X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fevp%2Fm_sha.c;h=3f30dfc579ca4d0f4406465165354045e4e2f624;hb=f092a073a75be72731e57b175d2df73d2d0eddd8;hp=6d35b71b8506346419d09d80263c03936ad75a42;hpb=d02f751ce1d13183a0c0e5528ec89f76587ed989;p=oweals%2Fopenssl.git

diff --git a/crypto/evp/m_sha.c b/crypto/evp/m_sha.c
index 6d35b71b85..3f30dfc579 100644
--- a/crypto/evp/m_sha.c
+++ b/crypto/evp/m_sha.c
@@ -56,27 +56,45 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef NO_SHA
 #include <stdio.h>
 #include "cryptlib.h"
+#include "evp_locl.h"
+
+#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA0)
+
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
+#ifndef OPENSSL_NO_RSA
+#include <openssl/rsa.h>
+#endif
+
+static int init(EVP_MD_CTX *ctx)
+	{ return SHA_Init(ctx->md_data); }
+
+static int update(EVP_MD_CTX *ctx,const void *data,size_t count)
+	{ return SHA_Update(ctx->md_data,data,count); }
+
+static int final(EVP_MD_CTX *ctx,unsigned char *md)
+	{ return SHA_Final(md,ctx->md_data); }
 
-static EVP_MD sha_md=
+static const EVP_MD sha_md=
 	{
 	NID_sha,
 	NID_shaWithRSAEncryption,
 	SHA_DIGEST_LENGTH,
-	SHA_Init,
-	SHA_Update,
-	SHA_Final,
+	0,
+	init,
+	update,
+	final,
+	NULL,
+	NULL,
 	EVP_PKEY_RSA_method,
 	SHA_CBLOCK,
 	sizeof(EVP_MD *)+sizeof(SHA_CTX),
 	};
 
-EVP_MD *EVP_sha(void)
+const EVP_MD *EVP_sha(void)
 	{
 	return(&sha_md);
 	}