summaryrefslogtreecommitdiffstats
path: root/crypto/nss_util.h
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-13 20:37:01 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-13 20:37:01 +0000
commit8c01b7f619cb7a166c2b78269aed9f2333ad89c9 (patch)
treed4c3c3833f08c73b57d3e384a1a29b985f36444a /crypto/nss_util.h
parent0f58817c50c73ac0acc9a924e4cf042c52c30335 (diff)
downloadchromium_src-8c01b7f619cb7a166c2b78269aed9f2333ad89c9.zip
chromium_src-8c01b7f619cb7a166c2b78269aed9f2333ad89c9.tar.gz
chromium_src-8c01b7f619cb7a166c2b78269aed9f2333ad89c9.tar.bz2
Export some functions to fix component build for chromeos.
BUG=none TEST=component build works for chromeos Review URL: http://codereview.chromium.org/7342033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/nss_util.h')
-rw-r--r--crypto/nss_util.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/crypto/nss_util.h b/crypto/nss_util.h
index 4513abc..d56c7b9 100644
--- a/crypto/nss_util.h
+++ b/crypto/nss_util.h
@@ -85,11 +85,11 @@ bool CheckNSSVersion(const char* version);
// Open the r/w nssdb that's stored inside the user's encrypted home
// directory. This is the default slot returned by
// GetPublicNSSKeySlot().
-void OpenPersistentNSSDB();
+CRYPTO_API void OpenPersistentNSSDB();
// A delegate class that we can use to access the cros API for
// communication with cryptohomed and the TPM.
-class TPMTokenInfoDelegate {
+class CRYPTO_API TPMTokenInfoDelegate {
public:
TPMTokenInfoDelegate();
virtual ~TPMTokenInfoDelegate();
@@ -113,25 +113,25 @@ class TPMTokenInfoDelegate {
// GetPrivateNSSKeySlot() will return the TPM slot if one was found.
// Takes ownership of the passed-in delegate object so it can access
// the cros library to talk to cryptohomed.
-void EnableTPMTokenForNSS(TPMTokenInfoDelegate* delegate);
+CRYPTO_API void EnableTPMTokenForNSS(TPMTokenInfoDelegate* delegate);
// Get name and user PIN for the built-in TPM token on ChromeOS.
// Either one can safely be NULL. Should only be called after
// EnableTPMTokenForNSS has been called with a non-null delegate.
-void GetTPMTokenInfo(std::string* token_name, std::string* user_pin);
+CRYPTO_API void GetTPMTokenInfo(std::string* token_name, std::string* user_pin);
// Returns true if the machine has a TPM and it can be used to store tokens.
-bool IsTPMTokenAvailable();
+CRYPTO_API bool IsTPMTokenAvailable();
// Returns true if the TPM is owned and PKCS#11 initialized with the
// user and security officer PINs, and has been enabled in NSS by
// calling EnableTPMForNSS, and opencryptoki has been successfully
// loaded into NSS.
-bool IsTPMTokenReady();
+CRYPTO_API bool IsTPMTokenReady();
// Same as IsTPMTokenReady() except this attempts to initialize the token
// if necessary.
-bool EnsureTPMTokenReady();
+CRYPTO_API bool EnsureTPMTokenReady();
#endif
// Convert a NSS PRTime value into a base::Time object.