[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Andy Polyakov]

The branch OpenSSL_1_0_2-stable has been updated
       via  df57e42baa0c1c8a97035adb9ffb2f335158c440 (commit)
      from  9c5c18500bfb58fe0eedfbab71409b6ebc4d2d4c (commit)


- Log -----------------------------------------------------------------
commit df57e42baa0c1c8a97035adb9ffb2f335158c440
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon Feb 9 11:46:19 2015 +0100

    evp/e_aes.c: fix SPARC T4-specific problem:
    
    - SIGSEGV/ILL in CCM (RT#3688);
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/evp/e_aes.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 41844bc..8161b26 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -790,6 +790,8 @@ static int aes_t4_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
         default:
             return 0;
         }
+#  else
+        cctx->str = NULL;
 #  endif
         cctx->key_set = 1;
     }