Bug 929043 - updated serverCert.profile with SAN results in SubjectAltNameExtDefault gname is empty, not added in cert ext during configuration

Bug 927545 - Transport Cert signing Algorithm doesn't show ECC Signing Algorithms during DRM configuration with ECC

3 files changed, 10 insertions, 3 deletions

diff --git a/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java b/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java
index 38379c283..907d8d631 100644
--- a/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java
+++ b/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java
@@ -25,6 +25,7 @@ import netscape.security.x509.X509CertInfo;
 
 import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.IConfigStore;
+import com.netscape.certsrv.request.IRequest;
 
 public class CertInfoProfile {
     private Vector<ICertInfoPolicyDefault> mDefaults = new Vector<ICertInfoPolicyDefault>();
@@ -87,11 +88,15 @@ public class CertInfoProfile {
     }
 
     public void populate(X509CertInfo info) {
+        populate( null /* request */, info);
+    }
+
+    public void populate(IRequest request, X509CertInfo info) {
         Enumeration<ICertInfoPolicyDefault> e1 = mDefaults.elements();
         while (e1.hasMoreElements()) {
             ICertInfoPolicyDefault def = e1.nextElement();
             try {
-                def.populate(null /* request */, info);
+                def.populate( request, info);
             } catch (Exception e) {
                 CMS.debug(e);
                 CMS.debug("CertInfoProfile.populate: " + e.toString());
diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java
index 4bb1d0309..61c200a96 100644
--- a/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java
@@ -462,7 +462,9 @@ public class SubjectAltNameExtDefault extends EnrollExtDefault {
                                 // call the mapPattern that does server-side gen
                                 // request is not used, but needed for the substitute
                                 // function
-                                gname = mapPattern(randUUID.toString(), request, pattern);
+                                if (request != null) {
+                                    gname = mapPattern(randUUID.toString(), request, pattern);
+                                }
                             } else { //expand more server-gen types here
                                 CMS.debug("SubjectAltNameExtDefault: createExtension - unsupported server-generated type: "
                                         + source + ". Supported: UUID4");
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java b/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
index d94091210..789c0aab5 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
@@ -406,7 +406,7 @@ public class CertUtil {
                 CMS.debug("Creating local request exception:" + e.toString());
             }
 
-            processor.populate(info);
+            processor.populate(req, info);
 
             String caPriKeyID = config.getString(
                     prefix + "signing" + ".privkey.id");