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

Merge branch 'TinCanTech-TinCanTech-sed-backtick' into v3.0.6

Browse Source 
Resolves #267

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
This commit is contained in:
Eric F Crist 2018-12-12 08:59:29 -06:00
commit 96696bcc7b
No known key found for this signature in database
GPG Key ID: 72964219390D0D0E
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
easyrsa3/easyrsa
View File

@ -305,22 +305,23 @@ prog_exit() {
# Make LibreSSL safe config file from OpenSSL config file
make_ssl_config() {
sed -e "s,ENV::,,g" \
-e "s,\$dir,$EASYRSA_PKI,g" \
-e "s,\$EASYRSA_PKI,$EASYRSA_PKI,g" \
-e "s,\$EASYRSA_CERT_EXPIRE,$EASYRSA_CERT_EXPIRE,g" \
-e "s,\$EASYRSA_CRL_DAYS,$EASYRSA_CRL_DAYS,g" \
-e "s,\$EASYRSA_DIGEST,$EASYRSA_DIGEST,g" \
-e "s,\$EASYRSA_KEY_SIZE,$EASYRSA_KEY_SIZE,g" \
-e "s,\$EASYRSA_DIGEST,$EASYRSA_DIGEST,g" \
-e "s,\$EASYRSA_DN,$EASYRSA_DN,g" \
-e "s,\$EASYRSA_REQ_COUNTRY,$EASYRSA_REQ_COUNTRY,g" \
-e "s,\$EASYRSA_REQ_PROVINCE,$EASYRSA_REQ_PROVINCE,g" \
-e "s,\$EASYRSA_REQ_CITY,$EASYRSA_REQ_CITY,g" \
-e "s,\$EASYRSA_REQ_ORG,$EASYRSA_REQ_ORG,g" \
-e "s,\$EASYRSA_REQ_OU,$EASYRSA_REQ_OU,g" \
-e "s,\$EASYRSA_REQ_CN,$EASYRSA_REQ_CN,g" \
-e "s,\$EASYRSA_REQ_EMAIL,$EASYRSA_REQ_EMAIL,g" \
sed \
-e "s\`ENV::\`\`g" \
-e "s\`\$dir\`$EASYRSA_PKI\`g" \
-e "s\`\$EASYRSA_PKI\`$EASYRSA_PKI\`g" \
-e "s\`\$EASYRSA_CERT_EXPIRE\`$EASYRSA_CERT_EXPIRE\`g" \
-e "s\`\$EASYRSA_CRL_DAYS\`$EASYRSA_CRL_DAYS\`g" \
-e "s\`\$EASYRSA_DIGEST\`$EASYRSA_DIGEST\`g" \
-e "s\`\$EASYRSA_KEY_SIZE\`$EASYRSA_KEY_SIZE\`g" \
-e "s\`\$EASYRSA_DIGEST\`$EASYRSA_DIGEST\`g" \
-e "s\`\$EASYRSA_DN\`$EASYRSA_DN\`g" \
-e "s\`\$EASYRSA_REQ_COUNTRY\`$EASYRSA_REQ_COUNTRY\`g" \
-e "s\`\$EASYRSA_REQ_PROVINCE\`$EASYRSA_REQ_PROVINCE\`g" \
-e "s\`\$EASYRSA_REQ_CITY\`$EASYRSA_REQ_CITY\`g" \
-e "s\`\$EASYRSA_REQ_ORG\`$EASYRSA_REQ_ORG\`g" \
-e "s\`\$EASYRSA_REQ_OU\`$EASYRSA_REQ_OU\`g" \
-e "s\`\$EASYRSA_REQ_CN\`$EASYRSA_REQ_CN\`g" \
-e "s\`\$EASYRSA_REQ_EMAIL\`$EASYRSA_REQ_EMAIL\`g" \
"$EASYRSA_SSL_CONF" > "$EASYRSA_SAFE_CONF" || die "\
Failed to update $EASYRSA_SAFE_CONF"
} # => make_ssl_config()