[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  ba4f1331e3e96a83144adf5f100b8b5f8f29a2c9 (commit)
      from  32c748140ff94016011efc206a3709e4187ce40b (commit)


- Log -----------------------------------------------------------------
commit ba4f1331e3e96a83144adf5f100b8b5f8f29a2c9
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Nov 20 18:45:12 2015 +0000

    Fix uninitialised variable
    
    The al variable could be uninitialised in an error path.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 ssl/statem/statem_srvr.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index a7498d8..61a79f5 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -2855,6 +2855,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt)
         inlen = Tlen;
         if (EVP_PKEY_decrypt
             (pkey_ctx, premaster_secret, &outlen, start, inlen) <= 0) {
+            al = SSL_AD_DECODE_ERROR;
             SSLerr(SSL_F_TLS_PROCESS_CLIENT_KEY_EXCHANGE,
                    SSL_R_DECRYPTION_FAILED);
             goto gerr;