diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-09 18:40:50 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-09 18:40:50 +0000 |
| commit | 692033a35dd662cd04b965cfa31581176ebdcfe6 (patch) | |
| tree | 6224a1b37f7c1a0f6296490ba5e805e815b51247 /base/crypto/signature_creator.h | |
| parent | 256865a6ab0cf3affd171b2eb275bfa7bb8c964d (diff) | |
| download | chromium_src-692033a35dd662cd04b965cfa31581176ebdcfe6.zip chromium_src-692033a35dd662cd04b965cfa31581176ebdcfe6.tar.gz chromium_src-692033a35dd662cd04b965cfa31581176ebdcfe6.tar.bz2 | |
Implement PBKDF2-based key derivation, random key generation,
and AES-CBC encryption/decryption using CryptoAPI.
Contributed by Ryan Sleevi <ryan.sleevi@gmail.com>.
Original review URL: http://codereview.chromium.org/1558018
R=wtc,albertb
BUG=none
TEST=SymmetricKeyTest.* and EncryptorTest.*
Review URL: http://codereview.chromium.org/1528021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/crypto/signature_creator.h')
| -rw-r--r-- | base/crypto/signature_creator.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/base/crypto/signature_creator.h b/base/crypto/signature_creator.h index 9f5a909..0e11ec3 100644 --- a/base/crypto/signature_creator.h +++ b/base/crypto/signature_creator.h @@ -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 @@ struct SGNContextStr; #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 @@ class SignatureCreator { #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); |