2132 - ret = AES_set_decrypt_key(key, ctx->key_len * 8, &dat->ks); |
2132 - ret = AES_set_decrypt_key(key, ctx->key_len * 8, &dat->ks); |
2133 + ret = AES_set_decrypt_key(key, ctx->key_len * 8, &dat->ks.ks); |
2133 + ret = AES_set_decrypt_key(key, ctx->key_len * 8, &dat->ks.ks); |
2134 dat->block = (block128_f) AES_decrypt; |
2134 dat->block = (block128_f) AES_decrypt; |
2135 dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? |
2135 dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? |
2136 (cbc128_f) AES_cbc_encrypt : NULL; |
2136 (cbc128_f) AES_cbc_encrypt : NULL; |
|
2137 @@ -502,7 +859,7 @@ |
|
2138 } else |
|
2139 # ifdef BSAES_CAPABLE |
|
2140 if (BSAES_CAPABLE && mode == EVP_CIPH_CTR_MODE) { |
|
2141 - ret = AES_set_encrypt_key(key, ctx->key_len * 8, &dat->ks); |
|
2142 + ret = AES_set_encrypt_key(key, ctx->key_len * 8, &dat->ks.ks); |
|
2143 dat->block = (block128_f) AES_encrypt; |
|
2144 dat->stream.ctr = (ctr128_f) bsaes_ctr32_encrypt_blocks; |
|
2145 } else |
2137 @@ -508,7 +865,7 @@ |
2146 @@ -508,7 +865,7 @@ |
2138 # endif |
2147 # endif |
2139 # ifdef VPAES_CAPABLE |
2148 # ifdef VPAES_CAPABLE |
2140 if (VPAES_CAPABLE) { |
2149 if (VPAES_CAPABLE) { |
2141 - ret = vpaes_set_encrypt_key(key, ctx->key_len * 8, &dat->ks); |
2150 - ret = vpaes_set_encrypt_key(key, ctx->key_len * 8, &dat->ks); |