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

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

Issue 1542753004: Replace last remaining NULLs in gfe/quic with nullptr. No behavior change. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@110554875
Patch Set: Created 5 years 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/chacha20_poly1305_decrypter_test.cc
diff --git a/net/quic/crypto/chacha20_poly1305_decrypter_test.cc b/net/quic/crypto/chacha20_poly1305_decrypter_test.cc
index ed7239c44b5a70b45aa32bb6dbc1c83fc20f3ed4..665595dd7f553924cffc864b73725b1bfc6a4eb5 100644
--- a/net/quic/crypto/chacha20_poly1305_decrypter_test.cc
+++ b/net/quic/crypto/chacha20_poly1305_decrypter_test.cc
@@ -14,7 +14,7 @@ namespace {
// The test vectors come from draft-agl-tls-chacha20poly1305-04 Section 7.
// Each test vector consists of six strings of lowercase hexadecimal digits.
-// The strings may be empty (zero length). A test vector with a NULL |key|
+// The strings may be empty (zero length). A test vector with a nullptr |key|
// marks the end of an array of test vectors.
struct TestVector {
// Input:
@@ -30,39 +30,39 @@ struct TestVector {
};
const TestVector test_vectors[] = {
- { "4290bcb154173531f314af57f3be3b5006da371ece272afa1b5dbdd110"
+ {"4290bcb154173531f314af57f3be3b5006da371ece272afa1b5dbdd110"
+ "0a1007",
+ "cd7cf67be39c794a", "87e229d4500845a079c0",
+ "e3e446f7ede9a19b62a4677dabf4e3d24b876bb28475", // "3896e1d6" truncated.
+ "86d09974840bded2a5ca"},
+ // Modify the ciphertext (ChaCha20 encryption output).
+ {
+ "4290bcb154173531f314af57f3be3b5006da371ece272afa1b5dbdd110"
"0a1007",
- "cd7cf67be39c794a",
- "87e229d4500845a079c0",
- "e3e446f7ede9a19b62a4677dabf4e3d24b876bb28475", // "3896e1d6" truncated.
- "86d09974840bded2a5ca"
- },
- // Modify the ciphertext (ChaCha20 encryption output).
- { "4290bcb154173531f314af57f3be3b5006da371ece272afa1b5dbdd110"
+ "cd7cf67be39c794a", "87e229d4500845a079c0",
+ "f3e446f7ede9a19b62a4677dabf4e3d24b876bb28475", // "3896e1d6"
+ // truncated.
+ nullptr // FAIL
+ },
+ // Modify the ciphertext (Poly1305 authenticator).
+ {
+ "4290bcb154173531f314af57f3be3b5006da371ece272afa1b5dbdd110"
"0a1007",
- "cd7cf67be39c794a",
- "87e229d4500845a079c0",
- "f3e446f7ede9a19b62a4677dabf4e3d24b876bb28475", // "3896e1d6" truncated.
- NULL // FAIL
- },
- // Modify the ciphertext (Poly1305 authenticator).
- { "4290bcb154173531f314af57f3be3b5006da371ece272afa1b5dbdd110"
+ "cd7cf67be39c794a", "87e229d4500845a079c0",
+ "e3e446f7ede9a19b62a4677dabf4e3d24b876bb28476", // "3896e1d6"
+ // truncated.
+ nullptr // FAIL
+ },
+ // Modify the associated data.
+ {
+ "4290bcb154173531f314af57f3be3b5006da371ece272afa1b5dbdd110"
"0a1007",
- "cd7cf67be39c794a",
- "87e229d4500845a079c0",
- "e3e446f7ede9a19b62a4677dabf4e3d24b876bb28476", // "3896e1d6" truncated.
- NULL // FAIL
- },
- // Modify the associated data.
- { "4290bcb154173531f314af57f3be3b5006da371ece272afa1b5dbdd110"
- "0a1007",
- "dd7cf67be39c794a",
- "87e229d4500845a079c0",
- "e3e446f7ede9a19b62a4677dabf4e3d24b876bb28475", // "3896e1d6" truncated.
- NULL // FAIL
- },
- { NULL }
-};
+ "dd7cf67be39c794a", "87e229d4500845a079c0",
+ "e3e446f7ede9a19b62a4677dabf4e3d24b876bb28475", // "3896e1d6"
+ // truncated.
+ nullptr // FAIL
+ },
+ {nullptr}};
} // namespace
« no previous file with comments | « net/quic/crypto/aes_128_gcm_12_encrypter_test.cc ('k') | net/quic/crypto/chacha20_poly1305_encrypter_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698