diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-13 03:29:22 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-13 03:29:22 +0000 |
| commit | 6e7da44d1c6183f65db77ee7ba0e4769cce7801f (patch) | |
| tree | 97d9ecc5480b1356f8a286e51efdb485a9529d42 /crypto/ec_private_key_openssl.cc | |
| parent | ae72d81219fa0a2dc2fc48857160d3117bd56523 (diff) | |
| download | chromium_src-6e7da44d1c6183f65db77ee7ba0e4769cce7801f.zip chromium_src-6e7da44d1c6183f65db77ee7ba0e4769cce7801f.tar.gz chromium_src-6e7da44d1c6183f65db77ee7ba0e4769cce7801f.tar.bz2 | |
NSS: {EC,RSA}PrivateKey shouldn't call crypto::GetPublicNSSKeySlot or GetPrivateNSSKeySlot.
Make ECPrivateKey use PK11_GetInternalKeySlot for temporary keys.
Make ECPrivateKey and RSAPrivateKey "sensitive" functions take slot as parameter.
This avoids calling non-thread-safe functions in nss_util on arbitrary threads.
Also removes the ANNOTATE_SCOPED_MEMORY_LEAK from RSAPrivateKey which should no longer be necessary.
BUG=125848,34742
Review URL: https://codereview.chromium.org/66213002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234726 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/ec_private_key_openssl.cc')
| -rw-r--r-- | crypto/ec_private_key_openssl.cc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/crypto/ec_private_key_openssl.cc b/crypto/ec_private_key_openssl.cc index c8d9c25..ce921dd 100644 --- a/crypto/ec_private_key_openssl.cc +++ b/crypto/ec_private_key_openssl.cc @@ -101,12 +101,6 @@ ECPrivateKey* ECPrivateKey::Create() { } // static -ECPrivateKey* ECPrivateKey::CreateSensitive() { - NOTIMPLEMENTED(); - return NULL; -} - -// static ECPrivateKey* ECPrivateKey::CreateFromEncryptedPrivateKeyInfo( const std::string& password, const std::vector<uint8>& encrypted_private_key_info, @@ -150,15 +144,6 @@ ECPrivateKey* ECPrivateKey::CreateFromEncryptedPrivateKeyInfo( return result.release(); } -// static -ECPrivateKey* ECPrivateKey::CreateSensitiveFromEncryptedPrivateKeyInfo( - const std::string& password, - const std::vector<uint8>& encrypted_private_key_info, - const std::vector<uint8>& subject_public_key_info) { - NOTIMPLEMENTED(); - return NULL; -} - bool ECPrivateKey::ExportEncryptedPrivateKey( const std::string& password, int iterations, |