Commit a9c33b52 authored by Richard Levitte's avatar Richard Levitte
Browse files

Merge from main trunk. No conflicts.

parent 5deb47f1

Configure

+3 −0
Original line number Diff line number Diff line
@@ -265,6 +265,9 @@ my %table=( 
#"hpux11-64bit-cc","cc:+DA2.0W -g -D_HPUX_SOURCE -Aa -Ae +ESlit::-D_REENTRANT::SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT :::",

# Use unified settings above instead.



#### HP MPE/iX http://jazz.external.hp.com/src/openssl/

"MPE/iX-gcc", "gcc:-D_ENDIAN -DBN_DIV2W -O3 -DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB::(unknown):-L/SYSLOG/PUB -lsyslog -lsocket -lcurses:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::",



# Dec Alpha, OSF/1 - the alpha164-cc is the flags for a 21164A with

# the new compiler

# For gcc, the following gave a %50 speedup on a 164 over the 'DES_INT' version

Makefile.org

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ AR=ar r 
RANLIB= ranlib

PERL= perl

TAR= tar

TARFLAGS= --norecurse

TARFLAGS= --no-recursion



# Set BN_ASM to bn_asm.o if you want to use the C version

BN_ASM= bn_asm.o

TABLE

+20 −0
Original line number Diff line number Diff line
@@ -140,6 +140,26 @@ $dso_scheme = 
$shared_target= 

$shared_cflag = 



*** MPE/iX-gcc

$cc           = gcc

$cflags       = -D_ENDIAN -DBN_DIV2W -O3 -DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB

$unistd       = 

$thread_cflag = (unknown)

$lflags       = -L/SYSLOG/PUB -lsyslog -lsocket -lcurses

$bn_ops       = BN_LLONG DES_PTR DES_UNROLL DES_RISC1

$bn_obj       = 

$des_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = 

$shared_target= 

$shared_cflag = 



*** Mingw32

$cc           = gcc

$cflags       = -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall

apps/s_socket.c

+2 −0
Original line number Diff line number Diff line
@@ -209,9 +209,11 @@ static int init_client_ip(int *sock, unsigned char ip[4], int port) 
	s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);

	if (s == INVALID_SOCKET) { perror("socket"); return(0); }



#ifndef MPE

	i=0;

	i=setsockopt(s,SOL_SOCKET,SO_KEEPALIVE,(char *)&i,sizeof(i));

	if (i < 0) { perror("keepalive"); return(0); }

#endif



	if (connect(s,(struct sockaddr *)&them,sizeof(them)) == -1)

		{ close(s); perror("connect"); return(0); }

apps/speed.c

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

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

# define TIMEB

#endif