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

build-ca: 'if/then/else' wrap file-descriptor commands

Browse Source 
Aesthetics, no functional change.

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2023-05-09 02:27:12 +01:00
parent 3d14095384
commit 0244306956
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 49 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
easyrsa3/easyrsa
View File

@ -1644,35 +1644,51 @@ to the latest Easy-RSA release."
if [ "$out_key_pass" ]; then
case "$EASYRSA_ALGO" in
rsa)
easyrsa_openssl genpkey \
-algorithm "$EASYRSA_ALGO" \
-pkeyopt rsa_keygen_bits:"$EASYRSA_ALGO_PARAMS" \
-out "$out_key_tmp" \
${cipher:+ "$cipher"} \
-pass fd:3 \
3<<-EOF || die "Failed create CA private key"
${out_key_pass}
EOF
if easyrsa_openssl genpkey \
-algorithm "$EASYRSA_ALGO" \
-pkeyopt \
rsa_keygen_bits:"$EASYRSA_ALGO_PARAMS" \
-out "$out_key_tmp" \
${cipher:+ "$cipher"} \
-pass fd:3 \
3<<-EOF
${out_key_pass}
EOF
then
: # ok
else
die "Failed create CA private key"
fi
;;
ec)
easyrsa_openssl genpkey \
-paramfile "$EASYRSA_ALGO_PARAMS" \
-out "$out_key_tmp" \
${cipher:+ "$cipher"} \
-pass fd:3 \
3<<-EOF || die "Failed create CA private key"
${out_key_pass-}
EOF
if easyrsa_openssl genpkey \
-paramfile "$EASYRSA_ALGO_PARAMS" \
-out "$out_key_tmp" \
${cipher:+ "$cipher"} \
-pass fd:3 \
3<<-EOF
${out_key_pass-}
EOF
then
: # ok
else
die "Failed create CA private key"
fi
;;
ed)
easyrsa_openssl genpkey \
-algorithm "$EASYRSA_CURVE" \
-out "$out_key_tmp" \
${cipher:+ "$cipher"} \
-pass fd:3 \
3<<-EOF || die "Failed create CA private key"
${out_key_pass-}
EOF
if easyrsa_openssl genpkey \
-algorithm "$EASYRSA_CURVE" \
-out "$out_key_tmp" \
${cipher:+ "$cipher"} \
-pass fd:3 \
3<<-EOF
${out_key_pass-}
EOF
then
: # ok
else
die "Failed create CA private key"
fi
;;
*) die "Unknown algorithm: $EASYRSA_ALGO"
esac
@ -1718,7 +1734,7 @@ build_ca: CA key password created via temp-files"
# Generate the CA keypair:
# shellcheck disable=SC2086 # Double quote to prevent ..
if [ "$out_key_pass" ]; then
easyrsa_openssl req -utf8 -new \
if easyrsa_openssl req -utf8 -new \
-key "$out_key_tmp" -keyout "$out_key_tmp" \
-out "$out_file_tmp" \
${ssl_batch:+ -batch} \
@ -1726,11 +1742,16 @@ build_ca: CA key password created via temp-files"
${date_stamp:+ -days "$EASYRSA_CA_EXPIRE"} \
${EASYRSA_DIGEST:+ -"$EASYRSA_DIGEST"} \
-passin fd:3 \
3<<-EOF || die "Failed to build the CA keypair"
3<<-EOF
${out_key_pass}
EOF
verbose "\
then
verbose "\
build_ca: CA certificate password created via FD"
else
die "Failed to build the CA keypair"
fi
else
easyrsa_openssl req -utf8 -new \
-key "$out_key_tmp" -keyout "$out_key_tmp" \