Title: [237727] trunk
Revision
237727
Author
ph...@webkit.org
Date
2018-11-02 03:04:22 -0700 (Fri, 02 Nov 2018)

Log Message

[Apache] Self-signed SSL certificate RSA key is considered too weak
https://bugs.webkit.org/show_bug.cgi?id=191156

Reviewed by Michael Catanzaro.

Tools:

* Scripts/webkitpy/common/system/pemfile.py:

LayoutTests:

Regenerate the self-signed SSL certificate with a 2048 bits RSA key.

* http/conf/webkit-httpd.pem:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (237726 => 237727)


--- trunk/LayoutTests/ChangeLog	2018-11-02 07:54:19 UTC (rev 237726)
+++ trunk/LayoutTests/ChangeLog	2018-11-02 10:04:22 UTC (rev 237727)
@@ -1,3 +1,14 @@
+2018-11-01  Philippe Normand  <pnorm...@igalia.com>
+
+        [Apache] Self-signed SSL certificate RSA key is considered too weak
+        https://bugs.webkit.org/show_bug.cgi?id=191156
+
+        Reviewed by Michael Catanzaro.
+
+        Regenerate the self-signed SSL certificate with a 2048 bits RSA key.
+
+        * http/conf/webkit-httpd.pem:
+
 2018-11-01  Antoine Quint  <grao...@apple.com>
 
         [Web Animations] Make document.getAnimations() return declarative animations in the correct order

Modified: trunk/LayoutTests/http/conf/webkit-httpd.pem (237726 => 237727)


