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

Unified Diff: net/quic/crypto/aes_128_gcm_12_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/aes_128_gcm_12_decrypter_test.cc ('k') | net/quic/crypto/aes_128_gcm_12_encrypter_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/crypto/aes_128_gcm_12_encrypter_nss.cc
diff --git a/net/quic/crypto/aes_128_gcm_12_encrypter_nss.cc b/net/quic/crypto/aes_128_gcm_12_encrypter_nss.cc
index 09901a4767243027aa73381c8c26fccf09513acc..6214af540f2740b32f5bcb872acf328a243b21b9 100644
--- a/net/quic/crypto/aes_128_gcm_12_encrypter_nss.cc
+++ b/net/quic/crypto/aes_128_gcm_12_encrypter_nss.cc
@@ -59,7 +59,7 @@ class GcmSupportChecker {
};
// static
-PK11_EncryptFunction GcmSupportChecker::pk11_encrypt_func_ = NULL;
+PK11_EncryptFunction GcmSupportChecker::pk11_encrypt_func_ = nullptr;
base::LazyInstance<GcmSupportChecker>::Leaky g_gcm_support_checker =
LAZY_INSTANCE_INITIALIZER;
@@ -78,7 +78,7 @@ SECStatus My_Encrypt(PK11SymKey* key,
// being used, then NSS will support AES-GCM directly.
PK11_EncryptFunction pk11_encrypt_func =
GcmSupportChecker::pk11_encrypt_func();
- if (pk11_encrypt_func != NULL) {
+ if (pk11_encrypt_func != nullptr) {
return pk11_encrypt_func(key, mechanism, param, out, out_len, max_len, data,
data_len);
}
@@ -110,7 +110,7 @@ SECStatus My_Encrypt(PK11SymKey* key,
return SECFailure;
}
- SECItem my_param = { siBuffer, NULL, 0 };
+ SECItem my_param = { siBuffer, nullptr, 0 };
// Step 1. Let H = CIPH_K(128 '0' bits).
unsigned char ghash_key[16] = {0};
« no previous file with comments | « net/quic/crypto/aes_128_gcm_12_decrypter_test.cc ('k') | net/quic/crypto/aes_128_gcm_12_encrypter_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698