[openssh-commits] [openssh] 03/03: make compile-time SSH protocol 1 default to off

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch V_6_8
in repository openssh.

commit f8411373b63374465c58c059c316b86f00893109
Author: Damien Miller <djm at mindrot.org>
Date:   Tue Mar 24 20:20:56 2015 +1100

    make compile-time SSH protocol 1 default to off
    
    SSH protocol 1 may be re-enabled using ./configure --with-ssh1
---
 configure.ac | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index b4d6598..5c9e0f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,7 +122,7 @@ AC_CHECK_DECL([PR_SET_NO_NEW_PRIVS], [have_linux_no_new_privs=1], , [
 ])
 
 openssl=yes
-ssh1=yes
+ssh1=no
 AC_ARG_WITH([openssl],
 	[  --without-openssl       Disable use of OpenSSL; use only limited internal crypto **EXPERIMENTAL** ],
 	[  if test "x$withval" = "xno" ; then
@@ -140,12 +140,13 @@ else
 fi
 
 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
-			ssh1=no
-		elif test "x$openssl" = "xno" ; then
-			AC_MSG_ERROR([Cannot enable SSH protocol 1 with OpenSSL disabled])
+		if test "x$withval" = "xyes" ; then
+			if test "x$openssl" = "xno" ; then
+				AC_MSG_ERROR([Cannot enable SSH protocol 1 with OpenSSL disabled])
+			fi
+			ssh1=yes
 		fi
 	]
 )

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.