diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-04-14 16:38:20 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-04-14 16:38:20 +0000 |
| commit | 8f331999f5906f2f8fdd350ee647865984831c9b (patch) | |
| tree | f25ca835d9e45f9b3df53c99d14e40f0ad2c745e /fips/fips_test_suite.c | |
| parent | 9338f290d193bd7497c66d37702cff21ebad8695 (diff) | |
Report each cipher used with CMAC tests.
Only add one error to error queue if a specific test type fails.
Diffstat (limited to 'fips/fips_test_suite.c')
| -rw-r--r-- | fips/fips_test_suite.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fips/fips_test_suite.c b/fips/fips_test_suite.c index c14ecb3058..6b2cdc7bf9 100644 --- a/fips/fips_test_suite.c +++ b/fips/fips_test_suite.c @@ -682,7 +682,11 @@ POST_ID id_list[] = { {EVP_PKEY_RSA, "RSA"}, {EVP_PKEY_DSA, "DSA"}, {EVP_PKEY_EC, "ECDSA"}, + {NID_aes_128_cbc, "AES-128-CBC"}, + {NID_aes_192_cbc, "AES-192-CBC"}, + {NID_aes_256_cbc, "AES-256-CBC"}, {NID_aes_128_ecb, "AES-128-ECB"}, + {NID_des_ede3_cbc, "DES-EDE3-CBC"}, {NID_des_ede3_ecb, "DES-EDE3-ECB"}, {0, NULL} }; @@ -696,7 +700,7 @@ static const char *lookup_id(int id) if (n->id == id) return n->name; } - sprintf(out, "ID=%d\n", id); + sprintf(out, "ID=%d", id); return out; } @@ -741,6 +745,7 @@ static int post_cb(int op, int id, int subid, void *ex) case FIPS_TEST_CMAC: idstr = "CMAC"; + exstr = lookup_id(subid); break; case FIPS_TEST_GCM: @@ -873,6 +878,8 @@ int main(int argc,char **argv) fail_id = FIPS_TEST_DIGEST; } else if (!strcmp(argv[1], "hmac")) { fail_id = FIPS_TEST_HMAC; + } else if (!strcmp(argv[1], "cmac")) { + fail_id = FIPS_TEST_CMAC; } else if (!strcmp(argv[1], "drbg")) { FIPS_corrupt_drbg(); } else if (!strcmp(argv[1], "rng")) { |