Fix a few warnings that -Wnull-conversion of a future clang will complain about.

crypto/rsa_private_key_mac.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "crypto/rsa_private_key.h"
 
 #include <list>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 53 matching lines @@
   key.KeyHeader.Format = CSSM_KEYBLOB_RAW_FORMAT_PKCS8;
   key.KeyHeader.HeaderVersion = CSSM_KEYHEADER_VERSION;
   key.KeyHeader.BlobType = CSSM_KEYBLOB_RAW;
   key.KeyHeader.AlgorithmId = CSSM_ALGID_RSA;
   key.KeyHeader.KeyClass = CSSM_KEYCLASS_PRIVATE_KEY;
   key.KeyHeader.KeyAttr = CSSM_KEYATTR_EXTRACTABLE;
   key.KeyHeader.KeyUsage = CSSM_KEYUSE_ANY;
 
   CSSM_KEY_SIZE key_size;
   CSSM_RETURN crtn;
-  crtn = CSSM_QueryKeySizeInBits(GetSharedCSPHandle(), NULL, &key, &key_size);
+  crtn = CSSM_QueryKeySizeInBits(
+      GetSharedCSPHandle(), CSSM_INVALID_HANDLE, &key, &key_size);
   if (crtn) {
     NOTREACHED() << "CSSM_QueryKeySizeInBits failed: " << crtn;
     return NULL;
   }
   key.KeyHeader.LogicalKeySizeInBits = key_size.LogicalKeySizeInBits;
 
   // Perform a NULL unwrap operation on the key so that result's key_
   // instance variable points to a key that can be released via CSSM_FreeKey().
   CSSM_ACCESS_CREDENTIALS creds;
   memset(&creds, 0, sizeof(CSSM_ACCESS_CREDENTIALS));
@@ skipping 41 matching lines @@
   memcpy(public_key->KeyData.Data, &public_key_data.front(), size);
   public_key->KeyData.Length = size;
   public_key->KeyHeader.Format = CSSM_KEYBLOB_RAW_FORMAT_PKCS1;
   public_key->KeyHeader.HeaderVersion = CSSM_KEYHEADER_VERSION;
   public_key->KeyHeader.BlobType = CSSM_KEYBLOB_RAW;
   public_key->KeyHeader.AlgorithmId = CSSM_ALGID_RSA;
   public_key->KeyHeader.KeyClass = CSSM_KEYCLASS_PUBLIC_KEY;
   public_key->KeyHeader.KeyAttr = CSSM_KEYATTR_EXTRACTABLE;
   public_key->KeyHeader.KeyUsage = CSSM_KEYUSE_ANY;
 
-  crtn = CSSM_QueryKeySizeInBits(GetSharedCSPHandle(), NULL, public_key,
-                                 &key_size);
+  crtn = CSSM_QueryKeySizeInBits(
+      GetSharedCSPHandle(), CSSM_INVALID_HANDLE, public_key, &key_size);
   if (crtn) {
     DLOG(ERROR) << "CSSM_QueryKeySizeInBits failed " << crtn;
     return NULL;
   }
   public_key->KeyHeader.LogicalKeySizeInBits = key_size.LogicalKeySizeInBits;
 
   return result.release();
 }
 
 // static
@@ skipping 46 matching lines @@
 bool RSAPrivateKey::ExportPublicKey(std::vector<uint8>* output) const {
   PrivateKeyInfoCodec private_key_info(true);
   std::vector<uint8> private_key_data;
   private_key_data.assign(key_.KeyData.Data,
                           key_.KeyData.Data + key_.KeyData.Length);
   return (private_key_info.Import(private_key_data) &&
           private_key_info.ExportPublicKeyInfo(output));
 }
 
 }  // namespace crypto