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, 5 insertions, 3 deletions

diff --git a/src/lib/libcrypto/camellia/camellia.c b/src/lib/libcrypto/camellia/camellia.c
index 27ce0fbc87..f400bc9ff7 100644
--- a/src/lib/libcrypto/camellia/camellia.c
+++ b/src/lib/libcrypto/camellia/camellia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: camellia.c,v 1.6 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: camellia.c,v 1.7 2014/07/10 22:45:56 jsing Exp $ */
 /* ====================================================================
  * Copyright 2006 NTT (Nippon Telegraph and Telephone Corporation) . 
  * ALL RIGHTS RESERVED.
@@ -81,10 +81,12 @@
  * words reasonable performance even with not so modern compilers.
  */
 
+#include <stdlib.h>
+#include <string.h>
+#include <openssl/opensslconf.h>
+
 #include "camellia.h"
 #include "cmll_locl.h"
-#include <string.h>
-#include <stdlib.h>
 
 /* 32-bit rotations */
 #if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)