From 493de5ad2ae4231b23bfa87a2024b3b6967654e6 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Thu, 7 Mar 2002 16:28:34 +0000
Subject: [PATCH] Changes from 0.9.6-stable.

---
 crypto/bio/bss_bio.c     | 2 +-
 crypto/md2/Makefile.ssl  | 2 +-
 crypto/tmdiff.c          | 1 +
 doc/crypto/des_modes.pod | 4 ++--
 test/Makefile.ssl        | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c
index 32afea95a6..d836e3bc3b 100644
--- a/crypto/bio/bss_bio.c
+++ b/crypto/bio/bss_bio.c
@@ -29,7 +29,7 @@
 # undef SSIZE_MAX
 # define SSIZE_MAX INT_MAX
 #elif !defined(SSIZE_MAX)
-# define SSIZE_MAX _INT_MAX
+# define SSIZE_MAX INT_MAX
 #endif
 
 static int bio_new(BIO *bio);
diff --git a/crypto/md2/Makefile.ssl b/crypto/md2/Makefile.ssl
index 8b382c35ff..cda8385347 100644
--- a/crypto/md2/Makefile.ssl
+++ b/crypto/md2/Makefile.ssl
@@ -2,7 +2,7 @@
 # SSLeay/crypto/md/Makefile
 #
 
-DIR=	md
+DIR=	md2
 TOP=	../..
 CC=	cc
 INCLUDES=
diff --git a/crypto/tmdiff.c b/crypto/tmdiff.c
index a10251a2ae..830092210f 100644
--- a/crypto/tmdiff.c
+++ b/crypto/tmdiff.c
@@ -234,6 +234,7 @@ int ms_time_cmp(char *ap, char *bp)
 	d=	 (double)(b->ms_timeb.time-a->ms_timeb.time)+
 		(((double)b->ms_timeb.millitm)-(double)a->ms_timeb.millitm)/1000.0;
 #  endif
+# endif
 #endif
 	if (d == 0.0)
 		ret=0;
diff --git a/doc/crypto/des_modes.pod b/doc/crypto/des_modes.pod
index 36b77c454d..da75e8007d 100644
--- a/doc/crypto/des_modes.pod
+++ b/doc/crypto/des_modes.pod
@@ -204,8 +204,8 @@ just one key.
 =item *
 
 If the first and last key are the same, the key length is 112 bits.
-There are attacks that could reduce the key space to 55 bit's but it
-requires 2^56 blocks of memory.
+There are attacks that could reduce the effective key strength
+to only slightly more than 56 bits, but these require a lot of memory.
 
 =item *
 
diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index 309e2a882e..24a06e4c67 100644
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -82,7 +82,7 @@ HEADER=	$(EXHEADER)
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
 top:
-	(cd ..; $(MAKE) DIRS=$(DIR) all)
+	(cd ..; $(MAKE) DIRS=$(DIR) TESTS=$(TESTS) all)
 
 all:	exe
 
-- 
2.40.0