| Index: net/quic/crypto/aead_base_encrypter_nss.cc
|
| diff --git a/net/quic/crypto/aead_base_encrypter_nss.cc b/net/quic/crypto/aead_base_encrypter_nss.cc
|
| index fd4d888554c61711e9fb76f8b174bb8daf626149..7c79ff92afdfb926f8568874f59b11af5963a048 100644
|
| --- a/net/quic/crypto/aead_base_encrypter_nss.cc
|
| +++ b/net/quic/crypto/aead_base_encrypter_nss.cc
|
| @@ -27,7 +27,8 @@ AeadBaseEncrypter::AeadBaseEncrypter(CK_MECHANISM_TYPE aead_mechanism,
|
| DCHECK_LE(nonce_prefix_size_, sizeof(nonce_prefix_));
|
| }
|
|
|
| -AeadBaseEncrypter::~AeadBaseEncrypter() {}
|
| +AeadBaseEncrypter::~AeadBaseEncrypter() {
|
| +}
|
|
|
| bool AeadBaseEncrypter::SetKey(StringPiece key) {
|
| DCHECK_EQ(key.size(), key_size_);
|
| @@ -94,8 +95,12 @@ bool AeadBaseEncrypter::Encrypt(StringPiece nonce,
|
| param.len = aead_params.len;
|
|
|
| unsigned int output_len;
|
| - if (pk11_encrypt_(aead_key.get(), aead_mechanism_, ¶m,
|
| - output, &output_len, ciphertext_size,
|
| + if (pk11_encrypt_(aead_key.get(),
|
| + aead_mechanism_,
|
| + ¶m,
|
| + output,
|
| + &output_len,
|
| + ciphertext_size,
|
| reinterpret_cast<const unsigned char*>(plaintext.data()),
|
| plaintext.size()) != SECSuccess) {
|
| DVLOG(1) << "pk11_encrypt_ failed";
|
| @@ -125,7 +130,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;
|
| }
|
| @@ -133,7 +139,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_;
|
|
|