diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/sha/sha.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/lib/libcrypto/sha/sha.h b/src/lib/libcrypto/sha/sha.h index 8a6bf4bbbb..7cbca26ff9 100644 --- a/src/lib/libcrypto/sha/sha.h +++ b/src/lib/libcrypto/sha/sha.h | |||
| @@ -70,10 +70,6 @@ extern "C" { | |||
| 70 | #error SHA is disabled. | 70 | #error SHA is disabled. |
| 71 | #endif | 71 | #endif |
| 72 | 72 | ||
| 73 | #if defined(OPENSSL_FIPS) | ||
| 74 | #define FIPS_SHA_SIZE_T size_t | ||
| 75 | #endif | ||
| 76 | |||
| 77 | /* | 73 | /* |
| 78 | * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 74 | * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
| 79 | * ! SHA_LONG has to be at least 32 bits wide. If it's wider, then ! | 75 | * ! SHA_LONG has to be at least 32 bits wide. If it's wider, then ! |
| @@ -106,9 +102,6 @@ typedef struct SHAstate_st | |||
| 106 | } SHA_CTX; | 102 | } SHA_CTX; |
| 107 | 103 | ||
| 108 | #ifndef OPENSSL_NO_SHA0 | 104 | #ifndef OPENSSL_NO_SHA0 |
| 109 | #ifdef OPENSSL_FIPS | ||
| 110 | int private_SHA_Init(SHA_CTX *c); | ||
| 111 | #endif | ||
| 112 | int SHA_Init(SHA_CTX *c); | 105 | int SHA_Init(SHA_CTX *c); |
| 113 | int SHA_Update(SHA_CTX *c, const void *data, size_t len); | 106 | int SHA_Update(SHA_CTX *c, const void *data, size_t len); |
| 114 | int SHA_Final(unsigned char *md, SHA_CTX *c); | 107 | int SHA_Final(unsigned char *md, SHA_CTX *c); |
| @@ -116,9 +109,6 @@ unsigned char *SHA(const unsigned char *d, size_t n, unsigned char *md); | |||
| 116 | void SHA_Transform(SHA_CTX *c, const unsigned char *data); | 109 | void SHA_Transform(SHA_CTX *c, const unsigned char *data); |
| 117 | #endif | 110 | #endif |
| 118 | #ifndef OPENSSL_NO_SHA1 | 111 | #ifndef OPENSSL_NO_SHA1 |
| 119 | #ifdef OPENSSL_FIPS | ||
| 120 | int private_SHA1_Init(SHA_CTX *c); | ||
| 121 | #endif | ||
| 122 | int SHA1_Init(SHA_CTX *c); | 112 | int SHA1_Init(SHA_CTX *c); |
| 123 | int SHA1_Update(SHA_CTX *c, const void *data, size_t len); | 113 | int SHA1_Update(SHA_CTX *c, const void *data, size_t len); |
| 124 | int SHA1_Final(unsigned char *md, SHA_CTX *c); | 114 | int SHA1_Final(unsigned char *md, SHA_CTX *c); |
| @@ -141,10 +131,6 @@ typedef struct SHA256state_st | |||
| 141 | } SHA256_CTX; | 131 | } SHA256_CTX; |
| 142 | 132 | ||
| 143 | #ifndef OPENSSL_NO_SHA256 | 133 | #ifndef OPENSSL_NO_SHA256 |
| 144 | #ifdef OPENSSL_FIPS | ||
| 145 | int private_SHA224_Init(SHA256_CTX *c); | ||
| 146 | int private_SHA256_Init(SHA256_CTX *c); | ||
| 147 | #endif | ||
| 148 | int SHA224_Init(SHA256_CTX *c); | 134 | int SHA224_Init(SHA256_CTX *c); |
| 149 | int SHA224_Update(SHA256_CTX *c, const void *data, size_t len); | 135 | int SHA224_Update(SHA256_CTX *c, const void *data, size_t len); |
| 150 | int SHA224_Final(unsigned char *md, SHA256_CTX *c); | 136 | int SHA224_Final(unsigned char *md, SHA256_CTX *c); |
| @@ -192,10 +178,6 @@ typedef struct SHA512state_st | |||
| 192 | #endif | 178 | #endif |
| 193 | 179 | ||
| 194 | #ifndef OPENSSL_NO_SHA512 | 180 | #ifndef OPENSSL_NO_SHA512 |
| 195 | #ifdef OPENSSL_FIPS | ||
| 196 | int private_SHA384_Init(SHA512_CTX *c); | ||
| 197 | int private_SHA512_Init(SHA512_CTX *c); | ||
| 198 | #endif | ||
| 199 | int SHA384_Init(SHA512_CTX *c); | 181 | int SHA384_Init(SHA512_CTX *c); |
| 200 | int SHA384_Update(SHA512_CTX *c, const void *data, size_t len); | 182 | int SHA384_Update(SHA512_CTX *c, const void *data, size_t len); |
| 201 | int SHA384_Final(unsigned char *md, SHA512_CTX *c); | 183 | int SHA384_Final(unsigned char *md, SHA512_CTX *c); |
