RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove TEST_SSH_ECC. 

Convert the only remaining user of it to runtime detection using ssh -Q.
This commit is contained in:
Darren Tucker 2021-09-29 18:33:38 +10:00
parent 5e6d28b787
commit c9172193ea
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -748,7 +748,6 @@ interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS)
TEST_SSH_CONCH="conch" \ TEST_SSH_CONCH="conch" \
TEST_SSH_IPV6="@TEST_SSH_IPV6@" \ TEST_SSH_IPV6="@TEST_SSH_IPV6@" \
TEST_SSH_UTF8="@TEST_SSH_UTF8@" \ TEST_SSH_UTF8="@TEST_SSH_UTF8@" \
TEST_SSH_ECC="@TEST_SSH_ECC@" \
TEST_SHELL="$(TEST_SHELL)" \ TEST_SHELL="$(TEST_SHELL)" \
EXEEXT="$(EXEEXT)" \ EXEEXT="$(EXEEXT)" \
$@ && echo all $@ passed $@ && echo all $@ passed

6
configure.ac
View File

@ -3105,8 +3105,6 @@ if test "x$openssl" = "xyes" ; then
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
) )
TEST_SSH_ECC=no
if test x$enable_nistp256 = x1 || test x$enable_nistp384 = x1 || \ if test x$enable_nistp256 = x1 || test x$enable_nistp384 = x1 || \
test x$enable_nistp521 = x1; then test x$enable_nistp521 = x1; then
AC_DEFINE(OPENSSL_HAS_ECC, [1], [OpenSSL has ECC]) 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 if test x$enable_nistp256 = x1; then
AC_DEFINE([OPENSSL_HAS_NISTP256], [1], AC_DEFINE([OPENSSL_HAS_NISTP256], [1],
[libcrypto has NID_X9_62_prime256v1]) [libcrypto has NID_X9_62_prime256v1])
TEST_SSH_ECC=yes
else else
unsupported_algorithms="$unsupported_algorithms \ unsupported_algorithms="$unsupported_algorithms \
ecdsa-sha2-nistp256 \ ecdsa-sha2-nistp256 \
@ -3127,7 +3124,6 @@ if test "x$openssl" = "xyes" ; then
fi fi
if test x$enable_nistp384 = x1; then if test x$enable_nistp384 = x1; then
AC_DEFINE([OPENSSL_HAS_NISTP384], [1], [libcrypto has NID_secp384r1]) AC_DEFINE([OPENSSL_HAS_NISTP384], [1], [libcrypto has NID_secp384r1])
TEST_SSH_ECC=yes
else else
unsupported_algorithms="$unsupported_algorithms \ unsupported_algorithms="$unsupported_algorithms \
ecdsa-sha2-nistp384 \ ecdsa-sha2-nistp384 \
@ -3136,7 +3132,6 @@ if test "x$openssl" = "xyes" ; then
fi fi
if test x$enable_nistp521 = x1; then if test x$enable_nistp521 = x1; then
AC_DEFINE([OPENSSL_HAS_NISTP521], [1], [libcrypto has NID_secp521r1]) AC_DEFINE([OPENSSL_HAS_NISTP521], [1], [libcrypto has NID_secp521r1])
TEST_SSH_ECC=yes
else else
unsupported_algorithms="$unsupported_algorithms \ unsupported_algorithms="$unsupported_algorithms \
ecdh-sha2-nistp521 \ ecdh-sha2-nistp521 \
@ -3144,7 +3139,6 @@ if test "x$openssl" = "xyes" ; then
ecdsa-sha2-nistp521-cert-v01@openssh.com" ecdsa-sha2-nistp521-cert-v01@openssh.com"
fi fi
AC_SUBST([TEST_SSH_ECC])
else else
AC_CHECK_LIB([crypt], [crypt], [LIBS="$LIBS -lcrypt"]) AC_CHECK_LIB([crypt], [crypt], [LIBS="$LIBS -lcrypt"])
AC_CHECK_FUNCS([crypt]) AC_CHECK_FUNCS([crypt])

6
regress/Makefile
View File

@ -188,13 +188,13 @@ t8: $(OBJ)/t8.out
${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t8.out > /dev/null ${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t8.out > /dev/null
$(OBJ)/t9.out: $(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 $@ ${TEST_SSH_SSHKEYGEN} -q -t ecdsa -N '' -f $@
t9: $(OBJ)/t9.out 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_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 ${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t9.out > /dev/null