summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Braithwaite <mab@google.com>2016-09-15 20:15:27 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-15 20:15:27 +0000
commitb6d97eefe4027cca2ff80b502e3e7acdbbee224c (patch)
tree4ad8cfd5a294551522506af3dc1b25cdd8d54d10
parent5f51074adcd8cb0fd6f34797a921685c15cdb23e (diff)
parentcb576493fe648b43eae88830b038bbc245378982 (diff)
downloadexternal_boringssl-b6d97eefe4027cca2ff80b502e3e7acdbbee224c.zip
external_boringssl-b6d97eefe4027cca2ff80b502e3e7acdbbee224c.tar.gz
external_boringssl-b6d97eefe4027cca2ff80b502e3e7acdbbee224c.tar.bz2
Fix NID of |EVP_CIPHER des3_cbc|. am: 15706c2705
am: cb576493fe Change-Id: Ifb233f7e519786f29c82f96c3c49e63e1b5a6f20
-rw-r--r--src/crypto/cipher/e_des.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/crypto/cipher/e_des.c b/src/crypto/cipher/e_des.c
index 74e1fce..4c09a81 100644
--- a/src/crypto/cipher/e_des.c
+++ b/src/crypto/cipher/e_des.c
@@ -127,7 +127,7 @@ static int des_ede3_cbc_cipher(EVP_CIPHER_CTX *ctx, uint8_t *out,
}
static const EVP_CIPHER des3_cbc = {
- NID_des_cbc, 8 /* block_size */, 24 /* key_size */,
+ NID_des_ede3_cbc, 8 /* block_size */, 24 /* key_size */,
8 /* iv_len */, sizeof(DES_EDE_KEY), EVP_CIPH_CBC_MODE,
NULL /* app_data */, des_ede3_init_key, des_ede3_cbc_cipher,
NULL /* cleanup */, NULL /* ctrl */, };