Commit 2f1d799c authored by Richard Levitte's avatar Richard Levitte
Browse files

Recent changes from 0.9.6-stable.

parent e7534d60

Configure

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ my %table=( 
"debug-bodo",	"gcc:-DL_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -DBIO_PAIR_DEBUG -g -m486 -pedantic -Wshadow -Wall::-D_REENTRANT::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",

"debug-ulf",	"gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -O2 -m486 -Wall -Werror -Wshadow -pipe::-D_REENTRANT::${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",

"debug-steve",	"gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -O2 -m486 -pedantic -Wall -Werror -Wshadow -pipe::-D_REENTRANT::${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",

"debug-levitte-linux-elf","gcc:-DUSE_ALLOCATING_PRINT -DRL_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DNO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -ggdb -g3 -m486 -pedantic -ansi -Wall -Wshadow -Wmissing-declarations -pipe::-D_REENTRANT:-ldl:::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"debug-levitte-linux-elf","gcc:-DUSE_ALLOCATING_PRINT -DRL_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DNO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -ggdb -g3 -m486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wmissing-declarations -Wno-long-long -pipe::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"dist",		"cc:-O::(unknown):::::",



# Basic configs that should work on any (32 and less bit) box

apps/apps.h

+4 −0
Original line number Diff line number Diff line
@@ -59,7 +59,11 @@ 
#ifndef HEADER_APPS_H

#define HEADER_APPS_H



#ifdef FLAT_INC

#include "e_os.h"

#else

#include "../e_os.h"

#endif



#include <openssl/buffer.h>

#include <openssl/bio.h>

crypto/asn1/a_strex.c

+7 −4
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ 
 * and a FILE pointer.

 */



int send_mem_chars(void *arg, const void *buf, int len)

#if 0 /* Not used */

static int send_mem_chars(void *arg, const void *buf, int len)

{

	unsigned char **out = arg;

	if(!out) return 1;
@@ -86,15 +87,16 @@ int send_mem_chars(void *arg, const void *buf, int len) 
	*out += len;

	return 1;

}

#endif



int send_bio_chars(void *arg, const void *buf, int len)

static int send_bio_chars(void *arg, const void *buf, int len)

{

	if(!arg) return 1;

	if(BIO_write(arg, buf, len) != len) return 0;

	return 1;

}



int send_fp_chars(void *arg, const void *buf, int len)

static int send_fp_chars(void *arg, const void *buf, int len)

{

	if(!arg) return 1;

	if(fwrite(buf, 1, len, arg) != (unsigned int)len) return 0;
@@ -240,7 +242,8 @@ static int do_hex_dump(char_io *io_ch, void *arg, unsigned char *buf, int buflen 
 * #01234 format.

 */



int do_dump(unsigned long lflags, char_io *io_ch, void *arg, ASN1_STRING *str)

static int do_dump(unsigned long lflags, char_io *io_ch, void *arg,

		   ASN1_STRING *str)

{

	/* Placing the ASN1_STRING in a temp ASN1_TYPE allows

	 * the DER encoding to readily obtained

crypto/bf/bftest.c

+4 −0
Original line number Diff line number Diff line
@@ -63,7 +63,11 @@ 
#include <string.h>

#include <stdlib.h>



#ifdef FLAT_INC

#include "e_os.h"

#else

#include "../e_os.h"

#endif



#ifdef NO_BF

int main(int argc, char *argv[])

crypto/bio/b_print.c

+3 −3
Original line number Diff line number Diff line
@@ -565,12 +565,12 @@ abs_val(LDOUBLE value) 
}



static LDOUBLE

pow10(int exp)

pow10(int in_exp)

{

    LDOUBLE result = 1;

    while (exp) {

    while (in_exp) {

        result *= 10;

        exp--;

        in_exp--;

    }

    return result;

}