From 3de4718ab517d37d3c3e1640fe46d1e12ad13771 Mon Sep 17 00:00:00 2001
From: hasuniea <hasunie@wso2.com>
Date: Thu, 29 Oct 2015 10:04:13 +0530
Subject: [PATCH] refactored certificate generator

---
 .../mgt/core/impl/CertificateGenerator.java   | 23 ++++++-------------
 .../CertificateManagementServiceImpl.java     |  1 -
 pom.xml                                       |  2 +-
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java
index 1bb973e76d..cda449e1ab 100755
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java
+++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java
@@ -43,7 +43,6 @@ import org.bouncycastle.operator.ContentSigner;
 import org.bouncycastle.operator.OperatorCreationException;
 import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
 import org.bouncycastle.pkcs.PKCS10CertificationRequest;
-import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequest;
 import org.bouncycastle.util.Store;
 import org.jscep.message.*;
 import org.jscep.transaction.FailInfo;
@@ -70,20 +69,6 @@ import java.util.List;
 
 public class CertificateGenerator {
 
-    private enum PropertyIndex {
-        COMMON_NAME_INDEX(0),
-        NOT_BEFORE_DAYS_INDEX(1),
-        NOT_AFTER_DAYS_INDEX(2);
-
-        private final int itemPosition;
-        private PropertyIndex(final int itemPosition) {
-            this.itemPosition = itemPosition;
-        }
-        public int getValue() {
-            return this.itemPosition;
-        }
-    }
-
     private static final Log log = LogFactory.getLog(CertificateGenerator.class);
 
     public List<X509Certificate> getRootCertificates(byte[] ca, byte[] ra) throws KeystoreException {
@@ -584,6 +569,13 @@ public class CertificateGenerator {
         return null;
     }
 
+    /**
+     * Get Signed certificate by parsing certificate.
+     * @param binarySecurityToken CSR that comes from the client as a String value.It is base 64 encoded request
+     *                            security token.
+     * @return Return signed certificate in X508Certificate type object.
+     * @throws KeystoreException
+     */
     public X509Certificate getSignedCertificateFromCSR(String binarySecurityToken)
             throws KeystoreException {
         byte[] byteArrayBst = DatatypeConverter.parseBase64Binary(binarySecurityToken);
@@ -599,7 +591,6 @@ public class CertificateGenerator {
             log.error(msg, e);
             throw new KeystoreException(msg, e);
         }
-        JcaPKCS10CertificationRequest csr = new JcaPKCS10CertificationRequest(certificationRequest);
         X509Certificate signedCertificate = generateCertificateFromCSR(privateKeyCA, certificationRequest,
                 certCA.getIssuerX500Principal().getName());
         return signedCertificate;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/CertificateManagementServiceImpl.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/CertificateManagementServiceImpl.java
index 6ac4ee9192..77dfe1686c 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/CertificateManagementServiceImpl.java
+++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/CertificateManagementServiceImpl.java
@@ -101,7 +101,6 @@ public class CertificateManagementServiceImpl implements CertificateManagementSe
         return certificateGenerator.extractChallengeToken(certificate);
     }
 
-    @Override
     public X509Certificate getSignedCertificateFromCSR(String binarySecurityToken) throws KeystoreException {
         return certificateGenerator.getSignedCertificateFromCSR(binarySecurityToken);
     }
diff --git a/pom.xml b/pom.xml
index 316508d24c..40d1b95b4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1427,7 +1427,7 @@
 
     <properties>
         <testng.version>6.1.1</testng.version>
-        <carbon.kernel.version>4.4.2</carbon.kernel.version>
+        <carbon.kernel.version>4.4.1</carbon.kernel.version>
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
         <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>