commit 3500ddf6b979294acb22b211a8a21750737ace02
author gitbuildkicker <android-build@google.com> Fri Dec 02 18:05:58 2016 -0800
committer gitbuildkicker <android-build@google.com> Fri Dec 02 18:05:58 2016 -0800
tree e842361a7e46e239ed82593793f0d1718025af02
parent 44ef9535b9afb123d150d8e0362e4bb50794dd41
parent b76556fcab1cff5997c13ad5ab836182423dc623

merge in nougat-cts-release history after reset to nougat-cts-dev

src/main/native/org_conscrypt_NativeCrypto.cpp

diff --git a/src/main/native/org_conscrypt_NativeCrypto.cpp b/src/main/native/org_conscrypt_NativeCrypto.cpp
index 5c66373..9af0cda 100644
--- a/src/main/native/org_conscrypt_NativeCrypto.cpp
+++ b/src/main/native/org_conscrypt_NativeCrypto.cpp
@@ -4612,7 +4612,7 @@
     } else if (strcasecmp(alg, "des-cbc") == 0) {
         cipher = EVP_des_cbc();
     } else if (strcasecmp(alg, "des-ede-cbc") == 0) {
-        cipher = EVP_des_cbc();
+        cipher = EVP_des_ede_cbc();
     } else if (strcasecmp(alg, "des-ede3-cbc") == 0) {
         cipher = EVP_des_ede3_cbc();
     } else if (strcasecmp(alg, "aes-128-ecb") == 0) {