Commit 71aa7c58 authored by Richard Levitte's avatar Richard Levitte
Browse files

Merge in all recent changes from 0.9.6-stable.

parent 7462f264

CHANGES

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ 


 Changes between 0.9.6d and 0.9.6e  [XX xxx XXXX]



  *) 

  *) Fix EVP_dsa_sha macro.

     [Nils Larsch]



 Changes between 0.9.6c and 0.9.6d  [9 May 2002]

Configure

+1 −1
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ my %table=( 
"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}::::::::::dlfcn:svr3-shared:-fPIC", # the SCO assembler doesn't seem to like our assembler files ...

"sco5-gcc-shared","gcc:-O3 -fomit-frame-pointer:::-lsocket -lresolv -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:svr3-shared:-fPIC", # the SCO assembler doesn't seem to like our assembler files ...



# Sinix/ReliantUNIX RM400

# NOTE: The CDS++ Compiler up to V2.0Bsomething has the IRIX_CC_BUG optimizer problem. Better use -g  */

apps/apps.c

+10 −3
Original line number Diff line number Diff line
@@ -230,10 +230,17 @@ void program_name(char *in, char *out, int size) 


	q=strrchr(p,'.');

	if (q == NULL)

		q = in+size;

	strncpy(out,p,q-p);

		q = p + strlen(p);

	strncpy(out,p,size-1);

	if (q-p >= size)

		{

		out[size-1]='\0';

		}

	else

		{

		out[q-p]='\0';

		}

	}

#else

void program_name(char *in, char *out, int size)

	{

config

+4 −0
Original line number Diff line number Diff line
@@ -497,6 +497,10 @@ EOF 
	${CC} -o dummy dummy.c && OUT=`./dummy ${MACHINE}`

	rm dummy dummy.c

	;;

  ppc64-*-linux2)

	#Use the standard target for PPC architecture until we create a

	#special one for the 64bit architecture.

	OUT="linux-ppc" ;;

  ppc-*-linux2) OUT="linux-ppc" ;;

  m68k-*-linux*) OUT="linux-m68k" ;;

  ia64-*-linux?) OUT="linux-ia64" ;;

crypto/bio/b_print.c

+7 −0
Original line number Diff line number Diff line
@@ -56,6 +56,13 @@ 
 * [including the GNU Public Licence.]

 */



/* disable assert() unless BIO_DEBUG has been defined */

#ifndef BIO_DEBUG

# ifndef NDEBUG

#  define NDEBUG

# endif

#endif



/* 

 * Stolen from tjh's ssl/ssl_trc.c stuff.

 */