Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 3c2b40b

Browse files
sam-githubBethGriggs
authored andcommittedFeb 5, 2019
test: rename agent1-pfx.pem to agent1.pfx
PFX is not PEM, its binary DER. Use the same .pfx extension as test/fixtures/test_cert.pfx does. Backport-PR-URL: #25501 PR-URL: #24374 Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Franziska Hinkelmann <[email protected]>
1 parent 43dcbbe commit 3c2b40b

6 files changed

+8
-8
lines changed
 

‎test/fixtures/keys/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -204,13 +204,13 @@ agent1-cert.pem: agent1-csr.pem ca1-cert.pem ca1-key.pem
204204
-CAcreateserial \
205205
-out agent1-cert.pem
206206

207-
agent1-pfx.pem: agent1-cert.pem agent1-key.pem ca1-cert.pem
207+
agent1.pfx: agent1-cert.pem agent1-key.pem ca1-cert.pem
208208
openssl pkcs12 -export \
209209
-descert \
210210
-in agent1-cert.pem \
211211
-inkey agent1-key.pem \
212212
-certfile ca1-cert.pem \
213-
-out agent1-pfx.pem \
213+
-out agent1.pfx \
214214
-password pass:sample
215215

216216
agent1-verify: agent1-cert.pem ca1-cert.pem
@@ -526,12 +526,12 @@ ec-cert.pem: ec-csr.pem ec-key.pem
526526
-signkey ec-key.pem \
527527
-out ec-cert.pem
528528

529-
ec-pfx.pem: ec-cert.pem ec-key.pem
529+
ec.pfx: ec-cert.pem ec-key.pem
530530
openssl pkcs12 -export \
531531
-descert \
532532
-in ec-cert.pem \
533533
-inkey ec-key.pem \
534-
-out ec-pfx.pem \
534+
-out ec.pfx \
535535
-password pass:
536536

537537
dh512.pem:
File renamed without changes.

‎test/fixtures/keys/ec-pfx.pem

-1006 Bytes
Binary file not shown.

‎test/parallel/test-tls-multi-pfx.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ const fixtures = require('../common/fixtures');
1010
const options = {
1111
pfx: [
1212
{
13-
buf: fixtures.readKey('agent1-pfx.pem'),
13+
buf: fixtures.readKey('agent1.pfx'),
1414
passphrase: 'sample'
1515
},
16-
fixtures.readKey('ec-pfx.pem')
16+
fixtures.readKey('ec.pfx')
1717
]
1818
};
1919

‎test/parallel/test-tls-ocsp-callback.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const assert = require('assert');
3535

3636
const SSL_OP_NO_TICKET = require('crypto').constants.SSL_OP_NO_TICKET;
3737

38-
const pfx = fixtures.readKey('agent1-pfx.pem');
38+
const pfx = fixtures.readKey('agent1.pfx');
3939

4040
function test(testOptions, cb) {
4141

‎test/parallel/test-tls-pfx-authorizationerror.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const fixtures = require('../common/fixtures');
1111
const assert = require('assert');
1212
const tls = require('tls');
1313

14-
const pfx = fixtures.readKey('agent1-pfx.pem');
14+
const pfx = fixtures.readKey('agent1.pfx');
1515

1616
const server = tls
1717
.createServer(

0 commit comments

Comments
 (0)
Please sign in to comment.