summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-29 02:17:25 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-29 02:17:25 +0000
commite8fe9e6321bc009931c4409f7b3a2244cd3d166f (patch)
treefe5c1c07f0d09e06ca2254b933d07ce28f238c65
parent431a00bfefb2a2fa958ba5337e93b8ba4087542e (diff)
downloadchromium_src-e8fe9e6321bc009931c4409f7b3a2244cd3d166f.zip
chromium_src-e8fe9e6321bc009931c4409f7b3a2244cd3d166f.tar.gz
chromium_src-e8fe9e6321bc009931c4409f7b3a2244cd3d166f.tar.bz2
mac: Components build for crypto
BUG=90078 TEST=none Review URL: http://codereview.chromium.org/7532023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94621 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--crypto/cssm_init.h11
-rw-r--r--crypto/mac_security_services_lock.h4
2 files changed, 9 insertions, 6 deletions
diff --git a/crypto/cssm_init.h b/crypto/cssm_init.h
index 9093b0f..86ea19d 100644
--- a/crypto/cssm_init.h
+++ b/crypto/cssm_init.h
@@ -9,32 +9,33 @@
#include <Security/cssm.h>
#include "base/basictypes.h"
+#include "crypto/crypto_api.h"
namespace crypto {
// Initialize CSSM if it isn't already initialized. This must be called before
// any other CSSM functions. This function is thread-safe, and CSSM will only
// ever be initialized once. CSSM will be properly shut down on program exit.
-void EnsureCSSMInit();
+CRYPTO_API void EnsureCSSMInit();
// Returns the shared CSP handle used by CSSM functions.
CSSM_CSP_HANDLE GetSharedCSPHandle();
// Returns the shared CL handle used by CSSM functions.
-CSSM_CL_HANDLE GetSharedCLHandle();
+CRYPTO_API CSSM_CL_HANDLE GetSharedCLHandle();
// Returns the shared TP handle used by CSSM functions.
-CSSM_TP_HANDLE GetSharedTPHandle();
+CRYPTO_API CSSM_TP_HANDLE GetSharedTPHandle();
// Set of pointers to memory function wrappers that are required for CSSM
extern const CSSM_API_MEMORY_FUNCS kCssmMemoryFunctions;
// Utility function to log an error message including the error name.
-void LogCSSMError(const char *function_name, CSSM_RETURN err);
+CRYPTO_API void LogCSSMError(const char *function_name, CSSM_RETURN err);
// Utility functions to allocate and release CSSM memory.
void* CSSMMalloc(CSSM_SIZE size);
-void CSSMFree(void* ptr);
+CRYPTO_API void CSSMFree(void* ptr);
// Wrapper class for CSSM_DATA type. This should only be used when using the
// CL/TP/CSP handles from above, since that's the only time we're guaranteed (or
diff --git a/crypto/mac_security_services_lock.h b/crypto/mac_security_services_lock.h
index 85db73e..c6e2ac4 100644
--- a/crypto/mac_security_services_lock.h
+++ b/crypto/mac_security_services_lock.h
@@ -6,6 +6,8 @@
#define CRYPTO_MAC_SECURITY_SERVICES_LOCK_H_
#pragma once
+#include "crypto/crypto_api.h"
+
namespace base {
class Lock;
}
@@ -18,7 +20,7 @@ namespace crypto {
// problematic.
//
// http://developer.apple.com/mac/library/documentation/Security/Reference/certifkeytrustservices/Reference/reference.html
-base::Lock& GetMacSecurityServicesLock();
+CRYPTO_API base::Lock& GetMacSecurityServicesLock();
} // namespace crypto