Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2825)

Unified Diff: base/crypto/rsa_private_key.h

Issue 1528021: Implement PBKDF2-based key derivation, random key generation,... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Make albertb's suggested changes. Created 10 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/crypto/encryptor_win.cc ('k') | base/crypto/rsa_private_key_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/crypto/rsa_private_key.h
===================================================================
--- base/crypto/rsa_private_key.h (revision 43766)
+++ base/crypto/rsa_private_key.h (working copy)
@@ -13,9 +13,6 @@
struct SECKEYPublicKeyStr;
#elif defined(OS_MACOSX)
#include <Security/cssm.h>
-#elif defined(OS_WIN)
-#include <windows.h>
-#include <wincrypt.h>
#endif
#include <list>
@@ -23,6 +20,10 @@
#include "base/basictypes.h"
+#if defined(OS_WIN)
+#include "base/crypto/scoped_capi_types.h"
+#endif
+
namespace base {
// Used internally by RSAPrivateKey for serializing and deserializing
@@ -194,8 +195,8 @@
#elif defined(OS_WIN)
bool InitProvider();
- HCRYPTPROV provider_;
- HCRYPTKEY key_;
+ ScopedHCRYPTPROV provider_;
+ ScopedHCRYPTKEY key_;
#elif defined(OS_MACOSX)
CSSM_KEY key_;
#endif
« no previous file with comments | « base/crypto/encryptor_win.cc ('k') | base/crypto/rsa_private_key_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698