diff options
| author | mrezai <mhd.rezai@gmail.com> | 2016-04-15 19:03:35 +0430 |
|---|---|---|
| committer | mrezai <mhd.rezai@gmail.com> | 2016-04-15 19:03:35 +0430 |
| commit | e97922f22038e9049ed4c2db5b3736dfaa0edde3 (patch) | |
| tree | 37e036a343e7482a387b7acd0a88509af78a69eb /drivers/builtin_openssl2/crypto/evp/m_sha1.c | |
| parent | 880f4abda44a42532abb6f15999a90bc85f6264a (diff) | |
Update OpenSSL to version 1.0.2g
Diffstat (limited to 'drivers/builtin_openssl2/crypto/evp/m_sha1.c')
| -rw-r--r-- | drivers/builtin_openssl2/crypto/evp/m_sha1.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/drivers/builtin_openssl2/crypto/evp/m_sha1.c b/drivers/builtin_openssl2/crypto/evp/m_sha1.c index 0cc63555ad..a74e6b7794 100644 --- a/drivers/builtin_openssl2/crypto/evp/m_sha1.c +++ b/drivers/builtin_openssl2/crypto/evp/m_sha1.c @@ -59,16 +59,14 @@ #include <stdio.h> #include "cryptlib.h" -#ifndef OPENSSL_FIPS +#ifndef OPENSSL_NO_SHA -# ifndef OPENSSL_NO_SHA - -# include <openssl/evp.h> -# include <openssl/objects.h> -# include <openssl/sha.h> -# ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -# endif +# include <openssl/evp.h> +# include <openssl/objects.h> +# include <openssl/sha.h> +# ifndef OPENSSL_NO_RSA +# include <openssl/rsa.h> +# endif static int init(EVP_MD_CTX *ctx) { @@ -104,9 +102,9 @@ const EVP_MD *EVP_sha1(void) { return (&sha1_md); } -# endif +#endif -# ifndef OPENSSL_NO_SHA256 +#ifndef OPENSSL_NO_SHA256 static int init224(EVP_MD_CTX *ctx) { return SHA224_Init(ctx->md_data); @@ -171,9 +169,9 @@ const EVP_MD *EVP_sha256(void) { return (&sha256_md); } -# endif /* ifndef OPENSSL_NO_SHA256 */ +#endif /* ifndef OPENSSL_NO_SHA256 */ -# ifndef OPENSSL_NO_SHA512 +#ifndef OPENSSL_NO_SHA512 static int init384(EVP_MD_CTX *ctx) { return SHA384_Init(ctx->md_data); @@ -234,6 +232,4 @@ const EVP_MD *EVP_sha512(void) { return (&sha512_md); } -# endif /* ifndef OPENSSL_NO_SHA512 */ - -#endif +#endif /* ifndef OPENSSL_NO_SHA512 */ |