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

Unified Diff: net/test/cert_test_util.h

Issue 1118263003: Revert of Don't use RSAPrivateKey in NSS integration code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ocsp-refactor
Patch Set: Created 5 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 | « net/net.gyp ('k') | net/test/cert_test_util_nss.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/test/cert_test_util.h
diff --git a/net/test/cert_test_util.h b/net/test/cert_test_util.h
index 219ccd872572dc3af65daac31edecebdd54f3f09..8ad566451dc945e45488db0a08a79fbed669c23b 100644
--- a/net/test/cert_test_util.h
+++ b/net/test/cert_test_util.h
@@ -12,6 +12,8 @@
#include "net/cert/x509_certificate.h"
#if defined(USE_NSS_CERTS)
+#include "base/memory/scoped_ptr.h"
+
// From <pk11pub.h>
typedef struct PK11SlotInfoStr PK11SlotInfo;
#endif
@@ -29,12 +31,13 @@
class EVRootCAMetadata;
#if defined(USE_NSS_CERTS)
-// Imports a private key from file |key_filename| in |dir| into |slot|. The file
-// must contain a PKCS#8 PrivateKeyInfo in DER encoding. Returns true on success
-// and false on failure.
-bool ImportSensitiveKeyFromFile(const base::FilePath& dir,
- const std::string& key_filename,
- PK11SlotInfo* slot);
+// Imports a private key from file |key_filename| in |dir|. The file must
+// contain a PKCS#8 PrivateKeyInfo in DER encoding. The key is imported to
+// |slot|.
+scoped_ptr<crypto::RSAPrivateKey> ImportSensitiveKeyFromFile(
+ const base::FilePath& dir,
+ const std::string& key_filename,
+ PK11SlotInfo* slot);
bool ImportClientCertToSlot(const scoped_refptr<X509Certificate>& cert,
PK11SlotInfo* slot);
« no previous file with comments | « net/net.gyp ('k') | net/test/cert_test_util_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698