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

33
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" install_data_to_pki: $context - create_openssl_easyrsa_cnf OK"
fi fi
[ -d "$EASYRSA_EXT_DIR" ] || warn "\ [ -d "$EASYRSA_EXT_DIR" ] || verbose "\
install_data_to_pki - Missing: '$x509_types_dir'" install_data_to_pki - Missing: '$x509_types_dir'"
verbose "install_data_to_pki: $context - COMPLETED" verbose "install_data_to_pki: $context - COMPLETED"
} # => install_data_to_pki () } # => 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." current CA. To start a new CA, run init-pki first."
fi 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: # create necessary dirs:
err_msg="\ err_msg="\
Unable to create necessary PKI files (permissions?)" Unable to create necessary PKI files (permissions?)"
@ -2737,7 +2731,7 @@ Failed to revoke certificate: revocation command failed."
revoke_move revoke_move
notice "\ notice "\
* IMPORTANT * * IMPORTANT *
Revocation was successful. You must run 'gen-crl' and upload Revocation was successful. You must run 'gen-crl' and upload
a new CRL to your infrastructure in order to prevent the revoked a new CRL to your infrastructure in order to prevent the revoked
@ -2991,7 +2985,7 @@ Failed to write inline file:
notice "\ notice "\
Renew was successful. Renew was successful.
* IMPORTANT * * IMPORTANT *
Renew has created a new certificate, to replace the old one. Renew has created a new certificate, to replace the old one.
@ -3199,7 +3193,7 @@ Failed to revoke renewed certificate: revocation command failed."
revoke_renewed_move revoke_renewed_move
notice "\ notice "\
* IMPORTANT * * IMPORTANT *
Revocation was successful. You must run 'gen-crl' and upload Revocation was successful. You must run 'gen-crl' and upload
a new CRL to your infrastructure in order to prevent the revoked a new CRL to your infrastructure in order to prevent the revoked
@ -3496,7 +3490,8 @@ The inline credentials files:
The duplicate certificate: The duplicate certificate:
* $dup_crt_by_serial * $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" "\ confirm " Continue with rebuild: " "yes" "\
Please confirm you wish to renew the certificate Please confirm you wish to renew the certificate
@ -3506,7 +3501,8 @@ with the following subject:
serial-number: $cert_serial" 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 rebuild_move
error_undo_rebuild_move=1 error_undo_rebuild_move=1
@ -3515,9 +3511,9 @@ with the following subject:
then then
unset -v error_undo_rebuild_move unset -v error_undo_rebuild_move
else else
# If rebuild failed then restore cert, key and req. Otherwise, # If rebuild failed then restore cert, key and req.
# issue a warning. If *restore* fails then at least the file-names # Otherwise, issue a warning. If *restore* fails
# are not serial-numbers # then at least the file-names are not serial-numbers
rebuild_restore_move rebuild_restore_move
die "\ die "\
Rebuild has failed to build a new certificate/key pair." Rebuild has failed to build a new certificate/key pair."
@ -3526,7 +3522,7 @@ Rebuild has failed to build a new certificate/key pair."
# Success messages # Success messages
notice "Rebuild was successful. notice "Rebuild was successful.
* IMPORTANT * * IMPORTANT *
Rebuild has created a new certificate and key, to replace Rebuild has created a new certificate and key, to replace
both old files. both old files.
@ -3573,7 +3569,8 @@ rebuild_restore_move() {
if [ "$rrm_err" ]; then if [ "$rrm_err" ]; then
warn "Failed to restore renewed files." warn "Failed to restore renewed files."
else else
notice "Rebuild FAILED but files have been successfully restored." notice "\
Rebuild FAILED but files have been successfully restored."
fi fi
return 0 return 0
@ -6620,7 +6617,7 @@ up23_manage_upgrade_23 ()
warn " warn "
========================================================================= =========================================================================
* WARNING * * WARNING *
Found settings from EasyRSA-v2 which are not compatible with EasyRSA-v3. Found settings from EasyRSA-v2 which are not compatible with EasyRSA-v3.
Before you can continue, EasyRSA must upgrade your settings and PKI. Before you can continue, EasyRSA must upgrade your settings and PKI.