| Index: net/quic/crypto/aead_base_decrypter_nss.cc
|
| diff --git a/net/quic/crypto/aead_base_decrypter_nss.cc b/net/quic/crypto/aead_base_decrypter_nss.cc
|
| index bbf30244f87636f896ecd8b86209e22fd17f3f2a..06cb7998abb78361ea5cb76680d63e4efb5de9ae 100644
|
| --- a/net/quic/crypto/aead_base_decrypter_nss.cc
|
| +++ b/net/quic/crypto/aead_base_decrypter_nss.cc
|
| @@ -27,7 +27,8 @@ AeadBaseDecrypter::AeadBaseDecrypter(CK_MECHANISM_TYPE aead_mechanism,
|
| DCHECK_LE(nonce_prefix_size_, sizeof(nonce_prefix_));
|
| }
|
|
|
| -AeadBaseDecrypter::~AeadBaseDecrypter() {}
|
| +AeadBaseDecrypter::~AeadBaseDecrypter() {
|
| +}
|
|
|
| bool AeadBaseDecrypter::SetKey(StringPiece key) {
|
| DCHECK_EQ(key.size(), key_size_);
|
| @@ -100,8 +101,12 @@ bool AeadBaseDecrypter::Decrypt(StringPiece nonce,
|
| param.len = aead_params.len;
|
|
|
| unsigned int output_len;
|
| - if (pk11_decrypt_(aead_key.get(), aead_mechanism_, ¶m,
|
| - output, &output_len, ciphertext.length(),
|
| + if (pk11_decrypt_(aead_key.get(),
|
| + aead_mechanism_,
|
| + ¶m,
|
| + output,
|
| + &output_len,
|
| + ciphertext.length(),
|
| reinterpret_cast<const unsigned char*>(ciphertext.data()),
|
| ciphertext.length()) != SECSuccess) {
|
| return false;
|
| @@ -131,7 +136,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;
|
|
|