From 5556ded1ab428930d3812a91a4ee758e3f6ac8a2 Mon Sep 17 00:00:00 2001 From: xuelei Date: Mon, 29 Mar 2010 13:27:25 +0800 Subject: [PATCH] 6693917: regression tests need to update for supporting ECC on solaris 11 Reviewed-by: weijun --- test/sun/security/ssl/etc/keystore | Bin 2576 -> 4605 bytes test/sun/security/ssl/etc/truststore | Bin 1462 -> 2489 bytes .../ciphersuites/CheckCipherSuites.java | 81 +++++++++++++++++- 3 files changed, 78 insertions(+), 3 deletions(-) diff --git a/test/sun/security/ssl/etc/keystore b/test/sun/security/ssl/etc/keystore index 0c95f22d640eefdd004990f063c8dcf5927d8a00..2eb1993f3aff3d996d7970001765fc3e8fb8d1f7 100644 GIT binary patch delta 1459 zcmaizdrZ?;6vuzRUwawMs%RdtOI-vSnz=e6x%|GD5F+DO!^RU zI+2#v2_hge4f04;1c!pPL_p+`!6bmLXa%MMg$eRfs{0AL&1`0WoaBCU&b|4b^Ep>Z zH8V+XO>a#Q1R+?US4oYibgn=W8=EBDBM|c;2wv`dbwGsWv_M`0D1^Cg1Q>-~kp(b} zhfsNzq@T8M3RhKKp*@>nB?_tWJQjq1x$O0Wl`JIPw>W2SW)uWo6LTAQm^-CuE{Dj}~SgHsKB z82T+|oMmO{+7Y$G5GTOj6uTh%lCCh_Le=iqBIx0N_v<*ENVn~qXl~KfiPrD`Myyb; z#yrCie#Z(fz>e@Gpnxx6u@fOeMon0Fj*&eChy)AQRKFG<6b3P@d6>inqXhK;EM%|% z-~dmsnhUtx5E_}o0&EuhgH%6(W2OFJ;fKozOqetC3J!*GYzVD<(wL&Wa<^l=p0y7H%t8*wm%@7$oj^C@Uk}46)&CXne>rg zbo?wqci-WO&l5bdWYeMo=$c3Ny=eYO?IzLVREfJ$mR#to*!A$;@ub`AKJQ9J(QZRqSgG2NYE69> z>Yb(G9w1?!k-rEc2Y>>J!w7br$00C+;2~vk^DrP2h}iH`C&<`7;&Bkzs&2K|x)j*c z$TJAJfX%_+VF=l)Ss1|&@_!H>G!{8pu2j8izG;!~O=q0mH{wW-*5)0q+Y#th7>KXg zn++^IOPyr6yHmPBH?golt^sltn1}6;-Fy_qA-Lzj?!BO()+p7jaId5^wrN%7tGMen zX#)QqLx>I7L!e-JCK?Jt@`HW~nDs4HpqBq?3c|_dkdVr2?Lmv8vU1D(7j3T7!e8wR zU}jKtJR@Zw0i6Qns_Gw_zmF>qdvq)P=u%~F%m$Mw!^HH+SsXh2j2qFvIc~uG-n3Ts z^g+zczd2Z894Huv1mwTW&Nkxs2>>?m`uK-97=ZV3woF|=$4=VXBnU7x;7Y=2H*Tin zCq*0@+0SsS(8bEm#WVXKC!K0|VUp|;>A`8lYf2+!Wfo9hWZ2)2jOcCR)s)5zzOnS5 zXt^9+>)bcUaFt}OPqpcUgZym6@n;o7oGys1d!fAN^sOE^@nfk>rgBogo;gtAF!!^fO20ee@ z+J#>EiCakH`md+7k$}njBhb~oAOg-wk}dI=%sW>VR=@6cWzK#4PBGGD!+0bTPj62= zf5(JQCYH7Q(zj|lFUrBZV#s<>TY^>|v@GgcKZo9n+o;t)j_hx^q4N=<#={4fS9o-w PmGP6cw$CZ=la=9&3ILTD B5!?U( diff --git a/test/sun/security/ssl/etc/truststore b/test/sun/security/ssl/etc/truststore index 1e140ddd2e140b18251cccc44e1a10ffabc3a14b..65a140d773206daf836779d70a5df75b51a5cd91 100644 GIT binary patch delta 689 zcmdnSy;C^&-`jt085kItfS3hL^QV;N=2jLJC#K~Wr6#9jFfcHx>-dB$V_=QYGc~XT zDitzlV&XGsVk~E35m%#Oj2+~bGKTSeO*y#oy+~qD*4@OrQ*YgVV=&$6D$+ znV1SG?imCZ#WT4<_c>30o|z z@a6e-(Cz2?Bm-ra4}n@bixU{56})-if_gzlLRJnZT->&K#0Yn7!5?yr1;y8lgH~nrv8DUZQEW8 zJ#74}vi~CA`lowRKTde{h)II&tWrv^mhL}+(qf~t^&Tg~ukgO*J$U+c{AMfWOeW!5 X9uZb=G6Rm?xzq82rG>|F_1&8QDx?V2 delta 47 zcmdlfyp5aZ-`jt085kItKzOqolQHvVC-xL3;hQY;#5&*HcYS4FKfyUYa`~~HHUNyE B5#ay; diff --git a/test/sun/security/ssl/sanity/ciphersuites/CheckCipherSuites.java b/test/sun/security/ssl/sanity/ciphersuites/CheckCipherSuites.java index 12a414758..8156cf28c 100644 --- a/test/sun/security/ssl/sanity/ciphersuites/CheckCipherSuites.java +++ b/test/sun/security/ssl/sanity/ciphersuites/CheckCipherSuites.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2002-2010 Sun Microsystems, Inc. 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 @@ -40,9 +40,21 @@ public class CheckCipherSuites { "SSL_RSA_WITH_RC4_128_MD5", "SSL_RSA_WITH_RC4_128_SHA", "TLS_RSA_WITH_AES_128_CBC_SHA", + "TLS_ECDH_ECDSA_WITH_RC4_128_SHA", + "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA", + "TLS_ECDH_RSA_WITH_RC4_128_SHA", + "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA", + "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA", + "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA", + "TLS_ECDHE_RSA_WITH_RC4_128_SHA", + "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA", "TLS_DHE_RSA_WITH_AES_128_CBC_SHA", "TLS_DHE_DSS_WITH_AES_128_CBC_SHA", "SSL_RSA_WITH_3DES_EDE_CBC_SHA", + "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA", + "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA", + "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA", + "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA", "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA", "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA", "SSL_RSA_WITH_DES_CBC_SHA", @@ -59,11 +71,27 @@ public class CheckCipherSuites { "SSL_RSA_WITH_RC4_128_SHA", "TLS_RSA_WITH_AES_128_CBC_SHA", "TLS_RSA_WITH_AES_256_CBC_SHA", + "TLS_ECDH_ECDSA_WITH_RC4_128_SHA", + "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA", + "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA", + "TLS_ECDH_RSA_WITH_RC4_128_SHA", + "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA", + "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA", + "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA", + "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA", + "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA", + "TLS_ECDHE_RSA_WITH_RC4_128_SHA", + "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA", + "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA", "TLS_DHE_RSA_WITH_AES_128_CBC_SHA", "TLS_DHE_RSA_WITH_AES_256_CBC_SHA", "TLS_DHE_DSS_WITH_AES_128_CBC_SHA", "TLS_DHE_DSS_WITH_AES_256_CBC_SHA", "SSL_RSA_WITH_3DES_EDE_CBC_SHA", + "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA", + "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA", + "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA", + "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA", "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA", "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA", "SSL_RSA_WITH_DES_CBC_SHA", @@ -81,9 +109,21 @@ public class CheckCipherSuites { "SSL_RSA_WITH_RC4_128_MD5", "SSL_RSA_WITH_RC4_128_SHA", "TLS_RSA_WITH_AES_128_CBC_SHA", + "TLS_ECDH_ECDSA_WITH_RC4_128_SHA", + "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA", + "TLS_ECDH_RSA_WITH_RC4_128_SHA", + "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA", + "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA", + "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA", + "TLS_ECDHE_RSA_WITH_RC4_128_SHA", + "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA", "TLS_DHE_RSA_WITH_AES_128_CBC_SHA", "TLS_DHE_DSS_WITH_AES_128_CBC_SHA", "SSL_RSA_WITH_3DES_EDE_CBC_SHA", + "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA", + "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA", + "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA", + "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA", "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA", "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA", "SSL_RSA_WITH_DES_CBC_SHA", @@ -93,14 +133,23 @@ public class CheckCipherSuites { "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA", "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA", "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA", + "SSL_RSA_WITH_NULL_MD5", "SSL_RSA_WITH_NULL_SHA", + "TLS_ECDH_ECDSA_WITH_NULL_SHA", + "TLS_ECDH_RSA_WITH_NULL_SHA", + "TLS_ECDHE_ECDSA_WITH_NULL_SHA", + "TLS_ECDHE_RSA_WITH_NULL_SHA", "SSL_DH_anon_WITH_RC4_128_MD5", "TLS_DH_anon_WITH_AES_128_CBC_SHA", "SSL_DH_anon_WITH_3DES_EDE_CBC_SHA", "SSL_DH_anon_WITH_DES_CBC_SHA", + "TLS_ECDH_anon_WITH_RC4_128_SHA", + "TLS_ECDH_anon_WITH_AES_128_CBC_SHA", + "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA", "SSL_DH_anon_EXPORT_WITH_RC4_40_MD5", "SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA", + "TLS_ECDH_anon_WITH_NULL_SHA", "TLS_KRB5_WITH_RC4_128_SHA", "TLS_KRB5_WITH_RC4_128_MD5", "TLS_KRB5_WITH_3DES_EDE_CBC_SHA", @@ -110,7 +159,7 @@ public class CheckCipherSuites { "TLS_KRB5_EXPORT_WITH_RC4_40_SHA", "TLS_KRB5_EXPORT_WITH_RC4_40_MD5", "TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA", - "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5" + "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5", }; // supported ciphersuites using unlimited JCE policy jurisdiction files @@ -120,11 +169,27 @@ public class CheckCipherSuites { "SSL_RSA_WITH_RC4_128_SHA", "TLS_RSA_WITH_AES_128_CBC_SHA", "TLS_RSA_WITH_AES_256_CBC_SHA", + "TLS_ECDH_ECDSA_WITH_RC4_128_SHA", + "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA", + "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA", + "TLS_ECDH_RSA_WITH_RC4_128_SHA", + "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA", + "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA", + "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA", + "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA", + "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA", + "TLS_ECDHE_RSA_WITH_RC4_128_SHA", + "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA", + "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA", "TLS_DHE_RSA_WITH_AES_128_CBC_SHA", "TLS_DHE_RSA_WITH_AES_256_CBC_SHA", "TLS_DHE_DSS_WITH_AES_128_CBC_SHA", "TLS_DHE_DSS_WITH_AES_256_CBC_SHA", "SSL_RSA_WITH_3DES_EDE_CBC_SHA", + "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA", + "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA", + "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA", + "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA", "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA", "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA", "SSL_RSA_WITH_DES_CBC_SHA", @@ -134,15 +199,25 @@ public class CheckCipherSuites { "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA", "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA", "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA", + "SSL_RSA_WITH_NULL_MD5", "SSL_RSA_WITH_NULL_SHA", + "TLS_ECDH_ECDSA_WITH_NULL_SHA", + "TLS_ECDH_RSA_WITH_NULL_SHA", + "TLS_ECDHE_ECDSA_WITH_NULL_SHA", + "TLS_ECDHE_RSA_WITH_NULL_SHA", "SSL_DH_anon_WITH_RC4_128_MD5", "TLS_DH_anon_WITH_AES_128_CBC_SHA", "TLS_DH_anon_WITH_AES_256_CBC_SHA", "SSL_DH_anon_WITH_3DES_EDE_CBC_SHA", "SSL_DH_anon_WITH_DES_CBC_SHA", + "TLS_ECDH_anon_WITH_RC4_128_SHA", + "TLS_ECDH_anon_WITH_AES_128_CBC_SHA", + "TLS_ECDH_anon_WITH_AES_256_CBC_SHA", + "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA", "SSL_DH_anon_EXPORT_WITH_RC4_40_MD5", "SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA", + "TLS_ECDH_anon_WITH_NULL_SHA", "TLS_KRB5_WITH_RC4_128_SHA", "TLS_KRB5_WITH_RC4_128_MD5", "TLS_KRB5_WITH_3DES_EDE_CBC_SHA", @@ -152,7 +227,7 @@ public class CheckCipherSuites { "TLS_KRB5_EXPORT_WITH_RC4_40_SHA", "TLS_KRB5_EXPORT_WITH_RC4_40_MD5", "TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA", - "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5" + "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5", }; private static void showSuites(String[] suites) { -- GitLab