From 5f723c895b71f25de8260510d7e2867e5236ff25 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Wed, 5 Jun 2019 15:19:24 -0700 Subject: [PATCH 01/17] Revert "test: add comments to the foaf+ssl fixtures" This reverts commit 39d6da81f992240aa87e403cb541e097d26cca26. --- test/fixtures/keys/Makefile | 3 --- test/fixtures/keys/rsa_cert_foafssl_b.cnf | 4 ---- 2 files changed, 7 deletions(-) diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile index 980fe8cf4cfc17..12d6914e9a1d5e 100644 --- a/test/fixtures/keys/Makefile +++ b/test/fixtures/keys/Makefile @@ -651,9 +651,6 @@ I_AM_THE_WALRUS_sha256_signature_signedby_rsa_private_b.sha256: rsa_private_b.pe rsa_public_b.pem: rsa_private_b.pem openssl rsa -in rsa_private_b.pem -pubout -out rsa_public_b.pem -# The following 'foafssl' cert is used in test/parallel/test-https-foafssl.js. -# It requires a SAN like 'http://example.com/#me'. More info here: -# https://www.w3.org/wiki/Foaf+ssl rsa_cert_foafssl_b.crt: rsa_private_b.pem openssl req -new -x509 -config rsa_cert_foafssl_b.cnf -key rsa_private_b.pem -out rsa_cert_foafssl_b.crt diff --git a/test/fixtures/keys/rsa_cert_foafssl_b.cnf b/test/fixtures/keys/rsa_cert_foafssl_b.cnf index 5e69db885a5ab7..38d6dd36f7bf22 100644 --- a/test/fixtures/keys/rsa_cert_foafssl_b.cnf +++ b/test/fixtures/keys/rsa_cert_foafssl_b.cnf @@ -1,7 +1,3 @@ -# The following 'foafssl' cert is used in test/parallel/test-https-foafssl.js. -# It requires a SAN like 'http://example.com/#me'. More info here: -# https://www.w3.org/wiki/Foaf+ssl - [ req ] days = 99999 distinguished_name = req_distinguished_name From 5c8d544267d5235b4eb84bfb9a08b59a4b31bfb5 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Wed, 5 Jun 2019 15:19:37 -0700 Subject: [PATCH 02/17] Revert "test: change formatting of fixtures/keys/Makefile" This reverts commit 2abaa1a4438344b70d59399be0039141980a7fcc. --- test/fixtures/keys/Makefile | 48 ++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile index 12d6914e9a1d5e..347254f6d97ed4 100644 --- a/test/fixtures/keys/Makefile +++ b/test/fixtures/keys/Makefile @@ -24,12 +24,12 @@ all: \ dh512.pem \ dh1024.pem \ dh2048.pem \ - dherror.pem \ - dsa_params.pem \ - dsa_private.pem \ - dsa_private_encrypted.pem \ - dsa_private_pkcs8.pem \ - dsa_public.pem \ + dherror.pem \ + dsa_params.pem \ + dsa_private.pem \ + dsa_private_encrypted.pem \ + dsa_private_pkcs8.pem \ + dsa_public.pem \ dsa1025.pem \ dsa_private_1025.pem \ dsa_private_encrypted_1025.pem \ @@ -37,24 +37,24 @@ all: \ ec-cert.pem \ ec.pfx \ fake-cnnic-root-cert.pem \ - rsa_private.pem \ - rsa_private_encrypted.pem \ - rsa_private_pkcs8.pem \ - rsa_private_pkcs8_bad.pem \ - rsa_public.pem \ - rsa_ca.crt \ - rsa_cert.crt \ - rsa_cert.pfx \ - rsa_public_sha1_signature_signedby_rsa_private.sha1 \ - rsa_public_sha1_signature_signedby_rsa_private_pkcs8.sha1 \ - rsa_private_b.pem \ - I_AM_THE_WALRUS_sha256_signature_signedby_rsa_private_b.sha256 \ - rsa_public_b.pem \ - rsa_cert_foafssl_b.crt \ - rsa_cert_foafssl_b.modulus \ - rsa_cert_foafssl_b.exponent \ - rsa_spkac.spkac \ - rsa_spkac_invalid.spkac \ + rsa_private.pem \ + rsa_private_encrypted.pem \ + rsa_private_pkcs8.pem \ + rsa_private_pkcs8_bad.pem \ + rsa_public.pem \ + rsa_ca.crt \ + rsa_cert.crt \ + rsa_cert.pfx \ + rsa_public_sha1_signature_signedby_rsa_private.sha1 \ + rsa_public_sha1_signature_signedby_rsa_private_pkcs8.sha1 \ + rsa_private_b.pem \ + I_AM_THE_WALRUS_sha256_signature_signedby_rsa_private_b.sha256 \ + rsa_public_b.pem \ + rsa_cert_foafssl_b.crt \ + rsa_cert_foafssl_b.modulus \ + rsa_cert_foafssl_b.exponent \ + rsa_spkac.spkac \ + rsa_spkac_invalid.spkac \ rsa_private_1024.pem \ rsa_private_2048.pem \ rsa_private_4096.pem \ From 337047349fbeb76e7d505a27c291812bd8717abf Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Wed, 5 Jun 2019 15:19:42 -0700 Subject: [PATCH 03/17] Revert "test: change fixtures.readSync to fixtures.readKey" This reverts commit f212fee2a3709abb267796e8e4a3fb5d85d438b1. --- test/parallel/test-tls-getprotocol.js | 4 ++-- test/parallel/test-tls-keylog-tlsv13.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/parallel/test-tls-getprotocol.js b/test/parallel/test-tls-getprotocol.js index ec3642cbf74614..20018241e33572 100644 --- a/test/parallel/test-tls-getprotocol.js +++ b/test/parallel/test-tls-getprotocol.js @@ -18,8 +18,8 @@ const clientConfigs = [ const serverConfig = { secureProtocol: 'TLS_method', - key: fixtures.readKey('agent2-key.pem'), - cert: fixtures.readKey('agent2-cert.pem') + key: fixtures.readSync('/keys/agent2-key.pem'), + cert: fixtures.readSync('/keys/agent2-cert.pem') }; const server = tls.createServer(serverConfig, common.mustCall(function() { diff --git a/test/parallel/test-tls-keylog-tlsv13.js b/test/parallel/test-tls-keylog-tlsv13.js index 0f6556451d013e..e56d777ff038b0 100644 --- a/test/parallel/test-tls-keylog-tlsv13.js +++ b/test/parallel/test-tls-keylog-tlsv13.js @@ -9,8 +9,8 @@ const tls = require('tls'); const fixtures = require('../common/fixtures'); const server = tls.createServer({ - key: fixtures.readKey('agent2-key.pem'), - cert: fixtures.readKey('agent2-cert.pem'), + key: fixtures.readSync('/keys/agent2-key.pem'), + cert: fixtures.readSync('/keys/agent2-cert.pem'), // Amount of keylog events depends on negotiated protocol // version, so force a specific one: minVersion: 'TLSv1.3', From 743e7526c28258433d8487602fdbecebd9aaa079 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Wed, 5 Jun 2019 15:19:46 -0700 Subject: [PATCH 04/17] Revert "test: remove uneeded agent keypair in fixtures/" This reverts commit 3e5b20cc0e3ea77803cc8ca796e98af99bc7ec49. --- test/fixtures/agent.crt | 21 +++++++++++++++ test/fixtures/agent.key | 27 +++++++++++++++++++ test/parallel/test-tls-securepair-server.js | 4 +-- test/parallel/test-tls-session-cache.js | 8 +++--- test/parallel/test-tls-ticket-cluster.js | 4 +-- test/sequential/test-tls-securepair-client.js | 2 +- test/sequential/test-tls-session-timeout.js | 4 +-- 7 files changed, 59 insertions(+), 11 deletions(-) create mode 100644 test/fixtures/agent.crt create mode 100644 test/fixtures/agent.key diff --git a/test/fixtures/agent.crt b/test/fixtures/agent.crt new file mode 100644 index 00000000000000..5883cd44961e67 --- /dev/null +++ b/test/fixtures/agent.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDXTCCAkWgAwIBAgIJAMUSOvlaeyQHMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV +BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX +aWRnaXRzIFB0eSBMdGQwHhcNMTAxMTE2MDkzMjQ5WhcNMTMxMTE1MDkzMjQ5WjBF +MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50 +ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB +CgKCAQEAz+LXZOjcQCJq3+ZKUFabj71oo/ex/XsBcFqtBThjjTw9CVEVwfPQQp4X +wtPiB204vnYXwQ1/R2NdTQqCZu47l79LssL/u2a5Y9+0NEU3nQA5qdt+1FAE0c5o +exPimXOrR3GWfKz7PmZ2O0117IeCUUXPG5U8umhDe/4mDF4ZNJiKc404WthquTqg +S7rLQZHhZ6D0EnGnOkzlmxJMYPNHSOY1/6ivdNUUcC87awNEA3lgfhy25IyBK3QJ +c+aYKNTbt70Lery3bu2wWLFGtmNiGlQTS4JsxImRsECTI727ObS7/FWAQsqW+COL +0Sa5BuMFrFIpjPrEe0ih7vRRbdmXRwIDAQABo1AwTjAdBgNVHQ4EFgQUDnV4d6mD +tOnluLoCjkUHTX/n4agwHwYDVR0jBBgwFoAUDnV4d6mDtOnluLoCjkUHTX/n4agw +DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAFwV4MQfTo+qMv9JMiyno +IEiqfOz4RgtmBqRnXUffcjS2dhc7/z+FPZnM79Kej8eLHoVfxCyWRHFlzm93vEdv +wxOCrD13EDOi08OOZfxWyIlCa6Bg8cMAKqQzd2OvQOWqlRWBTThBJIhWflU33izX +Qn5GdmYqhfpc+9ZHHGhvXNydtRQkdxVK2dZNzLBvBlLlRmtoClU7xm3A+/5dddeP +AQHEPtyFlUw49VYtZ3ru6KqPms7MKvcRhYLsy9rwSfuuniMlx4d0bDR7TOkw0QQS +A0N8MGQRQpzl4mw4jLzyM5d5QtuGBh2P6hPGa0YQxtI3RPT/p6ENzzBiAKXiSfzo +xw== +-----END CERTIFICATE----- diff --git a/test/fixtures/agent.key b/test/fixtures/agent.key new file mode 100644 index 00000000000000..f31ff3d9441075 --- /dev/null +++ b/test/fixtures/agent.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEAz+LXZOjcQCJq3+ZKUFabj71oo/ex/XsBcFqtBThjjTw9CVEV +wfPQQp4XwtPiB204vnYXwQ1/R2NdTQqCZu47l79LssL/u2a5Y9+0NEU3nQA5qdt+ +1FAE0c5oexPimXOrR3GWfKz7PmZ2O0117IeCUUXPG5U8umhDe/4mDF4ZNJiKc404 +WthquTqgS7rLQZHhZ6D0EnGnOkzlmxJMYPNHSOY1/6ivdNUUcC87awNEA3lgfhy2 +5IyBK3QJc+aYKNTbt70Lery3bu2wWLFGtmNiGlQTS4JsxImRsECTI727ObS7/FWA +QsqW+COL0Sa5BuMFrFIpjPrEe0ih7vRRbdmXRwIDAQABAoIBAGe4+9VqZfJN+dsq +8Osyuz01uQ8OmC0sAWTIqUlQgENIyf9rCJsUBlYmwR5BT6Z69XP6QhHdpSK+TiAR +XUz0EqG9HYzcxHIBaACP7j6iRoQ8R4kbbiWKo0z3WqQGIOqFjvD/mKEuQdE5mEYw +eOUCG6BnX1WY2Yr8WKd2AA/tp0/Y4d8z04u9eodMpSTbHTzYMJb5SbBN1vo6FY7q +8zSuO0BMzXlAxUsCwHsk1GQHFr8Oh3zIR7bQGtMBouI+6Lhh7sjFYsfxJboqMTBV +IKaA216M6ggHG7MU1/jeKcMGDmEfqQLQoyWp29rMK6TklUgipME2L3UD7vTyAVzz +xbVOpZkCgYEA8CXW4sZBBrSSrLR5SB+Ubu9qNTggLowOsC/kVKB2WJ4+xooc5HQo +mFhq1v/WxPQoWIxdYsfg2odlL+JclK5Qcy6vXmRSdAQ5lK9gBDKxZSYc3NwAw2HA +zyHCTK+I0n8PBYQ+yGcrxu0WqTGnlLW+Otk4CejO34WlgHwbH9bbY5UCgYEA3ZvT +C4+OoMHXlmICSt29zUrYiL33IWsR3/MaONxTEDuvgkOSXXQOl/8Ebd6Nu+3WbsSN +bjiPC/JyL1YCVmijdvFpl4gjtgvfJifs4G+QHvO6YfsYoVANk4u6g6rUuBIOwNK4 +RwYxwDc0oysp+g7tPxoSgDHReEVKJNzGBe9NGGsCgYEA4O4QP4gCEA3B9BF2J5+s +n9uPVxmiyvZUK6Iv8zP4pThTBBMIzNIf09G9AHPQ7djikU2nioY8jXKTzC3xGTHM +GJZ5m6fLsu7iH+nDvSreDSeNkTBfZqGAvoGYQ8uGE+L+ZuRfCcXYsxIOT5s6o4c3 +Dle2rVFpsuKzCY00urW796ECgYBn3go75+xEwrYGQSer6WR1nTgCV29GVYXKPooy +zmmMOT1Yw80NSkEw0pFD4cTyqVYREsTrPU0mn1sPfrOXxnGfZSVFpcR/Je9QVfQ7 +eW7GYxwfom335aqHVj10SxRqteP+UoWWnHujCPz94VRKZMakBddYCIGSan+G6YdS +7sdmwwKBgBc2qj0wvGXDF2kCLwSGfWoMf8CS1+5fIiUIdT1e/+7MfDdbmLMIFVjF +QKS3zVViXCbrG5SY6wS9hxoc57f6E2A8vcaX6zy2xkZlGHQCpWRtEM5R01OWJQaH +HsHMmQZGUQVoDm1oRkDhrTFK4K3ukc3rAxzeTZ96utOQN8/KJsTv +-----END RSA PRIVATE KEY----- diff --git a/test/parallel/test-tls-securepair-server.js b/test/parallel/test-tls-securepair-server.js index 5e3cd4130cba9f..92234fb4108fc5 100644 --- a/test/parallel/test-tls-securepair-server.js +++ b/test/parallel/test-tls-securepair-server.js @@ -33,8 +33,8 @@ const net = require('net'); const spawn = require('child_process').spawn; const fixtures = require('../common/fixtures'); -const key = fixtures.readKey('rsa_private.pem'); -const cert = fixtures.readKey('rsa_cert.crt'); +const key = fixtures.readSync('agent.key').toString(); +const cert = fixtures.readSync('agent.crt').toString(); function log(a) { console.error(`***server*** ${a}`); diff --git a/test/parallel/test-tls-session-cache.js b/test/parallel/test-tls-session-cache.js index 34c4a71ab2c149..2a74be0521df21 100644 --- a/test/parallel/test-tls-session-cache.js +++ b/test/parallel/test-tls-session-cache.js @@ -41,8 +41,8 @@ doTest({ tickets: false }, function() { }); function doTest(testOptions, callback) { - const key = fixtures.readKey('rsa_private.pem'); - const cert = fixtures.readKey('rsa_cert.crt'); + const key = fixtures.readSync('agent.key'); + const cert = fixtures.readSync('agent.crt'); const options = { key, cert, @@ -101,8 +101,8 @@ function doTest(testOptions, callback) { '-tls1', '-connect', `localhost:${this.address().port}`, '-servername', 'ohgod', - '-key', fixtures.path('keys/rsa_private.pem'), - '-cert', fixtures.path('keys/rsa_cert.crt'), + '-key', fixtures.path('agent.key'), + '-cert', fixtures.path('agent.crt'), '-reconnect' ].concat(testOptions.tickets ? [] : '-no_ticket'); diff --git a/test/parallel/test-tls-ticket-cluster.js b/test/parallel/test-tls-ticket-cluster.js index cc4f46e1430aea..234c1bad09c9a7 100644 --- a/test/parallel/test-tls-ticket-cluster.js +++ b/test/parallel/test-tls-ticket-cluster.js @@ -94,8 +94,8 @@ if (cluster.isMaster) { return; } -const key = fixtures.readKey('rsa_private.pem'); -const cert = fixtures.readKey('rsa_cert.crt'); +const key = fixtures.readSync('agent.key'); +const cert = fixtures.readSync('agent.crt'); const options = { key, cert }; diff --git a/test/sequential/test-tls-securepair-client.js b/test/sequential/test-tls-securepair-client.js index c450410baf907c..eec65af8a101ed 100644 --- a/test/sequential/test-tls-securepair-client.js +++ b/test/sequential/test-tls-securepair-client.js @@ -42,7 +42,7 @@ test1(); // simple/test-tls-securepair-client function test1() { - test('keys/rsa_private.pem', 'keys/rsa_cert.crt', null, test2); + test('agent.key', 'agent.crt', null, test2); } // simple/test-tls-ext-key-usage diff --git a/test/sequential/test-tls-session-timeout.js b/test/sequential/test-tls-session-timeout.js index 86a29eed46fe73..4e430b7135df30 100644 --- a/test/sequential/test-tls-session-timeout.js +++ b/test/sequential/test-tls-session-timeout.js @@ -51,8 +51,8 @@ function doTest() { const SESSION_TIMEOUT = 1; - const key = fixtures.readKey('rsa_private.pem'); - const cert = fixtures.readKey('rsa_cert.crt'); + const key = fixtures.readSync('agent.key'); + const cert = fixtures.readSync('agent.crt'); const options = { key: key, cert: cert, From 81e51079b73d19e5d7aa2974f54846b1eeac0fa3 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Wed, 5 Jun 2019 15:19:49 -0700 Subject: [PATCH 05/17] Revert "test: move foafssl certs to fixtures/keys/" This reverts commit 7aa79be81cb1613443cc2a8a5ada7ab688194824. --- test/fixtures/foafssl.crt | 25 +++++++++++++++ test/fixtures/foafssl.key | 32 +++++++++++++++++++ test/fixtures/keys/Makefile | 14 -------- test/fixtures/keys/rsa_cert_foafssl_b.cnf | 24 -------------- test/fixtures/keys/rsa_cert_foafssl_b.crt | 24 -------------- .../fixtures/keys/rsa_cert_foafssl_b.exponent | 1 - test/fixtures/keys/rsa_cert_foafssl_b.modulus | 1 - test/parallel/test-https-foafssl.js | 24 ++++++++------ 8 files changed, 72 insertions(+), 73 deletions(-) create mode 100644 test/fixtures/foafssl.crt create mode 100644 test/fixtures/foafssl.key delete mode 100644 test/fixtures/keys/rsa_cert_foafssl_b.cnf delete mode 100644 test/fixtures/keys/rsa_cert_foafssl_b.crt delete mode 100644 test/fixtures/keys/rsa_cert_foafssl_b.exponent delete mode 100644 test/fixtures/keys/rsa_cert_foafssl_b.modulus diff --git a/test/fixtures/foafssl.crt b/test/fixtures/foafssl.crt new file mode 100644 index 00000000000000..f4b5905e37263c --- /dev/null +++ b/test/fixtures/foafssl.crt @@ -0,0 +1,25 @@ +Bag Attributes + friendlyName: Me's Not a Certification Authority ID + localKeyID: 98 CC 02 91 83 8D 14 4A 60 40 B7 11 E8 EF A9 01 4B D7 16 8A +subject=/O=FOAF+SSL/OU=The Community Of Self Signers/UID=http://example.com/#me/CN=Me +issuer=/O=FOAF+SSL/OU=The Community of Self Signers/CN=Not a Certification Authority +-----BEGIN CERTIFICATE----- +MIIDVDCCAr2gAwIBAgIQRLIhwZ2N3ciEdpWb6kPmPzANBgkqhkiG9w0BAQUFADBj +MREwDwYDVQQKDAhGT0FGK1NTTDEmMCQGA1UECwwdVGhlIENvbW11bml0eSBvZiBT +ZWxmIFNpZ25lcnMxJjAkBgNVBAMMHU5vdCBhIENlcnRpZmljYXRpb24gQXV0aG9y +aXR5MB4XDTExMDgzMDE3MzIwNFoXDTEyMDgyMDE5MzIwNFowcDERMA8GA1UECgwI +Rk9BRitTU0wxJjAkBgNVBAsMHVRoZSBDb21tdW5pdHkgT2YgU2VsZiBTaWduZXJz +MSYwJAYKCZImiZPyLGQBAQwWaHR0cDovL2V4YW1wbGUuY29tLyNtZTELMAkGA1UE +AwwCTWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCm9EqcJXkUMSFP +XIevngQBd6i7iayAP34Ju8OlUZ80nNm5xAvkNtCqgjqUFH4myJJIraK+PdTTTowo +lkaUsgR9IXtPEpk3Hqk6g8iauUQHJBMeZfKwFh3pVgzenBNFVVKy9Jzw+wDY13Uy +MkkT9vgP8p0KEx0p2wav+L4ZG3kg3C2uHCbqgqR4R6EDke879qq7PMQP+CEAsDpP +D/GAknjk3f2n3pVO1W3HrZpH7rw313GjZvxgpby3I3O+wYBkmz76DpCScHIQtBuQ +Ayuxi8kfIEbr2vEZH0pOJtcYecTHhnti/NUI6M5m6C0SinHpFYCfz0To3ndAZ/He +XXC5wDaHAgMBAAGjeDB2MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgLsMBEG +CWCGSAGG+EIBAQQEAwIFoDAdBgNVHQ4EFgQU3gJIUFpe8rKklsjEdsxlaT6rZhow +JAYDVR0RAQH/BBowGIYWaHR0cDovL2V4YW1wbGUuY29tLyNtZTANBgkqhkiG9w0B +AQUFAAOBgQBLhwWbYMdeSkVZ4biVUle+XHP4Gv8V9WSfldvgn1PntS1lpVR46Exl +AkLO1SrnN5WHeAjv6VNb3KmTF+QhLt/4a1l9CEEeZSg5ml5aeXE+veobgypDoam+ +NKYAeIW9Wx+HcgBL4leIX3WiCKu/eal+a5ro18LQ8hkZqryHeVESIw== +-----END CERTIFICATE----- diff --git a/test/fixtures/foafssl.key b/test/fixtures/foafssl.key new file mode 100644 index 00000000000000..62e953a67f7da9 --- /dev/null +++ b/test/fixtures/foafssl.key @@ -0,0 +1,32 @@ +Bag Attributes + friendlyName: Me's Not a Certification Authority ID + localKeyID: 98 CC 02 91 83 8D 14 4A 60 40 B7 11 E8 EF A9 01 4B D7 16 8A +Key Attributes: +-----BEGIN PRIVATE KEY----- +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCm9EqcJXkUMSFP +XIevngQBd6i7iayAP34Ju8OlUZ80nNm5xAvkNtCqgjqUFH4myJJIraK+PdTTTowo +lkaUsgR9IXtPEpk3Hqk6g8iauUQHJBMeZfKwFh3pVgzenBNFVVKy9Jzw+wDY13Uy +MkkT9vgP8p0KEx0p2wav+L4ZG3kg3C2uHCbqgqR4R6EDke879qq7PMQP+CEAsDpP +D/GAknjk3f2n3pVO1W3HrZpH7rw313GjZvxgpby3I3O+wYBkmz76DpCScHIQtBuQ +Ayuxi8kfIEbr2vEZH0pOJtcYecTHhnti/NUI6M5m6C0SinHpFYCfz0To3ndAZ/He +XXC5wDaHAgMBAAECggEAEhwrv7Zc5PDTYS1zVnx4iMQ3HGi5uouom1uvxE4PTAC7 +qWf3tkCv798Cha+XY5OcMqALKEHCxU0e7QQoEdchn4UzQAePcSg1STCkYQw5seCa +5lA+vBUaF4aLDNa3TG0N9HWOVKGVnO/6OYC05qKClBBIMqCSKEkm942u6UBOql6q +71Sj1Nd/4eP9AcvgO5cgyUszM2I25LzXIZW7JLgdqXiJRj8CuY3X5FVURvadENgk +ctw5EjdT7LNdc67Ot9Bs6qcVr2ld/U+4ZSC2+cqtPyn7mnA4hrYXlpA1Ilv3oRwZ +aUJfG5HVV4jjNVHxDqddBh3UhOxJYZ1DNEMndTBx8QKBgQDcsrLfkE6utaj8w/of +Hk/aq1JRNLgSvhoP2wVmK7USvYFj7DIvL4CqyghY5TLgNk272v8mT0Q7R6AtsOUk +Gf50uZFAtIoPvTsvBu6cbRsPTeGJ0i1+LLme/AJu3MexXLF6mlzoGmlx8V7CoFqI +9hvqBA5rZ6ecoSjmU2q2xWKXKQKBgQDBqNqicSp2jnHiTXYbG/tsnxhFwALdEjvb +EgZprmoBzo1eQFOY/DNBdDiEZBstu9mJBX3XWTU1F4c6tYRocNCMDwLBZAB6NnVM +JjoddJApa5Qg3uoXmk53saZhcVkOzh+P/Dxg9c9O3q4DDUegnkM95ZSbCPtIBq6K +bPA3OS+GLwKBgQCY0022LjGuHbFlRzg+sDjPzW71OLJ2mBln/VyhwYZj8cJVtUuT +DSvmGHzrQduXE0OE4ENq/dzbx9+NhD9IXo+ruIxy6BHqkDkZeY1l2M+yK1YQn/BM +vR/UjeIJbu0BTpS/t4C6YP+/nUrnLy9CRFpUFHb/vQl+FsNBq2XsJob88QKBgQCD +6B5bbNduf2HEsdxTZMDhYJAo2jtZFxVcBzAFBb7A0k7qNsh6OLY0zBO+4Wy9vujR +8sKfTuz157u9WmwAs27pJ0RKM3I7zCIjJxqIe5/CBruTlCJAx2LRFljsoEb31aAb +88Owi12ULAq8m2wBVCsa2uhYnUqC6cIzGTaZdsMPEwKBgQDJXI+J2d36IWzFrByH +yskssFldbLxm/7EexzAYuoSpHuQIxGJYHTHn6CZhqrX8UbxVnS909ES+17kdLZVP +egvaxn1mtfZInnH64PiQDQrsNnbP4Zg8yvLvIcEVIPqnSQ5QrhdR29tjYuDwUIKM +4BMR2yfkFp6URRX7ZD1UQsduww== +-----END PRIVATE KEY----- diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile index 347254f6d97ed4..198c8e2bd0d7fe 100644 --- a/test/fixtures/keys/Makefile +++ b/test/fixtures/keys/Makefile @@ -50,9 +50,6 @@ all: \ rsa_private_b.pem \ I_AM_THE_WALRUS_sha256_signature_signedby_rsa_private_b.sha256 \ rsa_public_b.pem \ - rsa_cert_foafssl_b.crt \ - rsa_cert_foafssl_b.modulus \ - rsa_cert_foafssl_b.exponent \ rsa_spkac.spkac \ rsa_spkac_invalid.spkac \ rsa_private_1024.pem \ @@ -651,17 +648,6 @@ I_AM_THE_WALRUS_sha256_signature_signedby_rsa_private_b.sha256: rsa_private_b.pe rsa_public_b.pem: rsa_private_b.pem openssl rsa -in rsa_private_b.pem -pubout -out rsa_public_b.pem -rsa_cert_foafssl_b.crt: rsa_private_b.pem - openssl req -new -x509 -config rsa_cert_foafssl_b.cnf -key rsa_private_b.pem -out rsa_cert_foafssl_b.crt - -# The 'modulus=' in the output must be stripped out -rsa_cert_foafssl_b.modulus: rsa_cert_foafssl_b.crt - openssl x509 -modulus -in rsa_cert_foafssl_b.crt -noout | cut -c 9- > rsa_cert_foafssl_b.modulus - -# Have to parse out the hex exponent -rsa_cert_foafssl_b.exponent: rsa_cert_foafssl_b.crt - openssl x509 -in rsa_cert_foafssl_b.crt -text | grep -o 'Exponent:.*' | sed 's/\(.*(\|).*\)//g' > rsa_cert_foafssl_b.exponent - # openssl outputs `SPKAC=[SPKAC]`. That prefix needs to be removed to work with node rsa_spkac.spkac: rsa_private.pem openssl spkac -key rsa_private.pem -challenge this-is-a-challenge | cut -c 7- > rsa_spkac.spkac diff --git a/test/fixtures/keys/rsa_cert_foafssl_b.cnf b/test/fixtures/keys/rsa_cert_foafssl_b.cnf deleted file mode 100644 index 38d6dd36f7bf22..00000000000000 --- a/test/fixtures/keys/rsa_cert_foafssl_b.cnf +++ /dev/null @@ -1,24 +0,0 @@ -[ req ] -days = 99999 -distinguished_name = req_distinguished_name -attributes = req_attributes -prompt = no -x509_extensions = v3_ca - -[ req_distinguished_name ] -C = UK -ST = "FOAF+SSL Auth Certificate" -L = Rhys Jones -O = node.js -OU = Test TLS Certificate -CN = localhost -emailAddress = alex@aub.dev - -[ req_attributes ] - -[ v3_ca ] -basicConstraints = CA:FALSE -subjectAltName = @alt_names - -[ alt_names ] -URI = http://example.com/\#me diff --git a/test/fixtures/keys/rsa_cert_foafssl_b.crt b/test/fixtures/keys/rsa_cert_foafssl_b.crt deleted file mode 100644 index fa4db56c1f2b92..00000000000000 --- a/test/fixtures/keys/rsa_cert_foafssl_b.crt +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEEDCCAvigAwIBAgIUAhzZrkGH3j4aXirSjA6n87moF9kwDQYJKoZIhvcNAQEL -BQAwgagxCzAJBgNVBAYTAlVLMSIwIAYDVQQIDBlGT0FGK1NTTCBBdXRoIENlcnRp -ZmljYXRlMRMwEQYDVQQHDApSaHlzIEpvbmVzMRAwDgYDVQQKDAdub2RlLmpzMR0w -GwYDVQQLDBRUZXN0IFRMUyBDZXJ0aWZpY2F0ZTESMBAGA1UEAwwJbG9jYWxob3N0 -MRswGQYJKoZIhvcNAQkBFgxhbGV4QGF1Yi5kZXYwHhcNMTkwNTI5MjIzMjM1WhcN -MTkwNjI4MjIzMjM1WjCBqDELMAkGA1UEBhMCVUsxIjAgBgNVBAgMGUZPQUYrU1NM -IEF1dGggQ2VydGlmaWNhdGUxEzARBgNVBAcMClJoeXMgSm9uZXMxEDAOBgNVBAoM -B25vZGUuanMxHTAbBgNVBAsMFFRlc3QgVExTIENlcnRpZmljYXRlMRIwEAYDVQQD -DAlsb2NhbGhvc3QxGzAZBgkqhkiG9w0BCQEWDGFsZXhAYXViLmRldjCCASIwDQYJ -KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMm9YK6zftvX8XnhG02khI2ukyg06U/1 -l56qxQkvoeyGHJw6AFcHLD1ORWXlD7yyjM4vTR0id+C0Arq6h4B/F/nMNGE94HWE -v+6qEIl7Psyr+teTXLbQ98ZUC3HmPjcM56D18smcDnmaslOR4qm66ruoXa+oEGKI -DDS59jcQVtqRnoHevmRjAl9/vwbTD/+rV5rbWI2PsoTdkqxs+XCoVqXB4gul/ge7 -giqCmcvrdo1MWFSlMFq9WbjPJKUp7lQnL9TqDBhIphBwO7/3mhf8vs/1XUOGPPBo -U51TeCm7YGfqPT6IY8SxVOtlXkwC4sVOZj0CkoEiAin43r9BVFLqxesCAwEAAaMw -MC4wCQYDVR0TBAIwADAhBgNVHREEGjAYhhZodHRwOi8vZXhhbXBsZS5jb20vI21l -MA0GCSqGSIb3DQEBCwUAA4IBAQBMRbs4ERIJmZz6GAaI85vbwR166S+g5rkNK8iZ -jMAeSD9O2/ZT3JhGfh+f/m7cy1+RiARVSZOgd0nN/L6U6JlPbjtK92CpIx+gDw67 -lYV3QQCGU0tNQ1EFNzj6A7Mi/zSZ5wBbTi886xYztLPSjWEHt+8pShHga/Qi3alN -3haN/UvyamKgmWna8s3zWrCEZwW7D+XQqWoA2EISlnIdX46agHgmU30+TalGDAzf -OFwGvEfkyHTrrl6TxwdLU8fWsEcBOF6Ukg7kEc1aCBgd3cD9LI8g2N8DQdkWGGEQ -innpMWv59H2v3gVMj/0/BPGthQMTHMrhKWZZ1QGjkId7tHro ------END CERTIFICATE----- diff --git a/test/fixtures/keys/rsa_cert_foafssl_b.exponent b/test/fixtures/keys/rsa_cert_foafssl_b.exponent deleted file mode 100644 index ac0ecd69753412..00000000000000 --- a/test/fixtures/keys/rsa_cert_foafssl_b.exponent +++ /dev/null @@ -1 +0,0 @@ -0x10001 diff --git a/test/fixtures/keys/rsa_cert_foafssl_b.modulus b/test/fixtures/keys/rsa_cert_foafssl_b.modulus deleted file mode 100644 index 7f7f1f02cf0285..00000000000000 --- a/test/fixtures/keys/rsa_cert_foafssl_b.modulus +++ /dev/null @@ -1 +0,0 @@ -C9BD60AEB37EDBD7F179E11B4DA4848DAE932834E94FF5979EAAC5092FA1EC861C9C3A0057072C3D4E4565E50FBCB28CCE2F4D1D2277E0B402BABA87807F17F9CC34613DE07584BFEEAA10897B3ECCABFAD7935CB6D0F7C6540B71E63E370CE7A0F5F2C99C0E799AB25391E2A9BAEABBA85DAFA81062880C34B9F6371056DA919E81DEBE6463025F7FBF06D30FFFAB579ADB588D8FB284DD92AC6CF970A856A5C1E20BA5FE07BB822A8299CBEB768D4C5854A5305ABD59B8CF24A529EE54272FD4EA0C1848A610703BBFF79A17FCBECFF55D43863CF068539D537829BB6067EA3D3E8863C4B154EB655E4C02E2C54E663D029281220229F8DEBF415452EAC5EB diff --git a/test/parallel/test-https-foafssl.js b/test/parallel/test-https-foafssl.js index 43057817043789..4e1a8fbc4c6b30 100644 --- a/test/parallel/test-https-foafssl.js +++ b/test/parallel/test-https-foafssl.js @@ -33,15 +33,21 @@ const https = require('https'); const spawn = require('child_process').spawn; const options = { - key: fixtures.readKey('rsa_private.pem'), - cert: fixtures.readKey('rsa_cert.crt'), + key: fixtures.readSync('agent.key'), + cert: fixtures.readSync('agent.crt'), requestCert: true, rejectUnauthorized: false }; -const webIdUrl = 'URI:http://example.com/#me'; -const modulus = fixtures.readKey('rsa_cert_foafssl_b.modulus', 'ascii').replace(/\n/g, ''); -const exponent = fixtures.readKey('rsa_cert_foafssl_b.exponent', 'ascii').replace(/\n/g, ''); +const modulus = 'A6F44A9C25791431214F5C87AF9E040177A8BB89AC803F7E09BBC3A5519F' + + '349CD9B9C40BE436D0AA823A94147E26C89248ADA2BE3DD4D34E8C289646' + + '94B2047D217B4F1299371EA93A83C89AB9440724131E65F2B0161DE9560C' + + 'DE9C13455552B2F49CF0FB00D8D77532324913F6F80FF29D0A131D29DB06' + + 'AFF8BE191B7920DC2DAE1C26EA82A47847A10391EF3BF6AABB3CC40FF821' + + '00B03A4F0FF1809278E4DDFDA7DE954ED56DC7AD9A47EEBC37D771A366FC' + + '60A5BCB72373BEC180649B3EFA0E9092707210B41B90032BB18BC91F2046' + + 'EBDAF1191F4A4E26D71879C4C7867B62FCD508E8CE66E82D128A71E91580' + + '9FCF44E8DE774067F1DE5D70B9C03687'; const CRLF = '\r\n'; const body = 'hello world\n'; @@ -52,8 +58,8 @@ const server = https.createServer(options, common.mustCall(function(req, res) { cert = req.connection.getPeerCertificate(); - assert.strictEqual(cert.subjectaltname, webIdUrl); - assert.strictEqual(cert.exponent, exponent); + assert.strictEqual(cert.subjectaltname, 'URI:http://example.com/#me'); + assert.strictEqual(cert.exponent, '0x10001'); assert.strictEqual(cert.modulus, modulus); res.writeHead(200, { 'content-type': 'text/plain' }); res.end(body); @@ -63,8 +69,8 @@ server.listen(0, function() { const args = ['s_client', '-quiet', '-connect', `127.0.0.1:${this.address().port}`, - '-cert', fixtures.path('keys/rsa_cert_foafssl_b.crt'), - '-key', fixtures.path('keys/rsa_private_b.pem')]; + '-cert', fixtures.path('foafssl.crt'), + '-key', fixtures.path('foafssl.key')]; const client = spawn(common.opensslCli, args); From d34118aba9f40c8a7ede6d397178c30c5cf8bc72 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Wed, 5 Jun 2019 15:19:51 -0700 Subject: [PATCH 06/17] Revert "test: remove uneeded alice certs in fixtures/" This reverts commit c49e378f9e352933e301aa8b3473a9c468e39fff. --- test/fixtures/alice.crt | 24 +++++++++++++++++++ test/fixtures/multi-alice.crt | 22 +++++++++++++++++ .../test-tls-peer-certificate-multi-keys.js | 8 +++---- 3 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 test/fixtures/alice.crt create mode 100644 test/fixtures/multi-alice.crt diff --git a/test/fixtures/alice.crt b/test/fixtures/alice.crt new file mode 100644 index 00000000000000..b4e986bc7bf2b1 --- /dev/null +++ b/test/fixtures/alice.crt @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIID8DCCAtigAwIBAgIJALmw0zKhqlY1MA0GCSqGSIb3DQEBBQUAMFgxDjAMBgNV +BAMTBWFsaWNlMUYwRAYDVR0RFD11bmlmb3JtUmVzb3VyY2VJZGVudGlmaWVyOmh0 +dHA6Ly9sb2NhbGhvc3Q6ODAwMC9hbGljZS5mb2FmI21lMB4XDTExMDgyNDA1NTUx +NFoXDTExMDkyMzA1NTUxNFowWDEOMAwGA1UEAxMFYWxpY2UxRjBEBgNVHREUPXVu +aWZvcm1SZXNvdXJjZUlkZW50aWZpZXI6aHR0cDovL2xvY2FsaG9zdDo4MDAwL2Fs +aWNlLmZvYWYjbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDP4tdk +6NxAImrf5kpQVpuPvWij97H9ewFwWq0FOGONPD0JURXB89BCnhfC0+IHbTi+dhfB +DX9HY11NCoJm7juXv0uywv+7Zrlj37Q0RTedADmp237UUATRzmh7E+KZc6tHcZZ8 +rPs+ZnY7TXXsh4JRRc8blTy6aEN7/iYMXhk0mIpzjTha2Gq5OqBLustBkeFnoPQS +cac6TOWbEkxg80dI5jX/qK901RRwLztrA0QDeWB+HLbkjIErdAlz5pgo1Nu3vQt6 +vLdu7bBYsUa2Y2IaVBNLgmzEiZGwQJMjvbs5tLv8VYBCypb4I4vRJrkG4wWsUimM ++sR7SKHu9FFt2ZdHAgMBAAGjgbwwgbkwHQYDVR0OBBYEFA51eHepg7Tp5bi6Ao5F +B01/5+GoMIGJBgNVHSMEgYEwf4AUDnV4d6mDtOnluLoCjkUHTX/n4aihXKRaMFgx +DjAMBgNVBAMTBWFsaWNlMUYwRAYDVR0RFD11bmlmb3JtUmVzb3VyY2VJZGVudGlm +aWVyOmh0dHA6Ly9sb2NhbGhvc3Q6ODAwMC9hbGljZS5mb2FmI21lggkAubDTMqGq +VjUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAreudH4Y7R9Vl2GJo +2xRUEwZiMj/ogomZ7B+IZtcuMIR8X2mzQ30xmPKaCy/fjbueqBroIDdxFeQ4eWZf +MD3AK/q5lJXwSInDjnn7jE9gNgLdQeCnajV0/QH+eDxIe/Alvx+RuvrDiNOudEs4 +vhqv5zEaL6VEXoWVb4/cghDbynQucSpyOMmGGPYYw2zmg0nNXdQauYWDUZIaDwQ6 +tM/pi2ewYubHPZdwJv5jvxTN3Z7RuuGHM+aLAZSAqSgAi0ml8PYYd2eRzXMaEI0c +eajcEvVa405aYT6dxuF1qqRDYx14As/R7O5RKCpz7wsxD6ICD/Ynv3GCUGxANQim +bcCjpg== +-----END CERTIFICATE----- diff --git a/test/fixtures/multi-alice.crt b/test/fixtures/multi-alice.crt new file mode 100644 index 00000000000000..db573857ec401a --- /dev/null +++ b/test/fixtures/multi-alice.crt @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDnjCCAoYCCQCXooHS0l6bHDANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC +QVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdp +dHMgUHR5IEx0ZDEfMB0GA1UECwwWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEUMBIG +A1UECwwLRW5naW5lZXJpbmcxEjAQBgNVBAsMCU1hcmtldGluZzAeFw0xMjAzMDQx +NDA4MDVaFw0xMjA0MDMxNDA4MDVaMIGQMQswCQYDVQQGEwJBVTETMBEGA1UECAwK +U29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMR8w +HQYDVQQLDBZJbmZvcm1hdGlvbiBUZWNobm9sb2d5MRQwEgYDVQQLDAtFbmdpbmVl +cmluZzESMBAGA1UECwwJTWFya2V0aW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAz+LXZOjcQCJq3+ZKUFabj71oo/ex/XsBcFqtBThjjTw9CVEVwfPQ +Qp4XwtPiB204vnYXwQ1/R2NdTQqCZu47l79LssL/u2a5Y9+0NEU3nQA5qdt+1FAE +0c5oexPimXOrR3GWfKz7PmZ2O0117IeCUUXPG5U8umhDe/4mDF4ZNJiKc404Wthq +uTqgS7rLQZHhZ6D0EnGnOkzlmxJMYPNHSOY1/6ivdNUUcC87awNEA3lgfhy25IyB +K3QJc+aYKNTbt70Lery3bu2wWLFGtmNiGlQTS4JsxImRsECTI727ObS7/FWAQsqW ++COL0Sa5BuMFrFIpjPrEe0ih7vRRbdmXRwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB +AQC7kyzjGXy7SnT1tvefdvtdAtErDuD375/sB2l1V72+BNXlIlddmEC8IkAVSKg2 +5Y7MuQ4yMsHlhrdUxj/XOOVMHY/49xsZiN5hF2jb2mdq7KdvlVMYqyf126bW2mOx +cLVSiuucdp88zoJopWBUnNyVOYhh18St9bNosGgPzppGBCpL+MJvoSn3wrnFn8ER +wwN1m3ga590wHa4fny+qlD/hJNww16wbwgdF9NqsuR/e+sj9ZsoIYRCF8iKBajzt +3o7cZIRlvGtJfJRM87YCAn4BR3JgQPXfbhx31KwtMXtAJNzOHk26bblW3jTC8c7+ +Cu1gNEM083vUq6/UxJUM8lOM +-----END CERTIFICATE----- diff --git a/test/parallel/test-tls-peer-certificate-multi-keys.js b/test/parallel/test-tls-peer-certificate-multi-keys.js index ce4a0d406f9ea1..a2548d6bcffb9e 100644 --- a/test/parallel/test-tls-peer-certificate-multi-keys.js +++ b/test/parallel/test-tls-peer-certificate-multi-keys.js @@ -29,8 +29,8 @@ const tls = require('tls'); const fixtures = require('../common/fixtures'); const options = { - key: fixtures.readKey('rsa_private.pem'), - cert: fixtures.readKey('rsa_cert.crt') + key: fixtures.readSync('agent.key'), + cert: fixtures.readSync('multi-alice.crt') }; const server = tls.createServer(options, function(cleartext) { @@ -42,7 +42,7 @@ server.once('secureConnection', common.mustCall(function(socket) { // The server's local cert is the client's peer cert. assert.deepStrictEqual( cert.subject.OU, - ['Test TLS Certificate', 'Engineering'] + ['Information Technology', 'Engineering', 'Marketing'] ); })); @@ -54,7 +54,7 @@ server.listen(0, common.mustCall(function() { const peerCert = socket.getPeerCertificate(); assert.deepStrictEqual( peerCert.subject.OU, - ['Test TLS Certificate', 'Engineering'] + ['Information Technology', 'Engineering', 'Marketing'] ); server.close(); })); From d9a1925fe49a801c53c8d1fb67b8fbe8c66cf487 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Wed, 5 Jun 2019 15:19:57 -0700 Subject: [PATCH 07/17] Revert "test: remove uneeded certs in fixtures/" This reverts commit 6925f4185175e3b404662c1481ddac1bfcbba572. --- test/fixtures/cert.pem | 35 ++++++++++++++++++++ test/fixtures/msca.pem | 15 +++++++++ test/parallel/test-vm-syntax-error-stderr.js | 2 +- 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 test/fixtures/cert.pem create mode 100644 test/fixtures/msca.pem diff --git a/test/fixtures/cert.pem b/test/fixtures/cert.pem new file mode 100644 index 00000000000000..33854c2046b232 --- /dev/null +++ b/test/fixtures/cert.pem @@ -0,0 +1,35 @@ +-----BEGIN CERTIFICATE----- +MIIDNDCCAp2gAwIBAgIJAJvXLQpGPpm7MA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV +BAYTAkdCMRAwDgYDVQQIEwdHd3luZWRkMREwDwYDVQQHEwhXYXVuZmF3cjEUMBIG +A1UEChMLQWNrbmFjayBMdGQxEjAQBgNVBAsTCVRlc3QgQ2VydDESMBAGA1UEAxMJ +bG9jYWxob3N0MB4XDTA5MTEwMjE5MzMwNVoXDTEwMTEwMjE5MzMwNVowcDELMAkG +A1UEBhMCR0IxEDAOBgNVBAgTB0d3eW5lZGQxETAPBgNVBAcTCFdhdW5mYXdyMRQw +EgYDVQQKEwtBY2tuYWNrIEx0ZDESMBAGA1UECxMJVGVzdCBDZXJ0MRIwEAYDVQQD +Ewlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdym7nGe2yw +6LlJfJrQtC5TmKOGrSXiyolYCbGOy4xZI4KD31d3097jhlQFJyF+10gwkE62DuJe +fLvBZDUsvLe1R8bzlVhZnBVn+3QJyUIWQAL+DsRj8P3KoD7k363QN5dIaA1GOAg2 +vZcPy1HCUsvOgvDXGRUCZqNLAyt+h/cpAgMBAAGjgdUwgdIwHQYDVR0OBBYEFK4s +VBV4shKUj3UX/fvSJnFaaPBjMIGiBgNVHSMEgZowgZeAFK4sVBV4shKUj3UX/fvS +JnFaaPBjoXSkcjBwMQswCQYDVQQGEwJHQjEQMA4GA1UECBMHR3d5bmVkZDERMA8G +A1UEBxMIV2F1bmZhd3IxFDASBgNVBAoTC0Fja25hY2sgTHRkMRIwEAYDVQQLEwlU +ZXN0IENlcnQxEjAQBgNVBAMTCWxvY2FsaG9zdIIJAJvXLQpGPpm7MAwGA1UdEwQF +MAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAFxR7BA1mUlsYqPiogtxSIfLzHWh+s0bJ +SBuhNrHes4U8QxS8+x/KWjd/81gzsf9J1C2VzTlFaydAgigz3SkQYgs+TMnFkT2o +9jqoJrcdf4WpZ2DQXUALaZgwNzPumMUSx8Ac5gO+BY/RHyP6fCodYvdNwyKslnI3 +US7eCSHZsVo= +-----END CERTIFICATE----- +-----BEGIN RSA PRIVATE KEY----- +MIICXgIBAAKBgQDXcpu5xntssOi5SXya0LQuU5ijhq0l4sqJWAmxjsuMWSOCg99X +d9Pe44ZUBSchftdIMJBOtg7iXny7wWQ1LLy3tUfG85VYWZwVZ/t0CclCFkAC/g7E +Y/D9yqA+5N+t0DeXSGgNRjgINr2XD8tRwlLLzoLw1xkVAmajSwMrfof3KQIDAQAB +AoGBAIBHR/tT93ce2mJAJAXV0AJpWc+7x2pwX2FpXtQujnlxNZhnRlrBCRCD7h4m +t0bVS/86kyGaesBDvAbavfx/N5keYzzmmSp5Ht8IPqKPydGWdigk4x90yWvktai7 +dWuRKF94FXr0GUuBONb/dfHdp4KBtzN7oIF9WydYGGXA9ZmBAkEA8/k01bfwQZIu +AgcdNEM94Zcug1gSspXtUu8exNQX4+PNVbadghZb1+OnUO4d3gvWfqvAnaXD3KV6 +N4OtUhQQ0QJBAOIRbKMfaymQ9yE3CQQxYfKmEhHXWARXVwuYqIFqjmhSjSXx0l/P +7mSHz1I9uDvxkJev8sQgu1TKIyTOdqPH1tkCQQDPa6H1yYoj1Un0Q2Qa2Mg1kTjk +Re6vkjPQ/KcmJEOjZjtekgFbZfLzmwLXFXqjG2FjFFaQMSxR3QYJSJQEYjbhAkEA +sy7OZcjcXnjZeEkv61Pc57/7qIp/6Aj2JGnefZ1gvI1Z9Q5kCa88rA/9Iplq8pA4 +ZBKAoDW1ZbJGAsFmxc/6mQJAdPilhci0qFN86IGmf+ZBnwsDflIwHKDaVofti4wQ +sPWhSOb9VQjMXekI4Y2l8fqAVTS2Fn6+8jkVKxXBywSVCw== +-----END RSA PRIVATE KEY----- diff --git a/test/fixtures/msca.pem b/test/fixtures/msca.pem new file mode 100644 index 00000000000000..247368e625784f --- /dev/null +++ b/test/fixtures/msca.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYD +VQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNv +bHV0aW9ucywgSW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJv +b3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEzMjM1OTAwWjB1MQswCQYDVQQGEwJV +UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU +cnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEds +b2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrH +iM3dFw4usJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTS +r41tiGeA5u2ylc9yMcqlHHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X4 +04Wqk2kmhXBIgD8SFcd5tB8FLztimQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAG3r +GwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMWM4ETCJ57NE7fQMh017l9 +3PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OFNMQkpw0P +lZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/ +-----END CERTIFICATE----- diff --git a/test/parallel/test-vm-syntax-error-stderr.js b/test/parallel/test-vm-syntax-error-stderr.js index e8d48235cf3ede..137d5de432b398 100644 --- a/test/parallel/test-vm-syntax-error-stderr.js +++ b/test/parallel/test-vm-syntax-error-stderr.js @@ -4,7 +4,7 @@ const assert = require('assert'); const child_process = require('child_process'); const fixtures = require('../common/fixtures'); -const wrong_script = fixtures.path('keys/rsa_cert.crt'); +const wrong_script = fixtures.path('cert.pem'); const p = child_process.spawn(process.execPath, [ '-e', From cf7ae4b6ad6f6e7d2a93c056637e7071dc109f3e Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Wed, 5 Jun 2019 15:19:59 -0700 Subject: [PATCH 08/17] Revert "test: move dherror.pem to fixtures/keys/" This reverts commit b4225615ad05e8f791d69ceb67c7481b753d22cd. --- test/fixtures/{keys => }/dherror.pem | 3 +-- test/fixtures/keys/Makefile | 4 ---- test/parallel/test-tls-dhe.js | 6 ++++-- 3 files changed, 5 insertions(+), 8 deletions(-) rename test/fixtures/{keys => }/dherror.pem (51%) diff --git a/test/fixtures/keys/dherror.pem b/test/fixtures/dherror.pem similarity index 51% rename from test/fixtures/keys/dherror.pem rename to test/fixtures/dherror.pem index 4f56268d19a23e..455795fc6cffd3 100644 --- a/test/fixtures/keys/dherror.pem +++ b/test/fixtures/dherror.pem @@ -1,4 +1,3 @@ -----BEGIN DH PARAMETERS----- -AAAAAAAAAA -AAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -----END DH PARAMETERS----- diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile index 198c8e2bd0d7fe..d26872e7d55289 100644 --- a/test/fixtures/keys/Makefile +++ b/test/fixtures/keys/Makefile @@ -24,7 +24,6 @@ all: \ dh512.pem \ dh1024.pem \ dh2048.pem \ - dherror.pem \ dsa_params.pem \ dsa_private.pem \ dsa_private_encrypted.pem \ @@ -579,9 +578,6 @@ dh1024.pem: dh2048.pem: openssl dhparam -out dh2048.pem 2048 -dherror.pem: dh512.pem - sed 's/^[^-].*/AAAAAAAAAA/g' dh512.pem > dherror.pem - dsa_params.pem: openssl dsaparam -out dsa_params.pem 2048 diff --git a/test/parallel/test-tls-dhe.js b/test/parallel/test-tls-dhe.js index ef645ce1b6c624..868686335077a5 100644 --- a/test/parallel/test-tls-dhe.js +++ b/test/parallel/test-tls-dhe.js @@ -44,8 +44,10 @@ common.expectWarning('SecurityWarning', 'DH parameter is less than 2048 bits'); function loadDHParam(n) { - const keyname = `dh${n}.pem`; - return fixtures.readKey(keyname); + const params = [`dh${n}.pem`]; + if (n !== 'error') + params.unshift('keys'); + return fixtures.readSync(params); } function test(keylen, expectedCipher, cb) { From f3ff4e4676d3842b7ea8073bb268e15c555f4f9a Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Wed, 5 Jun 2019 15:20:03 -0700 Subject: [PATCH 09/17] Revert "test: remove pass-* certs" This reverts commit 6adeae686c60bbc22e678d9276471d5f8216a2c2. --- test/fixtures/pass-cert.pem | 12 ++++++++++++ test/fixtures/pass-csr.pem | 10 ++++++++++ test/fixtures/pass-key.pem | 17 +++++++++++++++++ test/fixtures/raw-key.pem | 15 +++++++++++++++ test/parallel/test-tls-passphrase.js | 26 +++++++++++++------------- 5 files changed, 67 insertions(+), 13 deletions(-) create mode 100644 test/fixtures/pass-cert.pem create mode 100644 test/fixtures/pass-csr.pem create mode 100644 test/fixtures/pass-key.pem create mode 100644 test/fixtures/raw-key.pem diff --git a/test/fixtures/pass-cert.pem b/test/fixtures/pass-cert.pem new file mode 100644 index 00000000000000..1b355a8ced4c38 --- /dev/null +++ b/test/fixtures/pass-cert.pem @@ -0,0 +1,12 @@ +-----BEGIN CERTIFICATE----- +MIIB2TCCAUICCQDQv9q5AAtoEzANBgkqhkiG9w0BAQUFADAxMQswCQYDVQQGEwJK +UDEOMAwGA1UECBMFVG9reW8xEjAQBgNVBAoUCW5vZGVqc19qcDAeFw0xMTExMjYx +NzA0MDhaFw0yMTExMjMxNzA0MDhaMDExCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVU +b2t5bzESMBAGA1UEChQJbm9kZWpzX2pwMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB +iQKBgQChmQeFwsaomtQbw9Nm55Dn6KSR9bkY8PDroQUeTNa90BlIbhGsKYm4l7bE +RaasFgOrkcQpk45fdDVYPjKxraZiGXXKjSIDYeDAIC/+CkwQKrejgCPmJs4gV4g+ +npvwi1gVr2NAg7fkJOyEW2TDp4dsAD8qtG8Aml0C1hJXwFYmBwIDAQABMA0GCSqG +SIb3DQEBBQUAA4GBAGJYkr3VgHUZSyGrdUWeGKiKS4EY3D4ki8Luv9Jf/IpxJLbZ +NGaKUbXSVYSW3US0yR1+lsNvWchmc0wLsbNEHbIiS4BQPkqX7F8FCthM1gwRLQPa +Sofz3dRNFKDmivG9mdbQDPD/duft7Kn6E3JS5myYUJ0dRKeYfOXLXCY2pZpG +-----END CERTIFICATE----- diff --git a/test/fixtures/pass-csr.pem b/test/fixtures/pass-csr.pem new file mode 100644 index 00000000000000..8436f510549832 --- /dev/null +++ b/test/fixtures/pass-csr.pem @@ -0,0 +1,10 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIBcDCB2gIBADAxMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEjAQBgNV +BAoUCW5vZGVqc19qcDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAoZkHhcLG +qJrUG8PTZueQ5+ikkfW5GPDw66EFHkzWvdAZSG4RrCmJuJe2xEWmrBYDq5HEKZOO +X3Q1WD4ysa2mYhl1yo0iA2HgwCAv/gpMECq3o4Aj5ibOIFeIPp6b8ItYFa9jQIO3 +5CTshFtkw6eHbAA/KrRvAJpdAtYSV8BWJgcCAwEAAaAAMA0GCSqGSIb3DQEBBQUA +A4GBAC9g7s3rG6G7JSTUOizY1u9Ij6QM9Y6PqQthr4OJHa+Hln5FJQahpgJmA4kC +WYoWvBMBgFPFBCYAj0yMPohrlAwlbd9MADe4gg3lxuO9UxXDzp/lOVRBAEa4n5i+ +Lw7VEiJtPha4NXgeNzxi5OyBJwxAOPFwsyCdR0SynlifTFHI +-----END CERTIFICATE REQUEST----- diff --git a/test/fixtures/pass-key.pem b/test/fixtures/pass-key.pem new file mode 100644 index 00000000000000..968d5175d31593 --- /dev/null +++ b/test/fixtures/pass-key.pem @@ -0,0 +1,17 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIICojAcBgoqhkiG9w0BDAEDMA4ECMeM7uTE/aoCAgIIAASCAoDIIO3VAz+gb7td +FSOwV/zshzjr7n54r6Jg6fFyeIRrE3tgobr0loPfZUadtd1uxGMFlf4WKqXdk9u/ +Le2BCw34rTVCIlwritFHmcQ56xDKB5WTx+yuzxr97tmnFq00kTeHUcsPOb+eYU5B +2M0xWpYeEUP4iwQafUz6A6EOjSADYYpdgHHAzIY9VwECPkCqOJJti644OMNPUw8q +nvoESqwjAO1t2lymNUFk6zHg6FewiyCfjY6ucUCadbN74vUqKAJI45u7HQL8rxSf +95ncmjpHc+t7GUrQyzD68JaIGFN1Q8d09/ve3EOfoUoDGW+rE3hJ7oISeJfY3k7I +bBw6i0MO/ZfMs9wbmbMNDKzXQMolXfenK+KdD5Scp6eCeE14KqbQXuDoy+yA9CcZ +F87v4AyiY2o+A+cS56oY2R9Gc7uX51N8ZQGCuE/IEXeZbemV81br/EytJiZsXbPj +Kks1QkcsWnfsCUEeyF6IvIRXB70A4fuJ3+V9YoPoIawY18OoRPbMBBWkfMwEJIdB +2bW3joco0unImwRT6aXFghCnHOdXyQOMNtf1aCSDd/7o+Vac50Lwtuwpp7NsnUID +V9reIaEugHuM3PHbv3ygm8o3wb2VVRHgWV/wOReEtqLPhERyM1xfVs0y6xCGiE84 +N4uEzAwSGDFgEYACoj7LrqrVVEeVbrD0Gul2/fq9HnKOk6E/tygrwusasyL5vtSX +ZH/DeKK2XKq70bSu+1eGA/A+SqySckBe4QgEO7Qyb9xWqZhbqDyLg/xCUfDscMyP +WWW6nN56LcWI7UOEfWJVLTFCBil5T4e2qA4BiJTNc8zwwOM0BIyqvnhlENGbwQBI +KuSCzKIh +-----END ENCRYPTED PRIVATE KEY----- diff --git a/test/fixtures/raw-key.pem b/test/fixtures/raw-key.pem new file mode 100644 index 00000000000000..3e27f9f8870ad0 --- /dev/null +++ b/test/fixtures/raw-key.pem @@ -0,0 +1,15 @@ +-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQChmQeFwsaomtQbw9Nm55Dn6KSR9bkY8PDroQUeTNa90BlIbhGs +KYm4l7bERaasFgOrkcQpk45fdDVYPjKxraZiGXXKjSIDYeDAIC/+CkwQKrejgCPm +Js4gV4g+npvwi1gVr2NAg7fkJOyEW2TDp4dsAD8qtG8Aml0C1hJXwFYmBwIDAQAB +AoGAVgZpAsQVjVwe3kj5GSbc9Rfbw/fTeXuKRWWKm/67soA9dVli/wt9zU62dPW/ +LIzrl0IZ8ygh+p6aZ0d1JTEUCPx7e0KocCmNg77i5AG0eK5i/KKjTWB4UGRDylfD +dnBXQc814bK+VB0mrcp46U/7tLGYkV2Kz/LiNpmxKwITS4ECQQDPoA6WIU87Eulq +OuVmJnFIQ2IR3SycVisO7TUq2MItq2U4BwsA3aQ4ehpP/uJdAfJEfwi2omRV5pGb +806pWkfPAkEAxz+igHS8tR11aLck71dD4BRBY7XZCUg6G4zmYYWsqj0yvM6c4Yn0 +HRcrZqFvV/xuMFphWEmMBhrqLvgy66yUSQJBALkei4LeRid0sDswMhMHGaAFvG4T +FtB5n8CaTPpb854GoKP42521ANP+QnGq36dvsdPStDEqz20rvA4hPLSQs08CQCV8 +eWxFikNg+XfsDQzilCiSZwMFcYHnjtckGSv75FJbFTKkhKuCMuVOOKIkeThKi8iZ +GHttyuRTKAASPjJM09ECQBrhlKJwYKuUDMp3qkLBgrXYqbFxZtkS2GeFMUfLcRlx +oMrTFEczz9lZ0huTuQYPeAAOY0Gd84mL0kQqTRTzNLs= +-----END RSA PRIVATE KEY----- diff --git a/test/parallel/test-tls-passphrase.js b/test/parallel/test-tls-passphrase.js index e6b57b243f684b..6ed19c74d22f73 100644 --- a/test/parallel/test-tls-passphrase.js +++ b/test/parallel/test-tls-passphrase.js @@ -28,9 +28,9 @@ const assert = require('assert'); const tls = require('tls'); const fixtures = require('../common/fixtures'); -const passKey = fixtures.readKey('rsa_private_encrypted.pem'); -const rawKey = fixtures.readKey('rsa_private.pem'); -const cert = fixtures.readKey('rsa_cert.crt'); +const passKey = fixtures.readSync('pass-key.pem'); +const rawKey = fixtures.readSync('raw-key.pem'); +const cert = fixtures.readSync('pass-cert.pem'); assert(Buffer.isBuffer(passKey)); assert(Buffer.isBuffer(cert)); @@ -39,7 +39,7 @@ assert.strictEqual(typeof cert.toString(), 'string'); const server = tls.Server({ key: passKey, - passphrase: 'password', + passphrase: 'passphrase', cert: cert, ca: [cert], requestCert: true, @@ -53,7 +53,7 @@ server.listen(0, common.mustCall(function() { tls.connect({ port: this.address().port, key: passKey, - passphrase: 'password', + passphrase: 'passphrase', cert: cert, rejectUnauthorized: false }, common.mustCall()); @@ -77,7 +77,7 @@ server.listen(0, common.mustCall(function() { tls.connect({ port: this.address().port, key: [passKey], - passphrase: 'password', + passphrase: 'passphrase', cert: [cert], rejectUnauthorized: false }, common.mustCall()); @@ -101,7 +101,7 @@ server.listen(0, common.mustCall(function() { tls.connect({ port: this.address().port, key: passKey.toString(), - passphrase: 'password', + passphrase: 'passphrase', cert: cert.toString(), rejectUnauthorized: false }, common.mustCall()); @@ -125,7 +125,7 @@ server.listen(0, common.mustCall(function() { tls.connect({ port: this.address().port, key: [passKey.toString()], - passphrase: 'password', + passphrase: 'passphrase', cert: [cert.toString()], rejectUnauthorized: false }, common.mustCall()); @@ -148,14 +148,14 @@ server.listen(0, common.mustCall(function() { // Object[] tls.connect({ port: this.address().port, - key: [{ pem: passKey, passphrase: 'password' }], + key: [{ pem: passKey, passphrase: 'passphrase' }], cert: cert, rejectUnauthorized: false }, common.mustCall()); tls.connect({ port: this.address().port, - key: [{ pem: passKey, passphrase: 'password' }], + key: [{ pem: passKey, passphrase: 'passphrase' }], passphrase: 'ignored', cert: cert, rejectUnauthorized: false @@ -164,14 +164,14 @@ server.listen(0, common.mustCall(function() { tls.connect({ port: this.address().port, key: [{ pem: passKey }], - passphrase: 'password', + passphrase: 'passphrase', cert: cert, rejectUnauthorized: false }, common.mustCall()); tls.connect({ port: this.address().port, - key: [{ pem: passKey.toString(), passphrase: 'password' }], + key: [{ pem: passKey.toString(), passphrase: 'passphrase' }], cert: cert, rejectUnauthorized: false }, common.mustCall()); @@ -288,7 +288,7 @@ assert.throws(function() { tls.connect({ port: server.address().port, key: [{ pem: passKey, passphrase: 'invalid' }], - passphrase: 'password', // Valid but unused + passphrase: 'passphrase', // Valid but unused cert: cert, rejectUnauthorized: false }); From 1eb400abb571da8c20e3c60c6e157faa670090b5 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Wed, 5 Jun 2019 15:20:06 -0700 Subject: [PATCH 10/17] Revert "test: move test_[key|ca|cert] to fixtures/keys/" This reverts commit 5d0869744d32fe7901daa568403396a1af12aff9. --- benchmark/tls/secure-pair.js | 10 +++++--- benchmark/tls/throughput.js | 10 +++++--- benchmark/tls/tls-connect.js | 10 +++++--- test/async-hooks/test-graph.tls-write.js | 4 +-- test/async-hooks/test-tlswrap.js | 4 +-- test/fixtures/keys/Makefile | 12 --------- test/fixtures/keys/rsa_ca.crt | 24 ------------------ test/fixtures/keys/rsa_cert.cnf | 23 ----------------- test/fixtures/keys/rsa_cert.crt | 24 ------------------ test/fixtures/keys/rsa_cert.pfx | Bin 2629 -> 0 bytes test/fixtures/test_ca.pem | 20 +++++++++++++++ test/fixtures/test_cert.pem | 20 +++++++++++++++ test/fixtures/test_cert.pfx | Bin 0 -> 1885 bytes test/fixtures/test_key.pem | 15 +++++++++++ test/parallel/test-crypto-binary-default.js | 6 ++--- test/parallel/test-crypto-rsa-dsa.js | 4 +-- test/parallel/test-crypto-sign-verify.js | 8 +++--- test/parallel/test-crypto-verify-failure.js | 2 +- test/parallel/test-crypto.js | 2 +- test/parallel/test-https-client-reject.js | 6 ++--- .../test-https-client-renegotiation-limit.js | 4 +-- test/parallel/test-https-drain.js | 4 +-- test/parallel/test-https-pfx.js | 2 +- .../test-https-unix-socket-self-signed.js | 4 +-- .../test-tls-async-cb-after-socket-end.js | 4 +-- test/parallel/test-tls-client-abort.js | 4 +-- test/parallel/test-tls-client-reject.js | 6 ++--- .../test-tls-client-renegotiation-limit.js | 4 +-- .../parallel/test-tls-connect-given-socket.js | 4 +-- test/parallel/test-tls-connect-memleak.js | 4 +-- test/parallel/test-tls-connect-no-host.js | 4 +-- .../test-tls-connect-stream-writes.js | 6 ++--- test/parallel/test-tls-destroy-stream.js | 6 ++--- test/parallel/test-tls-fast-writing.js | 6 ++--- test/parallel/test-tls-handshake-exception.js | 4 +-- .../parallel/test-tls-hello-parser-failure.js | 4 +-- test/parallel/test-tls-inception.js | 4 +-- test/parallel/test-tls-interleave.js | 6 ++--- .../test-tls-net-connect-prefer-path.js | 4 +-- test/parallel/test-tls-no-sslv3.js | 4 +-- test/parallel/test-tls-pause.js | 4 +-- test/parallel/test-tls-securepair-fiftharg.js | 4 +-- test/parallel/test-tls-zero-clear-in.js | 4 +-- test/pummel/test-https-no-reader.js | 4 +-- test/sequential/test-async-wrap-getasyncid.js | 6 ++--- test/sequential/test-tls-connect.js | 8 +++--- 46 files changed, 150 insertions(+), 172 deletions(-) delete mode 100644 test/fixtures/keys/rsa_ca.crt delete mode 100644 test/fixtures/keys/rsa_cert.cnf delete mode 100644 test/fixtures/keys/rsa_cert.crt delete mode 100644 test/fixtures/keys/rsa_cert.pfx create mode 100644 test/fixtures/test_ca.pem create mode 100644 test/fixtures/test_cert.pem create mode 100644 test/fixtures/test_cert.pfx create mode 100644 test/fixtures/test_key.pem diff --git a/benchmark/tls/secure-pair.js b/benchmark/tls/secure-pair.js index c0409febacda00..ed678b9060983e 100644 --- a/benchmark/tls/secure-pair.js +++ b/benchmark/tls/secure-pair.js @@ -6,19 +6,21 @@ const bench = common.createBenchmark(main, { size: [2, 1024, 1024 * 1024] }); -const fixtures = require('../../test/common/fixtures'); +const fs = require('fs'); const tls = require('tls'); const net = require('net'); +const path = require('path'); +const cert_dir = path.resolve(__dirname, '../../test/fixtures'); const REDIRECT_PORT = 28347; function main({ dur, size, securing }) { const chunk = Buffer.alloc(size, 'b'); const options = { - key: fixtures.readKey('rsa_private.pem'), - cert: fixtures.readKey('rsa_cert.crt'), - ca: fixtures.readKey('rsa_ca.crt'), + key: fs.readFileSync(`${cert_dir}/test_key.pem`), + cert: fs.readFileSync(`${cert_dir}/test_cert.pem`), + ca: [ fs.readFileSync(`${cert_dir}/test_ca.pem`) ], ciphers: 'AES256-GCM-SHA384', isServer: true, requestCert: true, diff --git a/benchmark/tls/throughput.js b/benchmark/tls/throughput.js index a8f2d19649d04a..cd957ff1edf495 100644 --- a/benchmark/tls/throughput.js +++ b/benchmark/tls/throughput.js @@ -6,7 +6,9 @@ const bench = common.createBenchmark(main, { size: [2, 1024, 1024 * 1024] }); -const fixtures = require('../../test/common/fixtures'); +const path = require('path'); +const fs = require('fs'); +const cert_dir = path.resolve(__dirname, '../../test/fixtures'); var options; const tls = require('tls'); @@ -30,9 +32,9 @@ function main({ dur, type, size }) { } options = { - key: fixtures.readKey('rsa_private.pem'), - cert: fixtures.readKey('rsa_cert.crt'), - ca: fixtures.readKey('rsa_ca.crt'), + key: fs.readFileSync(`${cert_dir}/test_key.pem`), + cert: fs.readFileSync(`${cert_dir}/test_cert.pem`), + ca: [ fs.readFileSync(`${cert_dir}/test_ca.pem`) ], ciphers: 'AES256-GCM-SHA384' }; diff --git a/benchmark/tls/tls-connect.js b/benchmark/tls/tls-connect.js index 4300f6841f0cd6..fa6e2cb80abf06 100644 --- a/benchmark/tls/tls-connect.js +++ b/benchmark/tls/tls-connect.js @@ -1,5 +1,6 @@ 'use strict'; -const fixtures = require('../../test/common/fixtures'); +const fs = require('fs'); +const path = require('path'); const tls = require('tls'); const common = require('../common.js'); @@ -17,10 +18,11 @@ var running = true; function main(conf) { dur = conf.dur; concurrency = conf.concurrency; + const cert_dir = path.resolve(__dirname, '../../test/fixtures'); const options = { - key: fixtures.readKey('rsa_private.pem'), - cert: fixtures.readKey('rsa_cert.crt'), - ca: fixtures.readKey('rsa_ca.crt'), + key: fs.readFileSync(`${cert_dir}/test_key.pem`), + cert: fs.readFileSync(`${cert_dir}/test_cert.pem`), + ca: [ fs.readFileSync(`${cert_dir}/test_ca.pem`) ], ciphers: 'AES256-GCM-SHA384' }; diff --git a/test/async-hooks/test-graph.tls-write.js b/test/async-hooks/test-graph.tls-write.js index f8bee6a879d0b4..5aee38e6b6841a 100644 --- a/test/async-hooks/test-graph.tls-write.js +++ b/test/async-hooks/test-graph.tls-write.js @@ -20,8 +20,8 @@ hooks.enable(); // const server = tls .createServer({ - cert: fixtures.readKey('rsa_cert.crt'), - key: fixtures.readKey('rsa_private.pem') + cert: fixtures.readSync('test_cert.pem'), + key: fixtures.readSync('test_key.pem') }) .on('listening', common.mustCall(onlistening)) .on('secureConnection', common.mustCall(onsecureConnection)) diff --git a/test/async-hooks/test-tlswrap.js b/test/async-hooks/test-tlswrap.js index 65a4087d1659c6..d6dcd204703d9d 100644 --- a/test/async-hooks/test-tlswrap.js +++ b/test/async-hooks/test-tlswrap.js @@ -24,8 +24,8 @@ tls.DEFAULT_MAX_VERSION = 'TLSv1.2'; // const server = tls .createServer({ - cert: fixtures.readKey('rsa_cert.crt'), - key: fixtures.readKey('rsa_private.pem') + cert: fixtures.readSync('test_cert.pem'), + key: fixtures.readSync('test_key.pem') }) .on('listening', common.mustCall(onlistening)) .on('secureConnection', common.mustCall(onsecureConnection)) diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile index d26872e7d55289..fd7ca677f63266 100644 --- a/test/fixtures/keys/Makefile +++ b/test/fixtures/keys/Makefile @@ -41,9 +41,6 @@ all: \ rsa_private_pkcs8.pem \ rsa_private_pkcs8_bad.pem \ rsa_public.pem \ - rsa_ca.crt \ - rsa_cert.crt \ - rsa_cert.pfx \ rsa_public_sha1_signature_signedby_rsa_private.sha1 \ rsa_public_sha1_signature_signedby_rsa_private_pkcs8.sha1 \ rsa_private_b.pem \ @@ -620,15 +617,6 @@ rsa_private_pkcs8_bad.pem: rsa_private_pkcs8.pem rsa_public.pem: rsa_private.pem openssl rsa -in rsa_private.pem -pubout -out rsa_public.pem -rsa_cert.crt: rsa_private.pem - openssl req -new -x509 -key rsa_private.pem -config rsa_cert.cnf -out rsa_cert.crt - -rsa_cert.pfx: rsa_cert.crt - openssl pkcs12 -export -passout 'pass:sample' -inkey rsa_private.pem -in rsa_cert.crt -out rsa_cert.pfx - -rsa_ca.crt: rsa_cert.crt - cp rsa_cert.crt rsa_ca.crt - rsa_public_sha1_signature_signedby_rsa_private.sha1: rsa_public.pem rsa_private.pem openssl dgst -sha1 -sign rsa_private.pem -out rsa_public_sha1_signature_signedby_rsa_private.sha1 rsa_public.pem diff --git a/test/fixtures/keys/rsa_ca.crt b/test/fixtures/keys/rsa_ca.crt deleted file mode 100644 index ef94a341846101..00000000000000 --- a/test/fixtures/keys/rsa_ca.crt +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEADCCAuigAwIBAgIUOLbA0Gyeqh/vqRSR98jmSKzv3aswDQYJKoZIhvcNAQEL -BQAwgbAxCzAJBgNVBAYTAlVLMRQwEgYDVQQIDAtBY2tuYWNrIEx0ZDETMBEGA1UE -BwwKUmh5cyBKb25lczEQMA4GA1UECgwHbm9kZS5qczEdMBsGA1UECwwUVGVzdCBU -TFMgQ2VydGlmaWNhdGUxFDASBgNVBAsMC0VuZ2luZWVyaW5nMRIwEAYDVQQDDAls -b2NhbGhvc3QxGzAZBgkqhkiG9w0BCQEWDGFsZXhAYXViLmRldjAeFw0xOTA1Mjky -MDI5NTBaFw0xOTA2MjgyMDI5NTBaMIGwMQswCQYDVQQGEwJVSzEUMBIGA1UECAwL -QWNrbmFjayBMdGQxEzARBgNVBAcMClJoeXMgSm9uZXMxEDAOBgNVBAoMB25vZGUu -anMxHTAbBgNVBAsMFFRlc3QgVExTIENlcnRpZmljYXRlMRQwEgYDVQQLDAtFbmdp -bmVlcmluZzESMBAGA1UEAwwJbG9jYWxob3N0MRswGQYJKoZIhvcNAQkBFgxhbGV4 -QGF1Yi5kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC33FiIiiex -wLe/P8DZx5HsqFlmUO7/lvJ7necJVNwqdZ3ax5jpQB0p6uxfqeOvzcN3k5V7UFb/ -Am+nkSNZMAZhsWzCU2Z4Pjh50QYz3f0Hour7/yIGStOLyYY3hgLK2K8TbhgjQPhd -kw9+QtKlpvbL8fLgONAoGrVOFnRQGcr70iFffsm79mgZhKVMgYiHPJqJgGHvCtkG -g9zMgS7p63+Q3ZWedtFS2RhMX3uCBy/mH6EOlRCNBbRmA4xxNzyf5GQaki3T+Iz9 -tOMjdPP+CwV2LqEdylmBuik8vrfTb3qIHLKKBAI8lXN26wWtA3kN4L7NP+cbKlCR -lqctvhmylLH1AgMBAAGjEDAOMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQAD -ggEBAFeDkFYcL1pcVA3q1LNWmpDi9MQAOajSyk3bNj0+ckyuOlqaXH2gVAdQh+XB -LOFDXNwAAqMe7FEoyvIaQSFcatRhQnKFxQ9i0o1T8+6Aebjj5oo8lY5CGyOacQV8 -C6LMl4gd/duIoaWkjykiGjTH8SR6VXYhPTm03wQSMMX664E/8onsw6cLuz4COB9q -dhWhkBXiVj3fF9kLOYMiBWc7Mb2Glfs3NLpu7TTltOwNNMWNfzE9XByR7Tg4WtIu -8x45ibQKqUhHCh/jpWns2g/YZXXBrcvYREgakkvJZLV2Z+xeoV5oY071554BfMms -YxLnHtl1YKNg++DSmxeUNK+NLZA= ------END CERTIFICATE----- diff --git a/test/fixtures/keys/rsa_cert.cnf b/test/fixtures/keys/rsa_cert.cnf deleted file mode 100644 index 5d30534012e40f..00000000000000 --- a/test/fixtures/keys/rsa_cert.cnf +++ /dev/null @@ -1,23 +0,0 @@ -[ req ] -days = 99999 -distinguished_name = req_distinguished_name -attributes = req_attributes -prompt = no -x509_extensions = v3_ca - -[ req_distinguished_name ] -C = UK -ST = Acknack Ltd -L = Rhys Jones -O = node.js -0.OU = Test TLS Certificate -1.OU = Engineering -CN = localhost -emailAddress = alex@aub.dev - -[ req_attributes ] - -[ v3_ca ] -basicConstraints = CA:TRUE - -[ x509_extensions ] \ No newline at end of file diff --git a/test/fixtures/keys/rsa_cert.crt b/test/fixtures/keys/rsa_cert.crt deleted file mode 100644 index ef94a341846101..00000000000000 --- a/test/fixtures/keys/rsa_cert.crt +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEADCCAuigAwIBAgIUOLbA0Gyeqh/vqRSR98jmSKzv3aswDQYJKoZIhvcNAQEL -BQAwgbAxCzAJBgNVBAYTAlVLMRQwEgYDVQQIDAtBY2tuYWNrIEx0ZDETMBEGA1UE -BwwKUmh5cyBKb25lczEQMA4GA1UECgwHbm9kZS5qczEdMBsGA1UECwwUVGVzdCBU -TFMgQ2VydGlmaWNhdGUxFDASBgNVBAsMC0VuZ2luZWVyaW5nMRIwEAYDVQQDDAls -b2NhbGhvc3QxGzAZBgkqhkiG9w0BCQEWDGFsZXhAYXViLmRldjAeFw0xOTA1Mjky -MDI5NTBaFw0xOTA2MjgyMDI5NTBaMIGwMQswCQYDVQQGEwJVSzEUMBIGA1UECAwL -QWNrbmFjayBMdGQxEzARBgNVBAcMClJoeXMgSm9uZXMxEDAOBgNVBAoMB25vZGUu -anMxHTAbBgNVBAsMFFRlc3QgVExTIENlcnRpZmljYXRlMRQwEgYDVQQLDAtFbmdp -bmVlcmluZzESMBAGA1UEAwwJbG9jYWxob3N0MRswGQYJKoZIhvcNAQkBFgxhbGV4 -QGF1Yi5kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC33FiIiiex -wLe/P8DZx5HsqFlmUO7/lvJ7necJVNwqdZ3ax5jpQB0p6uxfqeOvzcN3k5V7UFb/ -Am+nkSNZMAZhsWzCU2Z4Pjh50QYz3f0Hour7/yIGStOLyYY3hgLK2K8TbhgjQPhd -kw9+QtKlpvbL8fLgONAoGrVOFnRQGcr70iFffsm79mgZhKVMgYiHPJqJgGHvCtkG -g9zMgS7p63+Q3ZWedtFS2RhMX3uCBy/mH6EOlRCNBbRmA4xxNzyf5GQaki3T+Iz9 -tOMjdPP+CwV2LqEdylmBuik8vrfTb3qIHLKKBAI8lXN26wWtA3kN4L7NP+cbKlCR -lqctvhmylLH1AgMBAAGjEDAOMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQAD -ggEBAFeDkFYcL1pcVA3q1LNWmpDi9MQAOajSyk3bNj0+ckyuOlqaXH2gVAdQh+XB -LOFDXNwAAqMe7FEoyvIaQSFcatRhQnKFxQ9i0o1T8+6Aebjj5oo8lY5CGyOacQV8 -C6LMl4gd/duIoaWkjykiGjTH8SR6VXYhPTm03wQSMMX664E/8onsw6cLuz4COB9q -dhWhkBXiVj3fF9kLOYMiBWc7Mb2Glfs3NLpu7TTltOwNNMWNfzE9XByR7Tg4WtIu -8x45ibQKqUhHCh/jpWns2g/YZXXBrcvYREgakkvJZLV2Z+xeoV5oY071554BfMms -YxLnHtl1YKNg++DSmxeUNK+NLZA= ------END CERTIFICATE----- diff --git a/test/fixtures/keys/rsa_cert.pfx b/test/fixtures/keys/rsa_cert.pfx deleted file mode 100644 index 627f27bc7fe14d260d11d1e68d3be27369e9fa8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2629 zcmV-L3cB?$f(k(b0Ru3C3I_%WDuzgg_YDCD0ic2j_ymFp^e}=6@Gyb|rv?cshDe6@ z4FLxRpn?RLFoFb>0s#Opf&`5Q2`Yw2hW8Bt2LUh~1_~;MNQU8S zPEK;-&;-IL!+jVJ*t36KfTXxRXzyt3x}jDYiu@9E)J9LF>r^^`deMBaga6^WeqtW~ zRPB+e=0#h%jefzwZgIGI`_(Q(JaTPTyB-_+!BV`tr48R=y;8a1JV8KVz_ZE}n=Am( z$0-3@Uwl5!u&Gt(DBU>&B8$q5tw;JLyzt9K`H&R=!xrh}75Ml3^gK~@CW^DVdo~Q! z>a6-f5AznG=I6Tb=0h(oqzT}Sig@6_W~Q@UHEk@YrBp-1_ray-llfwbgz5)zydxaj z)xz9UUZ*@6bTJ#j)lb0d_r*BGT-iXLHfmp&EZx;$Q1!1d8QCm}?M z+J9|F50$}ORd>l$g#019YM$Kvuk-`hU#v^yJGuxmes(_5?ZaSUX-ujIDmn|nCIO0# zkJK4ZCvJHan#3VL3HTmAF`0@e2-AUv=6ZIzJ99BS%v7Z?#anx+*PtFR?v#NTtS@p* zrCghU0{Hcm0EwwHLd-ekG*w6tp+O}mh zRYvyYhUaI;@>8eXXq2|v#I$rqC{Y^18N=2riEW`wZ$c>rQ2f8NO)vW;^VQLTD%S$x z#87`mHyWC*T;$}AyObrp+y-L!6k{e=+So?aadQ10Jsl}U*lbCcrZycAEAwb0HHV&) zRX8x=QeMBs534%Q)>Hv-Tc7MjM9@1h5E~ZjX|s@tEnFzJ)D8nk|QE*armbWc|R zNI*LB*WVX}^2IAcr?L}pQ@sM7qc{I;&_0TK&M2Mg{{OEQA^_ciKUq5(g`__YV3$^t z8%(bJzzmq8dl}5DSbd({5g}nOQVA09nSiM~;#w zsln1WAU0SStd~Y$!Cbq%*hW^qFdnq8E)78Ip`X}9fa=E(G=wDsRL5?y+Dzc|5fRQ& zu$2hO=)8BA#;o=2n`pd@q(%?mWJM=g{c zX3S63<11~$td)LbSq*fx-<$o#`$?YLWC`t3Ww!US5nt6A?3{0CuqsQ?teRron`~gS7qF3fmZABCC#jof!YSGgcz=57w<=FwbN~duP+{i z@of}0p8{X|HA4-8t@+&LNQU`K==>3~KUJQ7G83xE|1smVG?-)_`z?7P2e!Fu;<)Fi!V0 z_;?h`^AKl^@B!r+`-_p^+07I8tn2jsY`zRE9Y;Bfcbw!em%T9+8kk8AD@yn4aUj#* z{0tcBF}GY+ujG%I(kA9tI*y;p2BF#Fc^~2@INbfA+&b7g zg<$P88!e8H9sxE9zhW~zGS#r?lN4zSDNOJCSN2^8bR4}!9`9?eV(nl1=$=r8Dl(%* zmBRaJMLi%+nyPbOuya(;JNS?{wN67QfI@!a*ipwNOKdi)L|dD6%-a)yDU9>p_CXP!|MIg`G*K z7K|KP02ZiAPayiBq^Axtm+XVbM|!clXhkqawZ#DilAn!LOMR!-TOFK7q|#WUo#Kr3 zRW30M2<;0AJkLpM3CNjoH_u@D?hoN1QGw+cuN}HDX0wv;-zFo&qQLFq7n3dOawuh* z>mV90?gEj(*h#8AmmfCobQ1K4ZcN9fKhmnhP-fj9N#pAAb0DRG$30Nu-4okW)q-Jguc8GYps5mUFD9a!ZD7!wrGeXBjE@C@m zcR;W7x|g4U?>X@l8u1pl{fp3E?6d?2EM`W{bV`}sf>N@~52{Blp@q|5bfD4q*f<4; zqqJ1mx7KUx{rSuTxKMg{^*nfo{PE3J1dG@>q!CIQoEh% zOLR|2Y!8coBeLlk*z8Xt36#5%td>*?rTL=zBUBw|zoI8CdlZAF2`LZ>j2W743ij3e4JkVl)Gxyoj0_kl1WcRb5aiS`>$fQsebRX-M=dVlPtjYtZ`4v^i0R1iIHiN zMM1-KXt@5N=qT?vSH!%fsHyzO?xaO7dLHVQp|k3PH~H`a(a6V6fm}f3QZCk)s3jql zzY9uUJ<#OQ5wM2v>Mxe6l&ZC9@b76-O{wpKR+c*)F&|IOZm>;i!>x;udB$`+IH+$R zolCK}zLj;({AB(h%>h>{vOGDO@+`S>`>CzkZ4qZcaHSWbF6 zh)^CAA_-v-$&@Z46VCQ}RhY`Z<5fS~5!>%1iaWE968o&3b z==?Si2nAeag5FHEP`Ac{^z2cYd68lqm+gRSeHX_}Y7@=CyhQmtVpxVUa=qXx&-V1k z{(ANvP%1OEgBL^;K}QaE``#3Nab@?Pq;$Y@ZOuCd8EN2$h1v~|5vXg}2r0RD&Y^VQ zlbz-H37xJpaP0o)#R0{frv})=CFE_F?0qd?_-@M@+yVRvqp$wdF*?sOKISBImNa3* zw>z?e&59!oIook7rSK{O7}Zw`-D$})lX=xi+ufzQb*$kVQ8!Q_Z2Ukg$Ly0|KV($q zYpaoLPQ8TILDIvbz|;OD`U3*Ao1O-{!119Tvu2BxO%8l&Wr>*po0EUH%M+@~oJ)Q-kFiaDH;~$ju+^!ubTVdn2qoG!X&zTpj@dzxh4k05xORT85d9Py$<_2&TjTb)EC=v*MB1U-D2 zcYEc;3~8Ycy77AaGjy!Nu-T@|B3kLptm*S!bIE2OmjKDq_Q74X=)$-J?a4D2r{w#gzNHMgUb4#_4HL%wzgJ;Lew9kRYwdp{w20oq_t{7>wO`I4E#-qu1Axlgb=8lt)oZ(K2e97($BNdR`L}9+NA@ zVPy?%>DjNFW}8=VQte-$yb&Yc$nVmk#3QU?+FK(hwL=5lt`D46S4AB@6`{yAe$8zw z-4aJLQ=yGbM-L{KsZ*TTHLH2{ioF8kZ-Q1ay{+@@_@{0hu%g+4)~dO7qD4`0Y_PjG zB;VJ{>5@i3J*!rh(9Vs{#ZSTk)Nn3xA}QZ_kp1z>+=HMXREM|LNc08Zt#KjM@#C1$)8G> zf;(6eNe4<9J$3K-mmf^~-JAb9XZI>$9-zfif2RIKAhXn@e^!1|M8>K3xWA|85}uKb zfs`HP4G3Z>QEZFG?(%#oh?2-RU5H@}@#cOthTJDW2+;BQ{v2r8U>6 zbpvDZSY|$jaybLzIw{NOU`Kf)qA9(9PHrG(D2l8I*GvzyWfEQkr}n>8!*=6kz(`C~ z{lM7jduKW!GYUuzJLEKTdkBZeso-ED!dP(-P+k}SMyma`FFOq}T57we%T9-i$x|j* S8Gxb3C+JEY^Q3!!r~5DRBW1w= literal 0 HcmV?d00001 diff --git a/test/fixtures/test_key.pem b/test/fixtures/test_key.pem new file mode 100644 index 00000000000000..48fd93c9944ff3 --- /dev/null +++ b/test/fixtures/test_key.pem @@ -0,0 +1,15 @@ +-----BEGIN RSA PRIVATE KEY----- +MIICXQIBAAKBgQDx3wdzpq2rvwm3Ucun1qAD/ClB+wW+RhR1nVix286QvaNqePAd +CAwwLL82NqXcVQRbQ4s95splQnwvjgkFdKVXFTjPKKJI5aV3wSRN61EBVPdYpCre +535yfG/uDysZFCnVQdnCZ1tnXAR8BirxCNjHqbVyIyBGjsNoNCEPb2R35QIDAQAB +AoGBAJNem9C4ftrFNGtQ2DB0Udz7uDuucepkErUy4MbFsc947GfENjDKJXr42Kx0 +kYx09ImS1vUpeKpH3xiuhwqe7tm4FsCBg4TYqQle14oxxm7TNeBwwGC3OB7hiokb +aAjbPZ1hAuNs6ms3Ybvvj6Lmxzx42m8O5DXCG2/f+KMvaNUhAkEA/ekrOsWkNoW9 +2n3m+msdVuxeek4B87EoTOtzCXb1dybIZUVv4J48VAiM43hhZHWZck2boD/hhwjC +M5NWd4oY6QJBAPPcgBVNdNZSZ8hR4ogI4nzwWrQhl9MRbqqtfOn2TK/tjMv10ALg +lPmn3SaPSNRPKD2hoLbFuHFERlcS79pbCZ0CQQChX3PuIna/gDitiJ8oQLOg7xEM +wk9TRiDK4kl2lnhjhe6PDpaQN4E4F0cTuwqLAoLHtrNWIcOAQvzKMrYdu1MhAkBm +Et3qDMnjDAs05lGT72QeN90/mPAcASf5eTTYGahv21cb6IBxM+AnwAPpqAAsHhYR +9h13Y7uYbaOjvuF23LRhAkBoI9eaSMn+l81WXOVUHnzh3ZwB4GuTyxMXXNOhuiFd +0z4LKAMh99Z4xQmqSoEkXsfM4KPpfhYjF/bwIcP5gOei +-----END RSA PRIVATE KEY----- diff --git a/test/parallel/test-crypto-binary-default.js b/test/parallel/test-crypto-binary-default.js index c96253bc44d450..712a9c7e39977f 100644 --- a/test/parallel/test-crypto-binary-default.js +++ b/test/parallel/test-crypto-binary-default.js @@ -41,9 +41,9 @@ const DH_NOT_SUITABLE_GENERATOR = crypto.constants.DH_NOT_SUITABLE_GENERATOR; require('internal/crypto/util').setDefaultEncoding('latin1'); // Test Certificates -const certPem = fixtures.readKey('rsa_cert.crt'); -const certPfx = fixtures.readKey('rsa_cert.pfx'); -const keyPem = fixtures.readKey('rsa_private.pem'); +const certPem = fixtures.readSync('test_cert.pem', 'ascii'); +const certPfx = fixtures.readSync('test_cert.pfx'); +const keyPem = fixtures.readSync('test_key.pem', 'ascii'); const rsaPubPem = fixtures.readKey('rsa_public.pem', 'ascii'); const rsaKeyPem = fixtures.readKey('rsa_private.pem', 'ascii'); diff --git a/test/parallel/test-crypto-rsa-dsa.js b/test/parallel/test-crypto-rsa-dsa.js index 120a9f1f94f570..1e657b9e60d494 100644 --- a/test/parallel/test-crypto-rsa-dsa.js +++ b/test/parallel/test-crypto-rsa-dsa.js @@ -11,8 +11,8 @@ const constants = crypto.constants; const fixtures = require('../common/fixtures'); // Test certificates -const certPem = fixtures.readKey('rsa_cert.crt'); -const keyPem = fixtures.readKey('rsa_private.pem'); +const certPem = fixtures.readSync('test_cert.pem', 'ascii'); +const keyPem = fixtures.readSync('test_key.pem', 'ascii'); const rsaKeySize = 2048; const rsaPubPem = fixtures.readKey('rsa_public.pem', 'ascii'); const rsaKeyPem = fixtures.readKey('rsa_private.pem', 'ascii'); diff --git a/test/parallel/test-crypto-sign-verify.js b/test/parallel/test-crypto-sign-verify.js index 66c7ac7d8014df..0c7f4fb0bc9e37 100644 --- a/test/parallel/test-crypto-sign-verify.js +++ b/test/parallel/test-crypto-sign-verify.js @@ -11,9 +11,9 @@ const crypto = require('crypto'); const fixtures = require('../common/fixtures'); // Test certificates -const certPem = fixtures.readKey('rsa_cert.crt'); -const keyPem = fixtures.readKey('rsa_private.pem'); -const keySize = 2048; +const certPem = fixtures.readSync('test_cert.pem', 'ascii'); +const keyPem = fixtures.readSync('test_key.pem', 'ascii'); +const modSize = 1024; { const Sign = crypto.Sign; @@ -152,7 +152,7 @@ common.expectsError( { function testPSS(algo, hLen) { // Maximum permissible salt length - const max = keySize / 8 - hLen - 2; + const max = modSize / 8 - hLen - 2; function getEffectiveSaltLength(saltLength) { switch (saltLength) { diff --git a/test/parallel/test-crypto-verify-failure.js b/test/parallel/test-crypto-verify-failure.js index ad7d5d4f86d52b..7e9fda9f6791f6 100644 --- a/test/parallel/test-crypto-verify-failure.js +++ b/test/parallel/test-crypto-verify-failure.js @@ -29,7 +29,7 @@ const crypto = require('crypto'); const tls = require('tls'); const fixtures = require('../common/fixtures'); -const certPem = fixtures.readKey('rsa_cert.crt'); +const certPem = fixtures.readSync('test_cert.pem', 'ascii'); const options = { key: fixtures.readKey('agent1-key.pem'), diff --git a/test/parallel/test-crypto.js b/test/parallel/test-crypto.js index 9337621d37fcfb..86c617815f2726 100644 --- a/test/parallel/test-crypto.js +++ b/test/parallel/test-crypto.js @@ -37,7 +37,7 @@ const tls = require('tls'); const fixtures = require('../common/fixtures'); // Test Certificates -const certPfx = fixtures.readKey('rsa_cert.pfx'); +const certPfx = fixtures.readSync('test_cert.pfx'); // 'this' safety // https://github.com/joyent/node/issues/6690 diff --git a/test/parallel/test-https-client-reject.js b/test/parallel/test-https-client-reject.js index 113b56fda66fe4..729256df54ff8c 100644 --- a/test/parallel/test-https-client-reject.js +++ b/test/parallel/test-https-client-reject.js @@ -30,8 +30,8 @@ const assert = require('assert'); const https = require('https'); const options = { - key: fixtures.readKey('rsa_private.pem'), - cert: fixtures.readKey('rsa_cert.crt') + key: fixtures.readSync('test_key.pem'), + cert: fixtures.readSync('test_cert.pem') }; const server = https.createServer(options, common.mustCall(function(req, res) { @@ -72,7 +72,7 @@ function rejectUnauthorized() { function authorized() { const options = { port: server.address().port, - ca: [fixtures.readKey('rsa_cert.crt')] + ca: [fixtures.readSync('test_cert.pem')] }; options.agent = new https.Agent(options); const req = https.request(options, function(res) { diff --git a/test/parallel/test-https-client-renegotiation-limit.js b/test/parallel/test-https-client-renegotiation-limit.js index 6b5aad2d30933f..4d3dda3d759e38 100644 --- a/test/parallel/test-https-client-renegotiation-limit.js +++ b/test/parallel/test-https-client-renegotiation-limit.js @@ -50,8 +50,8 @@ const LIMITS = [0, 1, 2, 3, 5, 10, 16]; function test(next) { const options = { - cert: fixtures.readKey('rsa_cert.crt'), - key: fixtures.readKey('rsa_private.pem'), + cert: fixtures.readSync('test_cert.pem'), + key: fixtures.readSync('test_key.pem'), }; const server = https.createServer(options, (req, res) => { diff --git a/test/parallel/test-https-drain.js b/test/parallel/test-https-drain.js index 1c8a29258f26f6..98e43b27d4cebd 100644 --- a/test/parallel/test-https-drain.js +++ b/test/parallel/test-https-drain.js @@ -29,8 +29,8 @@ const assert = require('assert'); const https = require('https'); const options = { - key: fixtures.readKey('rsa_private.pem'), - cert: fixtures.readKey('rsa_cert.crt') + key: fixtures.readSync('test_key.pem'), + cert: fixtures.readSync('test_cert.pem') }; const bufSize = 1024 * 1024; diff --git a/test/parallel/test-https-pfx.js b/test/parallel/test-https-pfx.js index 4246913a037ec1..7cf23a7dfa17f4 100644 --- a/test/parallel/test-https-pfx.js +++ b/test/parallel/test-https-pfx.js @@ -30,7 +30,7 @@ const fixtures = require('../common/fixtures'); const assert = require('assert'); const https = require('https'); -const pfx = fixtures.readKey('rsa_cert.pfx'); +const pfx = fixtures.readSync('test_cert.pfx'); const options = { host: '127.0.0.1', diff --git a/test/parallel/test-https-unix-socket-self-signed.js b/test/parallel/test-https-unix-socket-self-signed.js index 9db92ac2aed44a..48207a7a22f52a 100644 --- a/test/parallel/test-https-unix-socket-self-signed.js +++ b/test/parallel/test-https-unix-socket-self-signed.js @@ -10,8 +10,8 @@ tmpdir.refresh(); const fixtures = require('../common/fixtures'); const https = require('https'); const options = { - cert: fixtures.readKey('rsa_cert.crt'), - key: fixtures.readKey('rsa_private.pem') + cert: fixtures.readSync('test_cert.pem'), + key: fixtures.readSync('test_key.pem') }; const server = https.createServer(options, common.mustCall((req, res) => { diff --git a/test/parallel/test-tls-async-cb-after-socket-end.js b/test/parallel/test-tls-async-cb-after-socket-end.js index 357cef30715d71..49ca0cebc9b524 100644 --- a/test/parallel/test-tls-async-cb-after-socket-end.js +++ b/test/parallel/test-tls-async-cb-after-socket-end.js @@ -15,8 +15,8 @@ const tls = require('tls'); const options = { secureOptions: SSL_OP_NO_TICKET, - key: fixtures.readKey('rsa_private.pem'), - cert: fixtures.readKey('rsa_cert.crt') + key: fixtures.readSync('test_key.pem'), + cert: fixtures.readSync('test_cert.pem') }; const server = tls.createServer(options, common.mustCall()); diff --git a/test/parallel/test-tls-client-abort.js b/test/parallel/test-tls-client-abort.js index 50c9a4b32437fc..09f252db308881 100644 --- a/test/parallel/test-tls-client-abort.js +++ b/test/parallel/test-tls-client-abort.js @@ -27,8 +27,8 @@ if (!common.hasCrypto) const tls = require('tls'); const fixtures = require('../common/fixtures'); -const cert = fixtures.readKey('rsa_cert.crt'); -const key = fixtures.readKey('rsa_private.pem'); +const cert = fixtures.readSync('test_cert.pem'); +const key = fixtures.readSync('test_key.pem'); const conn = tls.connect({ cert, key, port: 0 }, common.mustNotCall()); conn.on('error', function() {}); diff --git a/test/parallel/test-tls-client-reject.js b/test/parallel/test-tls-client-reject.js index d41ad806ea3012..329b78c271baaa 100644 --- a/test/parallel/test-tls-client-reject.js +++ b/test/parallel/test-tls-client-reject.js @@ -29,8 +29,8 @@ const tls = require('tls'); const fixtures = require('../common/fixtures'); const options = { - key: fixtures.readKey('rsa_private.pem'), - cert: fixtures.readKey('rsa_cert.crt') + key: fixtures.readSync('test_key.pem'), + cert: fixtures.readSync('test_cert.pem') }; const server = tls.createServer(options, function(socket) { @@ -80,7 +80,7 @@ function rejectUnauthorized() { function authorized() { console.log('connect authorized'); const socket = tls.connect(server.address().port, { - ca: [fixtures.readKey('rsa_cert.crt')], + ca: [fixtures.readSync('test_cert.pem')], servername: 'localhost' }, common.mustCall(function() { console.log('... authorized'); diff --git a/test/parallel/test-tls-client-renegotiation-limit.js b/test/parallel/test-tls-client-renegotiation-limit.js index 9a08efe96f5098..38dcf5a80be5a6 100644 --- a/test/parallel/test-tls-client-renegotiation-limit.js +++ b/test/parallel/test-tls-client-renegotiation-limit.js @@ -49,8 +49,8 @@ const LIMITS = [0, 1, 2, 3, 5, 10, 16]; function test(next) { const options = { - cert: fixtures.readKey('rsa_cert.crt'), - key: fixtures.readKey('rsa_private.pem'), + cert: fixtures.readSync('test_cert.pem'), + key: fixtures.readSync('test_key.pem'), }; const server = tls.createServer(options, (conn) => { diff --git a/test/parallel/test-tls-connect-given-socket.js b/test/parallel/test-tls-connect-given-socket.js index f25cf4582d59b1..5fc5603dd1653b 100644 --- a/test/parallel/test-tls-connect-given-socket.js +++ b/test/parallel/test-tls-connect-given-socket.js @@ -30,8 +30,8 @@ const tls = require('tls'); const net = require('net'); const options = { - key: fixtures.readKey('rsa_private.pem'), - cert: fixtures.readKey('rsa_cert.crt') + key: fixtures.readSync('test_key.pem'), + cert: fixtures.readSync('test_cert.pem') }; const server = tls.createServer(options, common.mustCall((socket) => { diff --git a/test/parallel/test-tls-connect-memleak.js b/test/parallel/test-tls-connect-memleak.js index b0dedfa0bba56d..162d61fcdc7a66 100644 --- a/test/parallel/test-tls-connect-memleak.js +++ b/test/parallel/test-tls-connect-memleak.js @@ -35,8 +35,8 @@ const fixtures = require('../common/fixtures'); // added using `once()`, i.e. can be gc'ed once that event has occurred. const server = tls.createServer({ - cert: fixtures.readKey('rsa_cert.crt'), - key: fixtures.readKey('rsa_private.pem') + cert: fixtures.readSync('test_cert.pem'), + key: fixtures.readSync('test_key.pem') }).listen(0); let collected = false; diff --git a/test/parallel/test-tls-connect-no-host.js b/test/parallel/test-tls-connect-no-host.js index 97b95332c47c2e..f6384743ac7081 100644 --- a/test/parallel/test-tls-connect-no-host.js +++ b/test/parallel/test-tls-connect-no-host.js @@ -8,8 +8,8 @@ if (!common.hasCrypto) const tls = require('tls'); const assert = require('assert'); -const cert = fixtures.readKey('rsa_cert.crt'); -const key = fixtures.readKey('rsa_private.pem'); +const cert = fixtures.readSync('test_cert.pem'); +const key = fixtures.readSync('test_key.pem'); // https://github.com/nodejs/node/issues/1489 // tls.connect(options) with no options.host should accept a cert with diff --git a/test/parallel/test-tls-connect-stream-writes.js b/test/parallel/test-tls-connect-stream-writes.js index 001fe985800f28..0c6ae2b660d502 100644 --- a/test/parallel/test-tls-connect-stream-writes.js +++ b/test/parallel/test-tls-connect-stream-writes.js @@ -9,9 +9,9 @@ const stream = require('stream'); const net = require('net'); const fixtures = require('../common/fixtures'); -const options = { key: fixtures.readKey('rsa_private.pem'), - cert: fixtures.readKey('rsa_cert.crt'), - ca: [ fixtures.readKey('rsa_ca.crt') ], +const options = { key: fixtures.readSync('test_key.pem'), + cert: fixtures.readSync('test_cert.pem'), + ca: [ fixtures.readSync('test_ca.pem') ], ciphers: 'AES256-GCM-SHA384' }; const content = 'hello world'; const recv_bufs = []; diff --git a/test/parallel/test-tls-destroy-stream.js b/test/parallel/test-tls-destroy-stream.js index a49e985a7e0204..b06d7728dc6764 100644 --- a/test/parallel/test-tls-destroy-stream.js +++ b/test/parallel/test-tls-destroy-stream.js @@ -18,9 +18,9 @@ tls.DEFAULT_MAX_VERSION = 'TLSv1.3'; const CONTENT = 'Hello World'; const tlsServer = tls.createServer( { - key: fixtures.readKey('rsa_private.pem'), - cert: fixtures.readKey('rsa_cert.crt'), - ca: [fixtures.readKey('rsa_ca.crt')], + key: fixtures.readSync('test_key.pem'), + cert: fixtures.readSync('test_cert.pem'), + ca: [fixtures.readSync('test_ca.pem')], }, (socket) => { socket.on('close', common.mustCall()); diff --git a/test/parallel/test-tls-fast-writing.js b/test/parallel/test-tls-fast-writing.js index af40cc33baeda0..398beb0d097701 100644 --- a/test/parallel/test-tls-fast-writing.js +++ b/test/parallel/test-tls-fast-writing.js @@ -28,9 +28,9 @@ const fixtures = require('../common/fixtures'); const assert = require('assert'); const tls = require('tls'); -const options = { key: fixtures.readKey('rsa_private.pem'), - cert: fixtures.readKey('rsa_cert.crt'), - ca: [ fixtures.readKey('rsa_ca.crt') ] }; +const options = { key: fixtures.readSync('test_key.pem'), + cert: fixtures.readSync('test_cert.pem'), + ca: [ fixtures.readSync('test_ca.pem') ] }; const server = tls.createServer(options, onconnection); let gotChunk = false; diff --git a/test/parallel/test-tls-handshake-exception.js b/test/parallel/test-tls-handshake-exception.js index 4d8ea7d33ae7fb..1ba4bc6438e2f9 100644 --- a/test/parallel/test-tls-handshake-exception.js +++ b/test/parallel/test-tls-handshake-exception.js @@ -21,8 +21,8 @@ if (process.argv[2] === 'child') { const { Duplex } = require('stream'); const { mustCall } = common; - const cert = fixtures.readKey('rsa_cert.crt'); - const key = fixtures.readKey('rsa_private.pem'); + const cert = fixtures.readSync('test_cert.pem'); + const key = fixtures.readSync('test_key.pem'); net.createServer(mustCall(onplaintext)).listen(0, mustCall(onlisten)); diff --git a/test/parallel/test-tls-hello-parser-failure.js b/test/parallel/test-tls-hello-parser-failure.js index 07776dd89e9227..4b92f6bde3151c 100644 --- a/test/parallel/test-tls-hello-parser-failure.js +++ b/test/parallel/test-tls-hello-parser-failure.js @@ -36,8 +36,8 @@ const tls = require('tls'); const net = require('net'); const options = { - key: fixtures.readKey('rsa_private.pem'), - cert: fixtures.readKey('rsa_cert.crt') + key: fixtures.readSync('test_key.pem'), + cert: fixtures.readSync('test_cert.pem') }; const bonkers = Buffer.alloc(1024 * 1024, 42); diff --git a/test/parallel/test-tls-inception.js b/test/parallel/test-tls-inception.js index 7310308e6f9876..f28f92373c5500 100644 --- a/test/parallel/test-tls-inception.js +++ b/test/parallel/test-tls-inception.js @@ -32,8 +32,8 @@ const tls = require('tls'); const net = require('net'); const options = { - key: fixtures.readKey('rsa_private.pem'), - cert: fixtures.readKey('rsa_cert.crt') + key: fixtures.readSync('test_key.pem'), + cert: fixtures.readSync('test_cert.pem') }; const body = 'A'.repeat(40000); diff --git a/test/parallel/test-tls-interleave.js b/test/parallel/test-tls-interleave.js index 91449b5b3ae571..70f98f33e4f2b2 100644 --- a/test/parallel/test-tls-interleave.js +++ b/test/parallel/test-tls-interleave.js @@ -30,9 +30,9 @@ const tls = require('tls'); const fixtures = require('../common/fixtures'); -const options = { key: fixtures.readKey('rsa_private.pem'), - cert: fixtures.readKey('rsa_cert.crt'), - ca: [ fixtures.readKey('rsa_ca.crt') ] }; +const options = { key: fixtures.readSync('test_key.pem'), + cert: fixtures.readSync('test_cert.pem'), + ca: [ fixtures.readSync('test_ca.pem') ] }; const writes = [ 'some server data', diff --git a/test/parallel/test-tls-net-connect-prefer-path.js b/test/parallel/test-tls-net-connect-prefer-path.js index 1b8231664dce38..263501ae0330ac 100644 --- a/test/parallel/test-tls-net-connect-prefer-path.js +++ b/test/parallel/test-tls-net-connect-prefer-path.js @@ -29,8 +29,8 @@ function mkServer(lib, tcp, cb) { const args = [handler]; if (lib === tls) { args.unshift({ - cert: fixtures.readKey('rsa_cert.crt'), - key: fixtures.readKey('rsa_private.pem') + cert: fixtures.readSync('test_cert.pem'), + key: fixtures.readSync('test_key.pem') }); } const server = lib.createServer(...args); diff --git a/test/parallel/test-tls-no-sslv3.js b/test/parallel/test-tls-no-sslv3.js index 1acb1f93767404..4cbb62e3d595f1 100644 --- a/test/parallel/test-tls-no-sslv3.js +++ b/test/parallel/test-tls-no-sslv3.js @@ -11,8 +11,8 @@ const tls = require('tls'); const spawn = require('child_process').spawn; const fixtures = require('../common/fixtures'); -const cert = fixtures.readKey('rsa_cert.crt'); -const key = fixtures.readKey('rsa_private.pem'); +const cert = fixtures.readSync('test_cert.pem'); +const key = fixtures.readSync('test_key.pem'); const server = tls.createServer({ cert, key }, common.mustNotCall()); const errors = []; let stderr = ''; diff --git a/test/parallel/test-tls-pause.js b/test/parallel/test-tls-pause.js index 120d6d87a7a913..e246acff807a91 100644 --- a/test/parallel/test-tls-pause.js +++ b/test/parallel/test-tls-pause.js @@ -32,8 +32,8 @@ const tls = require('tls'); const fixtures = require('../common/fixtures'); const options = { - key: fixtures.readKey('rsa_private.pem'), - cert: fixtures.readKey('rsa_cert.crt') + key: fixtures.readSync('test_key.pem'), + cert: fixtures.readSync('test_cert.pem') }; const bufSize = 1024 * 1024; diff --git a/test/parallel/test-tls-securepair-fiftharg.js b/test/parallel/test-tls-securepair-fiftharg.js index 9adb2bf424818b..0651f98c6d780d 100644 --- a/test/parallel/test-tls-securepair-fiftharg.js +++ b/test/parallel/test-tls-securepair-fiftharg.js @@ -9,8 +9,8 @@ const tls = require('tls'); const fixtures = require('../common/fixtures'); const sslcontext = tls.createSecureContext({ - cert: fixtures.readKey('rsa_cert.crt'), - key: fixtures.readKey('rsa_private.pem') + cert: fixtures.readSync('test_cert.pem'), + key: fixtures.readSync('test_key.pem') }); const pair = tls.createSecurePair(sslcontext, true, false, false, { diff --git a/test/parallel/test-tls-zero-clear-in.js b/test/parallel/test-tls-zero-clear-in.js index f24fb6f992e75d..b2a07960d4138c 100644 --- a/test/parallel/test-tls-zero-clear-in.js +++ b/test/parallel/test-tls-zero-clear-in.js @@ -28,8 +28,8 @@ if (!common.hasCrypto) const tls = require('tls'); const fixtures = require('../common/fixtures'); -const cert = fixtures.readKey('rsa_cert.crt'); -const key = fixtures.readKey('rsa_private.pem'); +const cert = fixtures.readSync('test_cert.pem'); +const key = fixtures.readSync('test_key.pem'); const server = tls.createServer({ cert, diff --git a/test/pummel/test-https-no-reader.js b/test/pummel/test-https-no-reader.js index 31d2bfa2d3ca34..ad0b56c1f3c7b1 100644 --- a/test/pummel/test-https-no-reader.js +++ b/test/pummel/test-https-no-reader.js @@ -29,8 +29,8 @@ const https = require('https'); const fixtures = require('../common/fixtures'); const options = { - key: fixtures.readKey('rsa_private.pem'), - cert: fixtures.readKey('rsa_cert.crt') + key: fixtures.readSync('test_key.pem'), + cert: fixtures.readSync('test_cert.pem') }; const buf = Buffer.allocUnsafe(1024 * 1024); diff --git a/test/sequential/test-async-wrap-getasyncid.js b/test/sequential/test-async-wrap-getasyncid.js index 13aee51175f618..9f5c073c9e2d06 100644 --- a/test/sequential/test-async-wrap-getasyncid.js +++ b/test/sequential/test-async-wrap-getasyncid.js @@ -266,9 +266,9 @@ if (common.hasCrypto) { // eslint-disable-line node-core/crypto-check const { TCP, constants: TCPConstants } = internalBinding('tcp_wrap'); const tcp = new TCP(TCPConstants.SOCKET); - const ca = fixtures.readKey('rsa_ca.crt'); - const cert = fixtures.readKey('rsa_cert.crt'); - const key = fixtures.readKey('rsa_private.pem'); + const ca = fixtures.readSync('test_ca.pem', 'ascii'); + const cert = fixtures.readSync('test_cert.pem', 'ascii'); + const key = fixtures.readSync('test_key.pem', 'ascii'); const credentials = require('tls').createSecureContext({ ca, cert, key }); diff --git a/test/sequential/test-tls-connect.js b/test/sequential/test-tls-connect.js index 5cfec7ed04707d..291747aea77b49 100644 --- a/test/sequential/test-tls-connect.js +++ b/test/sequential/test-tls-connect.js @@ -33,8 +33,8 @@ const tls = require('tls'); // https://github.com/joyent/node/issues/1218 // uncatchable exception on TLS connection error { - const cert = fixtures.readKey('rsa_cert.crt'); - const key = fixtures.readKey('rsa_private.pem'); + const cert = fixtures.readSync('test_cert.pem'); + const key = fixtures.readSync('test_key.pem'); const options = { cert: cert, key: key, port: common.PORT }; const conn = tls.connect(options, common.mustNotCall()); @@ -47,8 +47,8 @@ const tls = require('tls'); // SSL_accept/SSL_connect error handling { - const cert = fixtures.readKey('rsa_cert.crt'); - const key = fixtures.readKey('rsa_private.pem'); + const cert = fixtures.readSync('test_cert.pem'); + const key = fixtures.readSync('test_key.pem'); assert.throws(() => { tls.connect({ From 0a680b907b1907cf844265e621de792ffa87ff4c Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Wed, 5 Jun 2019 15:20:10 -0700 Subject: [PATCH 11/17] Revert "test: move spkac certs to fixtures/keys/" This reverts commit b250085df30a1dc64bef51c88d76ed13597b4088. --- test/fixtures/keys/Makefile | 10 ---------- test/fixtures/keys/rsa_spkac.spkac | 1 - test/fixtures/keys/rsa_spkac_invalid.spkac | 1 - test/fixtures/spkac.fail | 1 + test/fixtures/spkac.pem | 6 ++++++ test/fixtures/spkac.valid | 1 + test/parallel/test-crypto-certificate.js | 11 +++++------ 7 files changed, 13 insertions(+), 18 deletions(-) delete mode 100644 test/fixtures/keys/rsa_spkac.spkac delete mode 100644 test/fixtures/keys/rsa_spkac_invalid.spkac create mode 100644 test/fixtures/spkac.fail create mode 100644 test/fixtures/spkac.pem create mode 100644 test/fixtures/spkac.valid diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile index fd7ca677f63266..8ca9e4d26c17f6 100644 --- a/test/fixtures/keys/Makefile +++ b/test/fixtures/keys/Makefile @@ -46,8 +46,6 @@ all: \ rsa_private_b.pem \ I_AM_THE_WALRUS_sha256_signature_signedby_rsa_private_b.sha256 \ rsa_public_b.pem \ - rsa_spkac.spkac \ - rsa_spkac_invalid.spkac \ rsa_private_1024.pem \ rsa_private_2048.pem \ rsa_private_4096.pem \ @@ -632,14 +630,6 @@ I_AM_THE_WALRUS_sha256_signature_signedby_rsa_private_b.sha256: rsa_private_b.pe rsa_public_b.pem: rsa_private_b.pem openssl rsa -in rsa_private_b.pem -pubout -out rsa_public_b.pem -# openssl outputs `SPKAC=[SPKAC]`. That prefix needs to be removed to work with node -rsa_spkac.spkac: rsa_private.pem - openssl spkac -key rsa_private.pem -challenge this-is-a-challenge | cut -c 7- > rsa_spkac.spkac - -# cutting characters from the start to invalidate the spkac -rsa_spkac_invalid.spkac: rsa_spkac.spkac - cat rsa_spkac.spkac | cut -c 5- > rsa_spkac_invalid.spkac - rsa_private_1024.pem: openssl genrsa -out rsa_private_1024.pem 1024 diff --git a/test/fixtures/keys/rsa_spkac.spkac b/test/fixtures/keys/rsa_spkac.spkac deleted file mode 100644 index 35627672968172..00000000000000 --- a/test/fixtures/keys/rsa_spkac.spkac +++ /dev/null @@ -1 +0,0 @@ -MIICUzCCATswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC33FiIiiexwLe/P8DZx5HsqFlmUO7/lvJ7necJVNwqdZ3ax5jpQB0p6uxfqeOvzcN3k5V7UFb/Am+nkSNZMAZhsWzCU2Z4Pjh50QYz3f0Hour7/yIGStOLyYY3hgLK2K8TbhgjQPhdkw9+QtKlpvbL8fLgONAoGrVOFnRQGcr70iFffsm79mgZhKVMgYiHPJqJgGHvCtkGg9zMgS7p63+Q3ZWedtFS2RhMX3uCBy/mH6EOlRCNBbRmA4xxNzyf5GQaki3T+Iz9tOMjdPP+CwV2LqEdylmBuik8vrfTb3qIHLKKBAI8lXN26wWtA3kN4L7NP+cbKlCRlqctvhmylLH1AgMBAAEWE3RoaXMtaXMtYS1jaGFsbGVuZ2UwDQYJKoZIhvcNAQEEBQADggEBAIozmeW1kfDfAVwRQKileZGLRGCD7AjdHLYEe16xTBPve8Af1bDOyuWsAm4qQLYA4FAFROiKeGqxCtIErEvm87/09tCfF1My/1Uj+INjAk39DK9J9alLlTsrwSgd1lb3YlXY7TyitCmh7iXLo4pVhA2chNA3njiMq3CUpSvGbpzrESL2dv97lv590gUD988wkTDVyYsf0T8+X0Kww3AgPWGji+2f2i5/jTfD/s1lK1nqi7ZxFm0pGZoy1MJ51SCEy7Y82ajroI+5786nC02mo9ak7samca4YDZOoxN4d3tax4B/HDF5dqJSm1/31xYLDTfujCM5FkSjRc4m6hnriEkc= diff --git a/test/fixtures/keys/rsa_spkac_invalid.spkac b/test/fixtures/keys/rsa_spkac_invalid.spkac deleted file mode 100644 index 0460a32b810216..00000000000000 --- a/test/fixtures/keys/rsa_spkac_invalid.spkac +++ /dev/null @@ -1 +0,0 @@ -UzCCATswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC33FiIiiexwLe/P8DZx5HsqFlmUO7/lvJ7necJVNwqdZ3ax5jpQB0p6uxfqeOvzcN3k5V7UFb/Am+nkSNZMAZhsWzCU2Z4Pjh50QYz3f0Hour7/yIGStOLyYY3hgLK2K8TbhgjQPhdkw9+QtKlpvbL8fLgONAoGrVOFnRQGcr70iFffsm79mgZhKVMgYiHPJqJgGHvCtkGg9zMgS7p63+Q3ZWedtFS2RhMX3uCBy/mH6EOlRCNBbRmA4xxNzyf5GQaki3T+Iz9tOMjdPP+CwV2LqEdylmBuik8vrfTb3qIHLKKBAI8lXN26wWtA3kN4L7NP+cbKlCRlqctvhmylLH1AgMBAAEWE3RoaXMtaXMtYS1jaGFsbGVuZ2UwDQYJKoZIhvcNAQEEBQADggEBAIozmeW1kfDfAVwRQKileZGLRGCD7AjdHLYEe16xTBPve8Af1bDOyuWsAm4qQLYA4FAFROiKeGqxCtIErEvm87/09tCfF1My/1Uj+INjAk39DK9J9alLlTsrwSgd1lb3YlXY7TyitCmh7iXLo4pVhA2chNA3njiMq3CUpSvGbpzrESL2dv97lv590gUD988wkTDVyYsf0T8+X0Kww3AgPWGji+2f2i5/jTfD/s1lK1nqi7ZxFm0pGZoy1MJ51SCEy7Y82ajroI+5786nC02mo9ak7samca4YDZOoxN4d3tax4B/HDF5dqJSm1/31xYLDTfujCM5FkSjRc4m6hnriEkc= diff --git a/test/fixtures/spkac.fail b/test/fixtures/spkac.fail new file mode 100644 index 00000000000000..4dc12f88bfed12 --- /dev/null +++ b/test/fixtures/spkac.fail @@ -0,0 +1 @@ +MIIB/FAILDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3L0IfUijj7+A8CPC8EmhcdNoe5fUAog7OrBdhn7EkxFButUp40P7+LiYiygYG1TmoI/a5EgsLU3s9twEz3hmgY9mYIqb/rb+SF8qlD/K6KVyUORC7Wlz1Df4L8O3DuRGzx6/+3jIW6cPBpfgH1sVuYS1vDBsP/gMMIxwTsKJ4P0CAwEAARYkZmI5YWI4MTQtNjY3Ny00MmE0LWE2MGMtZjkwNWQxYTY5MjRkMA0GCSqGSIb3DQEBBQUAA4GBADu1U9t3eY9O3WOofp1RHX2rkh0TPs1CeS+sNdWUSDmdV5ifaGdeXpDikEnh4QIUIeZehxwgy2EjiZqMjMJHF++KPTzfAnHuuEtpDmIGzBnodZa1qt322iGZwgREvacv78GxJBJvPP3KLe+EDDsERG1aWLJoSZRusadacdzNmdV4 diff --git a/test/fixtures/spkac.pem b/test/fixtures/spkac.pem new file mode 100644 index 00000000000000..4ad1cdd0bf0d3c --- /dev/null +++ b/test/fixtures/spkac.pem @@ -0,0 +1,6 @@ +-----BEGIN PUBLIC KEY----- +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDcvQh9SKOPv4DwI8LwSaFx02h7 +l9QCiDs6sF2GfsSTEUG61SnjQ/v4uJiLKBgbVOagj9rkSCwtTez23ATPeGaBj2Zg +ipv+tv5IXyqUP8ropXJQ5ELtaXPUN/gvw7cO5EbPHr/7eMhbpw8Gl+AfWxW5hLW8 +MGw/+AwwjHBOwong/QIDAQAB +-----END PUBLIC KEY----- diff --git a/test/fixtures/spkac.valid b/test/fixtures/spkac.valid new file mode 100644 index 00000000000000..6bfe5bb90d5e58 --- /dev/null +++ b/test/fixtures/spkac.valid @@ -0,0 +1 @@ +MIIBXjCByDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3L0IfUijj7+A8CPC8EmhcdNoe5fUAog7OrBdhn7EkxFButUp40P7+LiYiygYG1TmoI/a5EgsLU3s9twEz3hmgY9mYIqb/rb+SF8qlD/K6KVyUORC7Wlz1Df4L8O3DuRGzx6/+3jIW6cPBpfgH1sVuYS1vDBsP/gMMIxwTsKJ4P0CAwEAARYkZmI5YWI4MTQtNjY3Ny00MmE0LWE2MGMtZjkwNWQxYTY5MjRkMA0GCSqGSIb3DQEBBQUAA4GBADu1U9t3eY9O3WOofp1RHX2rkh0TPs1CeS+sNdWUSDmdV5ifaGdeXpDikEnh4QIUIeZehxwgy2EjiZqMjMJHF++KPTzfAnHuuEtpDmIGzBnodZa1qt322iGZwgREvacv78GxJBJvPP3KLe+EDDsERG1aWLJoSZRusadacdzNmdV4 diff --git a/test/parallel/test-crypto-certificate.js b/test/parallel/test-crypto-certificate.js index e987be212958a7..a426e0be003da0 100644 --- a/test/parallel/test-crypto-certificate.js +++ b/test/parallel/test-crypto-certificate.js @@ -30,10 +30,9 @@ const { Certificate } = crypto; const fixtures = require('../common/fixtures'); // Test Certificates -const spkacValid = fixtures.readKey('rsa_spkac.spkac'); -const spkacChallenge = 'this-is-a-challenge'; -const spkacFail = fixtures.readKey('rsa_spkac_invalid.spkac'); -const spkacPublicPem = fixtures.readKey('rsa_public.pem'); +const spkacValid = fixtures.readSync('spkac.valid'); +const spkacFail = fixtures.readSync('spkac.fail'); +const spkacPem = fixtures.readSync('spkac.pem'); function checkMethods(certificate) { @@ -42,13 +41,13 @@ function checkMethods(certificate) { assert.strictEqual( stripLineEndings(certificate.exportPublicKey(spkacValid).toString('utf8')), - stripLineEndings(spkacPublicPem.toString('utf8')) + stripLineEndings(spkacPem.toString('utf8')) ); assert.strictEqual(certificate.exportPublicKey(spkacFail), ''); assert.strictEqual( certificate.exportChallenge(spkacValid).toString('utf8'), - spkacChallenge + 'fb9ab814-6677-42a4-a60c-f905d1a6924d' ); assert.strictEqual(certificate.exportChallenge(spkacFail), ''); } From f2754452351b7fb2762f53a6bb6a97d34394c398 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Wed, 5 Jun 2019 15:20:15 -0700 Subject: [PATCH 12/17] Revert "test: move x448 keypairs to fixtures/keys/" This reverts commit 198162a2e311da105995d901ef36041e66ad6bab. --- test/fixtures/keys/Makefile | 8 -------- test/fixtures/keys/x448_private.pem | 4 ---- test/fixtures/keys/x448_public.pem | 4 ---- test/fixtures/test_x448_privkey.pem | 4 ++++ test/fixtures/test_x448_pubkey.pem | 4 ++++ test/parallel/test-crypto-key-objects.js | 6 +++--- 6 files changed, 11 insertions(+), 19 deletions(-) delete mode 100644 test/fixtures/keys/x448_private.pem delete mode 100644 test/fixtures/keys/x448_public.pem create mode 100644 test/fixtures/test_x448_privkey.pem create mode 100644 test/fixtures/test_x448_pubkey.pem diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile index 8ca9e4d26c17f6..f12664908f6f19 100644 --- a/test/fixtures/keys/Makefile +++ b/test/fixtures/keys/Makefile @@ -64,8 +64,6 @@ all: \ x25519_public.pem \ ed448_private.pem \ ed448_public.pem \ - x448_private.pem \ - x448_public.pem \ # # Create Certificate Authority: ca1 @@ -684,12 +682,6 @@ ed448_private.pem: ed448_public.pem: ed448_private.pem openssl pkey -in ed448_private.pem -pubout -out ed448_public.pem -x448_private.pem: - openssl genpkey -algorithm x448 -out x448_private.pem - -x448_public.pem: x448_private.pem - openssl pkey -in x448_private.pem -pubout -out x448_public.pem - clean: rm -f *.pfx *.pem *.srl ca2-database.txt ca2-serial fake-startcom-root-serial *.print *.old fake-startcom-root-issued-certs/*.pem @> fake-startcom-root-database.txt diff --git a/test/fixtures/keys/x448_private.pem b/test/fixtures/keys/x448_private.pem deleted file mode 100644 index 61cd52c3989105..00000000000000 --- a/test/fixtures/keys/x448_private.pem +++ /dev/null @@ -1,4 +0,0 @@ ------BEGIN PRIVATE KEY----- -MEYCAQAwBQYDK2VvBDoEOLTDbazv6vHZWOmODQ3kk8TUOQgApB4j75rpInT5zSLl -/xJHK8ixF7f+4uo+mGTCrK1sktI5UmCZ ------END PRIVATE KEY----- diff --git a/test/fixtures/keys/x448_public.pem b/test/fixtures/keys/x448_public.pem deleted file mode 100644 index 6475d0438042d5..00000000000000 --- a/test/fixtures/keys/x448_public.pem +++ /dev/null @@ -1,4 +0,0 @@ ------BEGIN PUBLIC KEY----- -MEIwBQYDK2VvAzkAioHSHVpTs6hMvghosEJDIR7ceFiE3+Xccxati64oOVJ7NWjf -ozE7ae31PXIUFq6cVYgvSKsDFPA= ------END PUBLIC KEY----- diff --git a/test/fixtures/test_x448_privkey.pem b/test/fixtures/test_x448_privkey.pem new file mode 100644 index 00000000000000..39c507d2b8d5d6 --- /dev/null +++ b/test/fixtures/test_x448_privkey.pem @@ -0,0 +1,4 @@ +-----BEGIN PRIVATE KEY----- +MEYCAQAwBQYDK2VvBDoEOPilLIAZTQqUbFb0LhTGaqn47zN2p2yGVk+2hhQQk9C8 +8SvFqEFw73YITSIJ2NUBZnZKNz2nGkrm +-----END PRIVATE KEY----- diff --git a/test/fixtures/test_x448_pubkey.pem b/test/fixtures/test_x448_pubkey.pem new file mode 100644 index 00000000000000..841c2bb66b5bfd --- /dev/null +++ b/test/fixtures/test_x448_pubkey.pem @@ -0,0 +1,4 @@ +-----BEGIN PUBLIC KEY----- +MEIwBQYDK2VvAzkAbceBBM+LkveTK09QojZdnHokCh7lOWxyVZrlbH3Ny3WorprD +Iir5A6heZzlRnz1elOHp7ZpPfWk= +-----END PUBLIC KEY----- diff --git a/test/parallel/test-crypto-key-objects.js b/test/parallel/test-crypto-key-objects.js index 558f7dc1f4b673..12c3ba4ff1ef94 100644 --- a/test/parallel/test-crypto-key-objects.js +++ b/test/parallel/test-crypto-key-objects.js @@ -212,9 +212,9 @@ const privateDsa = fixtures.readKey('dsa_private_encrypted_1025.pem', { private: fixtures.readKey('x25519_private.pem', 'ascii'), public: fixtures.readKey('x25519_public.pem', 'ascii'), keyType: 'x25519' }, - { private: fixtures.readKey('x448_private.pem', 'ascii'), - public: fixtures.readKey('x448_public.pem', 'ascii'), - keyType: 'x448' }, + { private: fixtures.readSync('test_x448_privkey.pem', 'ascii'), + public: fixtures.readSync('test_x448_pubkey.pem', 'ascii'), + keyType: 'x448' } ].forEach((info) => { const keyType = info.keyType; From e86aae82d08c4068e2823bdfcc4b76b222e123e3 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Wed, 5 Jun 2019 15:20:20 -0700 Subject: [PATCH 13/17] Revert "test: move ed448 keypairs to fixtures/keys/" This reverts commit c4209729fbac9184308de3803463934d62228a23. --- test/fixtures/keys/Makefile | 8 -------- test/fixtures/keys/ed448_private.pem | 4 ---- test/fixtures/keys/ed448_public.pem | 4 ---- test/fixtures/test_ed448_privkey.pem | 4 ++++ test/fixtures/test_ed448_pubkey.pem | 4 ++++ test/parallel/test-crypto-key-objects.js | 4 ++-- test/parallel/test-crypto-sign-verify.js | 4 ++-- 7 files changed, 12 insertions(+), 20 deletions(-) delete mode 100644 test/fixtures/keys/ed448_private.pem delete mode 100644 test/fixtures/keys/ed448_public.pem create mode 100644 test/fixtures/test_ed448_privkey.pem create mode 100644 test/fixtures/test_ed448_pubkey.pem diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile index f12664908f6f19..03a3011056adc6 100644 --- a/test/fixtures/keys/Makefile +++ b/test/fixtures/keys/Makefile @@ -62,8 +62,6 @@ all: \ ed25519_public.pem \ x25519_private.pem \ x25519_public.pem \ - ed448_private.pem \ - ed448_public.pem \ # # Create Certificate Authority: ca1 @@ -676,12 +674,6 @@ x25519_private.pem: x25519_public.pem: x25519_private.pem openssl pkey -in x25519_private.pem -pubout -out x25519_public.pem -ed448_private.pem: - openssl genpkey -algorithm ed448 -out ed448_private.pem - -ed448_public.pem: ed448_private.pem - openssl pkey -in ed448_private.pem -pubout -out ed448_public.pem - clean: rm -f *.pfx *.pem *.srl ca2-database.txt ca2-serial fake-startcom-root-serial *.print *.old fake-startcom-root-issued-certs/*.pem @> fake-startcom-root-database.txt diff --git a/test/fixtures/keys/ed448_private.pem b/test/fixtures/keys/ed448_private.pem deleted file mode 100644 index 9643665d67656d..00000000000000 --- a/test/fixtures/keys/ed448_private.pem +++ /dev/null @@ -1,4 +0,0 @@ ------BEGIN PRIVATE KEY----- -MEcCAQAwBQYDK2VxBDsEOdOtCnu9bDdBqSHNNZ5xoDA5KdLBTUNPcKFaOADNX32s -dfpo52pCtPqfku/l3/OfUHsF43EfZsaaWA== ------END PRIVATE KEY----- diff --git a/test/fixtures/keys/ed448_public.pem b/test/fixtures/keys/ed448_public.pem deleted file mode 100644 index b767109b187ee2..00000000000000 --- a/test/fixtures/keys/ed448_public.pem +++ /dev/null @@ -1,4 +0,0 @@ ------BEGIN PUBLIC KEY----- -MEMwBQYDK2VxAzoAoX/ee5+jlcU53+BbGRsGIzly0V+SZtJ/oGXY0udf84q2hTW2 -RdstLktvwpkVJOoNb7oDgc2V5ZUA ------END PUBLIC KEY----- diff --git a/test/fixtures/test_ed448_privkey.pem b/test/fixtures/test_ed448_privkey.pem new file mode 100644 index 00000000000000..b430a7ee7ca56b --- /dev/null +++ b/test/fixtures/test_ed448_privkey.pem @@ -0,0 +1,4 @@ +-----BEGIN PRIVATE KEY----- +MEcCAQAwBQYDK2VxBDsEObxytD95dGN3Hxk7kVk+Lig1rGYTRr3YdaHjRog++Sgk +QD7KwKmxroBURtkE2N0JbQ3ctdrpGRB5DQ== +-----END PRIVATE KEY----- diff --git a/test/fixtures/test_ed448_pubkey.pem b/test/fixtures/test_ed448_pubkey.pem new file mode 100644 index 00000000000000..5619b93aeb0310 --- /dev/null +++ b/test/fixtures/test_ed448_pubkey.pem @@ -0,0 +1,4 @@ +-----BEGIN PUBLIC KEY----- +MEMwBQYDK2VxAzoAIESY3jnpGdB5UVJDCznrv0vmBFIzgSMu+gafsbCX1rFtsJwR +M6XUDQiEY7dk6rmm/Fktyawna5EA +-----END PUBLIC KEY----- diff --git a/test/parallel/test-crypto-key-objects.js b/test/parallel/test-crypto-key-objects.js index 12c3ba4ff1ef94..591d3904563960 100644 --- a/test/parallel/test-crypto-key-objects.js +++ b/test/parallel/test-crypto-key-objects.js @@ -206,8 +206,8 @@ const privateDsa = fixtures.readKey('dsa_private_encrypted_1025.pem', { private: fixtures.readKey('ed25519_private.pem', 'ascii'), public: fixtures.readKey('ed25519_public.pem', 'ascii'), keyType: 'ed25519' }, - { private: fixtures.readKey('ed448_private.pem', 'ascii'), - public: fixtures.readKey('ed448_public.pem', 'ascii'), + { private: fixtures.readSync('test_ed448_privkey.pem', 'ascii'), + public: fixtures.readSync('test_ed448_pubkey.pem', 'ascii'), keyType: 'ed448' }, { private: fixtures.readKey('x25519_private.pem', 'ascii'), public: fixtures.readKey('x25519_public.pem', 'ascii'), diff --git a/test/parallel/test-crypto-sign-verify.js b/test/parallel/test-crypto-sign-verify.js index 0c7f4fb0bc9e37..2da2a91655cfdd 100644 --- a/test/parallel/test-crypto-sign-verify.js +++ b/test/parallel/test-crypto-sign-verify.js @@ -422,8 +422,8 @@ common.expectsError( public: fixtures.readKey('ed25519_public.pem', 'ascii'), algo: null, sigLen: 64 }, - { private: fixtures.readKey('ed448_private.pem', 'ascii'), - public: fixtures.readKey('ed448_public.pem', 'ascii'), + { private: fixtures.readSync('test_ed448_privkey.pem', 'ascii'), + public: fixtures.readSync('test_ed448_pubkey.pem', 'ascii'), algo: null, sigLen: 114 }, { private: fixtures.readKey('rsa_private_2048.pem', 'ascii'), From 0847f6fc6379f97eeca4ced4d43f5a0f1798e97c Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Wed, 5 Jun 2019 15:20:23 -0700 Subject: [PATCH 14/17] Revert "test: move dsa keypairs to fixtures/keys/" This reverts commit f5e6ac2bd9cfd55d156fdcaee4f73b2822f46a53. --- test/fixtures/keys/Makefile | 20 ----------------- test/fixtures/keys/dsa_params.pem | 14 ------------ test/fixtures/keys/dsa_private.pem | 20 ----------------- test/fixtures/keys/dsa_private_encrypted.pem | 23 -------------------- test/fixtures/keys/dsa_private_pkcs8.pem | 15 ------------- test/fixtures/keys/dsa_public.pem | 20 ----------------- test/fixtures/test_dsa_params.pem | 14 ++++++++++++ test/fixtures/test_dsa_pkcs8_privkey.pem | 15 +++++++++++++ test/fixtures/test_dsa_privkey.pem | 20 +++++++++++++++++ test/fixtures/test_dsa_privkey_encrypted.pem | 16 ++++++++++++++ test/fixtures/test_dsa_pubkey.pem | 20 +++++++++++++++++ test/parallel/test-crypto-binary-default.js | 4 ++-- test/parallel/test-crypto-rsa-dsa.js | 10 ++++----- 13 files changed, 92 insertions(+), 119 deletions(-) delete mode 100644 test/fixtures/keys/dsa_params.pem delete mode 100644 test/fixtures/keys/dsa_private.pem delete mode 100644 test/fixtures/keys/dsa_private_encrypted.pem delete mode 100644 test/fixtures/keys/dsa_private_pkcs8.pem delete mode 100644 test/fixtures/keys/dsa_public.pem create mode 100644 test/fixtures/test_dsa_params.pem create mode 100644 test/fixtures/test_dsa_pkcs8_privkey.pem create mode 100644 test/fixtures/test_dsa_privkey.pem create mode 100644 test/fixtures/test_dsa_privkey_encrypted.pem create mode 100644 test/fixtures/test_dsa_pubkey.pem diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile index 03a3011056adc6..c51991575edcf7 100644 --- a/test/fixtures/keys/Makefile +++ b/test/fixtures/keys/Makefile @@ -24,11 +24,6 @@ all: \ dh512.pem \ dh1024.pem \ dh2048.pem \ - dsa_params.pem \ - dsa_private.pem \ - dsa_private_encrypted.pem \ - dsa_private_pkcs8.pem \ - dsa_public.pem \ dsa1025.pem \ dsa_private_1025.pem \ dsa_private_encrypted_1025.pem \ @@ -569,21 +564,6 @@ dh1024.pem: dh2048.pem: openssl dhparam -out dh2048.pem 2048 -dsa_params.pem: - openssl dsaparam -out dsa_params.pem 2048 - -dsa_private.pem: dsa_params.pem - openssl gendsa -out dsa_private.pem dsa_params.pem - -dsa_private_encrypted.pem: dsa_private.pem - openssl dsa -aes256 -in dsa_private.pem -passout 'pass:password' -out dsa_private_encrypted.pem - -dsa_private_pkcs8.pem: dsa_private.pem - openssl pkcs8 -topk8 -inform PEM -outform PEM -in dsa_private.pem -out dsa_private_pkcs8.pem -nocrypt - -dsa_public.pem: dsa_private.pem - openssl dsa -in dsa_private.pem -pubout -out dsa_public.pem - dsa1025.pem: openssl dsaparam -out dsa1025.pem 1025 diff --git a/test/fixtures/keys/dsa_params.pem b/test/fixtures/keys/dsa_params.pem deleted file mode 100644 index 9052393fd2ebbe..00000000000000 --- a/test/fixtures/keys/dsa_params.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN DSA PARAMETERS----- -MIICLQKCAQEAoSw3Ghf02sMSmd5k2rvSqf6eJPFO7fHDRyvDDbifjO6/BKSIkXM4 -3qyCqddC04arKg7wc1QDEQ8gb13pCmnC0RBiljE6ke4yK46Q5JjiEKH9U1eCbtTr -hcGrLDgwbqvRM06EN6IfAL3OBF6YzS9wn3/EfSwW2Z8gAIkjZrTjEUTV+/gEAdfE -gd/WAZxcc9zYKOwPy0/LjjldQw5fsPlIEkS1yJFlWMokSsZVYlJLR06h1S4kQoE3 -BqELirH/FQfJ36RMRFsaKZ6nQYS66Qc8rybQw2VlOJsqiRoTSDwREPz6j9oLYh1E -e86j5Xt9jbiBrK33UbkTr/jBtO0J2PR0+wIhAIXIexS5LQJPSoi96k6OU4yrLLmA -IY8gS9mdYTdbpwcdAoIBAQCCN3gTjFiPgBQ/bj/Edp9w90SA+dQ/VnnYDTMcz+Mi -/8sgtlQ3O9CCFb0327YnOLwvxsmSadT9XrIq1/5jGD2VtjFDVlridjYASrjezR2k -dr781G+bxtVNQuIOKZl9xqruCmHUSSRL/vuCR6pKsA81ZPfpdcLh3RYYxDIoTK6t -VX4GrX5bcxGDIUCQiTaqKv9Nzpm1liBLRm6LHczBsFk2OVrRyMsT3gh0J6DSUw+d -w/Vru1J6glkrr0CxBWoJ65btcqtFyQV/76btor9Qgc/z9suYBoJZ3Ua0yAfv3J2E -rOs1CAbh4LWNULA9eJObY2R4sAV7Q8wOMT5jmjKo4unp ------END DSA PARAMETERS----- diff --git a/test/fixtures/keys/dsa_private.pem b/test/fixtures/keys/dsa_private.pem deleted file mode 100644 index 3f64ae4e85f0d4..00000000000000 --- a/test/fixtures/keys/dsa_private.pem +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN DSA PRIVATE KEY----- -MIIDVwIBAAKCAQEAoSw3Ghf02sMSmd5k2rvSqf6eJPFO7fHDRyvDDbifjO6/BKSI -kXM43qyCqddC04arKg7wc1QDEQ8gb13pCmnC0RBiljE6ke4yK46Q5JjiEKH9U1eC -btTrhcGrLDgwbqvRM06EN6IfAL3OBF6YzS9wn3/EfSwW2Z8gAIkjZrTjEUTV+/gE -AdfEgd/WAZxcc9zYKOwPy0/LjjldQw5fsPlIEkS1yJFlWMokSsZVYlJLR06h1S4k -QoE3BqELirH/FQfJ36RMRFsaKZ6nQYS66Qc8rybQw2VlOJsqiRoTSDwREPz6j9oL -Yh1Ee86j5Xt9jbiBrK33UbkTr/jBtO0J2PR0+wIhAIXIexS5LQJPSoi96k6OU4yr -LLmAIY8gS9mdYTdbpwcdAoIBAQCCN3gTjFiPgBQ/bj/Edp9w90SA+dQ/VnnYDTMc -z+Mi/8sgtlQ3O9CCFb0327YnOLwvxsmSadT9XrIq1/5jGD2VtjFDVlridjYASrje -zR2kdr781G+bxtVNQuIOKZl9xqruCmHUSSRL/vuCR6pKsA81ZPfpdcLh3RYYxDIo -TK6tVX4GrX5bcxGDIUCQiTaqKv9Nzpm1liBLRm6LHczBsFk2OVrRyMsT3gh0J6DS -Uw+dw/Vru1J6glkrr0CxBWoJ65btcqtFyQV/76btor9Qgc/z9suYBoJZ3Ua0yAfv -3J2ErOs1CAbh4LWNULA9eJObY2R4sAV7Q8wOMT5jmjKo4unpAoIBAQCE1m+DUb9L -T58u6XV/L1p6K9T2mc6jAmzD51fPiUwsRov9sDGJmSnQjQ5pt3hVp8inVfNkhqOI -1rpdKmx5W00fPu6VCiPuximuHSNHzJpCAVUrIH8YasS+AurCOwGMdvODLF6dx7yR -MdxbiszrBry8J0TdvqElHZ1YmQDwoHH7R4pUd31jsk4gnE6pkqLgWwVAy0LXXGsg -2JfnDvdQY8fIHkuezLdhOyO9pRlXSYv4fLdMaSjHyEcwr2hnm5tm5RsBwM+u0sDc -yBqUjwoN8NTuLLasfJzzmjeHWDcRGFbzKt/xlUkQ7pf+xdelnLOstuPDGglB1U85 -REhx4rQGKg7nAiA0FX4e4Ms3OXUnmtsTALk5YMiMF3jUp4pRDhHFKBgsYQ== ------END DSA PRIVATE KEY----- diff --git a/test/fixtures/keys/dsa_private_encrypted.pem b/test/fixtures/keys/dsa_private_encrypted.pem deleted file mode 100644 index 49b3375baf7194..00000000000000 --- a/test/fixtures/keys/dsa_private_encrypted.pem +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN DSA PRIVATE KEY----- -Proc-Type: 4,ENCRYPTED -DEK-Info: AES-256-CBC,FABA263DD471F214EF3E02699B837C20 - -Tj2+4x9MEIaQGFQ4o7hk12MriVYyvLO5aCbqq7LG5uhVk546/+bJc6hewdSwb6oT -MYPbuV+QTdtqshqFESA0McyGlj4w1tOg5TomP84NTKvwTO1EirVLMukfF3dqaguw -C117AZJkGbqgbi6lZ2bG0Hta6HRbhI5+ODFtOp3rKQ2KwVmtL7zw6vt3PCISeMHN -fLqikDc2+YoI9V1FJis9/FATyqV8yrJYYQQpP1RQN+gDY4SSs/eUr+Me7RNy6Lz7 -oH0tDaPGbiafwrZe1okksjxT2JQz1Q3hciBPikgdQIoE2NWTUlOeRYX0T0N2n37S -6Odbcr522e+2XjcLj34Ozthp+Q5mIDcLuakazxkXhq0RyhJ7vo+xA2YiP7Q3vH7g -oAnsJPFNVY6wJhprZi2VofKIUJUiajAXGDVX2yEIG/DOA9rnx0ZP+zopXMi4ptu0 -RzWyAL+P4jn0b8vgPf9CYJmn4VNfOcVmomZ1Bw6hzqTE2FnThJCXU3l2eaC/wcSR -uMRp8c6IM8AR5DUzUBKIckkvXj1m5iSZoKuR8dB7s9BhrRtBAI7K3G254G06sByv -0pnft8r+BkMqgdfG4rJQoQJw7tVYln+pL/gYPDuYsqyJ9kFuHDqtBvlozqXY5AL1 -XQaXoD6xMACEoJSIv5y+TzFzXwFQrDW+G1724YOSbiioUfGD0tRfjj2ei63PThQr -Z50SryfKQQf4UgcJeokMhmRWT2vPXEFWEP1b2FMEQxBy6fyKcqwZBAbhqF6usGEB -nwr/S1HXQAGEsWoc/Z4yynB7uhOwWu/Vpj+V6B98NmC7EUX15Why8zCsT9gzaIgC -M6sZafHhcmjfwc+lL9xFlU/wnAOz0LeKZWry3D0sXZn1r2FRlOJdtLLx01Sve/MU -ZRsgEDTkzv8E9dDltMeq8HQDCgLT1USTMWcY1kMELBj7y7ZdCWjH1QhTq2KlId+o -1X28zJOsOL/XRseUSlpjmSSLRw1QQEypNCY2+tcvViAvn3AifipBbdzUNhvygLhc -a2+5rYsd8BBEFnMJx7lDiyqXGnZkBbhbCSIudppNcjC+akFlFp6fBzkp4mKBuKpc -hwBBdfqdEyzqu6SVHM8nGV/aDoRuu9shV6MX0y/KnIgLedudn8aN2eLgjR5k1+99 ------END DSA PRIVATE KEY----- diff --git a/test/fixtures/keys/dsa_private_pkcs8.pem b/test/fixtures/keys/dsa_private_pkcs8.pem deleted file mode 100644 index 8e4be9e7224fd1..00000000000000 --- a/test/fixtures/keys/dsa_private_pkcs8.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIICZQIBADCCAjoGByqGSM44BAEwggItAoIBAQChLDcaF/TawxKZ3mTau9Kp/p4k -8U7t8cNHK8MNuJ+M7r8EpIiRczjerIKp10LThqsqDvBzVAMRDyBvXekKacLREGKW -MTqR7jIrjpDkmOIQof1TV4Ju1OuFwassODBuq9EzToQ3oh8Avc4EXpjNL3Cff8R9 -LBbZnyAAiSNmtOMRRNX7+AQB18SB39YBnFxz3Ngo7A/LT8uOOV1DDl+w+UgSRLXI -kWVYyiRKxlViUktHTqHVLiRCgTcGoQuKsf8VB8nfpExEWxopnqdBhLrpBzyvJtDD -ZWU4myqJGhNIPBEQ/PqP2gtiHUR7zqPle32NuIGsrfdRuROv+MG07QnY9HT7AiEA -hch7FLktAk9KiL3qTo5TjKssuYAhjyBL2Z1hN1unBx0CggEBAII3eBOMWI+AFD9u -P8R2n3D3RID51D9WedgNMxzP4yL/yyC2VDc70IIVvTfbtic4vC/GyZJp1P1esirX -/mMYPZW2MUNWWuJ2NgBKuN7NHaR2vvzUb5vG1U1C4g4pmX3Gqu4KYdRJJEv++4JH -qkqwDzVk9+l1wuHdFhjEMihMrq1VfgatfltzEYMhQJCJNqoq/03OmbWWIEtGbosd -zMGwWTY5WtHIyxPeCHQnoNJTD53D9Wu7UnqCWSuvQLEFagnrlu1yq0XJBX/vpu2i -v1CBz/P2y5gGglndRrTIB+/cnYSs6zUIBuHgtY1QsD14k5tjZHiwBXtDzA4xPmOa -Mqji6ekEIgIgNBV+HuDLNzl1J5rbEwC5OWDIjBd41KeKUQ4RxSgYLGE= ------END PRIVATE KEY----- diff --git a/test/fixtures/keys/dsa_public.pem b/test/fixtures/keys/dsa_public.pem deleted file mode 100644 index 7d2f2c63bc8e0e..00000000000000 --- a/test/fixtures/keys/dsa_public.pem +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIIDSDCCAjoGByqGSM44BAEwggItAoIBAQChLDcaF/TawxKZ3mTau9Kp/p4k8U7t -8cNHK8MNuJ+M7r8EpIiRczjerIKp10LThqsqDvBzVAMRDyBvXekKacLREGKWMTqR -7jIrjpDkmOIQof1TV4Ju1OuFwassODBuq9EzToQ3oh8Avc4EXpjNL3Cff8R9LBbZ -nyAAiSNmtOMRRNX7+AQB18SB39YBnFxz3Ngo7A/LT8uOOV1DDl+w+UgSRLXIkWVY -yiRKxlViUktHTqHVLiRCgTcGoQuKsf8VB8nfpExEWxopnqdBhLrpBzyvJtDDZWU4 -myqJGhNIPBEQ/PqP2gtiHUR7zqPle32NuIGsrfdRuROv+MG07QnY9HT7AiEAhch7 -FLktAk9KiL3qTo5TjKssuYAhjyBL2Z1hN1unBx0CggEBAII3eBOMWI+AFD9uP8R2 -n3D3RID51D9WedgNMxzP4yL/yyC2VDc70IIVvTfbtic4vC/GyZJp1P1esirX/mMY -PZW2MUNWWuJ2NgBKuN7NHaR2vvzUb5vG1U1C4g4pmX3Gqu4KYdRJJEv++4JHqkqw -DzVk9+l1wuHdFhjEMihMrq1VfgatfltzEYMhQJCJNqoq/03OmbWWIEtGbosdzMGw -WTY5WtHIyxPeCHQnoNJTD53D9Wu7UnqCWSuvQLEFagnrlu1yq0XJBX/vpu2iv1CB -z/P2y5gGglndRrTIB+/cnYSs6zUIBuHgtY1QsD14k5tjZHiwBXtDzA4xPmOaMqji -6ekDggEGAAKCAQEAhNZvg1G/S0+fLul1fy9aeivU9pnOowJsw+dXz4lMLEaL/bAx -iZkp0I0Oabd4VafIp1XzZIajiNa6XSpseVtNHz7ulQoj7sYprh0jR8yaQgFVKyB/ -GGrEvgLqwjsBjHbzgyxence8kTHcW4rM6wa8vCdE3b6hJR2dWJkA8KBx+0eKVHd9 -Y7JOIJxOqZKi4FsFQMtC11xrINiX5w73UGPHyB5Lnsy3YTsjvaUZV0mL+Hy3TGko -x8hHMK9oZ5ubZuUbAcDPrtLA3MgalI8KDfDU7iy2rHyc85o3h1g3ERhW8yrf8ZVJ -EO6X/sXXpZyzrLbjwxoJQdVPOURIceK0BioO5w== ------END PUBLIC KEY----- diff --git a/test/fixtures/test_dsa_params.pem b/test/fixtures/test_dsa_params.pem new file mode 100644 index 00000000000000..70073722687ed2 --- /dev/null +++ b/test/fixtures/test_dsa_params.pem @@ -0,0 +1,14 @@ +-----BEGIN DSA PARAMETERS----- +MIICIAKCAQEAiJCR40HCtA6pk864XhKceke8N4chlrpwcphAXpHwSQGHlv1JJFyj +aPqugWtzwZH55g7qpIiT3fmg6V6PfzNfx4sQGlSjckZaN02WRUAacn0va6UbwyYV +7LZzuHlHzayHLl/btGeTF+zL+9eMLKfll+r+5bJXDMWh3xUD1Nldf+fsIsbVZI9Q +Nzf3L1/07XVTLedQYaE77OqVuu+cfoBtb+K5MsQdHMMN20BGjKIvGkJICuC448Gk +Dx1wpxz2vSJEi6FqXruM6c9yrPvhJKSfbVFYK2n82MMXMNNu9Dwqwsv6Ig6dIVyw +dKDrSw1Nz9j9TWA5BolNta3yMPHrEjCuIQIVAKq0ZZ0/36sZE1cqt6j0hZTisWUV +AoIBAFbI9MKn9DBJ7lo7+LRblgNKg9lk4D/6NBBRgOeCN4WnOxHQrqpSTUBG+VcA +BDKEfoHfEPI9KZKpEgpzGTpr7mGxDPLHfGL+vvf1EYbmcTDrUWlf9B/3+L3uwIdd +v3NYLepyEZ8L8g6eRGSQ4Svg1oSR/GAUTeGJczPg6qW0b/LTpf4eeDNWYGF6aogJ +UphnPcZ0Xqw+yvq/i1uzAVirUxp9Crb7km0dfA0G/HBiSdcEt6l8LdQd6qmcL0nx +cm9x6L+tSol5hXNynV0wcxdCQz4Xj5na+NoRGb9jPYxgLkoq07hwAkqkQDyF61tx +fWgGc7zmh/x6JMGe/Xhg1TvgxLs= +-----END DSA PARAMETERS----- diff --git a/test/fixtures/test_dsa_pkcs8_privkey.pem b/test/fixtures/test_dsa_pkcs8_privkey.pem new file mode 100644 index 00000000000000..3d15aa1162a97d --- /dev/null +++ b/test/fixtures/test_dsa_pkcs8_privkey.pem @@ -0,0 +1,15 @@ +-----BEGIN PRIVATE KEY----- +MIICZAIBADCCAjkGByqGSM44BAEwggIsAoIBAQC5CYW1vZHbx/Ytm+/m+oseHbre +kOd40VOSybqo6Us2NysFq+46rNlnR28Lkolg4nv+XK6YTlB3XbEwbibYa1uwCuAE +io/Zs2rfOpGNwp31Fg3pb8ZhFrnjmhrQhZfRT6bXXw3hvyXitjgQkwIsRL5OUYlQ +CEIbf+LsogikQez2+xaYYkqUqSYdb48IkVtDTMweWslpDKUmIfH1cy0osqMC97GR +8EXXvhK7sig2hhHtj+NFGA7majfEFmTd0mafZBlEFodqvkwV1q7TTMrDWgkO2lcc +2DEMjZ9on9xVszRhNCGIwuFJLhWBKfNZ59X7LUxEfkelpce0Kr5eFmxwN4n3AiEA +pK7pu7TqHqiIoGDmAyUm71gx3V5T3mNaih8Y/9h7dMsCggEAJNtfC6LqpU84UMz+ +nsxSch/ylDx1lyh3rOGZ9Wn+2tIhahI+hqDwmPeHvymzDHh2QjuXgzeZmo1753CB +CtYdU0GnumSEEUUCiTBbSsX6Zy0VI4w/Qy3WV5IoXXkF9YsbkC8JhPq9jHLa5Qt5 +59TF+347OFso5ae+XkkZ8C112UyKnYzvniqlbj0Cb4E7FadCzSggC9c2drYE12Mx +QEEbddAVNty5wpjh3Qd2y8kKPDSn4OCrSIXAL8WDXJk507RL5moqKnwis/3iPUXi +U7s8QmJP4B8Mn4vDM1O0rORCmz9KXz0f5M0lw39jdA/AG0fNNz86KCFTPdXz/Iz1 +ThphTQQiAiAhjvXffKp1V3nMiUUUsYzS2Msn14bBFiBwSdNgitRwEA== +-----END PRIVATE KEY----- diff --git a/test/fixtures/test_dsa_privkey.pem b/test/fixtures/test_dsa_privkey.pem new file mode 100644 index 00000000000000..2056740af99718 --- /dev/null +++ b/test/fixtures/test_dsa_privkey.pem @@ -0,0 +1,20 @@ +-----BEGIN DSA PRIVATE KEY----- +MIIDVQIBAAKCAQEAuQmFtb2R28f2LZvv5vqLHh263pDneNFTksm6qOlLNjcrBavu +OqzZZ0dvC5KJYOJ7/lyumE5Qd12xMG4m2GtbsArgBIqP2bNq3zqRjcKd9RYN6W/G +YRa545oa0IWX0U+m118N4b8l4rY4EJMCLES+TlGJUAhCG3/i7KIIpEHs9vsWmGJK +lKkmHW+PCJFbQ0zMHlrJaQylJiHx9XMtKLKjAvexkfBF174Su7IoNoYR7Y/jRRgO +5mo3xBZk3dJmn2QZRBaHar5MFdau00zKw1oJDtpXHNgxDI2faJ/cVbM0YTQhiMLh +SS4VgSnzWefV+y1MRH5HpaXHtCq+XhZscDeJ9wIhAKSu6bu06h6oiKBg5gMlJu9Y +Md1eU95jWoofGP/Ye3TLAoIBACTbXwui6qVPOFDM/p7MUnIf8pQ8dZcod6zhmfVp +/trSIWoSPoag8Jj3h78pswx4dkI7l4M3mZqNe+dwgQrWHVNBp7pkhBFFAokwW0rF ++mctFSOMP0Mt1leSKF15BfWLG5AvCYT6vYxy2uULeefUxft+OzhbKOWnvl5JGfAt +ddlMip2M754qpW49Am+BOxWnQs0oIAvXNna2BNdjMUBBG3XQFTbcucKY4d0HdsvJ +Cjw0p+Dgq0iFwC/Fg1yZOdO0S+ZqKip8IrP94j1F4lO7PEJiT+AfDJ+LwzNTtKzk +Qps/Sl89H+TNJcN/Y3QPwBtHzTc/OighUz3V8/yM9U4aYU0CggEAS8U79P4cax28 +Emh8kQqiLEyoo89LIsD+DiBuEpeSGb7ty29dP2eRIBce4AVHQ7D/Pwkm8bxnh5+Y +iDqD13344lZY32a5zMXmMnN1e/lPs21p/z7XO/5ggDzw+h7EQHPIAF87KvPFiO14 +Vi1m9IzG/Nmu4Flks+4IBXlsXxgLDbYjtuQuOhmU+VtIxiQbrbe+wVMhzzaDNMt/ +wXr5twAwWbPqJynPlodndElETz6dNLL0gW61uHN/CFsaMTLManftSifh5DJpglaL +yQ/2+uGje419/kOWOexZ8ysREKIBrhWhePolw8SAiygwbCUhgSbruWpJPpQOOtI5 +YTh2lIK0vAIgIY7133yqdVd5zIlFFLGM0tjLJ9eGwRYgcEnTYIrUcBA= +-----END DSA PRIVATE KEY----- diff --git a/test/fixtures/test_dsa_privkey_encrypted.pem b/test/fixtures/test_dsa_privkey_encrypted.pem new file mode 100644 index 00000000000000..11bc8fbdeee1c8 --- /dev/null +++ b/test/fixtures/test_dsa_privkey_encrypted.pem @@ -0,0 +1,16 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIICkjAcBgoqhkiG9w0BDAEDMA4ECLCAnNHA9e3tAgIIAASCAnC9H9ncbLh/TpT9 +jVecNZZ+udUB0qmaqIQ+qW03NJfrJdGhAd8tbhGb2hqIi4tLfOpUAQS93BfMXguM +hyVQWJLGreIm7ehIqXwwFJFts9WJWsS9UleHOTtKNQvft3Lkp29lR/DZtXsJfJbT +0gjjHFpGhaNnIEK8eRAoyXZTPLv6ZPvFp4szj7GjslP5dvkcBeXbgTlBAT4EVB9e +43tfF1J2wOnuIkQXvnZ5eVseYIbKpCjAU/ZkoZU6ySVvFkc3+NIB9qHqKsE4LKdp +wqhCuuh0b95TpiUoI+IIsLUbcGW7EZGwkVV2NxYZGpNehx5/kwGnH32KyDOqNVkm +y5sC96oRSXz9eAo69zC0LgFL4ZyHWa9gebgPXRSbegiLNt+wxE4arSPlwUaKWzlH +qEL2zzeVBIvuDwQ6SDMNiNv1GK68kaZ9AuR0jPn3COO2TgdWaigqrGPpNv8c/F2m +Hv1ex6FAJr88aglxU7K6gS7ayFtWZqdg4K7KIGrP8Ii/UCkzQxSnFRTFbjUJCK8A +5mM7/jpmUd/U6Ygl/QrtMjPBHN02CjTc3LZK92uUf0g1u838zX91FxvItzyockpg +rkZ5UWggZ2q0Hg7duYffjOR28d6u44JPIPJ9WIN2upsZoP1ABdUdazBRhpq9Da68 +7+lpZC5BGwhpiP93bB66T+QwjqLCDFygIaCii+vQq/814pk/i/7VBEVGm2iDjOx/ +Ng99ltKl+JDJ/lQwE27pp+JP+9Oe8uU94kelPA7w8xrj/YuukQbVY03+WYFag/Dn +uMJyKYOqm7LmHOQy8rggM9RjY6XQY0KV8BKX3wG+4zjARTLKRbo= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/test/fixtures/test_dsa_pubkey.pem b/test/fixtures/test_dsa_pubkey.pem new file mode 100644 index 00000000000000..54d01bef7ae72c --- /dev/null +++ b/test/fixtures/test_dsa_pubkey.pem @@ -0,0 +1,20 @@ +-----BEGIN PUBLIC KEY----- +MIIDRjCCAjkGByqGSM44BAEwggIsAoIBAQC5CYW1vZHbx/Ytm+/m+oseHbrekOd4 +0VOSybqo6Us2NysFq+46rNlnR28Lkolg4nv+XK6YTlB3XbEwbibYa1uwCuAEio/Z +s2rfOpGNwp31Fg3pb8ZhFrnjmhrQhZfRT6bXXw3hvyXitjgQkwIsRL5OUYlQCEIb +f+LsogikQez2+xaYYkqUqSYdb48IkVtDTMweWslpDKUmIfH1cy0osqMC97GR8EXX +vhK7sig2hhHtj+NFGA7majfEFmTd0mafZBlEFodqvkwV1q7TTMrDWgkO2lcc2DEM +jZ9on9xVszRhNCGIwuFJLhWBKfNZ59X7LUxEfkelpce0Kr5eFmxwN4n3AiEApK7p +u7TqHqiIoGDmAyUm71gx3V5T3mNaih8Y/9h7dMsCggEAJNtfC6LqpU84UMz+nsxS +ch/ylDx1lyh3rOGZ9Wn+2tIhahI+hqDwmPeHvymzDHh2QjuXgzeZmo1753CBCtYd +U0GnumSEEUUCiTBbSsX6Zy0VI4w/Qy3WV5IoXXkF9YsbkC8JhPq9jHLa5Qt559TF ++347OFso5ae+XkkZ8C112UyKnYzvniqlbj0Cb4E7FadCzSggC9c2drYE12MxQEEb +ddAVNty5wpjh3Qd2y8kKPDSn4OCrSIXAL8WDXJk507RL5moqKnwis/3iPUXiU7s8 +QmJP4B8Mn4vDM1O0rORCmz9KXz0f5M0lw39jdA/AG0fNNz86KCFTPdXz/Iz1Thph +TQOCAQUAAoIBAEvFO/T+HGsdvBJofJEKoixMqKPPSyLA/g4gbhKXkhm+7ctvXT9n +kSAXHuAFR0Ow/z8JJvG8Z4efmIg6g9d9+OJWWN9muczF5jJzdXv5T7Ntaf8+1zv+ +YIA88PoexEBzyABfOyrzxYjteFYtZvSMxvzZruBZZLPuCAV5bF8YCw22I7bkLjoZ +lPlbSMYkG623vsFTIc82gzTLf8F6+bcAMFmz6icpz5aHZ3RJRE8+nTSy9IFutbhz +fwhbGjEyzGp37Uon4eQyaYJWi8kP9vrho3uNff5DljnsWfMrERCiAa4VoXj6JcPE +gIsoMGwlIYEm67lqST6UDjrSOWE4dpSCtLw= +-----END PUBLIC KEY----- diff --git a/test/parallel/test-crypto-binary-default.js b/test/parallel/test-crypto-binary-default.js index 712a9c7e39977f..e4c66969f942ff 100644 --- a/test/parallel/test-crypto-binary-default.js +++ b/test/parallel/test-crypto-binary-default.js @@ -667,8 +667,8 @@ common.expectsError( // Test DSA signing and verification // { - const privateKey = fixtures.readKey('dsa_private.pem'); - const publicKey = fixtures.readKey('dsa_public.pem'); + const privateKey = fixtures.readSync('test_dsa_privkey.pem'); + const publicKey = fixtures.readSync('test_dsa_pubkey.pem'); const input = 'I AM THE WALRUS'; diff --git a/test/parallel/test-crypto-rsa-dsa.js b/test/parallel/test-crypto-rsa-dsa.js index 1e657b9e60d494..27aef688535c12 100644 --- a/test/parallel/test-crypto-rsa-dsa.js +++ b/test/parallel/test-crypto-rsa-dsa.js @@ -18,12 +18,12 @@ const rsaPubPem = fixtures.readKey('rsa_public.pem', 'ascii'); const rsaKeyPem = fixtures.readKey('rsa_private.pem', 'ascii'); const rsaKeyPemEncrypted = fixtures.readKey('rsa_private_encrypted.pem', 'ascii'); -const dsaPubPem = fixtures.readKey('dsa_public.pem', 'ascii'); -const dsaKeyPem = fixtures.readKey('dsa_private.pem', 'ascii'); -const dsaKeyPemEncrypted = fixtures.readKey('dsa_private_encrypted.pem', - 'ascii'); +const dsaPubPem = fixtures.readSync('test_dsa_pubkey.pem', 'ascii'); +const dsaKeyPem = fixtures.readSync('test_dsa_privkey.pem', 'ascii'); +const dsaKeyPemEncrypted = fixtures.readSync('test_dsa_privkey_encrypted.pem', + 'ascii'); const rsaPkcs8KeyPem = fixtures.readKey('rsa_private_pkcs8.pem'); -const dsaPkcs8KeyPem = fixtures.readKey('dsa_private_pkcs8.pem'); +const dsaPkcs8KeyPem = fixtures.readSync('test_dsa_pkcs8_privkey.pem'); const decryptError = { message: 'error:06065064:digital envelope routines:EVP_DecryptFinal_ex:' + From 1d03c42bab4f0c9df60e117f90342a45187d17d5 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Wed, 5 Jun 2019 15:20:28 -0700 Subject: [PATCH 15/17] Revert "test: move rsa keypairs to fixtures/keys/" This reverts commit 56d338305d24c29a8898486bd30752665cedb913. --- ...56_signature_signedby_rsa_private_b.sha256 | Bin 256 -> 0 bytes test/fixtures/keys/Makefile | 40 ---------------- test/fixtures/keys/rsa_private.pem | 27 ----------- test/fixtures/keys/rsa_private_b.pem | 27 ----------- test/fixtures/keys/rsa_private_encrypted.pem | 30 ------------ test/fixtures/keys/rsa_private_pkcs8.pem | 28 ------------ test/fixtures/keys/rsa_private_pkcs8_bad.pem | 28 ------------ test/fixtures/keys/rsa_public.pem | 9 ---- test/fixtures/keys/rsa_public_b.pem | 9 ---- ...c_sha1_signature_signedby_rsa_private.sha1 | 2 - ..._signature_signedby_rsa_private_pkcs8.sha1 | 2 - test/fixtures/test_bad_rsa_privkey.pem | 10 ++++ test/fixtures/test_rsa_pkcs8_privkey.pem | 16 +++++++ test/fixtures/test_rsa_privkey.pem | 15 ++++++ test/fixtures/test_rsa_privkey_2.pem | 15 ++++++ test/fixtures/test_rsa_privkey_encrypted.pem | 17 +++++++ test/fixtures/test_rsa_pubkey.pem | 6 +++ test/fixtures/test_rsa_pubkey_2.pem | 5 ++ test/parallel/test-crypto-binary-default.js | 29 +++++++----- test/parallel/test-crypto-key-objects.js | 4 +- test/parallel/test-crypto-rsa-dsa.js | 43 ++++++++++-------- test/parallel/test-crypto.js | 11 +++-- 22 files changed, 134 insertions(+), 239 deletions(-) delete mode 100644 test/fixtures/keys/I_AM_THE_WALRUS_sha256_signature_signedby_rsa_private_b.sha256 delete mode 100644 test/fixtures/keys/rsa_private.pem delete mode 100644 test/fixtures/keys/rsa_private_b.pem delete mode 100644 test/fixtures/keys/rsa_private_encrypted.pem delete mode 100644 test/fixtures/keys/rsa_private_pkcs8.pem delete mode 100644 test/fixtures/keys/rsa_private_pkcs8_bad.pem delete mode 100644 test/fixtures/keys/rsa_public.pem delete mode 100644 test/fixtures/keys/rsa_public_b.pem delete mode 100644 test/fixtures/keys/rsa_public_sha1_signature_signedby_rsa_private.sha1 delete mode 100644 test/fixtures/keys/rsa_public_sha1_signature_signedby_rsa_private_pkcs8.sha1 create mode 100644 test/fixtures/test_bad_rsa_privkey.pem create mode 100644 test/fixtures/test_rsa_pkcs8_privkey.pem create mode 100644 test/fixtures/test_rsa_privkey.pem create mode 100644 test/fixtures/test_rsa_privkey_2.pem create mode 100644 test/fixtures/test_rsa_privkey_encrypted.pem create mode 100644 test/fixtures/test_rsa_pubkey.pem create mode 100644 test/fixtures/test_rsa_pubkey_2.pem diff --git a/test/fixtures/keys/I_AM_THE_WALRUS_sha256_signature_signedby_rsa_private_b.sha256 b/test/fixtures/keys/I_AM_THE_WALRUS_sha256_signature_signedby_rsa_private_b.sha256 deleted file mode 100644 index 59eb6c7c8831cc21f840333ef9b1fd375997969e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmV+b0ssCa`<*sOtJZ2_Xso%22DtCR2=2O46@e(%w`g0WQup7IIJApcZ^}TeJ#Wkq zV`aA)8anIRgMvQXTus&?Pku}yJzz4U(i-#tP?~8T>FH!KK*NFD;GH1zfk(ftAO{6W z%J>u4hmn(!5@)Aqyt(dyuVg=+HJ@I6j)2da{z5wKI_T_qi8Ui=mq#ILj*w_vtdv9k zcJ0?Q5I7u7R@C!qbI2e*WnGM@ZEfmL%l^*?HDw*2v41)Oho&$)*G7*F2%F*$iwS;-5}QR8`Y^#%RKg+hC6Rnu7TKAP?aKwGco0 GrD6ik<9l}i diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile index c51991575edcf7..85253ad967b0d5 100644 --- a/test/fixtures/keys/Makefile +++ b/test/fixtures/keys/Makefile @@ -31,16 +31,6 @@ all: \ ec-cert.pem \ ec.pfx \ fake-cnnic-root-cert.pem \ - rsa_private.pem \ - rsa_private_encrypted.pem \ - rsa_private_pkcs8.pem \ - rsa_private_pkcs8_bad.pem \ - rsa_public.pem \ - rsa_public_sha1_signature_signedby_rsa_private.sha1 \ - rsa_public_sha1_signature_signedby_rsa_private_pkcs8.sha1 \ - rsa_private_b.pem \ - I_AM_THE_WALRUS_sha256_signature_signedby_rsa_private_b.sha256 \ - rsa_public_b.pem \ rsa_private_1024.pem \ rsa_private_2048.pem \ rsa_private_4096.pem \ @@ -576,36 +566,6 @@ dsa_private_encrypted_1025.pem: dsa_public_1025.pem: openssl dsa -in dsa_private_1025.pem -pubout -out dsa_public_1025.pem -rsa_private.pem: - openssl genrsa -out rsa_private.pem 2048 - -rsa_private_encrypted.pem: rsa_private.pem - openssl rsa -aes256 -in rsa_private.pem -passout 'pass:password' -out rsa_private_encrypted.pem - -rsa_private_pkcs8.pem: rsa_private.pem - openssl pkcs8 -topk8 -inform PEM -outform PEM -in rsa_private.pem -out rsa_private_pkcs8.pem -nocrypt - -rsa_private_pkcs8_bad.pem: rsa_private_pkcs8.pem - sed 's/PRIVATE/RSA PRIVATE/g' rsa_private_pkcs8.pem > rsa_private_pkcs8_bad.pem - -rsa_public.pem: rsa_private.pem - openssl rsa -in rsa_private.pem -pubout -out rsa_public.pem - -rsa_public_sha1_signature_signedby_rsa_private.sha1: rsa_public.pem rsa_private.pem - openssl dgst -sha1 -sign rsa_private.pem -out rsa_public_sha1_signature_signedby_rsa_private.sha1 rsa_public.pem - -rsa_public_sha1_signature_signedby_rsa_private_pkcs8.sha1: rsa_public.pem rsa_private_pkcs8.pem - openssl dgst -sha1 -sign rsa_private_pkcs8.pem -out rsa_public_sha1_signature_signedby_rsa_private_pkcs8.sha1 rsa_public.pem - -rsa_private_b.pem: - openssl genrsa -out rsa_private_b.pem 2048 - -I_AM_THE_WALRUS_sha256_signature_signedby_rsa_private_b.sha256: rsa_private_b.pem - echo -n "I AM THE WALRUS" | openssl dgst -sha256 -sign rsa_private_b.pem -out I_AM_THE_WALRUS_sha256_signature_signedby_rsa_private_b.sha256 - -rsa_public_b.pem: rsa_private_b.pem - openssl rsa -in rsa_private_b.pem -pubout -out rsa_public_b.pem - rsa_private_1024.pem: openssl genrsa -out rsa_private_1024.pem 1024 diff --git a/test/fixtures/keys/rsa_private.pem b/test/fixtures/keys/rsa_private.pem deleted file mode 100644 index 215e5cc5131251..00000000000000 --- a/test/fixtures/keys/rsa_private.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpQIBAAKCAQEAt9xYiIonscC3vz/A2ceR7KhZZlDu/5bye53nCVTcKnWd2seY -6UAdKersX6njr83Dd5OVe1BW/wJvp5EjWTAGYbFswlNmeD44edEGM939B6Lq+/8i -BkrTi8mGN4YCytivE24YI0D4XZMPfkLSpab2y/Hy4DjQKBq1ThZ0UBnK+9IhX37J -u/ZoGYSlTIGIhzyaiYBh7wrZBoPczIEu6et/kN2VnnbRUtkYTF97ggcv5h+hDpUQ -jQW0ZgOMcTc8n+RkGpIt0/iM/bTjI3Tz/gsFdi6hHcpZgbopPL630296iByyigQC -PJVzdusFrQN5DeC+zT/nGypQkZanLb4ZspSx9QIDAQABAoIBAQCS2erYu8gyoGPi -3E/zYgQ6ishFAZWzDWSFubwD5wSm4SSAzvViL/RbO6kqS25xR569DmLRiHzD17VI -mJMsNECUnPrqR2TL256OJZaXrNHh3I1lUwVhEzjeKMsL4/ys+d70XPXoiocVblVs -moDXEIGEqa48ywPvVE3Fngeuxrsq3/GCVBNiwtt0YjAOZxmKEh31UZdHO+YI+wNF -/Z8KQCPscN5HGlR0SIQOlqMANz49aKStrevdvjS1UcpabzDEkuK84g3saJhcpAhb -pGFmAf5GTjkkhE0rE1qDF15dSqrKGfCFtOjUeK17SIEN7E322ChmTReZ1hYGfoSV -cdFntUINAoGBAPFKL5QeJ6wZu8R/ru11wTG6sQA0Jub2hGccPXpbnPrT+3CACOLI -JTCLy/xTKW3dqRHj/wZEe+jUw88w7jwGb1BkWr4BI8tDvY9jQLP1jyuLWRfrxXbp -4Z0oeBBwBeCI/ZG7FIvdDTqWxn1aj3Tmh6s4ByqEdtwrrrJPcBUNl01fAoGBAMMR -3RGE/ca6X6xz6kgUD6TtHVhiiRJK1jm/u+q0n7i/MBkeDgTZkHYS7lPc0yIdtqaI -Plz5yzwHnAvuMrv8LSdkjwioig2yQa3tAij8kXxqs7wN5418DMV2s1OJBrPthYPs -bv4im2iI8V63JQS4ZMYQbckq8ABYccTpOnxXDy0rAoGBAKkvzHa+QjERhjB9GyoT -1FhLQIsVBmYSWrp1+cGO9V6HPxoeHJzvm+wTSf/uS/FmaINL6+j4Ii4a6gWgmJts -I6cqBtqNsAx5vjQJczf8KdxthBYa0sXTrsfktXNJKUXMqIgDtp9vazQ2vozs8AQX -FPAAhD3SzgkJdCBBRSTt97ZfAoGAWAziKpxLKL7LnL4dzDcx8JIPIuwnTxh0plCD -dCffyLaT8WJ9lXbXHFTjOvt8WfPrlDP/Ylxmfkw5BbGZOP1VLGjZn2DkH9aMiwNm -bDXFPdG0G3hzQovx/9fajiRV4DWghLHeT9wzJfZabRRiI0VQR472300AVEeX4vgb -rDBn600CgYEAk7czBCT9rHn/PNwCa17hlTy88C4vXkwbz83Oa+aX5L4e5gw5lhcR -2ZuZHLb2r6oMt9rlD7EIDItSs+u21LOXWPTAlazdnpYUyw/CzogM/PN+qNwMRXn5 -uXFFhmlP2mVg2EdELTahXch8kWqHaCSX53yvqCtRKu/j76V31TfQZGM= ------END RSA PRIVATE KEY----- diff --git a/test/fixtures/keys/rsa_private_b.pem b/test/fixtures/keys/rsa_private_b.pem deleted file mode 100644 index 96d82ae2e24a3c..00000000000000 --- a/test/fixtures/keys/rsa_private_b.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAyb1grrN+29fxeeEbTaSEja6TKDTpT/WXnqrFCS+h7IYcnDoA -VwcsPU5FZeUPvLKMzi9NHSJ34LQCurqHgH8X+cw0YT3gdYS/7qoQiXs+zKv615Nc -ttD3xlQLceY+NwznoPXyyZwOeZqyU5Hiqbrqu6hdr6gQYogMNLn2NxBW2pGegd6+ -ZGMCX3+/BtMP/6tXmttYjY+yhN2SrGz5cKhWpcHiC6X+B7uCKoKZy+t2jUxYVKUw -Wr1ZuM8kpSnuVCcv1OoMGEimEHA7v/eaF/y+z/VdQ4Y88GhTnVN4KbtgZ+o9Pohj -xLFU62VeTALixU5mPQKSgSICKfjev0FUUurF6wIDAQABAoIBAQCs11C/PM/iYNfl -mSSAWAStMrWni/Wc6QhXC2422ZV8hMZ8XwEtjtqrR6UTkLXz8HHMsR/7Zy2X2gJA -o1E2mS0ceoUiDxaA+RRL0W7Lq0j5qBsImZukkdLHG/iWRDJnjenhsParHsYUD6Lb -ELFGw/safjyOI4quMGtsvSqisKAJL5ZCPD5JHLhnNP8HXT6icSZrsqGhunb2tsa+ -Ogcx1+bZzqdTsbvXdbw07Lnd/LRU0NDhjeEVl4J2yFNYY+OIj7/qrxSnZnGLLG0Y -DFxiD+HCMvTBSooqvWI6FAipfyCGjUznGsVaRv7TuzHPuKE4LtbIC/Ac3Q10rKWq -PmHALir5AoGBAOhGUCToWfYnj2zH0GIZQxnkrv9iRqmdGeCDX6ZM00Bs5tASnRo0 -o90UtLbhWjHe1PKRKFyD4I7a8iIWxcWWun2XHgOtItctPN+lbjpTHTyE2yA1iZhe -dKCV3bAo4t+puKrPkZmaBqFD/fQx7DNxYdRERa1giiZGhlMUN3l7/S21AoGBAN5Y -nZ68NkTgklk4YBzsxwsMpQbgbihyG79gtDFxWonxZUQ29EsL01yd30pJNhg1LxDN -0fADfHVzkZ3qYz9knge9a75Yk8UBM3DM+xu+DRkjKhK5mPX5oLvj6061u3Scs6tj -orpU/mV1amz5gqrkefMaelsdHRuGGZQVx9KTV2kfAoGBAN7EAL1E8nK4Qj/r6xkK -bWZ6ArQABxFJELZYiPWvnLOfPka0c2PctIOmBiOXQa+urMDvIqyH9mhL6Al1mbwE -8VreAfU4qb+BLW649FyPteyC5r2fWxV9EZGp6fG3ZM9psShw5o1QQaeM1BTNhGFa -Dp9L0x+TBSvsW4t2SjYDCjA5AoGASzxxGWVWd7gFzWrmGuOD9pkwvkLzA3yZJwjx -8EkK+eJVAeAWic5WluBUzi43v7k/U9BRWYXUd2nDvEuziZ/iWXwfGSmf1umxHlo+ -HgURKZBcjDmBKLpvSSS2WsvjwnHD2hq81ZAtBOfWO0myjWECYuByxqHzV3zo6tLz -6q0wxsECgYA26twPrAoRqvfvPnNj6o0LrsE39Tj6jHIVijT7Lbcf2xVnaDiQ18PQ -RC6Tgkz5KZf8GKfMRMA3WopGn9QE2luI4RLIbhLozEDrkk2L7wSYqI9DZ1Hd26wf -v3+3jdpsXkzHwWYz1a2+FhCF5mJJRQl6kd/B0wu00vdfwviK9OVO7w== ------END RSA PRIVATE KEY----- diff --git a/test/fixtures/keys/rsa_private_encrypted.pem b/test/fixtures/keys/rsa_private_encrypted.pem deleted file mode 100644 index f1914289ec4f7f..00000000000000 --- a/test/fixtures/keys/rsa_private_encrypted.pem +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -Proc-Type: 4,ENCRYPTED -DEK-Info: AES-256-CBC,DB3D20E60E8FDC3356BD79712FF8EF7E - -K+vu0U3IFTJBBi6zW5Zng80O1jXq/ZmlOFs/j/SQpPwfW1Do9i/Dwa7ntBlTwrCm -sd3IIPgu2ikfLwxvbxsZN540oCaCqaZ/bmmyzH3MyVDA9MllUu+X8+Q3ATzcYa9R -U5XfF5DAXsSRnstCbmKagWVQpO0oX8k3ratfny6Ixq86Y82tK8+o5YiBFq1kqa+9 -4yat7IWQbqV5ifUtUPCHZwEqBt+WKazX05BqERjkckHdpfaDrBvSSPXTwoLm6uRR -ktkUVpO4tHMZ4VlcTfFtpz8gdYYod0nM6vz26hvbESHSwztSgMhmKdsE5eqmYfgu -F4WkEN4bqAiPjKK3jnUKPt/vg2oKYFQlVYFl9QnBjiRqcQTi3e9lwn1hI7uoMb6g -HuaCc57JJHPN/ZLP3ts4ZxFbwUjTGioh5Zh6WozG3L3+Ujwq/sDrAskRyzdcuP7I -Rs3oLbHY03OHyg8IbxR5Iu89l6FLqnR45yvbxXtZ7ImGOPM5Z9pB1CzDhGDx2F6g -J/Kf/7ZF2DmYUVbVKDfESEDhRfuMAVzhasDPTRqipSA5QvJVQY+J/6QDPrNNmHVB -4e4ouHIDWERUf0t1Be7THvP3X8OJozj2HApzqa5ZCaJDo8eaL8TCD5uH75ID5URJ -VscGHaUXT8/sxfHi1x8BibW5W5J/akFsnrnJU/1BZgGznIxjf5tKfHGppSIVdlKP -3ghYNmEIFPNJ6cxuUA0D2IOV4uO3FTCU6seIzvJhYkmXnticcZYGtmGxXKrodtzS -J1YuaNkkO/YRZah285lQ6QCIhCFo4Oa4ILjgoTQISuw7nQj5ESyncauzLUBXKX0c -XDUej64KNTvVF9UXdG48fYvNmSZWCnTye4UmPu17FmwpVra38U+EdoLyWyMIAI5t -rP6Hhgc9BxOo41Im9QpTcAPfKAknP8Rbm3ACJG5T9FKq/c29d1E//eFR6SL51e/a -yWdCgJN/FJOAX60+erPwoVoRFEttAeDPkklgFGdc8F4LIYAig9gEZ92ykFFz3fWz -jIcUVLrL+IokFbPVUBoMihqVyMQsWH+5Qq9wjxf6EDIf0BVtm9U4BJoOkPStFIfF -Kof7OVv7izyL8R/GIil9VQs9ftwkIUPeXx2Hw0bE3HJ3C8K4+mbLg3tKhGnBDU5Z -Xm5mLHoCRBa3ZRFWZtigX7POszdLAzftYo8o65Be4OtPS+tQAORk9gHsXATv7dDB -OGw61x5KA55LHVHhWaRvu3J8E7nhxw0q/HskyZhDC+Y+Xs6vmQSb4nO4ET4NYX1P -m3PMdgGoqRDJ2jZw4eoQdRKCM0EHSepSAYpO1tcAXhPZS4ITogoRgPpVgOebEQUL -nKNeNu/BxMSH/IH15jjDLF3TiEoguF9xdTaCxIBzE1SFpVO0u9m9vXpWdPThVgsb -VcEI487p7v9iImP3BYPT8ZYvytC26EH0hyOrwhahTvTb4vXghkLIyvPUg1lZHc6e -aPHb2AzYAHLnp/ehDQGKWrCOJ1JE2vBv8ZkLa+XZo7YASXBRZitPOMlvykEyzxmR -QAmNhKGvFmeM2mmHAp0aC03rgF3lxNsXQ1CyfEdq3UV9ReSnttq8gtrJfCwxV+wY ------END RSA PRIVATE KEY----- diff --git a/test/fixtures/keys/rsa_private_pkcs8.pem b/test/fixtures/keys/rsa_private_pkcs8.pem deleted file mode 100644 index cd274ae6d9071d..00000000000000 --- a/test/fixtures/keys/rsa_private_pkcs8.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC33FiIiiexwLe/ -P8DZx5HsqFlmUO7/lvJ7necJVNwqdZ3ax5jpQB0p6uxfqeOvzcN3k5V7UFb/Am+n -kSNZMAZhsWzCU2Z4Pjh50QYz3f0Hour7/yIGStOLyYY3hgLK2K8TbhgjQPhdkw9+ -QtKlpvbL8fLgONAoGrVOFnRQGcr70iFffsm79mgZhKVMgYiHPJqJgGHvCtkGg9zM -gS7p63+Q3ZWedtFS2RhMX3uCBy/mH6EOlRCNBbRmA4xxNzyf5GQaki3T+Iz9tOMj -dPP+CwV2LqEdylmBuik8vrfTb3qIHLKKBAI8lXN26wWtA3kN4L7NP+cbKlCRlqct -vhmylLH1AgMBAAECggEBAJLZ6ti7yDKgY+LcT/NiBDqKyEUBlbMNZIW5vAPnBKbh -JIDO9WIv9Fs7qSpLbnFHnr0OYtGIfMPXtUiYkyw0QJSc+upHZMvbno4llpes0eHc -jWVTBWETON4oywvj/Kz53vRc9eiKhxVuVWyagNcQgYSprjzLA+9UTcWeB67Guyrf -8YJUE2LC23RiMA5nGYoSHfVRl0c75gj7A0X9nwpAI+xw3kcaVHRIhA6WowA3Pj1o -pK2t692+NLVRylpvMMSS4rziDexomFykCFukYWYB/kZOOSSETSsTWoMXXl1KqsoZ -8IW06NR4rXtIgQ3sTfbYKGZNF5nWFgZ+hJVx0We1Qg0CgYEA8UovlB4nrBm7xH+u -7XXBMbqxADQm5vaEZxw9eluc+tP7cIAI4sglMIvL/FMpbd2pEeP/BkR76NTDzzDu -PAZvUGRavgEjy0O9j2NAs/WPK4tZF+vFdunhnSh4EHAF4Ij9kbsUi90NOpbGfVqP -dOaHqzgHKoR23Cuusk9wFQ2XTV8CgYEAwxHdEYT9xrpfrHPqSBQPpO0dWGKJEkrW -Ob+76rSfuL8wGR4OBNmQdhLuU9zTIh22pog+XPnLPAecC+4yu/wtJ2SPCKiKDbJB -re0CKPyRfGqzvA3njXwMxXazU4kGs+2Fg+xu/iKbaIjxXrclBLhkxhBtySrwAFhx -xOk6fFcPLSsCgYEAqS/Mdr5CMRGGMH0bKhPUWEtAixUGZhJaunX5wY71Xoc/Gh4c -nO+b7BNJ/+5L8WZog0vr6PgiLhrqBaCYm2wjpyoG2o2wDHm+NAlzN/wp3G2EFhrS -xdOux+S1c0kpRcyoiAO2n29rNDa+jOzwBBcU8ACEPdLOCQl0IEFFJO33tl8CgYBY -DOIqnEsovsucvh3MNzHwkg8i7CdPGHSmUIN0J9/ItpPxYn2VdtccVOM6+3xZ8+uU -M/9iXGZ+TDkFsZk4/VUsaNmfYOQf1oyLA2ZsNcU90bQbeHNCi/H/19qOJFXgNaCE -sd5P3DMl9lptFGIjRVBHjvbfTQBUR5fi+BusMGfrTQKBgQCTtzMEJP2sef883AJr -XuGVPLzwLi9eTBvPzc5r5pfkvh7mDDmWFxHZm5kctvavqgy32uUPsQgMi1Kz67bU -s5dY9MCVrN2elhTLD8LOiAz8836o3AxFefm5cUWGaU/aZWDYR0QtNqFdyHyRaodo -JJfnfK+oK1Eq7+PvpXfVN9BkYw== ------END PRIVATE KEY----- diff --git a/test/fixtures/keys/rsa_private_pkcs8_bad.pem b/test/fixtures/keys/rsa_private_pkcs8_bad.pem deleted file mode 100644 index ca36972e3a6503..00000000000000 --- a/test/fixtures/keys/rsa_private_pkcs8_bad.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC33FiIiiexwLe/ -P8DZx5HsqFlmUO7/lvJ7necJVNwqdZ3ax5jpQB0p6uxfqeOvzcN3k5V7UFb/Am+n -kSNZMAZhsWzCU2Z4Pjh50QYz3f0Hour7/yIGStOLyYY3hgLK2K8TbhgjQPhdkw9+ -QtKlpvbL8fLgONAoGrVOFnRQGcr70iFffsm79mgZhKVMgYiHPJqJgGHvCtkGg9zM -gS7p63+Q3ZWedtFS2RhMX3uCBy/mH6EOlRCNBbRmA4xxNzyf5GQaki3T+Iz9tOMj -dPP+CwV2LqEdylmBuik8vrfTb3qIHLKKBAI8lXN26wWtA3kN4L7NP+cbKlCRlqct -vhmylLH1AgMBAAECggEBAJLZ6ti7yDKgY+LcT/NiBDqKyEUBlbMNZIW5vAPnBKbh -JIDO9WIv9Fs7qSpLbnFHnr0OYtGIfMPXtUiYkyw0QJSc+upHZMvbno4llpes0eHc -jWVTBWETON4oywvj/Kz53vRc9eiKhxVuVWyagNcQgYSprjzLA+9UTcWeB67Guyrf -8YJUE2LC23RiMA5nGYoSHfVRl0c75gj7A0X9nwpAI+xw3kcaVHRIhA6WowA3Pj1o -pK2t692+NLVRylpvMMSS4rziDexomFykCFukYWYB/kZOOSSETSsTWoMXXl1KqsoZ -8IW06NR4rXtIgQ3sTfbYKGZNF5nWFgZ+hJVx0We1Qg0CgYEA8UovlB4nrBm7xH+u -7XXBMbqxADQm5vaEZxw9eluc+tP7cIAI4sglMIvL/FMpbd2pEeP/BkR76NTDzzDu -PAZvUGRavgEjy0O9j2NAs/WPK4tZF+vFdunhnSh4EHAF4Ij9kbsUi90NOpbGfVqP -dOaHqzgHKoR23Cuusk9wFQ2XTV8CgYEAwxHdEYT9xrpfrHPqSBQPpO0dWGKJEkrW -Ob+76rSfuL8wGR4OBNmQdhLuU9zTIh22pog+XPnLPAecC+4yu/wtJ2SPCKiKDbJB -re0CKPyRfGqzvA3njXwMxXazU4kGs+2Fg+xu/iKbaIjxXrclBLhkxhBtySrwAFhx -xOk6fFcPLSsCgYEAqS/Mdr5CMRGGMH0bKhPUWEtAixUGZhJaunX5wY71Xoc/Gh4c -nO+b7BNJ/+5L8WZog0vr6PgiLhrqBaCYm2wjpyoG2o2wDHm+NAlzN/wp3G2EFhrS -xdOux+S1c0kpRcyoiAO2n29rNDa+jOzwBBcU8ACEPdLOCQl0IEFFJO33tl8CgYBY -DOIqnEsovsucvh3MNzHwkg8i7CdPGHSmUIN0J9/ItpPxYn2VdtccVOM6+3xZ8+uU -M/9iXGZ+TDkFsZk4/VUsaNmfYOQf1oyLA2ZsNcU90bQbeHNCi/H/19qOJFXgNaCE -sd5P3DMl9lptFGIjRVBHjvbfTQBUR5fi+BusMGfrTQKBgQCTtzMEJP2sef883AJr -XuGVPLzwLi9eTBvPzc5r5pfkvh7mDDmWFxHZm5kctvavqgy32uUPsQgMi1Kz67bU -s5dY9MCVrN2elhTLD8LOiAz8836o3AxFefm5cUWGaU/aZWDYR0QtNqFdyHyRaodo -JJfnfK+oK1Eq7+PvpXfVN9BkYw== ------END RSA PRIVATE KEY----- diff --git a/test/fixtures/keys/rsa_public.pem b/test/fixtures/keys/rsa_public.pem deleted file mode 100644 index 8c30cfa52d47af..00000000000000 --- a/test/fixtures/keys/rsa_public.pem +++ /dev/null @@ -1,9 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt9xYiIonscC3vz/A2ceR -7KhZZlDu/5bye53nCVTcKnWd2seY6UAdKersX6njr83Dd5OVe1BW/wJvp5EjWTAG -YbFswlNmeD44edEGM939B6Lq+/8iBkrTi8mGN4YCytivE24YI0D4XZMPfkLSpab2 -y/Hy4DjQKBq1ThZ0UBnK+9IhX37Ju/ZoGYSlTIGIhzyaiYBh7wrZBoPczIEu6et/ -kN2VnnbRUtkYTF97ggcv5h+hDpUQjQW0ZgOMcTc8n+RkGpIt0/iM/bTjI3Tz/gsF -di6hHcpZgbopPL630296iByyigQCPJVzdusFrQN5DeC+zT/nGypQkZanLb4ZspSx -9QIDAQAB ------END PUBLIC KEY----- diff --git a/test/fixtures/keys/rsa_public_b.pem b/test/fixtures/keys/rsa_public_b.pem deleted file mode 100644 index bce0804617fcb6..00000000000000 --- a/test/fixtures/keys/rsa_public_b.pem +++ /dev/null @@ -1,9 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyb1grrN+29fxeeEbTaSE -ja6TKDTpT/WXnqrFCS+h7IYcnDoAVwcsPU5FZeUPvLKMzi9NHSJ34LQCurqHgH8X -+cw0YT3gdYS/7qoQiXs+zKv615NcttD3xlQLceY+NwznoPXyyZwOeZqyU5Hiqbrq -u6hdr6gQYogMNLn2NxBW2pGegd6+ZGMCX3+/BtMP/6tXmttYjY+yhN2SrGz5cKhW -pcHiC6X+B7uCKoKZy+t2jUxYVKUwWr1ZuM8kpSnuVCcv1OoMGEimEHA7v/eaF/y+ -z/VdQ4Y88GhTnVN4KbtgZ+o9PohjxLFU62VeTALixU5mPQKSgSICKfjev0FUUurF -6wIDAQAB ------END PUBLIC KEY----- diff --git a/test/fixtures/keys/rsa_public_sha1_signature_signedby_rsa_private.sha1 b/test/fixtures/keys/rsa_public_sha1_signature_signedby_rsa_private.sha1 deleted file mode 100644 index 0b5947929a6895..00000000000000 --- a/test/fixtures/keys/rsa_public_sha1_signature_signedby_rsa_private.sha1 +++ /dev/null @@ -1,2 +0,0 @@ -�yf�F���4}�x=�e Z'`a%�Z>Yt�mxd4E�c(�9��ȴ� �k��L�����2��+��q�Si��2:���[dfj/���5П�9�O<���8��'. O��eL�8���2�t�ӟ/��3�K����,��Њ�l��Zڅ�t�[��4�f��#�* �Y� ��餡w/���2ߗfꢅ�X��h�aYt�mxd4E�c(�9��ȴ� �k��L�����2��+��q�Si��2:���[dfj/���5П�9�O<���8��'. O��eL�8���2�t�ӟ/��3�K����,��Њ�l��Zڅ�t�[��4�f��#�* �Y� ��餡w/���2ߗfꢅ�X��h�a { // Test RSA signing and verification // { - const privateKey = fixtures.readKey('rsa_private_b.pem'); - const publicKey = fixtures.readKey('rsa_public_b.pem'); + const privateKey = fixtures.readSync('test_rsa_privkey_2.pem'); + const publicKey = fixtures.readSync('test_rsa_pubkey_2.pem'); const input = 'I AM THE WALRUS'; - const signature = fixtures.readKey( - 'I_AM_THE_WALRUS_sha256_signature_signedby_rsa_private_b.sha256', - 'hex' - ); + const signature = + '79d59d34f56d0e94aa6a3e306882b52ed4191f07521f25f505a078dc2f89' + + '396e0c8ac89e996fde5717f4cb89199d8fec249961fcb07b74cd3d2a4ffa' + + '235417b69618e4bcd76b97e29975b7ce862299410e1b522a328e44ac9bb2' + + '8195e0268da7eda23d9825ac43c724e86ceeee0d0d4465678652ccaf6501' + + '0ddfb299bedeb1ad'; const sign = crypto.createSign('SHA256'); sign.update(input); const output = sign.sign(privateKey, 'hex'); - assert.strictEqual(output, signature); + assert.strictEqual(signature, output); const verify = crypto.createVerify('SHA256'); verify.update(input); @@ -260,7 +263,7 @@ assert.throws(() => { sign2.update(input); const output2 = sign2.sign(privateKey, 'hex'); - assert.strictEqual(output2, signature); + assert.strictEqual(signature, output2); const verify2 = crypto.createVerify('SHA256'); verify2.update(input); diff --git a/test/parallel/test-crypto.js b/test/parallel/test-crypto.js index 86c617815f2726..1952f8908acb03 100644 --- a/test/parallel/test-crypto.js +++ b/test/parallel/test-crypto.js @@ -224,12 +224,17 @@ assert.throws(function() { }); assert.throws(function() { - // The correct header inside `rsa_private_pkcs8_bad.pem` should have been + // The correct header inside `test_bad_rsa_privkey.pem` should have been // -----BEGIN PRIVATE KEY----- and -----END PRIVATE KEY----- // instead of // -----BEGIN RSA PRIVATE KEY----- and -----END RSA PRIVATE KEY----- - const sha1_privateKey = fixtures.readKey('rsa_private_pkcs8_bad.pem', - 'ascii'); + // It is generated in this way: + // $ openssl genrsa -out mykey.pem 512; + // $ openssl pkcs8 -topk8 -inform PEM -outform PEM -in mykey.pem \ + // -out private_key.pem -nocrypt; + // Then open private_key.pem and change its header and footer. + const sha1_privateKey = fixtures.readSync('test_bad_rsa_privkey.pem', + 'ascii'); // This would inject errors onto OpenSSL's error stack crypto.createSign('sha1').sign(sha1_privateKey); }, (err) => { From 833b5296d89927f2cc36d53bc4e0b5279a6895ee Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Wed, 5 Jun 2019 15:20:31 -0700 Subject: [PATCH 16/17] Revert "test: move x25519 keypair to fixtures/keys/" This reverts commit ee00111f2062ffe67d18de04a178ac39ed58f503. --- test/fixtures/keys/Makefile | 8 -------- test/fixtures/keys/x25519_private.pem | 3 --- test/fixtures/keys/x25519_public.pem | 3 --- test/fixtures/test_x25519_privkey.pem | 3 +++ test/fixtures/test_x25519_pubkey.pem | 3 +++ test/parallel/test-crypto-key-objects.js | 4 ++-- 6 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 test/fixtures/keys/x25519_private.pem delete mode 100644 test/fixtures/keys/x25519_public.pem create mode 100644 test/fixtures/test_x25519_privkey.pem create mode 100644 test/fixtures/test_x25519_pubkey.pem diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile index 85253ad967b0d5..72a0cb5718511b 100644 --- a/test/fixtures/keys/Makefile +++ b/test/fixtures/keys/Makefile @@ -45,8 +45,6 @@ all: \ rsa_pss_public_2048_sha512_sha256_20.pem \ ed25519_private.pem \ ed25519_public.pem \ - x25519_private.pem \ - x25519_public.pem \ # # Create Certificate Authority: ca1 @@ -608,12 +606,6 @@ ed25519_private.pem: ed25519_public.pem: ed25519_private.pem openssl pkey -in ed25519_private.pem -pubout -out ed25519_public.pem -x25519_private.pem: - openssl genpkey -algorithm x25519 -out x25519_private.pem - -x25519_public.pem: x25519_private.pem - openssl pkey -in x25519_private.pem -pubout -out x25519_public.pem - clean: rm -f *.pfx *.pem *.srl ca2-database.txt ca2-serial fake-startcom-root-serial *.print *.old fake-startcom-root-issued-certs/*.pem @> fake-startcom-root-database.txt diff --git a/test/fixtures/keys/x25519_private.pem b/test/fixtures/keys/x25519_private.pem deleted file mode 100644 index 926c4e3a2b669a..00000000000000 --- a/test/fixtures/keys/x25519_private.pem +++ /dev/null @@ -1,3 +0,0 @@ ------BEGIN PRIVATE KEY----- -MC4CAQAwBQYDK2VuBCIEIJi/yFpueUawC1BkXyWM8ONIBGFjL7UZHrD/Zo/KPDpn ------END PRIVATE KEY----- diff --git a/test/fixtures/keys/x25519_public.pem b/test/fixtures/keys/x25519_public.pem deleted file mode 100644 index e2d756bd17c83f..00000000000000 --- a/test/fixtures/keys/x25519_public.pem +++ /dev/null @@ -1,3 +0,0 @@ ------BEGIN PUBLIC KEY----- -MCowBQYDK2VuAyEAaSb8Q+RndwfNnPeOYGYPDUN3uhAPnMLzXyfi+mqfhig= ------END PUBLIC KEY----- diff --git a/test/fixtures/test_x25519_privkey.pem b/test/fixtures/test_x25519_privkey.pem new file mode 100644 index 00000000000000..b2f60cca40e547 --- /dev/null +++ b/test/fixtures/test_x25519_privkey.pem @@ -0,0 +1,3 @@ +-----BEGIN PRIVATE KEY----- +MC4CAQAwBQYDK2VuBCIEILD/13Y5R/tmcCjZVSooIcpfGvZxf+qt6dMu5FYaOC1a +-----END PRIVATE KEY----- diff --git a/test/fixtures/test_x25519_pubkey.pem b/test/fixtures/test_x25519_pubkey.pem new file mode 100644 index 00000000000000..3d1e7b835e14ec --- /dev/null +++ b/test/fixtures/test_x25519_pubkey.pem @@ -0,0 +1,3 @@ +-----BEGIN PUBLIC KEY----- +MCowBQYDK2VuAyEAYHCXnz085FKclfnx+gdiGXAyy7BhJjx0pxyE4wbXF0A= +-----END PUBLIC KEY----- diff --git a/test/parallel/test-crypto-key-objects.js b/test/parallel/test-crypto-key-objects.js index 747bb7c64d5163..0ec7dc1d74c70d 100644 --- a/test/parallel/test-crypto-key-objects.js +++ b/test/parallel/test-crypto-key-objects.js @@ -209,8 +209,8 @@ const privateDsa = fixtures.readKey('dsa_private_encrypted_1025.pem', { private: fixtures.readSync('test_ed448_privkey.pem', 'ascii'), public: fixtures.readSync('test_ed448_pubkey.pem', 'ascii'), keyType: 'ed448' }, - { private: fixtures.readKey('x25519_private.pem', 'ascii'), - public: fixtures.readKey('x25519_public.pem', 'ascii'), + { private: fixtures.readSync('test_x25519_privkey.pem', 'ascii'), + public: fixtures.readSync('test_x25519_pubkey.pem', 'ascii'), keyType: 'x25519' }, { private: fixtures.readSync('test_x448_privkey.pem', 'ascii'), public: fixtures.readSync('test_x448_pubkey.pem', 'ascii'), From cfae6ca14694d947ff4d6ec4894224cf7e37824b Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Wed, 5 Jun 2019 15:20:55 -0700 Subject: [PATCH 17/17] Revert "test: move ed25519 keypair to fixtures/keys/" This reverts commit 8091df065ee1cdb8580a4a263f97f0b0750ca1f6. --- test/fixtures/keys/.gitattributes | 4 ---- test/fixtures/keys/Makefile | 8 -------- test/fixtures/keys/ed25519_private.pem | 3 --- test/fixtures/keys/ed25519_public.pem | 3 --- test/fixtures/test_ed25519_privkey.pem | 3 +++ test/fixtures/test_ed25519_pubkey.pem | 3 +++ test/parallel/test-crypto-key-objects.js | 4 ++-- test/parallel/test-crypto-sign-verify.js | 4 ++-- 8 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 test/fixtures/keys/.gitattributes delete mode 100644 test/fixtures/keys/ed25519_private.pem delete mode 100644 test/fixtures/keys/ed25519_public.pem create mode 100644 test/fixtures/test_ed25519_privkey.pem create mode 100644 test/fixtures/test_ed25519_pubkey.pem diff --git a/test/fixtures/keys/.gitattributes b/test/fixtures/keys/.gitattributes deleted file mode 100644 index 87a4fb14e41aaa..00000000000000 --- a/test/fixtures/keys/.gitattributes +++ /dev/null @@ -1,4 +0,0 @@ -* -text - -Makefile text -*.cnf text diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile index 72a0cb5718511b..81fe36a81331eb 100644 --- a/test/fixtures/keys/Makefile +++ b/test/fixtures/keys/Makefile @@ -43,8 +43,6 @@ all: \ rsa_pss_public_2048.pem \ rsa_pss_public_2048_sha256_sha256_16.pem \ rsa_pss_public_2048_sha512_sha256_20.pem \ - ed25519_private.pem \ - ed25519_public.pem \ # # Create Certificate Authority: ca1 @@ -600,12 +598,6 @@ rsa_pss_public_2048_sha256_sha256_16.pem: rsa_pss_private_2048_sha256_sha256_16. rsa_pss_public_2048_sha512_sha256_20.pem: rsa_pss_private_2048_sha512_sha256_20.pem openssl pkey -in rsa_pss_private_2048_sha512_sha256_20.pem -pubout -out rsa_pss_public_2048_sha512_sha256_20.pem -ed25519_private.pem: - openssl genpkey -algorithm ED25519 -out ed25519_private.pem - -ed25519_public.pem: ed25519_private.pem - openssl pkey -in ed25519_private.pem -pubout -out ed25519_public.pem - clean: rm -f *.pfx *.pem *.srl ca2-database.txt ca2-serial fake-startcom-root-serial *.print *.old fake-startcom-root-issued-certs/*.pem @> fake-startcom-root-database.txt diff --git a/test/fixtures/keys/ed25519_private.pem b/test/fixtures/keys/ed25519_private.pem deleted file mode 100644 index f837457cbd4f23..00000000000000 --- a/test/fixtures/keys/ed25519_private.pem +++ /dev/null @@ -1,3 +0,0 @@ ------BEGIN PRIVATE KEY----- -MC4CAQAwBQYDK2VwBCIEIMFSujN0jIUIdzSvuxka0lfgVVkMdRTuaVvIYUHrvzXQ ------END PRIVATE KEY----- diff --git a/test/fixtures/keys/ed25519_public.pem b/test/fixtures/keys/ed25519_public.pem deleted file mode 100644 index 4127a471bac9f5..00000000000000 --- a/test/fixtures/keys/ed25519_public.pem +++ /dev/null @@ -1,3 +0,0 @@ ------BEGIN PUBLIC KEY----- -MCowBQYDK2VwAyEAK1wIouqnuiA04b3WrMa+xKIKIpfHetNZRv3h9fBf768= ------END PUBLIC KEY----- diff --git a/test/fixtures/test_ed25519_privkey.pem b/test/fixtures/test_ed25519_privkey.pem new file mode 100644 index 00000000000000..a8b9f2f603f03a --- /dev/null +++ b/test/fixtures/test_ed25519_privkey.pem @@ -0,0 +1,3 @@ +-----BEGIN PRIVATE KEY----- +MC4CAQAwBQYDK2VwBCIEIHXLsXm1lsq5HtyqJwQyFmpfEluuf0KOqP6DqMgGxxDL +-----END PRIVATE KEY----- diff --git a/test/fixtures/test_ed25519_pubkey.pem b/test/fixtures/test_ed25519_pubkey.pem new file mode 100644 index 00000000000000..b9657c9d08d050 --- /dev/null +++ b/test/fixtures/test_ed25519_pubkey.pem @@ -0,0 +1,3 @@ +-----BEGIN PUBLIC KEY----- +MCowBQYDK2VwAyEAEXRYV3v5ucrHVR3mKqyPXxXqU34lASwc7Y7MoOvaqcs= +-----END PUBLIC KEY----- diff --git a/test/parallel/test-crypto-key-objects.js b/test/parallel/test-crypto-key-objects.js index 0ec7dc1d74c70d..2a3a3ec2f0bff1 100644 --- a/test/parallel/test-crypto-key-objects.js +++ b/test/parallel/test-crypto-key-objects.js @@ -203,8 +203,8 @@ const privateDsa = fixtures.readKey('dsa_private_encrypted_1025.pem', } [ - { private: fixtures.readKey('ed25519_private.pem', 'ascii'), - public: fixtures.readKey('ed25519_public.pem', 'ascii'), + { private: fixtures.readSync('test_ed25519_privkey.pem', 'ascii'), + public: fixtures.readSync('test_ed25519_pubkey.pem', 'ascii'), keyType: 'ed25519' }, { private: fixtures.readSync('test_ed448_privkey.pem', 'ascii'), public: fixtures.readSync('test_ed448_pubkey.pem', 'ascii'), diff --git a/test/parallel/test-crypto-sign-verify.js b/test/parallel/test-crypto-sign-verify.js index 2da2a91655cfdd..062c2d08377cfe 100644 --- a/test/parallel/test-crypto-sign-verify.js +++ b/test/parallel/test-crypto-sign-verify.js @@ -418,8 +418,8 @@ common.expectsError( } [ - { private: fixtures.readKey('ed25519_private.pem', 'ascii'), - public: fixtures.readKey('ed25519_public.pem', 'ascii'), + { private: fixtures.readSync('test_ed25519_privkey.pem', 'ascii'), + public: fixtures.readSync('test_ed25519_pubkey.pem', 'ascii'), algo: null, sigLen: 64 }, { private: fixtures.readSync('test_ed448_privkey.pem', 'ascii'),