Index: net/quic/crypto/aead_base_encrypter_openssl.cc |
diff --git a/net/quic/crypto/aead_base_encrypter_openssl.cc b/net/quic/crypto/aead_base_encrypter_openssl.cc |
index 9f053abf93286df6b15a5ba72ddb3561cb7ee8a6..949f58a2a92e360c1ff5cc0aaa7c31cf514254de 100644 |
--- a/net/quic/crypto/aead_base_encrypter_openssl.cc |
+++ b/net/quic/crypto/aead_base_encrypter_openssl.cc |
@@ -20,7 +20,8 @@ namespace { |
// stack. |
void DLogOpenSslErrors() { |
#ifdef NDEBUG |
- while (ERR_get_error()) {} |
+ while (ERR_get_error()) { |
+ } |
#else |
while (unsigned long error = ERR_get_error()) { |
char buf[120]; |
@@ -44,7 +45,8 @@ AeadBaseEncrypter::AeadBaseEncrypter(const EVP_AEAD* aead_alg, |
DCHECK_LE(nonce_prefix_size_, sizeof(nonce_prefix_)); |
} |
-AeadBaseEncrypter::~AeadBaseEncrypter() {} |
+AeadBaseEncrypter::~AeadBaseEncrypter() { |
+} |
bool AeadBaseEncrypter::SetKey(StringPiece key) { |
DCHECK_EQ(key.size(), key_size_); |
@@ -55,8 +57,8 @@ bool AeadBaseEncrypter::SetKey(StringPiece key) { |
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; |
} |
@@ -82,9 +84,13 @@ bool AeadBaseEncrypter::Encrypt(StringPiece nonce, |
} |
ssize_t len = EVP_AEAD_CTX_seal( |
- ctx_.get(), output, plaintext.size() + auth_tag_size_, |
- reinterpret_cast<const uint8_t*>(nonce.data()), nonce.size(), |
- reinterpret_cast<const uint8_t*>(plaintext.data()), plaintext.size(), |
+ ctx_.get(), |
+ output, |
+ plaintext.size() + auth_tag_size_, |
+ reinterpret_cast<const uint8_t*>(nonce.data()), |
+ nonce.size(), |
+ reinterpret_cast<const uint8_t*>(plaintext.data()), |
+ plaintext.size(), |
reinterpret_cast<const uint8_t*>(associated_data.data()), |
associated_data.size()); |
@@ -111,7 +117,8 @@ QuicData* AeadBaseEncrypter::EncryptPacket( |
memcpy(nonce, nonce_prefix_, nonce_prefix_size_); |
memcpy(nonce + nonce_prefix_size_, &sequence_number, sizeof(sequence_number)); |
if (!Encrypt(StringPiece(reinterpret_cast<char*>(nonce), nonce_size), |
- associated_data, plaintext, |
+ associated_data, |
+ plaintext, |
reinterpret_cast<unsigned char*>(ciphertext.get()))) { |
return NULL; |
} |
@@ -119,7 +126,9 @@ QuicData* AeadBaseEncrypter::EncryptPacket( |
return new QuicData(ciphertext.release(), ciphertext_size, true); |
} |
-size_t AeadBaseEncrypter::GetKeySize() const { return key_size_; } |
+size_t AeadBaseEncrypter::GetKeySize() const { |
+ return key_size_; |
+} |
size_t AeadBaseEncrypter::GetNoncePrefixSize() const { |
return nonce_prefix_size_; |