diff --git a/commander b/commander index 4fac4fe..2788a19 100755 --- a/commander +++ b/commander @@ -62,7 +62,7 @@ case $txt in [ -e account.key ] || openssl genrsa 4096 > account.key [ -e labca_key.pem ] || openssl genrsa 4096 > labca_key.pem san=$(openssl x509 -noout -text -in labca_cert.pem | grep DNS:) - openssl req -new -sha256 -key labca_key.pem -subj "/" -reqexts SAN -config <(cat /etc/ssl/openssl.cnf <(printf "[SAN]\nsubjectAltName=$san")) > domain.csr + openssl req -new -utf8 -sha256 -key labca_key.pem -subj "/" -reqexts SAN -config <(cat /etc/ssl/openssl.cnf <(printf "[SAN]\nsubjectAltName=$san")) > domain.csr url=$(grep 'DEFAULT_DIRECTORY_URL =' /home/labca/acme_tiny.py | sed -e 's/.*=[ ]*//' | sed -e 's/\"//g') wait_server $url sleep 10 diff --git a/gui/certificate.go b/gui/certificate.go index 01fc855..9793de4 100644 --- a/gui/certificate.go +++ b/gui/certificate.go @@ -187,11 +187,11 @@ func (ci *CertificateInfo) Generate(path string, certBase string) error { subject = strings.Replace(subject, " ", "\\\\", -1) if ci.IsRoot { - if _, err := exeCmd("openssl req -config " + path + "openssl.cnf -days 3650 -new -x509 -extensions v3_ca -subj " + subject + " -key " + path + certBase + ".key -out " + path + certBase + ".pem"); err != nil { + if _, err := exeCmd("openssl req -config " + path + "openssl.cnf -days 3650 -new -utf8 -x509 -extensions v3_ca -subj " + subject + " -key " + path + certBase + ".key -out " + path + certBase + ".pem"); err != nil { return reportError(err) } } else { - if _, err := exeCmd("openssl req -config " + path + "openssl.cnf -new -subj " + subject + " -key " + path + certBase + ".key -out " + path + certBase + ".csr"); err != nil { + if _, err := exeCmd("openssl req -config " + path + "openssl.cnf -new -utf8 -subj " + subject + " -key " + path + certBase + ".key -out " + path + certBase + ".csr"); err != nil { return reportError(err) } if _, err := exeCmd("openssl ca -config " + path + "../openssl.cnf -extensions v3_intermediate_ca -days 3600 -md sha384 -notext -batch -in " + path + certBase + ".csr -out " + path + certBase + ".pem"); err != nil { diff --git a/gui/main.go b/gui/main.go index 865b911..ce94eee 100644 --- a/gui/main.go +++ b/gui/main.go @@ -1101,8 +1101,8 @@ func _manageGet(w http.ResponseWriter, r *http.Request) { backupFiles = backupFiles[:len(backupFiles)-1] manageData["BackupFiles"] = backupFiles - manageData["RootDetails"] = _doCmdOutput(w, r, "openssl x509 -noout -text -in data/root-ca.pem") - manageData["IssuerDetails"] = _doCmdOutput(w, r, "openssl x509 -noout -text -in data/issuer/ca-int.pem") + manageData["RootDetails"] = _doCmdOutput(w, r, "openssl x509 -noout -text -nameopt utf8 -in data/root-ca.pem") + manageData["IssuerDetails"] = _doCmdOutput(w, r, "openssl x509 -noout -text -nameopt utf8 -in data/issuer/ca-int.pem") manageData["Fqdn"] = viper.GetString("labca.fqdn") manageData["Organization"] = viper.GetString("labca.organization") diff --git a/install b/install index 00886f3..ad4e9a7 100755 --- a/install +++ b/install @@ -37,7 +37,7 @@ COL_LIGHT_GREEN='\e[1;32m' COL_LIGHT_RED='\e[1;31m' TICK="[${COL_LIGHT_GREEN}✓${COL_NC}]" CROSS="[${COL_LIGHT_RED}✗${COL_NC}]" -INFO="[i]" +INFO="[.]" DONE="${COL_LIGHT_GREEN} done!${COL_NC}" OVER="\\r\\033[K" @@ -342,7 +342,7 @@ copy_admin() { cd "$adminDir" git status --short &> /dev/null || rc=$? if [ $rc -gt 0 ]; then - git init >>$installLog + git init &>>$installLog fi git add --all &>/dev/null || true git commit --all --quiet -m "LabCA before update $runId" &>>$installLog && { msg_ok "Commit existing modifications of $adminDir"; msg_info "$msg"; } || true @@ -445,7 +445,7 @@ static_web() { cd /home/labca/nginx_data/static git status --short &> /dev/null || rc=$? if [ $rc -gt 0 ]; then - git init >>$installLog + git init &>>$installLog fi git add --all &>/dev/null || true git commit --all --quiet -m "LabCA before update $runId" &>>$installLog && { msg_ok "Commit existing modifications of $adminDir"; msg_info "$msg"; } || true @@ -524,7 +524,7 @@ config_boulder() { local rc=0 git status --short &> /dev/null || rc=$? if [ $rc -gt 0 ]; then - git init >>$installLog + git init &>>$installLog fi [ -d ".backup" ] || mkdir -p ".backup"