Separate GetMacSecurityServicesLock from cssm_init.h so that we can use...

base/crypto/cssm_init.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/crypto/cssm_init.h"
 
 #include <Security/SecBase.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/singleton.h"
-#include "base/synchronization/lock.h"
 #include "base/sys_string_conversions.h"
 
 // When writing crypto code for Mac OS X, you may find the following
 // documentation useful:
 // - Common Security: CDSA and CSSM, Version 2 (with corrigenda)
 //   http://www.opengroup.org/security/cdsa.htm
 // - Apple Cryptographic Service Provider Functional Specification
 // - CryptoSample: http://developer.apple.com/SampleCode/CryptoSample/
 
 namespace {
@@ skipping 124 matching lines @@
   bool csp_loaded_;  // True if gGuidAppleCSP has been loaded
   bool cl_loaded_;  // True if gGuidAppleX509CL has been loaded.
   bool tp_loaded_;  // True if gGuidAppleX509TP has been loaded.
   CSSM_CSP_HANDLE csp_handle_;
   CSSM_CL_HANDLE cl_handle_;
   CSSM_TP_HANDLE tp_handle_;
 
   friend struct DefaultSingletonTraits<CSSMInitSingleton>;
 };
 
-// This singleton is separate as it pertains to Apple's wrappers over
-// their own CSSM handles, as opposed to our own CSSM_CSP_HANDLE.
-class SecurityServicesSingleton {
- public:
-  static SecurityServicesSingleton* GetInstance() {
-    return Singleton<SecurityServicesSingleton,
-                     LeakySingletonTraits<SecurityServicesSingleton> >::get();
-  }
-
-  base::Lock& lock() { return lock_; }
-
- private:
-  friend struct DefaultSingletonTraits<SecurityServicesSingleton>;
-
-  SecurityServicesSingleton() {}
-  ~SecurityServicesSingleton() {}
-
-  base::Lock lock_;
-
-  DISALLOW_COPY_AND_ASSIGN(SecurityServicesSingleton);
-};
-
 }  // namespace
 
 namespace base {
 
 void EnsureCSSMInit() {
   CSSMInitSingleton::GetInstance();
 }
 
 CSSM_CSP_HANDLE GetSharedCSPHandle() {
   return CSSMInitSingleton::GetInstance()->csp_handle();
@@ skipping 17 matching lines @@
 
 void LogCSSMError(const char* fn_name, CSSM_RETURN err) {
   if (!err)
     return;
   base::mac::ScopedCFTypeRef<CFStringRef> cfstr(
       SecCopyErrorMessageString(err, NULL));
   LOG(ERROR) << fn_name << " returned " << err
              << " (" << SysCFStringRefToUTF8(cfstr) << ")";
 }
 
-base::Lock& GetMacSecurityServicesLock() {
-  return SecurityServicesSingleton::GetInstance()->lock();
-}
-
 ScopedCSSMData::ScopedCSSMData() {
   memset(&data_, 0, sizeof(data_));
 }
 
 ScopedCSSMData::~ScopedCSSMData() {
   if (data_.Data) {
     CSSMFree(data_.Data);
     data_.Data = NULL;
   }
 }
 
 }  // namespace base