Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / net / quic / crypto / aes_128_gcm_12_encrypter_nss.cc

diff --git a/src/net/quic/crypto/aes_128_gcm_12_encrypter_nss.cc b/src/net/quic/crypto/aes_128_gcm_12_encrypter_nss.cc
index 09901a4..6214af5 100644 (file)
--- a/src/net/quic/crypto/aes_128_gcm_12_encrypter_nss.cc
+++ b/src/net/quic/crypto/aes_128_gcm_12_encrypter_nss.cc
@@ -59,7 +59,7 @@ class GcmSupportChecker {
 };
 
 // static
-PK11_EncryptFunction GcmSupportChecker::pk11_encrypt_func_ = NULL;
+PK11_EncryptFunction GcmSupportChecker::pk11_encrypt_func_ = nullptr;
 
 base::LazyInstance<GcmSupportChecker>::Leaky g_gcm_support_checker =
     LAZY_INSTANCE_INITIALIZER;
@@ -78,7 +78,7 @@ SECStatus My_Encrypt(PK11SymKey* key,
   // being used, then NSS will support AES-GCM directly.
   PK11_EncryptFunction pk11_encrypt_func =
       GcmSupportChecker::pk11_encrypt_func();
-  if (pk11_encrypt_func != NULL) {
+  if (pk11_encrypt_func != nullptr) {
     return pk11_encrypt_func(key, mechanism, param, out, out_len, max_len, data,
                              data_len);
   }
@@ -110,7 +110,7 @@ SECStatus My_Encrypt(PK11SymKey* key,
     return SECFailure;
   }
 
-  SECItem my_param = { siBuffer, NULL, 0 };
+  SECItem my_param = { siBuffer, nullptr, 0 };
 
   // Step 1. Let H = CIPH_K(128 '0' bits).
   unsigned char ghash_key[16] = {0};