Merge pull request #4135 from zowe/user/markackert/extended-cert-debug

Don't convert certificates already in EBCDIC during init
zowe · Jan 16, 2025 · 95a7d61 · 95a7d61
2 parents 5eb6040 + 755f921
commit 95a7d61
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/bin/libs/certificate.sh b/bin/libs/certificate.sh
@@ -646,8 +646,14 @@ EOF
         return 1
       fi
       if [ `uname` = "OS/390" ]; then
-        iconv -f ISO8859-1 -t IBM-1047 "${keystore_dir}/${alias_lc}.cer" > "${keystore_dir}/${alias_lc}.cer-ebcdic"
-        mv "${keystore_dir}/${alias_lc}.cer-ebcdic" "${keystore_dir}/${alias_lc}.cer"
+        # check if certificate is in EBCDIC before converting
+        if [[ "$(head -c 10 ${keystore_dir}/${alias_lc}.cer)" = "-----BEGIN" ]]; then
+          print_message ">>>> Certificate \"${keystore_dir}/${alias_lc}.cer is in EBCDIC."
+        else
+          print_message ">>>> Converting certificate \"${keystore_dir}/${alias_lc}.cer\" to EBCDIC."
+          iconv -f ISO8859-1 -t IBM-1047 "${keystore_dir}/${alias_lc}.cer" >"${keystore_dir}/${alias_lc}.cer-ebcdic"
+          mv "${keystore_dir}/${alias_lc}.cer-ebcdic" "${keystore_dir}/${alias_lc}.cer"
+        fi
         ensure_file_encoding "${keystore_dir}/${alias_lc}.cer" "CERTIFICATE"
       fi
     fi