Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(943)

Unified Diff: trunk/src/net/quic/crypto/aead_base_decrypter_openssl.cc

Issue 405503002: Revert 283813 "Switch to BoringSSL." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/net/net_nacl.gyp ('k') | trunk/src/net/quic/crypto/aead_base_encrypter_openssl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/net/quic/crypto/aead_base_decrypter_openssl.cc
===================================================================
--- trunk/src/net/quic/crypto/aead_base_decrypter_openssl.cc (revision 283844)
+++ trunk/src/net/quic/crypto/aead_base_decrypter_openssl.cc (working copy)
@@ -86,12 +86,14 @@
return false;
}
- if (!EVP_AEAD_CTX_open(
- ctx_.get(), output, output_length, ciphertext.size(),
+ ssize_t len = EVP_AEAD_CTX_open(
+ ctx_.get(), output, ciphertext.size(),
reinterpret_cast<const uint8_t*>(nonce.data()), nonce.size(),
reinterpret_cast<const uint8_t*>(ciphertext.data()), ciphertext.size(),
reinterpret_cast<const uint8_t*>(associated_data.data()),
- associated_data.size())) {
+ associated_data.size());
+
+ if (len < 0) {
// Because QuicFramer does trial decryption, decryption errors are expected
// when encryption level changes. So we don't log decryption errors.
ClearOpenSslErrors();
@@ -98,6 +100,7 @@
return false;
}
+ *output_length = len;
return true;
}
« no previous file with comments | « trunk/src/net/net_nacl.gyp ('k') | trunk/src/net/quic/crypto/aead_base_encrypter_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698