Commit 6e19a040 authored by Richard Levitte's avatar Richard Levitte
Browse files

merge from the 0.9.6 branch.

parent 91102def

CHANGES

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


 Changes between 0.9.6b and 0.9.6c  [XX xxx XXXX]



  *) Only add signing time to PKCS7 structures if it is not already

     present.

     [Steve Henson]



  *) Fix crypto/objects/objects.h: "ld-ce" should be "id-ce",

     OBJ_ld_ce should be OBJ_id_ce.

     Also some ip-pda OIDs in crypto/objects/objects.txt were

     incorrect (cf. RFC 3039).

     [Matt Cooper, Frederic Giudicelli, Bodo Moeller]



  *) Release CRYPTO_LOCK_DYNLOCK when CRYPTO_destroy_dynlockid()

     returns early because it has nothing to do.

     [Andy Schneider <andy.schneider@bjss.co.uk>]

Configure

+6 −0
Original line number Diff line number Diff line
@@ -258,6 +258,9 @@ my %table=( 
# If hpux-gcc fails, try this one:

"hpux-brokengcc",	"gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown):-ldld:DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",



# HPUX 9.X on Motorola 68k platforms with gcc

"hpux-m68k-gcc",  "gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown)::BN_LLONG DES_PTR DES_UNROLL:::",



# HPUX 10.X config.  Supports threads.

"hpux10-cc",	"cc:-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O3 -z::-D_REENTRANT:-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

# If hpux10-cc fails, try this one (if still fails, try deleting BN_LLONG):
@@ -359,6 +362,9 @@ my %table=( 
# QNX 4

"qnx4",	"cc:-DL_ENDIAN -DTERMIO::(unknown)::${x86_gcc_des} ${x86_gcc_opts}:",



# QNX 6

"qnx6",	"cc:-DL_ENDIAN -DTERMIOS::(unknown):-lsocket:${x86_gcc_des} ${x86_gcc_opts}:",



# Linux on ARM

"linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::::::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

TABLE

+44 −1
Original line number Diff line number Diff line 
Output of `Configure TABLE':



*** BC-16

$cc           = bcc
@@ -1562,6 +1561,28 @@ $shared_cflag = -fPIC 
$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 



*** hpux-m68k-gcc

$cc           = gcc

$cflags       = -DB_ENDIAN -DBN_DIV2W -O3

$unistd       = 

$thread_cflag = (unknown)

$lflags       = 

$bn_ops       = BN_LLONG DES_PTR DES_UNROLL

$bn_obj       = 

$des_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = 

$shared_target= 

$shared_cflag = 

$shared_extension = 

$ranlib       = 



*** hpux-parisc-cc

$cc           = cc

$cflags       = +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY
@@ -2420,6 +2441,28 @@ $shared_cflag = 
$shared_extension = 

$ranlib       = 



*** qnx6

$cc           = cc

$cflags       = -DL_ENDIAN -DTERMIOS

$unistd       = 

$thread_cflag = (unknown)

$lflags       = -lsocket

$bn_ops       = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT

$bn_obj       = 

$des_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = 

$shared_target= 

$shared_cflag = 

$shared_extension = 

$ranlib       = 



*** rhapsody-ppc-cc

$cc           = cc

$cflags       = -O3 -DB_ENDIAN

config

+4 −1
Original line number Diff line number Diff line
@@ -220,10 +220,13 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in 
	;;



    QNX:*)

	case "$VERSION" in

	case "$RELEASE" in

	    4*)

		echo "${MACHINE}-whatever-qnx4"

		;;

	    6*)

		echo "${MACHINE}-whatever-qnx6"

		;;

	    *)

		echo "${MACHINE}-whatever-qnx"

		;;

crypto/bio/b_print.c

+2 −2
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ pow10(int exp) 
}



static long

round(LDOUBLE value)

roundv(LDOUBLE value)

{

    long intpart;

    intpart = (long) value;
@@ -621,7 +621,7 @@ fmtfp( 


    /* we "cheat" by converting the fractional part to integer by

       multiplying by a factor of 10 */

    fracpart = round((pow10(max)) * (ufvalue - intpart));

    fracpart = roundv((pow10(max)) * (ufvalue - intpart));



    if (fracpart >= pow10(max)) {

        intpart++;