AlgorithmIdentifier bugs

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

diff --git a/crypto/evp/m_sha1.c b/crypto/evp/m_sha1.c
index ea54adad5b927ab63af81b6ef6bbfc73fbf68d79..57a1ab0cceca5ab85d4f155d63689386c29bdeb4 100644 (file)
--- a/crypto/evp/m_sha1.c
+++ b/crypto/evp/m_sha1.c
@@ -56,38 +56,27 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef OPENSSL_NO_SHA
+#ifndef NO_SHA
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 
-static int init(EVP_MD_CTX *ctx)
-       { return SHA1_Init(ctx->md_data); }
-
-static int update(EVP_MD_CTX *ctx,const void *data,unsigned long 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 sha1_md=
+static EVP_MD sha1_md=
        {
        NID_sha1,
        NID_sha1WithRSAEncryption,
        SHA_DIGEST_LENGTH,
-       0,
-       init,
-       update,
-       final,
-       NULL,
+       SHA1_Init,
+       SHA1_Update,
+       SHA1_Final,
        EVP_PKEY_RSA_method,
        SHA_CBLOCK,
        sizeof(EVP_MD *)+sizeof(SHA_CTX),
        };
 
-const EVP_MD *EVP_sha1(void)
+EVP_MD *EVP_sha1(void)
        {
        return(&sha1_md);
        }