summaryrefslogtreecommitdiffstats
path: root/net/http/des.cc
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-17 03:18:58 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-17 03:18:58 +0000
commit4ad67c653f9f16125f0fcac759eba48d7bc9bee4 (patch)
treec321a4044552923c758687e11cd2368297dd617c /net/http/des.cc
parent54db05eab3af2554886bd2fab8783f7909dca6fe (diff)
downloadchromium_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 'net/http/des.cc')
-rw-r--r--net/http/des.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/http/des.cc b/net/http/des.cc
index e9d6388..79240cf 100644
--- a/net/http/des.cc
+++ b/net/http/des.cc
@@ -114,7 +114,7 @@ void DESEncrypt(const uint8* key, const uint8* src, uint8* hash) {
crypto::EnsureNSSInit();
- slot = PK11_GetBestSlot(cipher_mech, NULL);
+ slot = PK11_GetInternalSlot();
if (!slot)
goto done;