diff options
author | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-22 18:20:37 +0000 |
---|---|---|
committer | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-22 18:20:37 +0000 |
commit | edfd0f43f597524764f6cb6988f6d52cc3d5a815 (patch) | |
tree | 8d04cf46384f60e33b16e45a91865fcae291fee3 /crypto/encryptor_openssl.cc | |
parent | 6a565f0f33da0eb60371a5be8980b521f6b1980a (diff) | |
download | chromium_src-edfd0f43f597524764f6cb6988f6d52cc3d5a815.zip chromium_src-edfd0f43f597524764f6cb6988f6d52cc3d5a815.tar.gz chromium_src-edfd0f43f597524764f6cb6988f6d52cc3d5a815.tar.bz2 |
Switch to BoringSSL.
This is a reland of r284079 which was reverted in r284248 for components build
issues. That, in turn, was a reland of r283813 which was reverted in r283845
because it broke WebRTC tests on Android. That, in turn, was a reland of
r283542 which was reverted in r283591 because it broke the WebView build.
This is a much larger change than its diff suggests. If it breaks
something, please revert first and ask questions later.
BUG=393317
R=agl@chromium.org, jam@chromium.org
Review URL: https://codereview.chromium.org/401153002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284729 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/encryptor_openssl.cc')
-rw-r--r-- | crypto/encryptor_openssl.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/encryptor_openssl.cc b/crypto/encryptor_openssl.cc index 0bf96b7..0504adb 100644 --- a/crypto/encryptor_openssl.cc +++ b/crypto/encryptor_openssl.cc @@ -19,7 +19,6 @@ namespace { const EVP_CIPHER* GetCipherForKey(SymmetricKey* key) { switch (key->key().length()) { case 16: return EVP_aes_128_cbc(); - case 24: return EVP_aes_192_cbc(); case 32: return EVP_aes_256_cbc(); default: return NULL; } @@ -100,8 +99,8 @@ bool Encryptor::Crypt(bool do_encrypt, DCHECK(cipher); // Already handled in Init(); const std::string& key = key_->key(); - DCHECK_EQ(EVP_CIPHER_iv_length(cipher), static_cast<int>(iv_.length())); - DCHECK_EQ(EVP_CIPHER_key_length(cipher), static_cast<int>(key.length())); + DCHECK_EQ(EVP_CIPHER_iv_length(cipher), iv_.length()); + DCHECK_EQ(EVP_CIPHER_key_length(cipher), key.length()); ScopedCipherCTX ctx; if (!EVP_CipherInit_ex(ctx.get(), cipher, NULL, |