build-ca: Use create_x509_type() correctly; Remove errant characters

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2023-07-16 13:56:20 +01:00
parent 6f806d9577
commit 6e585eda19
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246

View File

@ -921,7 +921,7 @@ export EASYRSA_REQ_CITY=\"$EASYRSA_REQ_CITY\"
export EASYRSA_REQ_ORG=\"$EASYRSA_REQ_ORG\" export EASYRSA_REQ_ORG=\"$EASYRSA_REQ_ORG\"
export EASYRSA_REQ_OU=\"$EASYRSA_REQ_OU\" export EASYRSA_REQ_OU=\"$EASYRSA_REQ_OU\"
export EASYRSA_REQ_EMAIL=\"$EASYRSA_REQ_EMAIL\" export EASYRSA_REQ_EMAIL=\"$EASYRSA_REQ_EMAIL\"
export EASYRSA_REQ_SERIAL=\"$EASYRSA_REQ_SERIAL\" export EASYRSA_REQ_SERIAL=\"$EASYRSA_REQ_SERIAL\"\
" | sed -e s\`'\&'\`'\\\&'\`g \ " | sed -e s\`'\&'\`'\\\&'\`g \
-e s\`'\$'\`'\\\$'\`g \ -e s\`'\$'\`'\\\$'\`g \
> "$easyrsa_vars_org" || die "\ > "$easyrsa_vars_org" || die "\
@ -1772,14 +1772,14 @@ Raw CA mode
if [ -f "$EASYRSA_EXT_DIR/ca" ]; then if [ -f "$EASYRSA_EXT_DIR/ca" ]; then
cat "$EASYRSA_EXT_DIR/ca" cat "$EASYRSA_EXT_DIR/ca"
else else
create_x509_type_ca create_x509_type ca
fi fi
# COMMON file # COMMON file
if [ -f "$EASYRSA_EXT_DIR/COMMON" ]; then if [ -f "$EASYRSA_EXT_DIR/COMMON" ]; then
cat "$EASYRSA_EXT_DIR/COMMON" cat "$EASYRSA_EXT_DIR/COMMON"
else else
create_x509_type_COMMON create_x509_type COMMON
fi fi
# User extentions # User extentions
@ -6100,7 +6100,7 @@ keyUsage = cRLSign, keyCertSign
# Only issuerAltName and authorityKeyIdentifier make any sense in a CRL. # Only issuerAltName and authorityKeyIdentifier make any sense in a CRL.
# issuerAltName=issuer:copy # issuerAltName=issuer:copy
authorityKeyIdentifier=keyid:always,issuer:always' authorityKeyIdentifier=keyid:always,issuer:always
SSL_CONFIG SSL_CONFIG
} # => create_openssl_easyrsa_cnf() } # => create_openssl_easyrsa_cnf()