nik/easyrsa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use $EASYRSA_DIGEST instead of hard-coded 'digest=-sha256'

Browse Source 
Also, remove a duplicate EASYRSA_DIGEST in easyrsa_openssl().

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2022-04-28 15:03:49 +01:00
parent fac4abf074
commit 071405b1d5
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
easyrsa3/easyrsa
View File

@ -472,7 +472,6 @@ easyrsa_openssl() {
-e "s\`\$EASYRSA_CRL_DAYS\`$EASYRSA_CRL_DAYS\`g" \ -e "s\`\$EASYRSA_CRL_DAYS\`$EASYRSA_CRL_DAYS\`g" \
-e "s\`\$EASYRSA_DIGEST\`$EASYRSA_DIGEST\`g" \ -e "s\`\$EASYRSA_DIGEST\`$EASYRSA_DIGEST\`g" \
-e "s\`\$EASYRSA_KEY_SIZE\`$EASYRSA_KEY_SIZE\`g" \ -e "s\`\$EASYRSA_KEY_SIZE\`$EASYRSA_KEY_SIZE\`g" \
-e "s\`\$EASYRSA_DIGEST\`$EASYRSA_DIGEST\`g" \
-e "s\`\$EASYRSA_DN\`$EASYRSA_DN\`g" \ -e "s\`\$EASYRSA_DN\`$EASYRSA_DN\`g" \
-e "s\`\$EASYRSA_REQ_COUNTRY\`$EASYRSA_REQ_COUNTRY\`g" \ -e "s\`\$EASYRSA_REQ_COUNTRY\`$EASYRSA_REQ_COUNTRY\`g" \
-e "s\`\$EASYRSA_REQ_PROVINCE\`$EASYRSA_REQ_PROVINCE\`g" \ -e "s\`\$EASYRSA_REQ_PROVINCE\`$EASYRSA_REQ_PROVINCE\`g" \
@ -870,7 +869,6 @@ hide_read_pass()
# build-ca backend: # build-ca backend:
build_ca() { build_ca() {
cipher="-aes256" cipher="-aes256"
digest="-sha256"
unset -v nopass sub_ca ssl_batch date_stamp x509 unset -v nopass sub_ca ssl_batch date_stamp x509
while [ -n "$1" ]; do while [ -n "$1" ]; do
case "$1" in case "$1" in
@ -1022,7 +1020,7 @@ current CA keypair. If you intended to start a new CA, run init-pki first."
${ssl_batch+ -batch} \ ${ssl_batch+ -batch} \
${x509+ -x509} \ ${x509+ -x509} \
${date_stamp+ -days "$EASYRSA_CA_EXPIRE"} \ ${date_stamp+ -days "$EASYRSA_CA_EXPIRE"} \
"$digest" \ ${EASYRSA_DIGEST+ -"$EASYRSA_DIGEST"} \
${no_password+ "$no_password"} \ ${no_password+ "$no_password"} \
${EASYRSA_PASSIN:+ -passin "$EASYRSA_PASSIN"} \ ${EASYRSA_PASSIN:+ -passin "$EASYRSA_PASSIN"} \
${out_key_pass_tmp:+ -passin file:"$out_key_pass_tmp"} \ ${out_key_pass_tmp:+ -passin file:"$out_key_pass_tmp"} \
@ -2023,6 +2021,7 @@ Run easyrsa without commands for usage and command help."
want_ca=1 want_ca=1
want_key=1 want_key=1
want_pass=1 want_pass=1
unset -v pkcs_friendly_name
while [ -n "$1" ]; do while [ -n "$1" ]; do
case "$1" in case "$1" in
noca) want_ca="" ;; noca) want_ca="" ;;
@ -2492,13 +2491,13 @@ Sourcing the vars file will probably fail .."
# shellcheck disable=SC2016 # expansion inside '' blah # shellcheck disable=SC2016 # expansion inside '' blah
easyrsa_ksh='@(#)MIRBSD KSH R39-w32-beta14 $Date: 2013/06/28 21:28:57 $' easyrsa_ksh='@(#)MIRBSD KSH R39-w32-beta14 $Date: 2013/06/28 21:28:57 $'
[ "${KSH_VERSION}" = "${easyrsa_ksh}" ] && easyrsa_host_test="${easyrsa_ksh}" [ "${KSH_VERSION}" = "${easyrsa_ksh}" ] && easyrsa_host_test="${easyrsa_ksh}"
#unset -v easyrsa_ksh unset -v easyrsa_ksh
# If not Windows then nix # If not Windows then nix
if [ "${easyrsa_host_test}" ]; then if [ "${easyrsa_host_test}" ]; then
easyrsa_host_os=win easyrsa_host_os=win
easyrsa_uname="${easyrsa_host_test}" easyrsa_uname="${easyrsa_host_test}"
easyrsa_shell="$easyrsa_ksh" easyrsa_shell="$SHELL"
# Detect Windows git/bash # Detect Windows git/bash
if [ "${EXEPATH}" ]; then if [ "${EXEPATH}" ]; then
easyrsa_shell="$SHELL (Git)" easyrsa_shell="$SHELL (Git)"