projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ASYNC_block_pause and ASYNC_unblock_pause
[oweals/openssl.git]
/
crypto
/
sha
/
sha512.c
diff --git
a/crypto/sha/sha512.c
b/crypto/sha/sha512.c
index f934c74414851e0a363c8e5a36f7dd9de4343db3..427cdf5ea078faa350f8daed59abbb3de4b28ec4 100644
(file)
--- a/
crypto/sha/sha512.c
+++ b/
crypto/sha/sha512.c
@@
-47,9
+47,7
@@
#include <openssl/sha.h>
#include <openssl/opensslv.h>
#include <openssl/sha.h>
#include <openssl/opensslv.h>
-#include "cryptlib.h"
-
-const char SHA512_version[] = "SHA-512" OPENSSL_VERSION_PTEXT;
+#include "internal/cryptlib.h"
#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
defined(__x86_64) || defined(_M_AMD64) || defined(_M_X64) || \
#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
defined(__x86_64) || defined(_M_AMD64) || defined(_M_X64) || \
@@
-107,9
+105,11
@@
int SHA512_Final(unsigned char *md, SHA512_CTX *c)
p[n] = 0x80; /* There always is a room for one */
n++;
p[n] = 0x80; /* There always is a room for one */
n++;
- if (n > (sizeof(c->u) - 16))
- memset(p + n, 0, sizeof(c->u) - n), n = 0,
- sha512_block_data_order(c, p, 1);
+ if (n > (sizeof(c->u) - 16)) {
+ memset(p + n, 0, sizeof(c->u) - n);
+ n = 0;
+ sha512_block_data_order(c, p, 1);
+ }
memset(p + n, 0, sizeof(c->u) - 16 - n);
#ifdef B_ENDIAN
memset(p + n, 0, sizeof(c->u) - 16 - n);
#ifdef B_ENDIAN