summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Braithwaite <mab@google.com>2015-07-29 14:04:56 -0700
committergitbuildkicker <android-build@google.com>2016-09-27 15:54:55 -0700
commit43270fd68316c365a82feed8258348a0872bf9a7 (patch)
tree4ad8cfd5a294551522506af3dc1b25cdd8d54d10
parent74750e1fb24149043a533497f79c577b704d6e30 (diff)
downloadexternal_boringssl-43270fd68316c365a82feed8258348a0872bf9a7.zip
external_boringssl-43270fd68316c365a82feed8258348a0872bf9a7.tar.gz
external_boringssl-43270fd68316c365a82feed8258348a0872bf9a7.tar.bz2
Fix NID of |EVP_CIPHER des3_cbc|.
(cherry picked from commit 6bfdc63114d7921037f44e7e3145c706b9ffb2e4) Bug: 31081987 Change-Id: I0f27fa1897d2f0a148203610ccd5c6c7967f9f3d Reviewed-on: https://boringssl-review.googlesource.com/5510 Reviewed-by: Adam Langley <agl@google.com> (cherry picked from commit 15706c2705f748c4e70fa8f9204a1e2cdf5181d0)
-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 */, };