Remove engine.h includes for internal code.

This should no be used anywhere, as typedef for ENGINE is in types.h.

Only apps should include this header for compatibility stubs.

Signed-off-by: Milan Broz <gmazyland@gmail.com>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/29305)

diff --git a/apps/include/apps.h b/apps/include/apps.h
index 236f3ea998089908642aa576ee9f6237360d02fd..db4df403823f5f9f0c700123a95d9722a239be8c 100644 (file)
--- a/apps/include/apps.h
+++ b/apps/include/apps.h
@@ -27,7 +27,6 @@
 # include <openssl/x509.h>
 # include <openssl/conf.h>
 # include <openssl/txt_db.h>
-# include <openssl/engine.h>
 # include <openssl/ocsp.h>
 # include <openssl/http.h>
 # include <signal.h>
@@ -177,10 +176,6 @@ __owur int ctx_set_ctlog_list_file(SSL_CTX *ctx, const char *path);
 
 # endif
 
-# ifndef OPENSSL_NO_DEPRECATED_3_6
-int get_legacy_pkey_id(OSSL_LIB_CTX *libctx, const char *algname, ENGINE *e);
-# endif
-
 # ifndef OPENSSL_NO_OCSP
 OCSP_RESPONSE *process_responder(OCSP_REQUEST *req, const char *host,
                                  const char *port, const char *path,

diff --git a/crypto/asn1/a_digest.c b/crypto/asn1/a_digest.c
index 6cdeb709200fa30f30251229d7b255e0f08c1557..f485a19213f4df2be34c9a7ccb6c1e650d39051b 100644 (file)
--- a/crypto/asn1/a_digest.c
+++ b/crypto/asn1/a_digest.c
@@ -7,16 +7,12 @@
  * https://www.openssl.org/source/license.html
  */
 
-/* We need to use some engine deprecated APIs */
-#define OPENSSL_SUPPRESS_DEPRECATED
-
 #include <stdio.h>
 #include <time.h>
 #include <sys/types.h>
 
 #include "internal/cryptlib.h"
 
-#include <openssl/engine.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/buffer.h>

diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c
index 5f647b5dbfa9e45a7694ea994ff81c4f20be9612..f97b6f96179e4d20b32194eb980def907429ccc9 100644 (file)
--- a/crypto/asn1/ameth_lib.c
+++ b/crypto/asn1/ameth_lib.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * We need to use some engine deprecated APIs
+ * We need to use some EVP_PKEY_asn1 deprecated APIs
  */
 #include "internal/deprecated.h"
 
@@ -16,7 +16,6 @@
 #include <stdio.h>
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
-#include <openssl/engine.h>
 #include "crypto/asn1.h"
 #include "crypto/evp.h"
 

diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c
index c7dc93ad20b4843b9b838c6c0d03dc91b806902f..7b9d55ec7ab25ee30d79d1397511c6b25e4c6aef 100644 (file)
--- a/crypto/asn1/d2i_pr.c
+++ b/crypto/asn1/d2i_pr.c
@@ -7,16 +7,12 @@
  * https://www.openssl.org/source/license.html
  */
 
-/* We need to use some engine deprecated APIs */
-#define OPENSSL_SUPPRESS_DEPRECATED
-
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/bn.h>
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/decoder.h>
-#include <openssl/engine.h>
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
 #include "crypto/asn1.h"

diff --git a/crypto/conf/conf_mall.c b/crypto/conf/conf_mall.c
index f868f78a216117ab38f04b07fec6ecde9b9edf59..67ec97ec3c37b95841c2ccdfae0e810fd616a597 100644 (file)
--- a/crypto/conf/conf_mall.c
+++ b/crypto/conf/conf_mall.c
@@ -7,16 +7,12 @@
  * https://www.openssl.org/source/license.html
  */
 
-/* We need to use some engine deprecated APIs */
-#define OPENSSL_SUPPRESS_DEPRECATED
-
 #include <stdio.h>
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
 #include <openssl/conf.h>
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
-#include <openssl/engine.h>
 #include "internal/provider.h"
 #include "crypto/rand.h"
 #include "conf_local.h"

diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c
index 3436b03b3197e610640bfc53eb69371cb0f91503..b1010ee9c648fe5428277073225f72da7ded504d 100644 (file)
--- a/crypto/conf/conf_mod.c
+++ b/crypto/conf/conf_mod.c
@@ -7,9 +7,6 @@
  * https://www.openssl.org/source/license.html
  */
 
-/* We need to use some engine deprecated APIs */
-#define OPENSSL_SUPPRESS_DEPRECATED
-
 #include "internal/cryptlib.h"
 #include "internal/rcu.h"
 #include <stdio.h>
@@ -22,7 +19,6 @@
 #include "internal/thread_once.h"
 #include <openssl/x509.h>
 #include <openssl/trace.h>
-#include <openssl/engine.h>
 #include "conf_local.h"
 
 DEFINE_STACK_OF(CONF_MODULE)

diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c
index 106434dcbf3d79f290955a898a93d977d124ac84..8d65b393abdf2f3a0a50b312c031235ae4b9e157 100644 (file)
--- a/crypto/conf/conf_sap.c
+++ b/crypto/conf/conf_sap.c
@@ -14,7 +14,6 @@
 #include "conf_local.h"
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
-#include <openssl/engine.h>
 
 #if defined(_WIN32) && !defined(__BORLANDC__)
 # define strdup _strdup

diff --git a/crypto/ec/ec_backend.c b/crypto/ec/ec_backend.c
index 7abf37753e80db8e418e6e8dd1b6f513a9b81b0f..a5c0020dc92240cf8c577301af18705655a97e06 100644 (file)
--- a/crypto/ec/ec_backend.c
+++ b/crypto/ec/ec_backend.c
@@ -18,7 +18,6 @@
 #include <openssl/params.h>
 #include <openssl/err.h>
 #ifndef FIPS_MODULE
-# include <openssl/engine.h>
 # include <openssl/x509.h>
 #endif
 #include "crypto/bn.h"

diff --git a/crypto/ec/ec_kmeth.c b/crypto/ec/ec_kmeth.c
index 89c4985f3e53061f904cac3dfc73df5514c95194..88323d69bad33dfdfea2e2822676f8b45c16aada 100644 (file)
--- a/crypto/ec/ec_kmeth.c
+++ b/crypto/ec/ec_kmeth.c
@@ -15,13 +15,9 @@
 
 #include <string.h>
 #include <openssl/ec.h>
-#ifndef FIPS_MODULE
-# include <openssl/engine.h>
-#endif
 #include <openssl/err.h>
 #include "ec_local.h"
 
-
 static const EC_KEY_METHOD openssl_ec_key_method = {
     "OpenSSL EC_KEY method",
     0,

diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c
index e1e04cb146c81223b6ad6aeb7c83b1cd82283e20..8086f101cd94a49d5fffe4e54c5c11093b3e5307 100644 (file)
--- a/crypto/evp/digest.c
+++ b/crypto/evp/digest.c
@@ -7,16 +7,10 @@
  * https://www.openssl.org/source/license.html
  */
 
-/* We need to use some engine deprecated APIs */
-#define OPENSSL_SUPPRESS_DEPRECATED
-
 #include <stdio.h>
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/ec.h>
-#ifndef FIPS_MODULE
-# include <openssl/engine.h>
-#endif
 #include <openssl/params.h>
 #include <openssl/core_names.h>
 #include "internal/cryptlib.h"

diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
index a86f116090c4b311c93c52be92d4ffc00b7228cc..31ea539050ba7d8c84a1726e9443db88652912fa 100644 (file)
--- a/crypto/evp/evp_enc.c
+++ b/crypto/evp/evp_enc.c
@@ -7,18 +7,12 @@
  * https://www.openssl.org/source/license.html
  */
 
-/* We need to use some engine deprecated APIs */
-#define OPENSSL_SUPPRESS_DEPRECATED
-
 #include <stdio.h>
 #include <limits.h>
 #include <assert.h>
 #include <openssl/evp.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
-#ifndef FIPS_MODULE
-# include <openssl/engine.h>
-#endif
 #include <openssl/params.h>
 #include <openssl/core_names.h>
 #include "internal/cryptlib.h"

diff --git a/crypto/evp/evp_pkey_type.c b/crypto/evp/evp_pkey_type.c
index 192069dee43d5918058ff4e2d1638bb4a7348ae3..793a56f33eea58607b116f1909816c48a5a4ee04 100644 (file)
--- a/crypto/evp/evp_pkey_type.c
+++ b/crypto/evp/evp_pkey_type.c
@@ -13,7 +13,6 @@
 #include <openssl/core_names.h>
 #include <openssl/macros.h>
 #ifndef OPENSSL_NO_DEPRECATED_3_6
-# include <openssl/engine.h>
 # include "crypto/asn1.h"
 #include <openssl/types.h>
 #else

diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index 9912bd515fc0310acecb051bdc6467a7abf570f2..5ae44e35f70c45f2b01b9ae1c48c3bca11c04824 100644 (file)
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -27,9 +27,6 @@
 #include <openssl/dh.h>
 #include <openssl/ec.h>
 #include <openssl/cmac.h>
-#ifndef FIPS_MODULE
-# include <openssl/engine.h>
-#endif
 #include <openssl/params.h>
 #include <openssl/param_build.h>
 #include <openssl/encoder.h>

diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index 4eef8dfd659ae682eaaaa2af6aa78a284d5bba23..fe0bb142fd6bcef68725a4f32a97ed1e71f97beb 100644 (file)
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -15,9 +15,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifndef FIPS_MODULE
-# include <openssl/engine.h>
-#endif
 #include <openssl/evp.h>
 #include <openssl/core_names.h>
 #include <openssl/dh.h>

diff --git a/crypto/init.c b/crypto/init.c
index 05101b4db3e9004ddc0ef516d8062493445ae33b..9c01f1065cb939500de65a1375ec5ab98d66f492 100644 (file)
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -7,9 +7,6 @@
  * https://www.openssl.org/source/license.html
  */
 
-/* We need to use some engine deprecated APIs */
-#define OPENSSL_SUPPRESS_DEPRECATED
-
 #include "internal/e_os.h"
 #include "crypto/cryptlib.h"
 #include <openssl/err.h>
@@ -19,7 +16,6 @@
 #include "crypto/evp.h"
 #include "internal/conf.h"
 #include "crypto/async.h"
-#include "crypto/engine.h"
 #include "internal/comp.h"
 #include "internal/err.h"
 #include "crypto/err.h"

diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index 86ec911320c849e02c4a760218f2cbe2f7e1343d..282522a086439b38e3028d03e19a002f554ee2b5 100644 (file)
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * We need to use some engine deprecated APIs
+ * We need to use some EVP_PKEY_asn1 deprecated APIs
  */
 #include "internal/deprecated.h"
 
@@ -25,7 +25,6 @@
 #include <openssl/pkcs12.h>
 #include "crypto/asn1.h"
 #include <openssl/des.h>
-#include <openssl/engine.h>
 
 #define MIN_LENGTH      4
 

diff --git a/crypto/pem/pem_pkey.c b/crypto/pem/pem_pkey.c
index b1001e2d4beb080ef1db8d3abdee931290cef9eb..02ade5bfbc5cff6473915eb5442557780459a5c5 100644 (file)
--- a/crypto/pem/pem_pkey.c
+++ b/crypto/pem/pem_pkey.c
@@ -19,7 +19,6 @@
 #include <openssl/x509.h>
 #include <openssl/pkcs12.h>
 #include <openssl/pem.h>
-#include <openssl/engine.h>
 #include <openssl/dh.h>
 #include <openssl/decoder.h>
 #include <openssl/ui.h>

diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index 0477929c3901dd96b2057df5a9c6ad176a5d6bc2..f43efc575232ec1117d4f505cf21d73f02e63241 100644 (file)
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-/* We need to use some engine deprecated APIs */
+/* We need to use some RAND deprecated APIs */
 #define OPENSSL_SUPPRESS_DEPRECATED
 
 #include <openssl/err.h>
@@ -88,7 +88,6 @@ static RAND_GLOBAL *rand_get_global(OSSL_LIB_CTX *libctx)
 # include <limits.h>
 # include <openssl/conf.h>
 # include <openssl/trace.h>
-# include <openssl/engine.h>
 # include "crypto/rand_pool.h"
 # include "prov/seeding.h"
 # include "internal/e_os.h"

diff --git a/crypto/rand/rand_pool.c b/crypto/rand/rand_pool.c
index 4f258b87ee4b6b58764aa35193d3b016e37f6cc0..1c4e49c1d083d59392b105b13c5029c7f8be5e73 100644 (file)
--- a/crypto/rand/rand_pool.c
+++ b/crypto/rand/rand_pool.c
@@ -12,7 +12,6 @@
 #include "internal/cryptlib.h"
 #include <openssl/opensslconf.h>
 #include "crypto/rand.h"
-#include <openssl/engine.h>
 #include "internal/thread_once.h"
 #include "crypto/rand_pool.h"
 

diff --git a/crypto/store/store_local.h b/crypto/store/store_local.h
index 8c3ca54ebef9ffea382c7289fa337053bfde348b..eff232332f8d219ca87bec56eaf3cf7dd01eaefb 100644 (file)
--- a/crypto/store/store_local.h
+++ b/crypto/store/store_local.h
@@ -11,7 +11,6 @@
 #include "internal/thread_once.h"
 #include "internal/refcount.h"
 #include <openssl/dsa.h>
-#include <openssl/engine.h>
 #include <openssl/evp.h>
 #include <openssl/lhash.h>
 #include <openssl/x509.h>

diff --git a/crypto/ts/ts_conf.c b/crypto/ts/ts_conf.c
index 30ed883bda0dc5eb56da52720193832fdaf46477..9e3abb39cda07588238f340396335629ad330074 100644 (file)
--- a/crypto/ts/ts_conf.c
+++ b/crypto/ts/ts_conf.c
@@ -7,15 +7,11 @@
  * https://www.openssl.org/source/license.html
  */
 
-/* We need to use some engine deprecated APIs */
-#define OPENSSL_SUPPRESS_DEPRECATED
-
 #include <string.h>
 
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
 #include <openssl/pem.h>
-#include <openssl/engine.h>
 #include <openssl/ts.h>
 #include <openssl/conf_api.h>
 

diff --git a/crypto/x509/x_pubkey.c b/crypto/x509/x_pubkey.c
index abc4ee0cdf680939df6deb9a3b2f06a18e187fc2..d07b3752d3141c9f04d123cb15efb386336b24f3 100644 (file)
--- a/crypto/x509/x_pubkey.c
+++ b/crypto/x509/x_pubkey.c
@@ -17,7 +17,6 @@
 #include "internal/cryptlib.h"
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
-#include <openssl/engine.h>
 #include "crypto/asn1.h"
 #include "crypto/evp.h"
 #include "crypto/x509.h"

diff --git a/include/crypto/engine.h b/include/crypto/engine.h
deleted file mode 100644 (file)
index fac6ed0..0000000
--- a/include/crypto/engine.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the Apache License 2.0 (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#include <openssl/engine.h>
-
-void engine_load_openssl_int(void);
-void engine_load_devcrypto_int(void);
-void engine_load_rdrand_int(void);
-void engine_load_dynamic_int(void);
-void engine_load_padlock_int(void);
-void engine_load_capi_int(void);
-void engine_load_dasync_int(void);
-void engine_load_afalg_int(void);
-void engine_cleanup_int(void);