UPD: minor consistency cleanups

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

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java b/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java
index 9efbceb53f4e7aa71197cb04ddc06f0047163052..eb547cd3a22c915e94bbfeb86bd2a52eb344cde3 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java
@@ -263,11 +263,11 @@ public class CertificateRequest {
                 continue;
             }
             try {
-                SANType t = Certificate.SANType.valueOf(parts[0].toUpperCase());
+                SANType t = Certificate.SANType.valueOf(parts[0].toUpperCase().trim());
                 if (t == null) {
                     continue;
                 }
-                parsedNames.add(new SubjectAlternateName(t, parts[1]));
+                parsedNames.add(new SubjectAlternateName(t, parts[1].trim()));
             } catch (IllegalArgumentException e) {
                 // invalid enum type
                 continue;
@@ -445,8 +445,13 @@ public class CertificateRequest {
         if ( !error.isEmpty()) {
             throw error;
         }
-        return new Certificate(u, subject, selectedDigest.toString(), //
-                this.csr, this.csrType, profile, SANs.toArray(new SubjectAlternateName[SANs.size()]));
+        try {
+            return new Certificate(u, subject, selectedDigest.toString(), //
+                    this.csr, this.csrType, profile, SANs.toArray(new SubjectAlternateName[SANs.size()]));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
     }
 
     private String verifyName(GigiApiException error, PropertyTemplate nameTemp, PropertyTemplate wotUserTemp, String verifiedCN) {