cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/net SSLServerSocketFactory.java

[craigmcc]

craigmcc    01/09/12 10:00:38

  Modified:    catalina/src/share/org/apache/catalina/net
                        SSLServerSocketFactory.java
  Log:
  Register the JSSE security provider if it is not already there.
  
  Submitted by: Wolfgang Hoschek <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.6       +7 -4      
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/net/SSLServerSocketFactory.java
  
  Index: SSLServerSocketFactory.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/net/SSLServerSocketFactory.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SSLServerSocketFactory.java       2001/09/07 18:39:08     1.5
  +++ SSLServerSocketFactory.java       2001/09/12 17:00:32     1.6
  @@ -382,10 +382,13 @@
   
           try {
   
  -            /*
  -            Security.addProvider(new sun.security.provider.Sun());
  -            Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
  -            */
  +            // Register the JSSE security Provider (if it is not already there)
  +            try {
  +                Security.addProvider((java.security.Provider)
  +                    
Class.forName("com.sun.net.ssl.internal.ssl.Provider").newInstance());
  +            } catch (Throwable t) {
  +                ;
  +            }
   
               // Create an SSL context used to create an SSL socket factory
               SSLContext context = SSLContext.getInstance(protocol);