community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Dilshan Edirisuriya 2015-10-28 18:49:47 +05:30
parent 168a011376
commit 0b800b8615
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@
org.apache.commons.logging, org.apache.commons.logging,
javax.security.auth.x500, javax.security.auth.x500,
javax.xml.parsers, javax.xml.parsers,
org.apache.commons.codec.binary, org.apache.commons.codec.binary;version="${version.commons.codec}",
org.bouncycastle.asn1, org.bouncycastle.asn1,
org.bouncycastle.asn1.x500, org.bouncycastle.asn1.x500,
org.bouncycastle.asn1.x509, org.bouncycastle.asn1.x509,

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

@ -348,19 +348,19 @@ public class CertificateGenerator {
Date validityBeginDate = commonUtil.getValidityStartDate(); Date validityBeginDate = commonUtil.getValidityStartDate();
Date validityEndDate = commonUtil.getValidityEndDate(); Date validityEndDate = commonUtil.getValidityEndDate();
X500Name certSubject = request.getSubject(); X500Name certSubject = new X500Name(ConfigurationUtil.DEFAULT_PRINCIPAL);
Attribute attributes[] = request.getAttributes(); Attribute attributes[] = request.getAttributes();
if (certSubject == null) { // if (certSubject == null) {
certSubject = new X500Name(ConfigurationUtil.DEFAULT_PRINCIPAL); // certSubject = new X500Name(ConfigurationUtil.DEFAULT_PRINCIPAL);
} else { // } else {
org.bouncycastle.asn1.x500.RDN[] rdn = certSubject.getRDNs(); // org.bouncycastle.asn1.x500.RDN[] rdn = certSubject.getRDNs();
//
if (rdn == null || rdn.length == 0) { // if (rdn == null || rdn.length == 0) {
certSubject = new X500Name(ConfigurationUtil.DEFAULT_PRINCIPAL); // certSubject = new X500Name(ConfigurationUtil.DEFAULT_PRINCIPAL);
} // }
} // }
X509v3CertificateBuilder certificateBuilder = new X509v3CertificateBuilder( X509v3CertificateBuilder certificateBuilder = new X509v3CertificateBuilder(
new X500Name(issueSubject), CommonUtil.generateSerialNumber(), new X500Name(issueSubject), CommonUtil.generateSerialNumber(),
validityBeginDate, validityEndDate, certSubject, request.getSubjectPublicKeyInfo()); validityBeginDate, validityEndDate, certSubject, request.getSubjectPublicKeyInfo());