Commit 1950e8ac authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add more failure testing FIPS functions, for continuous RNG, pairwise RSA/DSA. 

Update fips_test_suite to use them and convert AES, DES3 and SHAx to use EVP.
parent 437bafa5

fips/dsa/fips_dsa_key.c

+9 −0
Original line number Diff line number Diff line
@@ -69,6 +69,13 @@ 


#ifdef OPENSSL_FIPS



static int fips_dsa_pairwise_fail = 0;



void FIPS_corrupt_dsa_keygen(void)

	{

	fips_dsa_pairwise_fail = 1;

	}



static int dsa_builtin_keygen(DSA *dsa);



int fips_check_dsa(DSA *dsa)
@@ -145,6 +152,8 @@ static int dsa_builtin_keygen(DSA *dsa) 


	dsa->priv_key=priv_key;

	dsa->pub_key=pub_key;

	if (fips_dsa_pairwise_fail)

		BN_add_word(dsa->pub_key, 1);

	if(!fips_check_dsa(dsa))

	    goto err;

	ok=1;

fips/fips.h

+3 −0
Original line number Diff line number Diff line
@@ -73,10 +73,13 @@ int FIPS_selftest_aes(void); 
void FIPS_corrupt_des(void);

int FIPS_selftest_des(void);

void FIPS_corrupt_rsa(void);

void FIPS_corrupt_rsa_keygen(void);

int FIPS_selftest_rsa(void);

void FIPS_corrupt_dsa(void);

void FIPS_corrupt_dsa_keygen(void);

int FIPS_selftest_dsa(void);

void FIPS_corrupt_rng(void);

void FIPS_rng_stick(void);

int FIPS_selftest_rng(void);

int FIPS_selftest_hmac(void);

fips/fips_test_suite.c

+98 −57
Original line number Diff line number Diff line
@@ -40,52 +40,57 @@ int main(int argc, char *argv[]) 


/* AES: encrypt and decrypt known plaintext, verify result matches original plaintext

*/

static int FIPS_aes_test()

static int FIPS_aes_test(void)

	{

    unsigned char userkey[16] = { 0xde, 0xad, 0xbe, 0xef, 0xfe, 0xed, 0xf0, 0x0d };

	int ret = 0;

	unsigned char pltmp[16];

	unsigned char citmp[16];

	unsigned char key[16] = { 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16};

	unsigned char plaintext[16] = "etaonrishdlcu";

    unsigned char ciphertext[16];

    unsigned char buf[16];

    AES_KEY key;

    AES_KEY dkey;



    ERR_clear_error();

    if (AES_set_encrypt_key( userkey, 128, &key ))

	return 0;

    AES_encrypt( plaintext, ciphertext, &key);

    if (AES_set_decrypt_key( userkey, 128, &dkey ))

        return 0;

    AES_decrypt( ciphertext, buf, &dkey);

    if (memcmp(buf, plaintext, sizeof(buf)))

        return 0;

    return 1;

	EVP_CIPHER_CTX ctx;

	EVP_CIPHER_CTX_init(&ctx);

	if (EVP_CipherInit_ex(&ctx, EVP_aes_128_ecb(),NULL, key, NULL, 1) <= 0)

		goto err;

	EVP_Cipher(&ctx, citmp, plaintext, 16);

	if (EVP_CipherInit_ex(&ctx, EVP_aes_128_ecb(),NULL, key, NULL, 0) <= 0)

		goto err;

	EVP_Cipher(&ctx, pltmp, citmp, 16);

	if (memcmp(pltmp, plaintext, 16))

		goto err;

	ret = 1;

	err:

	EVP_CIPHER_CTX_cleanup(&ctx);

	return ret;

	}



/* DES: encrypt and decrypt known plaintext, verify result matches original plaintext

*/

static int FIPS_des_test()

static int FIPS_des3_test(void)

	{

    DES_cblock userkey = { 0xde, 0xad, 0xbe, 0xef, 0xfe, 0xed, 0xf0, 0x0d };

    DES_cblock plaintext = { 'e', 't', 'a', 'o', 'n', 'r', 'i', 's' };



    DES_key_schedule key;

    DES_cblock ciphertext;

    DES_cblock buf;



    ERR_clear_error();

    if (DES_set_key(&userkey, &key) < 0)

        return 0;

    DES_ecb_encrypt( &plaintext, &ciphertext, &key, 1);

    DES_ecb_encrypt( &ciphertext, &buf, &key, 0);

    if (memcmp(buf, plaintext, sizeof(buf)))

        return 0;

    return 1;

	int ret = 0;

	unsigned char pltmp[8];

	unsigned char citmp[8];

    	unsigned char key[] = { 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,

		              19,20,21,22,23,24};

    	unsigned char plaintext[] = { 'e', 't', 'a', 'o', 'n', 'r', 'i', 's' };

	EVP_CIPHER_CTX ctx;

	EVP_CIPHER_CTX_init(&ctx);

	if (EVP_CipherInit_ex(&ctx, EVP_des_ede3_ecb(),NULL, key, NULL, 1) <= 0)

		goto err;

	EVP_Cipher(&ctx, citmp, plaintext, 8);

	if (EVP_CipherInit_ex(&ctx, EVP_des_ede3_ecb(),NULL, key, NULL, 0) <= 0)

		goto err;

	EVP_Cipher(&ctx, pltmp, citmp, 8);

	if (memcmp(pltmp, plaintext, 8))

		goto err;

	ret = 1;

	err:

	EVP_CIPHER_CTX_cleanup(&ctx);

	return ret;

	}



