summaryrefslogtreecommitdiffstats
path: root/crypto/nss_util_internal.h
diff options
context:
space:
mode:
authorgspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-08 19:46:42 +0000
committergspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-08 19:46:42 +0000
commitdd24ffcb6086d6ac46e46353007a80bf9f46831c (patch)
tree823464c487ef8bbbffbba3009a8ef579803a0c83 /crypto/nss_util_internal.h
parent36b70ae13ee2c7051b8ce9b531b2d72da7c1b3cb (diff)
downloadchromium_src-dd24ffcb6086d6ac46e46353007a80bf9f46831c.zip
chromium_src-dd24ffcb6086d6ac46e46353007a80bf9f46831c.tar.gz
chromium_src-dd24ffcb6086d6ac46e46353007a80bf9f46831c.tar.bz2
Search all slots when looking for a key in NSS
This should make it possible to run on a VM, and still find the private key created for the owner in the software slot. BUG=chromium-os:15817 TEST=Built an image and tried it on a VM and a device. Both showed restricted users list. Review URL: http://codereview.chromium.org/7066070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88380 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/nss_util_internal.h')
-rw-r--r--crypto/nss_util_internal.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/crypto/nss_util_internal.h b/crypto/nss_util_internal.h
index ea40fdb..e90e4c4 100644
--- a/crypto/nss_util_internal.h
+++ b/crypto/nss_util_internal.h
@@ -25,6 +25,18 @@ PK11SlotInfo* GetPublicNSSKeySlot();
// PK11_FreeSlot.
PK11SlotInfo* GetPrivateNSSKeySlot();
+// A helper class that acquires the SECMOD list read lock while the
+// AutoSECMODListReadLock is in scope.
+class AutoSECMODListReadLock {
+ public:
+ AutoSECMODListReadLock();
+ ~AutoSECMODListReadLock();
+
+ private:
+ SECMODListLock* lock_;
+ DISALLOW_COPY_AND_ASSIGN(AutoSECMODListReadLock);
+};
+
} // namespace crypto
#endif // CRYPTO_NSS_UTIL_INTERNAL_H_