Add new POST support to X9.31 PRNG.

[openssl.git] / fips / fips_test_suite.c

diff --git a/fips/fips_test_suite.c b/fips/fips_test_suite.c
index c14ecb3058d0b64cb028fda86f00c5c93c5ef786..e71a6930bca13fed2f259da329846c96f4be30a2 100644 (file)
--- 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;
        }
 
@@ -707,6 +711,7 @@ static int fail_key = -1;
 static int post_cb(int op, int id, int subid, void *ex)
        {
        const char *idstr, *exstr = "";
+       char asctmp[20];
        int keytype = -1;
        switch(id)
                {
@@ -741,6 +746,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:
@@ -757,6 +763,8 @@ static int post_cb(int op, int id, int subid, void *ex)
 
                case FIPS_TEST_X931:
                idstr = "X9.31 PRNG";
+               sprintf(asctmp, "keylen=%d", subid);
+               exstr = asctmp;
                break;
 
                case FIPS_TEST_DRBG:
@@ -873,10 +881,12 @@ 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")) {
-           FIPS_corrupt_x931();
+           fail_id = FIPS_TEST_X931;
        } else if (!strcmp(argv[1], "rngstick")) {
            do_rng_stick = 1;
            no_exit = 1;