fixes for BZ 510774,531162,504030, 493418

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@877 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

1 files changed, 10 insertions, 105 deletions

diff --git a/pki/base/silent/src/common/ComCrypto.java b/pki/base/silent/src/common/ComCrypto.java
index 897c13c4..229a64bf 100644
--- a/pki/base/silent/src/common/ComCrypto.java
+++ b/pki/base/silent/src/common/ComCrypto.java
@@ -85,14 +85,6 @@ public class ComCrypto {
     private CryptoStore store;
     private Password pass1 = null, pass2 = null;
 
-    public String C = null;
-    public String OU = null;
-    public String O = null;
-    public String CN = null;
-    public String UID = null;
-    public String L = null;
-    public String E = null;
-
     private String bstr = "-----BEGIN NEW CERTIFICATE REQUEST-----";
     private String blob, Blob1 = null;
     private String Blob2 = null;
@@ -500,57 +492,6 @@ public class ComCrypto {
         return false;
     }
 
-    public boolean getNames() throws Exception {
-
-        X500Name name = new X500Name(certnickname);
-
-        try {
-            C = name.getCountry();
-        } catch (Exception e) {
-            System.out.println("Exception: ");
-            e.getMessage();
-        }
-        try {
-            O = name.getOrganization();
-        } catch (Exception e) {
-            System.out.println("Exception: ");
-            e.getMessage();
-        }
-        try {
-            OU = name.getOrganizationalUnit();
-        } catch (Exception e) {
-            System.out.println("Exception: ");
-            e.getMessage();
-        }
-        try {
-            CN = name.getCommonName();
-        } catch (Exception e) {
-            System.out.println("Exception: ");
-            e.getMessage();
-        }
-        try {
-            UID = name.getCommonName();
-        } catch (Exception e) {
-            System.out.println("Exception: ");
-            e.getMessage();
-        }
-        try {
-            L = name.getLocality();
-        } catch (Exception e) {
-            System.out.println("Exception: ");
-            e.getMessage();
-        }
-        try {
-            E = name.getEmail();
-        } catch (Exception e) {
-            System.out.println("Exception: ");
-            e.getMessage();
-
-        }
-
-        return true;
-    }
-
     public String generateCRMFrequest() {
         URL url = null;
         URLConnection conn = null;
@@ -616,33 +557,13 @@ public class ComCrypto {
 
             certTemplate.setVersion(new INTEGER(2));
 
-            // Call getname to split certnickname aka cert subject name
-            try {
-                getNames();
-            } catch (Exception e) {
-                System.out.println("Exception: ");
-                e.getMessage();
-            }
-
-            Name n = new Name(); 
-
-            if (CN != null) {
-                n.addCommonName(CN);
-            } 
-            if (C != null) {
-                n.addCountryName(C);
-            } 
-            if (L != null) {
-                n.addLocalityName(L);
-            } 
-            if (OU != null) {
-                n.addOrganizationalUnitName(OU);
-            }
-            if (O != null) {
-                n.addOrganizationName(O);
+            if (certnickname != null) {
+                X500Name name = new X500Name(certnickname);
+                ByteArrayInputStream cs = new ByteArrayInputStream(name.getEncoded()); 
+                Name n = (Name) Name.getTemplate().decode(cs);
+                certTemplate.setSubject(n);
             }
 
-            certTemplate.setSubject(n);
             certTemplate.setPublicKey(new SubjectPublicKeyInfo(pair.getPublic()));
 
             SEQUENCE seq = new SEQUENCE();
@@ -783,28 +704,12 @@ public class ComCrypto {
 
             certTemplate.setVersion(new INTEGER(2));
 
-            // Call getname to split certnickname aka cert subject name
-            getNames();
-
-            Name n = new Name();
-
-            if (CN != null) {
-                n.addCommonName(CN);
+            if (certnickname != null) {
+                X500Name name = new X500Name(certnickname);
+                ByteArrayInputStream cs = new ByteArrayInputStream(name.getEncoded());
+                Name n = (Name) Name.getTemplate().decode(cs);
+                certTemplate.setSubject(n);
             }
-            if (C != null) {
-                n.addCountryName(C);
-            }
-            if (L != null) {
-                n.addLocalityName(L);
-            }
-            if (OU != null) {
-                n.addOrganizationalUnitName(OU);
-            }
-            if (O != null) {
-                n.addOrganizationName(O);
-            }
-
-            certTemplate.setSubject(n);
 
             certTemplate.setPublicKey(new SubjectPublicKeyInfo(pair.getPublic()));