Implement PBKDF2-based key derivation, random key generation,...

base/crypto/signature_creator.h

Index: base/crypto/signature_creator.h
===================================================================
--- base/crypto/signature_creator.h	(revision 43766)
+++ base/crypto/signature_creator.h	(working copy)
@@ -12,9 +12,6 @@
 struct SGNContextStr;
 #elif defined(OS_MACOSX)
 #include <Security/cssm.h>
-#elif defined(OS_WIN)
-#include <windows.h>
-#include <wincrypt.h>
 #endif
 
 #include <vector>
@@ -22,6 +19,10 @@
 #include "base/basictypes.h"
 #include "base/crypto/rsa_private_key.h"
 
+#if defined(OS_WIN)
+#include "base/crypto/scoped_capi_types.h"
+#endif
+
 namespace base {
 
 // Signs data using a bare private key (as opposed to a full certificate).
@@ -51,7 +52,7 @@
 #elif defined(OS_MACOSX)
   CSSM_CC_HANDLE sig_handle_;
 #elif defined(OS_WIN)
-  HCRYPTHASH hash_object_;
+  ScopedHCRYPTHASH hash_object_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(SignatureCreator);