--- trunk/LayoutTests/http/conf/webkit-httpd.pem	2018-11-02 07:54:19 UTC (rev 237726)
+++ trunk/LayoutTests/http/conf/webkit-httpd.pem	2018-11-02 10:04:22 UTC (rev 237727)
@@ -1,28 +1,53 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCmcXbusrr8zQr8snIb0OVQibVfgv7zPjh/5xdcrKOejJzp3epA
-AF4TITeFR9vzWIwkmkcRoY+IbQNhh7kefGUYD47bvVamJMtq5cGYVs0HngT+KTMa
-NGH/G44KkFIOaz/b5d/JNKONrlqwxqXS+m6IY4l/E1Ff25ZjND5TaEvI1wIDAQAB
-AoGBAIcDv4A9h6UOBv2ZGyspNvsv2erSblGOhXJrWO4aNNemJJspIp4sLiPCbDE3
-a1po17XRWBkbPz1hgL6axDXQnoeo++ebfrvRSed+Fys4+6SvuSrPOv6PmWTBT/Wa
-GpO+tv48JUNxC/Dy8ROixBXOViuIBEFq3NfVH4HU3+RG20NhAkEA1L3RAhdfPkLI
-82luSOYE3Eq44lICb/yZi+JEihwSeZTJKdZHwYD8KVCjOtjGrOmyEyvThrcIACQz
-JLEreVh33wJBAMhJm9pzJJNkIyBgiXA66FAwbhdDzSTPx0OBjoVWoj6u7jzGvIFT
-Cn1aiTBYzzsiMCaCx+W3e6pK/DcvHSwKrgkCQHZMcxwBmSHLC2lnmD8LQWqqVnLr
-fZV+VnfVw501DQT0uoP8NvygWBg1Uf9YKepfLXnBpidEQjup5ZKivnUEv+sCQA8N
-6VcMHI2vkyxV1T7ITrnoSf4ZrIu9yl56mHnRPzSy9VlAHt8hnMI7UeB+bGUndrMO
-VXQgzHzKUhbbxbePvfECQQDTtkOuhJyKDfHCxLDcwNpi+T6OWTEfCw/cq9ZWDbA7
-yCX81pQxfZkfMIS1YFIOGHovK0rMMTraCe+iDNYtVz/L
------END RSA PRIVATE KEY-----
+# This certificate was generated with the following command:
+# openssl req -x509 -newkey rsa:2048 -nodes -keyout webkit-httpd.pem -out cert.pem
+# Just press enter for all questions asked by the tool.
+# Then: cat cert.pem >> webkit-httpd.pem
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDAFswRGXs5cbQG
+XhWngKVy3dX4rQ2BgWR4BRYLqB5blZ6o/B5Fl1r2UxK04E+JmomS3FE12Ex4c4nP
+7pHQHLlo5g9MkPiRp1cuVeGAETVLAOYC/bsnnpfk3s9jtZw2iFGYZ2qKxJzlahGi
+pIExDsWTh8cq+S3gsc2vDxWDa7xcAgMXpbNiXDOTZMFd0GyC7xsqk4DvuirOsBzg
+yM87Vvu3axslf3Ie3GqHSjFcONOioLl7LTiquKGYuLwE/UAXsTd1fmcVdMHMinBx
+nifQDWCWjsWiElXYAuWJmaA7LH3RbVe2jFXjx6UIFSDuw/y/e/70+2e0OWshGSGL
+V+0FFMclAgMBAAECggEBAIVcTnlgs4iCRHZXQ7lzO2qwUSnBG6tZ5iLdhRy6r7jt
++6VexLWUC3cQ3d/uC8qBHBp2E3vKm+zUak2OWHWgO6l0cBK8Y5bcE078GP8M828L
+RKW2+wTauqIPfvS+1aGWqu+gfPuy3Sr5pRzCEV+53bo7fi97qDpjt2Vel5USa0eE
+ei0E+O7I3PEV4QM7YfGUa69ehjNSX1j0uXbXPpZR5h5ZKxwDcyq1vzS+p9jDgeDG
+FcytmRI0vwNJTIIxMMSoGy2IrQ2/7qliHH14bRKTmnqNjc82eszhIpBitg83vJP/
+OdTcTMi4OsFMW4fhtGs05QvMKMArIcWdISgbF+nYAAECgYEA3yTL3Y6PJehB8R49
+YXuG4C55l9Uv9O1u4IzMjv7UYQtuZfJYiuF5y89uDnKkFpFQcd0kqmLIJ7sSMHvd
+xn3fjxqPdiOvU/BvDAoIEAHBMEVSNGTQ9myz79qMtfZJYNf+EWz6NbJ06qmTHJLo
+LrDyvE/JAhg96ck1iEA+DuB/8AECgYEA3F9sFmWgYaupBkFZn/zFcOi76zV0Bwy8
+K2gIpLbv9LcE0vfKY0clwR12NKZn3sd+606GX8kn2u6M6ZbGM5kvFDE7Q+iVWucb
+m1IFWImKHjAyxoFmftcntpejNy6Yu9HTezKDYBo/04tSQXW7pJLzfB7VEERBtiMT
+KOqeW4QHFyUCgYEAxURRWceasydVjGRwXQqIHQ3Y/qpAICX63FZ8zHlppXUmnseV
+EQnt04jIQcuFVlIWrOKUdHCpg740gVovoDdM+MTBSO6ZI/qtIRaJNCVo9VSDLMBn
+n0JP/F3YAVD+Y7fu6tbNh8UA6ScKX7tbuVNC88kQ6WIm8dOoGJC6jApZ8AECgYEA
+07Gmt20wwCKS4DtuyU2crXYk7zIOH6eQK3JouzIxGDeoHrGCbhQupHCU2MbyCQRD
+W++3DdTCwIFgRBRembqRiygv8nA+6XARCQelswOM9qr+W8p6l2Y/9Bt+4seUWPib
+20EPCwasQZ8YiWF7vACefaFws4ueREU1ZpzbOrZ9yTECgYBgU0HrQ0IdH590yFNx
+fdTT0YRhXj/I0pwNjlhqrlGcaPWyBXo4tHa4KyNVAYsQ/k7v+q2vj4JDOMvjbdRb
+LgC1n/5nGROPcWzP2UdZfOZNW8ouM3dkYv8RBnqqp/1tu2IFUT1OZ2q+3geO16J+
+2IAg9na5hFPjLvd6P13IYwIx2Q==
+-----END PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-MIIB9zCCAWACCQDjWWTeC6BQvTANBgkqhkiG9w0BAQQFADBAMQswCQYDVQQGEwJB
-VTETMBEGA1UECBMKU29tZS1TdGF0ZTEcMBoGA1UEChMTV2ViS2l0IExheW91dCBU
-ZXN0czAeFw0wNzA3MTMxMjUxMzJaFw03MTA1MTMwNjIzMTZaMEAxCzAJBgNVBAYT
-AkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMRwwGgYDVQQKExNXZWJLaXQgTGF5b3V0
-IFRlc3RzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmcXbusrr8zQr8snIb
-0OVQibVfgv7zPjh/5xdcrKOejJzp3epAAF4TITeFR9vzWIwkmkcRoY+IbQNhh7ke
-fGUYD47bvVamJMtq5cGYVs0HngT+KTMaNGH/G44KkFIOaz/b5d/JNKONrlqwxqXS
-+m6IY4l/E1Ff25ZjND5TaEvI1wIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAAfbUbgD
-01O8DoZA02c1MUMbMHRPSb/qdok2pyWoCPa/BSaOIaNPePc8auPRbrS2XsVWSMft
-CTXiXmrK2Xx1+fJuZLAp0CUng4De4cDH5c8nvlocYmXo+1x53S9DfD0KPryjBRI7
-9LnJq2ysHAUawiqFXlwBag6mXawD8YjzcYat
+MIIDYTCCAkmgAwIBAgIUDwYaHSl8CfvfUBCL+sKLp+JaKwkwDQYJKoZIhvcNAQEL
+BQAwQDELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxHDAaBgNVBAoM
+E1dlYktpdCBMYXlvdXQgVGVzdHMwHhcNMTgxMTAxMTY0NTI5WhcNMTgxMjAxMTY0
+NTI5WjBAMQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEcMBoGA1UE
+CgwTV2ViS2l0IExheW91dCBUZXN0czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMAWzBEZezlxtAZeFaeApXLd1fitDYGBZHgFFguoHluVnqj8HkWXWvZT
+ErTgT4maiZLcUTXYTHhzic/ukdAcuWjmD0yQ+JGnVy5V4YARNUsA5gL9uyeel+Te
+z2O1nDaIUZhnaorEnOVqEaKkgTEOxZOHxyr5LeCxza8PFYNrvFwCAxels2JcM5Nk
+wV3QbILvGyqTgO+6Ks6wHODIzztW+7drGyV/ch7caodKMVw406KguXstOKq4oZi4
+vAT9QBexN3V+ZxV0wcyKcHGeJ9ANYJaOxaISVdgC5YmZoDssfdFtV7aMVePHpQgV
+IO7D/L97/vT7Z7Q5ayEZIYtX7QUUxyUCAwEAAaNTMFEwHQYDVR0OBBYEFE732I6m
+H3yYkbUSK198Ri+BqNM6MB8GA1UdIwQYMBaAFE732I6mH3yYkbUSK198Ri+BqNM6
+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAKaYZ9RJ6K6DmArW
+qtHl7jccwhte30Bnz/pVlBNcfmFbn9HIp191NOQUmAGtYtjTJ9AHNJosf1PDD9on
+GYaglnzf9MYySQ5vWWd567CKoGPzV92QU/suswNHJUb9WM0D5wtBoyGMCpWQvUCS
+lMqAGvkO73rMIxMX3bUEypCmz32bnXvq2LzAHKu3OchYnKspWJz9Tm3nba7LG14v
+JhXJj1LLIALuSBzQUmB6gzVcdrw2QGIoxWTYvlv6mwwTZZcHSCkPvAXmQLMnC2Wk
+DwFLjVpUjizFxeG8+rNgp7TiGcW7FGvfguNiviYjXSopKSp6UmNHuZDYVEV7FPAA
+lKSO9Y0=
 -----END CERTIFICATE-----

