Skip to content

[v10.x backport] generate more certs, and more test coverage using them #25501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sam-github wants to merge 4 commits into from
Closed

[v10.x backport] generate more certs, and more test coverage using them #25501

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96fe1e7
test: rename agent1-pfx.pem to agent1.pfx
sam-github Dec 22, 2016
18593f0
test: add independent multi-alg crypto identities
sam-github Dec 20, 2016
f1ff355
test: cover tls multi-identity option mixtures
sam-github Nov 28, 2016
8365239
test: confirm tls server suite default is its own
sam-github Nov 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
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 <daniel.bevenius@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
  • Loading branch information
@sam-github
sam-github committed Feb 4, 2019
commit 96fe1e705da929fa78a632406d43bd6d4dc91bac
8 changes: 4 additions & 4 deletions test/fixtures/keys/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,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 @@ -334,12 +334,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
0 test/fixtures/keys/agent1-pfx.pem → test/fixtures/keys/agent1.pfx
View file
Open in desktop
File renamed without changes.
Binary file removed test/fixtures/keys/ec-pfx.pem
View file
Open in desktop
Binary file not shown.
Binary file added test/fixtures/keys/ec.pfx
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions test/parallel/test-tls-multi-pfx.js
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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