Index: Makefile
===================================================================
RCS file: /home/ncvs/PortForwarder/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile	2001/05/29 02:50:52	1.1.1.1
+++ Makefile	2001/05/29 03:40:44	1.2
@@ -1,5 +1,6 @@
 OSSL_D	= openssl-0.9.5a
 OSSH_D	= openssh-1.2.3
+ZLIB_D	= zlib-1.1.3
 
 !if "$(TYPE)" == "HPCPRO-MIPS"
 SSL_MAKE	= ms\hpcpro-mips.mak
@@ -49,7 +50,7 @@
 	@echo Congratulations!!
 	@echo $(TARGET) was successfully created.
 
-$(TARGET): ssl ssh
+$(TARGET): zlib ssl ssh
 
 ssl: $(OSSL_D)\$(SSL_MAKE)
 	cd $(OSSL_D)
@@ -61,13 +62,19 @@
 	nmake -f PF.mak $(SSH_MAKE_FLAG)
 	cd ..
 
+zlib:
+	cd $(ZLIB_D)
+	copy nt\zlib.dnt
+	nmake -f nt\Makefile.nt
+	cd ..
+
 $(OSSL_D)\$(SSL_MAKE):
 	cd $(OSSL_D)
 	perl Configure VC-WIN32
 	ms\do_ms.bat
 	cd ..
 
-clean: clean_ssh clean_ssl
+clean: clean_ssh clean_ssl clean_zlib
 
 clean_ssl:
 	cd $(OSSL_D)
@@ -77,6 +84,12 @@
 clean_ssh:
 	cd $(OSSH_D)
 	nmake -f PF.mak $(SSH_MAKE_FLAG) clean
+	cd ..
+
+clean_zlib:
+	cd $(ZLIB_D)
+	-del zlib.dnt
+	nmake -f nt\Makefile.nt clean
 	cd ..
 
 clean_all: clean_all_ssl clean_all_ssh
Index: openssh-1.2.3/PF.mak
===================================================================
RCS file: /home/ncvs/PortForwarder/openssh-1.2.3/PF.mak,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- openssh-1.2.3/PF.mak	2001/05/29 02:50:54	1.1.1.1
+++ openssh-1.2.3/PF.mak	2001/05/29 03:40:44	1.2
@@ -4,6 +4,7 @@
 SRC_D	= .
 PFSRC_D	= ..
 SSL_D	= ..\openssl-0.9.5a
+ZLIB_D	= ..\zlib-1.1.3
 DMY_INCD	= ..\dummy_include
 
 !if "$(TYPE)" == "HPCPRO-MIPS"
@@ -52,10 +53,11 @@
 INC2_D	= $(DMY_INCD)
 
 SSL_LIB	= $(SSL_D)\$(SOUT_D)\ssleay32.lib $(SSL_D)\$(SOUT_D)\libeay32.lib
+ZLIB_LIB	= $(ZLIB_D)\zlib.lib
 TARGET	= PortForwarder.exe
 TARGET2	= PF-keygen.exe
 
-INC	= /I$(INC1_D) /I$(INC2_D) /I$(PFSRC_D) /I$(SRC_D)
+INC	= /I$(INC1_D) /I$(INC2_D) /I$(PFSRC_D) /I$(SRC_D) /I$(ZLIB_D)
 
 ###############################################################################
 !if "$(DEBUG)" == ""
@@ -164,7 +166,7 @@
 LFLAG	=  /nologo /entry:"WinMainCRTStartup" /subsystem:$(CESubsystem) /MACHINE:ARM winsock.lib aygshell.lib $(SSL_LIB)
 !else
 LINK	= link.exe
-LFLAG	= wsock32.lib user32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib $(SSL_LIB) /nologo /machine:i386 /subsystem:windows
+LFLAG	= wsock32.lib user32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib $(SSL_LIB) $(ZLIB_LIB) /nologo /machine:i386 /subsystem:windows
 !endif
 
 ###############################################################################
@@ -186,7 +188,8 @@
 	$(TMP_D)\hostfile.obj $(TMP_D)\nchan.obj $(TMP_D)\clientloop.obj \
 	$(TMP_D)\canohost.obj $(TMP_D)\LoadSaveInfo.obj $(TMP_D)\FindFile.obj \
 	$(TMP_D)\bsd-strlcpy.obj $(TMP_D)\fake-getaddrinfo.obj \
-	$(TMP_D)\fake-getnameinfo.obj $(TMP_D)\bsd-misc.obj $(TMP_D)\random.obj
+	$(TMP_D)\fake-getnameinfo.obj $(TMP_D)\bsd-misc.obj $(TMP_D)\random.obj \
+	$(TMP_D)\compress.obj
 
 MAIN_OBJS	= $(TMP_D)\pfmain.obj $(TMP_D)\resource.res
 
@@ -218,10 +221,10 @@
 	$(RM) $(OUT_D)\*.*
 	$(RMDIR) $(OUT_D)
 
