Skip to content

Commit

Permalink
Disable Server TLS-Crypt-V2 GROUP key functions
Browse files Browse the repository at this point in the history
Hense forth, all server keys are group keys.

Signed-off-by: Richard T Bonhomme <[email protected]>
  • Loading branch information
TinCanTech committed Dec 15, 2021
1 parent 8e40715 commit 4dd0d55
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
10 changes: 10 additions & 0 deletions easytls
Original file line number Diff line number Diff line change
Expand Up @@ -4048,6 +4048,11 @@ inline_tls_crypt_v2 ()
# Inline TLS-Crypt-V2 Group Server Key with X509 Certificate
inline_tls_crypt_v2_group_server ()
{
print "Only Client keys require the Group setting."
print "Use your current standard Server key to build"
print "a new server inline file."
return 1

[ $# -ge 2 ] || \
die "Required option(s): <server_common_name> <server_group_key>"

Expand Down Expand Up @@ -4891,6 +4896,11 @@ build_tls_crypt_v2_client ()
# Build group TLS-Crypt-v2 Server
build_tls_cv2_group_server ()
{
print "Only Client keys require the Group setting."
print "Use your current standard Server key to build"
print "new Client Group key(s) with."
return 1

[ $# -ge 1 ] || die "Required option(s): <server_group_name>"

# Verify OpenVPN version and use correct syntax to --genkey
Expand Down
7 changes: 4 additions & 3 deletions easytls-unit-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,8 @@ for cmd in "init no-ca" "cf cg easytls-unit-test" \
"-r=s03 itcv2 c05" "-r=s03 -k=hw itcv2 c05 no-md" \
"-r=s03 itcv2 c06" "-r=s03 -k=hw itcv2 c06 add-hw" \
"-k=hw rmd c06 serial" "status" \
"bc2gs sg01" "bc2gc sg01 cg01" "bc2gc sg01 cg02 ${hwaddr1} ${hwaddr2} ${ip4addr} ${ip6addr}"
"bc2gc s03 cg01" "bc2gc s03 cg02 ${hwaddr1} ${hwaddr2} ${ip4addr} ${ip6addr}" \
"ic2gc c06 cg02"
do
[ "${cmd}" = 99 ] && exit 99
echo "--------------------"
Expand Down Expand Up @@ -359,8 +360,8 @@ do
"--custom-group=tincantech --sub-key-name=eve remove-tlskey c10" \
"cert-expire" \
"inline-expire" \
"bc2gs sg01" "bc2gc sg01 cg01" "bc2gc sg01 cg02 ${hwaddr1} ${hwaddr2} ${ip4addr} ${ip6addr}" \
"ic2gs s01 sg01" "ic2gc c01 cg01" "ic2gc c01 cg02"
"bc2gc s01 cg01" "bc2gc s01 cg02 ${hwaddr1} ${hwaddr2} ${ip4addr} ${ip6addr}" \
"ic2gc c01 cg01" "ic2gc c01 cg02"
#"inline-index-rebuild" \
## EOL
do
Expand Down

1 comment on commit 4dd0d55

@TinCanTech
Copy link
Owner Author

@TinCanTech TinCanTech commented on 4dd0d55 Dec 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.