cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse JSSE14SocketFactory.java

[luehe]

luehe       2003/11/19 09:18:35

  Modified:    util/java/org/apache/tomcat/util/net/jsse
                        JSSE14SocketFactory.java
  Log:
  Added check for keyAlias!=null
  
  Revision  Changes    Path
  1.19      +2 -2      
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java
  
  Index: JSSE14SocketFactory.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- JSSE14SocketFactory.java  19 Nov 2003 08:32:21 -0000      1.18
  +++ JSSE14SocketFactory.java  19 Nov 2003 17:18:35 -0000      1.19
  @@ -169,12 +169,12 @@
   
           String keystorePass = getKeystorePassword();
   
  -        KeyManagerFactory kmf = KeyManagerFactory.getInstance(algorithm);
           KeyStore ks = getKeystore(keystoreType, keystorePass);
  -        if (!ks.isKeyEntry(keyAlias)) {
  +        if (keyAlias != null && !ks.isKeyEntry(keyAlias)) {
               throw new IOException(sm.getString("jsse.alias_no_key_entry", 
keyAlias));
           }
   
  +        KeyManagerFactory kmf = KeyManagerFactory.getInstance(algorithm);
           kmf.init(ks, keystorePass.toCharArray());
   
           kms = kmf.getKeyManagers();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]