Constify.

[openssl.git] / crypto / evp / m_sigver.c

diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c
index c6d257fc082611fdf1c8e6727b3dfe36f23afa2b..727ee0dfbacec1000d9510cb41d31536c1c50e89 100644 (file)
--- a/crypto/evp/m_sigver.c
+++ b/crypto/evp/m_sigver.c
@@ -128,7 +128,6 @@ int EVP_DigestVerifyInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
        return do_sigver_init(ctx, pctx, type, e, pkey, 1);
        }
 
-
 int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen)
        {
        int sctx, r = 0;
@@ -138,7 +137,7 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen)
                sctx = 0;
        if (sigret)
                {
-               MS_STATIC EVP_MD_CTX tmp_ctx;
+               EVP_MD_CTX tmp_ctx;
                unsigned char md[EVP_MAX_MD_SIZE];
                unsigned int mdlen;
                EVP_MD_CTX_init(&tmp_ctx);
@@ -159,25 +158,29 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen)
                {
                if (sctx)
                        {
-                       if (ctx->pctx->pmeth->signctx(ctx->pctx, 
-                                               sigret, siglen, ctx) <= 0)
+                       if (ctx->pctx->pmeth->signctx(ctx->pctx, sigret, siglen, ctx) <= 0)
+                               return 0;
+                       }
+               else
+                       {
+                       int s = EVP_MD_size(ctx->digest);
+                       if (s < 0 || EVP_PKEY_sign(ctx->pctx, sigret, siglen, NULL, s) <= 0)
                                return 0;
                        }
-               else if (EVP_PKEY_sign(ctx->pctx, sigret, siglen, NULL,
-                                               EVP_MD_size(ctx->digest)) <= 0)
-                       return 0;
                }
        return 1;
        }
 
-int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, unsigned char *sig, size_t siglen)
+int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
+                                                               size_t siglen)
        {
-       MS_STATIC EVP_MD_CTX tmp_ctx;
+       EVP_MD_CTX tmp_ctx;
        unsigned char md[EVP_MAX_MD_SIZE];
        int r;
        unsigned int mdlen;
        int vctx;
-       if (ctx->pctx->pmeth->signctx)
+
+       if (ctx->pctx->pmeth->verifyctx)
                vctx = 1;
        else
                vctx = 0;