Make x509_certificate_model_nss functions take CERTCertificate instead of OSCertHandle.
Renames x509_certificate_model.h to x509_certificate_model_nss.h.
Bug: 671420
Change-Id: I6b6c3bdd5e0d9b21dbf9a0bbaa56597d14d794ab
Reviewed-on: https://chromium-review.googlesource.com/612409
Commit-Queue: Matt Mueller <[email protected]>
Reviewed-by: Scott Violet <[email protected]>
Reviewed-by: David Benjamin <[email protected]>
Cr-Commit-Position: refs/heads/master@{#495484}diff --git a/net/test/cert_test_util.h b/net/test/cert_test_util.h
index 1369265..3bc2f87 100644
--- a/net/test/cert_test_util.h
+++ b/net/test/cert_test_util.h
@@ -13,6 +13,8 @@
#include "testing/gtest/include/gtest/gtest.h"
#if defined(USE_NSS_CERTS)
+#include "net/cert/scoped_nss_types.h"
+
// From <pk11pub.h>
typedef struct PK11SlotInfoStr PK11SlotInfo;
@@ -50,6 +52,15 @@
const std::string& cert_filename,
const std::string& key_filename,
PK11SlotInfo* slot);
+
+ScopedCERTCertificate ImportCERTCertificateFromFile(
+ const base::FilePath& certs_dir,
+ const std::string& cert_file);
+
+ScopedCERTCertificateList CreateCERTCertificateListFromFile(
+ const base::FilePath& certs_dir,
+ const std::string& cert_file,
+ int format);
#endif
// Imports all of the certificates in |cert_file|, a file in |certs_dir|, into a
