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

Unified Diff: net/quic/crypto/aead_base_encrypter_nss.cc

Issue 612323013: QUIC - (no behavior change) s/NULL/nullptr/g in .../quic/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « net/quic/crypto/aead_base_decrypter_openssl.cc ('k') | 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: 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..1e408ad36f4b25dbda0e7e6242fd80acb5c4de72 100644
--- a/net/quic/crypto/aead_base_encrypter_nss.cc
+++ b/net/quic/crypto/aead_base_encrypter_nss.cc
@@ -77,9 +77,9 @@ bool AeadBaseEncrypter::Encrypt(StringPiece nonce,
// it's not PK11_OriginFortezzaHack, so we pass PK11_OriginUnwrap as a
// placeholder.
crypto::ScopedPK11SymKey aead_key(PK11_ImportSymKey(
- slot, key_mechanism, PK11_OriginUnwrap, CKA_ENCRYPT, &key_item, NULL));
+ slot, key_mechanism, PK11_OriginUnwrap, CKA_ENCRYPT, &key_item, nullptr));
PK11_FreeSlot(slot);
- slot = NULL;
+ slot = nullptr;
if (!aead_key) {
DVLOG(1) << "PK11_ImportSymKey failed";
return false;
@@ -127,7 +127,7 @@ QuicData* AeadBaseEncrypter::EncryptPacket(
if (!Encrypt(StringPiece(reinterpret_cast<char*>(nonce), nonce_size),
associated_data, plaintext,
reinterpret_cast<unsigned char*>(ciphertext.get()))) {
- return NULL;
+ return nullptr;
}
return new QuicData(ciphertext.release(), ciphertext_size, true);
« no previous file with comments | « net/quic/crypto/aead_base_decrypter_openssl.cc ('k') | net/quic/crypto/aead_base_encrypter_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698