summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Braithwaite <mab@google.com>2015-07-29 14:04:56 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-11-10 13:53:08 -0800
commit87edd5539b940bf6d4a228b18d4eb19ca67895d3 (patch)
tree065f335b92bc42a64feac081fff4a2aec2b6b491
parent33ce65e3fe4122e5f83e97bae4b110398a024002 (diff)
downloadexternal_boringssl-87edd5539b940bf6d4a228b18d4eb19ca67895d3.zip
external_boringssl-87edd5539b940bf6d4a228b18d4eb19ca67895d3.tar.gz
external_boringssl-87edd5539b940bf6d4a228b18d4eb19ca67895d3.tar.bz2
Fix NID of |EVP_CIPHER des3_cbc|.
(cherry picked from commit 6bfdc63114d7921037f44e7e3145c706b9ffb2e4) CYNGNOS-3303 Bug: 31081987 Change-Id: I0f27fa1897d2f0a148203610ccd5c6c7967f9f3d Reviewed-on: https://boringssl-review.googlesource.com/5510 Reviewed-by: Adam Langley <agl@google.com>
-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 d7bef92..2420495 100644
--- a/src/crypto/cipher/e_des.c
+++ b/src/crypto/cipher/e_des.c
@@ -151,7 +151,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 */, };