Bring the handling of <keygen> and support for the application/x-x509-user-ce...

base/crypto/scoped_capi_types.h

 // 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.
 
 #ifndef BASE_CRYPTO_SCOPED_CAPI_TYPES_H_
 #define BASE_CRYPTO_SCOPED_CAPI_TYPES_H_
 
 #include <windows.h>
 #include <wincrypt.h>
 
 #include <algorithm>
 
 #include "base/logging.h"
 
 namespace base {
 
 // Simple destructor for the Free family of CryptoAPI functions, such as
-// CryptDestroyHash, which take only a single argument to release.
+// CertFreeCertificateChain, which take a single argument to release and
+// return VOID
+template <typename CAPIHandle, VOID (WINAPI *Destroyer)(CAPIHandle)>
+struct CAPIDestroyerVOID {
+  void operator()(CAPIHandle handle) const {
+    if (handle) Destroyer(handle);
+  }
+};
+
+// Simple destructor for the Free family of CryptoAPI functions, such as
+// CryptDestroyHash, which take only a single argument to release and return
+// BOOL
 template <typename CAPIHandle, BOOL (WINAPI *Destroyer)(CAPIHandle)>
-struct CAPIDestroyer {
+struct CAPIDestroyerBOOL {
   void operator()(CAPIHandle handle) const {
     if (handle) {
       BOOL ok = Destroyer(handle);
       DCHECK(ok);
     }
   }
 };
 
 // Destructor for the Close/Release family of CryptoAPI functions, which take
 // a second DWORD parameter indicating flags to use when closing or releasing.
@@ skipping 75 matching lines @@
 template<class CH, typename FP> inline
 bool operator!=(CH h, const ScopedCAPIHandle<CH, FP>& b) {
   return h != b.get();
 }
 
 typedef ScopedCAPIHandle<
     HCRYPTPROV,
     CAPIDestroyerWithFlags<HCRYPTPROV,
                            CryptReleaseContext, 0> > ScopedHCRYPTPROV;
 
-typedef ScopedCAPIHandle<
-    HCRYPTKEY, CAPIDestroyer<HCRYPTKEY, CryptDestroyKey> > ScopedHCRYPTKEY;
+typedef ScopedCAPIHandle<HCRYPTKEY,
+    CAPIDestroyerBOOL<HCRYPTKEY,
+                      CryptDestroyKey> > ScopedHCRYPTKEY;
 
-typedef ScopedCAPIHandle<
-    HCRYPTHASH, CAPIDestroyer<HCRYPTHASH, CryptDestroyHash> > ScopedHCRYPTHASH;
+typedef ScopedCAPIHandle<HCRYPTHASH,
+    CAPIDestroyerBOOL<HCRYPTHASH,
+                      CryptDestroyHash> > ScopedHCRYPTHASH;
 
 }  // namespace base
 
 #endif  // BASE_CRYPTO_SCOPED_CAPI_TYPES_H_