wrap optional headers with OPENSSL_NO_ macro

crypto/asn1/ameth_lib.c

@@ -11,7 +11,9 @@
 #include "internal/cryptlib.h"
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
-#include <openssl/engine.h>
+#ifndef OPENSSL_NO_ENGINE
+# include <openssl/engine.h>
+#endif
 #include "internal/asn1_int.h"
 #include "internal/evp_int.h"
 

crypto/asn1/d2i_pr.c

@@ -12,7 +12,9 @@
 #include <openssl/bn.h>
 #include <openssl/evp.h>
 #include <openssl/objects.h>
-#include <openssl/engine.h>
+#ifndef OPENSSL_NO_ENGINE
+# include <openssl/engine.h>
+#endif
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
 #include "internal/asn1_int.h"

crypto/conf/conf_mall.c

@@ -13,7 +13,9 @@
 #include <openssl/conf.h>
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
-#include <openssl/engine.h>
+#ifndef OPENSSL_NO_ENGINE
+# include <openssl/engine.h>
+#endif
 
 /* Load all OpenSSL builtin modules */
 

crypto/conf/conf_sap.c

@@ -13,7 +13,9 @@
 #include <internal/conf.h>
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
-#include <openssl/engine.h>
+#ifndef OPENSSL_NO_ENGINE
+# include <openssl/engine.h>
+#endif
 
 /*
  * This is the automatic configuration loader: it is called automatically by

crypto/ec/ec_ameth.c

@@ -12,7 +12,9 @@
 #include <openssl/x509.h>
 #include <openssl/ec.h>
 #include <openssl/bn.h>
-#include <openssl/cms.h>
+#ifndef OPENSSL_NO_CMS
+# include <openssl/cms.h>
+#endif
 #include <openssl/asn1t.h>
 #include "internal/asn1_int.h"
 #include "internal/evp_int.h"

crypto/ec/ec_key.c

@@ -17,7 +17,9 @@
 #include <string.h>
 #include "ec_lcl.h"
 #include <openssl/err.h>
-#include <openssl/engine.h>
+#ifndef OPENSSL_NO_ENGINE
+# include <openssl/engine.h>
+#endif
 
 EC_KEY *EC_KEY_new(void)
 {

crypto/ec/ec_kmeth.c

@@ -9,7 +9,9 @@
 
 #include <string.h>
 #include <openssl/ec.h>
-#include <openssl/engine.h>
+#ifndef OPENSSL_NO_ENGINE
+# include <openssl/engine.h>
+#endif
 #include <openssl/err.h>
 #include "ec_lcl.h"
 #ifndef OPENSSL_NO_SM2

crypto/err/err_all.c

@@ -18,7 +18,9 @@
 #endif
 #include <openssl/buffer.h>
 #include <openssl/bio.h>
-#include <openssl/comp.h>
+#ifndef OPENSSL_NO_COMP
+# include <openssl/comp.h>
+#endif
 #ifndef OPENSSL_NO_RSA
 # include <openssl/rsa.h>
 #endif
@@ -37,14 +39,22 @@
 #include <openssl/pkcs12.h>
 #include <openssl/rand.h>
 #include "internal/dso.h"
-#include <openssl/engine.h>
-#include <openssl/ui.h>
-#include <openssl/ocsp.h>
+#ifndef OPENSSL_NO_ENGINE
+# include <openssl/engine.h>
+#endif
+#ifndef OPENSSL_NO_UI
+# include <openssl/ui.h>
+#endif
+#ifndef OPENSSL_NO_OCSP
+# include <openssl/ocsp.h>
+#endif
 #include <openssl/err.h>
 #ifdef OPENSSL_FIPS
 # include <openssl/fips.h>
 #endif
-#include <openssl/ts.h>
+#ifndef OPENSSL_NO_TS
+# include <openssl/ts.h>
+#endif
 #ifndef OPENSSL_NO_CMS
 # include <openssl/cms.h>
 #endif

crypto/evp/digest.c

@@ -11,7 +11,9 @@
 #include "internal/cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/evp.h>
-#include <openssl/engine.h>
+#ifndef OPENSSL_NO_ENGINE
+# include <openssl/engine.h>
+#endif
 #include "internal/evp_int.h"
 #include "evp_locl.h"
 #ifndef OPENSSL_NO_SM2

crypto/evp/evp_enc.c

@@ -13,7 +13,9 @@
 #include <openssl/evp.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
-#include <openssl/engine.h>
+#ifndef OPENSSL_NO_ENGINE
+# include <openssl/engine.h>
+#endif
 #include "internal/evp_int.h"
 #include "evp_locl.h"
 

crypto/evp/m_md5.c

@@ -16,7 +16,9 @@
 # include <openssl/objects.h>
 # include <openssl/x509.h>
 # include <openssl/md5.h>
-# include <openssl/rsa.h>
+# ifndef OPENSSL_NO_RSA
+#  include <openssl/rsa.h>
+# endif
 # include "internal/evp_int.h"
 
 static int init(EVP_MD_CTX *ctx)

crypto/evp/p_lib.c

@@ -26,7 +26,9 @@
 #ifndef OPENSSL_NO_PAILLIER
 # include <openssl/paillier.h>
 #endif
-#include <openssl/engine.h>
+#ifndef OPENSSL_NO_ENGINE
+# include <openssl/engine.h>
+#endif
 
 #include "internal/asn1_int.h"
 #include "internal/evp_int.h"

crypto/evp/pmeth_lib.c

@@ -10,7 +10,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "internal/cryptlib.h"
-#include <openssl/engine.h>
+#ifndef OPENSSL_NO_ENGINE
+# include <openssl/engine.h>
+#endif
 #include <openssl/evp.h>
 #include <openssl/x509v3.h>
 #include "internal/asn1_int.h"

crypto/include/internal/async.h

@@ -7,7 +7,11 @@
  * https://www.openssl.org/source/license.html
  */
 
