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.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/lib/libcrypto/cast/cast.h b/src/lib/libcrypto/cast/cast.h
index 4759d4c782..1043c7f24f 100644
--- a/src/lib/libcrypto/cast/cast.h
+++ b/src/lib/libcrypto/cast/cast.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cast.h,v 1.11 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: cast.h,v 1.12 2014/07/10 22:45:56 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -59,12 +59,12 @@
 #ifndef HEADER_CAST_H
 #define HEADER_CAST_H
 
+#include <openssl/opensslconf.h>
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
-#include <openssl/opensslconf.h>
-
 #ifdef OPENSSL_NO_CAST
 #error CAST is disabled.
 #endif