8032473: Restructure JSSE regression test hierarchy in jdk test
Reviewed-by: weijun
This commit is contained in:
parent
751adf9af1
commit
521f9a2048
jdk/test
TEST.groups
com/sun/net/ssl/SSLSecurity
ComKeyManagerFactoryImpl.javaComSSLContextImpl.javaComTrustManagerFactoryImpl.javaJavaxKeyManagerFactoryImpl.javaJavaxSSLContextImpl.javaJavaxTrustManagerFactoryImpl.javaProviderTest.javaTruncateArray.java
javax/net/ssl
Fix5070632.java
FixingJavadocs
ComURLNulls.javaImplicitHandshake.javaJavaxURLNulls.javaKMTMGetNothing.javaSSLSessionNulls.javaSSLSocketInherit.java
GetInstance.javaHttpsURLConnection
CriticalSubjectAltName.javaDelayDefaultContextLoading.javaGetResponseCode.javacrisubn.jkstrusted.jks
READMESSLEngine
AcceptLargeFragments.javaArgCheck.javaArrays.javaBasics.javaCheckStatus.javaConnectionTest.javaExtendedKeyEngine.javaExtendedKeySocket.javaLargeBufs.javaLargePacket.javaMyX509ExtendedKeyManager.javaMyX509KeyManager.javaNoAuthClientAuth.javaSSLEngineResultArgs.javaSSLEngineService.javaTestAllSuites.java
SSLEngineResult
SSLParameters
SSLServerSocket
SSLSession
CheckMyTrustedKeystore.javaHttpsURLConnectionLocalCertificateChain.javaJSSERenegotiate.javaKeyManagerTrustManager.javaSSLCtxAccessToSessCtx.javaSessionCacheSizeTests.javaSessionTimeOutTests.javatestEnabledProtocols.java
ServerName
IllegalSNIName.javaSSLEngineExplorer.javaSSLEngineExplorerMatchedSNI.javaSSLEngineExplorerUnmatchedSNI.javaSSLEngineExplorerWithCli.javaSSLEngineExplorerWithSrv.javaSSLSocketConsistentSNI.javaSSLSocketExplorer.javaSSLSocketExplorerFailure.javaSSLSocketExplorerMatchedSNI.javaSSLSocketExplorerUnmatchedSNI.javaSSLSocketExplorerWithCliSNI.javaSSLSocketExplorerWithSrvSNI.javaSSLSocketInconsistentSNI.javaSSLSocketSNISensitive.java
TLSv11
EmptyCertificateAuthorities.javaExportableBlockCipher.javaExportableStreamCipher.javaGenericBlockCipher.javaGenericStreamCipher.java
TLSv12
etc
sanity
ciphersuites
interop
pluggability
templates
sun/net/www/protocol/https
@ -101,7 +101,7 @@ jdk_nio = \
|
||||
|
||||
jdk_net = \
|
||||
java/net \
|
||||
com/sun/net \
|
||||
com/sun/net/httpserver \
|
||||
com/oracle/net \
|
||||
sun/net
|
||||
|
||||
@ -126,6 +126,9 @@ jdk_security3 = \
|
||||
com/sun/security \
|
||||
com/sun/org/apache/xml/internal/security \
|
||||
sun/security \
|
||||
javax/net \
|
||||
sun/net/www/protocol/https \
|
||||
com/sun/net/ssl \
|
||||
lib/security
|
||||
|
||||
jdk_security = \
|
||||
@ -489,7 +492,7 @@ needs_compact3 = \
|
||||
sun/security/provider/PolicyFile/Alias.java \
|
||||
sun/security/provider/PolicyFile/Comparator.java \
|
||||
sun/security/provider/PolicyFile/SelfWildcard.java \
|
||||
sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineDeadlock.java \
|
||||
sun/security/ssl/SSLEngineImpl/SSLEngineDeadlock.java \
|
||||
sun/security/util/Oid/OidFormat.java \
|
||||
sun/security/util/Resources/Format.java \
|
||||
sun/security/util/Resources/NewNamesFormat.java
|
||||
@ -587,8 +590,8 @@ needs_compact2 = \
|
||||
java/util/zip/ZipFile/DeleteTempJar.java \
|
||||
javax/crypto/Cipher/CipherStreamClose.java \
|
||||
sun/misc/URLClassPath/ClassnameCharTest.java \
|
||||
sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java \
|
||||
sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java
|
||||
sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java \
|
||||
sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java
|
||||
|
||||
# Compact 1 adds full VM tests
|
||||
#
|
||||
|
@ -55,7 +55,7 @@ public class ImplicitHandshake {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
@ -55,7 +55,7 @@ public class SSLSessionNulls {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
@ -38,7 +38,7 @@ import java.net.*;
|
||||
import javax.net.ssl.*;
|
||||
|
||||
public class SSLSocketInherit {
|
||||
String pathToStores = "../../../../etc";
|
||||
String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
0
jdk/test/sun/security/ssl/javax/net/ssl/GetInstance.java → jdk/test/javax/net/ssl/GetInstance.java
0
jdk/test/sun/security/ssl/javax/net/ssl/GetInstance.java → jdk/test/javax/net/ssl/GetInstance.java
@ -54,7 +54,7 @@ public class GetResponseCode implements HostnameVerifier {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "../../../../../../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
@ -40,7 +40,7 @@ public class ArgCheck {
|
||||
|
||||
private static boolean debug = false;
|
||||
|
||||
private static String pathToStores = "../../../../../etc";
|
||||
private static String pathToStores = "../etc";
|
||||
private static String keyStoreFile = "keystore";
|
||||
private static String trustStoreFile = "truststore";
|
||||
private static String passwd = "passphrase";
|
@ -42,7 +42,7 @@ public class Arrays {
|
||||
private SSLEngine ssle1; // client
|
||||
private SSLEngine ssle2; // server
|
||||
|
||||
private static String pathToStores = "../../../../../etc";
|
||||
private static String pathToStores = "../etc";
|
||||
private static String keyStoreFile = "keystore";
|
||||
private static String trustStoreFile = "truststore";
|
||||
private static String passwd = "passphrase";
|
@ -43,7 +43,7 @@ import javax.net.ssl.SSLEngineResult.*;
|
||||
|
||||
public class Basics {
|
||||
|
||||
private static String pathToStores = "../../../../../etc";
|
||||
private static String pathToStores = "../etc";
|
||||
private static String keyStoreFile = "keystore";
|
||||
private static String trustStoreFile = "truststore";
|
||||
private static String passwd = "passphrase";
|
@ -48,7 +48,7 @@ public class CheckStatus {
|
||||
private SSLEngine ssle1; // client
|
||||
private SSLEngine ssle2; // server
|
||||
|
||||
private static String pathToStores = "../../../../../etc";
|
||||
private static String pathToStores = "../etc";
|
||||
private static String keyStoreFile = "keystore";
|
||||
private static String trustStoreFile = "truststore";
|
||||
private static String passwd = "passphrase";
|
@ -47,7 +47,7 @@ public class ConnectionTest {
|
||||
private SSLEngine ssle1;
|
||||
private SSLEngine ssle2;
|
||||
|
||||
private static String pathToStores = "../../../../../etc";
|
||||
private static String pathToStores = "../etc";
|
||||
private static String keyStoreFile = "keystore";
|
||||
private static String trustStoreFile = "truststore";
|
||||
private static String passwd = "passphrase";
|
@ -42,7 +42,7 @@ public class ExtendedKeyEngine {
|
||||
private SSLEngine ssle1; // client
|
||||
private SSLEngine ssle2; // server
|
||||
|
||||
private static String pathToStores = "../../../../../etc";
|
||||
private static String pathToStores = "../etc";
|
||||
private static String keyStoreFile = "keystore";
|
||||
private static String trustStoreFile = "truststore";
|
||||
private static String passwd = "passphrase";
|
@ -55,7 +55,7 @@ public class ExtendedKeySocket {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "../../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static char [] passwd = "passphrase".toCharArray();
|
@ -50,7 +50,7 @@ public class LargeBufs {
|
||||
static private SSLEngine ssle1; // client
|
||||
static private SSLEngine ssle2; // server
|
||||
|
||||
private static String pathToStores = "../../../../../etc";
|
||||
private static String pathToStores = "../etc";
|
||||
private static String keyStoreFile = "keystore";
|
||||
private static String trustStoreFile = "truststore";
|
||||
private static String passwd = "passphrase";
|
@ -174,7 +174,7 @@ public class LargePacket extends SSLEngineService {
|
||||
* Fork off the other side, then do your work.
|
||||
*/
|
||||
LargePacket() throws Exception {
|
||||
super("../../../../../etc");
|
||||
super("../etc");
|
||||
|
||||
if (separateServerThread) {
|
||||
startServer(true);
|
@ -117,7 +117,7 @@ public class NoAuthClientAuth {
|
||||
/*
|
||||
* The following is to set up the keystores.
|
||||
*/
|
||||
private static String pathToStores = "../../../../../etc";
|
||||
private static String pathToStores = "../etc";
|
||||
private static String keyStoreFile = "keystore";
|
||||
private static String trustStoreFile = "truststore";
|
||||
private static String passwd = "passphrase";
|
@ -49,7 +49,7 @@ public class SSLEngineService {
|
||||
private String trustFilename;
|
||||
|
||||
protected SSLEngineService() {
|
||||
init("../../../../../etc");
|
||||
init("../etc");
|
||||
}
|
||||
|
||||
protected SSLEngineService(String pathToStores) {
|
@ -51,7 +51,7 @@ public class TestAllSuites {
|
||||
private SSLEngine ssle1; // client
|
||||
private SSLEngine ssle2; // server
|
||||
|
||||
private static String pathToStores = "../../../../../etc";
|
||||
private static String pathToStores = "../etc";
|
||||
private static String keyStoreFile = "keystore";
|
||||
private static String trustStoreFile = "truststore";
|
||||
private static String passwd = "passphrase";
|
@ -57,7 +57,7 @@ public class UseCipherSuitesOrder {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
@ -21,21 +21,23 @@
|
||||
* questions.
|
||||
*/
|
||||
|
||||
// SunJSSE does not support dynamic system properties, no way to re-use
|
||||
// system properties in samevm/agentvm mode.
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 4329114
|
||||
* @summary Need better way of reflecting the reason when a chain is
|
||||
* rejected as untrusted.
|
||||
* @ignore JSSE supports algorithm constraints with CR 6916074,
|
||||
* need to update this test case in JDK 7 soon
|
||||
* @run main/othervm CheckMyTrustedKeystore
|
||||
*
|
||||
* SunJSSE does not support dynamic system properties, no way to re-use
|
||||
* system properties in samevm/agentvm mode.
|
||||
* @ignore JSSE supports algorithm constraints with CR 6916074,
|
||||
* need to update this test case in JDK 7 soon
|
||||
* This is a serious hack job!
|
||||
* @author Brad Wetmore
|
||||
*/
|
||||
|
||||
// This is a serious hack job!
|
||||
|
||||
import java.io.*;
|
||||
import java.net.*;
|
||||
import java.security.*;
|
||||
@ -60,7 +62,7 @@ public class CheckMyTrustedKeystore {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
final static String pathToStores = "../../../../etc";
|
||||
final static String pathToStores = "../etc";
|
||||
final static String keyStoreFile = "keystore";
|
||||
final static String trustStoreFile = "truststore";
|
||||
final static String unknownStoreFile = "unknown_keystore";
|
@ -62,7 +62,7 @@ public class HttpsURLConnectionLocalCertificateChain
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
@ -63,7 +63,7 @@ public class JSSERenegotiate {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
@ -55,7 +55,7 @@ public class SSLCtxAccessToSessCtx {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "/../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
@ -70,7 +70,7 @@ public class SessionCacheSizeTests {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "/../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
@ -69,7 +69,7 @@ public class SessionTimeOutTests {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "/../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
@ -99,7 +99,7 @@ public class testEnabledProtocols {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
final static String pathToStores = "../../../../etc";
|
||||
final static String pathToStores = "../etc";
|
||||
static String passwd = "passphrase";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
@ -30,7 +30,7 @@
|
||||
* @test
|
||||
* @bug 7068321
|
||||
* @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
|
||||
* @library ../NewAPIs/SSLEngine ../../../../templates
|
||||
* @library ../SSLEngine ../templates
|
||||
* @build SSLEngineService SSLCapabilities SSLExplorer
|
||||
* @run main/othervm SSLEngineExplorer SSLv2Hello,SSLv3
|
||||
* @run main/othervm SSLEngineExplorer SSLv3
|
||||
@ -251,7 +251,7 @@ public class SSLEngineExplorer extends SSLEngineService {
|
||||
* Fork off the other side, then do your work.
|
||||
*/
|
||||
SSLEngineExplorer() throws Exception {
|
||||
super("../../../../etc");
|
||||
super("../etc");
|
||||
|
||||
if (separateServerThread) {
|
||||
startServer(true);
|
@ -30,7 +30,7 @@
|
||||
* @test
|
||||
* @bug 7068321
|
||||
* @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
|
||||
* @library ../NewAPIs/SSLEngine ../../../../templates
|
||||
* @library ../SSLEngine ../templates
|
||||
* @build SSLEngineService SSLCapabilities SSLExplorer
|
||||
* @run main/othervm SSLEngineExplorerMatchedSNI www.example.com
|
||||
* www\.example\.com
|
||||
@ -309,7 +309,7 @@ public class SSLEngineExplorerMatchedSNI extends SSLEngineService {
|
||||
* Fork off the other side, then do your work.
|
||||
*/
|
||||
SSLEngineExplorerMatchedSNI() throws Exception {
|
||||
super("../../../../etc");
|
||||
super("../etc");
|
||||
|
||||
if (separateServerThread) {
|
||||
startServer(true);
|
@ -30,7 +30,7 @@
|
||||
* @test
|
||||
* @bug 7068321
|
||||
* @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
|
||||
* @library ../NewAPIs/SSLEngine ../../../../templates
|
||||
* @library ../SSLEngine ../templates
|
||||
* @build SSLEngineService SSLCapabilities SSLExplorer
|
||||
* @run main/othervm SSLEngineExplorerUnmatchedSNI www.example.com
|
||||
* www\.example\.org
|
||||
@ -322,7 +322,7 @@ public class SSLEngineExplorerUnmatchedSNI extends SSLEngineService {
|
||||
* Fork off the other side, then do your work.
|
||||
*/
|
||||
SSLEngineExplorerUnmatchedSNI() throws Exception {
|
||||
super("../../../../etc");
|
||||
super("../etc");
|
||||
|
||||
if (separateServerThread) {
|
||||
startServer(true);
|
@ -30,7 +30,7 @@
|
||||
* @test
|
||||
* @bug 7068321
|
||||
* @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
|
||||
* @library ../NewAPIs/SSLEngine ../../../../templates
|
||||
* @library ../SSLEngine ../templates
|
||||
* @build SSLEngineService SSLCapabilities SSLExplorer
|
||||
* @run main/othervm SSLEngineExplorerWithCli
|
||||
*/
|
||||
@ -281,7 +281,7 @@ public class SSLEngineExplorerWithCli extends SSLEngineService {
|
||||
* Fork off the other side, then do your work.
|
||||
*/
|
||||
SSLEngineExplorerWithCli() throws Exception {
|
||||
super("../../../../etc");
|
||||
super("../etc");
|
||||
|
||||
if (separateServerThread) {
|
||||
startServer(true);
|
@ -30,7 +30,7 @@
|
||||
* @test
|
||||
* @bug 7068321
|
||||
* @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
|
||||
* @library ../NewAPIs/SSLEngine ../../../../templates
|
||||
* @library ../SSLEngine ../templates
|
||||
* @build SSLEngineService SSLCapabilities SSLExplorer
|
||||
* @run main/othervm SSLEngineExplorerWithSrv
|
||||
*/
|
||||
@ -267,7 +267,7 @@ public class SSLEngineExplorerWithSrv extends SSLEngineService {
|
||||
* Fork off the other side, then do your work.
|
||||
*/
|
||||
SSLEngineExplorerWithSrv() throws Exception {
|
||||
super("../../../../etc");
|
||||
super("../etc");
|
||||
|
||||
if (separateServerThread) {
|
||||
startServer(true);
|
@ -58,7 +58,7 @@ public class SSLSocketConsistentSNI {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
@ -30,7 +30,7 @@
|
||||
* @test
|
||||
* @bug 7068321
|
||||
* @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
|
||||
* @library ../../../../templates
|
||||
* @library ../templates
|
||||
* @build SSLCapabilities SSLExplorer
|
||||
* @run main/othervm SSLSocketExplorer SSLv2Hello,SSLv3
|
||||
* @run main/othervm SSLSocketExplorer SSLv3
|
||||
@ -64,7 +64,7 @@ public class SSLSocketExplorer {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
@ -30,7 +30,7 @@
|
||||
* @test
|
||||
* @bug 7068321
|
||||
* @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
|
||||
* @library ../../../../templates
|
||||
* @library ../templates
|
||||
* @build SSLCapabilities SSLExplorer
|
||||
* @run main/othervm SSLSocketExplorerFailure SSLv2Hello,SSLv3
|
||||
* @run main/othervm SSLSocketExplorerFailure SSLv3
|
||||
@ -64,7 +64,7 @@ public class SSLSocketExplorerFailure {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
@ -30,7 +30,7 @@
|
||||
* @test
|
||||
* @bug 7068321
|
||||
* @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
|
||||
* @library ../../../../templates
|
||||
* @library ../templates
|
||||
* @build SSLCapabilities SSLExplorer
|
||||
* @run main/othervm SSLSocketExplorerMatchedSNI www.example.com
|
||||
* www\.example\.com
|
||||
@ -69,7 +69,7 @@ public class SSLSocketExplorerMatchedSNI {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
@ -30,7 +30,7 @@
|
||||
* @test
|
||||
* @bug 7068321
|
||||
* @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
|
||||
* @library ../../../../templates
|
||||
* @library ../templates
|
||||
* @build SSLCapabilities SSLExplorer
|
||||
* @run main/othervm SSLSocketExplorerUnmatchedSNI www.example.com
|
||||
* www\.example\.org
|
||||
@ -61,7 +61,7 @@ public class SSLSocketExplorerUnmatchedSNI {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
@ -30,7 +30,7 @@
|
||||
* @test
|
||||
* @bug 7068321
|
||||
* @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
|
||||
* @library ../../../../templates
|
||||
* @library ../templates
|
||||
* @build SSLCapabilities SSLExplorer
|
||||
* @run main/othervm SSLSocketExplorerWithCliSNI
|
||||
*/
|
||||
@ -60,7 +60,7 @@ public class SSLSocketExplorerWithCliSNI {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
@ -30,7 +30,7 @@
|
||||
* @test
|
||||
* @bug 7068321
|
||||
* @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
|
||||
* @library ../../../../templates
|
||||
* @library ../templates
|
||||
* @build SSLCapabilities SSLExplorer
|
||||
* @run main/othervm SSLSocketExplorerWithSrvSNI
|
||||
*/
|
||||
@ -60,7 +60,7 @@ public class SSLSocketExplorerWithSrvSNI {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
@ -58,7 +58,7 @@ public class SSLSocketInconsistentSNI {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
@ -60,7 +60,7 @@ public class EmptyCertificateAuthorities {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "/../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
@ -57,7 +57,7 @@ public class ExportableBlockCipher {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "/../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
@ -57,7 +57,7 @@ public class ExportableStreamCipher {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "/../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
@ -57,7 +57,7 @@ public class GenericBlockCipher {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "/../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
@ -57,7 +57,7 @@ public class GenericStreamCipher {
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "/../../../../etc";
|
||||
static String pathToStores = "../etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
@ -124,7 +124,7 @@ public class SSLSocketSSLEngineTemplate {
|
||||
/*
|
||||
* The following is to set up the keystores/trust material.
|
||||
*/
|
||||
private static final String pathToStores = "../etc/";
|
||||
private static final String pathToStores = "../etc";
|
||||
private static final String keyStoreFile = "keystore";
|
||||
private static final String trustStoreFile = "truststore";
|
||||
private static final String passwd = "passphrase";
|
@ -26,7 +26,7 @@
|
||||
* @bug 5026745
|
||||
* @library ../../httpstest/
|
||||
* @build TestHttpsServer HttpCallback
|
||||
* @run main/othervm Test
|
||||
* @run main/othervm ChunkedOutputStream
|
||||
*
|
||||
* SunJSSE does not support dynamic system properties, no way to re-use
|
||||
* system properties in samevm/agentvm mode.
|
||||
@ -37,11 +37,11 @@ import java.io.*;
|
||||
import java.net.*;
|
||||
import javax.net.ssl.*;
|
||||
|
||||
public class Test implements HttpCallback {
|
||||
public class ChunkedOutputStream implements HttpCallback {
|
||||
/*
|
||||
* Where do we find the keystores for ssl?
|
||||
*/
|
||||
static String pathToStores = "../../../../../etc";
|
||||
static String pathToStores = "../../../../../javax/net/ssl/etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
||||
@ -297,7 +297,8 @@ public class Test implements HttpCallback {
|
||||
HttpsURLConnection.setDefaultHostnameVerifier(new NameVerifier());
|
||||
|
||||
try {
|
||||
server = new TestHttpsServer (new Test(), 1, 10, 0);
|
||||
server = new TestHttpsServer(
|
||||
new ChunkedOutputStream(), 1, 10, 0);
|
||||
System.out.println ("Server started: listening on port: " + server.getLocalPort());
|
||||
// the test server doesn't support keep-alive yet
|
||||
// test1("http://localhost:"+server.getLocalPort()+"/d0");
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user