Commit 493de5ad authored by Richard Levitte's avatar Richard Levitte
Browse files

Changes from 0.9.6-stable.

parent b76b87fd

crypto/bio/bss_bio.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

crypto/md2/Makefile.ssl

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# SSLeay/crypto/md/Makefile

#



DIR=	md

DIR=	md2

TOP=	../..

CC=	cc

INCLUDES=

crypto/tmdiff.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

doc/crypto/des_modes.pod

+2 −2
Original line number Diff line number Diff line
@@ -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 *

test/Makefile.ssl

+1 −1
Original line number Diff line number Diff line
@@ -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