build-ca: Force the unit-test to build CA with pass via 'stdin' method
ERSA_UTEST_VERSION and EASYRSA_USE_PASS are only defined when the unit-tests are run. When they are detected, force use of CA password via 'stdin'. Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
parent
c11135d19b
commit
51cb520887
@ -1575,6 +1575,15 @@ to the latest Easy-RSA release."
|
|||||||
then
|
then
|
||||||
: # No passphrase required
|
: # No passphrase required
|
||||||
|
|
||||||
|
# Strictly for use only by easyrsa-unit-tests.sh
|
||||||
|
elif [ "$ERSA_UTEST_VERSION" ] && [ "$EASYRSA_USE_PASS" ]
|
||||||
|
then
|
||||||
|
# Set a test password and use file-descriptor method
|
||||||
|
CA_key_pass='EasyRSA'
|
||||||
|
# To use stdin for -passin and -passout
|
||||||
|
# MUST use -batch
|
||||||
|
ssl_batch=1
|
||||||
|
|
||||||
elif [ "$EASYRSA_PASSOUT" ] && [ "$EASYRSA_PASSIN" ]
|
elif [ "$EASYRSA_PASSOUT" ] && [ "$EASYRSA_PASSIN" ]
|
||||||
then
|
then
|
||||||
: # passphrase defined
|
: # passphrase defined
|
||||||
@ -1700,8 +1709,14 @@ to the latest Easy-RSA release."
|
|||||||
;;
|
;;
|
||||||
*) die "Unknown algorithm: $EASYRSA_ALGO"
|
*) die "Unknown algorithm: $EASYRSA_ALGO"
|
||||||
esac
|
esac
|
||||||
|
|
||||||
verbose "\
|
verbose "\
|
||||||
build_ca: CA key password created via FD"
|
build_ca: CA key password created via stdin"
|
||||||
|
if [ "$ERSA_UTEST_VERSION" ] && \
|
||||||
|
[ "$EASYRSA_USE_PASS" ]
|
||||||
|
then
|
||||||
|
print "CA key via stdin"
|
||||||
|
fi
|
||||||
|
|
||||||
else
|
else
|
||||||
case "$EASYRSA_ALGO" in
|
case "$EASYRSA_ALGO" in
|
||||||
@ -1753,12 +1768,19 @@ build_ca: CA key password created via temp-files"
|
|||||||
${CA_key_pass}
|
${CA_key_pass}
|
||||||
EOF
|
EOF
|
||||||
then
|
then
|
||||||
verbose "\
|
: # ok
|
||||||
build_ca: CA certificate password created via FD"
|
|
||||||
else
|
else
|
||||||
die "Failed to build the CA keypair."
|
die "Failed to build the CA keypair."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
verbose "\
|
||||||
|
build_ca: CA certificate password created via stdin"
|
||||||
|
if [ "$ERSA_UTEST_VERSION" ] && \
|
||||||
|
[ "$EASYRSA_USE_PASS" ]
|
||||||
|
then
|
||||||
|
print "CA Cert via stdin"
|
||||||
|
fi
|
||||||
|
|
||||||
else
|
else
|
||||||
easyrsa_openssl req -utf8 -new \
|
easyrsa_openssl req -utf8 -new \
|
||||||
-key "$out_key_tmp" -keyout "$out_key_tmp" \
|
-key "$out_key_tmp" -keyout "$out_key_tmp" \
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user