| Index: openssl/crypto/sha/sha.h
|
| ===================================================================
|
| --- openssl/crypto/sha/sha.h (revision 105093)
|
| +++ openssl/crypto/sha/sha.h (working copy)
|
| @@ -66,8 +66,6 @@
|
| extern "C" {
|
| #endif
|
|
|
| -#include <stddef.h>
|
| -
|
| #if defined(OPENSSL_NO_SHA) || (defined(OPENSSL_NO_SHA0) && defined(OPENSSL_NO_SHA1))
|
| #error SHA is disabled.
|
| #endif
|
| @@ -83,7 +81,7 @@
|
| * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
| */
|
|
|
| -#if defined(OPENSSL_SYS_WIN16) || defined(__LP32__)
|
| +#if defined(__LP32__)
|
| #define SHA_LONG unsigned long
|
| #elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
|
| #define SHA_LONG unsigned long
|
| @@ -108,9 +106,6 @@
|
| } SHA_CTX;
|
|
|
| #ifndef OPENSSL_NO_SHA0
|
| -#ifdef OPENSSL_FIPS
|
| -int private_SHA_Init(SHA_CTX *c);
|
| -#endif
|
| int SHA_Init(SHA_CTX *c);
|
| int SHA_Update(SHA_CTX *c, const void *data, size_t len);
|
| int SHA_Final(unsigned char *md, SHA_CTX *c);
|
|
|