Do no try to pretend we're at the end of anything unless we're at the end

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

diff --git a/crypto/evp/m_dss.c b/crypto/evp/m_dss.c
index 8ea826868eab319343872ee9d5cdb406fcd6a5d8..020f19c44bb656a447d5c500eb0d3404b0a8352f 100644 (file)
--- a/crypto/evp/m_dss.c
+++ b/crypto/evp/m_dss.c
@@ -61,22 +61,35 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
+#include <openssl/dsa.h>
 
-#ifndef NO_SHA
-static EVP_MD dsa_md=
+#ifndef OPENSSL_NO_SHA
+static int init(EVP_MD_CTX *ctx)
+       { return SHA1_Init(ctx->md_data); }
+
+static int update(EVP_MD_CTX *ctx,const void *data,size_t count)
+       { return SHA1_Update(ctx->md_data,data,count); }
+
+static int final(EVP_MD_CTX *ctx,unsigned char *md)
+       { return SHA1_Final(md,ctx->md_data); }
+
+static const EVP_MD dsa_md=
        {
        NID_dsaWithSHA,
        NID_dsaWithSHA,
        SHA_DIGEST_LENGTH,
-       SHA1_Init,
-       SHA1_Update,
-       SHA1_Final,
+       0,
+       init,
+       update,
+       final,
+       NULL,
+       NULL,
        EVP_PKEY_DSA_method,
        SHA_CBLOCK,
        sizeof(EVP_MD *)+sizeof(SHA_CTX),
        };
 
-EVP_MD *EVP_dss(void)
+const EVP_MD *EVP_dss(void)
        {
        return(&dsa_md);
        }