diff options
| author | Fedor Indutny <fedor.indutny@gmail.com> | 2014-01-06 19:35:36 +0400 |
|---|---|---|
| committer | Fedor Indutny <fedor.indutny@gmail.com> | 2014-01-08 02:43:17 +0400 |
| commit | 390598608c900adcc0ce753d5255c0a805505287 (patch) | |
| tree | fe9049237e5e9346845a5cb4ca59dfab4a902914 /deps/openssl/openssl/crypto/evp/e_aes.c | |
| parent | f057c7049eea6e6396dfd8117910ccb2a5c8977a (diff) | |
| download | android-node-v8-390598608c900adcc0ce753d5255c0a805505287.tar.gz android-node-v8-390598608c900adcc0ce753d5255c0a805505287.tar.bz2 android-node-v8-390598608c900adcc0ce753d5255c0a805505287.zip | |
deps: update openssl to 1.0.1f
Diffstat (limited to 'deps/openssl/openssl/crypto/evp/e_aes.c')
| -rw-r--r-- | deps/openssl/openssl/crypto/evp/e_aes.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/deps/openssl/openssl/crypto/evp/e_aes.c b/deps/openssl/openssl/crypto/evp/e_aes.c index 1bfb5d92b3..c7869b69ef 100644 --- a/deps/openssl/openssl/crypto/evp/e_aes.c +++ b/deps/openssl/openssl/crypto/evp/e_aes.c @@ -842,7 +842,10 @@ static int aes_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, gctx->ctr = NULL; break; } + else #endif + (void)0; /* terminate potentially open 'else' */ + AES_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks); CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, (block128_f)AES_encrypt); #ifdef AES_CTR_ASM @@ -1083,14 +1086,17 @@ static int aes_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, xctx->xts.block1 = (block128_f)vpaes_decrypt; } - vpaes_set_encrypt_key(key + ctx->key_len/2, + vpaes_set_encrypt_key(key + ctx->key_len/2, ctx->key_len * 4, &xctx->ks2); - xctx->xts.block2 = (block128_f)vpaes_encrypt; + xctx->xts.block2 = (block128_f)vpaes_encrypt; - xctx->xts.key1 = &xctx->ks1; - break; - } + xctx->xts.key1 = &xctx->ks1; + break; + } + else #endif + (void)0; /* terminate potentially open 'else' */ + if (enc) { AES_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1); |