From c8e58b52150f7c13e3281d122ed2c3ff38b6a1d5 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/ui/ui.h     | 4 +++-
 src/lib/libcrypto/ui/ui_err.c | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

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

diff --git a/src/lib/libcrypto/ui/ui.h b/src/lib/libcrypto/ui/ui.h
index 5abd5c2d7f..b6b0075e4d 100644
--- a/src/lib/libcrypto/ui/ui.h
+++ b/src/lib/libcrypto/ui/ui.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ui.h,v 1.8 2014/06/12 15:49:31 deraadt Exp $ */
+/* $OpenBSD: ui.h,v 1.9 2014/07/10 22:45:58 jsing Exp $ */
 /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
  * project 2001.
  */
@@ -59,6 +59,8 @@
 #ifndef HEADER_UI_H
 #define HEADER_UI_H
 
+#include <openssl/opensslconf.h>
+
 #ifndef OPENSSL_NO_DEPRECATED
 #include <openssl/crypto.h>
 #endif
diff --git a/src/lib/libcrypto/ui/ui_err.c b/src/lib/libcrypto/ui/ui_err.c
index 3c204171f3..576f334796 100644
--- a/src/lib/libcrypto/ui/ui_err.c
+++ b/src/lib/libcrypto/ui/ui_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ui_err.c,v 1.7 2014/06/12 15:49:31 deraadt Exp $ */
+/* $OpenBSD: ui_err.c,v 1.8 2014/07/10 22:45:58 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1999-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -59,6 +59,9 @@
  */
 
 #include <stdio.h>
+
+#include <openssl/opensslconf.h>
+
 #include <openssl/err.h>
 #include <openssl/ui.h>
 
-- 
cgit v1.2.3-55-g6feb