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

Unified Diff: net/quic/crypto/aes_128_gcm_12_decrypter_test.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_nss.cc ('k') | net/quic/crypto/aes_128_gcm_12_encrypter_nss.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_decrypter_test.cc
diff --git a/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc b/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc
index 5a719a05a41c8b39f85a33793f78ba879ac31832..37ee8f99855f00c5d184c616d2955c95450aa29b 100644
--- a/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc
+++ b/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc
@@ -262,7 +262,7 @@ QuicData* DecryptWithNonce(Aes128Gcm12Decrypter* decrypter,
if (!decrypter->Decrypt(nonce, associated_data, ciphertext,
reinterpret_cast<unsigned char*>(plaintext.get()),
&plaintext_size)) {
- return NULL;
+ return nullptr;
}
return new QuicData(plaintext.release(), plaintext_size, true);
}
@@ -272,7 +272,7 @@ TEST(Aes128Gcm12DecrypterTest, Decrypt) {
SCOPED_TRACE(i);
const TestVector* test_vectors = test_group_array[i];
const TestGroupInfo& test_info = test_group_info[i];
- for (size_t j = 0; test_vectors[j].key != NULL; j++) {
+ for (size_t j = 0; test_vectors[j].key != nullptr; j++) {
// If not present then decryption is expected to fail.
bool has_pt = test_vectors[j].pt;
@@ -316,7 +316,8 @@ TEST(Aes128Gcm12DecrypterTest, Decrypt) {
scoped_ptr<QuicData> decrypted(DecryptWithNonce(
&decrypter, iv,
// This deliberately tests that the decrypter can handle an AAD that
- // is set to NULL, as opposed to a zero-length, non-NULL pointer.
+ // is set to nullptr, as opposed to a zero-length, non-nullptr
+ // pointer.
aad.length() ? aad : StringPiece(), ciphertext));
if (!decrypted.get()) {
EXPECT_FALSE(has_pt);
« no previous file with comments | « net/quic/crypto/aes_128_gcm_12_decrypter_nss.cc ('k') | net/quic/crypto/aes_128_gcm_12_encrypter_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698