1 files changed, 93 insertions, 100 deletions

diff --git a/configure b/configure
index e2f12cdff..7be478a82 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.571 .
+# From configure.ac Revision: 1.583 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.68 for OpenSSH Portable.
 #
@@ -725,7 +725,6 @@ with_osfsia
 with_zlib
 with_zlib_version_check
 with_skey
-with_tcp_wrappers
 with_ldns
 with_libedit
 with_audit
@@ -1418,7 +1417,6 @@ Optional Packages:
   --with-zlib=PATH        Use zlib in PATH
   --without-zlib-version-check Disable zlib version check
   --with-skey[=PATH]      Enable S/Key support (optionally in PATH)
-  --with-tcp-wrappers[=PATH] Enable tcpwrappers support (optionally in PATH)
   --with-ldns[=PATH]      Use ldns for DNSSEC support (optionally in PATH)
   --with-libedit[=PATH]   Enable libedit support for sftp
   --with-audit=module     Enable audit support (modules=debug,bsm,linux)
@@ -9765,84 +9763,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 
-# Check whether user wants TCP wrappers support
-TCPW_MSG="no"
-
-# Check whether --with-tcp-wrappers was given.
-if test "${with_tcp_wrappers+set}" = set; then :
-  withval=$with_tcp_wrappers;
-                if test "x$withval" != "xno" ; then
-                        saved_LIBS="$LIBS"
-                        saved_LDFLAGS="$LDFLAGS"
-                        saved_CPPFLAGS="$CPPFLAGS"
-                        if test -n "${withval}" && \
-                            test "x${withval}" != "xyes"; then
-                                if test -d "${withval}/lib"; then
-                                        if test -n "${need_dash_r}"; then
-                                                LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}"
-                                        else
-                                                LDFLAGS="-L${withval}/lib ${LDFLAGS}"
-                                        fi
-                                else
-                                        if test -n "${need_dash_r}"; then
-                                                LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}"
-                                        else
-                                                LDFLAGS="-L${withval} ${LDFLAGS}"
-                                        fi
-                                fi
-                                if test -d "${withval}/include"; then
-                                        CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
-                                else
-                                        CPPFLAGS="-I${withval} ${CPPFLAGS}"
-                                fi
-                        fi
-                        LIBS="-lwrap $LIBS"
-                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwrap" >&5
-$as_echo_n "checking for libwrap... " >&6; }
-                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <tcpd.h>
-int deny_severity = 0, allow_severity = 0;
-
-int
-main ()
-{
-
-        hosts_access(0);
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-                                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define LIBWRAP 1" >>confdefs.h
-
-                                        SSHDLIBS="$SSHDLIBS -lwrap"
-                                        TCPW_MSG="yes"
-
-else
-
-                                        as_fn_error $? "*** libwrap missing" "$LINENO" 5
-
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-                        LIBS="$saved_LIBS"
-                fi
-
-
-fi
-
-
 # Check whether user wants to use ldns
 LDNS_MSG="no"
 
@@ -10407,10 +10327,6 @@ for ac_func in  \
         Blowfish_expandstate \
         Blowfish_expand0state \
         Blowfish_stream2word \
-        arc4random \
-        arc4random_buf \
-        arc4random_stir \
-        arc4random_uniform \
         asprintf \
         b64_ntop \
         __b64_ntop \
@@ -10454,6 +10370,7 @@ for ac_func in  \
         mblen \
         md5_crypt \
         memmove \
+        memset_s \
         mkdtemp \
         mmap \
         ngetaddrinfo \
@@ -10512,7 +10429,6 @@ for ac_func in  \
         user_from_uid \
         usleep \
         vasprintf \
-        vhangup \
         vsnprintf \
         waitpid \
 
@@ -11328,11 +11244,9 @@ fi
 
 fi
 
-# If we don't have a working asprintf, then we strongly depend on vsnprintf
-# returning the right thing on overflow: the number of characters it tried to
-# create (as per SUSv3)
-if test "x$ac_cv_func_asprintf" != "xyes" && \
-   test "x$ac_cv_func_vsnprintf" = "xyes" ; then
+# We depend on vsnprintf returning the right thing on overflow: the
+# number of characters it tried to create (as per SUSv3)
+if test "x$ac_cv_func_vsnprintf" = "xyes" ; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether vsnprintf returns correct values on overflow" >&5
 $as_echo_n "checking whether vsnprintf returns correct values on overflow... " >&6; }
         if test "$cross_compiling" = yes; then :
@@ -11347,10 +11261,14 @@ else
 #include <stdio.h>
 #include <stdarg.h>
 
-int x_snprintf(char *str,size_t count,const char *fmt,...)
+int x_snprintf(char *str, size_t count, const char *fmt, ...)
 {
-        size_t ret; va_list ap;
-        va_start(ap, fmt); ret = vsnprintf(str, count, fmt, ap); va_end(ap);
+        size_t ret;
+        va_list ap;
+
+        va_start(ap, fmt);
+        ret = vsnprintf(str, count, fmt, ap);
+        va_end(ap);
         return ret;
 }
 
