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

Unified Diff: net/quic/crypto/aead_base_decrypter_openssl.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/aead_base_decrypter_nss.cc ('k') | net/quic/crypto/aead_base_encrypter_nss.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/crypto/aead_base_decrypter_openssl.cc
diff --git a/net/quic/crypto/aead_base_decrypter_openssl.cc b/net/quic/crypto/aead_base_decrypter_openssl.cc
index fad0fe1b5204608b02cd8a2a0efc3babd5f2ba8e..62a6fb82f27ad5cf566c545e95875a04841ed4e8 100644
--- a/net/quic/crypto/aead_base_decrypter_openssl.cc
+++ b/net/quic/crypto/aead_base_decrypter_openssl.cc
@@ -59,7 +59,7 @@ bool AeadBaseDecrypter::SetKey(StringPiece key) {
EVP_AEAD_CTX_cleanup(ctx_.get());
if (!EVP_AEAD_CTX_init(ctx_.get(), aead_alg_, key_, key_size_,
- auth_tag_size_, NULL)) {
+ auth_tag_size_, nullptr)) {
DLogOpenSslErrors();
return false;
}
@@ -106,7 +106,7 @@ QuicData* AeadBaseDecrypter::DecryptPacket(
StringPiece associated_data,
StringPiece ciphertext) {
if (ciphertext.length() < auth_tag_size_) {
- return NULL;
+ return nullptr;
}
size_t plaintext_size = ciphertext.length();
scoped_ptr<char[]> plaintext(new char[plaintext_size]);
@@ -120,7 +120,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/crypto/aead_base_decrypter_nss.cc ('k') | net/quic/crypto/aead_base_encrypter_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698