Yes it is a typo ;-)

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

diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c
index 95382118b2d69fde4481e2d06de1b1bd75bff170..f0b7f95059e75f9e0f8e3aa57a898b57f23baa20 100644 (file)
--- a/crypto/evp/m_sigver.c
+++ b/crypto/evp/m_sigver.c
@@ -1,9 +1,9 @@
 /* m_sigver.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
 /* ====================================================================
- * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2006,2007 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
@@ -61,30 +61,58 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
+#include "evp_locl.h"
 
-int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
-                       const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey, int ver)
+static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
+                         const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey,
+                         int ver)
        {
-       if (!EVP_DigestInit_ex(ctx, type, e))
-               return 0;
        if (ctx->pctx == NULL)
                ctx->pctx = EVP_PKEY_CTX_new(pkey, e);
        if (ctx->pctx == NULL)
                return 0;
+
+       if (type == NULL)
+               {
+               int def_nid;
+               if (EVP_PKEY_get_default_digest_nid(pkey, &def_nid) > 0)
+                       type = EVP_get_digestbynid(def_nid);
+               }
+
+       if (type == NULL)
+               {
+               EVPerr(EVP_F_DO_SIGVER_INIT, EVP_R_NO_DEFAULT_DIGEST);
+               return 0;
+               }
+
        if (ver)
                {
-               if (EVP_PKEY_verify_init(ctx->pctx) <= 0)
+               if (ctx->pctx->pmeth->verifyctx_init)
+                       {
+                       if (ctx->pctx->pmeth->verifyctx_init(ctx->pctx, ctx) <=0)
+                               return 0;
+                       ctx->pctx->operation = EVP_PKEY_OP_VERIFYCTX;
+                       }
+               else if (EVP_PKEY_verify_init(ctx->pctx) <= 0)
                        return 0;
                }
        else
                {
-               if (EVP_PKEY_sign_init(ctx->pctx) <= 0)
+               if (ctx->pctx->pmeth->signctx_init)
+                       {
+                       if (ctx->pctx->pmeth->signctx_init(ctx->pctx, ctx) <= 0)
+                               return 0;
+                       ctx->pctx->operation = EVP_PKEY_OP_SIGNCTX;
+                       }
+               else if (EVP_PKEY_sign_init(ctx->pctx) <= 0)
                        return 0;
                }
        if (EVP_PKEY_CTX_set_signature_md(ctx->pctx, type) <= 0)
                return 0;
        if (pctx)
                *pctx = ctx->pctx;
+       if (!EVP_DigestInit_ex(ctx, type, e))
+               return 0;
        return 1;
        }
 
@@ -100,10 +128,13 @@ 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;
+       if (ctx->pctx->pmeth->signctx)
+               sctx = 1;
+       else
+               sctx = 0;
        if (sigret)
                {
                MS_STATIC EVP_MD_CTX tmp_ctx;
@@ -111,18 +142,31 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen)
                unsigned int mdlen;
                EVP_MD_CTX_init(&tmp_ctx);
                if (!EVP_MD_CTX_copy_ex(&tmp_ctx,ctx))
-                       return 0;       
-               if (!EVP_DigestFinal_ex(&tmp_ctx,md,&mdlen))
-                       return 0;
+                       return 0;
+               if (sctx)
+                       r = tmp_ctx.pctx->pmeth->signctx(tmp_ctx.pctx,
+                                       sigret, siglen, &tmp_ctx);
+               else
+                       r = EVP_DigestFinal_ex(&tmp_ctx,md,&mdlen);
                EVP_MD_CTX_cleanup(&tmp_ctx);
+               if (sctx || !r)
+                       return r;
                if (EVP_PKEY_sign(ctx->pctx, sigret, siglen, md, mdlen) <= 0)
                        return 0;
                }
        else
                {
-               if (EVP_PKEY_sign(ctx->pctx, sigret, siglen, NULL,
-                                               EVP_MD_size(ctx->digest)) <= 0)
-                       return 0;
+               if (sctx)
+                       {
+                       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;
+                       }
                }
        return 1;
        }
@@ -131,12 +175,26 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, unsigned char *sig, size_t siglen)
        {
        MS_STATIC EVP_MD_CTX tmp_ctx;
        unsigned char md[EVP_MAX_MD_SIZE];
+       int r;
        unsigned int mdlen;
+       int vctx;
+
+       if (ctx->pctx->pmeth->verifyctx)
+               vctx = 1;
+       else
+               vctx = 0;
        EVP_MD_CTX_init(&tmp_ctx);
        if (!EVP_MD_CTX_copy_ex(&tmp_ctx,ctx))
                return -1;      
-       if (!EVP_DigestFinal_ex(&tmp_ctx,md,&mdlen))
-               return -1;
+       if (vctx)
+               {
+               r = tmp_ctx.pctx->pmeth->verifyctx(tmp_ctx.pctx,
+                                       sig, siglen, &tmp_ctx);
+               }
+       else
+               r = EVP_DigestFinal_ex(&tmp_ctx,md,&mdlen);
        EVP_MD_CTX_cleanup(&tmp_ctx);
+       if (vctx || !r)
+               return r;
        return EVP_PKEY_verify(ctx->pctx, sig, siglen, md, mdlen);
        }