21179246 passing incompatible argument in crypto/evp/e_aes.c:861 s11u3-sru
authorIvo Raisr <ivo.raisr@oracle.com>
Fri, 07 Aug 2015 07:51:14 -0700
branchs11u3-sru
changeset 4933 5bb0c0ba3d32
parent 4932 9ace63b409d6
child 4934 ea3146b8a591
21179246 passing incompatible argument in crypto/evp/e_aes.c:861
components/openssl/openssl-1.0.1/patches/37_openssl_t4_inline.patch
--- a/components/openssl/openssl-1.0.1/patches/37_openssl_t4_inline.patch	Fri Oct 09 03:33:46 2015 -0700
+++ b/components/openssl/openssl-1.0.1/patches/37_openssl_t4_inline.patch	Fri Aug 07 07:51:14 2015 -0700
@@ -2134,6 +2134,15 @@
              dat->block = (block128_f) AES_decrypt;
              dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
                  (cbc128_f) AES_cbc_encrypt : NULL;
[email protected]@ -502,7 +859,7 @@
+     } else
+ #  ifdef BSAES_CAPABLE
+     if (BSAES_CAPABLE && mode == EVP_CIPH_CTR_MODE) {
+-        ret = AES_set_encrypt_key(key, ctx->key_len * 8, &dat->ks);
++        ret = AES_set_encrypt_key(key, ctx->key_len * 8, &dat->ks.ks);
+         dat->block = (block128_f) AES_encrypt;
+         dat->stream.ctr = (ctr128_f) bsaes_ctr32_encrypt_blocks;
+     } else
 @@ -508,7 +865,7 @@
  #  endif
  #  ifdef VPAES_CAPABLE