From 91ab0ba03b9d485725a965d05fb2700bd89999da Mon Sep 17 00:00:00 2001
From: jjiang <unknown>
Date: Mon, 30 Oct 2017 03:52:38 -0700
Subject: [PATCH] 8175252: Backout changeset for JDK-8176354 due to JDK-8190333
 Summary: Backout changeset for JDK-8176354 Reviewed-by: asmotrak

---
 test/jdk/ProblemList.txt            |   1 +
 test/jdk/javax/net/ssl/etc/README   |  17 +++++++----------
 test/jdk/javax/net/ssl/etc/keystore | Bin 4764 -> 4038 bytes
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index d5642dddc4..f44476a803 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -218,6 +218,7 @@ javax/net/ssl/DTLS/RespondToRetransmit.java                     8169086 macosx-x
 
 sun/security/krb5/auto/UnboundSSL.java                          8180265 windows-all
 sun/security/provider/KeyStore/DKSTest.sh                       8180266 windows-all
+sun/security/ssl/X509KeyManager/PreferredKey.java               8176354 generic-all
 
 ############################################################################
 
diff --git a/test/jdk/javax/net/ssl/etc/README b/test/jdk/javax/net/ssl/etc/README
index e2e746efcd..0ac6a844a8 100644
--- a/test/jdk/javax/net/ssl/etc/README
+++ b/test/jdk/javax/net/ssl/etc/README
@@ -62,25 +62,22 @@ it can be used for version 1 X.509 certificate) keytool command:
 
 Alias name: dummydsa
 --------------------
-Creation date: Sep 20, 2017
+Creation date: Mar 11, 2007
 Entry type: PrivateKeyEntry
 Certificate chain length: 1
 Certificate[1]:
 Owner: CN=dummy.example.com, OU=Dummy, O=Dummy, L=Cupertino, ST=CA, C=US
 Issuer: CN=dummy.example.com, OU=Dummy, O=Dummy, L=Cupertino, ST=CA, C=US
-Serial number: 4e8ca03d
-Valid from: Wed Sep 20 11:10:34 PDT 2017 until: Mon Sep 20 11:10:34 PDT 2027
+Serial number: 45f3a314
+Valid from: Sun Mar 11 06:35:00 UTC 2007 until: Wed Mar 08 06:35:00 UTC 2017
 Certificate fingerprints:
-	 MD5:  5F:6F:01:75:BF:6C:40:B9:65:C0:8D:00:AE:6F:BD:38
-	 SHA1: 31:06:4E:07:B2:01:78:8F:F4:6B:B6:6E:AC:C5:16:76:8B:1A:58:81
-	 SHA256: 86:A1:E6:69:EE:00:50:35:2A:56:F7:F9:8B:61:2B:83:51:44:EA:E9:B0:EF:34:77:94:05:97:8B:73:5A:B0:68
-	 Signature algorithm name: SHA256withDSA
-	 Version: 3
+Signature algorithm name: SHA1withDSA
+Version: 1
 
 This can be generated using hacked (update the keytool source code so that
 it can be used for version 1 X.509 certificate) keytool command:
-% keytool -genkeypair -alias dummydsa -keyalg DSA -keysize 2048 \
-  -sigalg SHA256withDSA \
+% keytool -genkeypair -alias dummy -keyalg DSA -keysize 1024 \
+  -sigalg SHA1withDSA \
   -dname "CN=dummy.example.com, OU=Dummy, O=Dummy, L=Cupertino, ST=CA, C=US" \
   -validity 3652 -keypass passphrase -keystore keystore -storepass passphrase
 
diff --git a/test/jdk/javax/net/ssl/etc/keystore b/test/jdk/javax/net/ssl/etc/keystore
index b16328ad78ee0901b96bae771939c70ca8059884..4062e1798c56b1bbd8840466fb04c4b6d46dfae6 100644
GIT binary patch
delta 1037
zcmV+o1oHcwCB`3+9e)u&wF!m*00EFNf&q*$4h9M<1_1;CDgqG!0R;dAf&qA-tW}Xr
zd&Hw<y3N`i8m#f&O*2;VRcS0MDR|R3Nnns&l$dgXxs<zDTY1_F(@b)hL{lcBQGneR
zRYd?_XY3>~Lf@o`c|*G#l=UY%DfXM?eS6~05w{C4BoneBrGL4pz2m234x<gM;9`-A
zHODa-C%TM!zZ9%s1R4hwprCJ#mt$u?R9X1`F&>d)H9V03Bx-}%XQ-;lm3VgTr+BTz
zsP=ee+l($vH2&taQ%*Hb+o-p3W)K}q#6>TT@fF)E4`dEj-kFLTegQ;R1vYTvO+X&z
zCp?{-bXU%v2Y<B=%zkB2Qn--AMb602ah^lN0rfu?evhv^1lK}c1Ue22@7~E6bG+{A
z4#01}3T<5CBmuzwLiRTich(M&U(~np|0FY2`I2_=B6leFp{{ozjgUZ^yUqU?8fE(y
zb1TG7V577acW1qhCbQM2I=AP+yG^R>xx*Z-@Rpmaz(m0XS~z@iZ{{{AJdK%o(61MB
z@S(W|{8y7{gH!+j00966SS~d%IRF3y4KRWO2{3{J#{vXJ^P?0n3kC-&hDgph1Ot=x
z0&*KLH!w3XF)%hWH83z*7Y#8tFf%YXFg7zaFffzh4;hmW166;50k|-N0W1awDuzhT
zI0OMOf&m`_fq?-1e^Y@SbrLC3-%6Y=?BwV65w}u2??eE@9zTG#Q6_0cT|gpH`&m7W
zSo*)k^|~<j%bQhf*MU2L9W-z9W?;8#nNX#qpP%Ridk`YRPrIqt{<p>(_&ZnU#;B$h
z4+Q&z_S3~4!vcRbR1;bjkuvsm^R6pl*DCMwA_Ezn(MSQu0u=z4U{H@0BMZ#3lDUGS
z>x2vNSRC~Nfq?+`;h=@qn?2skysKO`xL3J(l&`z`I_iS?S4;~%2ZCo&Syzs_)LBpF
zaR(5AfV4>#aU<wVC>9g9&j~V&$fn^u7J7?Re2pmJqpp7*E3>9`k#3`Z3;H27V)6T8
zdI2Om%%t(Ys8NuKsDt0(TIHVxl8a_ufO}OXWC2V&{?AD&1A&DA0)c@5;#=HD2&+d%
zT+hnfL-$FJxR_)+J+SCTj))+f*O?xCs|bX8Jwh3Q|6u=Cqe_kbWX>S`&Q#{Su){Jb
zyKN&h0c(E(7*L=6mST@EQkkq(U>(o)G%Xw;pZJjk5XiIASjB$i-m(-%7L?^8OO~v3
zQfM%p{VKr^G7JShT|Ajg$}kHC2P%e0&Nu`E1post05B{96m3s~QU3|QU*MC^k3p#5
zre$+PkOCASR2-D?9?h$#H2|&%h0C$EZYzQS006VA2i*!3d75j4u-}8O0{r%aeM!#&
HZTSn@f|bL&

delta 1763
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
FW^&*y68ZoD

-- 
GitLab