Don't access memory before checking the correct length in aesni_cbc_hmac_sha256_ctrl...

[openssl.git] / crypto / evp / e_aes_cbc_hmac_sha256.c

diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c
index 4830c00648559ebb0e30e54d7f0600234d050478..bef603a3a5970f06a315bac571edc83e6489916c 100644 (file)
--- a/crypto/evp/e_aes_cbc_hmac_sha256.c
+++ b/crypto/evp/e_aes_cbc_hmac_sha256.c
@@ -777,11 +777,13 @@ static int aesni_cbc_hmac_sha256_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
     case EVP_CTRL_AEAD_TLS1_AAD:
         {
             unsigned char *p = ptr;
     case EVP_CTRL_AEAD_TLS1_AAD:
         {
             unsigned char *p = ptr;

-            unsigned int len = p[arg - 2] << 8 | p[arg - 1];
+            unsigned int len;

 
             if (arg != EVP_AEAD_TLS1_AAD_LEN)
                 return -1;
 
 
             if (arg != EVP_AEAD_TLS1_AAD_LEN)
                 return -1;
 

+            len = p[arg - 2] << 8 | p[arg - 1];
+

             if (EVP_CIPHER_CTX_encrypting(ctx)) {
                 key->payload_length = len;
                 if ((key->aux.tls_ver =
             if (EVP_CIPHER_CTX_encrypting(ctx)) {
                 key->payload_length = len;
                 if ((key->aux.tls_ver =