Bug 1453659 [wpt PR 10445] - Rename cakey.pem to cacert.key for consistency, a=testonly
authorAnne van Kesteren <annevk@annevk.nl>
Sun, 22 Apr 2018 08:47:24 +0000
changeset 468857 00f84caf5d676ce751f6d487af3071da63eb2ae2
parent 468856 df9522c98264729141eaac762c2fc5b817ae6cea
child 468858 1d91623e5e21bbb149974624d63cbc38c3d499c3
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1453659, 10445
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1453659 [wpt PR 10445] - Rename cakey.pem to cacert.key for consistency, a=testonly Automatic update from web-platform-testsRename cakey.pem to cacert.key for consistency And add a README with some basic instructions for newcomers. -- wpt-commits: a5bb6d23ac757fcb5e8aef6fd7ed7587324982db wpt-pr: 10445
testing/web-platform/tests/tools/certs/README.md
testing/web-platform/tests/tools/certs/cacert.key
testing/web-platform/tests/tools/certs/cakey.pem
testing/web-platform/tests/tools/sslutils/openssl.py
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/tools/certs/README.md
@@ -0,0 +1,2 @@
+To enable https://web-platform.test:8443/, add cacert.pem to your browser as Certificate Authority.
+E.g., for Firefox, go to about:preferences and search for "certificates".
rename from testing/web-platform/tests/tools/certs/cakey.pem
rename to testing/web-platform/tests/tools/certs/cacert.key
--- a/testing/web-platform/tests/tools/sslutils/openssl.py
+++ b/testing/web-platform/tests/tools/sslutils/openssl.py
@@ -131,17 +131,17 @@ def get_config(root_dir, hosts, duration
 default_ca = CA_default
 
 [ CA_default ]
 dir = %(root_dir)s
 certs = $dir
 new_certs_dir = $certs
 crl_dir = $dir%(sep)scrl
 database = $dir%(sep)sindex.txt
-private_key = $dir%(sep)scakey.pem
+private_key = $dir%(sep)scacert.key
 certificate = $dir%(sep)scacert.pem
 serial = $dir%(sep)sserial
 crldir = $dir%(sep)scrl
 crlnumber = $dir%(sep)scrlnumber
 crl = $crldir%(sep)scrl.pem
 RANDFILE = $dir%(sep)sprivate%(sep)s.rand
 x509_extensions = usr_cert
 name_opt        = ca_default
@@ -289,17 +289,17 @@ class OpenSSLEnvironment(object):
         new one if needed"""
         if self._ca_cert_path is None and not self.force_regenerate:
             self._load_ca_cert()
         if self._ca_cert_path is None:
             self._generate_ca()
         return self._ca_cert_path
 
     def _load_ca_cert(self):
-        key_path = self.path("cakey.pem")
+        key_path = self.path("cacert.key")
         cert_path = self.path("cacert.pem")
 
         if self.check_key_cert(key_path, cert_path, None):
             self.logger.info("Using existing CA cert")
             self._ca_key_path, self._ca_cert_path = key_path, cert_path
 
     def check_key_cert(self, key_path, cert_path, hosts):
         """Check that a key and cert file exist and are valid"""
@@ -322,17 +322,17 @@ class OpenSSLEnvironment(object):
 
         #TODO: check the key actually signed the cert.
         return True
 
     def _generate_ca(self):
         path = self.path
         self.logger.info("Generating new CA in %s" % self.base_path)
 
-        key_path = path("cakey.pem")
+        key_path = path("cacert.key")
         req_path = path("careq.pem")
         cert_path = path("cacert.pem")
 
         with self._config_openssl(None) as openssl:
             openssl("req",
                     "-batch",
                     "-new",
                     "-newkey", "rsa:2048",