Skip to content

Commit b0050bd

Browse files
committed
Fix test of none MAC in rekey regression test.
The none MAC is valid in HPN-SSH but it's not enabled by default in sshd_config. So when the rekey tests tries to test it then it will fail. This doesn't occur in all scenarious but absolutely under OSX and other cases in which openssl is disabled.
1 parent 7ba2f82 commit b0050bd

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

regress/rekey.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,17 @@ for i in $macs; do
8888
done
8989

9090
for opt in $opts; do
91-
verbose "client rekey $opt"
91+
# HPN-SSH enables the none MAC but this fails
92+
# in the regression tests because, by default,
93+
# we don't enable the none MAC so the test
94+
# will fail. As such, skip it.
95+
# CJR 9/30/2024
96+
if echo ${opt} | grep -Eq "none"; then
97+
continue
98+
fi
99+
verbose "client rekey $opt"
100+
if ${SSH} -Q cipher-auth | sed 's/^/Ciphers=/' | \
101+
grep $opt >/dev/null; then
92102
if ${SSH} -Q cipher-auth | sed 's/^/Ciphers=/' | \
93103
grep $opt >/dev/null; then
94104
trace AEAD cipher, testing all KexAlgorithms

0 commit comments

Comments
 (0)