Workaround for some CMS signature formats.

[openssl.git] / fips / dsa / fips_dsa_sign.c

diff --git a/fips/dsa/fips_dsa_sign.c b/fips/dsa/fips_dsa_sign.c
index 2875752e014de8711685b7a40e45fa87778609ea..274bcd90169fd46bdcac561e7cbe9d47a3b5e7b7 100644 (file)
--- a/fips/dsa/fips_dsa_sign.c
+++ b/fips/dsa/fips_dsa_sign.c
@@ -3,7 +3,7 @@
  * project 2007.
  */
 /* ====================================================================
- * Copyright (c) 2007 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2011 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -76,7 +76,7 @@ DSA_SIG * FIPS_dsa_sign_ctx(DSA *dsa, EVP_MD_CTX *ctx)
        DSA_SIG *s;
        unsigned char dig[EVP_MAX_MD_SIZE];
        unsigned int dlen;
-        EVP_DigestFinal_ex(ctx, dig, &dlen);
+        FIPS_digestfinal(ctx, dig, &dlen);
        s = dsa->meth->dsa_do_sign(dig,dlen,dsa);
        OPENSSL_cleanse(dig, dlen);
        return s;
@@ -84,6 +84,11 @@ DSA_SIG * FIPS_dsa_sign_ctx(DSA *dsa, EVP_MD_CTX *ctx)
 
 DSA_SIG * FIPS_dsa_sign_digest(DSA *dsa, const unsigned char *dig, int dlen)
        {
+       if (FIPS_selftest_failed())
+               {
+               FIPSerr(FIPS_F_FIPS_DSA_SIGN_DIGEST, FIPS_R_SELFTEST_FAILED);
+               return NULL;
+               }
        return dsa->meth->dsa_do_sign(dig, dlen, dsa);
        }
 
@@ -92,7 +97,7 @@ int FIPS_dsa_verify_ctx(DSA *dsa, EVP_MD_CTX *ctx, DSA_SIG *s)
        int ret=-1;
        unsigned char dig[EVP_MAX_MD_SIZE];
        unsigned int dlen;
-        EVP_DigestFinal_ex(ctx, dig, &dlen);
+        FIPS_digestfinal(ctx, dig, &dlen);
        ret=dsa->meth->dsa_do_verify(dig,dlen,s,dsa);
        OPENSSL_cleanse(dig, dlen);
        return ret;
@@ -101,7 +106,36 @@ int FIPS_dsa_verify_ctx(DSA *dsa, EVP_MD_CTX *ctx, DSA_SIG *s)
 int FIPS_dsa_verify_digest(DSA *dsa,
                                const unsigned char *dig, int dlen, DSA_SIG *s)
        {
+       if (FIPS_selftest_failed())
+               {
+               FIPSerr(FIPS_F_FIPS_DSA_VERIFY_DIGEST, FIPS_R_SELFTEST_FAILED);
+               return -1;
+               }
        return dsa->meth->dsa_do_verify(dig,dlen,s,dsa);
        }
 
+int FIPS_dsa_verify(DSA *dsa, const unsigned char *msg, size_t msglen,
+                       const EVP_MD *mhash, DSA_SIG *s)
+       {
+       int ret=-1;
+       unsigned char dig[EVP_MAX_MD_SIZE];
+       unsigned int dlen;
+        FIPS_digest(msg, msglen, dig, &dlen, mhash);
+       ret=FIPS_dsa_verify_digest(dsa, dig, dlen, s);
+       OPENSSL_cleanse(dig, dlen);
+       return ret;
+       }
+
+DSA_SIG * FIPS_dsa_sign(DSA *dsa, const unsigned char *msg, size_t msglen,
+                       const EVP_MD *mhash)
+       {
+       DSA_SIG *s;
+       unsigned char dig[EVP_MAX_MD_SIZE];
+       unsigned int dlen;
+        FIPS_digest(msg, msglen, dig, &dlen, mhash);
+       s = FIPS_dsa_sign_digest(dsa, dig, dlen);
+       OPENSSL_cleanse(dig, dlen);
+       return s;
+       }
+
 #endif