diff options
| author | djm <> | 2012-10-13 21:23:50 +0000 |
|---|---|---|
| committer | djm <> | 2012-10-13 21:23:50 +0000 |
| commit | 228cae30b117c2493f69ad3c195341cd6ec8d430 (patch) | |
| tree | 29ff00b10d52c0978077c4fd83c33b065bade73e /src/lib/libcrypto/evp/m_sha1.c | |
| parent | 731838c66b52c0ae5888333005b74115a620aa96 (diff) | |
| download | openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.tar.gz openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.tar.bz2 openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.zip | |
import OpenSSL-1.0.1c
Diffstat (limited to 'src/lib/libcrypto/evp/m_sha1.c')
| -rw-r--r-- | src/lib/libcrypto/evp/m_sha1.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/libcrypto/evp/m_sha1.c b/src/lib/libcrypto/evp/m_sha1.c index 9a2790fdea..3cb11f1ebb 100644 --- a/src/lib/libcrypto/evp/m_sha1.c +++ b/src/lib/libcrypto/evp/m_sha1.c | |||
| @@ -59,6 +59,8 @@ | |||
| 59 | #include <stdio.h> | 59 | #include <stdio.h> |
| 60 | #include "cryptlib.h" | 60 | #include "cryptlib.h" |
| 61 | 61 | ||
| 62 | #ifndef OPENSSL_FIPS | ||
| 63 | |||
| 62 | #ifndef OPENSSL_NO_SHA | 64 | #ifndef OPENSSL_NO_SHA |
| 63 | 65 | ||
| 64 | #include <openssl/evp.h> | 66 | #include <openssl/evp.h> |
| @@ -68,6 +70,7 @@ | |||
| 68 | #include <openssl/rsa.h> | 70 | #include <openssl/rsa.h> |
| 69 | #endif | 71 | #endif |
| 70 | 72 | ||
| 73 | |||
| 71 | static int init(EVP_MD_CTX *ctx) | 74 | static int init(EVP_MD_CTX *ctx) |
| 72 | { return SHA1_Init(ctx->md_data); } | 75 | { return SHA1_Init(ctx->md_data); } |
| 73 | 76 | ||
| @@ -202,3 +205,5 @@ static const EVP_MD sha512_md= | |||
| 202 | const EVP_MD *EVP_sha512(void) | 205 | const EVP_MD *EVP_sha512(void) |
| 203 | { return(&sha512_md); } | 206 | { return(&sha512_md); } |
| 204 | #endif /* ifndef OPENSSL_NO_SHA512 */ | 207 | #endif /* ifndef OPENSSL_NO_SHA512 */ |
| 208 | |||
| 209 | #endif | ||
