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

Unified Diff: net/quic/crypto/crypto_utils.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/crypto_server_test.cc ('k') | net/quic/crypto/crypto_utils_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/crypto/crypto_utils.cc
diff --git a/net/quic/crypto/crypto_utils.cc b/net/quic/crypto/crypto_utils.cc
index 041c284b935871e26ed1dcea28ca13ec3cd09aea..7e0ab75bdd9483aad905cdd8f83410395f6230b1 100644
--- a/net/quic/crypto/crypto_utils.cc
+++ b/net/quic/crypto/crypto_utils.cc
@@ -91,7 +91,7 @@ bool CryptoUtils::DeriveKeys(StringPiece premaster_secret,
size_t key_bytes = crypters->encrypter->GetKeySize();
size_t nonce_prefix_bytes = crypters->encrypter->GetNoncePrefixSize();
size_t subkey_secret_bytes =
- subkey_secret == NULL ? 0 : premaster_secret.length();
+ subkey_secret == nullptr ? 0 : premaster_secret.length();
StringPiece nonce = client_nonce;
string nonce_storage;
@@ -117,7 +117,7 @@ bool CryptoUtils::DeriveKeys(StringPiece premaster_secret,
return false;
}
}
- if (subkey_secret != NULL) {
+ if (subkey_secret != nullptr) {
hkdf.subkey_secret().CopyToString(subkey_secret);
}
« no previous file with comments | « net/quic/crypto/crypto_server_test.cc ('k') | net/quic/crypto/crypto_utils_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698