summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/sha/sha1_one.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/sha/sha1_one.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/sha/sha1_one.c')
-rw-r--r--src/lib/libcrypto/sha/sha1_one.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/sha/sha1_one.c b/src/lib/libcrypto/sha/sha1_one.c
index 7c65b60276..c56ec94020 100644
--- a/src/lib/libcrypto/sha/sha1_one.c
+++ b/src/lib/libcrypto/sha/sha1_one.c
@@ -58,8 +58,8 @@
58 58
59#include <stdio.h> 59#include <stdio.h>
60#include <string.h> 60#include <string.h>
61#include <openssl/sha.h>
62#include <openssl/crypto.h> 61#include <openssl/crypto.h>
62#include <openssl/sha.h>
63 63
64#ifndef OPENSSL_NO_SHA1 64#ifndef OPENSSL_NO_SHA1
65unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md) 65unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md)