summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/evp/m_sha1.c
diff options
context:
space:
mode:
authormiod <>2014-04-13 15:25:35 +0000
committermiod <>2014-04-13 15:25:35 +0000
commitd2b3c9742a7df4ab87384039c99682d1944f66d7 (patch)
tree74f4ff344980894c7c9ceeab9b81176ac7572566 /src/lib/libcrypto/evp/m_sha1.c
parentdbf195d7fd4efbe4ee578f1dc5c72e7f3deadf18 (diff)
downloadopenbsd-d2b3c9742a7df4ab87384039c99682d1944f66d7.tar.gz
openbsd-d2b3c9742a7df4ab87384039c99682d1944f66d7.tar.bz2
openbsd-d2b3c9742a7df4ab87384039c99682d1944f66d7.zip
Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery.
Diffstat (limited to 'src/lib/libcrypto/evp/m_sha1.c')
-rw-r--r--src/lib/libcrypto/evp/m_sha1.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/evp/m_sha1.c b/src/lib/libcrypto/evp/m_sha1.c
index 3cb11f1ebb..bd0c01ad3c 100644
--- a/src/lib/libcrypto/evp/m_sha1.c
+++ b/src/lib/libcrypto/evp/m_sha1.c
@@ -65,7 +65,7 @@
65 65
66#include <openssl/evp.h> 66#include <openssl/evp.h>
67#include <openssl/objects.h> 67#include <openssl/objects.h>
68#include <openssl/x509.h> 68#include <openssl/sha.h>
69#ifndef OPENSSL_NO_RSA 69#ifndef OPENSSL_NO_RSA
70#include <openssl/rsa.h> 70#include <openssl/rsa.h>
71#endif 71#endif