projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Move FIPS RSA function definitions to fips.h
[openssl.git] / fips / rsa / fips_rsa_sign.c
diff --git a/fips/rsa/fips_rsa_sign.c b/fips/rsa/fips_rsa_sign.c
index d07111b4be61c135ed9401665d47a28c073733b4..a4c62bf1ce5c206da616bfc545ed354491fe6afd 100644 (file)
--- a/fips/rsa/fips_rsa_sign.c
+++ b/fips/rsa/fips_rsa_sign.c
@@ -63,6 +63,7 @@
 #include <openssl/rsa.h>
 #include <openssl/err.h>
 #include <openssl/sha.h>
+#include <openssl/fips.h>
 
 #ifdef OPENSSL_FIPS
 
@@ -190,38 +191,56 @@ static const unsigned char *fips_digestinfo_nn_encoding(int nid, unsigned int *l
                }
        }
 
-
 int FIPS_rsa_sign_ctx(RSA *rsa, EVP_MD_CTX *ctx,
                        int rsa_pad_mode, int saltlen, const EVP_MD *mgf1Hash,
                        unsigned char *sigret, unsigned int *siglen)
        {
+       unsigned int md_len, rv;
+       unsigned char md[EVP_MAX_MD_SIZE];
+        FIPS_digestfinal(ctx, md, &md_len);
+       rv = FIPS_rsa_sign_digest(rsa, md, md_len,
+                                       M_EVP_MD_CTX_md(ctx),
+                                       rsa_pad_mode, saltlen,
+                                       mgf1Hash, sigret, siglen);
+       OPENSSL_cleanse(md, md_len);
+       return rv;
+       }
+
+
+int FIPS_rsa_sign_digest(RSA *rsa, const unsigned char *md, int md_len,
+                       const EVP_MD *mhash, int rsa_pad_mode, int saltlen,
+                       const EVP_MD *mgf1Hash,
+                       unsigned char *sigret, unsigned int *siglen)
+       {
        int i=0,j,ret=0;
        unsigned int dlen;
        const unsigned char *der;
-       unsigned int m_len;
-       const EVP_MD *mhash;
        int md_type;
        /* Largest DigestInfo: 19 (max encoding) + max MD */
        unsigned char tmpdinfo[19 + EVP_MAX_MD_SIZE];
-       unsigned char md[EVP_MAX_MD_SIZE + 1];
-
-        EVP_DigestFinal_ex(ctx, md, &m_len);
 
-       mhash = M_EVP_MD_CTX_md(ctx);
-       md_type = M_EVP_MD_type(mhash);
+       if (FIPS_selftest_failed())
+               {
+               FIPSerr(FIPS_F_FIPS_RSA_SIGN_DIGEST, FIPS_R_SELFTEST_FAILED);
+               return 0;
+               }
+       if (!mhash && rsa_pad_mode == RSA_PKCS1_PADDING)
+               md_type = saltlen;
+       else
+               md_type = M_EVP_MD_type(mhash);
 
        if (rsa_pad_mode == RSA_X931_PADDING)
                {
                int hash_id;
-               memcpy(tmpdinfo, md, m_len);
+               memcpy(tmpdinfo, md, md_len);
                hash_id = RSA_X931_hash_id(md_type);
                if (hash_id == -1)
                        {
-                       RSAerr(RSA_F_FIPS_RSA_SIGN,RSA_R_UNKNOWN_ALGORITHM_TYPE);
+                       RSAerr(RSA_F_FIPS_RSA_SIGN_DIGEST,RSA_R_UNKNOWN_ALGORITHM_TYPE);
                        return 0;
                        }
-               tmpdinfo[m_len] = (unsigned char)hash_id;
-               i = m_len + 1;
+               tmpdinfo[md_len] = (unsigned char)hash_id;
+               i = md_len + 1;
                }
        else if (rsa_pad_mode == RSA_PKCS1_PADDING)
                {
@@ -230,13 +249,13 @@ int FIPS_rsa_sign_ctx(RSA *rsa, EVP_MD_CTX *ctx,
                
                if (!der)
                        {
-                       RSAerr(RSA_F_FIPS_RSA_SIGN,RSA_R_UNKNOWN_ALGORITHM_TYPE);
+                       RSAerr(RSA_F_FIPS_RSA_SIGN_DIGEST,RSA_R_UNKNOWN_ALGORITHM_TYPE);
                        return 0;
                        }
                memcpy(tmpdinfo, der, dlen);
-               memcpy(tmpdinfo + dlen, md, m_len);
+               memcpy(tmpdinfo + dlen, md, md_len);
 
-               i = dlen + m_len;
+               i = dlen + md_len;
 
                }
        else if (rsa_pad_mode == RSA_PKCS1_PSS_PADDING)
@@ -246,7 +265,7 @@ int FIPS_rsa_sign_ctx(RSA *rsa, EVP_MD_CTX *ctx,
                sbuf = OPENSSL_malloc(RSA_size(rsa));
                if (!sbuf)
                        {
-                       RSAerr(RSA_F_FIPS_RSA_SIGN,ERR_R_MALLOC_FAILURE);
+                       RSAerr(RSA_F_FIPS_RSA_SIGN_DIGEST,ERR_R_MALLOC_FAILURE);
                        goto psserr;
                        }
                if (!RSA_padding_add_PKCS1_PSS_mgf1(rsa, sbuf, md, mhash, 
@@ -259,7 +278,6 @@ int FIPS_rsa_sign_ctx(RSA *rsa, EVP_MD_CTX *ctx,
                        *siglen=j;
                        }
                psserr:
-               OPENSSL_cleanse(md,m_len);
                OPENSSL_cleanse(sbuf, i);
                OPENSSL_free(sbuf);
                return ret;
@@ -268,7 +286,7 @@ int FIPS_rsa_sign_ctx(RSA *rsa, EVP_MD_CTX *ctx,
        j=RSA_size(rsa);
        if (i > (j-RSA_PKCS1_PADDING_SIZE))
                {
-               RSAerr(RSA_F_FIPS_RSA_SIGN,RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY);
+               RSAerr(RSA_F_FIPS_RSA_SIGN_DIGEST,RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY);
                goto done;
                }
        /* NB: call underlying method directly to avoid FIPS blocking */
@@ -281,7 +299,6 @@ int FIPS_rsa_sign_ctx(RSA *rsa, EVP_MD_CTX *ctx,
 
        done:
        OPENSSL_cleanse(tmpdinfo,i);
-       OPENSSL_cleanse(md,m_len);
        return ret;
        }
 
@@ -289,30 +306,49 @@ int FIPS_rsa_verify_ctx(RSA *rsa, EVP_MD_CTX *ctx,
                        int rsa_pad_mode, int saltlen, const EVP_MD *mgf1Hash,
                        unsigned char *sigbuf, unsigned int siglen)
        {
+       unsigned int md_len, rv;
+       unsigned char md[EVP_MAX_MD_SIZE];
+        FIPS_digestfinal(ctx, md, &md_len);
+       rv = FIPS_rsa_verify_digest(rsa, md, md_len, M_EVP_MD_CTX_md(ctx),
+                                       rsa_pad_mode, saltlen, mgf1Hash,
+                                       sigbuf, siglen);
+       OPENSSL_cleanse(md, md_len);
+       return rv;
+       }
+       
+int FIPS_rsa_verify_digest(RSA *rsa, const unsigned char *dig, int diglen,
+                       const EVP_MD *mhash, int rsa_pad_mode, int saltlen,
+                       const EVP_MD *mgf1Hash,
+                       unsigned char *sigbuf, unsigned int siglen)
+       {
        int i,ret=0;
-       unsigned int dlen, diglen;
+       unsigned int dlen;
        unsigned char *s;
        const unsigned char *der;
-       unsigned char dig[EVP_MAX_MD_SIZE];
-       const EVP_MD *mhash;
        int md_type;
        int rsa_dec_pad_mode;
 
+       if (FIPS_selftest_failed())
+               {
+               FIPSerr(FIPS_F_FIPS_RSA_VERIFY_DIGEST, FIPS_R_SELFTEST_FAILED);
+               return 0;
+               }
+
        if (siglen != (unsigned int)RSA_size(rsa))
                {
-               RSAerr(RSA_F_FIPS_RSA_VERIFY,RSA_R_WRONG_SIGNATURE_LENGTH);
+               RSAerr(RSA_F_FIPS_RSA_VERIFY_DIGEST,RSA_R_WRONG_SIGNATURE_LENGTH);
                return(0);
                }
 
-       mhash = M_EVP_MD_CTX_md(ctx);
-       md_type = M_EVP_MD_type(mhash);
-
-        EVP_DigestFinal_ex(ctx, dig, &diglen);
+       if (!mhash && rsa_pad_mode == RSA_PKCS1_PADDING)
+               md_type = saltlen;
+       else
+               md_type = M_EVP_MD_type(mhash);
 
        s= OPENSSL_malloc((unsigned int)siglen);
        if (s == NULL)
                {
-               RSAerr(RSA_F_FIPS_RSA_VERIFY,ERR_R_MALLOC_FAILURE);
+               RSAerr(RSA_F_FIPS_RSA_VERIFY_DIGEST,ERR_R_MALLOC_FAILURE);
                goto err;
                }
 
@@ -331,23 +367,23 @@ int FIPS_rsa_verify_ctx(RSA *rsa, EVP_MD_CTX *ctx,
                int hash_id;
                if (i != (int)(diglen + 1))
                        {
-                       RSAerr(RSA_F_FIPS_RSA_VERIFY,RSA_R_BAD_SIGNATURE);
+                       RSAerr(RSA_F_FIPS_RSA_VERIFY_DIGEST,RSA_R_BAD_SIGNATURE);
                        goto err;
                        }
                hash_id = RSA_X931_hash_id(md_type);
                if (hash_id == -1)
                        {
-                       RSAerr(RSA_F_FIPS_RSA_VERIFY,RSA_R_UNKNOWN_ALGORITHM_TYPE);
+                       RSAerr(RSA_F_FIPS_RSA_VERIFY_DIGEST,RSA_R_UNKNOWN_ALGORITHM_TYPE);
                        goto err;
                        }
                if (s[diglen] != (unsigned char)hash_id)
                        {
-                       RSAerr(RSA_F_FIPS_RSA_VERIFY,RSA_R_BAD_SIGNATURE);
+                       RSAerr(RSA_F_FIPS_RSA_VERIFY_DIGEST,RSA_R_BAD_SIGNATURE);
                        goto err;
                        }
                if (memcmp(s, dig, diglen))
                        {
-                       RSAerr(RSA_F_FIPS_RSA_VERIFY,RSA_R_BAD_SIGNATURE);
+                       RSAerr(RSA_F_FIPS_RSA_VERIFY_DIGEST,RSA_R_BAD_SIGNATURE);
                        goto err;
                        }
                ret = 1;
@@ -359,7 +395,7 @@ int FIPS_rsa_verify_ctx(RSA *rsa, EVP_MD_CTX *ctx,
                
                if (!der)
                        {
-                       RSAerr(RSA_F_FIPS_RSA_VERIFY,RSA_R_UNKNOWN_ALGORITHM_TYPE);
+                       RSAerr(RSA_F_FIPS_RSA_VERIFY_DIGEST,RSA_R_UNKNOWN_ALGORITHM_TYPE);
                        return(0);
                        }
 
@@ -374,7 +410,7 @@ int FIPS_rsa_verify_ctx(RSA *rsa, EVP_MD_CTX *ctx,
                if ((i != (int)(dlen + diglen)) || memcmp(der, s, dlen)
                        || memcmp(s + dlen, dig, diglen))
                        {
-                       RSAerr(RSA_F_FIPS_RSA_VERIFY,RSA_R_BAD_SIGNATURE);
+                       RSAerr(RSA_F_FIPS_RSA_VERIFY_DIGEST,RSA_R_BAD_SIGNATURE);
                        goto err;
                        }
                ret = 1;
Unnamed repository; edit this file 'description' to name the repository.