Changes from 0.9.6-stable.

diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c
index 32afea95a61402895499ebd7159f02ea69a9adce..d836e3bc3b61894f96acab08c06648ef3a384eeb 100644 (file)
--- 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 8b382c35ff4417cc4c086ec64b3f479330e7dc1a..cda8385347eb24889234f5c29d792057646e5f92 100644 (file)
--- 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 a10251a2ae144595d6ce8b1fd5a9756fa8b8488b..830092210f420b3f707de71f312c9b7b127f521e 100644 (file)
--- 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 36b77c454d302b35343ca06ee3c8bded4a021414..da75e8007d454d1956a1c0153b1dc1cf691f9f88 100644 (file)
--- 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 309e2a882e91ffec68d477dcdc9765a13ee3bd08..24a06e4c67663b400d17ddc9da18c2208ea1065f 100644 (file)
--- 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