commit bdfd57e5a3a21ac340016a70ea425e4223f23b08
author Yi Kong <yikong@google.com> Wed Jul 25 13:26:10 2018 -0700
committer Yi Kong <yikong@google.com> Wed Jul 25 13:26:10 2018 -0700
tree baab5276b89048e9f327b93bc4a5de07325d8287
parent 50fdf5a544b2f475082978df035e137223e3d454

Modernize codebase by replacing NULL with nullptr

Fixes -Wzero-as-null-pointer-constant warning.

Test: m
Bug: 68236239
Change-Id: I226a0599db4f7c3557e55cade7869d00bd314949

server/dns/DnsTlsSocket.cpp

diff --git a/server/dns/DnsTlsSocket.cpp b/server/dns/DnsTlsSocket.cpp
index ca1cdc9..8e25b1f 100644
--- a/server/dns/DnsTlsSocket.cpp
+++ b/server/dns/DnsTlsSocket.cpp
@@ -108,7 +108,7 @@
 }
 
 bool getSPKIDigest(const X509* cert, std::vector<uint8_t>* out) {
-    int spki_len = i2d_X509_PUBKEY(X509_get_X509_PUBKEY(cert), NULL);
+    int spki_len = i2d_X509_PUBKEY(X509_get_X509_PUBKEY(cert), nullptr);
     unsigned char spki[spki_len];
     unsigned char* temp = spki;
     if (spki_len != i2d_X509_PUBKEY(X509_get_X509_PUBKEY(cert), &temp)) {
@@ -117,7 +117,7 @@
     }
     out->resize(SHA256_SIZE);
     unsigned int digest_len = 0;
-    int ret = EVP_Digest(spki, spki_len, out->data(), &digest_len, EVP_sha256(), NULL);
+    int ret = EVP_Digest(spki, spki_len, out->data(), &digest_len, EVP_sha256(), nullptr);
     if (ret != 1) {
         ALOGW("Server cert digest extraction failed");
         return false;