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

Remove user warnings for missing X509 types

Browse Source 
Minor alignment and wrap long lines

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2023-07-20 20:25:52 +01:00
parent 074d0706dd
commit 350c0c6cb8
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
easyrsa3/easyrsa
View File

@ -1517,7 +1517,7 @@ install_data_to_pki - Missing: '$ssl_cnf_file'"
install_data_to_pki: $context - create_openssl_easyrsa_cnf OK"
fi
[ -d "$EASYRSA_EXT_DIR" ] || warn "\
[ -d "$EASYRSA_EXT_DIR" ] || verbose "\
install_data_to_pki - Missing: '$x509_types_dir'"
verbose "install_data_to_pki: $context - COMPLETED"
} # => install_data_to_pki ()
@ -1628,12 +1628,6 @@ Refusing to create a new CA as this would overwrite your
current CA. To start a new CA, run init-pki first."
fi
# Cert type must exist under the EASYRSA_EXT_DIR
[ -e "$EASYRSA_EXT_DIR/ca" ] || warn "\
Missing X509-type 'ca'"
[ -e "$EASYRSA_EXT_DIR/COMMON" ] || warn "\
Missing X509-type 'COMMON'"
# create necessary dirs:
err_msg="\
Unable to create necessary PKI files (permissions?)"
@ -3496,7 +3490,8 @@ The inline credentials files:
The duplicate certificate:
* $dup_crt_by_serial
IMPORTANT: The new key will${EASYRSA_NO_PASS:+ NOT} be password protected."
IMPORTANT: The new key will${EASYRSA_NO_PASS:+ NOT} \
be password protected."
confirm " Continue with rebuild: " "yes" "\
Please confirm you wish to renew the certificate
@ -3506,7 +3501,8 @@ with the following subject:
serial-number: $cert_serial"
# move renewed files so we can reissue certificate with the same name
# move renewed files so we can reissue
# certificate with the same name
rebuild_move
error_undo_rebuild_move=1
@ -3515,9 +3511,9 @@ with the following subject:
then
unset -v error_undo_rebuild_move
else
# If rebuild failed then restore cert, key and req. Otherwise,
# issue a warning. If *restore* fails then at least the file-names
# are not serial-numbers
# If rebuild failed then restore cert, key and req.
# Otherwise, issue a warning. If *restore* fails
# then at least the file-names are not serial-numbers
rebuild_restore_move
die "\
Rebuild has failed to build a new certificate/key pair."
@ -3573,7 +3569,8 @@ rebuild_restore_move() {
if [ "$rrm_err" ]; then
warn "Failed to restore renewed files."
else
notice "Rebuild FAILED but files have been successfully restored."
notice "\
Rebuild FAILED but files have been successfully restored."
fi
return 0