Implements support for PBKDF2-based key derivation, random key generation, an...

base/crypto/signature_verifier.h

Index: base/crypto/signature_verifier.h
===================================================================
--- base/crypto/signature_verifier.h	(revision 43354)
+++ base/crypto/signature_verifier.h	(working copy)
@@ -11,15 +11,16 @@
 #include <cryptoht.h>
 #elif defined(OS_MACOSX)
 #include <Security/cssm.h>
-#elif defined(OS_WIN)
-#include <windows.h>
-#include <wincrypt.h>
 #endif
 
 #include <vector>
 
 #include "base/basictypes.h"
 
+#if defined(OS_WIN)
+#include "base/crypto/scoped_capi_types.h"
+#endif
+
 namespace base {
 
 // The SignatureVerifier class verifies a signature using a bare public key
@@ -90,11 +91,11 @@
 
   CSSM_KEY public_key_;
 #elif defined(OS_WIN)
-  HCRYPTPROV provider_;
+  ScopedHCRYPTPROV provider_;
 
-  HCRYPTHASH hash_object_;
+  ScopedHCRYPTHASH hash_object_;
 
-  HCRYPTKEY public_key_;
+  ScopedHCRYPTKEY public_key_;
 #endif
 };