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

formatting and travis fix

Browse Source
This commit is contained in:
Kodie Glosser 2018-02-21 10:55:15 -06:00
parent bdfbd51d7b
commit 8836d509ae
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
easyrsa3/easyrsa
View File

@ -220,6 +220,7 @@ Deprecated features:
} # => opt_usage() } # => opt_usage()
# Wrapper around printf - clobber print since it's not POSIX anyway # Wrapper around printf - clobber print since it's not POSIX anyway
# shellcheck disable=SC1117
print() { printf "%s\n" "$*"; } print() { printf "%s\n" "$*"; }
# Exit fatally with a message to stderr # Exit fatally with a message to stderr
@ -465,16 +466,17 @@ current CA keypair. If you intended to start a new CA, run init-pki first."
[ "$EASYRSA_BATCH" ] && opts="$opts -batch" || export EASYRSA_REQ_CN="Easy-RSA CA" [ "$EASYRSA_BATCH" ] && opts="$opts -batch" || export EASYRSA_REQ_CN="Easy-RSA CA"
out_key_tmp="$(mktemp "$out_key.XXXXXXXXXX")"; EASYRSA_TEMP_FILE_2="$out_key_tmp" out_key_tmp="$(mktemp "$out_key.XXXXXXXXXX")"; EASYRSA_TEMP_FILE_2="$out_key_tmp"
# shellcheck disable=SC2154
out_key_pass_tmp="$(mktemp "$out_key_pass.XXXXXXXXXX")"; EASYRSA_TEMP_FILE_3="$out_key_pass_tmp" out_key_pass_tmp="$(mktemp "$out_key_pass.XXXXXXXXXX")"; EASYRSA_TEMP_FILE_3="$out_key_pass_tmp"
out_file_tmp="$(mktemp "$out_file.XXXXXXXXXX")"; EASYRSA_TEMP_FILE_3="$out_file_tmp" out_file_tmp="$(mktemp "$out_file.XXXXXXXXXX")"; EASYRSA_TEMP_FILE_3="$out_file_tmp"
printf "Enter New CA Key Passphrase: " printf "Enter New CA Key Passphrase: "
stty -echo stty -echo
read kpass read -r kpass
stty echo stty echo
echo echo
printf "Re-Enter New CA Key Passphrase: " printf "Re-Enter New CA Key Passphrase: "
stty -echo stty -echo
read kpass2 read -r kpass2
stty echo stty echo
echo echo
if [ "$kpass" = "$kpass2" ]; if [ "$kpass" = "$kpass2" ];
@ -681,7 +683,6 @@ $(display_dn req "$req_in")
# add one to the extensions file # add one to the extensions file
if [ "$crt_type" = 'server' ]; if [ "$crt_type" = 'server' ];
then then
sname=$(basename $req_in | cut -d. -f1)
echo "$EASYRSA_EXTRA_EXTS" | echo "$EASYRSA_EXTRA_EXTS" |
grep -q subjectAltName || grep -q subjectAltName ||
default_server_san "$req_in" default_server_san "$req_in"