diff options
| author | Kenny Root <kroot@google.com> | 2016-08-25 12:08:18 -0700 |
|---|---|---|
| committer | gitbuildkicker <android-build@google.com> | 2016-10-12 17:24:08 -0700 |
| commit | 68a82f6e34082ef20cb7bd366cc0d2170fc33e1a (patch) | |
| tree | e842361a7e46e239ed82593793f0d1718025af02 | |
| parent | 456452b42c559a63aa5ebe575a1d3c816f628e39 (diff) | |
| download | conscrypt-nougat-dr1-release.tar.gz | |
Fix typo in name of des-ede mappingandroid-7.1.0_r7android-7.1.0_r6android-7.1.0_r5nougat-dr1-release
This was mapping 2-key 3DES to regular DES thus resulting in all
encryption using 2-key 3DES having the wrong answers.
(cherry picked from commit 55caed999846897bcf949828e6e367bf8d7d9909)
Bug: 31081987
Change-Id: I44ba12dcf51d57952cf3ba501381d144d271a2a6
(cherry picked from commit 3209baf397afb1481aa19d398f34c48facc19903)
| -rw-r--r-- | src/main/native/org_conscrypt_NativeCrypto.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/native/org_conscrypt_NativeCrypto.cpp b/src/main/native/org_conscrypt_NativeCrypto.cpp index 5c663735..9af0cda7 100644 --- a/src/main/native/org_conscrypt_NativeCrypto.cpp +++ b/src/main/native/org_conscrypt_NativeCrypto.cpp @@ -4612,7 +4612,7 @@ static jlong NativeCrypto_EVP_get_cipherbyname(JNIEnv* env, jclass, jstring algo } 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) { |