Skip to content

Commit 02a45b0

Browse files
committed
8357253: Test test/jdk/sun/security/ssl/SSLSessionImpl/ResumeClientTLS12withSNI.java writes in src dir
Backport-of: 566e3b21ed14748cb0d9117b6bd58b4bfcf625c6
1 parent c730336 commit 02a45b0

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

test/jdk/sun/security/ssl/SSLSessionImpl/ResumeClientTLS12withSNI.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,10 @@ public class ResumeClientTLS12withSNI {
6565
/*
6666
* The following is to set up the keystores.
6767
*/
68-
private static final String pathToStores = System.getProperty("test.src", ".");
69-
private static final String keyStoreFile = "ks_san.p12";
70-
private static final String trustStoreFile = "ks_san.p12";
68+
private static final String keyFilename = "ks_san.p12";
69+
private static final String trustFilename = "ks_san.p12";
7170
private static final char[] passphrase = "123456".toCharArray();
7271

73-
private static final String keyFilename =
74-
pathToStores + "/" + keyStoreFile;
75-
private static final String trustFilename =
76-
pathToStores + "/" + trustStoreFile;
77-
7872
private static final String HOST_NAME = "arf.yak.foo.localhost123456.localhost123456.localhost123456.localhost123456.localhost123456.localhost123456."
7973
+ "localhost123456.localhost123456.localhost123456.localhost123456.localhost123456.localhost123456";
8074
private static final SNIMatcher SNI_MATCHER = SNIHostName.createSNIMatcher("arf\\.yak\\.foo.*");
@@ -118,7 +112,7 @@ public ResumeClientTLS12withSNI(final String sslProtocol) throws Exception {
118112
private static KeyManagerFactory makeKeyManagerFactory(String ksPath,
119113
char[] pass) throws GeneralSecurityException, IOException {
120114
KeyManagerFactory kmf;
121-
KeyStore ks = KeyStore.getInstance("JKS");
115+
KeyStore ks = KeyStore.getInstance("PKCS12");
122116

123117
try (FileInputStream fsIn = new FileInputStream(ksPath)) {
124118
ks.load(fsIn, pass);

0 commit comments

Comments
 (0)