summaryrefslogtreecommitdiffstats
path: root/fips
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-09-21 18:42:12 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-09-21 18:42:12 +0000
commit456d883a2596cb5792a8c18588fa2a906f726c5a (patch)
tree7eda9985de4c49e9edfa2f2cedb3cb0d8b12d31d /fips
parentd57cc97f2418590e7e69d9846f52877bbe24cf94 (diff)
Don't print out errors in cases where errors are expected: testing
DSA parameter validity and EC public key validity.
Diffstat (limited to 'fips')
-rw-r--r--fips/dsa/fips_dssvs.c2
-rw-r--r--fips/ecdsa/fips_ecdsavs.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/fips/dsa/fips_dssvs.c b/fips/dsa/fips_dssvs.c
index b8c6bd15bd..d355fcb6ff 100644
--- a/fips/dsa/fips_dssvs.c
+++ b/fips/dsa/fips_dssvs.c
@@ -314,6 +314,7 @@ static void pqgver(FILE *in, FILE *out)
dsa->p = BN_dup(p);
dsa->q = BN_dup(q);
}
+ no_err = 1;
if (!dsa2 && !dsa_builtin_paramgen(dsa, L, N, md,
seed, seedlen, NULL,
&counter2, &h2, NULL))
@@ -328,6 +329,7 @@ static void pqgver(FILE *in, FILE *out)
fprintf(stderr, "Parameter Generation error\n");
exit(1);
}
+ no_err = 0;
if (idx >= 0)
{
if (BN_cmp(dsa->g, g))
diff --git a/fips/ecdsa/fips_ecdsavs.c b/fips/ecdsa/fips_ecdsavs.c
index 1245f854e7..4cf536cee8 100644
--- a/fips/ecdsa/fips_ecdsavs.c
+++ b/fips/ecdsa/fips_ecdsavs.c
@@ -284,7 +284,9 @@ static int PKV(FILE *in, FILE *out)
return 0;
}
key = EC_KEY_new_by_curve_name(curve_nid);
+ no_err = 1;
rv = EC_KEY_set_public_key_affine_coordinates(key, Qx, Qy);
+ no_err = 0;
fprintf(out, "Result = %s\n", rv ? "P":"F");
}