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

More travis-ci changes, SAN fix, maybe related to #89

Browse Source 
Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
This commit is contained in:
Eric F Crist 2017-12-14 08:43:24 -06:00
parent b5803ee9e3
commit da2bd3afbd
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
easyrsa3/easyrsa
View File

@ -412,7 +412,8 @@ Your newly created PKI dir is: $EASYRSA_PKI
# build-ca backend: # build-ca backend:
build_ca() { build_ca() {
opts= sub_ca= opts=""
sub_ca=""
while [ -n "$1" ]; do while [ -n "$1" ]; do
case "$1" in case "$1" in
nopass) opts="$opts -nodes" ;; nopass) opts="$opts -nodes" ;;
@ -570,12 +571,15 @@ key: $key_out
# common signing backend # common signing backend
sign_req() { sign_req() {
crt_type="$1" opts= crt_type="$1"
opts=""
req_in="$EASYRSA_PKI/reqs/$2.req" req_in="$EASYRSA_PKI/reqs/$2.req"
crt_out="$EASYRSA_PKI/issued/$2.crt" crt_out="$EASYRSA_PKI/issued/$2.crt"
# Randomize Serial number # Randomize Serial number
i= serial= check_serial= i=""
serial=""
check_serial=""
for i in 1 2 3 4 5; do for i in 1 2 3 4 5; do
"$EASYRSA_OPENSSL" rand -hex -out "$EASYRSA_PKI/serial" 16 "$EASYRSA_OPENSSL" rand -hex -out "$EASYRSA_PKI/serial" 16
serial="$(cat "$EASYRSA_PKI/serial")" serial="$(cat "$EASYRSA_PKI/serial")"
@ -651,7 +655,7 @@ $(display_dn req "$req_in")
if [ "$crt_type" = 'server' ]; then if [ "$crt_type" = 'server' ]; then
echo "$EASYRSA_EXTRA_EXTS" | echo "$EASYRSA_EXTRA_EXTS" |
grep -q subjectAltName || grep -q subjectAltName ||
print $(default_server_san "$req_in") print "default_server_san $req_in"
fi fi
# Add any advanced extensions supplied by env-var: # Add any advanced extensions supplied by env-var:
@ -974,8 +978,12 @@ Run easyrsa without commands for usage help."
opts="-${type}opt no_pubkey,no_sigdump" opts="-${type}opt no_pubkey,no_sigdump"
while [ -n "$1" ]; do while [ -n "$1" ]; do
case "$1" in case "$1" in
full) opts= ;; full)
*) warn "Ignoring unknown command option: '$1'" ;; opts=""
;;
*)
warn "Ignoring unknown command option: '$1'"
;;
esac esac
shift shift
done done