diff options
author | Matt Braithwaite <mab@google.com> | 2015-08-11 17:19:35 -0700 |
---|---|---|
committer | gitbuildkicker <android-build@google.com> | 2016-09-27 15:54:55 -0700 |
commit | 9120fca9ecc68b3d1a660be048b20f0c3a8feade (patch) | |
tree | 49fb9e4bcec94ac1d5c16790988fd7ac1e1906e0 /src/crypto/cipher/cipher_test.cc | |
parent | 43270fd68316c365a82feed8258348a0872bf9a7 (diff) | |
download | external_boringssl-9120fca9ecc68b3d1a660be048b20f0c3a8feade.zip external_boringssl-9120fca9ecc68b3d1a660be048b20f0c3a8feade.tar.gz external_boringssl-9120fca9ecc68b3d1a660be048b20f0c3a8feade.tar.bz2 |
Re-add |EVP_des_ede_cbc|.
Note that while |DES_ede2_cbc_encrypt| exists, I didn't use it: I
think it's easier to see what's happening this way.
(I couldn't find an authoritative source of test data, including in
OpenSSL's source, so I used OpenSSL's implementation to produce the
test ciphertext.)
This benefits globalplatform.
(cherry picked from commit 8c413a2d94fa720fae6a7d9c939e33978f3ed25b)
Bug: 31081987
Change-Id: I7e17ca0b69067d7b3f4bc213b4616eb269882ae0
Reviewed-on: https://boringssl-review.googlesource.com/5724
Reviewed-by: Adam Langley <agl@google.com>
(cherry picked from commit 9f12ca8242e6de532a8c947804d9dcf047c45af8)
Diffstat (limited to 'src/crypto/cipher/cipher_test.cc')
-rw-r--r-- | src/crypto/cipher/cipher_test.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/crypto/cipher/cipher_test.cc b/src/crypto/cipher/cipher_test.cc index 97a84e0..2b4f58f 100644 --- a/src/crypto/cipher/cipher_test.cc +++ b/src/crypto/cipher/cipher_test.cc @@ -69,6 +69,8 @@ static const EVP_CIPHER *GetCipher(const std::string &name) { if (name == "DES-CBC") { return EVP_des_cbc(); + } else if (name == "DES-EDE-CBC") { + return EVP_des_ede_cbc(); } else if (name == "DES-EDE3-CBC") { return EVP_des_ede3_cbc(); } else if (name == "RC4") { |