cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/ajp Ajp13.java

[jfclere]

jfclere     01/09/17 08:45:50

  Modified:    jk/java/org/apache/ajp Ajp13.java
  Log:
  I have noted that I used javax.security.cert instead of java.security.cert.
  
  Revision  Changes    Path
  1.14      +10 -4     jakarta-tomcat-connectors/jk/java/org/apache/ajp/Ajp13.java
  
  Index: Ajp13.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/Ajp13.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Ajp13.java        2001/09/14 14:26:38     1.13
  +++ Ajp13.java        2001/09/17 15:45:50     1.14
  @@ -63,9 +63,12 @@
   import java.io.UnsupportedEncodingException;
   import java.io.InputStream;
   import java.io.OutputStream;
  +import java.io.ByteArrayInputStream;
  +
   import java.net.Socket;
   import java.util.Enumeration;
  -import javax.security.cert.X509Certificate;
  +import java.security.cert.X509Certificate;
  +import java.security.cert.CertificateFactory;
   
   import org.apache.tomcat.util.buf.MessageBytes;
   import org.apache.tomcat.util.buf.ByteChunk;
  @@ -406,15 +409,18 @@
                   // Transform the string into certificate.
                   String certString = msg.getString();
                   byte[] certData = certString.getBytes();
  +                ByteArrayInputStream bais = new ByteArrayInputStream(certData);
    
                   // Fill the first element.
                   X509Certificate jsseCerts[] = null;
                   try {
  -                    X509Certificate cert =
  -                        X509Certificate.getInstance(certData);
  +                    CertificateFactory cf =
  +                        CertificateFactory.getInstance("X.509");
  +                    X509Certificate cert = (X509Certificate)
  +                        cf.generateCertificate(bais);
                       jsseCerts =  new X509Certificate[1];
                       jsseCerts[0] = cert;
  -                } catch(javax.security.cert.CertificateException e) {
  +                } catch(java.security.cert.CertificateException e) {
                       logger.log("Certificate convertion failed" + e );
                   }