summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2021-09-29 18:33:38 +1000
committerDarren Tucker <dtucker@dtucker.net>2021-09-29 18:33:38 +1000
commitc9172193ea975415facf0afb356d87df21535f88 (patch)
tree06a1e8adb51bf6a02ca94e79e1bdb53189f16755
parent5e6d28b7874b0deae95d2c68947c45212d32e599 (diff)
Remove TEST_SSH_ECC.
Convert the only remaining user of it to runtime detection using ssh -Q.
-rw-r--r--Makefile.in1
-rw-r--r--configure.ac6
-rw-r--r--regress/Makefile6
3 files changed, 3 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in
index 24e11de0..c015a487 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -748,7 +748,6 @@ interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS)
TEST_SSH_CONCH="conch" \
TEST_SSH_IPV6="@TEST_SSH_IPV6@" \
TEST_SSH_UTF8="@TEST_SSH_UTF8@" \
- TEST_SSH_ECC="@TEST_SSH_ECC@" \
TEST_SHELL="$(TEST_SHELL)" \
EXEEXT="$(EXEEXT)" \
$@ && echo all $@ passed
diff --git a/configure.ac b/configure.ac
index 821a75ba..f5fad647 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3105,8 +3105,6 @@ if test "x$openssl" = "xyes" ; then
AC_MSG_RESULT([no])
)
- TEST_SSH_ECC=no
-
if test x$enable_nistp256 = x1 || test x$enable_nistp384 = x1 || \
test x$enable_nistp521 = x1; then
AC_DEFINE(OPENSSL_HAS_ECC, [1], [OpenSSL has ECC])
@@ -3118,7 +3116,6 @@ if test "x$openssl" = "xyes" ; then
if test x$enable_nistp256 = x1; then
AC_DEFINE([OPENSSL_HAS_NISTP256], [1],
[libcrypto has NID_X9_62_prime256v1])
- TEST_SSH_ECC=yes
else
unsupported_algorithms="$unsupported_algorithms \
ecdsa-sha2-nistp256 \
@@ -3127,7 +3124,6 @@ if test "x$openssl" = "xyes" ; then
fi
if test x$enable_nistp384 = x1; then
AC_DEFINE([OPENSSL_HAS_NISTP384], [1], [libcrypto has NID_secp384r1])
- TEST_SSH_ECC=yes
else
unsupported_algorithms="$unsupported_algorithms \
ecdsa-sha2-nistp384 \
@@ -3136,7 +3132,6 @@ if test "x$openssl" = "xyes" ; then
fi
if test x$enable_nistp521 = x1; then
AC_DEFINE([OPENSSL_HAS_NISTP521], [1], [libcrypto has NID_secp521r1])
- TEST_SSH_ECC=yes
else
unsupported_algorithms="$unsupported_algorithms \
ecdh-sha2-nistp521 \
@@ -3144,7 +3139,6 @@ if test "x$openssl" = "xyes" ; then
ecdsa-sha2-nistp521-cert-v01@openssh.com"
fi
- AC_SUBST([TEST_SSH_ECC])
else
AC_CHECK_LIB([crypt], [crypt], [LIBS="$LIBS -lcrypt"])
AC_CHECK_FUNCS([crypt])
diff --git a/regress/Makefile b/regress/Makefile
index 0b5ad45d..d5481e44 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -188,13 +188,13 @@ t8: $(OBJ)/t8.out
${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t8.out > /dev/null
$(OBJ)/t9.out:
- test "${TEST_SSH_ECC}" != yes || \
+ ! ${TEST_SSH_SSH} -Q key-plain | grep ecdsa >/dev/null || \
${TEST_SSH_SSHKEYGEN} -q -t ecdsa -N '' -f $@
t9: $(OBJ)/t9.out
- test "${TEST_SSH_ECC}" != yes || \
+ ! ${TEST_SSH_SSH} -Q key-plain | grep ecdsa >/dev/null || \
${TEST_SSH_SSHKEYGEN} -lf $(OBJ)/t9.out > /dev/null
- test "${TEST_SSH_ECC}" != yes || \
+ ! ${TEST_SSH_SSH} -Q key-plain | grep ecdsa >/dev/null || \
${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t9.out > /dev/null