@@ -11358,8 +11276,12 @@ int
 main ()
 {
 
-        char x[1];
-        exit(x_snprintf(x, 1, "%s %d", "hello", 12345) == 11 ? 0 : 1);
+char x[1];
+if (x_snprintf(x, 1, "%s %d", "hello", 12345) != 11)
+        return 1;
+if (x_snprintf(NULL, 0, "%s %d", "hello", 12345) != 11)
+        return 1;
+return 0;
 
   ;
   return 0;
@@ -11956,7 +11878,7 @@ main ()
         if(fd == NULL)
                 exit(1);
 
-        if ((rc = fprintf(fd ,"%x (%s)\n", OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT)) <0)
+        if ((rc = fprintf(fd ,"%08x (%s)\n", OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT)) <0)
                 exit(1);
 
         exit(0);
@@ -12013,7 +11935,8 @@ main ()
         if(fd == NULL)
                 exit(1);
 
-        if ((rc = fprintf(fd ,"%x (%s)\n", SSLeay(), SSLeay_version(SSLEAY_VERSION))) <0)
+        if ((rc = fprintf(fd ,"%08x (%s)\n", SSLeay(),
+            SSLeay_version(SSLEAY_VERSION))) <0)
                 exit(1);
 
         exit(0);
@@ -12025,6 +11948,13 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
 
                 ssl_library_ver=`cat conftest.ssllibver`
+                # Check version is supported.
+                case "$ssl_library_ver" in
+                        0090[0-7]*|009080[0-5]*)
+                                as_fn_error $? "OpenSSL >= 0.9.8f required" "$LINENO" 5
+                                ;;
+                        *) ;;
+                esac
                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ssl_library_ver" >&5
 $as_echo "$ssl_library_ver" >&6; }
 
@@ -12040,6 +11970,18 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 
+# XXX make --without-openssl work
+
+cat >>confdefs.h <<_ACEOF
+#define WITH_OPENSSL 1
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define WITH_SSH1 1
+_ACEOF
+
+
 
 # Check whether --with-openssl-header-check was given.
 if test "${with_openssl_header_check+set}" = set; then :
@@ -12573,6 +12515,25 @@ else
 fi
 done
 
+# Search for RIPE-MD support in OpenSSL
+for ac_func in EVP_ripemd160
+do :
+  ac_fn_c_check_func "$LINENO" "EVP_ripemd160" "ac_cv_func_EVP_ripemd160"
+if test "x$ac_cv_func_EVP_ripemd160" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_EVP_RIPEMD160 1
+_ACEOF
+
+else
+  unsupported_algorithms="$unsupported_algorithms \
+        hmac-ripemd160
+        hmac-ripemd160@openssh.com
+        hmac-ripemd160-etm@openssh.com"
+
+
+fi
+done
+
 
 # Check complete ECC support in OpenSSL
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OpenSSL has NID_X9_62_prime256v1" >&5
@@ -12773,6 +12734,24 @@ fi
 
 
 
+for ac_func in  \
+        arc4random \
+        arc4random_buf \
+        arc4random_stir \
+        arc4random_uniform \
+
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
 saved_LIBS="$LIBS"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ia_openinfo in -liaf" >&5
 $as_echo_n "checking for ia_openinfo in -liaf... " >&6; }
@@ -13182,7 +13161,14 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-SSH_PRIVSEP_USER=sshd
+case "$host" in
+*-*-cygwin*)
+        SSH_PRIVSEP_USER=CYGWIN_SSH_PRIVSEP_USER
+        ;;
+*)
+        SSH_PRIVSEP_USER=sshd
+        ;;
+esac
 
 # Check whether --with-privsep-user was given.
 if test "${with_privsep_user+set}" = set; then :
@@ -13195,11 +13181,19 @@ if test "${with_privsep_user+set}" = set; then :
 
 fi
 
+if test "x$SSH_PRIVSEP_USER" = "xCYGWIN_SSH_PRIVSEP_USER" ; then
+
+cat >>confdefs.h <<_ACEOF
+#define SSH_PRIVSEP_USER CYGWIN_SSH_PRIVSEP_USER
+_ACEOF
+
+else
 
 cat >>confdefs.h <<_ACEOF
 #define SSH_PRIVSEP_USER "$SSH_PRIVSEP_USER"
 _ACEOF
 
+fi
 
 
 if test "x$have_linux_no_new_privs" = "x1" ; then
@@ -19872,7 +19866,6 @@ echo "                 KerberosV support: $KRB5_MSG"
 echo "                   SELinux support: $SELINUX_MSG"
 echo "                 Smartcard support: $SCARD_MSG"
 echo "                     S/KEY support: $SKEY_MSG"
-echo "              TCP Wrappers support: $TCPW_MSG"
 echo "              MD5 password support: $MD5_MSG"
 echo "                   libedit support: $LIBEDIT_MSG"
 echo "  Solaris process contract support: $SPC_MSG"