Commit 55f78baf authored by Richard Levitte's avatar Richard Levitte
Browse files

Have all tests use EXIT() to exit rather than exit(), since the latter doesn't 

always give the expected result on some platforms.
parent 6c359479

crypto/bf/bftest.c

+3 −1
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ 
#include <string.h>

#include <stdlib.h>



#include "../e_os.h"



#ifdef OPENSSL_NO_BF

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

{
@@ -275,7 +277,7 @@ int main(int argc, char *argv[]) 
	else

		ret=test();



	exit(ret);

	EXIT(ret);

	return(0);

	}

crypto/bn/bntest.c

+7 −7
Original line number Diff line number Diff line
@@ -163,10 +163,10 @@ int main(int argc, char *argv[]) 




	ctx=BN_CTX_new();

	if (ctx == NULL) exit(1);

	if (ctx == NULL) EXIT(1);



	out=BIO_new(BIO_s_file());

	if (out == NULL) exit(1);

	if (out == NULL) EXIT(1);

	if (outfile == NULL)

		{

		BIO_set_fp(out,stdout,BIO_NOCLOSE);
@@ -176,7 +176,7 @@ int main(int argc, char *argv[]) 
		if (!BIO_write_filename(out,outfile))

			{

			perror(outfile);

			exit(1);

			EXIT(1);

			}

		}
@@ -296,14 +296,14 @@ int main(int argc, char *argv[]) 
	BIO_free(out);



/**/

	exit(0);

	EXIT(0);

err:

	BIO_puts(out,"1\n"); /* make sure the Perl script fed by bc notices

	                      * the failure, see test_bn in test/Makefile.ssl*/

	BIO_flush(out);

	ERR_load_crypto_strings();

	ERR_print_errors_fp(stderr);

	exit(1);

	EXIT(1);

	return(1);

	}
@@ -546,7 +546,7 @@ int test_mul(BIO *bp) 
	BN_CTX *ctx;



	ctx = BN_CTX_new();

	if (ctx == NULL) exit(1);

	if (ctx == NULL) EXIT(1);

	

	BN_init(&a);

	BN_init(&b);
@@ -784,7 +784,7 @@ int test_mod_mul(BIO *bp, BN_CTX *ctx) 
			while ((l=ERR_get_error()))

				fprintf(stderr,"ERROR:%s\n",

					ERR_error_string(l,NULL));

			exit(1);

			EXIT(1);

			}

		if (bp != NULL)

			{

crypto/bn/exptest.c

+11 −8
Original line number Diff line number Diff line
@@ -59,6 +59,9 @@ 
#include <stdio.h>

#include <stdlib.h>

#include <string.h>



#include "../e_os.h"



#include <openssl/bio.h>

#include <openssl/bn.h>

#include <openssl/rand.h>
@@ -86,7 +89,7 @@ int main(int argc, char *argv[]) 
	ERR_load_BN_strings();



	ctx=BN_CTX_new();

	if (ctx == NULL) exit(1);

	if (ctx == NULL) EXIT(1);

	r_mont=BN_new();

	r_recp=BN_new();

	r_simple=BN_new();
@@ -99,7 +102,7 @@ int main(int argc, char *argv[]) 


	out=BIO_new(BIO_s_file());



	if (out == NULL) exit(1);

	if (out == NULL) EXIT(1);

	BIO_set_fp(out,stdout,BIO_NOCLOSE);



	for (i=0; i<200; i++)
@@ -124,7 +127,7 @@ int main(int argc, char *argv[]) 
			{

			printf("BN_mod_exp_mont() problems\n");

			ERR_print_errors(out);

			exit(1);

			EXIT(1);

			}



		ret=BN_mod_exp_recp(r_recp,a,b,m,ctx);
@@ -132,7 +135,7 @@ int main(int argc, char *argv[]) 
			{

			printf("BN_mod_exp_recp() problems\n");

			ERR_print_errors(out);

			exit(1);

			EXIT(1);

			}



		ret=BN_mod_exp_simple(r_simple,a,b,m,ctx);
@@ -140,7 +143,7 @@ int main(int argc, char *argv[]) 
			{

			printf("BN_mod_exp_simple() problems\n");

			ERR_print_errors(out);

			exit(1);

			EXIT(1);

			}



		if (BN_cmp(r_simple, r_mont) == 0
@@ -163,7 +166,7 @@ int main(int argc, char *argv[]) 
			printf("\nrecp     =");	BN_print(out,r_recp);

			printf("\nmont     ="); BN_print(out,r_mont);

			printf("\n");

			exit(1);

			EXIT(1);

			}

		}

	BN_free(r_mont);
@@ -177,11 +180,11 @@ int main(int argc, char *argv[]) 
	CRYPTO_mem_leaks(out);

	BIO_free(out);

	printf(" done\n");

	exit(0);

	EXIT(0);

err:

	ERR_load_crypto_strings();

	ERR_print_errors(out);

	exit(1);

	EXIT(1);

	return(1);

	}

crypto/cast/casttest.c

+3 −1
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ 
#include <string.h>

#include <stdlib.h>



#include "../e_os.h"



#ifdef OPENSSL_NO_CAST

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

{
@@ -224,7 +226,7 @@ int main(int argc, char *argv[]) 
      }

#endif



    exit(err);

    EXIT(err);

    return(err);

    }

#endif

crypto/dh/dhtest.c

+5 −2
Original line number Diff line number Diff line
@@ -59,6 +59,9 @@ 
#include <stdio.h>

#include <stdlib.h>

#include <string.h>



#include "../e_os.h"



#ifdef OPENSSL_SYS_WINDOWS

#include "../bio/bss_file.c" 

#endif
@@ -111,7 +114,7 @@ int main(int argc, char *argv[]) 
	RAND_seed(rnd_seed, sizeof rnd_seed);



	out=BIO_new(BIO_s_file());

	if (out == NULL) exit(1);

	if (out == NULL) EXIT(1);

	BIO_set_fp(out,stdout,BIO_NOCLOSE);



	a=DH_generate_parameters(64,DH_GENERATOR_5,cb,out);
@@ -195,7 +198,7 @@ err: 
	CRYPTO_cleanup_all_ex_data();

	ERR_remove_state(0);

	CRYPTO_mem_leaks_fp(stderr);

	exit(ret);

	EXIT(ret);

	return(ret);

	}