Merge EVP changes in from FIPS branch.

[oweals/openssl.git] / crypto / evp / p_sign.c

diff --git a/crypto/evp/p_sign.c b/crypto/evp/p_sign.c
index 073270ce31535d646f39975b867afc0b6bf4439f..bf41a0db68ad1af405fcfd332b837b05a9130c6a 100644 (file)
--- a/crypto/evp/p_sign.c
+++ b/crypto/evp/p_sign.c
@@ -58,32 +58,25 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
 
 #ifdef undef
-void EVP_SignInit(ctx,type)
-EVP_MD_CTX *ctx;
-EVP_MD *type;
+void EVP_SignInit(EVP_MD_CTX *ctx, EVP_MD *type)
        {
-       EVP_DigestInit(ctx,type);
+       EVP_DigestInit_ex(ctx,type);
        }
 
-void EVP_SignUpdate(ctx,data,count)
-EVP_MD_CTX *ctx;
-unsigned char *data;
-unsigned int count;
+void EVP_SignUpdate(EVP_MD_CTX *ctx, unsigned char *data,
+            unsigned int count)
        {
        EVP_DigestUpdate(ctx,data,count);
        }
 #endif
 
-int EVP_SignFinal(ctx,sigret,siglen,pkey)
-EVP_MD_CTX *ctx;
-unsigned char *sigret;
-unsigned int *siglen;
-EVP_PKEY *pkey;
+int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
+            EVP_PKEY *pkey)
        {
        unsigned char m[EVP_MAX_MD_SIZE];
        unsigned int m_len;
@@ -91,8 +84,6 @@ EVP_PKEY *pkey;
        MS_STATIC EVP_MD_CTX tmp_ctx;
 
        *siglen=0;
-       memcpy(&tmp_ctx,ctx,sizeof(EVP_MD_CTX));
-       EVP_DigestFinal(&tmp_ctx,&(m[0]),&m_len);
        for (i=0; i<4; i++)
                {
                v=ctx->digest->required_pkey_type[i];
@@ -113,7 +104,23 @@ EVP_PKEY *pkey;
                EVPerr(EVP_F_EVP_SIGNFINAL,EVP_R_NO_SIGN_FUNCTION_CONFIGURED);
                return(0);
                }
-       return(ctx->digest->sign(ctx->digest->type,m,m_len,sigret,siglen,
-               pkey->pkey.ptr));
+       EVP_MD_CTX_init(&tmp_ctx);
+       EVP_MD_CTX_copy_ex(&tmp_ctx,ctx);
+       if (ctx->digest->flags & EVP_MD_FLAG_SVCTX)
+               {
+               EVP_MD_SVCTX sctmp;
+               sctmp.mctx = &tmp_ctx;
+               sctmp.key = pkey->pkey.ptr;
+               i = ctx->digest->sign(ctx->digest->type,
+                       NULL, -1, sigret, siglen, &sctmp);
+               }
+       else
+               {
+               EVP_DigestFinal_ex(&tmp_ctx,&(m[0]),&m_len);
+               i = ctx->digest->sign(ctx->digest->type,m,m_len,sigret,siglen,
+                                       pkey->pkey.ptr);
+               }
+       EVP_MD_CTX_cleanup(&tmp_ctx);
+       return i;
        }