diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 03:18:58 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 03:18:58 +0000 |
| commit | 4ad67c653f9f16125f0fcac759eba48d7bc9bee4 (patch) | |
| tree | c321a4044552923c758687e11cd2368297dd617c /crypto/openpgp_symmetric_encryption.cc | |
| parent | 54db05eab3af2554886bd2fab8783f7909dca6fe (diff) | |
| download | chromium_src-4ad67c653f9f16125f0fcac759eba48d7bc9bee4.zip chromium_src-4ad67c653f9f16125f0fcac759eba48d7bc9bee4.tar.gz chromium_src-4ad67c653f9f16125f0fcac759eba48d7bc9bee4.tar.bz2 | |
Use the NSS internal key slot for all temporary key operations
Rather than calling PK11_GetBestSlot, which requires enumerating all
connected tokens, use PK11_GetInternalSlot, which explicitly uses the
internal NSS key database. On Linux, this will ignore any user preferences
regarding what tokens should be used for which mechanisms, but for
internal/temporary operations, this is an acceptable tradeoff.
BUG=chrome-os-partner:14707
Review URL: https://chromiumcodereview.appspot.com/11186004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/openpgp_symmetric_encryption.cc')
| -rw-r--r-- | crypto/openpgp_symmetric_encryption.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openpgp_symmetric_encryption.cc b/crypto/openpgp_symmetric_encryption.cc index 7eb6737..702952b 100644 --- a/crypto/openpgp_symmetric_encryption.cc +++ b/crypto/openpgp_symmetric_encryption.cc @@ -150,7 +150,7 @@ void SaltedIteratedS2K(unsigned cipher_key_length, // in ECB mode and with no IV. bool CreateAESContext(const uint8* key, unsigned key_len, ScopedPK11Context* out_decryption_context) { - ScopedPK11Slot slot(PK11_GetBestSlot(CKM_AES_ECB, NULL)); + ScopedPK11Slot slot(PK11_GetInternalSlot()); if (!slot.get()) return false; SECItem key_item; |