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

Unified Diff: base/crypto/encryptor.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 | « no previous file | base/crypto/encryptor_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/crypto/encryptor.h
===================================================================
--- base/crypto/encryptor.h (revision 43766)
+++ base/crypto/encryptor.h (working copy)
@@ -7,11 +7,18 @@
#include <string>
-#include "base/crypto/symmetric_key.h"
-#include "base/scoped_ptr.h"
+#include "build/build_config.h"
+#if defined(USE_NSS)
+#include "base/crypto/scoped_nss_types.h"
+#elif defined(OS_WIN)
+#include "base/crypto/scoped_capi_types.h"
+#endif
+
namespace base {
+class SymmetricKey;
+
class Encryptor {
public:
enum Mode {
@@ -45,6 +52,9 @@
std::string* output);
std::string iv_;
+#elif defined(OS_WIN)
+ ScopedHCRYPTKEY capi_key_;
+ DWORD block_size_;
#endif
};
« no previous file with comments | « no previous file | base/crypto/encryptor_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698