Skip to content

Commit a22ff54

Browse files
committed
HTTP API: Remove 1024 bit certificates from bundled root certificates.
These legacy certificates have historically been retained in the certificate bundle so some ancient versions of OpenSSL continue to work with the bundle despite path discovery bugs in those versions. The affected OpenSSL versions are all over a decade old now. To ensure the ongoing security of the HTTP API these 1024 bit certificates have been removed. Props kkmuffme, JavierCasares, desrosj Fixes #64063 git-svn-id: https://develop.svn.wordpress.org/trunk@61669 602fd350-edb4-49c9-b593-d223f7449a82
1 parent a75e96c commit a22ff54

4 files changed

Lines changed: 3 additions & 3735 deletions

File tree

Gruntfile.js

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,6 @@ module.exports = function(grunt) {
283283
src: buildFiles.concat( [
284284
'!wp-includes/assets/**', // Assets is extracted into separate copy tasks.
285285
'!js/**', // JavaScript is extracted into separate copy tasks.
286-
'!wp-includes/certificates/cacert.pem*', // Exclude raw root certificate files that are combined into ca-bundle.crt.
287-
'!wp-includes/certificates/legacy-1024bit.pem',
288286
'!.{svn,git}', // Exclude version control folders.
289287
'!wp-includes/version.php', // Exclude version.php.
290288
'!{wp-admin,wp-includes,wp-content/themes/twenty*,wp-content/plugins/akismet}/**/*.map', // The build doesn't need .map files.
@@ -582,7 +580,7 @@ module.exports = function(grunt) {
582580
},
583581
certificates: {
584582
src: 'vendor/composer/ca-bundle/res/cacert.pem',
585-
dest: SOURCE_DIR + 'wp-includes/certificates/cacert.pem'
583+
dest: SOURCE_DIR + 'wp-includes/certificates/ca-bundle.crt'
586584
}
587585
},
588586
sass: {
@@ -1006,16 +1004,6 @@ module.exports = function(grunt) {
10061004
WORKING_DIR + 'wp-includes/js/wp-emoji.min.js'
10071005
],
10081006
dest: WORKING_DIR + 'wp-includes/js/wp-emoji-release.min.js'
1009-
},
1010-
certificates: {
1011-
options: {
1012-
separator: '\n\n'
1013-
},
1014-
src: [
1015-
SOURCE_DIR + 'wp-includes/certificates/legacy-1024bit.pem',
1016-
SOURCE_DIR + 'wp-includes/certificates/cacert.pem'
1017-
],
1018-
dest: SOURCE_DIR + 'wp-includes/certificates/ca-bundle.crt'
10191007
}
10201008
},
10211009
patch:{
@@ -1824,13 +1812,12 @@ module.exports = function(grunt) {
18241812
} );
18251813

18261814
grunt.registerTask( 'build:certificates', [
1827-
'concat:certificates'
1815+
'copy:certificates'
18281816
] );
18291817

18301818
grunt.registerTask( 'certificates:upgrade', [
18311819
'certificates:upgrade-package',
1832-
'copy:certificates',
1833-
'build:certificates'
1820+
'copy:certificates'
18341821
] );
18351822

18361823
grunt.registerTask( 'build:files', [

src/wp-includes/certificates/ca-bundle.crt

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,3 @@
1-
##
2-
## Bundle of CA Root Certificates
3-
##
4-
## WordPress Modification - We prepend some unexpired 'legacy' 1024bit certificates
5-
## for backward compatibility. See https://core.trac.wordpress.org/ticket/34935#comment:10
6-
##
7-
8-
9-
Verisign Class 3 Public Primary Certification Authority
10-
=======================================================
11-
-----BEGIN CERTIFICATE-----
12-
MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMx
13-
FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmltYXJ5
14-
IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVow
15-
XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAz
16-
IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
17-
A4GNADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhEBarsAx94
18-
f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/isI19wKTakyYbnsZogy1Ol
19-
hec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0GCSqGSIb3DQEBAgUAA4GBALtMEivPLCYA
20-
TxQT3ab7/AoRhIzzKBxnki98tsX63/Dolbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59Ah
21-
WM1pF+NEHJwZRDmJXNycAA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2Omuf
22-
Tqj/ZA1k
23-
-----END CERTIFICATE-----
24-
25-
Verisign Class 3 Public Primary Certification Authority - G2
26-
============================================================
27-
-----BEGIN CERTIFICATE-----
28-
MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJBgNVBAYTAlVT
29-
MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMgUHJpbWFy
30-
eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
31-
biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
32-
dCBOZXR3b3JrMB4XDTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVT
33-
MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMgUHJpbWFy
34-
eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
35-
biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
36-
dCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCO
37-
FoUgRm1HP9SFIIThbbP4pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71
38-
lSk8UOg013gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwIDAQAB
39-
MA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSkU01UbSuvDV1Ai2TT
40-
1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7iF6YM40AIOw7n60RzKprxaZLvcRTD
41-
Oaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpYoJ2daZH9
42-
-----END CERTIFICATE-----
43-
44-
Verisign Class 3 Public Primary Certification Authority
45-
=======================================================
46-
-----BEGIN CERTIFICATE-----
47-
MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCVVMx
48-
FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmltYXJ5
49-
IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVow
50-
XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAz
51-
IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
52-
A4GNADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhEBarsAx94
53-
f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/isI19wKTakyYbnsZogy1Ol
54-
hec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBABByUqkFFBky
55-
CEHwxWsKzH4PIRnN5GfcX6kb5sroc50i2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWX
56-
bj9T/UWZYB2oK0z5XqcJ2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/
57-
D/xwzoiQ
58-
-----END CERTIFICATE-----
59-
60-
611
##
622
## Bundle of CA Root Certificates
633
##

0 commit comments

Comments
 (0)