Add pairwise consistency test to EC.

diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index 7126cd619d2296af1ca73e6bf69408da3e872321..1615ec8a5a7204b760e2a8beb039bd6e67169635 100644 (file)
--- a/crypto/ec/ec_key.c
+++ b/crypto/ec/ec_key.c
@@ -232,6 +232,35 @@ int EC_KEY_up_ref(EC_KEY *r)
        return ((i > 1) ? 1 : 0);
        }
 
        return ((i > 1) ? 1 : 0);
        }
 

+#ifdef OPENSSL_FIPS
+
+#include <openssl/evp.h>
+
+static int fips_ec_pairwise_fail = 0;
+
+void FIPS_corrupt_ec_keygen(void)
+       {
+       fips_ec_pairwise_fail = 1;
+       }
+
+static int fips_check_ec(EC_KEY *key)
+       {
+       EVP_PKEY pk;
+       unsigned char tbs[] = "ECDSA Pairwise Check Data";
+       pk.type = EVP_PKEY_EC;
+       pk.pkey.ec = key;
+
+       if (!fips_pkey_signature_test(&pk, tbs, -1, NULL, 0, NULL, 0, NULL))
+               {
+               FIPSerr(FIPS_F_FIPS_CHECK_EC,FIPS_R_PAIRWISE_TEST_FAILED);
+               fips_set_selftest_fail();
+               return 0;
+               }
+       return 1;
+       }
+
+#endif
+

 int EC_KEY_generate_key(EC_KEY *eckey)
        {       
        int     ok = 0;
 int EC_KEY_generate_key(EC_KEY *eckey)
        {       
        int     ok = 0;


@@ -280,6 +309,17 @@ int EC_KEY_generate_key(EC_KEY *eckey)
        eckey->priv_key = priv_key;
        eckey->pub_key  = pub_key;
 
        eckey->priv_key = priv_key;
        eckey->pub_key  = pub_key;
 

+#ifdef OPENSSL_FIPS
+       if (fips_ec_pairwise_fail)
+               BN_add_word(eckey->priv_key, 1);
+       if(!fips_check_ec(eckey))
+               {
+               eckey->priv_key = NULL;
+               eckey->pub_key  = NULL;
+               goto err;
+               }
+#endif
+

        ok=1;
 
 err:   
        ok=1;
 
 err:   

diff --git a/crypto/fips_err.h b/crypto/fips_err.h
index 4ea18399f12e6164f335e1cce6176b4b68377a19..00406ba8ac3ad3cff1d99aefbdf0b8a6a2f91859 100644 (file)
--- a/crypto/fips_err.h
+++ b/crypto/fips_err.h
@@ -78,6 +78,7 @@ static ERR_STRING_DATA FIPS_str_functs[]=
 {ERR_FUNC(FIPS_F_EVP_CIPHERINIT_EX),   "EVP_CipherInit_ex"},
 {ERR_FUNC(FIPS_F_EVP_DIGESTINIT_EX),   "EVP_DigestInit_ex"},
 {ERR_FUNC(FIPS_F_FIPS_CHECK_DSA),      "FIPS_CHECK_DSA"},
 {ERR_FUNC(FIPS_F_EVP_CIPHERINIT_EX),   "EVP_CipherInit_ex"},
 {ERR_FUNC(FIPS_F_EVP_DIGESTINIT_EX),   "EVP_DigestInit_ex"},
 {ERR_FUNC(FIPS_F_FIPS_CHECK_DSA),      "FIPS_CHECK_DSA"},

+{ERR_FUNC(FIPS_F_FIPS_CHECK_EC),       "FIPS_CHECK_EC"},

 {ERR_FUNC(FIPS_F_FIPS_CHECK_INCORE_FINGERPRINT),       "FIPS_check_incore_fingerprint"},
 {ERR_FUNC(FIPS_F_FIPS_CHECK_RSA),      "fips_check_rsa"},
 {ERR_FUNC(FIPS_F_FIPS_CIPHERINIT),     "FIPS_CIPHERINIT"},
 {ERR_FUNC(FIPS_F_FIPS_CHECK_INCORE_FINGERPRINT),       "FIPS_check_incore_fingerprint"},
 {ERR_FUNC(FIPS_F_FIPS_CHECK_RSA),      "fips_check_rsa"},
 {ERR_FUNC(FIPS_F_FIPS_CIPHERINIT),     "FIPS_CIPHERINIT"},

diff --git a/fips/fips.c b/fips/fips.c
index 6a90328d7e38f5c9f31947c2c2a5291b434fdcbf..ac4313f96525b1d52769720f2309afaade702a9d 100644 (file)
--- a/fips/fips.c
+++ b/fips/fips.c
@@ -56,6 +56,7 @@
 #include <openssl/hmac.h>
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
 #include <openssl/hmac.h>
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>

+#include <openssl/ecdsa.h>

 #include <string.h>
 #include <limits.h>
 #include "fips_locl.h"
 #include <string.h>
 #include <limits.h>
 #include "fips_locl.h"


@@ -437,6 +438,7 @@ int fips_pkey_signature_test(EVP_PKEY *pkey,
        unsigned char sigtmp[256], *sig = sigtmp;
        unsigned int siglen;
        DSA_SIG *dsig = NULL;
        unsigned char sigtmp[256], *sig = sigtmp;
        unsigned int siglen;
        DSA_SIG *dsig = NULL;

+       ECDSA_SIG *esig = NULL;

        EVP_MD_CTX mctx;
        FIPS_md_ctx_init(&mctx);
 
        EVP_MD_CTX mctx;
        FIPS_md_ctx_init(&mctx);
 


@@ -473,6 +475,12 @@ int fips_pkey_signature_test(EVP_PKEY *pkey,
                if (!dsig)
                        goto error;
                }
                if (!dsig)
                        goto error;
                }

+       else if (pkey->type == EVP_PKEY_EC)
+               {
+               esig = FIPS_ecdsa_sign_ctx(pkey->pkey.ec, &mctx);
+               if (!esig)
+                       goto error;
+               }

 #if 0
        else if (!EVP_SignFinal(&mctx, sig, &siglen, pkey))
                goto error;
 #if 0
        else if (!EVP_SignFinal(&mctx, sig, &siglen, pkey))
                goto error;


@@ -494,6 +502,10 @@ int fips_pkey_signature_test(EVP_PKEY *pkey,
                {
                ret = FIPS_dsa_verify_ctx(pkey->pkey.dsa, &mctx, dsig);
                }
                {
                ret = FIPS_dsa_verify_ctx(pkey->pkey.dsa, &mctx, dsig);
                }

+       else if (pkey->type == EVP_PKEY_EC)
+               {
+               ret = FIPS_ecdsa_verify_ctx(pkey->pkey.ec, &mctx, esig);
+               }

 #if 0
        else
                ret = EVP_VerifyFinal(&mctx, sig, siglen, pkey);
 #if 0
        else
                ret = EVP_VerifyFinal(&mctx, sig, siglen, pkey);


@@ -502,6 +514,8 @@ int fips_pkey_signature_test(EVP_PKEY *pkey,
        error:
        if (dsig != NULL)
                FIPS_dsa_sig_free(dsig);
        error:
        if (dsig != NULL)
                FIPS_dsa_sig_free(dsig);

+       if (esig != NULL)
+               FIPS_ecdsa_sig_free(esig);

        if (sig != sigtmp)
                OPENSSL_free(sig);
        FIPS_md_ctx_cleanup(&mctx);
        if (sig != sigtmp)
                OPENSSL_free(sig);
        FIPS_md_ctx_cleanup(&mctx);

diff --git a/fips/fips.h b/fips/fips.h
index 64115da2d6a120b93a194c812a94fbbf1b0396f8..8087fa178bb6e0bd597b728dfbc72987184c98bf 100644 (file)
--- a/fips/fips.h
+++ b/fips/fips.h
@@ -84,6 +84,7 @@ int FIPS_selftest_rsa(void);
 void FIPS_corrupt_dsa(void);
 void FIPS_corrupt_dsa_keygen(void);
 int FIPS_selftest_dsa(void);
 void FIPS_corrupt_dsa(void);
 void FIPS_corrupt_dsa_keygen(void);
 int FIPS_selftest_dsa(void);

+void FIPS_corrupt_ec_keygen(void);

 void FIPS_corrupt_rng(void);
 void FIPS_rng_stick(void);
 int FIPS_selftest_rng(void);
 void FIPS_corrupt_rng(void);
 void FIPS_rng_stick(void);
 int FIPS_selftest_rng(void);


@@ -180,6 +181,7 @@ void ERR_load_FIPS_strings(void);
 #define FIPS_F_EVP_CIPHERINIT_EX                        124
 #define FIPS_F_EVP_DIGESTINIT_EX                        125
 #define FIPS_F_FIPS_CHECK_DSA                           104
 #define FIPS_F_EVP_CIPHERINIT_EX                        124
 #define FIPS_F_EVP_DIGESTINIT_EX                        125
 #define FIPS_F_FIPS_CHECK_DSA                           104

+#define FIPS_F_FIPS_CHECK_EC                            129

 #define FIPS_F_FIPS_CHECK_INCORE_FINGERPRINT            105
 #define FIPS_F_FIPS_CHECK_RSA                           106
 #define FIPS_F_FIPS_CIPHERINIT                          128
 #define FIPS_F_FIPS_CHECK_INCORE_FINGERPRINT            105
 #define FIPS_F_FIPS_CHECK_RSA                           106
 #define FIPS_F_FIPS_CIPHERINIT                          128