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

Merge branch 'TinCanTech-improve-gen-dh'

Browse Source 
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2022-08-15 12:50:30 +01:00
commit 0d999826ea
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
easyrsa3/easyrsa
View File

@ -1384,23 +1384,37 @@ gen_dh() {
out_file="$EASYRSA_PKI/dh.pem" out_file="$EASYRSA_PKI/dh.pem"
# check to see if we already have a dh parameters file # check to see if we already have a dh parameters file
if [ -e "$EASYRSA_PKI/dh.pem" ]; then if [ -e "$out_file" ]; then
if [ "$EASYRSA_BATCH" ]; then if [ "$EASYRSA_BATCH" ]; then
# if batch is enabled, die # if batch is enabled, die
die "file $EASYRSA_PKI/dh.pem already exists!" die "\
DH parameters file already exists
at: $out_file"
else else
# warn the user, give them a chance to force overwrite # warn the user, give them a chance to force overwrite
confirm "Overwrite? " "yes" "*** File $EASYRSA_PKI/dh.pem already exists! ***" confirm "Overwrite? " "yes" "\
DH parameters file already exists
at: $out_file"
fi fi
fi fi
"$EASYRSA_OPENSSL" dhparam -out "$out_file" "$EASYRSA_KEY_SIZE" || \ # Create a temp file, otherwise user abort leaves an incomplete dh.pem
die "Failed to build DH params" tmp_dh_file="$(easyrsa_mktemp)" || die "Failed to create temp DH file"
# Generate dh.pem
"$EASYRSA_OPENSSL" dhparam -out "$tmp_dh_file" "$EASYRSA_KEY_SIZE" || \
die "Failed to generate DH params"
# Validate dh.pem
"$EASYRSA_OPENSSL" dhparam -in "$tmp_dh_file" -check -noout || \
die "Failed to validate DH params"
mv -f "$tmp_dh_file" "$out_file" || die "Failed to move temp DH file"
[ "$EASYRSA_SILENT" ] || print # Separate Notice below
notice "\ notice "\
DH parameters of size $EASYRSA_KEY_SIZE created at $out_file" DH parameters of size $EASYRSA_KEY_SIZE created
at: $out_file"
return 0 return 0
} # => gen_dh() } # => gen_dh()