Index: net/test/cert_test_util.h |
diff --git a/net/test/cert_test_util.h b/net/test/cert_test_util.h |
index d4aa4d7d32565ead66dbd53cad74d1cfc6b7bcf4..68465bdfb39364130c693d74827bc822df426d82 100644 |
--- a/net/test/cert_test_util.h |
+++ b/net/test/cert_test_util.h |
@@ -18,16 +18,24 @@ class FilePath; |
namespace net { |
class EVRootCAMetadata; |
- |
+// Imports all of the certificates in |cert_file|, a file in |certs_dir|, |
wtc
2013/11/21 02:05:02
Add a blank line before this comment.
Eran M. (Google)
2013/11/21 20:06:02
Done.
|
+// // into a CertificateList. |
CertificateList CreateCertificateListFromFile(const base::FilePath& certs_dir, |
const std::string& cert_file, |
int format); |
-// Imports a certificate file in the directory net::GetTestCertsDirectory() |
-// returns. |
+// Imports all of the certificates in |cert_file|, a file in |certs_dir|, into |
+// a new X509Certificate. The first certificate in the chain will be used for |
+// the returned cert, with any additional certificates configured as |
+// intermediate certificates. |
+scoped_refptr<X509Certificate> CreateCertificateChainFromFile( |
+ const base::FilePath& certs_dir, |
+ const std::string& cert_file, |
+ int format); |
+ |
+// Imports a single certificate from |cert_file|. |
wtc
2013/11/21 02:05:02
Nit: it seems useful to keep the original comment
Eran M. (Google)
2013/11/21 20:06:02
Done.
|
// |certs_dir| represents the test certificates directory. |cert_file| is the |
-// name of the certificate file. If cert_file contains multiple certificates, |
-// the first certificate found will be returned. |
+// name of the certificate file. |
scoped_refptr<X509Certificate> ImportCertFromFile(const base::FilePath& certs_dir, |
const std::string& cert_file); |