From 3c27208fab1dc29f47f088490404df5abfcdfb05 Mon Sep 17 00:00:00 2001
From: Rich Salz <rsalz@openssl.org>
Date: Fri, 18 Mar 2016 14:30:20 -0400
Subject: Remove #error from include files.

Don't have #error statements in header files, but instead wrap
the contents of that file in #ifndef OPENSSL_NO_xxx
This means it is now always safe to include the header file.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---
 ssl/s3_lib.c             |  4 +---
 ssl/ssl_cert.c           |  4 +---
 ssl/ssl_ciph.c           |  8 ++------
 ssl/ssl_conf.c           |  4 +---
 ssl/ssl_lib.c            | 12 +++---------
 ssl/ssl_locl.h           | 16 ++++------------
 ssl/ssl_sess.c           |  4 +---
 ssl/statem/statem_clnt.c |  8 ++------
 ssl/statem/statem_srvr.c |  4 +---
 ssl/t1_enc.c             |  4 +---
 ssl/t1_ext.c             |  4 +---
 ssl/t1_lib.c             | 10 +++-------
 12 files changed, 21 insertions(+), 61 deletions(-)

(limited to 'ssl')

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 49180cd34a..e6cf309bb5 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -151,9 +151,7 @@
 #include <openssl/objects.h>
 #include "ssl_locl.h"
 #include <openssl/md5.h>
-#ifndef OPENSSL_NO_DH
-# include <openssl/dh.h>
-#endif
+#include <openssl/dh.h>
 #include <openssl/rand.h>
 
 #define SSL3_NUM_CIPHERS        OSSL_NELEM(ssl3_ciphers)
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index e17cffc814..4081ebe4ff 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -125,9 +125,7 @@
 #include <openssl/bio.h>
 #include <openssl/pem.h>
 #include <openssl/x509v3.h>
-#ifndef OPENSSL_NO_DH
-# include <openssl/dh.h>
-#endif
+#include <openssl/dh.h>
 #include <openssl/bn.h>
 #include "internal/threads.h"
 #include "ssl_locl.h"
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index c62b1935b6..938baaca43 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -141,12 +141,8 @@
 
 #include <stdio.h>
 #include <openssl/objects.h>
-#ifndef OPENSSL_NO_COMP
-# include <openssl/comp.h>
-#endif
-#ifndef OPENSSL_NO_ENGINE
-# include <openssl/engine.h>
-#endif
+#include <openssl/comp.h>
+#include <openssl/engine.h>
 #include "internal/threads.h"
 #include "ssl_locl.h"
 
diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c
index 157bf8ba0d..77fc4373d5 100644
--- a/ssl/ssl_conf.c
+++ b/ssl/ssl_conf.c
@@ -59,9 +59,7 @@
 #include "ssl_locl.h"
 #include <openssl/conf.h>
 #include <openssl/objects.h>
-#ifndef OPENSSL_NO_DH
-# include <openssl/dh.h>
-#endif
+#include <openssl/dh.h>
 
 /*
  * structure holding name tables. This is used for pemitted elements in lists
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 87e3dfad67..3385bc1508 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -152,16 +152,10 @@
 #include <openssl/x509v3.h>
 #include <openssl/rand.h>
 #include <openssl/ocsp.h>
-#ifndef OPENSSL_NO_DH
-# include <openssl/dh.h>
-#endif
-#ifndef OPENSSL_NO_ENGINE
-# include <openssl/engine.h>
-#endif
+#include <openssl/dh.h>
+#include <openssl/engine.h>
 #include <openssl/async.h>
-#ifndef OPENSSL_NO_CT
-# include <openssl/ct.h>
-#endif
+#include <openssl/ct.h>
 
 const char SSL_version_str[] = OPENSSL_VERSION_TEXT;
 
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index fa0254c809..4abe7b425f 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -149,24 +149,16 @@
 # include "e_os.h"
 
 # include <openssl/buffer.h>
-# ifndef OPENSSL_NO_COMP
-#  include <openssl/comp.h>
-# endif
+# include <openssl/comp.h>
 # include <openssl/bio.h>
 # include <openssl/stack.h>
-# ifndef OPENSSL_NO_RSA
-#  include <openssl/rsa.h>
-# endif
-# ifndef OPENSSL_NO_DSA
-#  include <openssl/dsa.h>
-# endif
+# include <openssl/rsa.h>
+# include <openssl/dsa.h>
 # include <openssl/err.h>
 # include <openssl/ssl.h>
 # include <openssl/async.h>
 # include <openssl/symhacks.h>
-# ifndef OPENSSL_NO_CT
-#  include <openssl/ct.h>
-# endif
+# include <openssl/ct.h>
 #include "record/record.h"
 #include "statem/statem.h"
 #include "packet_locl.h"
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index ebeeba011c..3f030a76eb 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -137,9 +137,7 @@
 #include <stdio.h>
 #include <openssl/lhash.h>
 #include <openssl/rand.h>
-#ifndef OPENSSL_NO_ENGINE
-# include <openssl/engine.h>
-#endif
+#include <openssl/engine.h>
 #include "ssl_locl.h"
 
 static void SSL_SESSION_list_remove(SSL_CTX *ctx, SSL_SESSION *s);
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 26c4d10785..bafb90a9dc 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -155,13 +155,9 @@
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/md5.h>
-#ifndef OPENSSL_NO_DH
-# include <openssl/dh.h>
-#endif
+#include <openssl/dh.h>
 #include <openssl/bn.h>
-#ifndef OPENSSL_NO_ENGINE
-# include <openssl/engine.h>
-#endif
+#include <openssl/engine.h>
 
 static ossl_inline int cert_req_allowed(SSL *s);
 static int key_exchange_expected(SSL *s);
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 526b0c5cd4..2f2f457074 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -158,9 +158,7 @@
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/x509.h>
-#ifndef OPENSSL_NO_DH
-# include <openssl/dh.h>
-#endif
+#include <openssl/dh.h>
 #include <openssl/bn.h>
 #include <openssl/md5.h>
 
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index f2650b0b77..6e56441d0f 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -136,9 +136,7 @@
 
 #include <stdio.h>
 #include "ssl_locl.h"
-#ifndef OPENSSL_NO_COMP
-# include <openssl/comp.h>
-#endif
+#include <openssl/comp.h>
 #include <openssl/evp.h>
 #include <openssl/kdf.h>
 #include <openssl/rand.h>
diff --git a/ssl/t1_ext.c b/ssl/t1_ext.c
index eb7d8a74b2..7940cfc2bf 100644
--- a/ssl/t1_ext.c
+++ b/ssl/t1_ext.c
@@ -54,9 +54,7 @@
 
 /* Custom extension utility functions */
 
-#ifndef OPENSSL_NO_CT
-# include <openssl/ct.h>
-#endif
+#include <openssl/ct.h>
 #include "ssl_locl.h"
 
 
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index fc7ebe41ca..26c02a0e44 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -115,14 +115,10 @@
 #include <openssl/hmac.h>
 #include <openssl/ocsp.h>
 #include <openssl/rand.h>
-#ifndef OPENSSL_NO_DH
-# include <openssl/dh.h>
-# include <openssl/bn.h>
-#endif
+#include <openssl/dh.h>
+#include <openssl/bn.h>
 #include "ssl_locl.h"
-#ifndef OPENSSL_NO_CT
-# include <openssl/ct.h>
-#endif
+#include <openssl/ct.h>
 
 static int tls_decrypt_ticket(SSL *s, const unsigned char *tick, int ticklen,
                               const unsigned char *sess_id, int sesslen,
-- 
cgit v1.2.3