Skip to content

tls: multiple PFX support in createSecureContext #14793

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
djphoenix wants to merge 7 commits into from
Closed

tls: multiple PFX support in createSecureContext #14793

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
21e2413
tls: multiple PFX in createSecureContext
djphoenix Aug 12, 2017
a389780
Fix buffer type check
djphoenix Aug 23, 2017
f8fdff4
Use fixtures API in test
djphoenix Aug 23, 2017
f2607b3
Use mustCall for test callbacks
djphoenix Aug 23, 2017
17a9522
Add EC PFX to fixtures Makefile
djphoenix Aug 23, 2017
be2756d
Fix EC PFX fixture to be FIPS-compatible
djphoenix Aug 23, 2017
501fe05
Rename buffer to buf, doc string and string[] support
djphoenix Aug 29, 2017
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
Prev Previous commit
Next Next commit
Fix buffer type check
  • Loading branch information
@djphoenix
djphoenix committed Sep 1, 2017
commit a3897801ee2c13ed3323e5ef9a5eadd66dc6252b
3 changes: 1 addition & 2 deletions lib/_tls_common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,12 @@ exports.createSecureContext = function createSecureContext(options, context) {
if (options.pfx) {
if (!crypto)
crypto = require('crypto');
const Buffer = require('buffer').Buffer;

if (Array.isArray(options.pfx)) {
for (i = 0; i < options.pfx.length; i++) {
const pfx = options.pfx[i];
let buf;
if (pfx.buffer instanceof Buffer) {
if (ArrayBuffer.isView(pfx.buffer)) {
buf = crypto._toBuf(pfx.buffer);
} else {
buf = crypto._toBuf(pfx);
Expand Down