/*

 * DSA: generate keys and sign, verify input plaintext.

 */

static int FIPS_dsa_test()

static int FIPS_dsa_test(int bad)

    {

    DSA *dsa = NULL;

    EVP_PKEY pk;
@@ -104,6 +109,8 @@ static int FIPS_dsa_test() 
	goto end;

    if (!DSA_generate_key(dsa))

	goto end;

    if (bad)

	    BN_add_word(dsa->pub_key, 1);



    pk.type = EVP_PKEY_DSA;

    pk.pkey.dsa = dsa;
@@ -132,7 +139,7 @@ static int FIPS_dsa_test() 
/*

 * RSA: generate keys and sign, verify input plaintext.

 */

static int FIPS_rsa_test()

static int FIPS_rsa_test(int bad)

    {

    RSA *key;

    unsigned char input_ptext[] = "etaonrishdlc";
@@ -153,6 +160,8 @@ static int FIPS_rsa_test() 
    if (!RSA_generate_key_ex(key, 1024,bn,NULL))

	return 0;

    BN_free(bn);

    if (bad)

	    BN_add_word(key->n, 1);



    pk.type = EVP_PKEY_RSA;

    pk.pkey.rsa = key;
@@ -209,7 +218,7 @@ static int FIPS_sha256_test() 
    unsigned char md[SHA256_DIGEST_LENGTH];



    ERR_clear_error();

    if (!SHA256(str,sizeof(str) - 1,md)) return 0;

    if (!EVP_Digest(str,sizeof(str) - 1,md, NULL, EVP_sha256(), NULL)) return 0;

    if (memcmp(md,digest,sizeof(md)))

        return 0;

    return 1;
@@ -230,7 +239,7 @@ static int FIPS_sha512_test() 
    unsigned char md[SHA512_DIGEST_LENGTH];



    ERR_clear_error();

    if (!SHA512(str,sizeof(str) - 1,md)) return 0;

    if (!EVP_Digest(str,sizeof(str) - 1,md, NULL, EVP_sha512(), NULL)) return 0;

    if (memcmp(md,digest,sizeof(md)))

        return 0;

    return 1;
@@ -401,6 +410,7 @@ static int Zeroize() 
static int Error;

const char * Fail(const char *msg)

    {

    do_print_errors();

    Error++;

    return msg; 

    }
@@ -408,6 +418,11 @@ const char * Fail(const char *msg) 
int main(int argc,char **argv)

    {



    int do_corrupt_rsa_keygen = 0, do_corrupt_dsa_keygen = 0;

    int bad_rsa = 0, bad_dsa = 0;

    int do_rng_stick = 0;

    int no_exit = 0;



    printf("\tFIPS-mode test application\n\n");



    /* Load entropy from external file, if any */
@@ -420,25 +435,44 @@ int main(int argc,char **argv) 
            printf("AES encryption/decryption with corrupted KAT...\n");

        } else if (!strcmp(argv[1], "des")) {

            FIPS_corrupt_des();

            printf("DES-ECB encryption/decryption with corrupted KAT...\n");

            printf("DES3-ECB encryption/decryption with corrupted KAT...\n");

        } else if (!strcmp(argv[1], "dsa")) {

            FIPS_corrupt_dsa();

            printf("DSA key generation and signature validation with corrupted KAT...\n");

        } else if (!strcmp(argv[1], "rsa")) {

            FIPS_corrupt_rsa();

            printf("RSA key generation and encryption/decryption with corrupted KAT...\n");

            printf("RSA key generation and signature validation with corrupted KAT...\n");

        } else if (!strcmp(argv[1], "rsakey")) {

            printf("RSA key generation and signature validation with corrupted key...\n");

	    bad_rsa = 1;

	    no_exit = 1;

        } else if (!strcmp(argv[1], "rsakeygen")) {

	    do_corrupt_rsa_keygen = 1;

	    no_exit = 1;

            printf("RSA key generation and signature validation with corrupted keygen...\n");

        } else if (!strcmp(argv[1], "dsakey")) {

            printf("DSA key generation and signature validation with corrupted key...\n");

	    bad_dsa = 1;

	    no_exit = 1;

        } else if (!strcmp(argv[1], "dsakeygen")) {

	    do_corrupt_dsa_keygen = 1;

	    no_exit = 1;

            printf("DSA key generation and signature validation with corrupted keygen...\n");

        } else if (!strcmp(argv[1], "sha1")) {

            FIPS_corrupt_sha1();

            printf("SHA-1 hash with corrupted KAT...\n");

	} else if (!strcmp(argv[1], "rng")) {

	    FIPS_corrupt_rng();

	    printf("RNG test with corrupted KAT...\n");

	} else if (!strcmp(argv[1], "rngstick")) {

	    do_rng_stick = 1;

	    no_exit = 1;

	    printf("RNG test with stuck continuous test...\n");

        } else {

            printf("Bad argument \"%s\"\n", argv[1]);

            exit(1);

        }

        if (!FIPS_mode_set(1))

   	    {

	if (!no_exit) {

        	if (!FIPS_mode_set(1)) {

 		    do_print_errors();

        	    printf("Power-up self test failed\n");

		    exit(1);
@@ -446,6 +480,7 @@ int main(int argc,char **argv) 
        	printf("Power-up self test successful\n");

        	exit(0);

	}

    }



    /* Non-Approved cryptographic operation

    */
@@ -464,6 +499,12 @@ int main(int argc,char **argv) 
	exit(1);

	}

    printf("successful\n");

    if (do_corrupt_dsa_keygen)

            FIPS_corrupt_dsa_keygen();

    if (do_corrupt_rsa_keygen)

            FIPS_corrupt_rsa_keygen();

    if (do_rng_stick)

            FIPS_rng_stick();



    /* AES encryption/decryption

    */
@@ -473,17 +514,17 @@ int main(int argc,char **argv) 
    /* RSA key generation and encryption/decryption

    */

    printf("4. RSA key generation and encryption/decryption...");

    printf( FIPS_rsa_test() ? "successful\n" :  Fail("FAILED!\n") );

    printf( FIPS_rsa_test(bad_rsa) ? "successful\n" :  Fail("FAILED!\n") );



    /* DES-CBC encryption/decryption

    */

    printf("5. DES-ECB encryption/decryption...");

    printf( FIPS_des_test() ? "successful\n" :  Fail("FAILED!\n") );

    printf( FIPS_des3_test() ? "successful\n" :  Fail("FAILED!\n") );



    /* DSA key generation and signature validation

    */

    printf("6. DSA key generation and signature validation...");

    printf( FIPS_dsa_test() ? "successful\n" :  Fail("FAILED!\n") );

    printf( FIPS_dsa_test(bad_dsa) ? "successful\n" :  Fail("FAILED!\n") );



    /* SHA-1 hash

    */

fips/rand/fips_rand.c

+10 −1
Original line number Diff line number Diff line
@@ -107,6 +107,13 @@ typedef struct 


static FIPS_PRNG_CTX sctx;



static int fips_prng_fail = 0;



void FIPS_rng_stick(void)

	{

	fips_prng_fail = 1;

	}



void fips_rand_prng_reset(FIPS_PRNG_CTX *ctx)

	{

	ctx->seeded = 0;
@@ -295,9 +302,11 @@ static int fips_rand(FIPS_PRNG_CTX *ctx, 
		for (i = 0; i < AES_BLOCK_LENGTH; i++)

			tmp[i] = R[i] ^ I[i];

		AES_encrypt(tmp, ctx->V, &ctx->ks);

		/* Continuouse PRNG test */

		/* Continuous PRNG test */

		if (ctx->second)

			{

			if (fips_prng_fail)

				memcpy(ctx->last, R, AES_BLOCK_LENGTH);

			if (!memcmp(R, ctx->last, AES_BLOCK_LENGTH))

				{

	    			RANDerr(RAND_F_FIPS_RAND,RAND_R_PRNG_STUCK);

fips/rsa/fips_rsa_gen.c

+10 −0
Original line number Diff line number Diff line
@@ -75,6 +75,13 @@ 


#ifdef OPENSSL_FIPS



static int fips_rsa_pairwise_fail = 0;



void FIPS_corrupt_rsa_keygen(void)

	{

	fips_rsa_pairwise_fail = 1;

	}



int fips_check_rsa(RSA *rsa)

	{

	const unsigned char tbs[] = "RSA Pairwise Check Data";
@@ -278,6 +285,9 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, BN_GENCB *cb) 
		p = rsa->p;

	if (!BN_mod_inverse(rsa->iqmp,rsa->q,p,ctx)) goto err;



	if (fips_rsa_pairwise_fail)

		BN_add_word(rsa->n, 1);



	if(!fips_check_rsa(rsa))

	    goto err;