| commit | 3e5ce3108e2684bc25013d9a84a7966a6dcd6e14 | [log] [tgz] |
|---|---|---|
| author | Mark Thomas <markt@apache.org> | Mon Feb 25 17:59:13 2019 +0000 |
| committer | Mark Thomas <markt@apache.org> | Mon Feb 25 17:59:13 2019 +0000 |
| tree | 3089c5a5328e2a84d5aa75c537791ee364e61612 | |
| parent | 126e4b4d034da849606a1456d3974024997c9c08 [diff] |
Rename keystore files in preparation for adding an EC keystore git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1854328 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java b/test/org/apache/tomcat/util/net/TesterSupport.java index 80091a2..4cc616a 100644 --- a/test/org/apache/tomcat/util/net/TesterSupport.java +++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -69,8 +69,8 @@ public static final String CA_JKS = SSL_DIR + CA_ALIAS + ".jks"; public static final String CLIENT_ALIAS = "user1"; public static final String CLIENT_JKS = SSL_DIR + CLIENT_ALIAS + ".jks"; - public static final String LOCALHOST_JKS = SSL_DIR + "localhost.jks"; - public static final String LOCALHOST_KEYPASS_JKS = SSL_DIR + "localhost-copy1.jks"; + public static final String LOCALHOST_JKS = SSL_DIR + "localhost-rsa.jks"; + public static final String LOCALHOST_KEYPASS_JKS = SSL_DIR + "localhost-rsa-copy1.jks"; public static final String JKS_PASS = "changeit"; public static final String JKS_KEY_PASS = "tomcatpass"; public static final String CA_CERT_PEM = SSL_DIR + CA_ALIAS + "-cert.pem";
diff --git a/test/org/apache/tomcat/util/net/keystore-info.txt b/test/org/apache/tomcat/util/net/keystore-info.txt index 08fec38..986a4bf 100644 --- a/test/org/apache/tomcat/util/net/keystore-info.txt +++ b/test/org/apache/tomcat/util/net/keystore-info.txt
@@ -18,10 +18,10 @@ ca.jks (changeit) ca CN=Apache Tomcat Test CA -localhost.jks (changeit) +localhost-rsa.jks (changeit) tomcat CN=localhost -localhost-copy1.jks (changeit) +localhost-rsa-copy1.jks (changeit) tomcat CN=localhost (tomcatpass) user1.jks (changeit)
diff --git a/test/org/apache/tomcat/util/net/localhost-copy1.jks b/test/org/apache/tomcat/util/net/localhost-rsa-copy1.jks similarity index 100% rename from test/org/apache/tomcat/util/net/localhost-copy1.jks rename to test/org/apache/tomcat/util/net/localhost-rsa-copy1.jks Binary files differ
diff --git a/test/org/apache/tomcat/util/net/localhost.jks b/test/org/apache/tomcat/util/net/localhost-rsa.jks similarity index 100% rename from test/org/apache/tomcat/util/net/localhost.jks rename to test/org/apache/tomcat/util/net/localhost-rsa.jks Binary files differ