generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
always give the expected result on some platforms.
This commit is contained in:
Richard Levitte 2002-11-28 18:56:18 +00:00
parent 6a99f54418
commit dd54633339
21 changed files with 75 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/bf/bftest.c
View File

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

12
crypto/bn/bntest.c
View File

@ -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)
{

19
crypto/bn/exptest.c
View File

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

4
crypto/cast/casttest.c
View File

@ -60,6 +60,8 @@
#include <string.h>
#include <stdlib.h>
#include "../e_os.h"
#ifdef 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

7
crypto/dh/dhtest.c
View File

@ -59,6 +59,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "../e_os.h"
#ifdef WINDOWS
#include "../bio/bss_file.c"
#endif
@ -107,7 +110,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);
@ -188,7 +191,7 @@ err:
if(b != NULL) DH_free(b);
if(a != NULL) DH_free(a);
BIO_free(out);
exit(ret);
EXIT(ret);
return(ret);
}

7
crypto/dsa/dsatest.c
View File

@ -61,6 +61,9 @@
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include "../e_os.h"
#include <openssl/crypto.h>
#include <openssl/rand.h>
#include <openssl/bio.h>
@ -207,7 +210,7 @@ end:
BIO_free(bio_err);
bio_err = NULL;
}
exit(!ret);
EXIT(!ret);
return(0);
}
@ -226,7 +229,7 @@ static void MS_CALLBACK dsa_cb(int p, int n, void *arg)
if (!ok && (p == 0) && (num > 1))
{
BIO_printf((BIO *)arg,"error in dsatest\n");
exit(1);
EXIT(1);
}
}
#endif

4
crypto/hmac/hmactest.c
View File

@ -60,6 +60,8 @@
#include <string.h>
#include <stdlib.h>
#include "../e_os.h"
#ifdef NO_HMAC
int main(int argc, char *argv[])
{
@ -143,7 +145,7 @@ int main(int argc, char *argv[])
else
printf("test %d ok\n",i);
}
exit(err);
EXIT(err);
return(0);
}

4
crypto/idea/ideatest.c
View File

@ -60,6 +60,8 @@
#include <string.h>
#include <stdlib.h>
#include "../e_os.h"
#ifdef NO_IDEA
int main(int argc, char *argv[])
{
@ -167,7 +169,7 @@ int main(int argc, char *argv[])
else
printf("ok\n");
exit(err);
EXIT(err);
return(err);
}

4
crypto/md2/md2test.c
View File

@ -60,6 +60,8 @@
#include <stdlib.h>
#include <string.h>
#include "../e_os.h"
#ifdef NO_MD2
int main(int argc, char *argv[])
{
@ -119,7 +121,7 @@ int main(int argc, char *argv[])
R++;
P++;
}
exit(err);
EXIT(err);
return(0);
}

4
crypto/md4/md4test.c
View File

@ -60,6 +60,8 @@
#include <string.h>
#include <stdlib.h>
#include "../e_os.h"
#ifdef NO_MD4
int main(int argc, char *argv[])
{
@ -115,7 +117,7 @@ int main(int argc, char *argv[])
R++;
P++;
}
exit(err);
EXIT(err);
return(0);
}

4
crypto/md5/md5test.c
View File

@ -60,6 +60,8 @@
#include <string.h>
#include <stdlib.h>
#include "../e_os.h"
#ifdef NO_MD5
int main(int argc, char *argv[])
{
@ -115,7 +117,7 @@ int main(int argc, char *argv[])
R++;
P++;
}
exit(err);
EXIT(err);
return(0);
}

4
crypto/mdc2/mdc2test.c
View File

@ -60,6 +60,8 @@
#include <stdlib.h>
#include <string.h>
#include "../e_os.h"
#if defined(NO_DES) && !defined(NO_MDC2)
#define NO_MDC2
#endif
@ -134,7 +136,7 @@ int main(int argc, char *argv[])
else
printf("pad2 - ok\n");
exit(ret);
EXIT(ret);
return(ret);
}
#endif

4
crypto/rand/randtest.c
View File

@ -60,6 +60,8 @@
#include <stdlib.h>
#include <openssl/rand.h>
#include "../e_os.h"
/* some FIPS 140-1 random number test */
/* some simple tests */
@ -202,6 +204,6 @@ int main()
}
printf("test 4 done\n");
err=((err)?1:0);
exit(err);
EXIT(err);
return(err);
}

4
crypto/rc2/rc2test.c
View File

@ -63,6 +63,8 @@
#include <string.h>
#include <stdlib.h>
#include "../e_os.h"
#ifdef NO_RC2
int main(int argc, char *argv[])
{
@ -203,7 +205,7 @@ int main(int argc, char *argv[])
printf("ok\n");
#endif
exit(err);
EXIT(err);
return(err);
}

4
crypto/rc4/rc4test.c
View File

@ -60,6 +60,8 @@
#include <stdlib.h>
#include <string.h>
#include "../e_os.h"
#ifdef NO_RC4
int main(int argc, char *argv[])
{
@ -195,7 +197,7 @@ int main(int argc, char *argv[])
}
}
printf("done\n");
exit(err);
EXIT(err);
return(0);
}
#endif

4
crypto/rc5/rc5test.c
View File

@ -63,6 +63,8 @@
#include <string.h>
#include <stdlib.h>
#include "../e_os.h"
#ifdef NO_RC5
int main(int argc, char *argv[])
{
@ -318,7 +320,7 @@ int main(int argc, char *argv[])
}
if (err == 0) printf("cbc RC5 ok\n");
exit(err);
EXIT(err);
return(err);
}

4
crypto/ripemd/rmdtest.c
View File

@ -60,6 +60,8 @@
#include <string.h>
#include <stdlib.h>
#include "../e_os.h"
#ifdef NO_RIPEMD
int main(int argc, char *argv[])
{
@ -124,7 +126,7 @@ int main(int argc, char *argv[])
R++;
P++;
}
exit(err);
EXIT(err);
return(0);
}

4
crypto/sha/sha1test.c
View File

@ -60,6 +60,8 @@
#include <string.h>
#include <stdlib.h>
#include "../e_os.h"
#ifdef NO_SHA
int main(int argc, char *argv[])
{
@ -152,7 +154,7 @@ int main(int argc, char *argv[])
}
else
printf("test 3 ok\n");
exit(err);
EXIT(err);
return(0);
}

4
crypto/sha/shatest.c
View File

@ -60,6 +60,8 @@
#include <string.h>
#include <stdlib.h>
#include "../e_os.h"
#ifdef NO_SHA
int main(int argc, char *argv[])
{
@ -152,7 +154,7 @@ int main(int argc, char *argv[])
}
else
printf("test 3 ok\n");
exit(err);
EXIT(err);
return(0);
}

2
ssl/ssltest.c
View File

@ -366,7 +366,7 @@ bad:
"the test anyway (and\n-d to see what happens), "
"or add one of -ssl2, -ssl3, -tls1, -reuse\n"
"to avoid protocol mismatch.\n");
exit(1);
EXIT(1);
}
if (print_time)

4
test/methtest.c
View File

@ -96,10 +96,10 @@ char *argv[];
METH_init(top);
METH_control(tmp1,METH_CONTROL_DUMP,stdout);
METH_control(tmp2,METH_CONTROL_DUMP,stdout);
exit(0);
EXIT(0);
err:
ERR_load_crypto_strings();
ERR_print_errors_fp(stderr);
exit(1);
EXIT(1);
return(0);
}