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, 1 deletions

diff --git a/src/lib/libcrypto/srp/srp.h b/src/lib/libcrypto/srp/srp.h
index 53e7b8049a..168d9656b3 100644
--- a/src/lib/libcrypto/srp/srp.h
+++ b/src/lib/libcrypto/srp/srp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: srp.h,v 1.2 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: srp.h,v 1.3 2014/07/10 22:45:58 jsing Exp $ */
 /* Written by Christophe Renou (christophe.renou@edelweb.fr) with 
  * the precious help of Peter Sylvester (peter.sylvester@edelweb.fr) 
  * for the EdelKey project and contributed to the OpenSSL project 2004.
@@ -59,6 +59,8 @@
 #ifndef __SRP_H__
 #define __SRP_H__
 
+#include <openssl/opensslconf.h>
+
 #ifndef OPENSSL_NO_SRP
 
 #include <stdio.h>