projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PR: 2632
[oweals/openssl.git]
/
crypto
/
sha
/
sha_one.c
diff --git
a/crypto/sha/sha_one.c
b/crypto/sha/sha_one.c
index 3e2751ec8482681acdf7556dbbe1d734443cbe15..3bae623ce882ce46360b0041ac4ef2db3d4b2728 100644
(file)
--- a/
crypto/sha/sha_one.c
+++ b/
crypto/sha/sha_one.c
@@
-58,17
+58,21
@@
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <string.h>
-#include "sha.h"
+#include <openssl/sha.h>
+#include <openssl/crypto.h>
-unsigned char *SHA(unsigned char *d, unsigned long n, unsigned char *md)
+#ifndef OPENSSL_NO_SHA0
+unsigned char *SHA(const unsigned char *d, size_t n, unsigned char *md)
{
SHA_CTX c;
static unsigned char m[SHA_DIGEST_LENGTH];
if (md == NULL) md=m;
{
SHA_CTX c;
static unsigned char m[SHA_DIGEST_LENGTH];
if (md == NULL) md=m;
- SHA_Init(&c);
+ if (!SHA_Init(&c))
+ return NULL;
SHA_Update(&c,d,n);
SHA_Final(md,&c);
SHA_Update(&c,d,n);
SHA_Final(md,&c);
-
memset(&c,0
,sizeof(c));
+
OPENSSL_cleanse(&c
,sizeof(c));
return(md);
}
return(md);
}
+#endif