Workaround for some CMS signature formats.
[openssl.git] / fips / fips_test_suite.c
index e07b6d6..cf8f085 100644 (file)
@@ -43,6 +43,7 @@ int main(int argc, char *argv[])
 #include <openssl/dh.h>
 
 #include <openssl/fips.h>
 #include <openssl/dh.h>
 
 #include <openssl/fips.h>
+#include <openssl/fips_rand.h>
 #include "fips_utl.h"
 
 /* AES: encrypt and decrypt known plaintext, verify result matches original plaintext
 #include "fips_utl.h"
 
 /* AES: encrypt and decrypt known plaintext, verify result matches original plaintext
@@ -143,11 +144,9 @@ static int FIPS_dsa_test(int bad)
     DSA *dsa = NULL;
     unsigned char dgst[] = "etaonrishdlc";
     int r = 0;
     DSA *dsa = NULL;
     unsigned char dgst[] = "etaonrishdlc";
     int r = 0;
-    EVP_MD_CTX mctx;
     DSA_SIG *sig = NULL;
 
     ERR_clear_error();
     DSA_SIG *sig = NULL;
 
     ERR_clear_error();
-    FIPS_md_ctx_init(&mctx);
     dsa = FIPS_dsa_new();
     if (!dsa)
        goto end;
     dsa = FIPS_dsa_new();
     if (!dsa)
        goto end;
@@ -158,23 +157,14 @@ static int FIPS_dsa_test(int bad)
     if (bad)
            BN_add_word(dsa->pub_key, 1);
 
     if (bad)
            BN_add_word(dsa->pub_key, 1);
 
-    if (!FIPS_digestinit(&mctx, EVP_sha256()))
-       goto end;
-    if (!FIPS_digestupdate(&mctx, dgst, sizeof(dgst) - 1))
-       goto end;
-    sig = FIPS_dsa_sign_ctx(dsa, &mctx);
+    sig = FIPS_dsa_sign(dsa, dgst, sizeof(dgst) -1, EVP_sha256());
     if (!sig)
        goto end;
 
     if (!sig)
        goto end;
 
-    if (!FIPS_digestinit(&mctx, EVP_sha256()))
-       goto end;
-    if (!FIPS_digestupdate(&mctx, dgst, sizeof(dgst) - 1))
-       goto end;
-    r = FIPS_dsa_verify_ctx(dsa, &mctx, sig);
+    r = FIPS_dsa_verify(dsa, dgst, sizeof(dgst) -1, EVP_sha256(), sig);
     end:
     if (sig)
        FIPS_dsa_sig_free(sig);
     end:
     if (sig)
        FIPS_dsa_sig_free(sig);
-    FIPS_md_ctx_cleanup(&mctx);
     if (dsa)
          FIPS_dsa_free(dsa);
     if (r != 1)
     if (dsa)
          FIPS_dsa_free(dsa);
     if (r != 1)
@@ -192,11 +182,9 @@ static int FIPS_rsa_test(int bad)
     unsigned char buf[256];
     unsigned int slen;
     BIGNUM *bn;
     unsigned char buf[256];
     unsigned int slen;
     BIGNUM *bn;
-    EVP_MD_CTX mctx;
     int r = 0;
 
     ERR_clear_error();
     int r = 0;
 
     ERR_clear_error();
-    FIPS_md_ctx_init(&mctx);
     key = FIPS_rsa_new();
     bn = BN_new();
     if (!key || !bn)
     key = FIPS_rsa_new();
     bn = BN_new();
     if (!key || !bn)
@@ -208,20 +196,13 @@ static int FIPS_rsa_test(int bad)
     if (bad)
            BN_add_word(key->n, 1);
 
     if (bad)
            BN_add_word(key->n, 1);
 
-    if (!FIPS_digestinit(&mctx, EVP_sha256()))
-       goto end;
-    if (!FIPS_digestupdate(&mctx, input_ptext, sizeof(input_ptext) - 1))
-       goto end;
-    if (!FIPS_rsa_sign_ctx(key, &mctx, RSA_PKCS1_PADDING, 0, NULL, buf, &slen))
+    if (!FIPS_rsa_sign(key, input_ptext, sizeof(input_ptext) - 1, EVP_sha256(),
+                       RSA_PKCS1_PADDING, 0, NULL, buf, &slen))
        goto end;
 
        goto end;
 
-    if (!FIPS_digestinit(&mctx, EVP_sha256()))
-       goto end;
-    if (!FIPS_digestupdate(&mctx, input_ptext, sizeof(input_ptext) - 1))
-       goto end;
-    r = FIPS_rsa_verify_ctx(key, &mctx, RSA_PKCS1_PADDING, 0, NULL, buf, slen);
+    r = FIPS_rsa_verify(key, input_ptext, sizeof(input_ptext) - 1, EVP_sha256(),
+                       RSA_PKCS1_PADDING, 0, NULL, buf, slen);
     end:
     end:
-    FIPS_md_ctx_cleanup(&mctx);
     if (key)
          FIPS_rsa_free(key);
     if (r != 1)
     if (key)
          FIPS_rsa_free(key);
     if (r != 1)
@@ -650,9 +631,115 @@ static int Zeroize()
     for(i = 0; i < sizeof(userkey); i++) printf("%02x", userkey[i]);
         printf("\n");
 
     for(i = 0; i < sizeof(userkey); i++) printf("%02x", userkey[i]);
         printf("\n");
 
+    FIPS_rsa_free(key);
+
     return 1;
     }
 
     return 1;
     }
 
+/* Dummy Entropy for DRBG tests. WARNING: THIS IS TOTALLY BOGUS
+ * HAS ZERO SECURITY AND MUST NOT BE USED IN REAL APPLICATIONS.
+ */
+
+static unsigned char dummy_drbg_entropy[1024];
+
+static size_t drbg_test_cb(DRBG_CTX *ctx, unsigned char **pout,
+                                int entropy, size_t min_len, size_t max_len)
+       {
+       *pout = dummy_drbg_entropy;
+       /* Round up to multiple of block size */
+       return (min_len + 0xf) & ~0xf;
+       }
+
+/* Callback which returns 0 to indicate entropy source failure */
+static size_t drbg_fail_cb(DRBG_CTX *ctx, unsigned char **pout,
+                                int entropy, size_t min_len, size_t max_len)
+       {
+       return 0;
+       }
+
+/* DRBG test: just generate lots of data and trigger health checks */
+
+static int do_drbg_test(int type, int flags)
+    {
+    DRBG_CTX *dctx;
+    int rv = 0;
+    size_t i;
+    unsigned char randout[1024];
+    dctx = FIPS_drbg_new(type, flags);
+    if (!dctx)
+       return 0;
+    FIPS_drbg_set_callbacks(dctx, drbg_test_cb, 0, 0x10, drbg_test_cb, 0);
+    for (i = 0; i < sizeof(dummy_drbg_entropy); i++)
+       {
+       dummy_drbg_entropy[i] = i & 0xff;
+       }
+    if (!FIPS_drbg_instantiate(dctx, dummy_drbg_entropy, 10))
+       goto err;
+    FIPS_drbg_set_check_interval(dctx, 10);
+    for (i = 0; i < 32; i++)
+       {
+       if (!FIPS_drbg_generate(dctx, randout, sizeof(randout), 0, NULL, 0))
+               goto err;
+       if (!FIPS_drbg_generate(dctx, randout, sizeof(randout), 0, dummy_drbg_entropy, 1))
+               goto err;
+       }
+    rv = 1;
+    err:
+    FIPS_drbg_free(dctx);
+    return rv;
+    }
+
+typedef struct 
+    {
+    int type, flags;
+    } DRBG_LIST;
+
+static int do_drbg_all(void)
+    {
+    static DRBG_LIST drbg_types[] =
+       {
+               {NID_sha1, 0},
+               {NID_sha224, 0},
+               {NID_sha256, 0},
+               {NID_sha384, 0},
+               {NID_sha512, 0},
+               {NID_hmacWithSHA1, 0},
+               {NID_hmacWithSHA224, 0},
+               {NID_hmacWithSHA256, 0},
+               {NID_hmacWithSHA384, 0},
+               {NID_hmacWithSHA512, 0},
+               {NID_aes_128_ctr, 0},
+               {NID_aes_192_ctr, 0},
+               {NID_aes_256_ctr, 0},
+               {NID_aes_128_ctr, DRBG_FLAG_CTR_USE_DF},
+               {NID_aes_192_ctr, DRBG_FLAG_CTR_USE_DF},
+               {NID_aes_256_ctr, DRBG_FLAG_CTR_USE_DF},
+               {(NID_X9_62_prime256v1 << 16)|NID_sha1, 0},
+               {(NID_X9_62_prime256v1 << 16)|NID_sha224, 0},
+               {(NID_X9_62_prime256v1 << 16)|NID_sha256, 0},
+               {(NID_X9_62_prime256v1 << 16)|NID_sha384, 0},
+               {(NID_X9_62_prime256v1 << 16)|NID_sha512, 0},
+               {(NID_secp384r1 << 16)|NID_sha224, 0},
+               {(NID_secp384r1 << 16)|NID_sha256, 0},
+               {(NID_secp384r1 << 16)|NID_sha384, 0},
+               {(NID_secp384r1 << 16)|NID_sha512, 0},
+               {(NID_secp521r1 << 16)|NID_sha256, 0},
+               {(NID_secp521r1 << 16)|NID_sha384, 0},
+               {(NID_secp521r1 << 16)|NID_sha512, 0},
+               {0, 0}
+       };
+    DRBG_LIST *lst;
+    int rv = 1;
+    for (lst = drbg_types;; lst++)
+       {
+       if (lst->type == 0)
+               break;
+       if (!do_drbg_test(lst->type, lst->flags))
+               rv = 0;
+       }
+    return rv;
+    }
+
 static int Error;
 static const char * Fail(const char *msg)
     {
 static int Error;
 static const char * Fail(const char *msg)
     {
@@ -679,17 +766,31 @@ POST_ID id_list[] = {
        {NID_sha256, "SHA256"},
        {NID_sha384, "SHA384"},
        {NID_sha512, "SHA512"},
        {NID_sha256, "SHA256"},
        {NID_sha384, "SHA384"},
        {NID_sha512, "SHA512"},
+       {NID_hmacWithSHA1, "HMAC-SHA1"},
+       {NID_hmacWithSHA224, "HMAC-SHA224"},
+       {NID_hmacWithSHA256, "HMAC-SHA256"},
+       {NID_hmacWithSHA384, "HMAC-SHA384"},
+       {NID_hmacWithSHA512, "HMAC-SHA512"},
        {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"},
        {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_ctr, "AES-128-CTR"},
+       {NID_aes_192_ctr, "AES-192-CTR"},
+       {NID_aes_256_ctr, "AES-256-CTR"},
        {NID_aes_128_ecb, "AES-128-ECB"},
        {NID_aes_128_xts, "AES-128-XTS"},
        {NID_aes_256_xts, "AES-256-XTS"},
        {NID_des_ede3_cbc, "DES-EDE3-CBC"},
        {NID_des_ede3_ecb, "DES-EDE3-ECB"},
        {NID_aes_128_ecb, "AES-128-ECB"},
        {NID_aes_128_xts, "AES-128-XTS"},
        {NID_aes_256_xts, "AES-256-XTS"},
        {NID_des_ede3_cbc, "DES-EDE3-CBC"},
        {NID_des_ede3_ecb, "DES-EDE3-ECB"},
+       {NID_secp224r1, "P-224"},
+       {NID_sect233r1, "B-233"},
+       {NID_sect233k1, "K-233"},
+       {NID_X9_62_prime256v1, "P-256"},
+       {NID_secp384r1, "P-384"},
+       {NID_secp521r1, "P-521"},
        {0, NULL}
 };
 
        {0, NULL}
 };
 
@@ -710,11 +811,17 @@ static int fail_id = -1;
 static int fail_sub = -1;
 static int fail_key = -1;
 
 static int fail_sub = -1;
 static int fail_key = -1;
 
+static int st_err, post_quiet = 0;
+
 static int post_cb(int op, int id, int subid, void *ex)
        {
        const char *idstr, *exstr = "";
        char asctmp[20];
        int keytype = -1;
 static int post_cb(int op, int id, int subid, void *ex)
        {
        const char *idstr, *exstr = "";
        char asctmp[20];
        int keytype = -1;
+       int exp_fail = 0;
+#ifdef FIPS_POST_TIME
+       static struct timespec start, end, tstart, tend;
+#endif
        switch(id)
                {
                case FIPS_TEST_INTEGRITY:
        switch(id)
                {
                case FIPS_TEST_INTEGRITY:
@@ -736,7 +843,17 @@ static int post_cb(int op, int id, int subid, void *ex)
                        {
                        EVP_PKEY *pkey = ex;
                        keytype = pkey->type;
                        {
                        EVP_PKEY *pkey = ex;
                        keytype = pkey->type;
-                       exstr = lookup_id(keytype);
+                       if (keytype == EVP_PKEY_EC)
+                               {
+                               const EC_GROUP *grp;
+                               int cnid;
+                               grp = EC_KEY_get0_group(pkey->pkey.ec);
+                               cnid = EC_GROUP_get_curve_name(grp);
+                               sprintf(asctmp, "ECDSA %s", lookup_id(cnid));
+                               exstr = asctmp;
+                               }
+                       else
+                               exstr = lookup_id(keytype);
                        }
                idstr = "Signature";
                break;
                        }
                idstr = "Signature";
                break;
@@ -772,6 +889,20 @@ static int post_cb(int op, int id, int subid, void *ex)
 
                case FIPS_TEST_DRBG:
                idstr = "DRBG";
 
                case FIPS_TEST_DRBG:
                idstr = "DRBG";
+               if (*(int *)ex & DRBG_FLAG_CTR_USE_DF)
+                       {
+                       sprintf(asctmp, "%s DF", lookup_id(subid));
+                       exstr = asctmp;
+                       }
+               else if (subid >> 16)
+                       {
+                       sprintf(asctmp, "%s %s",
+                                       lookup_id(subid >> 16),
+                                       lookup_id(subid & 0xFFFF));
+                       exstr = asctmp;
+                       }
+               else
+                       exstr = lookup_id(subid);
                break;
 
                case FIPS_TEST_PAIRWISE:
                break;
 
                case FIPS_TEST_PAIRWISE:
@@ -788,38 +919,85 @@ static int post_cb(int op, int id, int subid, void *ex)
                idstr = "Continuous PRNG";
                break;
 
                idstr = "Continuous PRNG";
                break;
 
+               case FIPS_TEST_ECDH:
+               idstr = "ECDH";
+               exstr = lookup_id(subid);
+               break;
+
                default:
                idstr = "Unknown";
                break;
 
                }
 
                default:
                idstr = "Unknown";
                break;
 
                }
 
+       if (fail_id == id
+               && (fail_key == -1 || fail_key == keytype)
+               && (fail_sub == -1 || fail_sub == subid))
+                       exp_fail = 1;
+
        switch(op)
                {
                case FIPS_POST_BEGIN:
        switch(op)
                {
                case FIPS_POST_BEGIN:
+#ifdef FIPS_POST_TIME
+               clock_getres(CLOCK_REALTIME, &tstart);
+               printf("\tTimer resolution %ld s, %ld ns\n",
+                               (long)tstart.tv_sec, (long)tstart.tv_nsec);
+               clock_gettime(CLOCK_REALTIME, &tstart);
+#endif
                printf("\tPOST started\n");
                break;
 
                case FIPS_POST_END:
                printf("\tPOST %s\n", id ? "Success" : "Failed");
                printf("\tPOST started\n");
                break;
 
                case FIPS_POST_END:
                printf("\tPOST %s\n", id ? "Success" : "Failed");
+#ifdef FIPS_POST_TIME
+               clock_gettime(CLOCK_REALTIME, &tend);
+               printf("\t\tTook %f seconds\n",
+                       (double)((tend.tv_sec+tend.tv_nsec*1e-9)
+                        - (tstart.tv_sec+tstart.tv_nsec*1e-9)));
+#endif
                break;
 
                case FIPS_POST_STARTED:
                break;
 
                case FIPS_POST_STARTED:
-               printf("\t\t%s %s test started\n", idstr, exstr);
+               if (!post_quiet && !exp_fail)
+                       printf("\t\t%s %s test started\n", idstr, exstr);
+#ifdef FIPS_POST_TIME
+               clock_gettime(CLOCK_REALTIME, &start);
+#endif
                break;
 
                case FIPS_POST_SUCCESS:
                break;
 
                case FIPS_POST_SUCCESS:
-               printf("\t\t%s %s test OK\n", idstr, exstr);
+               if (exp_fail)
+                       {
+                       printf("\t\t%s %s test OK but should've failed\n",
+                                                               idstr, exstr);
+                       st_err++;
+                       }
+               else if (!post_quiet)
+                       printf("\t\t%s %s test OK\n", idstr, exstr);
+#ifdef FIPS_POST_TIME
+               clock_gettime(CLOCK_REALTIME, &end);
+               printf("\t\t\tTook %f seconds\n",
+                       (double)((end.tv_sec+end.tv_nsec*1e-9)
+                        - (start.tv_sec+start.tv_nsec*1e-9)));
+#endif
                break;
 
                case FIPS_POST_FAIL:
                break;
 
                case FIPS_POST_FAIL:
-               printf("\t\t%s %s test FAILED!!\n", idstr, exstr);
+               if (exp_fail)
+                       {
+                       printf("\t\t%s %s test failed as expected\n",
+                                                       idstr, exstr);
+                       }
+               else
+                       {
+                       printf("\t\t%s %s test Failed Incorrectly!!\n",
+                                                       idstr, exstr);
+                       st_err++;
+                       }
                break;
 
                case FIPS_POST_CORRUPT:
                break;
 
                case FIPS_POST_CORRUPT:
-               if (fail_id == id
-                       && (fail_key == -1 || fail_key == keytype)
-                       && (fail_sub == -1 || fail_sub == subid))
+               if (exp_fail)
                        {
                        printf("\t\t%s %s test failure induced\n", idstr, exstr);
                        return 0;
                        {
                        printf("\t\t%s %s test failure induced\n", idstr, exstr);
                        return 0;
@@ -830,105 +1008,461 @@ static int post_cb(int op, int id, int subid, void *ex)
        return 1;
        }
 
        return 1;
        }
 
-int main(int argc,char **argv)
+/* Test POST induced failures */
+
+typedef struct 
+       {
+       const char *name;
+       int id, subid, keyid;
+       } fail_list;
+
+static fail_list flist[] =
+       {
+       {"Integrity", FIPS_TEST_INTEGRITY, -1, -1},
+       {"AES", FIPS_TEST_CIPHER, NID_aes_128_ecb, -1},
+       {"DES3", FIPS_TEST_CIPHER, NID_des_ede3_ecb, -1},
+       {"AES-GCM", FIPS_TEST_GCM, -1, -1},
+       {"AES-CCM", FIPS_TEST_CCM, -1, -1},
+       {"AES-XTS", FIPS_TEST_XTS, -1, -1},
+       {"Digest", FIPS_TEST_DIGEST, -1, -1},
+       {"HMAC", FIPS_TEST_HMAC, -1, -1},
+       {"CMAC", FIPS_TEST_CMAC, -1, -1},
+       {"DRBG", FIPS_TEST_DRBG, -1, -1},
+       {"X9.31 PRNG", FIPS_TEST_X931, -1, -1},
+       {"RSA", FIPS_TEST_SIGNATURE, -1, EVP_PKEY_RSA},
+       {"DSA", FIPS_TEST_SIGNATURE, -1, EVP_PKEY_DSA},
+       {"ECDSA", FIPS_TEST_SIGNATURE, -1, EVP_PKEY_EC},
+       {"ECDH", FIPS_TEST_ECDH, -1, -1},
+       {NULL, -1, -1, -1}
+       };
+
+static int do_fail_all(int fullpost, int fullerr)
+       {
+       fail_list *ftmp;
+       int rv;
+       size_t i;
+       RSA *rsa = NULL;
+       DSA *dsa = NULL;
+       DRBG_CTX *dctx = NULL, *defctx = NULL;
+       EC_KEY *ec = NULL;
+       BIGNUM *bn = NULL;
+       unsigned char out[10];
+       if (!fullpost)
+               post_quiet = 1;
+       if (!fullerr)
+               no_err = 1;
+       FIPS_module_mode_set(0, NULL);
+       for (ftmp = flist; ftmp->name; ftmp++)
+               {
+               printf("    Testing induced failure of %s test\n", ftmp->name);
+               fail_id = ftmp->id;
+               fail_sub = ftmp->subid;
+               fail_key = ftmp->keyid;
+               rv = FIPS_module_mode_set(1, FIPS_AUTH_USER_PASS);
+               if (rv)
+                       {
+                       printf("\tFIPS mode incorrectly successful!!\n");
+                       st_err++;
+                       }
+               }
+       printf("    Testing induced failure of RSA keygen test\n");
+       /* NB POST will succeed with a pairwise test failures as
+        * it is not used during POST.
+        */
+       fail_id = FIPS_TEST_PAIRWISE;
+       fail_key = EVP_PKEY_RSA;
+       /* Now enter FIPS mode successfully */
+       if (!FIPS_module_mode_set(1, FIPS_AUTH_USER_PASS))
+               {
+               printf("\tError entering FIPS mode\n");
+               st_err++;
+               }
+
+       rsa = FIPS_rsa_new();
+       bn = BN_new();
+       if (!rsa || !bn)
+               return 0;
+       BN_set_word(bn, 65537);
+       if (RSA_generate_key_ex(rsa, 2048,bn,NULL))
+               {
+               printf("\tRSA key generated OK incorrectly!!\n");
+               st_err++;
+               }
+       else
+               printf("\tRSA key generation failed as expected.\n");
+
+       /* Leave FIPS mode to clear error */
+       FIPS_module_mode_set(0, NULL);
+
+       printf("    Testing induced failure of DSA keygen test\n");
+       fail_key = EVP_PKEY_DSA;
+       /* Enter FIPS mode successfully */
+       if (!FIPS_module_mode_set(1, FIPS_AUTH_USER_PASS))
+               {
+               printf("\tError entering FIPS mode\n");
+               st_err++;
+               }
+       dsa = FIPS_dsa_new();
+       if (!dsa)
+               return 0;
+       if (!DSA_generate_parameters_ex(dsa, 1024,NULL,0,NULL,NULL,NULL))
+               return 0;
+       if (DSA_generate_key(dsa))
+               {
+               printf("\tDSA key generated OK incorrectly!!\n");
+               st_err++;
+               }
+       else
+               printf("\tDSA key generation failed as expected.\n");
+
+       /* Leave FIPS mode to clear error */
+       FIPS_module_mode_set(0, NULL);
+       /* Enter FIPS mode successfully */
+       if (!FIPS_module_mode_set(1, FIPS_AUTH_USER_PASS))
+               {
+               printf("\tError entering FIPS mode\n");
+               st_err++;
+               }
+
+       printf("    Testing induced failure of ECDSA keygen test\n");
+       fail_key = EVP_PKEY_EC;
+
+       ec = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
+
+       if (!ec)
+               return 0;
+
+       if (EC_KEY_generate_key(ec))
+               {
+               printf("\tECDSA key generated OK incorrectly!!\n");
+               st_err++;
+               }
+       else
+               printf("\tECDSA key generation failed as expected.\n");
+
+       FIPS_ec_key_free(ec);
+       ec = NULL;
+
+       fail_id = -1;
+       fail_sub = -1;
+       fail_key = -1;
+       /* Leave FIPS mode to clear error */
+       FIPS_module_mode_set(0, NULL);
+       /* Enter FIPS mode successfully */
+       if (!FIPS_module_mode_set(1, FIPS_AUTH_USER_PASS))
+               {
+               printf("\tError entering FIPS mode\n");
+               st_err++;
+               }
+       /* Induce continuous PRNG failure for DRBG */
+       printf("    Testing induced failure of DRBG CPRNG test\n");
+       FIPS_drbg_stick(1);
+
+       /* Initialise a DRBG context */
+       dctx = FIPS_drbg_new(NID_sha1, 0);
+       if (!dctx)
+               return 0;
+       for (i = 0; i < sizeof(dummy_drbg_entropy); i++)
+               {
+               dummy_drbg_entropy[i] = i & 0xff;
+               }
+       FIPS_drbg_set_callbacks(dctx, drbg_test_cb, 0, 0x10, drbg_test_cb, 0);
+       if (!FIPS_drbg_instantiate(dctx, dummy_drbg_entropy, 10))
+               {
+               printf("\tDRBG instantiate error!!\n");
+               st_err++;
+               }
+       if (FIPS_drbg_generate(dctx, out, sizeof(out), 0, NULL, 0))
+               {
+               printf("\tDRBG continuous PRNG OK incorrectly!!\n");
+               st_err++;
+               }
+       else
+               printf("\tDRBG continuous PRNG failed as expected\n");
+       FIPS_drbg_stick(0);
+
+       /* Leave FIPS mode to clear error */
+       FIPS_module_mode_set(0, NULL);
+       /* Enter FIPS mode successfully */
+       if (!FIPS_module_mode_set(1, FIPS_AUTH_USER_PASS))
+               {
+               printf("\tError entering FIPS mode\n");
+               st_err++;
+               }
+
+       FIPS_drbg_free(dctx);
+
+       /* Induce continuous PRNG failure for DRBG entropy source*/
+       printf("    Testing induced failure of DRBG entropy CPRNG test\n");
+
+       /* Initialise a DRBG context */
+       dctx = FIPS_drbg_new(NID_sha1, 0);
+       if (!dctx)
+               return 0;
+       for (i = 0; i < sizeof(dummy_drbg_entropy); i++)
+               {
+               dummy_drbg_entropy[i] = i & 0xf;
+               }
+       FIPS_drbg_set_callbacks(dctx, drbg_test_cb, 0, 0x10, drbg_test_cb, 0);
+       if (FIPS_drbg_instantiate(dctx, dummy_drbg_entropy, 10))
+               {
+               printf("\tDRBG continuous PRNG entropy OK incorrectly!!\n");
+               st_err++;
+               }
+       else
+               printf("\tDRBG continuous PRNG entropy failed as expected\n");
+       /* Leave FIPS mode to clear error */
+       FIPS_module_mode_set(0, NULL);
+       /* Enter FIPS mode successfully */
+       if (!FIPS_module_mode_set(1, FIPS_AUTH_USER_PASS))
+               {
+               printf("\tError entering FIPS mode\n");
+               st_err++;
+               }
+       FIPS_drbg_free(dctx);
+
+       /* Leave FIPS mode to clear error */
+       FIPS_module_mode_set(0, NULL);
+       /* Enter FIPS mode successfully */
+       if (!FIPS_module_mode_set(1, FIPS_AUTH_USER_PASS))
+               {
+               printf("\tError entering FIPS mode\n");
+               st_err++;
+               }
+
+       printf("    Testing induced failure of X9.31 CPRNG test\n");
+       FIPS_x931_stick(1);
+       if (!FIPS_x931_set_key(dummy_drbg_entropy, 32))
+               {
+               printf("\tError initialiasing X9.31 PRNG\n");
+               st_err++;
+               }
+       if (!FIPS_x931_seed(dummy_drbg_entropy + 32, 16))
+               {
+               printf("\tError seeding X9.31 PRNG\n");
+               st_err++;
+               }
+       if (FIPS_x931_bytes(out, 10) > 0)
+               {
+               printf("\tX9.31 continuous PRNG failure OK incorrectly!!\n");
+               st_err++;
+               }
+       else
+               printf("\tX9.31 continuous PRNG failed as expected\n");
+       FIPS_x931_stick(0);
+
+       /* Leave FIPS mode to clear error */
+       FIPS_module_mode_set(0, NULL);
+       /* Enter FIPS mode successfully */
+       if (!FIPS_module_mode_set(1, FIPS_AUTH_USER_PASS))
+               {
+               printf("\tError entering FIPS mode\n");
+               st_err++;
+               }
+
+       printf("    Testing operation failure with DRBG entropy failure\n");
+
+       /* Generate DSA key for later use */
+       if (DSA_generate_key(dsa))
+               printf("\tDSA key generated OK as expected.\n");
+       else
+               {
+               printf("\tDSA key generation FAILED!!\n");
+               st_err++;
+               }
+
+       /* Initialise default DRBG context */
+       defctx = FIPS_get_default_drbg();
+       if (!defctx)
+               return 0;
+       if (!FIPS_drbg_init(defctx, NID_sha512, 0))
+               return 0;
+       /* Set entropy failure callback */
+       FIPS_drbg_set_callbacks(defctx, drbg_fail_cb, 0, 0x10, drbg_test_cb, 0);
+       if (FIPS_drbg_instantiate(defctx, dummy_drbg_entropy, 10))
+               {
+               printf("\tDRBG entropy fail OK incorrectly!!\n");
+               st_err++;
+               }
+       else
+               printf("\tDRBG entropy fail failed as expected\n");
+
+       if (FIPS_dsa_sign(dsa, dummy_drbg_entropy, 5, EVP_sha256()))
+               {
+               printf("\tDSA signing OK incorrectly!!\n");
+               st_err++;
+               }
+       else
+               printf("\tDSA signing failed as expected\n");
+
+       ec = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
+
+       if (!ec)
+               return 0;
+
+       if (EC_KEY_generate_key(ec))
+               {
+               printf("\tECDSA key generated OK incorrectly!!\n");
+               st_err++;
+               }
+       else
+               printf("\tECDSA key generation failed as expected.\n");
+
+       printf("  Induced failure test completed with %d errors\n", st_err);
+       post_quiet = 0; 
+       no_err = 0;
+       BN_free(bn);
+       FIPS_rsa_free(rsa);
+       FIPS_dsa_free(dsa);
+       FIPS_ec_key_free(ec);
+       if (st_err)
+               return 0;
+       return 1;
+       }
+
+#ifdef FIPS_ALGVS
+int fips_test_suite_main(int argc, char **argv)
+#else
+int main(int argc, char **argv)
+#endif
     {
     {
+    char **args = argv + 1;
     int bad_rsa = 0, bad_dsa = 0;
     int do_rng_stick = 0;
     int do_drbg_stick = 0;
     int no_exit = 0;
     int bad_rsa = 0, bad_dsa = 0;
     int do_rng_stick = 0;
     int do_drbg_stick = 0;
     int no_exit = 0;
-
-    fips_algtest_init_nofips();
+    int no_dh = 0, no_drbg = 0;
+    char *pass = FIPS_AUTH_USER_PASS;
+    int fullpost = 0, fullerr = 0;
 
     FIPS_post_set_callback(post_cb);
 
 
     FIPS_post_set_callback(post_cb);
 
-    printf("\tFIPS-mode test application\n\n");
+    printf("\tFIPS-mode test application\n");
+
+    printf("\t%s\n\n", FIPS_module_version_text());
 
 
-    if (argv[1]) {
+    while(*args) {
         /* Corrupted KAT tests */
         /* Corrupted KAT tests */
-        if (!strcmp(argv[1], "integrity")) {
+        if (!strcmp(*args, "integrity")) {
            fail_id = FIPS_TEST_INTEGRITY;
            fail_id = FIPS_TEST_INTEGRITY;
-        } else if (!strcmp(argv[1], "aes")) {
+        } else if (!strcmp(*args, "aes")) {
            fail_id = FIPS_TEST_CIPHER;
            fail_sub = NID_aes_128_ecb; 
            fail_id = FIPS_TEST_CIPHER;
            fail_sub = NID_aes_128_ecb; 
-        } else if (!strcmp(argv[1], "aes-gcm")) {
+        } else if (!strcmp(*args, "aes-ccm")) {
+           fail_id = FIPS_TEST_CCM;
+        } else if (!strcmp(*args, "aes-gcm")) {
            fail_id = FIPS_TEST_GCM;
            fail_id = FIPS_TEST_GCM;
-        } else if (!strcmp(argv[1], "aes-xts")) {
+        } else if (!strcmp(*args, "aes-xts")) {
            fail_id = FIPS_TEST_XTS;
            fail_id = FIPS_TEST_XTS;
-        } else if (!strcmp(argv[1], "des")) {
+        } else if (!strcmp(*args, "des")) {
            fail_id = FIPS_TEST_CIPHER;
            fail_sub = NID_des_ede3_ecb;        
            fail_id = FIPS_TEST_CIPHER;
            fail_sub = NID_des_ede3_ecb;        
-        } else if (!strcmp(argv[1], "dsa")) {
+        } else if (!strcmp(*args, "dsa")) {
            fail_id = FIPS_TEST_SIGNATURE;
            fail_key = EVP_PKEY_DSA;    
            fail_id = FIPS_TEST_SIGNATURE;
            fail_key = EVP_PKEY_DSA;    
-        } else if (!strcmp(argv[1], "ecdsa")) {
+        } else if (!strcmp(argv[1], "ecdh")) {
+           fail_id = FIPS_TEST_ECDH;
+        } else if (!strcmp(*args, "ecdsa")) {
            fail_id = FIPS_TEST_SIGNATURE;
            fail_key = EVP_PKEY_EC;     
            fail_id = FIPS_TEST_SIGNATURE;
            fail_key = EVP_PKEY_EC;     
-        } else if (!strcmp(argv[1], "rsa")) {
+        } else if (!strcmp(*args, "rsa")) {
            fail_id = FIPS_TEST_SIGNATURE;
            fail_key = EVP_PKEY_RSA;    
            fail_id = FIPS_TEST_SIGNATURE;
            fail_key = EVP_PKEY_RSA;    
-        } else if (!strcmp(argv[1], "rsakey")) {
+        } else if (!strcmp(*args, "rsakey")) {
             printf("RSA key generation and signature validation with corrupted key...\n");
            bad_rsa = 1;
            no_exit = 1;
             printf("RSA key generation and signature validation with corrupted key...\n");
            bad_rsa = 1;
            no_exit = 1;
-        } else if (!strcmp(argv[1], "rsakeygen")) {
+        } else if (!strcmp(*args, "rsakeygen")) {
            fail_id = FIPS_TEST_PAIRWISE;
            fail_key = EVP_PKEY_RSA;
            no_exit = 1;
            fail_id = FIPS_TEST_PAIRWISE;
            fail_key = EVP_PKEY_RSA;
            no_exit = 1;
-        } else if (!strcmp(argv[1], "dsakey")) {
+        } else if (!strcmp(*args, "dsakey")) {
             printf("DSA key generation and signature validation with corrupted key...\n");
            bad_dsa = 1;
            no_exit = 1;
             printf("DSA key generation and signature validation with corrupted key...\n");
            bad_dsa = 1;
            no_exit = 1;
-        } else if (!strcmp(argv[1], "dsakeygen")) {
+        } else if (!strcmp(*args, "dsakeygen")) {
            fail_id = FIPS_TEST_PAIRWISE;
            fail_key = EVP_PKEY_DSA;
            no_exit = 1;
            fail_id = FIPS_TEST_PAIRWISE;
            fail_key = EVP_PKEY_DSA;
            no_exit = 1;
-        } else if (!strcmp(argv[1], "sha1")) {
+        } else if (!strcmp(*args, "sha1")) {
            fail_id = FIPS_TEST_DIGEST;
            fail_id = FIPS_TEST_DIGEST;
-        } else if (!strcmp(argv[1], "hmac")) {
+        } else if (!strcmp(*args, "hmac")) {
            fail_id = FIPS_TEST_HMAC;
            fail_id = FIPS_TEST_HMAC;
-        } else if (!strcmp(argv[1], "cmac")) {
+        } else if (!strcmp(*args, "cmac")) {
            fail_id = FIPS_TEST_CMAC;
            fail_id = FIPS_TEST_CMAC;
-       } else if (!strcmp(argv[1], "drbg")) {
-           FIPS_corrupt_drbg();
+       } else if (!strcmp(*args, "drbg")) {
+           fail_id = FIPS_TEST_DRBG;
        } else if (!strcmp(argv[1], "rng")) {
            fail_id = FIPS_TEST_X931;
        } else if (!strcmp(argv[1], "rng")) {
            fail_id = FIPS_TEST_X931;
-       } else if (!strcmp(argv[1], "rngstick")) {
+       } else if (!strcmp(*args, "nodrbg")) {
+           no_drbg = 1;
+           no_exit = 1;
+       } else if (!strcmp(*args, "nodh")) {
+           no_dh = 1;
+           no_exit = 1;
+       } else if (!strcmp(*args, "post")) {
+           fail_id = -1;
+       } else if (!strcmp(*args, "rngstick")) {
            do_rng_stick = 1;
            no_exit = 1;
            printf("RNG test with stuck continuous test...\n");
            do_rng_stick = 1;
            no_exit = 1;
            printf("RNG test with stuck continuous test...\n");
-       } else if (!strcmp(argv[1], "drbgstick")) {
+       } else if (!strcmp(*args, "drbgentstick")) {
+               do_entropy_stick();
+       } else if (!strcmp(*args, "drbgstick")) {
            do_drbg_stick = 1;
            no_exit = 1;
            printf("DRBG test with stuck continuous test...\n");
            do_drbg_stick = 1;
            no_exit = 1;
            printf("DRBG test with stuck continuous test...\n");
+       } else if (!strcmp(*args, "user")) {
+               pass = FIPS_AUTH_USER_PASS;
+       } else if (!strcmp(*args, "officer")) {
+               pass = FIPS_AUTH_OFFICER_PASS;
+       } else if (!strcmp(*args, "badpass")) {
+               pass = "bad invalid password";
+       } else if (!strcmp(*args, "nopass")) {
+               pass = "";
+       } else if (!strcmp(*args, "fullpost")) {
+               fullpost = 1;
+               no_exit = 1;
+       } else if (!strcmp(*args, "fullerr")) {
+               fullerr = 1;
+               no_exit = 1;
         } else {
         } else {
-            printf("Bad argument \"%s\"\n", argv[1]);
-            exit(1);
+            printf("Bad argument \"%s\"\n", *args);
+            return 1;
         }
         }
-       if (!no_exit) {
-               if (!FIPS_mode_set(1)) {
+    args++;
+    }
+
+    if ((argc != 1) && !no_exit) {
+               fips_algtest_init_nofips();
+               if (!FIPS_module_mode_set(1, pass)) {
                    printf("Power-up self test failed\n");
                    printf("Power-up self test failed\n");
-                   exit(1);
+                   return 1;
                }
                printf("Power-up self test successful\n");
                }
                printf("Power-up self test successful\n");
-               exit(0);
-       }
+               return 0;
     }
 
     }
 
+    fips_algtest_init_nofips();
+
     /* Non-Approved cryptographic operation
     */
     printf("1. Non-Approved cryptographic operation test...\n");
     /* Non-Approved cryptographic operation
     */
     printf("1. Non-Approved cryptographic operation test...\n");
-    test_msg("\ta. Included algorithm (D-H)...", dh_test());
+    if (no_dh)
+       printf("\t D-H test skipped\n");
+    else
+       test_msg("\ta. Included algorithm (D-H)...", dh_test());
 
     /* Power-up self test
     */
     ERR_clear_error();
 
     /* Power-up self test
     */
     ERR_clear_error();
-    test_msg("2. Automatic power-up self test", FIPS_mode_set(1));
-    if (!FIPS_mode())
-       exit(1);
+    test_msg("2. Automatic power-up self test", FIPS_module_mode_set(1, pass));
+    if (!FIPS_module_mode())
+       return 1;
     if (do_drbg_stick)
     if (do_drbg_stick)
-            FIPS_drbg_stick();
+            FIPS_drbg_stick(1);
     if (do_rng_stick)
     if (do_rng_stick)
-            FIPS_x931_stick();
+            FIPS_x931_stick(1);
 
     /* AES encryption/decryption
     */
 
     /* AES encryption/decryption
     */
@@ -1009,6 +1543,7 @@ int main(int argc,char **argv)
     */
     printf("9. Non-Approved cryptographic operation test...\n");
     printf("\ta. Included algorithm (D-H)...%s\n",
     */
     printf("9. Non-Approved cryptographic operation test...\n");
     printf("\ta. Included algorithm (D-H)...%s\n",
+               no_dh ? "skipped" :
                dh_test() ? "successful as expected"
                                                : Fail("failed INCORRECTLY!") );
 
                dh_test() ? "successful as expected"
                                                : Fail("failed INCORRECTLY!") );
 
@@ -1018,6 +1553,20 @@ int main(int argc,char **argv)
                Zeroize() ? "successful as expected"
                                        : Fail("failed INCORRECTLY!") );
 
                Zeroize() ? "successful as expected"
                                        : Fail("failed INCORRECTLY!") );
 
+    printf("11. Complete DRBG health check...\n");
+    printf("\t%s\n", FIPS_selftest_drbg_all() ? "successful as expected"
+                                       : Fail("failed INCORRECTLY!") );
+
+    printf("12. DRBG generation check...\n");
+    if (no_drbg)
+       printf("\tskipped\n");
+    else
+       printf("\t%s\n", do_drbg_all() ? "successful as expected"
+                                       : Fail("failed INCORRECTLY!") );
+
+    printf("13. Induced test failure check...\n");
+    printf("\t%s\n", do_fail_all(fullpost, fullerr) ? "successful as expected"
+                                       : Fail("failed INCORRECTLY!") );
     printf("\nAll tests completed with %d errors\n", Error);
     return Error ? 1 : 0;
     }
     printf("\nAll tests completed with %d errors\n", Error);
     return Error ? 1 : 0;
     }