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

Merge from 1.0.0-stable branch.

parent 8711efb4

Configure

+7 −1
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ my %table=( 


my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A

		    VC-NT VC-CE VC-WIN32

		    BC-32 OS2-EMX

		    BC-32 

		    netware-clib netware-clib-bsdsock

		    netware-libc netware-libc-bsdsock);
@@ -918,6 +918,11 @@ if (defined($disabled{"tls1"})) 
	$disabled{"tlsext"} = "forced";

	}



if (defined($disabled{"ec"}))

	{

	$disabled{"gost"} = "forced";

	}



if ($target eq "TABLE") {

	foreach $target (sort keys %table) {

		print_table_entry($target);
@@ -1432,6 +1437,7 @@ while (<IN>) 
		}

	$sdirs = 0 unless /\\$/;

        s/engines // if (/^DIRS=/ && $disabled{"engine"});

	s/ccgost// if (/^ENGDIRS=/ && $disabled{"gost"});

	s/^VERSION=.*/VERSION=$version/;

	s/^MAJOR=.*/MAJOR=$major/;

	s/^MINOR=.*/MINOR=$minor/;

Makefile.org

+2 −1
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ ZLIB_INCLUDE= 
LIBZLIB=



DIRS=   crypto ssl engines apps test tools

ENGDIRS= ccgost

SHLIBDIRS= crypto ssl



# dirs in crypto to build
@@ -179,7 +180,7 @@ BUILDENV= PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \ 
		AS='$(CC)' ASFLAG='$(CFLAG) -c'			\

		AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'	\

		CROSS_COMPILE_PREFIX='$(CROSS_COMPILE_PREFIX)'	\

		PERL='$(PERL)'					\

		PERL='$(PERL)' ENGDIRS='$(ENGDIRS)'		\

		SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/lib'	\

		INSTALL_PREFIX='$(INSTALL_PREFIX)'		\

		INSTALLTOP='$(INSTALLTOP)' OPENSSLDIR='$(OPENSSLDIR)'	\

NEWS

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
      o RFC3280 path validation: sufficient to process PKITS tests.

      o Integrated support for PVK files and keyblobs.

      o Change default private key format to PKCS#8.

      o CMS support: able to process all examples in RFCXXXX

      o CMS support: able to process all examples in RFC4134

      o Streaming ASN1 encode support for PKCS#7 and CMS.

      o Multiple signer and signer add support for PKCS#7 and CMS.

      o ASN1 printing support.

TABLE

+1 −1
Original line number Diff line number Diff line
@@ -3691,7 +3691,7 @@ $multilib = 64 


*** mingw

$cc           = gcc

$cflags       = -mno-cygwin -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall

$cflags       = -mno-cygwin -DL_ENDIAN -DOPENSSL_NO_CAPIENG -fomit-frame-pointer -O3 -march=i486 -Wall

$unistd       = 

$thread_cflag = 

$sys_id       = MINGW32

apps/ec.c

+6 −0
Original line number Diff line number Diff line
@@ -400,4 +400,10 @@ end: 
	apps_shutdown();

	OPENSSL_EXIT(ret);

}

#else /* !OPENSSL_NO_EC */



# if PEDANTIC

static void *dummy=&dummy;

# endif



#endif