diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-13 07:19:00 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-13 07:19:00 +0000 |
| commit | 49631886cb557424721d2d9c1a43c90b2ab99f04 (patch) | |
| tree | 457d8704979a4491c4b3d3ec095281ea6edee06d /crypto/nss_util_internal.h | |
| parent | c493c5517381b5bf3a4563ffb63cb43c339bf98f (diff) | |
| download | chromium_src-49631886cb557424721d2d9c1a43c90b2ab99f04.zip chromium_src-49631886cb557424721d2d9c1a43c90b2ab99f04.tar.gz chromium_src-49631886cb557424721d2d9c1a43c90b2ab99f04.tar.bz2 | |
Add GetSystemNSSKeySlot, merge GetPrivateNSSKeySlot/GetPublicNSSKeySlot to GetPersistentNSSKeySlot.
GetSystemNSSKeySlot returns the ChromeOS system-wide TPM slot.
ChromeOS has separate slots for each user and linux doesn't have a public/private split, so GetPrivateNSSKeySlot no longer makes sense.
BUG=210525
TBR=stevenjb@chromium.org
Review URL: https://codereview.chromium.org/383593002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/nss_util_internal.h')
| -rw-r--r-- | crypto/nss_util_internal.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/crypto/nss_util_internal.h b/crypto/nss_util_internal.h index 8175604..e9d4870 100644 --- a/crypto/nss_util_internal.h +++ b/crypto/nss_util_internal.h @@ -21,17 +21,11 @@ class FilePath; namespace crypto { -// Returns a reference to the default NSS key slot for storing -// public-key data only (e.g. server certs). Caller must release -// returned reference with PK11_FreeSlot. -CRYPTO_EXPORT PK11SlotInfo* GetPublicNSSKeySlot() WARN_UNUSED_RESULT; - -// Returns a reference to the default slot for storing private-key and -// mixed private-key/public-key data. Returns a hardware (TPM) NSS -// key slot if on ChromeOS and EnableTPMForNSS() has been called -// successfully. Caller must release returned reference with -// PK11_FreeSlot. -CRYPTO_EXPORT PK11SlotInfo* GetPrivateNSSKeySlot() WARN_UNUSED_RESULT; +// Returns a reference to the default NSS key slot for storing persistent data. +// Caller must release returned reference with PK11_FreeSlot. +// TODO(mattm): this should be if !defined(OS_CHROMEOS), but some tests need to +// be fixed first. +CRYPTO_EXPORT PK11SlotInfo* GetPersistentNSSKeySlot() WARN_UNUSED_RESULT; // A helper class that acquires the SECMOD list read lock while the // AutoSECMODListReadLock is in scope. @@ -46,6 +40,10 @@ class CRYPTO_EXPORT AutoSECMODListReadLock { }; #if defined(OS_CHROMEOS) +// Returns a reference to the system-wide TPM slot. Caller must release +// returned reference with PK11_FreeSlot. +CRYPTO_EXPORT PK11SlotInfo* GetSystemNSSKeySlot() WARN_UNUSED_RESULT; + // Prepare per-user NSS slot mapping. It is safe to call this function multiple // times. Returns true if the user was added, or false if it already existed. CRYPTO_EXPORT bool InitializeNSSForChromeOSUser( |