diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-11-09 11:44:49 -0800 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-11-09 11:58:14 -0800 |
| commit | 1c725f9b6cce4af300ac28b902d186e8053c2f97 (patch) | |
| tree | 1d2fc71f41d7ea83be9f52e42d0192636b6ffa53 /src/crypto/cipher/cipher_test.cc | |
| parent | 9eeaa8c0f3b6324cc1cd518e18b33f2032bb173c (diff) | |
| parent | 9120fca9ecc68b3d1a660be048b20f0c3a8feade (diff) | |
| download | external_boringssl-1c725f9b6cce4af300ac28b902d186e8053c2f97.zip external_boringssl-1c725f9b6cce4af300ac28b902d186e8053c2f97.tar.gz external_boringssl-1c725f9b6cce4af300ac28b902d186e8053c2f97.tar.bz2 | |
Merge tag 'android-6.0.1_r74' into HEADHEADstable/cm-13.0-ZNH5Ycm-13.0
CYNGNOS-3303
Android 6.0.1 release 74
Change-Id: I74fadbfb9c05b2e1ce69f27809add70a2c89ec15
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 35bb82f..a9b207b 100644 --- a/src/crypto/cipher/cipher_test.cc +++ b/src/crypto/cipher/cipher_test.cc @@ -71,6 +71,8 @@ static const EVP_CIPHER *GetCipher(const std::string &name) { return EVP_des_cbc(); } else if (name == "DES-ECB") { return EVP_des_ecb(); + } 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") { |