Commit cc7399e7 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Changes from 1.0.0-stable.

parent 14b3f100

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -772,6 +772,9 @@ 


 Changes between 0.9.8k and 0.9.8l  [xx XXX xxxx]



  *) Handle non-blocking I/O properly in SSL_shutdown() call.

     [Darryl Miles <darryl-mailinglists@netbauds.net>]



  *) Add 2.5.4.* OIDs

     [Ilya O. <vrghost@gmail.com>]

Configure

+8 −1
Original line number Diff line number Diff line
@@ -1217,9 +1217,16 @@ if ($zlib) 
	{

	$cflags = "-DZLIB $cflags";

	if (defined($disabled{"zlib-dynamic"}))

		{

		if (defined($withargs{"zlib-lib"}))

			{

			$lflags = "$lflags -L" . $withargs{"zlib-lib"} . " -lz";

			}

		else

			{

			$lflags = "$lflags -lz";

			}

		}

	else

		{

		$cflags = "-DZLIB_SHARED $cflags";

Makefile.org

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ BUILDENV= PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \ 
		MAKEDEPPROG='$(MAKEDEPPROG)'			\

		SHARED_LDFLAGS='$(SHARED_LDFLAGS)'		\

		KRB5_INCLUDES='$(KRB5_INCLUDES)' LIBKRB5='$(LIBKRB5)'	\

		ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)'	\

		EXE_EXT='$(EXE_EXT)' SHARED_LIBS='$(SHARED_LIBS)'	\

		SHLIB_EXT='$(SHLIB_EXT)' SHLIB_TARGET='$(SHLIB_TARGET)'	\

		PEX_LIBS='$(PEX_LIBS)' EX_LIBS='$(EX_LIBS)'	\

crypto/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ 
DIR=		crypto

TOP=		..

CC=		cc

INCLUDE=	-I. -I$(TOP) -I../include

INCLUDE=	-I. -I$(TOP) -I../include $(ZLIB_INCLUDE)

# INCLUDES targets sudbirs!

INCLUDES=	-I.. -I../.. -I../asn1 -I../evp -I../../include

INCLUDES=	-I.. -I../.. -I../asn1 -I../evp -I../../include $(ZLIB_INCLUDE)

CFLAG=		-g

MAKEDEPPROG=	makedepend

MAKEDEPEND=	$(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)

crypto/objects/objxref.pl

+5 −2
Original line number Diff line number Diff line
@@ -55,9 +55,12 @@ my @srt2 = sort 
	return $ap2 - $bp2;

	} @xrkeys;



my $pname = $0;



$pname =~ s|^.[^/]/||;



print <<EOF;

/* AUTOGENERATED BY $0, DO NOT EDIT */

/* AUTOGENERATED BY $pname, DO NOT EDIT */



typedef struct

	{