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

Merge branch 'master' of https://github.com/TinCanTech/easy-rsa into TinCanTech-master

Browse Source
This commit is contained in:
Eric F Crist 2018-09-07 09:18:06 -05:00
commit 53ff1188ee
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/build-dist.sh
View File

@ -78,6 +78,8 @@ stage_unix() {
cp -R "$SRC_ROOT/doc" "$DIST_ROOT/unix/$PV/" || die "failed to copy unix doc" cp -R "$SRC_ROOT/doc" "$DIST_ROOT/unix/$PV/" || die "failed to copy unix doc"
sed -i -e "s/~~~/$VERSION/" "$DIST_ROOT/unix/$PV/easyrsa"
# files not included # files not included
rm -rf "$DIST_ROOT/unix/$PV/doc/TODO" || die "failed rm TODO" rm -rf "$DIST_ROOT/unix/$PV/doc/TODO" || die "failed rm TODO"
} }
@ -92,6 +94,7 @@ stage_win() {
for f in $SRC_ROOT/doc/*.md; for f in $SRC_ROOT/doc/*.md;
do do
fname=$(basename "$f" .md) fname=$(basename "$f" .md)
sed -i -e "s/~~~/$VERSION/" "$SRC_ROOT/$f"
python -m markdown "$f" > "$DIST_ROOT/windows/$PV/doc/$fname.html" python -m markdown "$f" > "$DIST_ROOT/windows/$PV/doc/$fname.html"
done done

6
easyrsa3/easyrsa
View File

@ -1012,7 +1012,7 @@ $file"
If the key is currently encrypted you must supply the decryption passphrase. If the key is currently encrypted you must supply the decryption passphrase.
${crypto:+You will then enter a new PEM passphrase for this key.$NL}" ${crypto:+You will then enter a new PEM passphrase for this key.$NL}"
"$EASYRSA_OPENSSL" "$key_type" -in "$file" -out "$file" "$crypto" || die "\ "$EASYRSA_OPENSSL" "$key_type" -in "$file" -out "$file" $crypto || die "\
Failed to change the private key passphrase. See above for possible openssl Failed to change the private key passphrase. See above for possible openssl
error messages." error messages."
@ -1169,10 +1169,10 @@ Note: using Easy-RSA configuration from: $vars"
set_var EASYRSA_CURVE secp384r1 set_var EASYRSA_CURVE secp384r1
set_var EASYRSA_EC_DIR "$EASYRSA_PKI/ecparams" set_var EASYRSA_EC_DIR "$EASYRSA_PKI/ecparams"
set_var EASYRSA_CA_EXPIRE 3650 set_var EASYRSA_CA_EXPIRE 3650
set_var EASYRSA_CERT_EXPIRE 3650 set_var EASYRSA_CERT_EXPIRE 1080 # new default of 36 months
set_var EASYRSA_CRL_DAYS 180 set_var EASYRSA_CRL_DAYS 180
set_var EASYRSA_NS_SUPPORT no set_var EASYRSA_NS_SUPPORT no
set_var EASYRSA_NS_COMMENT "Easy-RSA Generated Certificate" set_var EASYRSA_NS_COMMENT "Easy-RSA (~~~) Generated Certificate"
set_var EASYRSA_TEMP_CONF "$EASYRSA_PKI/openssl-easyrsa.temp" set_var EASYRSA_TEMP_CONF "$EASYRSA_PKI/openssl-easyrsa.temp"
set_var EASYRSA_TEMP_EXT "$EASYRSA_PKI/extensions.temp" set_var EASYRSA_TEMP_EXT "$EASYRSA_PKI/extensions.temp"
set_var EASYRSA_TEMP_FILE_2 "" set_var EASYRSA_TEMP_FILE_2 ""