tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r428884 [2/2] - in /tomcat/tc6.0.x/trunk/java/org/apache: coyote/http11/ tomcat/util/net/ tomcat/util/net/jsse/
Date Fri, 04 Aug 2006 21:13:06 GMT
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java?rev=428884&r1=428883&r2=428884&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java Fri Aug  4
14:13:05 2006
@@ -32,7 +32,7 @@
 
 import org.apache.tomcat.util.net.SSLSupport;
 
-/* JSSESupport
+/** JSSESupport
 
    Concrete implementation class for JSSE
    Support classes.
@@ -42,6 +42,7 @@
 
    @author EKR
    @author Craig R. McClanahan
+   @author Filip Hanik
    Parts cribbed from JSSECertCompat       
    Parts cribbed from CertificatesValve
 */
@@ -52,17 +53,22 @@
         org.apache.commons.logging.LogFactory.getLog(JSSESupport.class);
 
     protected SSLSocket ssl;
+    protected SSLSession session;
 
     Listener listener = new Listener();
 
     JSSESupport(SSLSocket sock){
         ssl=sock;
+        session = sock.getSession();
         sock.addHandshakeCompletedListener(listener);
     }
+    
+    JSSESupport(SSLSession session) {
+        this.session = session;
+    }
 
     public String getCipherSuite() throws IOException {
         // Look up the current SSLSession
-        SSLSession session = ssl.getSession();
         if (session == null)
             return null;
         return session.getCipherSuite();
@@ -114,7 +120,6 @@
     public Object[] getPeerCertificateChain(boolean force)
         throws IOException {
         // Look up the current SSLSession
-	SSLSession session = ssl.getSession();
         if (session == null)
             return null;
 
@@ -177,7 +182,6 @@
     public Integer getKeySize() 
         throws IOException {
         // Look up the current SSLSession
-        SSLSession session = ssl.getSession();
         SSLSupport.CipherData c_aux[]=ciphers;
         if (session == null)
             return null;
@@ -200,7 +204,6 @@
     public String getSessionId()
         throws IOException {
         // Look up the current SSLSession
-        SSLSession session = ssl.getSession();
         if (session == null)
             return null;
         // Expose ssl_session (getId)



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


Mime
View raw message