| Index: net/quic/crypto/aead_base_decrypter_openssl.cc
|
| diff --git a/net/quic/crypto/aead_base_decrypter_openssl.cc b/net/quic/crypto/aead_base_decrypter_openssl.cc
|
| index 2190bf6966e32c8847a82191865d5a0e00a5dee6..eb4db7137741a109fd84c8522a816aeec872ec32 100644
|
| --- a/net/quic/crypto/aead_base_decrypter_openssl.cc
|
| +++ b/net/quic/crypto/aead_base_decrypter_openssl.cc
|
| @@ -17,7 +17,8 @@ namespace {
|
|
|
| // Clear OpenSSL error stack.
|
| void ClearOpenSslErrors() {
|
| - while (ERR_get_error()) {}
|
| + while (ERR_get_error()) {
|
| + }
|
| }
|
|
|
| // In debug builds only, log OpenSSL error stack. Then clear OpenSSL error
|
| @@ -48,7 +49,8 @@ AeadBaseDecrypter::AeadBaseDecrypter(const EVP_AEAD* aead_alg,
|
| DCHECK_LE(nonce_prefix_size_, sizeof(nonce_prefix_));
|
| }
|
|
|
| -AeadBaseDecrypter::~AeadBaseDecrypter() {}
|
| +AeadBaseDecrypter::~AeadBaseDecrypter() {
|
| +}
|
|
|
| bool AeadBaseDecrypter::SetKey(StringPiece key) {
|
| DCHECK_EQ(key.size(), key_size_);
|
| @@ -58,8 +60,8 @@ bool AeadBaseDecrypter::SetKey(StringPiece key) {
|
| memcpy(key_, key.data(), key.size());
|
|
|
| EVP_AEAD_CTX_cleanup(ctx_.get());
|
| - if (!EVP_AEAD_CTX_init(ctx_.get(), aead_alg_, key_, key_size_,
|
| - auth_tag_size_, NULL)) {
|
| + if (!EVP_AEAD_CTX_init(
|
| + ctx_.get(), aead_alg_, key_, key_size_, auth_tag_size_, NULL)) {
|
| DLogOpenSslErrors();
|
| return false;
|
| }
|
| @@ -87,9 +89,13 @@ bool AeadBaseDecrypter::Decrypt(StringPiece nonce,
|
| }
|
|
|
| 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(),
|
| + 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());
|
|
|
| @@ -120,7 +126,8 @@ QuicData* AeadBaseDecrypter::DecryptPacket(
|
| memcpy(nonce, nonce_prefix_, nonce_prefix_size_);
|
| memcpy(nonce + nonce_prefix_size_, &sequence_number, sizeof(sequence_number));
|
| if (!Decrypt(StringPiece(reinterpret_cast<char*>(nonce), nonce_size),
|
| - associated_data, ciphertext,
|
| + associated_data,
|
| + ciphertext,
|
| reinterpret_cast<uint8*>(plaintext.get()),
|
| &plaintext_size)) {
|
| return NULL;
|
|
|