Don't print out errors in cases where errors are expected: testing
authorDr. Stephen Henson <steve@openssl.org>
Wed, 21 Sep 2011 18:42:12 +0000 (18:42 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Wed, 21 Sep 2011 18:42:12 +0000 (18:42 +0000)
DSA parameter validity and EC public key validity.

fips/dsa/fips_dssvs.c
fips/ecdsa/fips_ecdsavs.c

index b8c6bd1..d355fcb 100644 (file)
@@ -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))
index 1245f85..4cf536c 100644 (file)
@@ -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");
                        }