diff options
Diffstat (limited to 'src/lib/libcrypto/evp/m_sha1.c')
-rw-r--r-- | src/lib/libcrypto/evp/m_sha1.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/lib/libcrypto/evp/m_sha1.c b/src/lib/libcrypto/evp/m_sha1.c index 471ec30be0..9a2790fdea 100644 --- a/src/lib/libcrypto/evp/m_sha1.c +++ b/src/lib/libcrypto/evp/m_sha1.c | |||
@@ -68,8 +68,6 @@ | |||
68 | #include <openssl/rsa.h> | 68 | #include <openssl/rsa.h> |
69 | #endif | 69 | #endif |
70 | 70 | ||
71 | #ifndef OPENSSL_FIPS | ||
72 | |||
73 | static int init(EVP_MD_CTX *ctx) | 71 | static int init(EVP_MD_CTX *ctx) |
74 | { return SHA1_Init(ctx->md_data); } | 72 | { return SHA1_Init(ctx->md_data); } |
75 | 73 | ||
@@ -84,7 +82,7 @@ static const EVP_MD sha1_md= | |||
84 | NID_sha1, | 82 | NID_sha1, |
85 | NID_sha1WithRSAEncryption, | 83 | NID_sha1WithRSAEncryption, |
86 | SHA_DIGEST_LENGTH, | 84 | SHA_DIGEST_LENGTH, |
87 | 0, | 85 | EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT, |
88 | init, | 86 | init, |
89 | update, | 87 | update, |
90 | final, | 88 | final, |
@@ -99,6 +97,7 @@ const EVP_MD *EVP_sha1(void) | |||
99 | { | 97 | { |
100 | return(&sha1_md); | 98 | return(&sha1_md); |
101 | } | 99 | } |
100 | #endif | ||
102 | 101 | ||
103 | #ifndef OPENSSL_NO_SHA256 | 102 | #ifndef OPENSSL_NO_SHA256 |
104 | static int init224(EVP_MD_CTX *ctx) | 103 | static int init224(EVP_MD_CTX *ctx) |
@@ -120,7 +119,7 @@ static const EVP_MD sha224_md= | |||
120 | NID_sha224, | 119 | NID_sha224, |
121 | NID_sha224WithRSAEncryption, | 120 | NID_sha224WithRSAEncryption, |
122 | SHA224_DIGEST_LENGTH, | 121 | SHA224_DIGEST_LENGTH, |
123 | 0, | 122 | EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT, |
124 | init224, | 123 | init224, |
125 | update256, | 124 | update256, |
126 | final256, | 125 | final256, |
@@ -139,7 +138,7 @@ static const EVP_MD sha256_md= | |||
139 | NID_sha256, | 138 | NID_sha256, |
140 | NID_sha256WithRSAEncryption, | 139 | NID_sha256WithRSAEncryption, |
141 | SHA256_DIGEST_LENGTH, | 140 | SHA256_DIGEST_LENGTH, |
142 | 0, | 141 | EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT, |
143 | init256, | 142 | init256, |
144 | update256, | 143 | update256, |
145 | final256, | 144 | final256, |
@@ -170,7 +169,7 @@ static const EVP_MD sha384_md= | |||
170 | NID_sha384, | 169 | NID_sha384, |
171 | NID_sha384WithRSAEncryption, | 170 | NID_sha384WithRSAEncryption, |
172 | SHA384_DIGEST_LENGTH, | 171 | SHA384_DIGEST_LENGTH, |
173 | 0, | 172 | EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT, |
174 | init384, | 173 | init384, |
175 | update512, | 174 | update512, |
176 | final512, | 175 | final512, |
@@ -189,7 +188,7 @@ static const EVP_MD sha512_md= | |||
189 | NID_sha512, | 188 | NID_sha512, |
190 | NID_sha512WithRSAEncryption, | 189 | NID_sha512WithRSAEncryption, |
191 | SHA512_DIGEST_LENGTH, | 190 | SHA512_DIGEST_LENGTH, |
192 | 0, | 191 | EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT, |
193 | init512, | 192 | init512, |
194 | update512, | 193 | update512, |
195 | final512, | 194 | final512, |
@@ -203,7 +202,3 @@ static const EVP_MD sha512_md= | |||
203 | const EVP_MD *EVP_sha512(void) | 202 | const EVP_MD *EVP_sha512(void) |
204 | { return(&sha512_md); } | 203 | { return(&sha512_md); } |
205 | #endif /* ifndef OPENSSL_NO_SHA512 */ | 204 | #endif /* ifndef OPENSSL_NO_SHA512 */ |
206 | |||
207 | #endif | ||
208 | |||
209 | #endif | ||