| Index: crypto/ec_private_key_nss.cc
|
| diff --git a/crypto/ec_private_key_nss.cc b/crypto/ec_private_key_nss.cc
|
| index c6c476325bb7b52ed7ee4ff0013e6346e2244559..32e4617788517f060f0dfe01cbc2b70f6d355815 100644
|
| --- a/crypto/ec_private_key_nss.cc
|
| +++ b/crypto/ec_private_key_nss.cc
|
| @@ -114,7 +114,7 @@ bool ECPrivateKey::ImportFromEncryptedPrivateKeyInfo(
|
| bool sensitive,
|
| SECKEYPrivateKey** key,
|
| SECKEYPublicKey** public_key) {
|
| - ScopedPK11Slot slot(GetPublicNSSKeySlot());
|
| + ScopedPK11Slot slot(GetKeySlot());
|
| if (!slot.get())
|
| return false;
|
|
|
| @@ -174,6 +174,11 @@ bool ECPrivateKey::ImportFromEncryptedPrivateKeyInfo(
|
| return true;
|
| }
|
|
|
| +// static
|
| +PK11SlotInfo* ECPrivateKey::GetKeySlot() {
|
| + return GetPublicNSSKeySlot();
|
| +}
|
| +
|
| bool ECPrivateKey::ExportEncryptedPrivateKey(
|
| const std::string& password,
|
| int iterations,
|
| @@ -247,7 +252,7 @@ ECPrivateKey* ECPrivateKey::CreateWithParams(bool permanent,
|
|
|
| scoped_ptr<ECPrivateKey> result(new ECPrivateKey);
|
|
|
| - ScopedPK11Slot slot(GetPrivateNSSKeySlot());
|
| + ScopedPK11Slot slot(GetKeySlot());
|
| if (!slot.get())
|
| return NULL;
|
|
|
|
|