svn commit: r1854328 - in /tomcat/trunk/test/org/apache/tomcat/util/net: TesterSupport.java keystore-info.txt localhost-copy1.jks localhost-rsa-copy1.jks localhost-rsa.jks localhost.jks

[markt]

Author: markt
Date: Mon Feb 25 17:59:13 2019
New Revision: 1854328

URL: http://svn.apache.org/viewvc?rev=1854328&view=rev
Log:
Rename keystore files in preparation for adding an EC keystore

Added:
    tomcat/trunk/test/org/apache/tomcat/util/net/localhost-rsa-copy1.jks
      - copied unchanged from r1854327, 
tomcat/trunk/test/org/apache/tomcat/util/net/localhost-copy1.jks
    tomcat/trunk/test/org/apache/tomcat/util/net/localhost-rsa.jks
      - copied unchanged from r1854327, 
tomcat/trunk/test/org/apache/tomcat/util/net/localhost.jks
Removed:
    tomcat/trunk/test/org/apache/tomcat/util/net/localhost-copy1.jks
    tomcat/trunk/test/org/apache/tomcat/util/net/localhost.jks
Modified:
    tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
    tomcat/trunk/test/org/apache/tomcat/util/net/keystore-info.txt

Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1854328&r1=1854327&r2=1854328&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Mon Feb 25 
17:59:13 2019
@@ -69,8 +69,8 @@ public final class TesterSupport {
     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";

Modified: tomcat/trunk/test/org/apache/tomcat/util/net/keystore-info.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/keystore-info.txt?rev=1854328&r1=1854327&r2=1854328&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/keystore-info.txt (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/keystore-info.txt Mon Feb 25 
17:59:13 2019
@@ -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)



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org