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

Merge branch 'expand-help' of ssh://github.com/TinCanTech/easy-rsa into TinCanTech-expand-help

Browse Source 
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2023-08-22 12:55:01 +01:00
commit 94078ae8da
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
easyrsa3/easyrsa
View File

@ -24,6 +24,9 @@ To get detailed usage and help for a command, use:
For a list of global-options, use: For a list of global-options, use:
./easyrsa help options ./easyrsa help options
For a list of extra test commands, use:
./easyrsa help more
A list of commands is shown below: A list of commands is shown below:
init-pki [ cmd-opts ] init-pki [ cmd-opts ]
build-ca [ cmd-opts ] build-ca [ cmd-opts ]
@ -41,7 +44,6 @@ A list of commands is shown below:
rebuild <file_name_base> [ cmd-opts ] rebuild <file_name_base> [ cmd-opts ]
gen-crl gen-crl
update-db update-db
make-safe-ssl
show-req <file_name_base> [ cmd-opts ] show-req <file_name_base> [ cmd-opts ]
show-cert <file_name_base> [ cmd-opts ] show-cert <file_name_base> [ cmd-opts ]
show-ca [ cmd-opts ] show-ca [ cmd-opts ]
@ -90,7 +92,6 @@ DIRECTORY STATUS (commands would take effect on these locations)
EASYRSA: $work_dir EASYRSA: $work_dir
PKI: $pki_dir PKI: $pki_dir
vars-file: $vars_status vars-file: $vars_status
x509-types: ${EASYRSA_EXT_DIR:-Missing or undefined}
$CA_status" $CA_status"
# if the vars file in use is not in the PKI # if the vars file in use is not in the PKI
@ -450,6 +451,28 @@ cmd_help() {
eg: '--batch --req-cn=NAME build-ca [subca]' eg: '--batch --req-cn=NAME build-ca [subca]'
* To generate a certificate signing request: * To generate a certificate signing request:
eg: '--batch --req-cn=NAME gen-req <file_name_base>'" eg: '--batch --req-cn=NAME gen-req <file_name_base>'"
;;
more|test|xtra|extra|ext)
# Test features
text_only=1
text="
Make safessl-easyrsa.cnf file:
mss|make-safe-ssl
Check <SERIAL> number is unique:
serial|check-serial <SERIAL>
Display DN of certificate:
display-dn <file_name_base>
Display SAN of certificate:
display-san <file_name_base>
Generate default SAN of request:
default-san <file_name_base>
Display EKU of certificate:
x509-eku <file_name_base>"
;; ;;
opts|options) opts|options)
opt_usage opt_usage
@ -4180,6 +4203,15 @@ default_server_san - input error"
path="$1" path="$1"
shift shift
# Command line support for <file_name_base>
if [ -e "$path" ]; then
: # ok
else
path="${EASYRSA_PKI}/reqs/${path}.req"
[ -e "$path" ] || \
user_error "Missing file: $path"
fi
# Extract CN from DN # Extract CN from DN
cn="$( cn="$(
easyrsa_openssl req -in "$path" -noout -subject \ easyrsa_openssl req -in "$path" -noout -subject \
@ -6795,10 +6827,6 @@ case "$cmd" in
verify_working_env verify_working_env
show_host "$@" show_host "$@"
;; ;;
make-safe-ssl)
verify_working_env
make_safe_ssl "$@"
;;
verify|verify-cert) verify|verify-cert)
verify_working_env verify_working_env
# Called with --batch, this will return error # Called with --batch, this will return error
@ -6807,6 +6835,10 @@ case "$cmd" in
verify_cert "$@" || \ verify_cert "$@" || \
easyrsa_exit_with_error=1 easyrsa_exit_with_error=1
;; ;;
mss|make-safe-ssl)
verify_working_env
make_safe_ssl "$@"
;;
serial|check-serial) serial|check-serial)
verify_working_env verify_working_env
# Called with --batch, this will return error # Called with --batch, this will return error