From 3c2b40ba043731caafa6474d7edcec82583bd0b8 Mon Sep 17 00:00:00 2001
From: Sam Roberts <vieuxtech@gmail.com>
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.

Backport-PR-URL: https://github.com/nodejs/node/pull/25501
PR-URL: https://github.com/nodejs/node/pull/24374
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
---
 test/fixtures/keys/Makefile                      |   8 ++++----
 .../fixtures/keys/{agent1-pfx.pem => agent1.pfx} | Bin
 test/fixtures/keys/ec-pfx.pem                    | Bin 1006 -> 0 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 +-
 6 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

diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile
index 88a041db49b542..964fb2f5f1451b 100644
--- a/test/fixtures/keys/Makefile
+++ b/test/fixtures/keys/Makefile
@@ -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
@@ -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:
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-+U<ANsUg)B|XbAiG$4Vswx5mIamnwT1ZLN!c`
z3_z+BA;V}O!^Q<Qfd^<J9}CBeLSMn?L=8?RCJu&%CMJ(ty<bi*T5#=Y>MQF98S@);
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-g<sW{#C
z*Gk3r)Ws9i{{H0g;Ehj+Z{L4A-~91cw;Ju`K{FH7H%9PZnk-^!l4|+w`^vBUi*1aV
zixcMl_@0_~q5Yrojcp#Q=3bre?#}F{x4tb(G3qX-Y5f$>bn$1+8}@xS+<mNTZ`ye;
zt`GxfFVPj@JSr~E_a|oMsea_$dzK?vic3p-W0knV+?A!*gcfoM{;e)JP<l}?*GSeQ
z;d9s9>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_<v<J<b6Z~4LxpSW;b_o?1~?V6a8BA3PkcJ^Pleod`a|5{~mn|*O=`u~Z{
zg~rc56go+KTvA!@*qo*JfTPV)qi3VSjvuqX+D^T_@`TXak2B}<FxGPBC*9m~{pWil
zz1e^E9=15$)4#QMy26>D7onSUTD@<D?oTpkVq`)}cncc8urz)&XnbeT_?nFymIS#N
znHDr|F=*U~nJ!;{OEB9Ncq<*0E?F8U2pz~i({)txIY-8BnY=|zx7_xeSS|N1mifh&
z+Wj*!LtVKaEDu}1=A62B%*Q&J{vSVNa}72N@ZVLLuk&qQ^~^O-w2ab}dBVNx_uo7I
zZKM6!`o9mAE~=|mD$j_koF(!><JLotEB|gql+X0}AhXZfhby;Mf>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/parallel/test-tls-multi-pfx.js b/test/parallel/test-tls-multi-pfx.js
index f750aec325c957..28cd945e3cf3b9 100644
--- a/test/parallel/test-tls-multi-pfx.js
+++ b/test/parallel/test-tls-multi-pfx.js
@@ -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')
   ]
 };
 
diff --git a/test/parallel/test-tls-ocsp-callback.js b/test/parallel/test-tls-ocsp-callback.js
index cf05f6967a967b..2670fefd3dcf72 100644
--- a/test/parallel/test-tls-ocsp-callback.js
+++ b/test/parallel/test-tls-ocsp-callback.js
@@ -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) {
 
diff --git a/test/parallel/test-tls-pfx-authorizationerror.js b/test/parallel/test-tls-pfx-authorizationerror.js
index 64b6e1485dc538..5461a19d20c481 100644
--- a/test/parallel/test-tls-pfx-authorizationerror.js
+++ b/test/parallel/test-tls-pfx-authorizationerror.js
@@ -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(