From dedef42dacc4c9007cac90843dab7eb57a009ccd Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Mon, 12 Feb 2024 15:27:18 -0500 Subject: [PATCH] Fix bug in keyring generation where commonname fields were not substituted Signed-off-by: 1000TurquoisePogs --- example-zowe.yaml | 8 ++++---- files/SZWESAMP/ZWEIKRA1 | 4 ++-- files/SZWESAMP/ZWEIKRR1 | 4 ++-- files/SZWESAMP/ZWEIKRT1 | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example-zowe.yaml b/example-zowe.yaml index ef96de9672..3d8dd63cdc 100644 --- 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 index 8672305306..b0b2d22a44 100644 --- 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 index ec7c0be3ef..a7cf76b81b 100644 --- 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 index 06cedec321..5587d405aa 100644 --- 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}." +