Modified: trunk/Tools/ChangeLog (237726 => 237727)


--- trunk/Tools/ChangeLog	2018-11-02 07:54:19 UTC (rev 237726)
+++ trunk/Tools/ChangeLog	2018-11-02 10:04:22 UTC (rev 237727)
@@ -1,3 +1,12 @@
+2018-11-01  Philippe Normand  <pnorm...@igalia.com>
+
+        [Apache] Self-signed SSL certificate RSA key is considered too weak
+        https://bugs.webkit.org/show_bug.cgi?id=191156
+
+        Reviewed by Michael Catanzaro.
+
+        * Scripts/webkitpy/common/system/pemfile.py:
+
 2018-11-02  Zan Dobersek  <zdober...@igalia.com>
 
         Unreviewed follow-up to r237678.

Modified: trunk/Tools/Scripts/webkitpy/common/system/pemfile.py (237726 => 237727)


--- trunk/Tools/Scripts/webkitpy/common/system/pemfile.py	2018-11-02 07:54:19 UTC (rev 237726)
+++ trunk/Tools/Scripts/webkitpy/common/system/pemfile.py	2018-11-02 10:04:22 UTC (rev 237727)
@@ -68,7 +68,7 @@
     @property
     def private_key(self):
         """Return private key"""
-        return self.get(RSA_PRIVATE_KEY)
+        return self.get(PRIVATE_KEY)
 
     @property
     def csr(self):
@@ -91,7 +91,7 @@
 END_MARKER = "END"
 
 CERTIFICATE_REQUEST = "CERTIFICATE REQUEST"
