bn/bntest.c: make it indent-friendly.

Conflicts:
	crypto/bn/bntest.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Andy Polyakov 2015-01-20 15:22:42 +01:00 committed by Matt Caswell
parent 1c246f6bef
commit d68e7df7ab

View File

@ -304,11 +304,11 @@ int main(int argc, char *argv[])
BN_CTX_free(ctx); BN_CTX_free(ctx);
BIO_free(out); BIO_free(out);
/**/
EXIT(0); EXIT(0);
err: err:
BIO_puts(out,"1\n"); /* make sure the Perl script fed by bc notices BIO_puts(out,"1\n"); /* make sure the Perl script fed by bc notices
* the failure, see test_bn in test/Makefile.ssl*/ * the failure, see test_bn in test/Makefile.ssl
*/
(void)BIO_flush(out); (void)BIO_flush(out);
ERR_load_crypto_strings(); ERR_load_crypto_strings();
ERR_print_errors_fp(stderr); ERR_print_errors_fp(stderr);
@ -718,7 +718,8 @@ int test_sqr(BIO *bp, BN_CTX *ctx)
/* Regression test for a BN_sqr overflow bug. */ /* Regression test for a BN_sqr overflow bug. */
BN_hex2bn(&a, BN_hex2bn(&a,
"80000000000000008000000000000001FFFFFFFFFFFFFFFE0000000000000000"); "80000000000000008000000000000001"
"FFFFFFFFFFFFFFFE0000000000000000");
BN_sqr(c, a, ctx); BN_sqr(c, a, ctx);
if (bp != NULL) if (bp != NULL)
{ {
@ -742,7 +743,8 @@ int test_sqr(BIO *bp, BN_CTX *ctx)
/* Regression test for a BN_sqr overflow bug. */ /* Regression test for a BN_sqr overflow bug. */
BN_hex2bn(&a, BN_hex2bn(&a,
"80000000000000000000000080000001FFFFFFFE000000000000000000000000"); "80000000000000000000000080000001"
"FFFFFFFE000000000000000000000000");
BN_sqr(c, a, ctx); BN_sqr(c, a, ctx);
if (bp != NULL) if (bp != NULL)
{ {
@ -791,8 +793,8 @@ int test_mont(BIO *bp, BN_CTX *ctx)
if (mont == NULL) if (mont == NULL)
return 0; return 0;
BN_bntest_rand(&a,100,0,0); /**/ BN_bntest_rand(&a,100,0,0);
BN_bntest_rand(&b,100,0,0); /**/ BN_bntest_rand(&b,100,0,0);
for (i=0; i<num2; i++) for (i=0; i<num2; i++)
{ {
int bits = (200*(i+1))/num2; int bits = (200*(i+1))/num2;
@ -808,8 +810,8 @@ int test_mont(BIO *bp, BN_CTX *ctx)
BN_to_montgomery(&A,&a,mont,ctx); BN_to_montgomery(&A,&a,mont,ctx);
BN_to_montgomery(&B,&b,mont,ctx); BN_to_montgomery(&B,&b,mont,ctx);
BN_mod_mul_montgomery(&c,&A,&B,mont,ctx);/**/ BN_mod_mul_montgomery(&c,&A,&B,mont,ctx);
BN_from_montgomery(&A,&c,mont,ctx);/**/ BN_from_montgomery(&A,&c,mont,ctx);
if (bp != NULL) if (bp != NULL)
{ {
if (!results) if (!results)
@ -860,13 +862,13 @@ int test_mod(BIO *bp, BN_CTX *ctx)
d=BN_new(); d=BN_new();
e=BN_new(); e=BN_new();
BN_bntest_rand(a,1024,0,0); /**/ BN_bntest_rand(a,1024,0,0);
for (i=0; i<num0; i++) for (i=0; i<num0; i++)
{ {
BN_bntest_rand(b,450+i*10,0,0); /**/ BN_bntest_rand(b,450+i*10,0,0);
a->neg=rand_neg(); a->neg=rand_neg();
b->neg=rand_neg(); b->neg=rand_neg();
BN_mod(c,a,b,ctx);/**/ BN_mod(c,a,b,ctx);
if (bp != NULL) if (bp != NULL)
{ {
if (!results) if (!results)
@ -907,11 +909,11 @@ int test_mod_mul(BIO *bp, BN_CTX *ctx)
e=BN_new(); e=BN_new();
for (j=0; j<3; j++) { for (j=0; j<3; j++) {
BN_bntest_rand(c,1024,0,0); /**/ BN_bntest_rand(c,1024,0,0);
for (i=0; i<num0; i++) for (i=0; i<num0; i++)
{ {
BN_bntest_rand(a,475+i*10,0,0); /**/ BN_bntest_rand(a,475+i*10,0,0);
BN_bntest_rand(b,425+i*11,0,0); /**/ BN_bntest_rand(b,425+i*11,0,0);
a->neg=rand_neg(); a->neg=rand_neg();
b->neg=rand_neg(); b->neg=rand_neg();
if (!BN_mod_mul(e,a,b,c,ctx)) if (!BN_mod_mul(e,a,b,c,ctx))
@ -980,8 +982,8 @@ int test_mod_exp(BIO *bp, BN_CTX *ctx)
BN_bntest_rand(c,30,0,1); /* must be odd for montgomery */ BN_bntest_rand(c,30,0,1); /* must be odd for montgomery */
for (i=0; i<num2; i++) for (i=0; i<num2; i++)
{ {
BN_bntest_rand(a,20+i*5,0,0); /**/ BN_bntest_rand(a,20+i*5,0,0);
BN_bntest_rand(b,2+i,0,0); /**/ BN_bntest_rand(b,2+i,0,0);
if (!BN_mod_exp(d,a,b,c,ctx)) if (!BN_mod_exp(d,a,b,c,ctx))
return(0); return(0);
@ -1031,8 +1033,8 @@ int test_mod_exp_mont_consttime(BIO *bp, BN_CTX *ctx)
BN_bntest_rand(c,30,0,1); /* must be odd for montgomery */ BN_bntest_rand(c,30,0,1); /* must be odd for montgomery */
for (i=0; i<num2; i++) for (i=0; i<num2; i++)
{ {
BN_bntest_rand(a,20+i*5,0,0); /**/ BN_bntest_rand(a,20+i*5,0,0);
BN_bntest_rand(b,2+i,0,0); /**/ BN_bntest_rand(b,2+i,0,0);
if (!BN_mod_exp_mont_consttime(d,a,b,c,ctx,NULL)) if (!BN_mod_exp_mont_consttime(d,a,b,c,ctx,NULL))
return(00); return(00);
@ -1156,8 +1158,8 @@ int test_exp(BIO *bp, BN_CTX *ctx)
for (i=0; i<num2; i++) for (i=0; i<num2; i++)
{ {
BN_bntest_rand(a,20+i*5,0,0); /**/ BN_bntest_rand(a,20+i*5,0,0);
BN_bntest_rand(b,2+i,0,0); /**/ BN_bntest_rand(b,2+i,0,0);
if (BN_exp(d,a,b,ctx) <= 0) if (BN_exp(d,a,b,ctx) <= 0)
return(0); return(0);
@ -1964,7 +1966,7 @@ int test_lshift(BIO *bp,BN_CTX *ctx,BIGNUM *a_)
else else
{ {
a=BN_new(); a=BN_new();
BN_bntest_rand(a,200,0,0); /**/ BN_bntest_rand(a,200,0,0);
a->neg=rand_neg(); a->neg=rand_neg();
} }
for (i=0; i<num0; i++) for (i=0; i<num0; i++)
@ -2016,7 +2018,7 @@ int test_lshift1(BIO *bp)
b=BN_new(); b=BN_new();
c=BN_new(); c=BN_new();
BN_bntest_rand(a,200,0,0); /**/ BN_bntest_rand(a,200,0,0);
a->neg=rand_neg(); a->neg=rand_neg();
for (i=0; i<num0; i++) for (i=0; i<num0; i++)
{ {
@ -2060,7 +2062,7 @@ int test_rshift(BIO *bp,BN_CTX *ctx)
e=BN_new(); e=BN_new();
BN_one(c); BN_one(c);
BN_bntest_rand(a,200,0,0); /**/ BN_bntest_rand(a,200,0,0);
a->neg=rand_neg(); a->neg=rand_neg();
for (i=0; i<num0; i++) for (i=0; i<num0; i++)
{ {
@ -2103,7 +2105,7 @@ int test_rshift1(BIO *bp)
b=BN_new(); b=BN_new();
c=BN_new(); c=BN_new();
BN_bntest_rand(a,200,0,0); /**/ BN_bntest_rand(a,200,0,0);
a->neg=rand_neg(); a->neg=rand_neg();
for (i=0; i<num0; i++) for (i=0; i<num0; i++)
{ {