From 63e314a3719507045839176d4836455e5c479ce7 Mon Sep 17 00:00:00 2001 From: Shigeki Ohtsu Date: Tue, 9 Feb 2016 10:49:37 +0900 Subject: [PATCH] test: enable to work pkcs12 test in FIPS mode The pfx file created by pkcs12 command of openssl causes an error in FIPS mode because its certificate is encrypted with RC2 by default. Adding `-descert` option resolves the error. Fix: https://github.com/nodejs/node/pull/5144 Fix: https://github.com/nodejs/node/pull/5109 PR-URL: https://github.com/nodejs/node/pull/5150 Reviewed-By: Rich Trott --- test/fixtures/keys/Makefile | 1 + test/fixtures/keys/agent1-pfx.pem | Bin 2437 -> 2437 bytes test/parallel/test-tls-pfx-gh-5100-regr.js | 5 ----- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile index 1148e529cd9595..277734aa174562 100644 --- a/test/fixtures/keys/Makefile +++ b/test/fixtures/keys/Makefile @@ -81,6 +81,7 @@ agent1-cert.pem: agent1-csr.pem ca1-cert.pem ca1-key.pem agent1-pfx.pem: 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 \ diff --git a/test/fixtures/keys/agent1-pfx.pem b/test/fixtures/keys/agent1-pfx.pem index a36e746a72e06e8dd913f335c1e889ae7646513e..b0395eede9c2513f714ac49e0a9d386cc4830da4 100644 GIT binary patch delta 2257 zcmV;?2rl=96NM9ySbqaB4g?5_h$qm|BbqM)0tf(rf(7UV?i!b_D&;ZUCSQHyD=Z9* z?%FdishSNgBGM@s!&f*~F!D++ZUae5FW`n@gF^>x(FBRot{!^1>$a!VFny73H_|n# zqAFpoopygz--(Fn7c!bvJ?$=7h}AA`l)$4)gK0}>^gr(p$bWTo$WY22MGdLy<}t=B z)UbXFUv{>61Dy(3(e2bQL6G9Z`s4=3v{yW$}1;u$%{i4GoNKU~Eg} z+b}zKG3=8GOWBUj)VE|e_4Dsv8|^2V!{6C3qYnGAF9`a5jy?W}!icU2km}-|Pk|qL zwx!5yxcrY?pMNsMk2B=0n%^!@IV1ibaHTB7Ci&tMAMEc+?)}RvUdnTcI$4N$4m0%K zqHA@A$y0f|bd9+DmI5(h-Ky*k4YK(XF{6l~;eWuvtR4lz#I#l?5sG&(s7Z-N z5=d`5L$5L1H)zxNhWtYNVlu%Za*d$iz``E(Fr~`=K$Q)fsMEp4nV|{*TU^%yC4c>m z$>Z6o1#)t8KCFG5We}8zvyyG<0Me7MkWrHODA0= z(p7PB(h92}em%2T{Mg~q5c$`UL?WOXzo&+yV$k5@C~E}F2=lc`=|JOqt_=TR!fYCJ zgGG&6f#JL1kp_X}|1d{o&V_!LL_oVML!I_)PJaobY@!o!cfXZ-AAOYSymKfk09 zZ;e$A0nM>w=b}vkxse#mnSs*Hd!`p}myEs%qQ9dM%aKX{;NDw;4(r=&7JCiuJ!!#| z0LF<%GjzcW*c6qGpmvE9|17xw;0W`_&r}Ctd)s~K;GIyvjY>Gjx?v)a8X4&5gH)*A zcz;*1Pa*n{Jh`=B8Qg@H4Zg`0{#mOT#pn0dy($E&7bQUvE~`6E!)w@y}0Lu$;? z0(Kh!3JK($`mO@zyCR1S?#2K&0A8f%B4MDRjZlw9PHrFJw@ZW)0Fc@xadm|hFH`$K znBHMUs=cSp;RPHE*;`)pC3o;REb+ivn9rmaol$*X_6f?6V%M|#zTsZh(Q5TPg6w~dZBdZJ;UxsEamT+L2rF?pCc3h~#8H$^9e@3p*mX}f zev{*he3xG_T-9sYT@F+8*?1&AYeuX(yZMnptss~lP=!cySQa4a3r)tKfp5nZRoh@e z%kWm-}pq95Z!@6j6P9t3dJQV^<28gD9};8-H9rHtQxH2W1#kX#R$tQV=>4ZYD%E zx+>{&%);>GDhQ#LJ@N}d`l~UehENDP@SnWzy-RK zRR%_XA`mgw?h4200s;sC1cCy9#6+Lb*0GSEj@|&6`rJ`fsPTia>_oGJ+Z@&1bzDWl&bBXr zr43Nx!~(*eTET=}4v?dL`2DfXXtVwHvNI|WXJk7G(w{fdb@?rAU!>jR%Ewn6j zCVuuw<1G62%D0y>t<&MTt_yyz9aQvxf%Kz87B?hXpqK+G;mr>(6a>1riSK?9KL|@s zFzmZzC}4W$V=!$QEEF5*Kb1&{m5`*G{m0vGTJM{TnW9CcQbIN|L$tg}KdBJn{QA?F zWY9)lvOPhKSfD|7qEH|l(;ed7O^fHf!lf;FwzA^_W6&T=Z#$UBuJanYS+2o zrp{kI_`bPJm8lBc#@v_+I*OowFEM)>f)@fu2Sj7TDWu$@dOc(tDzM@%8vrt#w{rVt zZ})Aj=V$g0uzkj9r~IKhnN7zPVSP5)m?Z;s#R}m-Y8S0s;sC9$-lx delta 2257 zcmV;?2rl=96NM9ySbqjE4g?6g#@(8c#O&t+0tf(rf(7WE9Mh?!zRtdv574C@FDX2Z z0g>vi^8dsYtUmupVw5J{tQ+0Q8XD8n%NL^;PjdqRY~66IILpO@^C+(a7Pgb1#)g}N~nD^9*| zEeE)!f{QMK<9{BWK=HR=u-Z_ZRU_i4_x-G)wWGGz>-GqPS5lB8<$qWXSln6l5oMHh z1CnO&_pcz%yPvqmC{l?Nkv9a4eLq2M;g`#EU=q6lSu2Q_^Ahx@F#1xtIYOAmE{D_~ zjhrJ_qkCwtj^}YgXP+B;&Ihnv#xbLtyw(G#ZFr+GBsR>JZ35g)qrfSAJC}(M#W)i#4*M+nQzkn&x>!5D6A0yH%!Jt2!bOmH03~gO zR9jFz>wkTsWSAaUms?Db*!+n_{5+@9r$hcv#9%kjdA0ag+ixNZ#T>|vMf$042Z9Jz zYVt{scq_Qfc#P9|E|5>}&mJ&wTCRj^AG##mi}fW`E@?DhAc|+NtaI~3v!1x)9qYs7 zzYNEyjd5xXeCBlI%8+76UG&5eOgtVqrBFkgNPpw-9?u=R&;TT{wv1cI+!_yHT~XCn z|MNn#Yk8Yuld4ND#meja7>YG(K9AVQ1h@!tCHEB?58nS_Nt34V`N38QD4RI$WaQVg zPBj@r9dGEl@9Z_9bJE<3M|WwMvK_QF3bAO8f6=Y~u|iJU4Xn7EZD;=UOY@#s9kd*~ z%zsKH(YvPIH&c*hrjj)0z?XV|ThPVnr~XzL^A|yqW2`Zx{7(ncEhPGbel2&RRk;5I2&Hc?k@s~20^NGXc=fS-u7ab_bF!M$EUB(fZ z{|q(CLFm`lC^@3@sAH9wH?(U@?9llQuYXeBLww_vDD;wsiGUAkSn-Wcf?5*8fqsI1 zs7K5q!^gLWr8&~btA)6l>=Zii+k?cPwjO-vhz&@q{9d|0u?O2C`Kl~XWES=!jsjtMgth_1m z9Tb*KYH61JOXWOk0m;c3mtM5Iet+jzDQP9X>s~hv?_~E(l>BPk{@E=e$r+TNObS>Y zz$N>xHsa-NCzi_C?0l6$bY!=8dbP2}IGtM#hLet+eGuU3^| zY)J9p83K8Z;9@&a`3qDIO)_ZbmCR@o-J(UqBm9qY0Amk1_QQ@hQi%ny zlKeEv8Vq#HhTS{c6VEJnE~5G;D8kt!_~nOFT=BZ~NJUcJCO&bOS_5#aq^nl?vTBO& z=wjcDR(xK@xQ$mGfV+$=qJK-+m)p`lYk&P~q2t~3Sc4Dtnkfd+?n>91ic*U58oVh( z4ZSm42txtuDRLkAG{66KlXDjUG@Ho1^wo~{UJ)X@ltY&c3$ok+6GU-`QGTdk z;p9EocaVC1d8(GK#Q+Z&2*=oR1tlV7YKeFJ2%`Jx=Lp{Vy+a;~` zFycFyq0)o8`++u*vjmuy1gYa;l5C@;w(e!NRaJT|7DXl*;@ff$Zplug zA)O}TttSs$`eVd38~;qM>Rn5hIKJzhR$m9LPDG0OqZBR{rJA{Nh;ES94>#B)TO0>} z$S}+>sPP=6<8{_Vyg9l>}nFtSg*J%Mc7}_af zRKPg1o0U%C!)3IYTlN@jK9-(#^0~eVun{sT9bd}mNLzuj8=3fn5XM=6e+j}}3s-&( zyCKAQz1?(+313YQo`i3IcIrXpIF{dku|*q>f_x*EC~*$dPD94dX%^EwJ7IG+Y)EZi zLM0F1Lc3Z!xlE8|C~-MyB|A%jmA;AvleXT|ri=vDF4(^a~V-3Iwx< zr%`GI@`{!xCm`&@?(${3)N6$E$9}idcwG}2$H-9~AtrY9L*f=|`_OrvLVDCRfh1Y) z^Hv^p&Bk6T$-ay}To^VaJHK`ngIzL8%uO^UPQX+hN~MZ%ud0#7pOY&II3keW1VKcO feP#f`Ci@p^lH80~I_(4qINF$R17{|G0s;sCw3Sy9 diff --git a/test/parallel/test-tls-pfx-gh-5100-regr.js b/test/parallel/test-tls-pfx-gh-5100-regr.js index 29b8955c8758d8..865ac2ba3f299a 100644 --- a/test/parallel/test-tls-pfx-gh-5100-regr.js +++ b/test/parallel/test-tls-pfx-gh-5100-regr.js @@ -7,11 +7,6 @@ if (!common.hasCrypto) { return; } -if (common.hasFipsCrypto) { - console.log('1..0 # Skipped: PFX does not work in FIPS mode'); - return; -} - const assert = require('assert'); const tls = require('tls'); const fs = require('fs');