Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 41397 invoked from network); 13 Apr 2002 06:02:03 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 13 Apr 2002 06:02:03 -0000 Received: (qmail 9823 invoked by uid 97); 13 Apr 2002 06:02:07 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org Received: (qmail 9807 invoked by uid 97); 13 Apr 2002 06:02:06 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 9796 invoked by uid 97); 13 Apr 2002 06:02:05 -0000 Date: 13 Apr 2002 06:01:52 -0000 Message-ID: <20020413060152.50621.qmail@icarus.apache.org> From: billbarker@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net PureTLSSupport.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N billbarker 02/04/12 23:01:52 Modified: util/java/org/apache/tomcat/util/net PureTLSSupport.java Log: fix tabs. Revision Changes Path 1.3 +41 -41 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PureTLSSupport.java Index: PureTLSSupport.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PureTLSSupport.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- PureTLSSupport.java 13 Apr 2002 05:34:11 -0000 1.2 +++ PureTLSSupport.java 13 Apr 2002 06:01:52 -0000 1.3 @@ -85,63 +85,63 @@ private SSLSocket ssl; PureTLSSupport(SSLSocket sock){ - ssl=sock; + ssl=sock; } public String getCipherSuite() throws IOException { - int cs=ssl.getCipherSuite(); - return SSLPolicyInt.getCipherSuiteName(cs); + int cs=ssl.getCipherSuite(); + return SSLPolicyInt.getCipherSuiteName(cs); } public Object[] getPeerCertificateChain() - throws IOException + throws IOException { - Vector v=ssl.getCertificateChain(); + Vector v=ssl.getCertificateChain(); - if(v==null) - return null; - - java.security.cert.X509Certificate[] chain= + if(v==null) + return null; + + java.security.cert.X509Certificate[] chain= new java.security.cert.X509Certificate[v.size()]; - try { - for(int i=1;i<=v.size();i++){ - // PureTLS provides cert chains with the peer - // cert last but the Servlet 2.3 spec (S 4.7) requires - // the opposite order so we reverse the chain as we go - byte buffer[]=((X509Cert)v.elementAt( - v.size()-i)).getDER(); - - CertificateFactory cf = - CertificateFactory.getInstance("X.509"); - ByteArrayInputStream stream = - new ByteArrayInputStream(buffer); - - chain[i]=(java.security.cert.X509Certificate) - cf.generateCertificate(stream); - } - } catch (java.security.cert.CertificateException e) { - throw new IOException("JDK's broken cert handling can't parse this certificate (which PureTLS likes"); - } - return chain; + try { + for(int i=1;i<=v.size();i++){ + // PureTLS provides cert chains with the peer + // cert last but the Servlet 2.3 spec (S 4.7) requires + // the opposite order so we reverse the chain as we go + byte buffer[]=((X509Cert)v.elementAt( + v.size()-i)).getDER(); + + CertificateFactory cf = + CertificateFactory.getInstance("X.509"); + ByteArrayInputStream stream = + new ByteArrayInputStream(buffer); + + chain[i]=(java.security.cert.X509Certificate) + cf.generateCertificate(stream); + } + } catch (java.security.cert.CertificateException e) { + throw new IOException("JDK's broken cert handling can't parse this certificate (which PureTLS likes"); + } + return chain; } public Integer getKeySize() - throws IOException { - /* - int cs = ssl.getCipherSuite(); - int ks = SSLCipherSuite.findCipherSuite(cs).getCipherKeyLength(); - return new Integer(ks); - */ - return null; + throws IOException { + /* + int cs = ssl.getCipherSuite(); + int ks = SSLCipherSuite.findCipherSuite(cs).getCipherKeyLength(); + return new Integer(ks); + */ + return null; } public String getSessionId() - throws IOException { - byte [] ssl_session = ssl.getSessionID(); - if(ssl_session == null) - return null; - return HexUtils.convert(ssl_session); + throws IOException { + byte [] ssl_session = ssl.getSessionID(); + if(ssl_session == null) + return null; + return HexUtils.convert(ssl_session); } } -- To unsubscribe, e-mail: For additional commands, e-mail: