Skip to content

Commit e673b57

Browse files
reasonablytallBridgeAR
reasonablytall
authored and
BridgeAR
committed
test: move test_[key|ca|cert] to fixtures/keys/
Lots of changes, but mostly just search/replace of fixtures.readSync(...) to fixtures.readKey([new key]...) Benchmarks modified to use fixtures.readKey(...): benchmark/tls/throughput.js benchmark/tls/tls-connect.js benchmark/tls/secure-pair.js Also be sure to review the change to L16 of test/parallel/test-crypto-sign-verify.js PR-URL: #27962 Reviewed-By: Sam Roberts <[email protected]> Reviewed-By: Ujjwal Sharma <[email protected]> Reviewed-By: Rich Trott <[email protected]>
1 parent 8670f6d commit e673b57

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+172
-150
lines changed

‎benchmark/tls/secure-pair.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,19 @@ const bench = common.createBenchmark(main, {
66
size: [2, 1024, 1024 * 1024]
77
});
88

9-
const fs = require('fs');
9+
const fixtures = require('../../test/common/fixtures');
1010
const tls = require('tls');
1111
const net = require('net');
12-
const path = require('path');
1312

14-
const cert_dir = path.resolve(__dirname, '../../test/fixtures');
1513
const REDIRECT_PORT = 28347;
1614

