Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V321 final touches #1221

Merged
merged 14 commits into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ Easy-RSA 3 ChangeLog

3.2.1 (TBD)

* Always exit with error for unknown command options (Except nopass) (#1221)
(build-ca: b2f7912); (gen-req: 07f21d3); (build_full(): 0ff7f4c);
(export_pkcs(): 2c51288); (set-pass: 1266d4e)
* Integrate Easy-RSA TLS-Key for use with 'init-pki soft' (03d9dc2) (#1220)
Note: Inline files that contain private key data are now created in sub-dir
'pki/inline/private'.
Expand Down
17 changes: 8 additions & 9 deletions distro/windows/bin/easyrsa-shell-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
# project; use with other POSIX shells for Windows may require modification to
# this wrapper script.

echo "Easy-RSA starting.."

setup_path="${EASYRSA:-$PWD}"
export PATH="$setup_path;$setup_path/bin;$PATH"
export HOME="$setup_path"
Expand All @@ -24,9 +26,8 @@ for f in $extern_list; do
echo " Your installation is incomplete and cannot function without the required"
echo " files."
echo ""
echo " Press enter to exit."
#shellcheck disable=SC2162
read
read -p "Press Enter or CTRL-C to exit."
exit 1
fi
done
Expand All @@ -48,16 +49,13 @@ done
# Access denied
access_denied() {
echo "Access error: $1"
cat << "ACCESS_DENIED_MSG"

echo "\
To use Easy-RSA in a protected system directory, you must have
full administrator privileges via Windows User Access Control.

Press Enter or CTRL-C to exit.
ACCESS_DENIED_MSG
full administrator privileges via Windows User Access Control."
echo ""

#shellcheck disable=SC2162
read
read -p "Press Enter or CTRL-C to exit."
exit 1
}

Expand Down Expand Up @@ -130,6 +128,7 @@ fi

[ -f "$setup_path/easyrsa" ] || {
echo "Missing easyrsa script. Expected to find it at: $setup_path/easyrsa"
read -p "Press Enter or CTRL-C to exit."
exit 2
}

Expand Down
Loading