-RSA_PRIVATE_KEY = "RSA PRIVATE KEY"
+PRIVATE_KEY = "PRIVATE KEY"
 CERTIFICATE = "CERTIFICATE"
 
 BEGIN_PATTERN = re.compile("^{}BEGIN (.+){}$".format(MARKER, MARKER))

Modified: trunk/Tools/Scripts/webkitpy/common/system/pemfile_unittest.py (237726 => 237727)


--- trunk/Tools/Scripts/webkitpy/common/system/pemfile_unittest.py	2018-11-02 07:54:19 UTC (rev 237726)
+++ trunk/Tools/Scripts/webkitpy/common/system/pemfile_unittest.py	2018-11-02 10:04:22 UTC (rev 237727)
@@ -57,7 +57,7 @@
     def test_parse_bad_format(self):
         with self.assertRaises(BadFormatError):
             # Partial contents raises format error
-            Pem(trim("""-----BEGIN RSA PRIVATE KEY-----
+            Pem(trim("""-----BEGIN PRIVATE KEY-----
             MIICXQIBAAKBgQCmcXbusrr8zQr8snIb0OVQibVfgv7zPjh/5xdcrKOejJzp3epA
             AF4TITeFR9vzWIwkmkcRoY+IbQNhh7kefGUYD47bvVamJMtq5cGYVs0HngT+KTMa
             NGH/G44KkFIOaz/b5d/JNKONrlqwxqXS+m6IY4l/E1Ff25ZjND5TaEvI1wIDAQAB
@@ -85,7 +85,7 @@
                     -----END FOOBAR-----"""))
 
     def setUp(self):
-        self.pem_contents = trim("""-----BEGIN RSA PRIVATE KEY-----
+        self.pem_contents = trim("""-----BEGIN PRIVATE KEY-----
         MIICXQIBAAKBgQCmcXbusrr8zQr8snIb0OVQibVfgv7zPjh/5xdcrKOejJzp3epA
         AF4TITeFR9vzWIwkmkcRoY+IbQNhh7kefGUYD47bvVamJMtq5cGYVs0HngT+KTMa
         NGH/G44KkFIOaz/b5d/JNKONrlqwxqXS+m6IY4l/E1Ff25ZjND5TaEvI1wIDAQAB
@@ -99,7 +99,7 @@
         6VcMHI2vkyxV1T7ITrnoSf4ZrIu9yl56mHnRPzSy9VlAHt8hnMI7UeB+bGUndrMO
         VXQgzHzKUhbbxbePvfECQQDTtkOuhJyKDfHCxLDcwNpi+T6OWTEfCw/cq9ZWDbA7
         yCX81pQxfZkfMIS1YFIOGHovK0rMMTraCe+iDNYtVz/L
-        -----END RSA PRIVATE KEY-----
+        -----END PRIVATE KEY-----
         -----BEGIN CERTIFICATE-----
         MIIB9zCCAWACCQDjWWTeC6BQvTANBgkqhkiG9w0BAQQFADBAMQswCQYDVQQGEwJB
         VTETMBEGA1UECBMKU29tZS1TdGF0ZTEcMBoGA1UEChMTV2ViS2l0IExheW91dCBU
@@ -115,7 +115,7 @@
         -----END CERTIFICATE-----
         """) + "\n"
 
-        self.private_key = trim("""-----BEGIN RSA PRIVATE KEY-----
+        self.private_key = trim("""-----BEGIN PRIVATE KEY-----
         MIICXQIBAAKBgQCmcXbusrr8zQr8snIb0OVQibVfgv7zPjh/5xdcrKOejJzp3epA
         AF4TITeFR9vzWIwkmkcRoY+IbQNhh7kefGUYD47bvVamJMtq5cGYVs0HngT+KTMa
         NGH/G44KkFIOaz/b5d/JNKONrlqwxqXS+m6IY4l/E1Ff25ZjND5TaEvI1wIDAQAB
@@ -129,7 +129,7 @@
         6VcMHI2vkyxV1T7ITrnoSf4ZrIu9yl56mHnRPzSy9VlAHt8hnMI7UeB+bGUndrMO
         VXQgzHzKUhbbxbePvfECQQDTtkOuhJyKDfHCxLDcwNpi+T6OWTEfCw/cq9ZWDbA7
         yCX81pQxfZkfMIS1YFIOGHovK0rMMTraCe+iDNYtVz/L
-        -----END RSA PRIVATE KEY-----
+        -----END PRIVATE KEY-----
         """) + "\n"
 
         self.certificate = trim("""-----BEGIN CERTIFICATE-----
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to