diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-17 17:59:10 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-17 17:59:10 +0000 |
| commit | 2126ceff10266d71675244ba89c6a7951cfb3d8b (patch) | |
| tree | 8d161378853a3ac9965098fd3da3f7ff1511ce24 /crypto/encryptor_openssl.cc | |
| parent | 791733d3dbc0dc80ba00b70a8c18ebaf2c2af812 (diff) | |
| download | chromium_src-2126ceff10266d71675244ba89c6a7951cfb3d8b.zip chromium_src-2126ceff10266d71675244ba89c6a7951cfb3d8b.tar.gz chromium_src-2126ceff10266d71675244ba89c6a7951cfb3d8b.tar.bz2 | |
Switch to BoringSSL.
(This is a reland of r283542 which was reverted in r283591 because it
broke the WebView build. The android_aosp trybots are broken[1] so this
based on hope.)
This is a much larger change than its diff suggests. If it breaks
something, please revert first and ask questions later.
[1] http://code.google.com/p/chromium/issues/detail?id=394597
BUG=none
Review URL: https://codereview.chromium.org/399993002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283813 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, |