diff options
| author | Matt Braithwaite <mab@google.com> | 2016-09-15 20:17:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-15 20:17:59 +0000 |
| commit | 5c9faa3e81c24a1e1b2f60a6931dc4aacb34c583 (patch) | |
| tree | 4ad8cfd5a294551522506af3dc1b25cdd8d54d10 | |
| parent | 2fddbe3348fcf4b087efcc4d44c1d466fccaf462 (diff) | |
| parent | b6d97eefe4027cca2ff80b502e3e7acdbbee224c (diff) | |
| download | external_boringssl-5c9faa3e81c24a1e1b2f60a6931dc4aacb34c583.zip external_boringssl-5c9faa3e81c24a1e1b2f60a6931dc4aacb34c583.tar.gz external_boringssl-5c9faa3e81c24a1e1b2f60a6931dc4aacb34c583.tar.bz2 | |
Fix NID of |EVP_CIPHER des3_cbc|. am: 15706c2705 am: cb576493fe
am: b6d97eefe4
Change-Id: I15bbc5d62cb1cd56115c36fffa01e0a288910163
| -rw-r--r-- | src/crypto/cipher/e_des.c | 2 |
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 */, }; |