[openssl-commits] [openssl] OpenSSL_1_0_0-stable update

[Dr. Stephen Henson]

The branch OpenSSL_1_0_0-stable has been updated
       via  df32994cf0dbaefef8187b60785eb615735d7be1 (commit)
      from  01d8ae61f236d24a5a04992866d94ec10f7d69a2 (commit)


- Log -----------------------------------------------------------------
commit df32994cf0dbaefef8187b60785eb615735d7be1
Author: Ivo Raisr <ivo.raisr at oracle.com>
Date:   Fri Sep 11 17:24:33 2015 +0100

    Make no-psk compile without warnings.
    
    PR#4035
    
    Reviewed-by: Emilia Käsper <emilia at openssl.org>
    Reviewed-by: Stephen Henson <steve at openssl.org>
    (cherry picked from commit 929f6d6f55275b17cfdd5c405ef403bce87c9aef)

-----------------------------------------------------------------------

Summary of changes:
 ssl/ssl_asn1.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c
index aad07e6..8629916 100644
--- a/ssl/ssl_asn1.c
+++ b/ssl/ssl_asn1.c
@@ -118,13 +118,16 @@ typedef struct ssl_session_asn1_st {
 int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
 {
 #define LSIZE2 (sizeof(long)*2)
-    int v1 = 0, v2 = 0, v3 = 0, v4 = 0, v5 = 0, v7 = 0, v8 = 0;
+    int v1 = 0, v2 = 0, v3 = 0, v4 = 0, v5 = 0;
     unsigned char buf[4], ibuf1[LSIZE2], ibuf2[LSIZE2];
     unsigned char ibuf3[LSIZE2], ibuf4[LSIZE2], ibuf5[LSIZE2];
 #ifndef OPENSSL_NO_TLSEXT
     int v6 = 0, v9 = 0, v10 = 0;
     unsigned char ibuf6[LSIZE2];
 #endif
+#ifndef OPENSSL_NO_PSK
+    int v7 = 0, v8 = 0;
+#endif
 #ifndef OPENSSL_NO_COMP
     unsigned char cbuf;
     int v11 = 0;