Remove the password parameter for ECPrivateKey::ExportEncryptedPrivateKey.

components/gcm_driver/crypto/p256_key_util.cc

 // Copyright 2015 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 "components/gcm_driver/crypto/p256_key_util.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 33 matching lines @@
   if (!key_pair.get()) {
     DLOG(ERROR) << "Unable to generate a new P-256 key pair.";
     return false;
   }
 
   std::vector<uint8_t> private_key;
 
   // Export the encrypted private key with an empty password. This is not done
   // to provide any security, but rather to achieve a consistent private key
   // storage between the BoringSSL and NSS implementations.
-  if (!key_pair->ExportEncryptedPrivateKey(
-          "" /* password */, 1 /* iteration */, &private_key)) {
+  if (!key_pair->ExportEncryptedPrivateKey(&private_key)) {
     DLOG(ERROR) << "Unable to export the private key.";
     return false;
   }
 
   std::string candidate_public_key;
 
   // ECPrivateKey::ExportRawPublicKey() returns the EC point in the uncompressed
   // point format, but does not include the leading byte of value 0x04 that
   // indicates usage of uncompressed points, per SEC1 2.3.3.
   if (!key_pair->ExportRawPublicKey(&candidate_public_key) ||
@@ skipping 27 matching lines @@
 }
 
 bool ComputeSharedP256Secret(const base::StringPiece& private_key,
                              const base::StringPiece& public_key_x509,
                              const base::StringPiece& peer_public_key,
                              std::string* out_shared_secret) {
   DCHECK(out_shared_secret);
 
   std::unique_ptr<crypto::ECPrivateKey> local_key_pair(
       crypto::ECPrivateKey::CreateFromEncryptedPrivateKeyInfo(
-          "" /* no password */,
           std::vector<uint8_t>(private_key.data(),
                                private_key.data() + private_key.size()),
           std::vector<uint8_t>(
               public_key_x509.data(),
               public_key_x509.data() + public_key_x509.size())));
 
   if (!local_key_pair) {
     DLOG(ERROR) << "Unable to create the local key pair.";
     return false;
   }
@@ skipping 21 matching lines @@
                        nullptr) != sizeof(result)) {
     DLOG(ERROR) << "Unable to compute the ECDH shared secret.";
     return false;
   }
 
   out_shared_secret->assign(reinterpret_cast<char*>(result), sizeof(result));
   return true;
 }
 
 }  // namespace gcm