You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by la...@apache.org on 2002/01/25 05:00:37 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/net JSSESocketFactory.java
larryi 02/01/24 20:00:37
Modified: src/share/org/apache/tomcat/util/net JSSESocketFactory.java
Log:
Add support for a separate keystore password, "keystorePass". It will
default to the keypass password if not set.
Revision Changes Path
1.2 +4 -1 jakarta-tomcat/src/share/org/apache/tomcat/util/net/JSSESocketFactory.java
Index: JSSESocketFactory.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/net/JSSESocketFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JSSESocketFactory.java 7 Dec 2001 04:40:06 -0000 1.1
+++ JSSESocketFactory.java 25 Jan 2002 04:00:37 -0000 1.2
@@ -166,6 +166,9 @@
String keyPass=(String)attributes.get("keypass");
if( keyPass==null) keyPass=defaultKeyPass;
+ String keystorePass=(String)attributes.get("keystorePass");
+ if( keystorePass==null) keystorePass=keyPass;
+
//protocol for the SSL ie - TLS, SSL v3 etc.
String protocol = (String)attributes.get("protocol");
if(protocol == null) protocol = defaultProtocol;
@@ -176,7 +179,7 @@
// You can't use ssl without a server certificate.
// Create a KeyStore ( to get server certs )
- KeyStore kstore = initKeyStore( keystoreFile, keyPass );
+ KeyStore kstore = initKeyStore( keystoreFile, keystorePass );
// Create a SSLContext ( to create the ssl factory )
// This is the only way to use server sockets with JSSE 1.0.1
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>