From 2fc9550280d9adc82f022d3f5d33421479dcef18 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Thu, 22 Dec 2016 11:04:59 -0800 Subject: [PATCH] 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. PR-URL: https://github.com/nodejs/node/pull/24374 Reviewed-By: Daniel Bevenius Reviewed-By: Ben Noordhuis Reviewed-By: Franziska Hinkelmann --- test/fixtures/keys/Makefile | 8 ++++---- .../fixtures/keys/{agent1-pfx.pem => agent1.pfx} | Bin test/fixtures/keys/ec-pfx.pem | Bin 1006 -> 0 bytes test/fixtures/keys/ec.pfx | Bin 0 -> 1006 bytes test/parallel/test-tls-multi-pfx.js | 4 ++-- test/parallel/test-tls-ocsp-callback.js | 2 +- test/parallel/test-tls-pfx-authorizationerror.js | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename test/fixtures/keys/{agent1-pfx.pem => agent1.pfx} (100%) delete mode 100644 test/fixtures/keys/ec-pfx.pem create mode 100644 test/fixtures/keys/ec.pfx diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile index 32e34705bb9794..c4ac0768e7685f 100644 --- a/test/fixtures/keys/Makefile +++ b/test/fixtures/keys/Makefile @@ -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 @@ -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: diff --git a/test/fixtures/keys/agent1-pfx.pem b/test/fixtures/keys/agent1.pfx similarity index 100% rename from test/fixtures/keys/agent1-pfx.pem rename to test/fixtures/keys/agent1.pfx diff --git a/test/fixtures/keys/ec-pfx.pem b/test/fixtures/keys/ec-pfx.pem deleted file mode 100644 index f5e76a76118e44c62e08a24d8dbe86b4bb2bf4ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1006 zcmXqLVt&QM$ZXKWyn&5VtIebBJ1-+UMQF98S@); zKE$lpYO>_Cq*ch&`wU&*%jD|KS9F@lc3a4Bym-hr`_%CYJx|>i-!s1dOtyN}dNWj6 z;_Fu1+();=_RMoqw_jnF;AJIcVm*h|n^&jxKxf>&j^&GNlYg(3v$)tQrs&Z+|5W#C zPFYPki7k8qiE7tp#Kv7c^x)64fBKQHU!}VKOL$sl68cG0V0p*1OYgVX314}x@#c9J z%iWB7lHm~(qZs~YZCmt7NNSDIhp_L5ZkzFG{#$TjGka=D#G~^@$_lqyei-gbn$1+8}@xS+d+HbW*K6l&&xep89(;^-oM29rB}p^d$T`8f2;f~ULMuH`5t$r|KaZ516uNW zN|TfK9&pzztLQ%R=>49(wh51azTL3nQ{kE^!r$(>oTysqGkvYIT&}g8^CTOCP>tJb zPTziBv8_D7onSUTD@X`%%evQVijEr0 z?q5BF@$@X+dG0!%6L}@4yXS15VW?`L4EG+VsG%5(h#;qZ_o`WKrn!?Quw4#hI=wq7 z-^jqwK+%Acja8eEnMsP3fkkAeiA=$*$5v6IX9cDnUB6ee*-K<23rA~=lEgs<2N95G E0oTd5u>b%7 diff --git a/test/fixtures/keys/ec.pfx b/test/fixtures/keys/ec.pfx new file mode 100644 index 0000000000000000000000000000000000000000..3130860e9939309cb90c1ecae28ad88bd8ceb5e3 GIT binary patch literal 1006 zcmXqLVt&QM$ZXKWyn&5VtIebBJ1-+UA!2PZtPfIyeN-Tr#61dzx&hg{@%)Y zZ)&N|{lfZ)RP80)2aEkJuP;oT^KOl{hYNS&MEAyp-?RUV-;jRs;bh!C`Qxk$_w#Bh zZjkxhWUHjDCsgY6LT5#E*8ihQDt{+B7Myers90(9b-LDke`_b}tua}DEG9`c%!pS# z{VB8i@LrLYgFbU^C5TKu^IKcoNA;-&QBye+Q}$$ru=Q7hvQYOq=AEU~9UM(B|CX6CM-X8-*EMZpQL)|m1C z2)giNcHh0luaAA-+?i7lsPu<#p~K!Qo*YlOv$sIO^{69bqh=(_8x z9a*+Q;M}uYWy?F3hgB%5cSRM}UB7+qaaM|t^^_I6*T23dkaNLzM&-GqSMG3%u)a6+ zBGUokr_pCFVUHL}a%_5BL?myona|~E49A3Rh$$Pl$)F$)9sy*ivWb_xkY3gI2 zT+_{{YFaW=)ldG8zW2Gv&;9wks;>q%oGvIeXkuhSN_YzzzpylZG-!Nh(D<5-8X-;PQEGr;qMZTobg{Z`*&>Sg!H{T$~2|Jm+sSfzjeb- z&eckcxss>D?whG5rfHY#(~ebMwDtX?+mkk*EOwmSYvs9G@2SbV<;7WjC-T0n5h(iq zCE?K{k>piY{AzQXq?fvzHL#be+Zn1FD8s$SDQYOjA|l9X-@R&9n`!Q(32c`GnNIIc z$~Q7FG*C3)WMkFlV`h?KWnd9`Eb_x))*|&NvA3J@x=L=V_n4GDV&TY~+|