remove zlib and libssp dependency

Author: arif-pragmasys

.gitignore

@@ -248,4 +248,10 @@ regress/t6.out1
 regress/t8.out.pub
 regress/t9.out.pub
 regress/t6.out1
-regress/t10.out.pub
+regress/t10.out.pub
+regress/t10.out.pub
+regress/t6.out1
+Makefile
+openbsd-compat/Makefile
+openbsd-compat/regress/Makefile
+contrib/win32/win32compat/Makefile

compress.c

@@ -22,7 +22,9 @@
 #include "buffer.h"
 #include "compress.h"
 
+#ifndef WIN32_ZLIB_NO
 #include <zlib.h>
+#endif
 
 z_stream incoming_stream;
 z_stream outgoing_stream;

config.h.tail

@@ -98,5 +98,7 @@
 #define HAVE_DECL_NFDBITS 0
 #define HAVE_DECL_HOWMANY 0
 
+#define WIN32_ZLIB_NO 1
+
 //#define HAVE_ARC4RANDOM_UNIFORM 1
 

configure.ac

@@ -160,42 +160,42 @@ if test "$GCC" = "yes" || test "$GCC" = "egcs"; then
 	# -fstack-protector-all doesn't always work for some GCC versions
 	# and/or platforms, so we test if we can.  If it's not supported
 	# on a given platform gcc will emit a warning so we use -Werror.
-	if test "x$use_stack_protector" = "x1"; then
-	    for t in -fstack-protector-all -fstack-protector; do
-		AC_MSG_CHECKING([if $CC supports $t])
-		saved_CFLAGS="$CFLAGS"
-		saved_LDFLAGS="$LDFLAGS"
-		CFLAGS="$CFLAGS $t -Werror"
-		LDFLAGS="$LDFLAGS $t -Werror"
-		AC_LINK_IFELSE(
-			[AC_LANG_PROGRAM([[ #include <stdio.h> ]],
-			[[
-	char x[256];
-	snprintf(x, sizeof(x), "XXX");
-			 ]])],
-		    [ AC_MSG_RESULT([yes])
-		      CFLAGS="$saved_CFLAGS $t"
-		      LDFLAGS="$saved_LDFLAGS $t"
-		      AC_MSG_CHECKING([if $t works])
-		      AC_RUN_IFELSE(
-			[AC_LANG_PROGRAM([[ #include <stdio.h> ]],
-			[[
-	char x[256];
-	snprintf(x, sizeof(x), "XXX");
-			]])],
-			[ AC_MSG_RESULT([yes])
-			  break ],
-			[ AC_MSG_RESULT([no]) ],
-			[ AC_MSG_WARN([cross compiling: cannot test])
-			  break ]
-		      )
-		    ],
-		    [ AC_MSG_RESULT([no]) ]
-		)
-		CFLAGS="$saved_CFLAGS"
-		LDFLAGS="$saved_LDFLAGS"
-	    done
-	fi
+#	if test "x$use_stack_protector" = "x1"; then
+#	    for t in -fstack-protector-all -fstack-protector; do
+#		AC_MSG_CHECKING([if $CC supports $t])
+#		saved_CFLAGS="$CFLAGS"
+#		saved_LDFLAGS="$LDFLAGS"
+#		CFLAGS="$CFLAGS $t -Werror"
+#		LDFLAGS="$LDFLAGS $t -Werror"
+#		AC_LINK_IFELSE(
+#			[AC_LANG_PROGRAM([[ #include <stdio.h> ]],
+#			[[
+#	char x[256];
+#	snprintf(x, sizeof(x), "XXX");
+#			 ]])],
+#		    [ AC_MSG_RESULT([yes])
+#		      CFLAGS="$saved_CFLAGS $t"
+#		      LDFLAGS="$saved_LDFLAGS $t"
+#		      AC_MSG_CHECKING([if $t works])
+#		      AC_RUN_IFELSE(
+#			[AC_LANG_PROGRAM([[ #include <stdio.h> ]],
+#			[[
+#	char x[256];
+#	snprintf(x, sizeof(x), "XXX");
+#			]])],
+#			[ AC_MSG_RESULT([yes])
+#			  break ],
+#			[ AC_MSG_RESULT([no]) ],
+#			[ AC_MSG_WARN([cross compiling: cannot test])
+#			  break ]
+#		      )
+#		    ],
+#		    [ AC_MSG_RESULT([no]) ]
+#		)
+#		CFLAGS="$saved_CFLAGS"
+#		LDFLAGS="$saved_LDFLAGS"
+#	    done
+#	fi
 
 	if test -z "$have_llong_max"; then
 		# retry LLONG_MAX with -std=gnu99, needed on some Linuxes

monitor.c

@@ -88,8 +88,10 @@
 #include "zlib.h"
 #define TARGET_OS_MAC 1
 #else
+#ifndef WIN32_ZLIB_NO
 #include "zlib.h"
 #endif
+#endif
 #include "packet.h"
 #include "auth-options.h"
 #include "sshpty.h"
@@ -1886,11 +1888,13 @@ monitor_apply_keystate(struct monitor *pmonitor)
 	}
 
 	/* Update with new address */
+#ifndef WIN32_ZLIB_NO
 	if (options.compression) {
 		ssh_packet_set_compress_hooks(ssh, pmonitor->m_zlib,
 		    (ssh_packet_comp_alloc_func *)mm_zalloc,
 		    (ssh_packet_comp_free_func *)mm_zfree);
 	}
+#endif
 }
 
 /* This function requries careful sanity checking */

monitor_wrap.c

@@ -74,8 +74,10 @@
 #include "zlib.h"
 #define TARGET_OS_MAC 1
 #else
+#ifndef WIN32_ZLIB_NO
 #include "zlib.h"
 #endif
+#endif
 #include "monitor.h"
 #ifdef GSSAPI
 #include "ssh-gss.h"
@@ -95,8 +97,10 @@
 
 /* Imports */
 extern int compat20;
+#ifndef WIN32_ZLIB_NO
 extern z_stream incoming_stream;
 extern z_stream outgoing_stream;
+#endif
 extern struct monitor *pmonitor;
 extern Buffer loginmsg;
 extern ServerOptions options;