Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml

@@ -62,6 +62,7 @@
                             org.bouncycastle.asn1,
                             org.bouncycastle.asn1.x500,
                             org.bouncycastle.asn1.x509,
+                            org.bouncycastle.asn1.pkcs,
                             org.bouncycastle.cert,
                             org.bouncycastle.cert.jcajce,
                             org.bouncycastle.cms,

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java

@@ -20,6 +20,7 @@ package org.wso2.carbon.certificate.mgt.core.impl;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.bouncycastle.asn1.pkcs.Attribute;
 import org.bouncycastle.asn1.x500.X500Name;
 import org.bouncycastle.asn1.x509.KeyUsage;
 import org.bouncycastle.asn1.x509.X509Extension;
@@ -344,6 +345,7 @@ public class CertificateGenerator {
         Date validityEndDate = commonUtil.getValidityEndDate();
 
         X500Name certSubject = request.getSubject();
+        Attribute attributes[] = request.getAttributes();
 
         if (certSubject == null) {
             certSubject = new X500Name(ConfigurationUtil.DEFAULT_PRINCIPAL);