diff options
| author | Christina Fu <cfu@dhcp-16-189.sjc.redhat.com> | 2016-07-11 17:51:57 -0700 |
|---|---|---|
| committer | Christina Fu <cfu@dhcp-16-189.sjc.redhat.com> | 2016-07-11 18:29:45 -0700 |
| commit | ee68baccc5510184ff67b903288410d3ccc6a831 (patch) | |
| tree | a314cb2460d190b0ec551bab90ffa868c9af4906 /base/server/cms/src | |
| parent | 74182c05460e19c7b9aeb3fadb13f0135e33a58a (diff) | |
Ticket #2389 fix for regular CA installation
This patch addresses the issue that with the previous patch, the regular (non-external and non-existing) CA installation fails.
Diffstat (limited to 'base/server/cms/src')
| -rw-r--r-- | base/server/cms/src/com/netscape/cms/servlet/csadmin/CertUtil.java | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/base/server/cms/src/com/netscape/cms/servlet/csadmin/CertUtil.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/CertUtil.java index 495e4c0af..ed762def6 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/csadmin/CertUtil.java +++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/CertUtil.java @@ -535,9 +535,14 @@ public class CertUtil { CMS.debug("Creating local request exception:" + e.toString()); } - // installAdjustValidity tells ValidityDefault to adjust the - // notAfter value to that of the CA's signing cert if needed - req.setExtData("installAdjustValidity", "true"); + if (!certTag.equals("signing")) { + /* + * (applies to non-CA-signing cert only) + * installAdjustValidity tells ValidityDefault to adjust the + * notAfter value to that of the CA's signing cert if needed + */ + req.setExtData("installAdjustValidity", "true"); + } processor.populate(req, info); PrivateKey caPrik = null; @@ -554,11 +559,11 @@ public class CertUtil { } if (caPrik == null) { - CMS.debug("CertUtil::createSelfSignedCert() - " + CMS.debug("CertUtil::createLocalCert() - " + "CA private key is null!"); throw new IOException("CA private key is null"); } else { - CMS.debug("CertUtil createSelfSignedCert: got CA private key"); + CMS.debug("CertUtil createLocalCert: got CA private key"); } String keyAlgo = x509key.getAlgorithm(); @@ -586,7 +591,7 @@ public class CertUtil { } if (cert != null) { - CMS.debug("CertUtil createSelfSignedCert: got cert signed"); + CMS.debug("CertUtil createLocalCert: got cert signed"); } } catch (IOException e) { |