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
/
sha1_one.c
diff --git
a/crypto/sha/sha1_one.c
b/crypto/sha/sha1_one.c
index e6a24888ed5949675cf49da35ae0b7309281042a..c56ec94020e180600f534e68c3402839ca330a79 100644
(file)
--- a/
crypto/sha/sha1_one.c
+++ b/
crypto/sha/sha1_one.c
@@
-58,19
+58,21
@@
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <string.h>
+#include <openssl/crypto.h>
#include <openssl/sha.h>
#ifndef OPENSSL_NO_SHA1
#include <openssl/sha.h>
#ifndef OPENSSL_NO_SHA1
-unsigned char *SHA1(const unsigned char *d,
unsigned long
n, unsigned char *md)
+unsigned char *SHA1(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;
- SHA1_Init(&c);
+ if (!SHA1_Init(&c))
+ return NULL;
SHA1_Update(&c,d,n);
SHA1_Final(md,&c);
SHA1_Update(&c,d,n);
SHA1_Final(md,&c);
-
memset(&c,0
,sizeof(c));
+
OPENSSL_cleanse(&c
,sizeof(c));
return(md);
}
#endif
return(md);
}
#endif