commit a4e2afcac677b961f429278312e0ac9d39797767
author Matt Braithwaite <mab@google.com> Wed Jul 29 14:04:56 2015 -0700
committer gitbuildkicker <android-build@google.com> Tue Sep 27 18:09:20 2016 -0700
tree 4ad8cfd5a294551522506af3dc1b25cdd8d54d10
parent 98d0f1b7673670cade321e73be5b1c4e83415d23

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)

src/crypto/cipher/e_des.c

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 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 */, };