diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2012-10-13 21:25:15 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2012-10-13 21:25:15 +0000 |
| commit | 426a154a830ca2d9bae74612741ff86332f5c66e (patch) | |
| tree | 7937e26cb4336f7a8bfd41a8238859a89e83e4b3 /lib/libcrypto/evp/m_sha.c | |
| parent | 1ab62f029308adf86f7a805afd722d5170be8c34 (diff) | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/evp/m_sha.c')
| -rw-r--r-- | lib/libcrypto/evp/m_sha.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/libcrypto/evp/m_sha.c b/lib/libcrypto/evp/m_sha.c index acccc8f92d8..8769cdd42fd 100644 --- a/lib/libcrypto/evp/m_sha.c +++ b/lib/libcrypto/evp/m_sha.c @@ -67,6 +67,7 @@ #ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> #endif +#include "evp_locl.h" static int init(EVP_MD_CTX *ctx) { return SHA_Init(ctx->md_data); } |