Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit e673b57

Browse filesBrowse 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 <vieuxtech@gmail.com> Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
1 parent 8670f6d commit e673b57
Copy full SHA for e673b57

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

46 files changed

+172
-150
lines changed
Open diff view settings
Collapse file

‎benchmark/tls/secure-pair.js‎

Copy file name to clipboardExpand all lines: benchmark/tls/secure-pair.js
+4-6Lines changed: 4 additions & 6 deletions
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,
Collapse file

‎benchmark/tls/throughput.js‎

Copy file name to clipboardExpand all lines: benchmark/tls/throughput.js
+4-6Lines changed: 4 additions & 6 deletions
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

Collapse file

‎benchmark/tls/tls-connect.js‎

Copy file name to clipboardExpand all lines: benchmark/tls/tls-connect.js
+4-6Lines changed: 4 additions & 6 deletions
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

Collapse file

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

Copy file name to clipboardExpand all lines: test/async-hooks/test-graph.tls-write.js
+2-2Lines changed: 2 additions & 2 deletions
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))
Collapse file

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

Copy file name to clipboardExpand all lines: test/async-hooks/test-tlswrap.js
+2-2Lines changed: 2 additions & 2 deletions
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))
Collapse file

‎test/fixtures/keys/Makefile‎

Copy file name to clipboardExpand all lines: test/fixtures/keys/Makefile
+12Lines changed: 12 additions & 0 deletions
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

Collapse file

‎test/fixtures/keys/rsa_ca.crt‎

Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions
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-----
Collapse file

‎test/fixtures/keys/rsa_cert.cnf‎

Copy file name to clipboard
+23Lines changed: 23 additions & 0 deletions
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 = alex@aub.dev
17+
18+
[ req_attributes ]
19+
20+
[ v3_ca ]
21+
basicConstraints = CA:TRUE
22+
23+
[ x509_extensions ]
Collapse file

‎test/fixtures/keys/rsa_cert.crt‎

Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions
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-----
Collapse file

‎test/fixtures/keys/rsa_cert.pfx‎

Copy file name to clipboard
2.57 KB
Binary file not shown.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.