Merge branch 'master' into 'master'

Fix CN extraction issue

See merge request entgra/carbon-device-mgt!199

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

@@ -324,9 +324,14 @@ public class CertificateGenerator {
         KeyStoreReader keyStoreReader = new KeyStoreReader();
         if (distinguishedName != null && !distinguishedName.isEmpty()) {
             if (distinguishedName.contains("/CN=")) {
-                String[] dnSplits = distinguishedName.split("/CN=");
+                String[] dnSplits = distinguishedName.split("/");
-                String commonNameExtracted = dnSplits[dnSplits.length - 1];
+                for (String dnPart : dnSplits) {
-                lookUpCertificate = keyStoreReader.getCertificateBySerial(commonNameExtracted);
+                    if (dnPart.contains("CN=")) {
+                        String commonNameExtracted = dnPart.replace("CN=", "");
+                        lookUpCertificate = keyStoreReader.getCertificateBySerial(commonNameExtracted);
+                        break;
+                    }
+                }
             } else {
                 LdapName ldapName;
                 try {
@@ -711,4 +716,4 @@ public class CertificateGenerator {
         return generateCertificateFromCSR(privateKeyCA, certificationRequest,
                 certCA.getIssuerX500Principal().getName());
     }
-}
+}