Pre-guess signature for cert based on csr signature.

diff --git a/src/org/cacert/gigi/pages/account/CertificateIssueForm.java b/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
index 115e958eda5f97bc13adf2792454c14d8e05f9fb..4332a39142f630acf7986e7292b2186cda98b05a 100644 (file)
--- a/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
+++ b/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
@@ -206,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;
@@ -219,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
@@ -315,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<>();