+//FIXME:
+
+#ifndef OPENSSL_NO_ASYNC
 #include <openssl/async.h>
+#endif
 
 int async_init(void);
 void async_deinit(void);

crypto/include/internal/engine.h

@@ -7,7 +7,9 @@
  * https://www.openssl.org/source/license.html
  */
 
+#ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
+#endif
 
 void engine_load_openssl_int(void);
 void engine_load_cryptodev_int(void);

crypto/pem/pem3.c

@@ -52,10 +52,14 @@
 #include <openssl/bio.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
-#include <openssl/pkcs7.h>
+#ifndef OPENSSL_NO_PKCS7
+# include <openssl/pkcs7.h>
+#endif
 #include <openssl/pem.h>
 #include <openssl/pem3.h>
-#include <openssl/paillier.h>
+#ifndef OPENSSL_NO_PAILLIER
+# include <openssl/paillier.h>
+#endif
 
 /*
 extern PAILLIER *EVP_PKEY_get1_PAILLIER(EVP_PKEY *key);

crypto/pem/pem_lib.c

@@ -22,7 +22,9 @@
 #ifndef OPENSSL_NO_DES
 # include <openssl/des.h>
 #endif
-#include <openssl/engine.h>
+#ifndef OPENSSL_NO_ENGINE
+# include <openssl/engine.h>
+#endif
 
 #define MIN_LENGTH      4
 

crypto/pem/pem_pkey.c

@@ -15,7 +15,9 @@
 #include <openssl/x509.h>
 #include <openssl/pkcs12.h>
 #include <openssl/pem.h>
-#include <openssl/engine.h>
+#ifndef OPENSSL_NO_ENGINE
+# include <openssl/engine.h>
+#endif
 #ifndef OPENSSL_NO_DH
 # include <openssl/dh.h>
 #endif

crypto/rand/md_rand.c

@@ -22,7 +22,9 @@
 #include <openssl/opensslconf.h>
 #include <openssl/crypto.h>
 #include <openssl/rand.h>
-#include <openssl/async.h>
+#ifndef OPENSSL_NO_ASYNC
+# include <openssl/async.h>
+#endif
 #include "rand_lcl.h"
 
 #include <openssl/err.h>

crypto/rand/rand_lib.c

@@ -13,7 +13,9 @@
 #include <openssl/opensslconf.h>
 #include "internal/rand.h"
 
-#include <openssl/engine.h>
+#ifndef OPENSSL_NO_ENGINE
+# include <openssl/engine.h>
+#endif
 
 #ifdef OPENSSL_FIPS
 # include <openssl/fips.h>