projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warnings.
[oweals/openssl.git]
/
crypto
/
evp
/
m_sha.c
diff --git
a/crypto/evp/m_sha.c
b/crypto/evp/m_sha.c
index f3b96107578e3b0dcb437532143c064a99438477..3f30dfc579ca4d0f4406465165354045e4e2f624 100644
(file)
--- a/
crypto/evp/m_sha.c
+++ b/
crypto/evp/m_sha.c
@@
-58,18
+58,21
@@
#include <stdio.h>
#include "cryptlib.h"
#include <stdio.h>
#include "cryptlib.h"
+#include "evp_locl.h"
-#if
ndef OPENSSL_NO_SHA
+#if
!defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA0)
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>
+#ifndef OPENSSL_NO_RSA
#include <openssl/rsa.h>
#include <openssl/rsa.h>
+#endif
static int init(EVP_MD_CTX *ctx)
{ return SHA_Init(ctx->md_data); }
static int init(EVP_MD_CTX *ctx)
{ return SHA_Init(ctx->md_data); }
-static int update(EVP_MD_CTX *ctx,const void *data,
unsigned long
count)
+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_Update(ctx->md_data,data,count); }
static int final(EVP_MD_CTX *ctx,unsigned char *md)