From f7c255ea1def87601d233ca1cdd64da6d2543232 Mon Sep 17 00:00:00 2001 From: "agl@chromium.org" Date: Thu, 17 Jul 2014 00:20:36 +0000 Subject: Revert "Switch to BoringSSL." This reverts commit 283542. This broke the WebView Android build. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283591 0039d316-1c4b-4281-b951-d872f2087c98 --- crypto/encryptor_openssl.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'crypto/encryptor_openssl.cc') diff --git a/crypto/encryptor_openssl.cc b/crypto/encryptor_openssl.cc index 0504adb..0bf96b7 100644 --- a/crypto/encryptor_openssl.cc +++ b/crypto/encryptor_openssl.cc @@ -19,6 +19,7 @@ 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; } @@ -99,8 +100,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), iv_.length()); - DCHECK_EQ(EVP_CIPHER_key_length(cipher), key.length()); + DCHECK_EQ(EVP_CIPHER_iv_length(cipher), static_cast(iv_.length())); + DCHECK_EQ(EVP_CIPHER_key_length(cipher), static_cast(key.length())); ScopedCipherCTX ctx; if (!EVP_CipherInit_ex(ctx.get(), cipher, NULL, -- cgit v1.1