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

Unified Diff: crypto/signature_creator.h

Issue 17265013: Remove platform-specific implementations of RSAPrivateKey and SignatureCreator (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix colliding serial numbers Created 7 years, 6 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 | « crypto/rsa_private_key_win.cc ('k') | crypto/signature_creator_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: crypto/signature_creator.h
diff --git a/crypto/signature_creator.h b/crypto/signature_creator.h
index 301ab19bc1acbead6716be33f8a6d53b15964cc6..1a1d6e5ce7f6331b1bfd7fde48909a3bd011fd98 100644
--- a/crypto/signature_creator.h
+++ b/crypto/signature_creator.h
@@ -7,23 +7,17 @@
#include "build/build_config.h"
-#if defined(USE_OPENSSL)
-// Forward declaration for openssl/*.h
-typedef struct env_md_ctx_st EVP_MD_CTX;
-#elif defined(USE_NSS)
-// Forward declaration.
-struct SGNContextStr;
-#elif defined(OS_MACOSX) && !defined(OS_IOS)
-#include <Security/cssm.h>
-#endif
-
#include <vector>
#include "base/basictypes.h"
#include "crypto/crypto_export.h"
-#if defined(OS_WIN)
-#include "crypto/scoped_capi_types.h"
+#if defined(USE_OPENSSL)
+// Forward declaration for openssl/*.h
+typedef struct env_md_ctx_st EVP_MD_CTX;
+#elif defined(USE_NSS) || defined(OS_WIN) || defined(OS_MACOSX)
+// Forward declaration.
+struct SGNContextStr;
#endif
namespace crypto {
@@ -54,12 +48,8 @@ class CRYPTO_EXPORT SignatureCreator {
#if defined(USE_OPENSSL)
EVP_MD_CTX* sign_context_;
-#elif defined(USE_NSS)
+#elif defined(USE_NSS) || defined(OS_WIN) || defined(OS_MACOSX)
SGNContextStr* sign_context_;
-#elif defined(OS_MACOSX) && !defined(OS_IOS)
- CSSM_CC_HANDLE sig_handle_;
-#elif defined(OS_WIN)
- ScopedHCRYPTHASH hash_object_;
#endif
DISALLOW_COPY_AND_ASSIGN(SignatureCreator);
« no previous file with comments | « crypto/rsa_private_key_win.cc ('k') | crypto/signature_creator_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698