1715
function main({ dur, size, securing }) {
1816
const chunk = Buffer.alloc(size, 'b');
1917

2018
const options = {
21-
key: fs.readFileSync(`${cert_dir}/test_key.pem`),
22-
cert: fs.readFileSync(`${cert_dir}/test_cert.pem`),
23-
ca: [ fs.readFileSync(`${cert_dir}/test_ca.pem`) ],
19+
key: fixtures.readKey('rsa_private.pem'),
20+
cert: fixtures.readKey('rsa_cert.crt'),
21+
ca: fixtures.readKey('rsa_ca.crt'),
2422
ciphers: 'AES256-GCM-SHA384',
2523
isServer: true,
2624
requestCert: true,

‎benchmark/tls/throughput.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ const bench = common.createBenchmark(main, {
66
size: [2, 1024, 1024 * 1024]
77
});
88

9-
const path = require('path');
10-
const fs = require('fs');
11-
const cert_dir = path.resolve(__dirname, '../../test/fixtures');
9+
const fixtures = require('../../test/common/fixtures');
1210
var options;
1311
const tls = require('tls');
1412

@@ -32,9 +30,9 @@ function main({ dur, type, size }) {
3230
}
3331

3432
options = {
35-
key: fs.readFileSync(`${cert_dir}/test_key.pem`),
36-
cert: fs.readFileSync(`${cert_dir}/test_cert.pem`),
37-
ca: [ fs.readFileSync(`${cert_dir}/test_ca.pem`) ],
33+
key: fixtures.readKey('rsa_private.pem'),
34+
cert: fixtures.readKey('rsa_cert.crt'),
35+
ca: fixtures.readKey('rsa_ca.crt'),
3836
ciphers: 'AES256-GCM-SHA384'
3937
};
4038

‎benchmark/tls/tls-connect.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
2-
const fs = require('fs');
3-
const path = require('path');
2+
const fixtures = require('../../test/common/fixtures');
43
const tls = require('tls');
54

65
const common = require('../common.js');
@@ -18,11 +17,10 @@ var running = true;
1817
function main(conf) {
1918
dur = conf.dur;
2019
concurrency = conf.concurrency;
21-
const cert_dir = path.resolve(__dirname, '../../test/fixtures');
2220
const options = {
23-
key: fs.readFileSync(`${cert_dir}/test_key.pem`),
24-
cert: fs.readFileSync(`${cert_dir}/test_cert.pem`),
25-
ca: [ fs.readFileSync(`${cert_dir}/test_ca.pem`) ],
21+
key: fixtures.readKey('rsa_private.pem'),
22+
cert: fixtures.readKey('rsa_cert.crt'),
23+
ca: fixtures.readKey('rsa_ca.crt'),
2624
ciphers: 'AES256-GCM-SHA384'
2725
};
2826

‎test/async-hooks/test-graph.tls-write.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ hooks.enable();
2020
//
2121
const server = tls
2222
.createServer({
23-
cert: fixtures.readSync('test_cert.pem'),
24-
key: fixtures.readSync('test_key.pem')
23+
cert: fixtures.readKey('rsa_cert.crt'),
24+
key: fixtures.readKey('rsa_private.pem')
2525
})
2626
.on('listening', common.mustCall(onlistening))
2727
.on('secureConnection', common.mustCall(onsecureConnection))

‎test/async-hooks/test-tlswrap.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ tls.DEFAULT_MAX_VERSION = 'TLSv1.2';
2424
//
2525
const server = tls
2626
.createServer({
27-
cert: fixtures.readSync('test_cert.pem'),
28-
key: fixtures.readSync('test_key.pem')
27+
cert: fixtures.readKey('rsa_cert.crt'),
28+
key: fixtures.readKey('rsa_private.pem')
2929
})
3030
.on('listening', common.mustCall(onlistening))
3131
.on('secureConnection', common.mustCall(onsecureConnection))

‎test/fixtures/keys/Makefile

+12
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ all: \
4141
rsa_private_pkcs8.pem \
4242
rsa_private_pkcs8_bad.pem \
4343
rsa_public.pem \
44+
rsa_ca.crt \
45+
rsa_cert.crt \
46+
rsa_cert.pfx \
4447
rsa_public_sha1_signature_signedby_rsa_private.sha1 \
4548
rsa_public_sha1_signature_signedby_rsa_private_pkcs8.sha1 \
4649
rsa_private_b.pem \
@@ -617,6 +620,15 @@ rsa_private_pkcs8_bad.pem: rsa_private_pkcs8.pem
617620
rsa_public.pem: rsa_private.pem
618621
openssl rsa -in rsa_private.pem -pubout -out rsa_public.pem
619622

623+
rsa_cert.crt: rsa_private.pem
624+
openssl req -new -x509 -key rsa_private.pem -config rsa_cert.cnf -out rsa_cert.crt
625+
626+
rsa_cert.pfx: rsa_cert.crt
627+
openssl pkcs12 -export -passout 'pass:sample' -inkey rsa_private.pem -in rsa_cert.crt -out rsa_cert.pfx
628+
629+
rsa_ca.crt: rsa_cert.crt
630+
cp rsa_cert.crt rsa_ca.crt
631+
620632
rsa_public_sha1_signature_signedby_rsa_private.sha1: rsa_public.pem rsa_private.pem
621633
openssl dgst -sha1 -sign rsa_private.pem -out rsa_public_sha1_signature_signedby_rsa_private.sha1 rsa_public.pem
622634

‎test/fixtures/keys/rsa_ca.crt

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIEADCCAuigAwIBAgIUOLbA0Gyeqh/vqRSR98jmSKzv3aswDQYJKoZIhvcNAQEL
3+
BQAwgbAxCzAJBgNVBAYTAlVLMRQwEgYDVQQIDAtBY2tuYWNrIEx0ZDETMBEGA1UE
4+
BwwKUmh5cyBKb25lczEQMA4GA1UECgwHbm9kZS5qczEdMBsGA1UECwwUVGVzdCBU
5+
TFMgQ2VydGlmaWNhdGUxFDASBgNVBAsMC0VuZ2luZWVyaW5nMRIwEAYDVQQDDAls
6+
b2NhbGhvc3QxGzAZBgkqhkiG9w0BCQEWDGFsZXhAYXViLmRldjAeFw0xOTA1Mjky
7+
MDI5NTBaFw0xOTA2MjgyMDI5NTBaMIGwMQswCQYDVQQGEwJVSzEUMBIGA1UECAwL
8+
QWNrbmFjayBMdGQxEzARBgNVBAcMClJoeXMgSm9uZXMxEDAOBgNVBAoMB25vZGUu
9+
anMxHTAbBgNVBAsMFFRlc3QgVExTIENlcnRpZmljYXRlMRQwEgYDVQQLDAtFbmdp
10+
bmVlcmluZzESMBAGA1UEAwwJbG9jYWxob3N0MRswGQYJKoZIhvcNAQkBFgxhbGV4
11+
QGF1Yi5kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC33FiIiiex
12+
wLe/P8DZx5HsqFlmUO7/lvJ7necJVNwqdZ3ax5jpQB0p6uxfqeOvzcN3k5V7UFb/
13+
Am+nkSNZMAZhsWzCU2Z4Pjh50QYz3f0Hour7/yIGStOLyYY3hgLK2K8TbhgjQPhd
14+
kw9+QtKlpvbL8fLgONAoGrVOFnRQGcr70iFffsm79mgZhKVMgYiHPJqJgGHvCtkG
15+
g9zMgS7p63+Q3ZWedtFS2RhMX3uCBy/mH6EOlRCNBbRmA4xxNzyf5GQaki3T+Iz9
16+
tOMjdPP+CwV2LqEdylmBuik8vrfTb3qIHLKKBAI8lXN26wWtA3kN4L7NP+cbKlCR
17+
lqctvhmylLH1AgMBAAGjEDAOMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
18+
ggEBAFeDkFYcL1pcVA3q1LNWmpDi9MQAOajSyk3bNj0+ckyuOlqaXH2gVAdQh+XB
19+
LOFDXNwAAqMe7FEoyvIaQSFcatRhQnKFxQ9i0o1T8+6Aebjj5oo8lY5CGyOacQV8
20+
C6LMl4gd/duIoaWkjykiGjTH8SR6VXYhPTm03wQSMMX664E/8onsw6cLuz4COB9q
21+
dhWhkBXiVj3fF9kLOYMiBWc7Mb2Glfs3NLpu7TTltOwNNMWNfzE9XByR7Tg4WtIu
22+
8x45ibQKqUhHCh/jpWns2g/YZXXBrcvYREgakkvJZLV2Z+xeoV5oY071554BfMms
23+
YxLnHtl1YKNg++DSmxeUNK+NLZA=
24+
-----END CERTIFICATE-----

‎test/fixtures/keys/rsa_cert.cnf

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
[ req ]
2+
days = 99999
3+
distinguished_name = req_distinguished_name
4+
attributes = req_attributes
5+
prompt = no
6+
x509_extensions = v3_ca
7+
8+
[ req_distinguished_name ]
9+
C = UK
10+
ST = Acknack Ltd
11+
L = Rhys Jones
12+
O = node.js
13+
0.OU = Test TLS Certificate
14+
1.OU = Engineering
15+
CN = localhost
16+
emailAddress = [email protected]
17+
18+
[ req_attributes ]
19+
20+
[ v3_ca ]
21+
basicConstraints = CA:TRUE
22+
23+
[ x509_extensions ]

‎test/fixtures/keys/rsa_cert.crt

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIEADCCAuigAwIBAgIUOLbA0Gyeqh/vqRSR98jmSKzv3aswDQYJKoZIhvcNAQEL
3+
BQAwgbAxCzAJBgNVBAYTAlVLMRQwEgYDVQQIDAtBY2tuYWNrIEx0ZDETMBEGA1UE
4+
BwwKUmh5cyBKb25lczEQMA4GA1UECgwHbm9kZS5qczEdMBsGA1UECwwUVGVzdCBU
5+
TFMgQ2VydGlmaWNhdGUxFDASBgNVBAsMC0VuZ2luZWVyaW5nMRIwEAYDVQQDDAls
6+
b2NhbGhvc3QxGzAZBgkqhkiG9w0BCQEWDGFsZXhAYXViLmRldjAeFw0xOTA1Mjky
7+
MDI5NTBaFw0xOTA2MjgyMDI5NTBaMIGwMQswCQYDVQQGEwJVSzEUMBIGA1UECAwL
8+
QWNrbmFjayBMdGQxEzARBgNVBAcMClJoeXMgSm9uZXMxEDAOBgNVBAoMB25vZGUu
9+
anMxHTAbBgNVBAsMFFRlc3QgVExTIENlcnRpZmljYXRlMRQwEgYDVQQLDAtFbmdp
10+
bmVlcmluZzESMBAGA1UEAwwJbG9jYWxob3N0MRswGQYJKoZIhvcNAQkBFgxhbGV4
11+
QGF1Yi5kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC33FiIiiex
12+
wLe/P8DZx5HsqFlmUO7/lvJ7necJVNwqdZ3ax5jpQB0p6uxfqeOvzcN3k5V7UFb/
13+
Am+nkSNZMAZhsWzCU2Z4Pjh50QYz3f0Hour7/yIGStOLyYY3hgLK2K8TbhgjQPhd
14+
kw9+QtKlpvbL8fLgONAoGrVOFnRQGcr70iFffsm79mgZhKVMgYiHPJqJgGHvCtkG
15+
g9zMgS7p63+Q3ZWedtFS2RhMX3uCBy/mH6EOlRCNBbRmA4xxNzyf5GQaki3T+Iz9
16+
tOMjdPP+CwV2LqEdylmBuik8vrfTb3qIHLKKBAI8lXN26wWtA3kN4L7NP+cbKlCR
17+
lqctvhmylLH1AgMBAAGjEDAOMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
18+
ggEBAFeDkFYcL1pcVA3q1LNWmpDi9MQAOajSyk3bNj0+ckyuOlqaXH2gVAdQh+XB
19+
LOFDXNwAAqMe7FEoyvIaQSFcatRhQnKFxQ9i0o1T8+6Aebjj5oo8lY5CGyOacQV8
20+
C6LMl4gd/duIoaWkjykiGjTH8SR6VXYhPTm03wQSMMX664E/8onsw6cLuz4COB9q
21+
dhWhkBXiVj3fF9kLOYMiBWc7Mb2Glfs3NLpu7TTltOwNNMWNfzE9XByR7Tg4WtIu
22+
8x45ibQKqUhHCh/jpWns2g/YZXXBrcvYREgakkvJZLV2Z+xeoV5oY071554BfMms
23+
YxLnHtl1YKNg++DSmxeUNK+NLZA=
24+
-----END CERTIFICATE-----

‎test/fixtures/keys/rsa_cert.pfx

2.57 KB
Binary file not shown.

‎test/fixtures/test_ca.pem

-20
This file was deleted.

‎test/fixtures/test_cert.pem

-20
This file was deleted.

‎test/fixtures/test_cert.pfx

-1.84 KB
Binary file not shown.

‎test/fixtures/test_key.pem

-15
This file was deleted.

‎test/parallel/test-crypto-binary-default.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ const DH_NOT_SUITABLE_GENERATOR = crypto.constants.DH_NOT_SUITABLE_GENERATOR;
4141
require('internal/crypto/util').setDefaultEncoding('latin1');
4242

4343
// Test Certificates
44-
const certPem = fixtures.readSync('test_cert.pem', 'ascii');
45-
const certPfx = fixtures.readSync('test_cert.pfx');
46-
const keyPem = fixtures.readSync('test_key.pem', 'ascii');
44+
const certPem = fixtures.readKey('rsa_cert.crt');
45+
const certPfx = fixtures.readKey('rsa_cert.pfx');
46+
const keyPem = fixtures.readKey('rsa_private.pem');
4747
const rsaPubPem = fixtures.readKey('rsa_public.pem', 'ascii');
4848
const rsaKeyPem = fixtures.readKey('rsa_private.pem', 'ascii');
4949

‎test/parallel/test-crypto-rsa-dsa.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ const constants = crypto.constants;
1111
const fixtures = require('../common/fixtures');
1212

1313
// Test certificates
14-
const certPem = fixtures.readSync('test_cert.pem', 'ascii');
15-
const keyPem = fixtures.readSync('test_key.pem', 'ascii');
14+
const certPem = fixtures.readKey('rsa_cert.crt');
15+
const keyPem = fixtures.readKey('rsa_private.pem');
1616
const rsaKeySize = 2048;
1717
const rsaPubPem = fixtures.readKey('rsa_public.pem', 'ascii');
1818
const rsaKeyPem = fixtures.readKey('rsa_private.pem', 'ascii');

‎test/parallel/test-crypto-sign-verify.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ const crypto = require('crypto');
1111
const fixtures = require('../common/fixtures');
1212

1313
// Test certificates
14-
const certPem = fixtures.readSync('test_cert.pem', 'ascii');
15-
const keyPem = fixtures.readSync('test_key.pem', 'ascii');
16-
const modSize = 1024;
14+
const certPem = fixtures.readKey('rsa_cert.crt');
15+
const keyPem = fixtures.readKey('rsa_private.pem');
16+
const keySize = 2048;
1717

1818
{
1919
const Sign = crypto.Sign;
@@ -152,7 +152,7 @@ common.expectsError(
152152
{
153153
function testPSS(algo, hLen) {
154154
// Maximum permissible salt length
155-
const max = modSize / 8 - hLen - 2;
155+
const max = keySize / 8 - hLen - 2;
156156

157157
function getEffectiveSaltLength(saltLength) {
158158
switch (saltLength) {

‎test/parallel/test-crypto-verify-failure.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const crypto = require('crypto');
2929
const tls = require('tls');
3030
const fixtures = require('../common/fixtures');
3131

32-
const certPem = fixtures.readSync('test_cert.pem', 'ascii');
32+
const certPem = fixtures.readKey('rsa_cert.crt');
3333

3434
const options = {
3535
key: fixtures.readKey('agent1-key.pem'),

‎test/parallel/test-crypto.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const tls = require('tls');
3737
const fixtures = require('../common/fixtures');
3838

3939
// Test Certificates
40-
const certPfx = fixtures.readSync('test_cert.pfx');
40+
const certPfx = fixtures.readKey('rsa_cert.pfx');
4141

4242
// 'this' safety
4343
// https://github.com/joyent/node/issues/6690

‎test/parallel/test-https-client-reject.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ const assert = require('assert');
3030
const https = require('https');
3131

3232
const options = {
33-
key: fixtures.readSync('test_key.pem'),
34-
cert: fixtures.readSync('test_cert.pem')
33+
key: fixtures.readKey('rsa_private.pem'),
34+
cert: fixtures.readKey('rsa_cert.crt')
3535
};
3636

3737
const server = https.createServer(options, common.mustCall(function(req, res) {
@@ -72,7 +72,7 @@ function rejectUnauthorized() {
7272
function authorized() {
7373
const options = {
7474
port: server.address().port,
75-
ca: [fixtures.readSync('test_cert.pem')]
75+
ca: [fixtures.readKey('rsa_cert.crt')]
7676
};
7777
options.agent = new https.Agent(options);
7878
const req = https.request(options, function(res) {

‎test/parallel/test-https-client-renegotiation-limit.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ const LIMITS = [0, 1, 2, 3, 5, 10, 16];
5050

5151
function test(next) {
5252
const options = {
53-
cert: fixtures.readSync('test_cert.pem'),
54-
key: fixtures.readSync('test_key.pem'),
53+
cert: fixtures.readKey('rsa_cert.crt'),
54+
key: fixtures.readKey('rsa_private.pem'),
5555
};
5656

5757
const server = https.createServer(options, (req, res) => {

‎test/parallel/test-https-drain.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ const assert = require('assert');
2929
const https = require('https');
3030

3131
const options = {
32-
key: fixtures.readSync('test_key.pem'),
33-
cert: fixtures.readSync('test_cert.pem')
32+
key: fixtures.readKey('rsa_private.pem'),
33+
cert: fixtures.readKey('rsa_cert.crt')
3434
};
3535

3636
const bufSize = 1024 * 1024;

‎test/parallel/test-https-pfx.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const fixtures = require('../common/fixtures');
3030
const assert = require('assert');
3131
const https = require('https');
3232

33-
const pfx = fixtures.readSync('test_cert.pfx');
33+
const pfx = fixtures.readKey('rsa_cert.pfx');
3434

3535
const options = {
3636
host: '127.0.0.1',

‎test/parallel/test-https-unix-socket-self-signed.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ tmpdir.refresh();
1010
const fixtures = require('../common/fixtures');
1111
const https = require('https');
1212
const options = {
13-
cert: fixtures.readSync('test_cert.pem'),
14-
key: fixtures.readSync('test_key.pem')
13+
cert: fixtures.readKey('rsa_cert.crt'),
14+
key: fixtures.readKey('rsa_private.pem')
1515
};
1616

1717
const server = https.createServer(options, common.mustCall((req, res) => {

‎test/parallel/test-tls-async-cb-after-socket-end.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ const tls = require('tls');
1515

1616
const options = {
1717
secureOptions: SSL_OP_NO_TICKET,
18-
key: fixtures.readSync('test_key.pem'),
19-
cert: fixtures.readSync('test_cert.pem')
18+
key: fixtures.readKey('rsa_private.pem'),
19+
cert: fixtures.readKey('rsa_cert.crt')
2020
};
2121

2222
const server = tls.createServer(options, common.mustCall());

0 commit comments

Comments
 (0)