Skip to content

Commit

Permalink
test: rename agent1-pfx.pem to agent1.pfx
Browse files Browse the repository at this point in the history
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 <daniel.bevenius@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
  • Loading branch information
sam-github authored and BethGriggs committed Feb 5, 2019
1 parent 43dcbbe commit 3c2b40b
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions test/fixtures/keys/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -204,13 +204,13 @@ agent1-cert.pem: agent1-csr.pem ca1-cert.pem ca1-key.pem
-CAcreateserial \
-out agent1-cert.pem

agent1-pfx.pem: agent1-cert.pem agent1-key.pem ca1-cert.pem
agent1.pfx: agent1-cert.pem agent1-key.pem ca1-cert.pem
openssl pkcs12 -export \
-descert \
-in agent1-cert.pem \
-inkey agent1-key.pem \
-certfile ca1-cert.pem \
-out agent1-pfx.pem \
-out agent1.pfx \
-password pass:sample

agent1-verify: agent1-cert.pem ca1-cert.pem
Expand Down Expand Up @@ -526,12 +526,12 @@ ec-cert.pem: ec-csr.pem ec-key.pem
-signkey ec-key.pem \
-out ec-cert.pem

ec-pfx.pem: ec-cert.pem ec-key.pem
ec.pfx: ec-cert.pem ec-key.pem
openssl pkcs12 -export \
-descert \
-in ec-cert.pem \
-inkey ec-key.pem \
-out ec-pfx.pem \
-out ec.pfx \
-password pass:

dh512.pem:
Expand Down
File renamed without changes.
Binary file removed test/fixtures/keys/ec-pfx.pem
Binary file not shown.
4 changes: 2 additions & 2 deletions test/parallel/test-tls-multi-pfx.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ const fixtures = require('../common/fixtures');
const options = {
pfx: [
{
buf: fixtures.readKey('agent1-pfx.pem'),
buf: fixtures.readKey('agent1.pfx'),
passphrase: 'sample'
},
fixtures.readKey('ec-pfx.pem')
fixtures.readKey('ec.pfx')
]
};

Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-tls-ocsp-callback.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const assert = require('assert');

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

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

function test(testOptions, cb) {

Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-tls-pfx-authorizationerror.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const fixtures = require('../common/fixtures');
const assert = require('assert');
const tls = require('tls');

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

const server = tls
.createServer(
Expand Down

0 comments on commit 3c2b40b

Please sign in to comment.