upstream commit

Compile-time disable SSH protocol 1. You can turn it
 back on using the Makefile.inc knob if you need it to talk to ancient
 devices.
This commit is contained in:
djm@openbsd.org 2015-03-24 01:29:19 +00:00 committed by Damien Miller
parent 53097b2022
commit 2aa9da1a3b

View File

@ -122,7 +122,7 @@ AC_CHECK_DECL([PR_SET_NO_NEW_PRIVS], [have_linux_no_new_privs=1], , [
]) ])
openssl=yes openssl=yes
ssh1=yes ssh1=no
AC_ARG_WITH([openssl], AC_ARG_WITH([openssl],
[ --without-openssl Disable use of OpenSSL; use only limited internal crypto **EXPERIMENTAL** ], [ --without-openssl Disable use of OpenSSL; use only limited internal crypto **EXPERIMENTAL** ],
[ if test "x$withval" = "xno" ; then [ if test "x$withval" = "xno" ; then
@ -140,12 +140,13 @@ else
fi fi
AC_ARG_WITH([ssh1], AC_ARG_WITH([ssh1],
[ --without-ssh1 Disable support for SSH protocol 1], [ --with-ssh1 Enable support for SSH protocol 1],
[ [
if test "x$withval" = "xno" ; then if test "x$withval" = "xyes" ; then
ssh1=no if test "x$openssl" = "xno" ; then
elif test "x$openssl" = "xno" ; then AC_MSG_ERROR([Cannot enable SSH protocol 1 with OpenSSL disabled])
AC_MSG_ERROR([Cannot enable SSH protocol 1 with OpenSSL disabled]) fi
ssh1=yes
fi fi
] ]
) )