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/evp/e_chacha20poly1305.c b/src/lib/libcrypto/evp/e_chacha20poly1305.c
index 90d8a9c7b8..da1e036668 100644
--- a/src/lib/libcrypto/evp/e_chacha20poly1305.c
+++ b/src/lib/libcrypto/evp/e_chacha20poly1305.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_chacha20poly1305.c,v 1.7 2014/06/21 15:30:36 jsing Exp $ */
+/* $OpenBSD: e_chacha20poly1305.c,v 1.8 2014/07/10 22:45:57 jsing Exp $ */
 /*
  * Copyright (c) 2014, Google Inc.
  *
@@ -17,14 +17,16 @@
 
 #include <stdint.h>
 #include <string.h>
+
 #include <openssl/opensslconf.h>
 
 #if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
 
+#include <openssl/err.h>
+#include <openssl/evp.h>
 #include <openssl/chacha.h>
 #include <openssl/poly1305.h>
-#include <openssl/evp.h>
-#include <openssl/err.h>
+
 #include "evp_locl.h"
 
 #define POLY1305_TAG_LEN 16