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

some more patches for avoiding problems with non-automatic variables

parent 0d64ea89

CHANGES

+5 −0
Original line number Original line Diff line number Diff line
@@ -4,6 +4,11 @@ 




 Changes between 0.9.4 and 0.9.5  [xx XXX 1999]

 Changes between 0.9.4 and 0.9.5  [xx XXX 1999]





  *) Initialize all non-automatic variables each time one of the openssl

     sub-programs is started (this is necessary as they may be started

     multiple times from the "OpenSSL>" prompt).

     [Lennart Bang, Bodo Moeller]



  *) Preliminary compilation option RSA_NULL which disables RSA crypto without

  *) Preliminary compilation option RSA_NULL which disables RSA crypto without

     removing all other RSA functionality (this is what NO_RSA does). This

     removing all other RSA functionality (this is what NO_RSA does). This

     is so (for example) those in the US can disable those operations covered

     is so (for example) those in the US can disable those operations covered

apps/s_time.c

+6 −9
Original line number Original line Diff line number Diff line
@@ -248,15 +248,6 @@ static int parseArgs(int argc, char **argv) 




    verify_depth=0;

    verify_depth=0;

    verify_error=X509_V_OK;

    verify_error=X509_V_OK;

#ifdef FIONBIO

    t_nbio=0;

#endif



	apps_startup();

	s_time_init();



	if (bio_err == NULL)

		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);





    argc--;

    argc--;

    argv++;

    argv++;
@@ -411,6 +402,12 @@ int MAIN(int argc, char **argv) 
	MS_STATIC char buf[1024*8];

	MS_STATIC char buf[1024*8];

	int ver;

	int ver;





	apps_startup();

	s_time_init();



	if (bio_err == NULL)

		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);



#if !defined(NO_SSL2) && !defined(NO_SSL3)

#if !defined(NO_SSL2) && !defined(NO_SSL3)

	s_time_meth=SSLv23_client_method();

	s_time_meth=SSLv23_client_method();

#elif !defined(NO_SSL3)

#elif !defined(NO_SSL3)

apps/speed.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -344,6 +344,7 @@ int MAIN(int argc, char **argv) 
	int pr_header=0;

	int pr_header=0;





	apps_startup();

	apps_startup();

	memset(results, 0, sizeof(results));

#ifndef NO_DSA

#ifndef NO_DSA

	memset(dsa_key,0,sizeof(dsa_key));

	memset(dsa_key,0,sizeof(dsa_key));

#endif

#endif

crypto/hmac/hmactest.c

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

#include <openssl/ebcdic.h>

#endif

#endif





struct test_st

static struct test_st

	{

	{

	unsigned char key[16];

	unsigned char key[16];

	int key_len;

	int key_len;

crypto/md2/md2test.c

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

#include <openssl/ebcdic.h>

#endif

#endif





char *test[]={

static char *test[]={

	"",

	"",

	"a",

	"a",

	"abc",

	"abc",
@@ -84,7 +84,7 @@ char *test[]={ 
	NULL,

	NULL,

	};

	};





char *ret[]={

static char *ret[]={

	"8350e5a3e24c153df2275c9f80692773",

	"8350e5a3e24c153df2275c9f80692773",

	"32ec01ec4a6dac72c0ab96fb34c0b5d1",

	"32ec01ec4a6dac72c0ab96fb34c0b5d1",

	"da853b0d3f88d99b30283a69e6ded6bb",

	"da853b0d3f88d99b30283a69e6ded6bb",