From 62348213609ef233110561d1a6ed67ad66df1c7e Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 10 Jul 2014 22:45:58 +0000
Subject: 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.
---
 src/lib/libcrypto/err/err.c     | 7 +++++--
 src/lib/libcrypto/err/err_all.c | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/lib/libcrypto/err')

diff --git a/src/lib/libcrypto/err/err.c b/src/lib/libcrypto/err/err.c
index ee6d91f465..cc9d78cb07 100644
--- a/src/lib/libcrypto/err/err.c
+++ b/src/lib/libcrypto/err/err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: err.c,v 1.36 2014/06/27 07:01:21 deraadt Exp $ */
+/* $OpenBSD: err.c,v 1.37 2014/07/10 22:45:57 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -109,9 +109,12 @@
  *
  */
 
-#include <stdio.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <string.h>
+
+#include <openssl/opensslconf.h>
+
 #include "cryptlib.h"
 #include <openssl/lhash.h>
 #include <openssl/crypto.h>
diff --git a/src/lib/libcrypto/err/err_all.c b/src/lib/libcrypto/err/err_all.c
index 0de1ced6fd..d950aad3b4 100644
--- a/src/lib/libcrypto/err/err_all.c
+++ b/src/lib/libcrypto/err/err_all.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: err_all.c,v 1.15 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: err_all.c,v 1.16 2014/07/10 22:45:57 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,6 +57,9 @@
  */
 
 #include <stdio.h>
+
+#include <openssl/opensslconf.h>
+
 #include <openssl/asn1.h>
 #include <openssl/bn.h>
 #ifndef OPENSSL_NO_EC
-- 
cgit v1.2.3-55-g6feb