Commit 22b3a95d authored by Richard Levitte's avatar Richard Levitte
Browse files

Recent changes from 0.9.6-stable.

parent 63e86149

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 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/bn_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -263,12 +263,12 @@ void BN_clear_free(BIGNUM *a) 
	if (a == NULL) return;

	if (a->d != NULL)

		{

		memset(a->d,0,a->dmax*sizeof(a->d[0]));

		OPENSSL_cleanse(a->d,a->dmax*sizeof(a->d[0]));

		if (!(BN_get_flags(a,BN_FLG_STATIC_DATA)))

			OPENSSL_free(a->d);

		}

	i=BN_get_flags(a,BN_FLG_MALLOCED);

	memset(a,0,sizeof(BIGNUM));

	OPENSSL_cleanse(a,sizeof(BIGNUM));

	if (i)

		OPENSSL_free(a);

	}

crypto/bn/bn_rand.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static int bnrand(int pseudorand, BIGNUM *rnd, int bits, int top, int bottom) 
err:

	if (buf != NULL)

		{

		memset(buf,0,bytes);

		OPENSSL_cleanse(buf,bytes);

		OPENSSL_free(buf);

		}

	return(ret);

crypto/bn/bntest.c

+6 −6
Original line number Diff line number Diff line
@@ -139,10 +139,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);
@@ -152,7 +152,7 @@ int main(int argc, char *argv[]) 
		if (!BIO_write_filename(out,outfile))

			{

			perror(outfile);

			exit(1);

			EXIT(1);

			}

		}
@@ -228,14 +228,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);

	}
@@ -746,7 +746,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);

	}