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

Unified Diff: net/quic/crypto/aead_base_decrypter_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
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..2401222d3dccce8c9fb7b2b3c090d804d0076877 100644
--- a/net/quic/crypto/aead_base_decrypter_nss.cc
+++ b/net/quic/crypto/aead_base_decrypter_nss.cc
@@ -83,9 +83,9 @@ bool AeadBaseDecrypter::Decrypt(StringPiece nonce,
// it's not PK11_OriginFortezzaHack, so pass PK11_OriginUnwrap as a
// placeholder.
crypto::ScopedPK11SymKey aead_key(PK11_ImportSymKey(
- slot, key_mechanism, PK11_OriginUnwrap, CKA_DECRYPT, &key_item, NULL));
+ slot, key_mechanism, PK11_OriginUnwrap, CKA_DECRYPT, &key_item, nullptr));
PK11_FreeSlot(slot);
- slot = NULL;
+ slot = nullptr;
if (!aead_key) {
DVLOG(1) << "PK11_ImportSymKey failed";
return false;
@@ -120,7 +120,7 @@ QuicData* AeadBaseDecrypter::DecryptPacket(
StringPiece associated_data,
StringPiece ciphertext) {
if (ciphertext.length() < auth_tag_size_) {
- return NULL;
+ return nullptr;
}
size_t plaintext_size;
scoped_ptr<char[]> plaintext(new char[ciphertext.length()]);
@@ -134,7 +134,7 @@ QuicData* AeadBaseDecrypter::DecryptPacket(
associated_data, ciphertext,
reinterpret_cast<uint8*>(plaintext.get()),
&plaintext_size)) {
- return NULL;
+ return nullptr;
}
return new QuicData(plaintext.release(), plaintext_size, true);
}
« no previous file with comments | « net/quic/congestion_control/time_loss_algorithm_test.cc ('k') | net/quic/crypto/aead_base_decrypter_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698