Commit 79875776 authored by Bodo Möller's avatar Bodo Möller
Browse files

Improve support for running everything as a monolithic application. 

Submitted by: Lennart Bång, Bodo Möller
parent a5fcd09e

Configure

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ my %table=( 
"debug-ben-debug",	"gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown):::::",

"debug-ben-strict",	"gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe::(unknown):::::",

"debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",

"debug-bodo",	"gcc:-DBIO_PAIR_DEBUG -DL_ENDIAN -DREF_CHECK -DCRYPTO_MDEBUG_ALL -g -m486 -Wall::-D_REENTRANT::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",

"debug-bodo",	"gcc:-DBIO_PAIR_DEBUG -DL_ENDIAN -DREF_CHECK -DCRYPTO_MDEBUG_ALL -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 -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -O2 -m486 -Wall  -pedantic -Wall -Wshadow -pipe::-D_REENTRANT::$x86_gcc_des $x86_gcc_opts:$x86_elf_asm",

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

TABLE

+1 −1
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ $rc5_obj = 


*** debug-bodo

$cc           = gcc

$cflags       = -DBIO_PAIR_DEBUG -DL_ENDIAN -DREF_CHECK -DCRYPTO_MDEBUG_ALL -g -m486 -Wall

$cflags       = -DBIO_PAIR_DEBUG -DL_ENDIAN -DREF_CHECK -DCRYPTO_MDEBUG_ALL -g -m486 -pedantic -Wshadow -Wall

$unistd       = 

$thread_cflag = -D_REENTRANT

$lflags       =

apps/ca.c

+4 −0
Original line number Diff line number Diff line
@@ -603,12 +603,14 @@ bad: 
			perror(outdir);

			goto err;

			}

#ifdef S_IFDIR

		if (!(sb.st_mode & S_IFDIR))

			{

			BIO_printf(bio_err,"%s need to be a directory\n",outdir);

			perror(outdir);

			goto err;

			}

#endif

		}



	/*****************************************************************/
@@ -1902,6 +1904,8 @@ err: 
		X509_NAME_free(CAname);

	if (subject != NULL)

		X509_NAME_free(subject);

	if (tmptm != NULL)

		ASN1_UTCTIME_free(tmptm);

	if (ok <= 0)

		{

		if (ret != NULL) X509_free(ret);

apps/x509.c

+1 −0
Original line number Diff line number Diff line
@@ -754,6 +754,7 @@ end: 
	EVP_PKEY_free(CApkey);

	X509_REQ_free(rq);

	X509V3_EXT_cleanup();

	X509_PURPOSE_cleanup();

	EXIT(ret);

	}

crypto/bf/bftest.c

+6 −6
Original line number Diff line number Diff line
@@ -76,18 +76,18 @@ int main(int argc, char *argv[]) 
#include <openssl/ebcdic.h>

#endif



char *bf_key[2]={

static char *bf_key[2]={

	"abcdefghijklmnopqrstuvwxyz",

	"Who is John Galt?"

	};



/* big endian */

BF_LONG bf_plain[2][2]={

static BF_LONG bf_plain[2][2]={

	{0x424c4f57L,0x46495348L},

	{0xfedcba98L,0x76543210L}

	};



BF_LONG bf_cipher[2][2]={

static BF_LONG bf_cipher[2][2]={

	{0x324ed0feL,0xf413a203L},

	{0xcc91732bL,0x8022f684L}

	};
@@ -228,16 +228,16 @@ static unsigned char ofb64_ok[]={ 
	0x63,0xC2,0xCF,0x80,0xDA};



#define KEY_TEST_NUM	25

unsigned char key_test[KEY_TEST_NUM]={

static unsigned char key_test[KEY_TEST_NUM]={

	0xf0,0xe1,0xd2,0xc3,0xb4,0xa5,0x96,0x87,

	0x78,0x69,0x5a,0x4b,0x3c,0x2d,0x1e,0x0f,

	0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,

	0x88};



unsigned char key_data[8]=

static unsigned char key_data[8]=

	{0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10};



unsigned char key_out[KEY_TEST_NUM][8]={

static unsigned char key_out[KEY_TEST_NUM][8]={

	{0xF9,0xAD,0x59,0x7C,0x49,0xDB,0x00,0x5E},

	{0xE9,0x1D,0x21,0xC1,0xD9,0x61,0xA6,0xD6},

	{0xE9,0xC2,0xB7,0x0A,0x1B,0xC6,0x5C,0xF3},