summaryrefslogtreecommitdiff
path: root/lib/libcrypto/rc4/rc4.h
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2014-07-10 22:45:59 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2014-07-10 22:45:59 +0000
commit03bd4af8b64912d28ecf5845fced13e4926fe5a1 (patch)
treeebcea9269eef6832b649e7fc5f08dc626d79f4b1 /lib/libcrypto/rc4/rc4.h
parentc91dd69f085de982c70898116e3538397e189678 (diff)
Explicitly include <openssl/opensslconf.h> in every file that references
an OPENSSL_NO_* define. This avoids relying on something else pulling it in for us, plus it fixes several cases where the #ifndef OPENSSL_NO_XYZ is never going to do anything, since OPENSSL_NO_XYZ will never defined, due to the fact that opensslconf.h has not been included. This also includes some miscellaneous sorting/tidying of headers.
Diffstat (limited to 'lib/libcrypto/rc4/rc4.h')
-rw-r--r--lib/libcrypto/rc4/rc4.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libcrypto/rc4/rc4.h b/lib/libcrypto/rc4/rc4.h
index 0712fc0a95c..5359577402d 100644
--- a/lib/libcrypto/rc4/rc4.h
+++ b/lib/libcrypto/rc4/rc4.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc4.h,v 1.11 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: rc4.h,v 1.12 2014/07/10 22:45:57 jsing Exp $ */
/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -60,6 +60,7 @@
#define HEADER_RC4_H
#include <openssl/opensslconf.h> /* OPENSSL_NO_RC4, RC4_INT */
+
#ifdef OPENSSL_NO_RC4
#error RC4 is disabled.
#endif