diff options
| author | Tim Rice <tim@multitalents.net> | 2016-08-01 23:31:52 +0200 |
|---|---|---|
| committer | Tim Rice <tim@multitalents.net> | 2016-08-01 23:31:52 +0200 |
| commit | cf3e0be7f5828a5e5f6c296a607d20be2f07d60c (patch) | |
| tree | 01964a9c47f5e31a9f74c8e0f0868c428e2249b8 /configure.ac | |
| parent | define _OPENBSD_SOURCE for reallocarray on NetBSD (diff) | |
| download | openssh-cf3e0be7f5828a5e5f6c296a607d20be2f07d60c.tar.xz openssh-cf3e0be7f5828a5e5f6c296a607d20be2f07d60c.zip | |
modified: configure.ac opensshd.init.in
Skip generating missing RSA1 key on startup unless ssh1 support is enabled.
Spotted by Jean-Pierre Radley
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 373d21b34..7c1956dc6 100644 --- a/configure.ac +++ b/configure.ac @@ -123,6 +123,7 @@ AC_CHECK_DECL([PR_SET_NO_NEW_PRIVS], [have_linux_no_new_privs=1], , [ openssl=yes ssh1=no +COMMENT_OUT_RSA1="#no ssh1#" AC_ARG_WITH([openssl], [ --without-openssl Disable use of OpenSSL; use only limited internal crypto **EXPERIMENTAL** ], [ if test "x$withval" = "xno" ; then @@ -147,6 +148,7 @@ AC_ARG_WITH([ssh1], AC_MSG_ERROR([Cannot enable SSH protocol 1 with OpenSSL disabled]) fi ssh1=yes + COMMENT_OUT_RSA1="" elif test "x$withval" = "xno" ; then ssh1=no else @@ -158,6 +160,7 @@ AC_MSG_CHECKING([whether SSH protocol 1 support is enabled]) if test "x$ssh1" = "xyes" ; then AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED([WITH_SSH1], [1], [include SSH protocol version 1 support]) + AC_SUBST([COMMENT_OUT_RSA1]) else AC_MSG_RESULT([no]) fi |