Commit 9aef355c authored by Richard Levitte's avatar Richard Levitte
Browse files

Merge in changes from the 0.9.6-stable branch.

parent 11f3f9f4

CHANGES

+10 −0
Original line number Diff line number Diff line
@@ -4,6 +4,13 @@ 


 Changes between 0.9.6 and 0.9.6a  [xx XXX 2001]



  *) Change Configure and Makefiles to provide EXE_EXT, which will contain

     the default extension for executables, if any.  Also, make the perl

     scripts that use symlink() to test if it really exists and use "cp"

     if it doesn't.  All this made OpenSSL compilable and installable in

     CygWin.

     [Richard Levitte]



  *) Fix for asn1_GetSequence() for indefinite length constructed data.

     If SEQUENCE is length is indefinite just set c->slen to the total

     amount of data available.
@@ -28,6 +35,9 @@ 
  *) MIPS assembler BIGNUM division bug fix. 

     [Andy Polyakov]



  *) Disabled incorrect Alpha assembler code.

     [Richard Levitte]



  *) Fix PKCS#7 decode routines so they correctly update the length

     after reading an EOC for the EXPLICIT tag.

     [Steve Henson]

Configure

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


# DGUX, 88100.

"dgux-R3-gcc",	"gcc:-O3 -fomit-frame-pointer::(unknown)::RC4_INDEX DES_UNROLL:::",

"dgux-R4-gcc",	"gcc:-O3 -fomit-frame-pointer::(unknown):-lnsl -lsocket:RC4_INDEX:RC4_INDEX DES_UNROLL:::",

"dgux-R4-gcc",	"gcc:-O3 -fomit-frame-pointer::(unknown):-lnsl -lsocket:RC4_INDEX DES_UNROLL:::",

"dgux-R4-x86-gcc",	"gcc:-O3 -fomit-frame-pointer -DL_ENDIAN::(unknown):-lnsl -lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",



# SCO 3 - Tim Rice <tim@multitalents.net>
@@ -441,6 +441,7 @@ my @WinTargets=qw(VC-NT VC-WIN32 VC-WIN16 VC-W31-16 VC-W31-32 VC-MSDOS BC-32 


my $prefix="";

my $openssldir="";

my $exe_ext="";

my $install_prefix="";

my $no_threads=0;

my $no_shared=1;
@@ -657,6 +658,7 @@ print "Configuring for $target\n"; 


my $IsWindows=scalar grep /^$target$/,@WinTargets;



$exe_ext=".exe" if ($target eq "CygWin32");

$openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq "");

$prefix=$openssldir if $prefix eq "";
@@ -859,6 +861,7 @@ while (<IN>) 
	s/^CFLAG=.*$/CFLAG= $cflags/;

	s/^DEPFLAG=.*$/DEPFLAG= $depflags/;

	s/^EX_LIBS=.*$/EX_LIBS= $lflags/;

	s/^EXE_EXT=.*$/EXE_EXT= $exe_ext/;

	s/^BN_ASM=.*$/BN_ASM= $bn_obj/;

	s/^DES_ENC=.*$/DES_ENC= $des_obj/;

	s/^BF_ENC=.*$/BF_ENC= $bf_obj/;

Makefile.org

+5 −4
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD 
DEPFLAG= 

PEX_LIBS= 

EX_LIBS= 

EXE_EXT= 

AR=ar r

RANLIB= ranlib

PERL= perl
@@ -201,7 +202,7 @@ sub_all: 
	do \

	if [ -d "$$i" ]; then \

		(cd $$i && echo "making all in $$i..." && \

		$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \

		$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' EXE_EXT='${EXE_EXT}' all ) || exit 1; \

	else \

		$(MAKE) $$i; \

	fi; \
@@ -250,7 +251,7 @@ link-shared: 


build-shared: clean-shared do_$(SHLIB_TARGET) link-shared



do_bsd-gcc-shared: linux-shared

do_bsd-gcc-shared: do_gnu-shared

do_linux-shared: do_gnu-shared

do_gnu-shared:

	libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
@@ -349,7 +350,7 @@ test: tests 


tests: rehash

	@(cd test && echo "testing..." && \

	$(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SDIRS='${SDIRS}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' tests );

	$(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SDIRS='${SDIRS}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' EXE_EXT='${EXE_EXT}' tests );

	@apps/openssl version -a



report:
@@ -440,7 +441,7 @@ install: all install_docs 
	do \

	if [ -d "$$i" ]; then \

		(cd $$i; echo "installing $$i..."; \

		$(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}' EX_LIBS='${EX_LIBS}' SDIRS='${SDIRS}' RANLIB='${RANLIB}' install ); \

		$(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}' EX_LIBS='${EX_LIBS}' SDIRS='${SDIRS}' RANLIB='${RANLIB}' EXE_EXT='${EXE_EXT}' install ); \

	fi; \

	done

	@for i in $(LIBS) ;\

apps/Makefile.ssl

+3 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ RM= rm -f 


PEX_LIBS=

EX_LIBS= 

EXE_EXT= 



CFLAGS= -DMONOLITH $(INCLUDES) $(CFLAG)
@@ -32,7 +33,7 @@ PROGRAM= openssl 


SCRIPTS=CA.sh CA.pl der_chop



EXE= $(PROGRAM)

EXE= $(PROGRAM)$(EXE_EXT)



E_EXE=	verify asn1pars req dgst dh dhparam enc passwd gendh errstr \

	ca crl rsa rsautl dsa dsaparam \
@@ -77,7 +78,7 @@ top: 


all:	exe



exe:	$(EXE)

exe:	$(PROGRAM)



req: sreq.o $(A_OBJ) $(DLIBCRYPTO)

	$(CC) -o req $(CFLAG) sreq.o $(A_OBJ) $(RAND_OBJ) $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

apps/s_server.c

+8 −0
Original line number Diff line number Diff line
@@ -1432,9 +1432,11 @@ static int www_body(char *hostname, int s, unsigned char *context) 
				break;

				}



#if 0

			/* append if a directory lookup */

			if (e[-1] == '/')

				strcat(p,"index.html");

#endif



			/* if a directory, do the index thang */

			if (stat(p,&st_buf) < 0)
@@ -1446,7 +1448,13 @@ static int www_body(char *hostname, int s, unsigned char *context) 
				}

			if (S_ISDIR(st_buf.st_mode))

				{

#if 0 /* must check buffer size */

				strcat(p,"/index.html");

#else

				BIO_puts(io,text);

				BIO_printf(io,"'%s' is a directory\r\n",p);

				break;

#endif

				}



			if ((file=BIO_new_file(p,"r")) == NULL)