diff options
author | djm <> | 2006-06-27 05:05:40 +0000 |
---|---|---|
committer | djm <> | 2006-06-27 05:05:40 +0000 |
commit | 4f828b924f54507141fb95ebe49dfcd261945e85 (patch) | |
tree | f6b05913ca6b34db73a343a7bb36d57ff4105356 /src/lib/libcrypto/evp/m_sha.c | |
parent | 588543a0946f1dbf0f1dd5135f8f6447486dc183 (diff) | |
download | openbsd-4f828b924f54507141fb95ebe49dfcd261945e85.tar.gz openbsd-4f828b924f54507141fb95ebe49dfcd261945e85.tar.bz2 openbsd-4f828b924f54507141fb95ebe49dfcd261945e85.zip |
import of openssl-0.9.7j
Diffstat (limited to 'src/lib/libcrypto/evp/m_sha.c')
-rw-r--r-- | src/lib/libcrypto/evp/m_sha.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/libcrypto/evp/m_sha.c b/src/lib/libcrypto/evp/m_sha.c index d1785e5f74..ed54909b16 100644 --- a/src/lib/libcrypto/evp/m_sha.c +++ b/src/lib/libcrypto/evp/m_sha.c | |||
@@ -59,6 +59,9 @@ | |||
59 | #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA0) | 59 | #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA0) |
60 | #include <stdio.h> | 60 | #include <stdio.h> |
61 | #include "cryptlib.h" | 61 | #include "cryptlib.h" |
62 | /* Including sha.h prior evp.h masks FIPS SHA declarations, but that's | ||
63 | * exactly what we want to achieve here... */ | ||
64 | #include <openssl/sha.h> | ||
62 | #include <openssl/evp.h> | 65 | #include <openssl/evp.h> |
63 | #include "evp_locl.h" | 66 | #include "evp_locl.h" |
64 | #include <openssl/objects.h> | 67 | #include <openssl/objects.h> |