Add tests for certificate data pre-fillin:

[gigi.git] / src / org / cacert / gigi / pages / account / CertificateIssueForm.java

diff --git a/src/org/cacert/gigi/pages/account/CertificateIssueForm.java b/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
index 936ced84f52ad8e98576428bce73c85a54ca9fcc..184b87860ca8a0388a1ea36ddc52f02237f6767f 100644 (file)
--- a/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
+++ b/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
@@ -42,6 +42,7 @@ import sun.security.pkcs10.PKCS10Attribute;
 import sun.security.pkcs10.PKCS10Attributes;
 import sun.security.util.DerInputStream;
 import sun.security.util.DerValue;
+import sun.security.util.ObjectIdentifier;
 import sun.security.x509.AVA;
 import sun.security.x509.AlgorithmId;
 import sun.security.x509.CertificateExtensions;
@@ -63,12 +64,36 @@ import sun.security.x509.X500Name;
  */
 public class CertificateIssueForm extends Form {
 
-    private static final String DEFAULT_CN = "CAcert WoT User";
+    public static final String DEFAULT_CN = "CAcert WoT User";
 
     private final static Template t = new Template(CertificateIssueForm.class.getResource("CertificateIssueForm.templ"));
 
     private final static Template tIni = new Template(CertificateAdd.class.getResource("RequestCertificate.templ"));
 
+    public static final ObjectIdentifier OID_KEY_USAGE_SSL_SERVER = ObjectIdentifier.newInternal(new int[] {
+            1, 3, 6, 1, 5, 5, 7, 3, 1
+    });
+
+    public static final ObjectIdentifier OID_KEY_USAGE_SSL_CLIENT = ObjectIdentifier.newInternal(new int[] {
+            1, 3, 6, 1, 5, 5, 7, 3, 2
+    });
+
+    public static final ObjectIdentifier OID_KEY_USAGE_CODESIGN = ObjectIdentifier.newInternal(new int[] {
+            1, 3, 6, 1, 5, 5, 7, 3, 3
+    });
+
+    public static final ObjectIdentifier OID_KEY_USAGE_EMAIL_PROTECTION = ObjectIdentifier.newInternal(new int[] {
+            1, 3, 6, 1, 5, 5, 7, 3, 4
+    });
+
+    public static final ObjectIdentifier OID_KEY_USAGE_TIMESTAMP = ObjectIdentifier.newInternal(new int[] {
+            1, 3, 6, 1, 5, 5, 7, 3, 8
+    });
+
+    public static final ObjectIdentifier OID_KEY_USAGE_OCSP = ObjectIdentifier.newInternal(new int[] {
+            1, 3, 6, 1, 5, 5, 7, 3, 9
+    });
+
     User u;
 
     private CSRType csrType;
@@ -151,17 +176,20 @@ public class CertificateIssueForm extends Form {
                             } else if (c instanceof ExtendedKeyUsageExtension) {
                                 ExtendedKeyUsageExtension ekue = (ExtendedKeyUsageExtension) c;
                                 for (String s : ekue.getExtendedKeyUsage()) {
-                                    if (s.equals("1.3.6.1.5.5.7.3.1")) {
+                                    if (s.equals(OID_KEY_USAGE_SSL_SERVER.toString())) {
                                         // server
-                                    } else if (s.equals("1.3.6.1.5.5.7.3.2")) {
+                                        profile = CertificateProfile.getByName("server");
+                                    } else if (s.equals(OID_KEY_USAGE_SSL_CLIENT.toString())) {
                                         // client
-                                    } else if (s.equals("1.3.6.1.5.5.7.3.3")) {
+                                        profile = CertificateProfile.getByName("client");
+                                    } else if (s.equals(OID_KEY_USAGE_CODESIGN.toString())) {
                                         // code sign
-                                    } else if (s.equals("1.3.6.1.5.5.7.3.4")) {
+                                    } else if (s.equals(OID_KEY_USAGE_EMAIL_PROTECTION.toString())) {
                                         // emailProtection
-                                    } else if (s.equals("1.3.6.1.5.5.7.3.8")) {
+                                        profile = CertificateProfile.getByName("mail");
+                                    } else if (s.equals(OID_KEY_USAGE_TIMESTAMP.toString())) {
                                         // timestamp
-                                    } else if (s.equals("1.3.6.1.5.5.7.3.9")) {
+                                    } else if (s.equals(OID_KEY_USAGE_OCSP.toString())) {
                                         // OCSP
                                     }
                                 }
@@ -178,6 +206,8 @@ public class CertificateIssueForm extends Form {
                     PublicKey pk = parsed.getSubjectPublicKeyInfo();
                     checkKeyStrength(pk, out);
                     String sign = getSignatureAlgorithm(data);
+                    guessDigest(sign);
+
                     out.println("<br/>digest: " + sign + "<br/>");
 
                     this.csr = csr;
@@ -191,6 +221,7 @@ public class CertificateIssueForm extends Form {
                     }
                     checkKeyStrength(parsed.getPubkey(), out);
                     String sign = getSignatureAlgorithm(data);
+                    guessDigest(sign);
                     out.println("<br/>digest: " + sign + "<br/>");
 
                     // spkacChallenge
@@ -287,6 +318,14 @@ public class CertificateIssueForm extends Form {
         return false;
     }
 
+    private void guessDigest(String sign) {
+        if (sign.toLowerCase().startsWith("sha512")) {
+            selectedDigest = Digest.SHA512;
+        } else if (sign.toLowerCase().startsWith("sha384")) {
+            selectedDigest = Digest.SHA384;
+        }
+    }
+
     private TreeSet<SubjectAlternateName> parseSANBox(String SANs) {
         String[] SANparts = SANs.split("[\r\n]+|, *");
         TreeSet<SubjectAlternateName> parsedNames = new TreeSet<>();