From 1696603ccd43a279efa35d9f6617ce664bfdf504 Mon Sep 17 00:00:00 2001 From: Kevin Driver Date: Mon, 6 Nov 2023 15:07:03 +0000 Subject: [PATCH] 8308453: Convert JKS test keystores in test/jdk/javax/net/ssl/etc to PKCS12 Reviewed-by: weijun --- .../ssl/SSLSession/ResumeTLS13withSNI.java | 22 +++++++----------- .../ssl/SSLSession/SSLCtxAccessToSessCtx.java | 6 ++--- .../ssl/SSLSession/SessionCacheSizeTests.java | 9 ++++--- .../ssl/SSLSession/SessionTimeOutTests.java | 6 ++--- test/jdk/javax/net/ssl/etc/keystore | Bin 6494 -> 8074 bytes test/jdk/javax/net/ssl/etc/truststore | Bin 2785 -> 3318 bytes test/jdk/javax/net/ssl/etc/unknown_keystore | Bin 2538 -> 3231 bytes .../sun/net/www/http/HttpClient/B8025710.java | 6 ++--- .../security/provider/X509Factory/BadPem.java | 10 ++++---- .../security/provider/X509Factory/BigCRL.java | 7 +++--- .../sun/security/ssl/GenSSLConfigs/main.java | 7 +++--- .../ssl/InputRecord/ClientHelloRead.java | 9 ++++--- .../ssl/SSLEngineImpl/TestBadDNForPeerCA.java | 8 +++---- .../SSLEngineImpl/TestBadDNForPeerCA12.java | 8 +++---- .../SSLSocketSSLEngineCloseInbound.java | 12 +++------- .../ssl/ServerHandshaker/GetPeerHost.java | 4 +++- .../ServerHandshaker/GetPeerHostServer.java | 8 +++---- .../ServerHandshaker/HelloExtensionsTest.java | 9 +++---- .../ssl/X509KeyManager/PreferredKey.java | 5 ++-- .../X509KeyManager/SelectOneKeyOutOfMany.java | 5 ++-- .../CertRequestOverflow.java | 8 +++---- .../X509TrustManagerImpl/CheckNullEntity.java | 5 ++-- .../X509ExtendedTMEnabled.java | 8 +++---- 23 files changed, 68 insertions(+), 94 deletions(-) diff --git a/test/jdk/javax/net/ssl/SSLSession/ResumeTLS13withSNI.java b/test/jdk/javax/net/ssl/SSLSession/ResumeTLS13withSNI.java index 3e70af733fb..3d05607bd39 100644 --- a/test/jdk/javax/net/ssl/SSLSession/ResumeTLS13withSNI.java +++ b/test/jdk/javax/net/ssl/SSLSession/ResumeTLS13withSNI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -438,13 +438,11 @@ public class ResumeTLS13withSNI { private static TrustManagerFactory makeTrustManagerFactory(String tsPath, char[] pass) throws GeneralSecurityException, IOException { TrustManagerFactory tmf; - KeyStore ts = KeyStore.getInstance("JKS"); - try (FileInputStream fsIn = new FileInputStream(tsPath)) { - ts.load(fsIn, pass); - tmf = TrustManagerFactory.getInstance("SunX509"); - tmf.init(ts); - } + KeyStore ts = KeyStore.getInstance(new File(tsPath), pass); + tmf = TrustManagerFactory.getInstance("SunX509"); + tmf.init(ts); + return tmf; } @@ -463,13 +461,11 @@ public class ResumeTLS13withSNI { private static KeyManagerFactory makeKeyManagerFactory(String ksPath, char[] pass) throws GeneralSecurityException, IOException { KeyManagerFactory kmf; - KeyStore ks = KeyStore.getInstance("JKS"); - try (FileInputStream fsIn = new FileInputStream(ksPath)) { - ks.load(fsIn, pass); - kmf = KeyManagerFactory.getInstance("SunX509"); - kmf.init(ks, pass); - } + KeyStore ks = KeyStore.getInstance(new File(ksPath), pass); + kmf = KeyManagerFactory.getInstance("SunX509"); + kmf.init(ks, pass); + return kmf; } diff --git a/test/jdk/javax/net/ssl/SSLSession/SSLCtxAccessToSessCtx.java b/test/jdk/javax/net/ssl/SSLSession/SSLCtxAccessToSessCtx.java index 4e3b8e0b076..d50a30bcc3c 100644 --- a/test/jdk/javax/net/ssl/SSLSession/SSLCtxAccessToSessCtx.java +++ b/test/jdk/javax/net/ssl/SSLSession/SSLCtxAccessToSessCtx.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -179,8 +179,8 @@ public class SSLCtxAccessToSessCtx { sslctx = SSLContext.getInstance("TLS"); KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509"); - KeyStore ks = KeyStore.getInstance("JKS"); - ks.load(new FileInputStream(keyFilename), passwd.toCharArray()); + KeyStore ks = KeyStore.getInstance(new File(keyFilename), + passwd.toCharArray()); kmf.init(ks, passwd.toCharArray()); sslctx.init(kmf.getKeyManagers(), null, null); diff --git a/test/jdk/javax/net/ssl/SSLSession/SessionCacheSizeTests.java b/test/jdk/javax/net/ssl/SSLSession/SessionCacheSizeTests.java index bb61abb35d5..bd6891a3573 100644 --- a/test/jdk/javax/net/ssl/SSLSession/SessionCacheSizeTests.java +++ b/test/jdk/javax/net/ssl/SSLSession/SessionCacheSizeTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -315,10 +315,9 @@ public class SessionCacheSizeTests { sslctx = SSLContext.getInstance("TLS"); KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509"); - KeyStore ks = KeyStore.getInstance("JKS"); - try (FileInputStream fis = new FileInputStream(keyFilename)) { - ks.load(fis, passwd.toCharArray()); - } + KeyStore ks = KeyStore.getInstance(new File(keyFilename), + passwd.toCharArray()); + kmf.init(ks, passwd.toCharArray()); sslctx.init(kmf.getKeyManagers(), null, null); sslssf = (SSLServerSocketFactory) sslctx.getServerSocketFactory(); diff --git a/test/jdk/javax/net/ssl/SSLSession/SessionTimeOutTests.java b/test/jdk/javax/net/ssl/SSLSession/SessionTimeOutTests.java index c44c12f6c59..18a31dd1dd1 100644 --- a/test/jdk/javax/net/ssl/SSLSession/SessionTimeOutTests.java +++ b/test/jdk/javax/net/ssl/SSLSession/SessionTimeOutTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -342,8 +342,8 @@ public class SessionTimeOutTests { sslctx = SSLContext.getInstance("TLS"); KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509"); - KeyStore ks = KeyStore.getInstance("JKS"); - ks.load(new FileInputStream(keyFilename), passwd.toCharArray()); + KeyStore ks = KeyStore.getInstance(new File(keyFilename), + passwd.toCharArray()); kmf.init(ks, passwd.toCharArray()); sslctx.init(kmf.getKeyManagers(), null, null); sslssf = (SSLServerSocketFactory) sslctx.getServerSocketFactory(); diff --git a/test/jdk/javax/net/ssl/etc/keystore b/test/jdk/javax/net/ssl/etc/keystore index fc5e1ce53bf9ca25a722fa0c45057e3996e20e7e..7e2a8d69a44e0d34c2b22b040addc31045b9a917 100644 GIT binary patch literal 8074 zcmbW6WmH_tx~`GNf@=f8T^7&{q;Yq5C%C)2I|P@;-Q9z`OK?koU_la~2@V0m$-eiF zz0Wy+)*5%zkE;4g#;CX6`8{*Y2@0c(LV!mEg;9c#(O9BnqwX=`QQ(WhD5(Kql;nTH zB%m;Ks{b*BjtdAw$NUpU1BD>~k0*Fb z0R+L__aGzd&Oj^cZKf5%AJgfZCtU~#j5rAJR3Hpw)c?C90vZw=h#VQsBuWIHqoF--ilFhl8Gs;xnPc8t$;8m5Mg-YhG>M1;aIStevA#IEKq$IzkG4-HD4Iqs6 z4=K2{!-UX*YeEIjftELZ#%42y%*XHg&+cXo6#tc__XLT{W+bY?aE1A``|RH=;HyDI;p^77~sm@Jq7@l1X2F` zy3h!~coaBr7I2<$j(>{ppO!nEDTw+%69~Zs06a}wM@uR&gpUWz&B@2h`Hqw8j|={n zHA4G9q1}IHj67&|?Jza{&ojX>F@`KWF%lm0@_%9scjQO=+wsxHfIO6DWxZkxfa;dP z{`-;Z^9*WTG87EoFZcAvd> z3F}P@fb_G#V{RL)d64WGjrU61W;*u0R~uLsMEjpp6M%^*2>zQamT=~9ZvRLcUe5nd zX?P&^1|AE7<#IhVZ=rP}w|HA@y#GX+5b~-iQW?CMvx%rl%R9|BfNIJ?7NDM?QKf<~ zAc_773jUpMl5FOB(l!D@3wNpr zSulbL)(E#c|A{!mseL>5m`m2zU<=-sosWKiFu+0K4{?ugcXh{c1zn?I=D`L z8fU_ZU8)9snMlCgf*Wod)UPz71&{p(+eCZ}_`LpGCaK|Sv|?n~_EX5`@2;{Bq4An) zOB@ZblI8ILvW}r?HDRh5d|brh$3=*C=FC^u{->)iaQVl#RUh^?NqIef#y00A-jU@_ zq~S}T<&Z6oN55!e7bOJgGO<2~VkM=jUSogOWb7_=UWj;k|LZ+w*z5`^yF@=A%=`=y zjp(+JujgToNq>Xm;*9{~=ca5y_{EUM{xH>4V3!&*iqZ`g^I!$nM5PRehzW5bqLmrj z;K^)`p5_gPm0>P#3p-d4-eSU(I>zl3k7Y=lG9Gt&$n6A`*^wcCNq4SnJ>? z#<7J?q=H+KgwGPv6Tar0KMZyeF#dc=HL)$mH*X(MJ5J>x`F5J`>QMW$pl_h9ner%v znewjoK)s1DCTDQ|K>1)ap+)Mn#n@^tdyCBCH>Ot1`iLxYcevsVHHV~Mw)#^W_ui1o zxhbQOEdHyf0%!#yE-u=ifUz5^nGfdiaY`43_Ljx5XFX#2H=LkIy4z!acOgFzc7sMn zFw{HMcjC*=ClZg?33#E}b#s5fKGHG=rj?1f*x6~ia5*uc$6~=Q7w^CA2yB!@x{D!l zTD2wZ?B~; zENbtaa&xD&-bX)t9?FrVwZd$;pTsCA&I}`mIMMqL_)e>l0$!#~HW{!Jy4HnSm)quJ zyD0XY$i4J@`U1jTM+8|KX}gHF+o%wNH(ep)HhNPpFVZkN4`aw&!L!soo-@1tv^&yUE1ug3^OEpyjDgzl4DL8g z2bDX?x6myl_z5Jo1i^>&sHt~%L9|Lj`lu)aywAml?yV1%YNz-@w7uH}ns`_tW2^K+ z77o4a$X5uN&7>cUL!cM(KT4D5F%J}-cn5?J#5KvoCFfxNl+anw`0T;lFe2oTvY$1O z!~H%d>0k^I2^vT|bFZfM#3xF|5{5{fiiC1e?z{OZM#(`Vr$(@L|1G0=`ly!q1^3Ta z`n)@a{*uR@Q`nXNMGB*-!wZXC=WgiJ4T;ba6k_BU-V= z3qwx*L>|vB8~bPC?-m|gU||r+e+etw;rlX8C_RZq^|s~$ z9Os?y+!plVf>lAR|6LFY3NpBV0sQ|^>JP;K)pmj7gnI`E`2%(E-%9k32NZ^X`R^T3 zkc-0b_y2^xBEZA_sn-890{?d$V>sdZO5Z-waNJ6$CWT^+J!4#|{7*!~J8=$3r$7R< zmCK)t^E|ACgyEa)uUAR31$ja>h$p3C(^**A7OxMnn>Vpe7mDw$GSSMgho!*kKhd`5 zW+9~lFixiZ(CakL*l4GBZQXK3tAoxbhuP}yA>wa)@lBZpy+ushn-U@tMw)tNKOXC( z;u7STI7^Jmlp=rsf?;mCTvS(S5eihn&l~lx=Iabazbl_gLJYD|gLA(|-se*fy;4u@ z7BL)|J1DG)Xe6BXXLqct(qu>Gal!p!IsY1cQD$u>X11R~YRqqRQt??#%!iZ7;Z?(# zyX0JGjrYTvhUz)N5yP@Qhs97A3{88_E0F=CieIjp_}&8F^27+S|5|6QCA09eyh4H@ z+(yc^*enLt;*MTSY3b~8Hdpz0p0JHx`)8la`HkF)^Qpn2qpokBv$L9~RIFviks+z4 zF%YYij`}lme|8D2BeCQj&EK55~oW|UTXH7GNs4Sw#uG`ymcNBVUboOY zRCYbn~bL3lNTdyJe9}Qq;e9?qv|1sL{#x-e{$Nj(tZMiyr;AI%%2bint%| zMAVd-pBq+b*?sZJAajBD#np9via-vBD#sqGLrJVoqN1=i1uy27pk6$;cZcZsC~(9M z+4_3&?G5bdxpC0=_@D;Aa>JoK$ag370R{8IgN%Repw&Q1ZoNIzC`ApAfE6bh3)9d# zXFoW#14x20BsHD;SaKk_b@sz+$cyFrQ>Tcl5}_-(twef}v9$ClF4(J^=&Kex`8P14 zG;)hr#8<+BrX{iDuB9u=jRoNh#HPzQQK6}_R$T4tDh9V8l3Wx-=#rDQteqgfJvwFF zD>^-*b(n?PS)rkR>aVBm-mgCo;#EH|MMb~VsJWGCNBH{@LQs$paW#%;DC;xKup?N6 zz{FEtSQl}4ZG|y`7>=9tD+l`qu}JszD|Kq2(WI4jP8;H1Dla3pDC!$iT6ExBRFx*< zZxsA@l}Q*_1frfj6+EKDPv<#KIGMP*O#MBZJ;r^eTuH+(PUo%#LuqwJ;o~PyN;&8- zN^wgZ-cnU-!+hQrD9(OFc9c!fF0qUaebFxX0^(h3H@+6lgB~&6s`xf;+f>;?vi6Wf zO31#EFG=9@*Sd(Xb1QYaIE0!qiM6!RCa$c@D-DJhC1(R!#oQUyBftMjuRwHkja_$+ zK#=crp*I`HP9vhnK;LPoYBksFBsKVGV-6R77H#;#5^!Il8lYSg8u3Pvm@&+LUky`ZjTjOx?S^E}2Xclsg`rPG(`q4>&~1R}R|zoY#eX4KL3Q5u#1 zOmCpYP$6xS*Tk20@WJdv8c-UHz7K+-^8o#BU+Hl?*CF|iqDc&>1Y+34)0^rJ5CnuGS^X+xPdlIX*x z(-Ep=3)a&wtc_n7#F%X=g3i9U6qG^`+s%=(QN#{fx&xK2+_ zP3(!IP^#T4#{!9f@&P9O9x~6Y&a$JbuOne|9g>(=UX?52c)^SrOy5i*TiTdz38s9@ zGpnM-aSlH-I9G$ABcy#|yR8|4P|!+U_MeCI4o6^>yrqBC1aS=S#?Ha=wn~Kms62W) zIN&@5Q*nhmvQu)>*S%3U-tBQAy3A(H%?uo*J_F@LJ72%M`he5FpFP0TKW(w~FsxKn8>H(>k9ycny18m-UY?zvKE0UME0Ky^*&aAIXHbfht*De#4bqmy!xcjdkM!vL?q5ZxPrIKbb@z% z*|AMc;ZyTBBUJI)xG8;cmIRWXDvZE0O_oyw9Lk~1#LTRO7q$hf@?M;a{^Pb`6;$xq zR+H`W?~`vrEGp++2p&~Bx6@?$PfcCRbPRak7p^s}F$#ZeS5XA-gfy2GhIdog+v1M= z(4q%DpdxtsVS!^Fa8!LLM!$zmGn^@~-9DDst;S~7VntI|NXzziemUNEZ&NZ(vW)ew z?to?bFQMLDbJ`XMy-RibT|n3KHFyZz;Cb_K+30!lXZ{amg2tN{)Gr#;BN zO3bOf`rb8Qc|vq|2~%Rml6Z{?*{%m}fm0msaM79bCIIZSNYF!0v<}mynHXl@6{;+$ zr<1;$m%oiGGRd1OHuL)aiZb#AN7ua{&^B{=MM2mZ+;>D>u4rqNkhb8}3-wJmzUe9Z zs14MpEK8;f`$c=;q?2zJEAbI@a~J1oUQW_M=HwIB;G*x476CEH8ZRkF9FK1lf zfb^80RYkw%=-Wtg+lIHf>HuGRQnOV3w+}n1pB6U|Y0|!C1j12oo>0mlU}H7yubh{e zQc!wNty$8Ee-CrL`Mlf4?_5;o?OiH)&8j9Y@&3?2CzJKF_!g=AR;%b5_f7%6D**|0 zR3(%>m0sS8Xb|3VyPs=+Lpw<>-u<=?9TiBuQ`+d=c;#7P6Idc&d%l4l<=6KkSA|Si zS)6hF)0IcdfEw!4qJDSH=uX?cU|Y?Ha|Cs&D~>dq1UY97e$;1GB2(Q%7fe23{kk4- zV4uRv;$OX=WnW@}FRoja>pYlPV@XJZVR>R^8Q7}JNy4pRU(Hb_AHaPwpWTZSz}22x zKknfgj`hp?#Nl}RMrH+VKj9*HoX@@}aSju2BziDV_QWo)5)4QiNe}d~)&s^=9)nb1 zZj-!eMXBvmxCdF}_D$dIf%cwO`G_jdHrwH%B$wm5uz>@ODID)yi#rFW;Ql^JBY!r% z-?MHZ>2iTCjeFB6stPnVXIlFvN}ew=7d4$)h>8-Zfp$+)Gl(;kelUo0^liY3#(j9O zSl)}yDTl?4NZ=;*rYMjyPu*h2S@9xAGEGsGX%+}cF1N9I1bYKI->f;vZX&dvUTT+i)4+fX@QaA zQv>d?$X4M)Ux@bdczL-VP0nHG5kO281Iv<*EqS13<9W4))M<{+=DqVLh7~MG zW8$%}xub2qxtx|i3YLlC_H8a>j>jg6yFhDIGS?Z3e+ZkeSd+}Wl39GS+gtFjx+sl} zSY7pKyo8vPU6$!^b_r)9npRB*Ztp$dMo>yl|q zq0Y6PLMQ`$Y)~kS5OKI~!1y8iMn^;PRj5spTNy@%bz3pDILrz!aQSh%;8f0#_yHXM zCaK(U>wVZKTWW~c)o(Z0zUqDa>6mBQ*J8^~z%w#(NG^-@LEt@qmPEIM1s*4_jGGq++Qp~7PiyXQy;lQV(~JKONMHs1WS!IPdMB&&Pv~?m5tyRDAB(t zblu~JkP`7kCJ~Q$*z$Kr-U6!}<{Hqfs&l%me<9#B748IlSb(QDrH7A8eszA~ZrgM$ zA1>p6mJaJFrqwR~U9UTk%TZ(SvBN2np_EY{A%Nn1%gBG@qQ4!&knBy2uo?M4nTRV? zoooc(uRp1?pwvo@g_?B@?WAcVl2%MyMsm6#Yjni0hS*M_U@B1Cs|c3`u#ub( zd-G>J1^;=E#s>h;Bulh*K=$+-&R+3~BB2HwB>Aj`LM^=%qL{|em9Z)RZDfhNHC>|JG=U=%Sl^{3y`h_B(^ti^BjP@#>t@-hh7^8apv=H)K-%sI!{NdlTaM;sq{7sXNtb zhhbk*x)!Gou#k%};wUl7IR)G}-K@L^z6^SmW|&WMt~Yd8Fcms3mh|UrU3B@Y#~AAo zN7X##Ou!DGBG4~F(T-CS663kP>++4C$Y*`89n%{-_=iKYrxBXr$}oD6T4zWY|4LisYL zl(&&a1g{7rZad=1&g5^`w-r#Wl5qHJXk-LJFt@dSlTT+HAcU;nhh71&j5KB(01{#6 z>Qr{+0XU+#NP!BGo2?$(q_a0;Q_P~8!FBeO_fBff-dM%##pGuM?(b836b!tf55yBd z+4|R#?g)j8gu1oQ;MiLY>}P6g2lhwYNuenieHAXQ2_2PR&sHsHjB;PBrDA`@X=-?SFYlOMg$_wexUT*fB5Daks%v;~&AAe&j}7NC+B6fo9>EkgM^0+1)fphy1UX745tEP>0S|y~|nnfRTV};l|rie62 zH&v600)`^2hHcavHZSv6A2(;T*9zibNR5z^8jRB{LiLp4P*Kk>Fy2V*>8{r-reF2xbuXj{^9-PX4B*+WOGDlii5S_tJf~-KJ9flkGF8 z_V3wG(1<^6j7Ct?$$f zF&1T)iAWWC?#90M!KiQ+&Jbk2TM=!^pgq}At9+oYx9`_tm_c9fsXCHx+##fN^p-c{ z_mFeKo6%^@Ez#{A5e(yU))HMl;QI^f!s;eO z$YV)F3%{oEIY-|y2Or0XZk2-LHIj6LfQ^sHRNy@1vT-N8uRk_AJ;eA@i6e|_0J(XN z^UfA0bThM7n80u9ib_?A9n#1qz$LsaY!(yytg2Kn#xl{;+o9psm-F651EaHw5YgGH zu*!Y6f!=ZtX$8e?$AI$9N$RLJ0^QGAS$0}~Ki%{@g4L~#Nk5|Bj~+U?Zmw+E*K8k! zq1&_GnHKTD07hVkR7f3p*O{)?A;&1^d9ZK3FTDn2buanSF{LPa1j@fZ^p&gHhsh$3 zHVJFLrtvbop;mVuWt!*-&EB9!n5TR1R^!L)dp((cs$Q1;VNQ?|2n@pf_y1`GcqBLg z)m?sx^1hz%iJ1*~wP`22fgcE1$WIJ5q=yz_*$*M&0SMX~%2%&-X^Ax@Ke{6iPC6gJ Lg1-Fg6W@OU>?NZZ literal 6494 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 diff --git a/test/jdk/javax/net/ssl/etc/truststore b/test/jdk/javax/net/ssl/etc/truststore index 0ab0702512e3320be3344d54cbea352257ab3c5e..5e08b3b456604250bf266409ce701932883f122e 100644 GIT binary patch literal 3318 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 literal 2538 zcmchXX*d*W8^>og7_y8Ri8w~GO=HHEeJ4fseLDzQ#!{JVy%=k@m?4U!*On!F_7Yh; zlEah-avbFTNx`E))!*Y*7G`~L91ujl`J=%4AI0RRB##{mLh9wDxN zfdmf#0LZ1$pux-Nwc?^djkse>tWr!s2v8El1q4C?kZ4fB@_X`?$=*jqe=lUTaQz(G z;;_N9qBDH^MCe&Z=~_vLSb&1M^*(m!z_pWmo~*gpUTNs%BSvrxT9!yTd;kkrH#V0L zvzK(UA=I0X&rV*jOJyxnTTjoo2%;vHVi59$FKsW!YJD7bmxJ~zLqg5iYT8^wtHUeH zYRaKQ`2rH*(*5lqQn?|Z8Eb&QRZ!hgcrJRVkTRohSD6nnz`-r%yt_6=_t>0}6&WqV? zbSWL-Ow%Y>pB=BVm70JlHJzhrD|zybE-bx>|vt!s&x`={a+$06NUU*;~ftKOY4?tqfK* z`z-N+z(4@-ul5)Z17`Sg7#Dp*%UJ9K9ySs}Hf8IV zS9?|8jTzK?T{xP)p0%eNn~C8U41%RGd-Tc-86{+YP4C!ws^U{N>>xjK8} z`VJ#nX^b!>|NqYj3|^EZENb3-9}iI8ID3NoxH(F-Hg<2^%458fAcmO=(k#mZZ}FMB&?Z%6D-YbR&VV3;XVrdXa2Lu0|z(LF<^o$Qdo#Z121p%BC5AkKZ; zs*`J4h3l+KYh`4t)pWvjO+Jyuyddd<Cj=FMY#AX=~w)oG%W&>20!FMlXq3+$e8Z zk6BN%y#c=`E43z^5{K`k7Bb!UP0nuyWa<@*P{;p3T~Iw|hkL17LAR5@r2q@;~+CYX7I)eNl(t>o7 z$Sq+$ec>K_btybJNHP?#pnxqnS zQZ8WA)1}Gxu4!>me*O|9oD==rq^;~Vy{VUfSH^tx$aXPJLyEu$>L@MI1)pN!>$U=0N7i;`AH==NReMK$ zQsJo3Y||2&S>5(c`D65+jS*Z87Jb>w&gNF@sGZ5;6&NQe>hXEh6_F()aTKD7#v+r_ zUoxwT3QM-Ukt#k@SS2V`UqU4N7e>Or3Cp`}?7M{lPpJ$PZM2t~r6-ogOwZacZQ%dE8UH!J|o@3{}xuTGysPI z@th-O3Pu{Ub?PnvK-1&*(}ep^Yl3)Su7~=>#s*vUyEVm&a`1=`1a5BA7sy+YdskOz QIzH-P5#g!Gu&A{^0NpqMI{*Lx diff --git a/test/jdk/sun/net/www/http/HttpClient/B8025710.java b/test/jdk/sun/net/www/http/HttpClient/B8025710.java index 0c3a9344459..490f6aacb23 100644 --- a/test/jdk/sun/net/www/http/HttpClient/B8025710.java +++ b/test/jdk/sun/net/www/http/HttpClient/B8025710.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -264,8 +264,8 @@ public class B8025710 { HttpServer() throws Exception { super("HttpServer Thread"); - KeyStore ks = KeyStore.getInstance("JKS"); - ks.load(new FileInputStream(keystorefile), passphrase.toCharArray()); + KeyStore ks = KeyStore.getInstance(new File(keystorefile), + passphrase.toCharArray()); KeyManagerFactory factory = KeyManagerFactory.getInstance("SunX509"); factory.init(ks, passphrase.toCharArray()); SSLContext ctx = SSLContext.getInstance("TLS"); diff --git a/test/jdk/sun/security/provider/X509Factory/BadPem.java b/test/jdk/sun/security/provider/X509Factory/BadPem.java index 69682ff7d19..c63f9295123 100644 --- a/test/jdk/sun/security/provider/X509Factory/BadPem.java +++ b/test/jdk/sun/security/provider/X509Factory/BadPem.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,8 +28,9 @@ * @modules java.base/sun.security.provider */ +import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.FileInputStream; +import java.io.File; import java.io.PrintStream; import java.security.KeyStore; import java.security.cert.CertificateException; @@ -38,7 +39,6 @@ import java.util.Base64; import sun.security.provider.X509Factory; import java.security.cert.CertificateFactory; -import java.io.ByteArrayInputStream; public class BadPem { @@ -49,8 +49,8 @@ public class BadPem { String alias = "dummy"; CertificateFactory cf = CertificateFactory.getInstance("X.509"); - KeyStore keyStore = KeyStore.getInstance("JKS"); - keyStore.load(new FileInputStream(ks), pass.toCharArray()); + KeyStore keyStore = KeyStore.getInstance(new File(ks), + pass.toCharArray()); byte[] cert = keyStore.getCertificate(alias).getEncoded(); // 8074935 diff --git a/test/jdk/sun/security/provider/X509Factory/BigCRL.java b/test/jdk/sun/security/provider/X509Factory/BigCRL.java index eab4e7499f8..4709a34623d 100644 --- a/test/jdk/sun/security/provider/X509Factory/BigCRL.java +++ b/test/jdk/sun/security/provider/X509Factory/BigCRL.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,6 +29,7 @@ * @run main/othervm -Xshare:off -Xmx1024m BigCRL */ +import java.io.File; import java.io.FileInputStream; import java.math.BigInteger; import java.security.KeyStore; @@ -49,8 +50,8 @@ public class BigCRL { String pass = "passphrase"; String alias = "dummy"; - KeyStore keyStore = KeyStore.getInstance("JKS"); - keyStore.load(new FileInputStream(ks), pass.toCharArray()); + KeyStore keyStore = KeyStore.getInstance(new File(ks), + pass.toCharArray()); Certificate signerCert = keyStore.getCertificate(alias); byte[] encoded = signerCert.getEncoded(); X509CertImpl signerCertImpl = new X509CertImpl(encoded); diff --git a/test/jdk/sun/security/ssl/GenSSLConfigs/main.java b/test/jdk/sun/security/ssl/GenSSLConfigs/main.java index 6fcb39cea7c..50487634f46 100644 --- a/test/jdk/sun/security/ssl/GenSSLConfigs/main.java +++ b/test/jdk/sun/security/ssl/GenSSLConfigs/main.java @@ -7,7 +7,7 @@ */ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -190,9 +190,8 @@ public class main System.setProperty("javax.net.ssl.trustStore", testRoot + "/../../../../javax/net/ssl/etc/truststore"); - KeyStore ks = KeyStore.getInstance("JKS"); - ks.load(new FileInputStream(testRoot - + "/../../../../javax/net/ssl/etc/truststore"), + KeyStore ks = KeyStore.getInstance(new File(testRoot + + "/../../../../javax/net/ssl/etc/truststore"), "passphrase".toCharArray()); KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509"); kmf.init(ks, "passphrase".toCharArray()); diff --git a/test/jdk/sun/security/ssl/InputRecord/ClientHelloRead.java b/test/jdk/sun/security/ssl/InputRecord/ClientHelloRead.java index 4b0c19015e2..dab438ea9b9 100644 --- a/test/jdk/sun/security/ssl/InputRecord/ClientHelloRead.java +++ b/test/jdk/sun/security/ssl/InputRecord/ClientHelloRead.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,7 +34,7 @@ */ import java.io.BufferedReader; -import java.io.FileInputStream; +import java.io.File; import java.io.IOException; import java.io.InputStreamReader; import java.net.ServerSocket; @@ -146,10 +146,9 @@ public class ClientHelloRead { ctx = SSLContext.getInstance("TLS"); kmf = KeyManagerFactory.getInstance("SunX509"); - ks = KeyStore.getInstance("JKS"); + ks = KeyStore.getInstance(new File(System.getProperty( + "javax.net.ssl.keyStore")), passphrase); - ks.load(new FileInputStream(System.getProperty( - "javax.net.ssl.keyStore")), passphrase); kmf.init(ks, passphrase); ctx.init(kmf.getKeyManagers(), null, null); diff --git a/test/jdk/sun/security/ssl/SSLEngineImpl/TestBadDNForPeerCA.java b/test/jdk/sun/security/ssl/SSLEngineImpl/TestBadDNForPeerCA.java index 06e2aa94b35..20b4c39afb1 100644 --- a/test/jdk/sun/security/ssl/SSLEngineImpl/TestBadDNForPeerCA.java +++ b/test/jdk/sun/security/ssl/SSLEngineImpl/TestBadDNForPeerCA.java @@ -37,6 +37,7 @@ import javax.net.ssl.SSLEngineResult; import javax.net.ssl.SSLEngineResult.HandshakeStatus; import javax.net.ssl.SSLHandshakeException; import javax.net.ssl.TrustManagerFactory; +import java.io.File; import java.io.FileInputStream; import java.nio.ByteBuffer; import java.security.KeyStore; @@ -101,13 +102,10 @@ public class TestBadDNForPeerCA { public TestBadDNForPeerCA() throws Exception { - KeyStore ks = KeyStore.getInstance("JKS"); - KeyStore ts = KeyStore.getInstance("JKS"); - char[] passphrase = passwd.toCharArray(); - ks.load(new FileInputStream(keyStoreFile), passphrase); - ts.load(new FileInputStream(keyStoreFile), passphrase); + KeyStore ks = KeyStore.getInstance(new File(keyStoreFile), passphrase); + KeyStore ts = KeyStore.getInstance(new File(keyStoreFile), passphrase); KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509"); kmf.init(ks, passphrase); diff --git a/test/jdk/sun/security/ssl/SSLEngineImpl/TestBadDNForPeerCA12.java b/test/jdk/sun/security/ssl/SSLEngineImpl/TestBadDNForPeerCA12.java index 701620a7502..527ceb406c6 100644 --- a/test/jdk/sun/security/ssl/SSLEngineImpl/TestBadDNForPeerCA12.java +++ b/test/jdk/sun/security/ssl/SSLEngineImpl/TestBadDNForPeerCA12.java @@ -37,6 +37,7 @@ import javax.net.ssl.SSLEngineResult; import javax.net.ssl.SSLEngineResult.HandshakeStatus; import javax.net.ssl.SSLHandshakeException; import javax.net.ssl.TrustManagerFactory; +import java.io.File; import java.io.FileInputStream; import java.nio.ByteBuffer; import java.security.KeyStore; @@ -124,13 +125,10 @@ public class TestBadDNForPeerCA12 { public TestBadDNForPeerCA12() throws Exception { - KeyStore ks = KeyStore.getInstance("JKS"); - KeyStore ts = KeyStore.getInstance("JKS"); - char[] passphrase = passwd.toCharArray(); - ks.load(new FileInputStream(keyStoreFile), passphrase); - ts.load(new FileInputStream(keyStoreFile), passphrase); + KeyStore ks = KeyStore.getInstance(new File(keyStoreFile), passphrase); + KeyStore ts = KeyStore.getInstance(new File(keyStoreFile), passphrase); KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509"); kmf.init(ks, passphrase); diff --git a/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketSSLEngineCloseInbound.java b/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketSSLEngineCloseInbound.java index abf1571cadc..e084bdd3367 100644 --- a/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketSSLEngineCloseInbound.java +++ b/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketSSLEngineCloseInbound.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -173,16 +173,10 @@ public class SSLSocketSSLEngineCloseInbound { */ public SSLSocketSSLEngineCloseInbound(String protocol) throws Exception { - KeyStore ks = KeyStore.getInstance("JKS"); - KeyStore ts = KeyStore.getInstance("JKS"); - char[] passphrase = "passphrase".toCharArray(); - try (FileInputStream keyFile = new FileInputStream(keyFilename); - FileInputStream trustFile = new FileInputStream(trustFilename)) { - ks.load(keyFile, passphrase); - ts.load(trustFile, passphrase); - } + KeyStore ks = KeyStore.getInstance(new File(keyFilename), passphrase); + KeyStore ts = KeyStore.getInstance(new File(trustFilename), passphrase); KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509"); kmf.init(ks, passphrase); diff --git a/test/jdk/sun/security/ssl/ServerHandshaker/GetPeerHost.java b/test/jdk/sun/security/ssl/ServerHandshaker/GetPeerHost.java index 96180df92be..664f9b2dd49 100644 --- a/test/jdk/sun/security/ssl/ServerHandshaker/GetPeerHost.java +++ b/test/jdk/sun/security/ssl/ServerHandshaker/GetPeerHost.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -41,6 +41,8 @@ public class GetPeerHost { String testRoot = System.getProperty("test.src", "."); System.setProperty("javax.net.ssl.trustStore", testRoot + "/../../../../javax/net/ssl/etc/truststore"); + System.setProperty("javax.net.ssl.trustStoreType", "PKCS12"); + System.setProperty("javax.net.ssl.trustStorePassword", "passphrase"); GetPeerHostServer server = new GetPeerHostServer(); server.start(); GetPeerHostClient client = diff --git a/test/jdk/sun/security/ssl/ServerHandshaker/GetPeerHostServer.java b/test/jdk/sun/security/ssl/ServerHandshaker/GetPeerHostServer.java index afcaaf4b088..44a1e3b175a 100644 --- a/test/jdk/sun/security/ssl/ServerHandshaker/GetPeerHostServer.java +++ b/test/jdk/sun/security/ssl/ServerHandshaker/GetPeerHostServer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -49,12 +49,10 @@ class GetPeerHostServer extends Thread try { SSLContext ctx = SSLContext.getInstance("TLS"); KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509"); - KeyStore ks = KeyStore.getInstance("JKS"); char[] passphrase = "passphrase".toCharArray(); String testRoot = System.getProperty("test.src", "."); - ks.load(new FileInputStream(testRoot - + "/../../../../javax/net/ssl/etc/keystore"), - passphrase); + KeyStore ks = KeyStore.getInstance(new File(testRoot + + "/../../../../javax/net/ssl/etc/keystore"), passphrase); kmf.init(ks, passphrase); ctx.init(kmf.getKeyManagers(), null, null); ServerSocketFactory ssf = ctx.getServerSocketFactory(); diff --git a/test/jdk/sun/security/ssl/ServerHandshaker/HelloExtensionsTest.java b/test/jdk/sun/security/ssl/ServerHandshaker/HelloExtensionsTest.java index 392e882a19a..b8ac579f8fe 100644 --- a/test/jdk/sun/security/ssl/ServerHandshaker/HelloExtensionsTest.java +++ b/test/jdk/sun/security/ssl/ServerHandshaker/HelloExtensionsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -254,13 +254,10 @@ public class HelloExtensionsTest { SSLEngine ssle; - KeyStore ks = KeyStore.getInstance("JKS"); - KeyStore ts = KeyStore.getInstance("JKS"); - char[] passphrase = "passphrase".toCharArray(); - ks.load(new FileInputStream(keyFile), passphrase); - ts.load(new FileInputStream(trustFile), passphrase); + KeyStore ks = KeyStore.getInstance(new File(keyFile), passphrase); + KeyStore ts = KeyStore.getInstance(new File(trustFile), passphrase); KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509"); kmf.init(ks, passphrase); diff --git a/test/jdk/sun/security/ssl/X509KeyManager/PreferredKey.java b/test/jdk/sun/security/ssl/X509KeyManager/PreferredKey.java index 0f249f53516..5086463b589 100644 --- a/test/jdk/sun/security/ssl/X509KeyManager/PreferredKey.java +++ b/test/jdk/sun/security/ssl/X509KeyManager/PreferredKey.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -71,8 +71,7 @@ public class PreferredKey { "/" + keyStoreFile; char [] password = passwd.toCharArray(); - ks = KeyStore.getInstance("JKS"); - ks.load(new FileInputStream(keyFilename), password); + ks = KeyStore.getInstance(new File(keyFilename), password); kmf = KeyManagerFactory.getInstance("NewSunX509"); kmf.init(ks, password); km = (X509KeyManager) kmf.getKeyManagers()[0]; diff --git a/test/jdk/sun/security/ssl/X509KeyManager/SelectOneKeyOutOfMany.java b/test/jdk/sun/security/ssl/X509KeyManager/SelectOneKeyOutOfMany.java index b0348fec841..f05c32b3079 100644 --- a/test/jdk/sun/security/ssl/X509KeyManager/SelectOneKeyOutOfMany.java +++ b/test/jdk/sun/security/ssl/X509KeyManager/SelectOneKeyOutOfMany.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -70,8 +70,7 @@ public class SelectOneKeyOutOfMany { * Setup the tests. */ kmf = KeyManagerFactory.getInstance("SunX509"); - ks = KeyStore.getInstance("JKS"); - ks.load(new FileInputStream(keyFilename), passphrase); + ks = KeyStore.getInstance(new File(keyFilename), passphrase); kmf.init(ks, passphrase); km = (X509KeyManager) kmf.getKeyManagers()[0]; diff --git a/test/jdk/sun/security/ssl/X509TrustManagerImpl/CertRequestOverflow.java b/test/jdk/sun/security/ssl/X509TrustManagerImpl/CertRequestOverflow.java index c91840fa8ed..36bb6ccf01f 100644 --- a/test/jdk/sun/security/ssl/X509TrustManagerImpl/CertRequestOverflow.java +++ b/test/jdk/sun/security/ssl/X509TrustManagerImpl/CertRequestOverflow.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -192,13 +192,11 @@ public class CertRequestOverflow { "/" + trustStoreFile; KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509"); - KeyStore ks = KeyStore.getInstance("JKS"); - ks.load(new FileInputStream(keyFilename), cpasswd); + KeyStore ks = KeyStore.getInstance(new File(keyFilename), cpasswd); kmf.init(ks, cpasswd); TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509"); - KeyStore ts = KeyStore.getInstance("JKS"); - ts.load(new FileInputStream(trustFilename), cpasswd); + KeyStore ts = KeyStore.getInstance(new File(trustFilename), cpasswd); tmf.init(ts); TrustManager tms[] = tmf.getTrustManagers(); diff --git a/test/jdk/sun/security/ssl/X509TrustManagerImpl/CheckNullEntity.java b/test/jdk/sun/security/ssl/X509TrustManagerImpl/CheckNullEntity.java index 452fe1b4570..550cb8227cb 100644 --- a/test/jdk/sun/security/ssl/X509TrustManagerImpl/CheckNullEntity.java +++ b/test/jdk/sun/security/ssl/X509TrustManagerImpl/CheckNullEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -65,8 +65,7 @@ public class CheckNullEntity { "/" + trustStoreFile; char[] passphrase = "passphrase".toCharArray(); - KeyStore ks = KeyStore.getInstance("JKS"); - ks.load(new FileInputStream(trustFilename), passphrase); + KeyStore ks = KeyStore.getInstance(new File(trustFilename), passphrase); for (Enumeration e = ks.aliases() ; e.hasMoreElements() ;) { String alias = (String)e.nextElement(); diff --git a/test/jdk/sun/security/ssl/X509TrustManagerImpl/X509ExtendedTMEnabled.java b/test/jdk/sun/security/ssl/X509TrustManagerImpl/X509ExtendedTMEnabled.java index d0eb242442e..337f36979bb 100644 --- a/test/jdk/sun/security/ssl/X509TrustManagerImpl/X509ExtendedTMEnabled.java +++ b/test/jdk/sun/security/ssl/X509TrustManagerImpl/X509ExtendedTMEnabled.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -181,13 +181,11 @@ public class X509ExtendedTMEnabled { "/" + trustStoreFile; KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509"); - KeyStore ks = KeyStore.getInstance("JKS"); - ks.load(new FileInputStream(keyFilename), cpasswd); + KeyStore ks = KeyStore.getInstance(new File(keyFilename), cpasswd); kmf.init(ks, cpasswd); TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509"); - KeyStore ts = KeyStore.getInstance("JKS"); - ts.load(new FileInputStream(trustFilename), cpasswd); + KeyStore ts = KeyStore.getInstance(new File(trustFilename), cpasswd); tmf.init(ts); TrustManager tms[] = tmf.getTrustManagers();