Fix bug in keyring generation where commonname fields were not substi…

…tuted Signed-off-by: 1000TurquoisePogs <[email protected]>
zowe · Feb 12, 2024 · dedef42 · dedef42
1 parent 0acee7e
commit dedef42
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/example-zowe.yaml b/example-zowe.yaml
@@ -125,8 +125,8 @@ zowe:
         caPassword: local_ca_password
       # Distinguished name for Zowe generated certificates. All optional.
       dname:
-        caCommonName: ""
-        commonName: "Zowe Development Instances"
+        caCommonName: "Zowe Development Instances CA"
+        commonName: "Zowe Development Instances Certificate"
         orgUnit: "API Mediation Layer"
         org: "Zowe Sample"
         locality: "Prague"
@@ -197,8 +197,8 @@ zowe:
     #       user: "IZUSVR"
     #   # Distinguished name for Zowe generated certificates. All optional.
     #   dname:
-    #     caCommonName: ""
-    #     commonName: "Zowe Development Instances"
+    #     caCommonName: "Zowe Development Instances CA"
+    #     commonName: "Zowe Development Instances Certificate"
     #     orgUnit: "API Mediation Layer"
     #     org: "Zowe Sample"
     #     locality: "Prague"

diff --git a/files/SZWESAMP/ZWEIKRA1 b/files/SZWESAMP/ZWEIKRA1
@@ -112,7 +112,7 @@ ACF
   SET PROFILE(USER) DIVISION(CERTDATA)
   GENCERT CERTAUTH.ZOWECA -
           LABEL({zowe.setup.certificate.keyring.caLabel}) SIZE(2048) -
-          SUBJSDN(CN='{zowe.setup.certificate.dname}. CA' -
+          SUBJSDN(CN='{zowe.setup.certificate.dname.caCommonName}' -
                   OU='{zowe.setup.certificate.dname.orgUnit}.' -
                   O='{zowe.setup.certificate.dname.org}.' -
                   L='{zowe.setup.certificate.dname.locality}.' -
@@ -131,7 +131,7 @@ ACF
 * Create a certificate signed by local zowe's CA .................. */
    SET PROFILE(USER) DIV(CERTDATA)
    GENCERT {zowe.setup.security.users.zowe}.ZOWECERT -
-            SUBJSDN(CN='{zowe.setup.certificate.dname}. certificate' -
+            SUBJSDN(CN='{zowe.setup.certificate.dname.commonName}' -
                     OU='{zowe.setup.certificate.dname.orgUnit}.' -
                     O='{zowe.setup.certificate.dname.org}.' -
                     L='{zowe.setup.certificate.dname.locality}.' -

diff --git a/files/SZWESAMP/ZWEIKRR1 b/files/SZWESAMP/ZWEIKRR1
@@ -108,7 +108,7 @@ $$
 /* Create Zowe's local CA authority .................................*/
    RACDCERT GENCERT CERTAUTH +
             SUBJECTSDN( +
-              CN('{zowe.setup.certificate.dname}. CA') +
+              CN('{zowe.setup.certificate.dname.caCommonName}') +
               OU('{zowe.setup.certificate.dname.orgUnit}') +
               O('{zowe.setup.certificate.dname.org}') +
               L('{zowe.setup.certificate.dname.locality}') +
@@ -128,7 +128,7 @@ $$
 /* Create a certificate signed by local zowe's CA .................. */
    RACDCERT GENCERT ID({zowe.setup.security.users.zowe}) +
             SUBJECTSDN( +
-              CN('{zowe.setup.certificate.dname}. certificate') +
+              CN('{zowe.setup.certificate.dname.commonName}') +
               OU('{zowe.setup.certificate.dname.orgUnit}') +
               O('{zowe.setup.certificate.dname.org}') +
               L('{zowe.setup.certificate.dname.locality}') +

diff --git a/files/SZWESAMP/ZWEIKRT1 b/files/SZWESAMP/ZWEIKRT1
@@ -107,7 +107,7 @@ $$
   TSS GENCERT(CERTAUTH) +
         DIGICERT(ZOWECA) +
         SUBJECTN( +
-          'CN="{zowe.setup.certificate.dname}. CA" +
+          'CN="{zowe.setup.certificate.dname.caCommonName}" +
           OU="{zowe.setup.certificate.dname.orgUnit}." +
           O="{zowe.setup.certificate.dname.org}." +
           L="{zowe.setup.certificate.dname.locality}." +
@@ -127,7 +127,7 @@ $$
    TSS GENCERT({zowe.setup.security.users.zowe}) +
        DIGICERT(ZOWECERT) +
        SUBJECTN( +
-         'CN="{zowe.setup.certificate.dname}. certificate" +
+         'CN="{zowe.setup.certificate.dname.commonName}" +
          OU="{zowe.setup.certificate.dname.orgUnit}." +
          O="{zowe.setup.certificate.dname.org}." +
          L="{zowe.setup.certificate.dname.locality}." +