Add a locked version of CryptAcquireContext

base/crypto/capi_util.cc

Index: base/crypto/capi_util.cc
diff --git a/base/crypto/capi_util.cc b/base/crypto/capi_util.cc
new file mode 100644
index 0000000000000000000000000000000000000000..550f54b34c3c7710d471bcfa69888e51a2c08f3b
--- /dev/null
+++ b/base/crypto/capi_util.cc
@@ -0,0 +1,51 @@
+// Copyright (c) 2010 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/capi_util.h"
+
+#include "base/basictypes.h"
+#include "base/lock.h"
+#include "base/singleton.h"
+
+namespace {
+
+class CAPIUtilSingleton {
+ public:
+  static CAPIUtilSingleton* GetInstance() {
+    return Singleton<CAPIUtilSingleton>::get();
+  }
+
+  // Returns a lock to guard calls to CryptAcquireContext with
+  // CRYPT_DELETEKEYSET or CRYPT_NEWKEYSET.
+  Lock& acquire_context_lock() {
+    return acquire_context_lock_;
+  }
+
+ private:
+  friend class Singleton<CAPIUtilSingleton>;
+  friend struct DefaultSingletonTraits<CAPIUtilSingleton>;
+
+  CAPIUtilSingleton() {

[wtc, 2010/06/23 16:44:15]

Nit: consider writing a method with an empty body like this:
  CAPIUtilSingleton() {}

Your style is fine, too.

+  }
+
+  Lock acquire_context_lock_;
+
+  DISALLOW_COPY_AND_ASSIGN(CAPIUtilSingleton);
+};
+
+}  // namespace
+
+namespace base {
+
+BOOL CryptAcquireContextLocked(HCRYPTPROV* prov,
+                               const TCHAR* container,
+                               const TCHAR* provider,
+                               DWORD prov_type,
+                               DWORD flags)
+{
+  AutoLock lock(CAPIUtilSingleton::GetInstance()->acquire_context_lock());
+  return CryptAcquireContext(prov, container, provider, prov_type, flags);
+}
+
+}  // namespace base