Index: openssl/crypto/evp/m_sha1.c |
=================================================================== |
--- openssl/crypto/evp/m_sha1.c (revision 105093) |
+++ openssl/crypto/evp/m_sha1.c (working copy) |
@@ -68,8 +68,6 @@ |
#include <openssl/rsa.h> |
#endif |
-#ifndef OPENSSL_FIPS |
- |
static int init(EVP_MD_CTX *ctx) |
{ return SHA1_Init(ctx->md_data); } |
@@ -84,7 +82,7 @@ |
NID_sha1, |
NID_sha1WithRSAEncryption, |
SHA_DIGEST_LENGTH, |
- 0, |
+ EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT, |
init, |
update, |
final, |
@@ -99,6 +97,7 @@ |
{ |
return(&sha1_md); |
} |
+#endif |
#ifndef OPENSSL_NO_SHA256 |
static int init224(EVP_MD_CTX *ctx) |
@@ -120,7 +119,7 @@ |
NID_sha224, |
NID_sha224WithRSAEncryption, |
SHA224_DIGEST_LENGTH, |
- 0, |
+ EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT, |
init224, |
update256, |
final256, |
@@ -139,7 +138,7 @@ |
NID_sha256, |
NID_sha256WithRSAEncryption, |
SHA256_DIGEST_LENGTH, |
- 0, |
+ EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT, |
init256, |
update256, |
final256, |
@@ -170,7 +169,7 @@ |
NID_sha384, |
NID_sha384WithRSAEncryption, |
SHA384_DIGEST_LENGTH, |
- 0, |
+ EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT, |
init384, |
update512, |
final512, |
@@ -189,7 +188,7 @@ |
NID_sha512, |
NID_sha512WithRSAEncryption, |
SHA512_DIGEST_LENGTH, |
- 0, |
+ EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT, |
init512, |
update512, |
final512, |
@@ -203,7 +202,3 @@ |
const EVP_MD *EVP_sha512(void) |
{ return(&sha512_md); } |
#endif /* ifndef OPENSSL_NO_SHA512 */ |
- |
-#endif |
- |
-#endif |