svn commit: r1800885 - in /tomcat/trunk/java/org/apache/tomcat/util/net/jsse: JSSEUtil.java LocalStrings.properties

[ma...@apache.org]

Author: markt
Date: Wed Jul  5 14:21:56 2017
New Revision: 1800885

URL: http://svn.apache.org/viewvc?rev=1800885&view=rev
Log:
Follow-up to r1800867
Better handling for when user does not specify an alias to use

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
    tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java?rev=1800885&r1=1800884&r2=1800885&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java Wed Jul  5 14:21:56 2017
@@ -216,7 +216,11 @@ public class JSSEUtil extends SSLUtilBas
             if (keyAlias != null && !ks.isKeyEntry(keyAlias)) {
                 throw new IOException(sm.getString("jsse.alias_no_key_entry", keyAlias));
             } else if (keyAlias == null) {
-                keyAlias = "tomcat";
+                Enumeration<String> aliases = ks.aliases();
+                if (!aliases.hasMoreElements()) {
+                    throw new IOException(sm.getString("jsse.noKeys"));
+                }
+                keyAlias = aliases.nextElement();
             }
 
             inMemoryKeyStore.setKeyEntry(keyAlias, ks.getKey(keyAlias, keyPassArray), keyPassArray,

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties?rev=1800885&r1=1800884&r2=1800885&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties Wed Jul  5 14:21:56 2017
@@ -22,6 +22,7 @@ jsse.unsupported_ciphers=Some specified
 jsse.excludeProtocol=The SSL protocol [{0}] which is supported in this JRE was excluded from the protocols available to Tomcat
 jsse.noDefaultCiphers=Unable to determine a default for ciphers for [{0}]. Set an explicit value to ensure the connector can start.
 jsse.noDefaultProtocols=Unable to determine a default for sslEnabledProtocols. Set an explicit value to ensure the connector can start.
+jsse.noKeys=No aliases for private keys found in key store
 jsse.exceptionOnClose=Failure to close socket.
 jsse.pemParseError=Unable to parse the key from [{0}]
 



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