1 files changed, 48 insertions, 178 deletions

diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/CertificateRequest.java b/libjava/classpath/gnu/javax/net/ssl/provider/CertificateRequest.java
index 0f788039b0b..b7a22b20400 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/CertificateRequest.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/CertificateRequest.java
@@ -38,201 +38,96 @@ exception statement from your version.  */
 
 package gnu.javax.net.ssl.provider;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.EOFException;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 
-import java.util.LinkedList;
-import java.security.Principal;
-
-final class CertificateRequest implements Handshake.Body
+/**
+ * A request by the server for a client certificate.
+ *
+ * <pre>
+struct
+{
+  ClientCertificateType certificate_types&lt;1..2^8-1&gt;;
+  DistinguishedName certificate_authorities&lt;3..2^16-1&gt;;
+} CertificateRequest;
+</pre>
+ */
+public class CertificateRequest implements Handshake.Body
 {
 
   // Fields.
   // -------------------------------------------------------------------------
 
-  private final ClientType[] types;
-  private final Principal[] authorities;
-
+  protected ByteBuffer buffer;
+  
   // Constructor.
   // -------------------------------------------------------------------------
 
-  CertificateRequest(ClientType[] types, Principal[] authorities)
-  {
-    if (types == null)
-      {
-        throw new NullPointerException();
-      }
-    this.types = types;
-    if (authorities == null)
-      {
-        throw new NullPointerException();
-      }
-    this.authorities = authorities;
-  }
-
-  // Class methods.
-  // -------------------------------------------------------------------------
-
-  static CertificateRequest read(InputStream in) throws IOException
+  public CertificateRequest(final ByteBuffer buffer)
   {
-    DataInputStream din = new DataInputStream(in);
-    ClientType[] types = new ClientType[din.readUnsignedByte()];
-    for (int i = 0; i < types.length; i++)
-      {
-        types[i] = ClientType.read(din);
-      }
-
-    LinkedList authorities = new LinkedList();
-    byte[] buf = new byte[din.readUnsignedShort()];
-    din.readFully(buf);
-    ByteArrayInputStream bin = new ByteArrayInputStream(buf);
-    try
-      {
-        String x500name = Util.getSecurityProperty("jessie.x500.class");
-        if (x500name == null)
-          {
-            x500name = "org.metastatic.jessie.pki.X500Name";
-          }
-        Class x500class = null;
-        ClassLoader cl = ClassLoader.getSystemClassLoader();
-        if (cl != null)
-          {
-            x500class = cl.loadClass(x500name);
-          }
-        else
-          {
-            x500class = Class.forName(x500name);
-          }
-        Constructor c = x500class.getConstructor(new Class[] { new byte[0].getClass() });
-        while (bin.available() > 0)
-          {
-            buf = new byte[(bin.read() & 0xFF) << 8 | (bin.read() & 0xFF)];
-            bin.read(buf);
-            authorities.add(c.newInstance(new Object[] { buf }));
-          }
-      }
-    catch (IOException ioe)
-      {
-        throw ioe;
-      }
-    catch (Exception ex)
-      {
-        throw new Error(ex.toString());
-      }
-    return new CertificateRequest(types,
-      (Principal[]) authorities.toArray(new Principal[authorities.size()]));
+    this.buffer = buffer.duplicate().order(ByteOrder.BIG_ENDIAN);
   }
 
   // Instance methods.
   // -------------------------------------------------------------------------
 
-  public void write(OutputStream out) throws IOException
+  public int length ()
   {
-    ByteArrayOutputStream bout = new ByteArrayOutputStream();
-    out.write(types.length);
-    for (int i = 0; i < types.length; i++)
-      {
-        out.write(types[i].getValue());
-      }
-
-    try
-      {
-        Class x500class = authorities[0].getClass();
-        Method m = x500class.getMethod("getEncoded", null);
-        for (int i = 0; i < authorities.length; i++)
-          {
-            byte[] buf = (byte[]) m.invoke(authorities[i], null);
-            bout.write(buf.length >>> 8 & 0xFF);
-            bout.write(buf.length & 0xFF);
-            bout.write(buf, 0, buf.length);
-          }
-      }
-    catch (Exception ex)
-      {
-        throw new Error(ex.toString());
-      }
-    out.write(bout.size() >>> 8 & 0xFF);
-    out.write(bout.size() & 0xFF);
-    bout.writeTo(out);
+    int o1 = (buffer.get (0) & 0xFF) + 1;
+    return o1 + (buffer.getShort (o1) & 0xFFFF) + 2;
   }
 
-  ClientType[] getTypes()
+  public ClientCertificateTypeList types ()
   {
-    return types;
+    return new ClientCertificateTypeList(buffer.duplicate());
   }
 
-  String[] getTypeStrings()
+  public X500PrincipalList authorities ()
   {
-    try
-      {
-        return (String[]) Util.transform(types, String.class, "toString", null);
-      }
-    catch (Exception x)
-      {
-        return null;
-      }
+    int offset = (buffer.get (0) & 0xFF) + 1;
+    return new X500PrincipalList (((ByteBuffer) buffer.position(offset)).slice());
   }
 
-  Principal[] getAuthorities()
+  public String toString()
   {
-    return authorities;
+    return toString (null);
   }
 
-  public String toString()
+  public String toString (final String prefix)
   {
     StringWriter str = new StringWriter();
     PrintWriter out = new PrintWriter(str);
+    String subprefix = "  ";
+    if (prefix != null) subprefix = prefix + "  ";
+    if (prefix != null) out.print (prefix);
     out.println("struct {");
-    out.print("  types = ");
-    for (int i = 0; i < types.length; i++)
-      {
-        out.print(types[i]);
-        if (i != types.length - 1)
-          out.print(", ");
-      }
-    out.println(";");
+    if (prefix != null) out.print (prefix);
+    out.println ("  types =");
+    out.println (types ().toString (subprefix));
+    if (prefix != null) out.print (prefix);
     out.println("  authorities =");
-    for (int i = 0; i < authorities.length; i++)
-      {
-        out.print("    ");
-        out.print(authorities[i].getName());
-        if (i != types.length - 1)
-          out.println(",");
-      }
-    out.println(";");
-    out.println("} CertificateRequest;");
+    out.println (authorities ().toString (subprefix));
+    if (prefix != null) out.print (prefix);
+    out.print ("} CertificateRequest;");
     return str.toString();
   }
 
-  // Inner class.
-  // -------------------------------------------------------------------------
-
-  static final class ClientType implements Enumerated
+  public static enum ClientCertificateType
   {
-
-    // Constants and fields.
-    // -----------------------------------------------------------------------
-
-    static final ClientType
-      RSA_SIGN     = new ClientType(1), DSS_SIGN     = new ClientType(2),
-      RSA_FIXED_DH = new ClientType(3), DSS_FIXED_DH = new ClientType(4);
+    RSA_SIGN     (1),
+    DSS_SIGN     (2),
+    RSA_FIXED_DH (3),
+    DSS_FIXED_DH (4);
 
     private final int value;
 
     // Constructor.
     // -----------------------------------------------------------------------
 
-    private ClientType(int value)
+    private ClientCertificateType (final int value)
     {
       this.value = value;
     }
@@ -240,46 +135,21 @@ final class CertificateRequest implements Handshake.Body
     // Class method.
     // -----------------------------------------------------------------------
 
-    static ClientType read(InputStream in) throws IOException
+    static ClientCertificateType forValue (final int value)
     {
-      int i = in.read();
-      if (i == -1)
-        {
-          throw new EOFException("unexpected end of input stream");
-        }
-      switch (i & 0xFF)
+      switch (value)
         {
         case 1: return RSA_SIGN;
         case 2: return DSS_SIGN;
         case 3: return RSA_FIXED_DH;
         case 4: return DSS_FIXED_DH;
-        default: return new ClientType(i);
+        default: throw new IllegalArgumentException("unknown client certificate type: " + value);
         }
     }
 
-    // Instance methods.
-    // -----------------------------------------------------------------------
-
-    public byte[] getEncoded()
-    {
-      return new byte[] { (byte) value };
-    }
-
     public int getValue()
     {
       return value;
     }
-
-    public String toString()
-    {
-      switch (value)
-        {
-        case 1: return "rsa_sign";
-        case 2: return "dss_sign";
-        case 3: return "rsa_fixed_dh";
-        case 4: return "dss_fixed_dh";
-        default: return "unknown(" + value + ")";
-        }
-    }
   }
 }