Commit 362771f8 authored by Richard Levitte's avatar Richard Levitte
Browse files

Merge in the latest changes from 0.9.6-stable.

parent 88e89f90

Configure

+96 −7
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ use strict; 


# see INSTALL for instructions.



my $usage="Usage: Configure [no-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [rsaref] [no-threads] [no-asm] [no-dso] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] os/compiler[:flags]\n";

my $usage="Usage: Configure [no-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [rsaref] [no-threads] [no-asm] [no-dso] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--test-sanity] os/compiler[:flags]\n";



# Options:

#
@@ -28,6 +28,10 @@ my $usage="Usage: Configure [no-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [- 
#               are always compiled but return NULL if the hardware

#               support isn't compiled.

# no-hw         do not compile support for any crypto hardware.

#

# --test-sanity Make a number of sanity checks on the data in this file.

#               This is a debugging tool for OpenSSL developers.

#

# rsaref        use RSAref

# [no-]threads  [don't] try to create a library that is suitable for

#               multithreaded applications (default is "threads" if we
@@ -341,7 +345,7 @@ my %table=( 
# The intel boxes :-), It would be worth seeing if bsdi-gcc can use the

# bn86-elf.o file file since it is hand tweaked assembler.

"linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",

"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",

"linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",

"linux-mipsel",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::",
@@ -434,9 +438,11 @@ my %table=( 


# SCO 5 - Ben Laurie <ben@algroup.co.uk> says the -O breaks the

# SCO cc.

"sco5-cc",  "cc:::(unknown):-lsocket:${x86_gcc_des} ${x86_gcc_opts}:::", # des options?

"sco5-cc",  "cc:-belf::(unknown):-lsocket -lresolv:${x86_gcc_des} ${x86_gcc_opts}:::", # des options?

"sco5-cc-pentium",  "cc:-Kpentium::(unknown):-lsocket:${x86_gcc_des} ${x86_gcc_opts}:::", # des options?

"sco5-gcc",  "gcc:-O3 -fomit-frame-pointer::(unknown):-lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", # the SCO assembler doesn't seem to like our assembler files ...

"sco5-cc-shared","cc:-belf:::-lsocket -lresolv -lnsl:MD2_CHAR RC4_INDEX ${x86_gcc_des}::::::::::dlfcn:svr3-shared:-Kpic",

"sco5-gcc-shared","gcc:-O3 -DFILIO_H -fomit-frame-pointer:::-lsocket -lresolv -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:svr3-shared:-fPIC",



# Sinix/ReliantUNIX RM400

# NOTE: The CDS++ Compiler up to V2.0Bsomething has the IRIX_CC_BUG optimizer problem. Better use -g  */
@@ -498,6 +504,29 @@ my %table=( 
my @WinTargets=qw(VC-NT VC-WIN32 VC-WIN16 VC-W31-16 VC-W31-32 VC-MSDOS BC-32

	BC-16 Mingw32);



my $idx = 0;

my $idx_cc = $idx++;

my $idx_cflags = $idx++;

my $idx_unistd = $idx++;

my $idx_thread_cflag = $idx++;

my $idx_lflags = $idx++;

my $idx_bn_ops = $idx++;

my $idx_bn_obj = $idx++;

my $idx_des_obj = $idx++;

my $idx_bf_obj = $idx++;

my $idx_md5_obj = $idx++;

my $idx_sha1_obj = $idx++;

my $idx_cast_obj = $idx++;

my $idx_rc4_obj = $idx++;

my $idx_rmd160_obj = $idx++;

my $idx_rc5_obj = $idx++;

my $idx_dso_scheme = $idx++;

my $idx_shared_target = $idx++;

my $idx_shared_cflag = $idx++;

my $idx_shared_ldflag = $idx++;

my $idx_shared_extension = $idx++;

my $idx_ranlib = $idx++;



my $prefix="";

my $openssldir="";

my $exe_ext="";
@@ -570,7 +599,11 @@ PROCESS_ARGS: 
	foreach (@argvcopy)

		{

		s /^-no-/no-/; # some people just can't read the instructions

		if (/^no-asm$/)

		if (/^--test-sanity$/)

			{

			exit(&test_sanity());

			}

		elsif (/^no-asm$/)

		 	{

			$no_asm=1;

			$flags .= "-DNO_ASM ";
@@ -730,9 +763,29 @@ $openssldir=$prefix . "/" . $openssldir if $openssldir !~ /^\//; 


print "IsWindows=$IsWindows\n";



(my $cc,my $cflags,my $unistd,my $thread_cflag,my $lflags,my $bn_ops,my $bn_obj,my $des_obj,my $bf_obj,

 $md5_obj,$sha1_obj,my $cast_obj,my $rc4_obj,$rmd160_obj,my $rc5_obj,my $dso_scheme,my $shared_target,my $shared_cflag,my $shared_ldflag,my $shared_extension,my $ranlib)=

	split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);

my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);

my $cc = $fields[$idx_cc];

my $cflags = $fields[$idx_cflags];

my $unistd = $fields[$idx_unistd];

my $thread_cflag = $fields[$idx_thread_cflag];

my $lflags = $fields[$idx_lflags];

my $bn_ops = $fields[$idx_bn_ops];

my $bn_obj = $fields[$idx_bn_obj];

my $des_obj = $fields[$idx_des_obj];

my $bf_obj = $fields[$idx_bf_obj];

my $md5_obj = $fields[$idx_md5_obj];

my $sha1_obj = $fields[$idx_sha1_obj];

my $cast_obj = $fields[$idx_cast_obj];

my $rc4_obj = $fields[$idx_rc4_obj];

my $rmd160_obj = $fields[$idx_rmd160_obj];

my $rc5_obj = $fields[$idx_rc5_obj];

my $dso_scheme = $fields[$idx_dso_scheme];

my $shared_target = $fields[$idx_shared_target];

my $shared_cflag = $fields[$idx_shared_cflag];

my $shared_ldflag = $fields[$idx_shared_ldflag];

my $shared_extension = $fields[$idx_shared_extension];

my $ranlib = $fields[$idx_ranlib];



$cflags="$flags$cflags" if ($flags ne "");



# The DSO code currently always implements all functions so that no
@@ -1263,3 +1316,39 @@ sub print_table_entry 
\$ranlib       = $ranlib

EOF

	}



sub test_sanity

	{

	my $errorcnt = 0;



	print STDERR "=" x 70, "\n";

	print STDERR "=== SANITY TESTING!\n";

	print STDERR "=== No configuration will be done, all other arguments will be ignored!\n";

	print STDERR "=" x 70, "\n";



	foreach $target (sort keys %table)

		{

		@fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);



		if ($fields[$idx_dso_scheme-1] =~ /^(dl|dlfcn|win32|vms)$/)

			{

			$errorcnt++;

			print STDERR "SANITY ERROR: '$target' has the dso_scheme [$idx_dso_scheme] values\n";

			print STDERR "              in the previous field\n";

			}

		elsif ($fields[$idx_dso_scheme+1] =~ /^(dl|dlfcn|win32|vms)$/)

			{

			$errorcnt++;

			print STDERR "SANITY ERROR: '$target' has the dso_scheme [$idx_dso_scheme] values\n";

			print STDERR "              in the following field\n";

			}

		elsif ($fields[$idx_dso_scheme] !~ /^(dl|dlfcn|win32|vms|)$/)

			{

			$errorcnt++;

			print STDERR "SANITY ERROR: '$target' has the dso_scheme [$idx_dso_scheme] field = ",$fields[$idx_dso_scheme],"\n";

			print STDERR "              valid values are 'dl', 'dlfcn', 'win32' and 'vms'\n";

			}

		}

	print STDERR "No sanity errors detected!\n" if $errorcnt == 0;

	return $errorcnt;

	}

Makefile.org

+21 −2
Original line number Diff line number Diff line
@@ -345,6 +345,25 @@ do_solaris-shared: 
		done; \

	fi



# OpenServer 5 native compilers used

do_svr3-shared:

	if ${DETECT_GNU_LD}; then \

		$(MAKE) do_gnu-shared; \

	else \

		libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

		( PATH=/usr/ccs/bin:$$PATH ; export PATH; \

		  find . -name "*.o" -print > allobjs ; \

		  OBJS= ; export OBJS ; \

		  for obj in `ar t lib$$i.a` ; do \

		    OBJS="$${OBJS} `grep $$obj allobjs`" ; \

		  done ; \

		  set -x; ${CC}  -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

			-h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

			$${OBJS} $$libs ${EX_LIBS} ) || exit 1; \

		libs="$$libs -l$$i"; \

		done; \

	fi



# UnixWare 7 and OpenUNIX 8 native compilers used

do_svr5-shared:

	if ${DETECT_GNU_LD}; then \
@@ -381,7 +400,7 @@ do_irix-shared: 


# This assumes that GNU utilities are *not* used

do_hpux-shared:

	libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

	libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

	( set -x; /usr/ccs/bin/ld ${SHARED_LDFLAGS} \

		+vnocompatwarnings \

		-b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
@@ -392,7 +411,7 @@ do_hpux-shared: 


# This assumes that GNU utilities are *not* used

do_hpux64-shared:

	libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

	libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

	( set -x; /usr/ccs/bin/ld ${SHARED_LDFLAGS} \

		-b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \

		+h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \

apps/speed.c

+2 −2
Original line number Diff line number Diff line
@@ -83,9 +83,9 @@ 
#include <openssl/err.h>

#include <openssl/engine.h>



#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)

#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(_DARWIN)

# define USE_TOD

#elif !defined(MSDOS) && (!defined(VMS) || defined(__DECC)) || defined(_DARWIN)

#elif !defined(MSDOS) && (!defined(VMS) || defined(__DECC))

# define TIMES

#endif

#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(MPE) && !defined(__NetBSD__) && !defined(_DARWIN)