-$(OUT_D)\$(TARGET): $(MAIN_OBJS) $(OBJS) $(SSL_LIB)
+$(OUT_D)\$(TARGET): $(MAIN_OBJS) $(OBJS) $(SSL_LIB) $(ZLIB_LIB)
 	$(LINK) $(LFLAG) /out:"$(OUT_D)\$(TARGET)" $(OBJS) $(MAIN_OBJS)
 
-$(OUT_D)\$(TARGET2): $(OBJS) $(OBJS2) $(SSL_LIB)
+$(OUT_D)\$(TARGET2): $(OBJS) $(OBJS2) $(SSL_LIB) $(ZLIB_LIB)
 	$(LINK) $(LFLAG) /out:"$(OUT_D)\$(TARGET2)" $(OBJS) $(OBJS2)
 
 $(TMP_D)\resource.res: $(PFSRC_D)\resource.rc
@@ -292,6 +295,8 @@
 	$(CC) /Fo$@ $(CFLAG) $(SRC_D)\bsd-misc.c
 $(TMP_D)\random.obj: $(SRC_D)\random.c
 	$(CC) /Fo$@ $(CFLAG) $(SRC_D)\random.c
+$(TMP_D)\compress.obj: $(SRC_D)\compress.c
+	$(CC) /Fo$@ $(CFLAG) $(SRC_D)\compress.c
 $(TMP_D)\malloc_dummy.obj: $(PFSRC_D)\malloc_dummy.c
 	$(CC) /Fo$@ $(CFLAG) $(PFSRC_D)\malloc_dummy.c
 
Index: openssh-1.2.3/packet.c
===================================================================
RCS file: /home/ncvs/PortForwarder/openssh-1.2.3/packet.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- openssh-1.2.3/packet.c	2001/05/29 02:50:54	1.1.1.1
+++ openssh-1.2.3/packet.c	2001/05/29 03:40:44	1.2
@@ -212,12 +212,12 @@
 	buffer_free(&output);
 	buffer_free(&outgoing_packet);
 	buffer_free(&incoming_packet);
-#ifndef _TOH_
+#ifndef _NOCOMP_
 	if (packet_compression) {
 		buffer_free(&compression_buffer);
 		buffer_compress_uninit();
 	}
-#endif /* _TOH_ */
+#endif /* _NOCOMP_ */
 }
 
 /* Sets remote side protocol flags. */
@@ -242,7 +242,9 @@
  * Starts packet compression from the next packet on in both directions.
  * Level is compression level 1 (fastest) - 9 (slow, best) as in gzip.
  */
+#endif /* _TOH_ */
 
+#ifndef _NOCOMP_
 void
 packet_start_compression(int level)
 {
@@ -252,7 +254,7 @@
 	buffer_init(&compression_buffer);
 	buffer_compress_init(level);
 }
-#endif /* _TOH_ */
+#endif /* _NOCOMP_ */
 
 /*
  * Encrypts the given number of bytes, copying from src to dest. bytes is
@@ -374,7 +376,7 @@
 	unsigned int checksum;
 	u_int32_t rand = 0;
 
-#ifndef _TOH_
+#ifndef _NOCOMP_
 	/*
 	 * If using packet compression, compress the payload of the outgoing
 	 * packet.
@@ -390,7 +392,7 @@
 		buffer_append(&outgoing_packet, buffer_ptr(&compression_buffer),
 			      buffer_len(&compression_buffer));
 	}
-#endif /* _TOH_ */
+#endif /* _NOCOMP_ */
 	/* Compute packet length without padding (add checksum, remove padding). */
 	len = buffer_len(&outgoing_packet) + 4 - 8;
 
@@ -591,7 +593,7 @@
 		packet_disconnect("Corrupted check bytes on input.");
 	buffer_consume_end(&incoming_packet, 4);
 
-#ifndef _TOH_
+#ifndef _NOCOMP_
 	/* If using packet compression, decompress the packet. */
 	if (packet_compression) {
 		buffer_clear(&compression_buffer);
@@ -600,7 +602,7 @@
 		buffer_append(&incoming_packet, buffer_ptr(&compression_buffer),
 			      buffer_len(&compression_buffer));
 	}
-#endif /* _TOH_ */
+#endif /* _NOCOMP_ */
 	/* Get packet type. */
 	buffer_get(&incoming_packet, &buf[0], 1);
 
Index: openssh-1.2.3/ssh.c
===================================================================
RCS file: /home/ncvs/PortForwarder/openssh-1.2.3/ssh.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- openssh-1.2.3/ssh.c	2001/05/29 02:50:55	1.1.1.1
+++ openssh-1.2.3/ssh.c	2001/05/29 03:40:43	1.2
@@ -707,7 +707,7 @@
 	/* Close connection cleanly after attack. */
 	cipher_attack_detected = packet_disconnect;
 
-#ifndef _TOH_
+#ifndef _NOCOMP_
 	/* Enable compression if requested. */
 	if (options.compression) {
 		debug("Requesting compression at level %d.", options.compression_level);
@@ -728,7 +728,7 @@
 		else
 			packet_disconnect("Protocol error waiting for compression response.");
 	}
-#endif /* _TOH_ */
+#endif /* _NOCOMP_ */
 #ifndef _TOH_
 	/* Allocate a pseudo tty if appropriate. */
 	if (tty_flag) {