[openssl] master update
Richard Levitte
levitte at openssl.org
Thu Jul 16 07:15:09 UTC 2020
The branch master has been updated
via 81ed433cf835bf7b47aa926735196b6948f65e95 (commit)
via bb9542621170185a9a4af6d0468cf839f4512343 (commit)
via 184fb690fabe272a197f363144064141d369a192 (commit)
via 03445677b900fb9775c6652daa7fe7943d468aa7 (commit)
via 2099f1bb6ba61e9f50193d3eab22e31bba627fb9 (commit)
via 1bdab93a62df26112564acc94b2a753436b9ac7b (commit)
via 8b4c89f8d2d0a277ad9f66e98d8f308ebb4ef8c4 (commit)
via 571d2c4dc70b9dffb32cf1a4969820dec6426c46 (commit)
via 2d71c9468a338adaa5c78b9d4a1382ff8f106143 (commit)
via 9bd8d96c390902ae3c0926c1d6c68521e48a7f7f (commit)
via e4468e6d8dc5a8a7e49f2ba77ed55ce2b282d4a7 (commit)
via ad8fc6f626a6f9064383d77b102c8efcf442a9d7 (commit)
via 91512a771ac0f98b741824af9b2472d3eb754e70 (commit)
via 304d070eba9dae427a5846371a4575e397f7bbbd (commit)
via 92f8603537d5e883588163e04396779edb21a0b7 (commit)
via cf8e8cba93776cda9a137232df58a17d7c9a8fc1 (commit)
via 597f3f3ab144a4f3616073f41ee3722e1b75f2a3 (commit)
via 4222682dae2efde296ba43a98673b55d0ce55d7e (commit)
via 0f221d9c68b005332e21e70e7e841d021dc20498 (commit)
via 699caa18d5f28f373fb7f5c7b946249e0be1ceb4 (commit)
via 0a684b09d8911a5849744f2de90e81ae07bd59fb (commit)
via 910b71cf47266233fcb0a46d3e742e1a0834069f (commit)
from 8c2bfd25129aea1b1f1b66ec753b21955f8ed523 (commit)
- Log -----------------------------------------------------------------
commit 81ed433cf835bf7b47aa926735196b6948f65e95
Author: Pauli <paul.dale at oracle.com>
Date: Tue Jul 14 22:04:29 2020 +1000
libcrypto.num: engine deprecation updates
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
commit bb9542621170185a9a4af6d0468cf839f4512343
Author: Pauli <paul.dale at oracle.com>
Date: Tue Jul 14 21:33:14 2020 +1000
doc: remove unused engine tracing option
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
commit 184fb690fabe272a197f363144064141d369a192
Author: Pauli <paul.dale at oracle.com>
Date: Tue Jul 14 21:32:52 2020 +1000
trace: condition out engine related tracing
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
commit 03445677b900fb9775c6652daa7fe7943d468aa7
Author: Pauli <paul.dale at oracle.com>
Date: Tue Jul 14 10:29:56 2020 +1000
Document that ENGINE_add_conf_module() was deprecated.
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
commit 2099f1bb6ba61e9f50193d3eab22e31bba627fb9
Author: Pauli <paul.dale at oracle.com>
Date: Tue Jul 14 10:29:24 2020 +1000
Document that exdata for ENGINES is deprecated.
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
commit 1bdab93a62df26112564acc94b2a753436b9ac7b
Author: Pauli <paul.dale at oracle.com>
Date: Tue Jul 14 10:28:49 2020 +1000
Document that the ENGINE_[sg]_ex_data() calls are reprecated.
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
commit 8b4c89f8d2d0a277ad9f66e98d8f308ebb4ef8c4
Author: Pauli <paul.dale at oracle.com>
Date: Tue Jul 14 10:27:39 2020 +1000
RAND: document that the ENGINE RAND override is deprecated.
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
commit 571d2c4dc70b9dffb32cf1a4969820dec6426c46
Author: Pauli <paul.dale at oracle.com>
Date: Tue Jul 14 10:27:07 2020 +1000
ENGINESDIR: document that this configuration is deprecated.
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
commit 2d71c9468a338adaa5c78b9d4a1382ff8f106143
Author: Pauli <paul.dale at oracle.com>
Date: Tue Jul 14 10:25:38 2020 +1000
doc: document that the engine initialisation options are deprecated.
They can't be removed yet for API compatibility reasons.
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
commit 9bd8d96c390902ae3c0926c1d6c68521e48a7f7f
Author: Pauli <paul.dale at oracle.com>
Date: Tue Jul 14 09:40:47 2020 +1000
deprecate engines in provider code
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
commit e4468e6d8dc5a8a7e49f2ba77ed55ce2b282d4a7
Author: Pauli <paul.dale at oracle.com>
Date: Tue Jul 14 09:40:29 2020 +1000
deprecate engines in libcrypto
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
commit ad8fc6f626a6f9064383d77b102c8efcf442a9d7
Author: Pauli <paul.dale at oracle.com>
Date: Tue Jul 14 09:40:04 2020 +1000
apps: deprecate engines
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
commit 91512a771ac0f98b741824af9b2472d3eb754e70
Author: Pauli <paul.dale at oracle.com>
Date: Tue Jul 14 09:39:47 2020 +1000
deprecate engine from public header files
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
commit 304d070eba9dae427a5846371a4575e397f7bbbd
Author: Pauli <paul.dale at oracle.com>
Date: Tue Jul 14 09:39:20 2020 +1000
deprecate engine tests
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
commit 92f8603537d5e883588163e04396779edb21a0b7
Author: Pauli <paul.dale at oracle.com>
Date: Tue Jul 14 09:38:42 2020 +1000
deprecate engines in SSL
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
commit cf8e8cba93776cda9a137232df58a17d7c9a8fc1
Author: Pauli <paul.dale at oracle.com>
Date: Tue Jul 14 09:38:22 2020 +1000
deprecate engines
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
commit 597f3f3ab144a4f3616073f41ee3722e1b75f2a3
Author: Pauli <paul.dale at oracle.com>
Date: Mon Jul 13 10:51:03 2020 +1000
Fix indentation for engine.h
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
commit 4222682dae2efde296ba43a98673b55d0ce55d7e
Author: Pauli <paul.dale at oracle.com>
Date: Thu Jun 25 11:30:13 2020 +1000
doc: deprecate ENGINE documentation
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
commit 0f221d9c68b005332e21e70e7e841d021dc20498
Author: Pauli <paul.dale at oracle.com>
Date: Thu Jun 25 11:27:51 2020 +1000
apps: document the deprecation of the -engine option
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
commit 699caa18d5f28f373fb7f5c7b946249e0be1ceb4
Author: Pauli <paul.dale at oracle.com>
Date: Thu Jun 25 11:20:49 2020 +1000
engine: document the engine app as deprecated
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
commit 0a684b09d8911a5849744f2de90e81ae07bd59fb
Author: Pauli <paul.dale at oracle.com>
Date: Thu Jun 25 10:40:20 2020 +1000
apps/list: deprecate engine support
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
commit 910b71cf47266233fcb0a46d3e742e1a0834069f
Author: Pauli <paul.dale at oracle.com>
Date: Thu Jun 25 10:36:29 2020 +1000
deprecate engines in 3.0
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
-----------------------------------------------------------------------
Summary of changes:
Configure | 3 +-
apps/engine.c | 3 +
apps/genpkey.c | 3 +
apps/lib/apps.c | 3 +
apps/list.c | 26 +-
apps/req.c | 3 +
apps/s_client.c | 3 +
crypto/asn1/ameth_lib.c | 3 +
crypto/asn1/d2i_pr.c | 3 +
crypto/conf/conf_mall.c | 3 +
crypto/conf/conf_mod.c | 3 +
crypto/engine/eng_cnf.c | 3 +
crypto/engine/eng_ctrl.c | 3 +
crypto/engine/eng_dyn.c | 3 +
crypto/engine/eng_fat.c | 3 +
crypto/engine/eng_init.c | 3 +
crypto/engine/eng_list.c | 3 +
crypto/engine/eng_openssl.c | 3 +
crypto/engine/eng_pkey.c | 3 +
crypto/engine/eng_rdrand.c | 3 +
crypto/engine/tb_asnmth.c | 3 +
crypto/engine/tb_cipher.c | 3 +
crypto/engine/tb_dh.c | 3 +
crypto/engine/tb_digest.c | 3 +
crypto/engine/tb_dsa.c | 3 +
crypto/engine/tb_eckey.c | 3 +
crypto/engine/tb_pkmeth.c | 3 +
crypto/engine/tb_rand.c | 3 +
crypto/engine/tb_rsa.c | 3 +
crypto/evp/digest.c | 3 +
crypto/evp/evp_enc.c | 3 +
crypto/evp/pkey_mac.c | 3 +
crypto/init.c | 3 +
crypto/pem/pem_lib.c | 3 +
crypto/rand/rand_lib.c | 3 +
crypto/store/loader_file.c | 3 +
crypto/trace.c | 2 +
crypto/ts/ts_conf.c | 3 +
doc/man1/openssl-ca.pod.in | 2 +
doc/man1/openssl-cmp.pod.in | 4 +-
doc/man1/openssl-cms.pod.in | 2 +
doc/man1/openssl-dgst.pod.in | 8 +-
doc/man1/openssl-dhparam.pod.in | 2 +-
doc/man1/openssl-dsa.pod.in | 4 +
doc/man1/openssl-dsaparam.pod.in | 4 +
doc/man1/openssl-ec.pod.in | 4 +
doc/man1/openssl-ecparam.pod.in | 4 +
doc/man1/openssl-enc.pod.in | 2 +-
doc/man1/openssl-engine.pod.in | 6 +
doc/man1/openssl-gendsa.pod.in | 4 +
doc/man1/openssl-genpkey.pod.in | 2 +
doc/man1/openssl-list.pod.in | 10 +
doc/man1/openssl-pkcs12.pod.in | 4 +
doc/man1/openssl-pkcs7.pod.in | 4 +
doc/man1/openssl-pkcs8.pod.in | 2 +
doc/man1/openssl-pkey.pod.in | 4 +
doc/man1/openssl-pkeyparam.pod.in | 4 +
doc/man1/openssl-pkeyutl.pod.in | 2 +
doc/man1/openssl-rand.pod.in | 4 +
doc/man1/openssl-req.pod.in | 2 +
doc/man1/openssl-rsa.pod.in | 4 +
doc/man1/openssl-rsautl.pod.in | 2 +
doc/man1/openssl-s_client.pod.in | 2 +
doc/man1/openssl-s_server.pod.in | 2 +
doc/man1/openssl-smime.pod.in | 2 +
doc/man1/openssl-speed.pod.in | 4 +
doc/man1/openssl-spkac.pod.in | 2 +
doc/man1/openssl-srp.pod.in | 4 +
doc/man1/openssl-storeutl.pod.in | 2 +
doc/man1/openssl-ts.pod.in | 2 +
doc/man1/openssl-verify.pod.in | 2 +
doc/man1/openssl-x509.pod.in | 2 +
doc/man3/BIO_get_ex_new_index.pod | 5 +
doc/man3/CRYPTO_get_ex_new_index.pod | 3 +
doc/man3/ENGINE_add.pod | 9 +
doc/man3/OPENSSL_init_crypto.pod | 24 +-
doc/man3/OPENSSL_load_builtin_modules.pod | 4 +
doc/man3/OSSL_trace_set_channel.pod | 4 -
doc/man3/OpenSSL_version.pod | 3 +-
doc/man3/RAND_set_rand_method.pod | 8 +-
doc/perlvars.pm | 19 +-
engines/e_afalg.c | 3 +
engines/e_capi.c | 3 +
engines/e_dasync.c | 3 +
engines/e_devcrypto.c | 3 +
engines/e_ossltest.c | 3 +
engines/e_padlock.c | 4 +-
include/openssl/crypto.h | 1 -
include/openssl/engine.h | 477 ++++++++++++++++--------------
include/openssl/trace.h | 6 +-
providers/common/provider_util.c | 3 +
ssl/ssl_ciph.c | 3 +
ssl/ssl_lib.c | 3 +
ssl/ssl_sess.c | 3 +
ssl/statem/statem_clnt.c | 3 +
test/afalgtest.c | 3 +
test/enginetest.c | 3 +
util/libcrypto.num | 242 +++++++--------
98 files changed, 708 insertions(+), 387 deletions(-)
diff --git a/Configure b/Configure
index c9b5c59726..eeb88f6618 100755
--- a/Configure
+++ b/Configure
@@ -600,9 +600,8 @@ my @disable_cascades = (
"cmp" => [ "crmf" ],
- # Padlock engine uses low-level AES APIs which are deprecated
sub { $disabled{"deprecated-3.0"} }
- => [ "padlockeng" ]
+ => [ "engine" ]
);
# Avoid protocol support holes. Also disable all versions below N, if version
diff --git a/apps/engine.c b/apps/engine.c
index 6d788ac852..d51586d855 100644
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include <openssl/opensslconf.h>
#include "apps.h"
diff --git a/apps/genpkey.c b/apps/genpkey.c
index 4a4a83fd40..17fb42eba6 100644
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include <stdio.h>
#include <string.h>
#include "apps.h"
diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index 3e4cc288b1..777e4fed35 100644
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#if !defined(_POSIX_C_SOURCE) && defined(OPENSSL_SYS_VMS)
/*
* On VMS, you need to define this to get the declaration of fileno(). The
diff --git a/apps/list.c b/apps/list.c
index ed93186254..f0ea7dc6ae 100644
--- a/apps/list.c
+++ b/apps/list.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include <string.h>
#include <openssl/evp.h>
#include <openssl/err.h>
@@ -522,9 +525,10 @@ static void list_pkey_meth(void)
}
}
+#ifndef OPENSSL_NO_DEPRECATED_3_0
static void list_engines(void)
{
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
ENGINE *e;
BIO_puts(bio_out, "Engines:\n");
@@ -533,10 +537,11 @@ static void list_engines(void)
BIO_printf(bio_out, "%s\n", ENGINE_get_id(e));
e = ENGINE_get_next(e);
}
-#else
+# else
BIO_puts(bio_out, "Engine support is disabled.\n");
-#endif
+# endif
}
+#endif
static void list_disabled(void)
{
@@ -592,7 +597,7 @@ static void list_disabled(void)
#ifdef OPENSSL_NO_EC2M
BIO_puts(bio_out, "EC2M\n");
#endif
-#ifdef OPENSSL_NO_ENGINE
+#if defined(OPENSSL_NO_ENGINE) && !defined(OPENSSL_NO_DEPRECATED_3_0)
BIO_puts(bio_out, "ENGINE\n");
#endif
#ifdef OPENSSL_NO_GOST
@@ -689,8 +694,11 @@ typedef enum HELPLIST_CHOICE {
OPT_ERR = -1, OPT_EOF = 0, OPT_HELP, OPT_ONE, OPT_VERBOSE,
OPT_COMMANDS, OPT_DIGEST_COMMANDS, OPT_MAC_ALGORITHMS, OPT_OPTIONS,
OPT_DIGEST_ALGORITHMS, OPT_CIPHER_COMMANDS, OPT_CIPHER_ALGORITHMS,
- OPT_PK_ALGORITHMS, OPT_PK_METHOD, OPT_ENGINES, OPT_DISABLED,
+ OPT_PK_ALGORITHMS, OPT_PK_METHOD, OPT_DISABLED,
OPT_KDF_ALGORITHMS, OPT_RANDOM_GENERATORS, OPT_MISSING_HELP, OPT_OBJECTS,
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+ OPT_ENGINES,
+#endif
OPT_PROV_ENUM
} HELPLIST_CHOICE;
@@ -721,8 +729,10 @@ const OPTIONS list_options[] = {
"List of public key algorithms"},
{"public-key-methods", OPT_PK_METHOD, '-',
"List of public key methods"},
+#ifndef OPENSSL_NO_DEPRECATED_3_0
{"engines", OPT_ENGINES, '-',
"List of loaded engines"},
+#endif
{"disabled", OPT_DISABLED, '-',
"List of disabled features"},
{"missing-help", OPT_MISSING_HELP, '-',
@@ -752,7 +762,9 @@ int list_main(int argc, char **argv)
unsigned int cipher_algorithms:1;
unsigned int pk_algorithms:1;
unsigned int pk_method:1;
+#ifndef OPENSSL_NO_DEPRECATED_3_0
unsigned int engines:1;
+#endif
unsigned int disabled:1;
unsigned int missing_help:1;
unsigned int objects:1;
@@ -805,9 +817,11 @@ opthelp:
case OPT_PK_METHOD:
todo.pk_method = 1;
break;
+#ifndef OPENSSL_NO_DEPRECATED_3_0
case OPT_ENGINES:
todo.engines = 1;
break;
+#endif
case OPT_DISABLED:
todo.disabled = 1;
break;
@@ -855,8 +869,10 @@ opthelp:
list_pkey();
if (todo.pk_method)
list_pkey_meth();
+#ifndef OPENSSL_NO_DEPRECATED_3_0
if (todo.engines)
list_engines();
+#endif
if (todo.disabled)
list_disabled();
if (todo.missing_help)
diff --git a/apps/req.c b/apps/req.c
index a2212b988d..4ae828cd45 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
diff --git a/apps/s_client.c b/apps/s_client.c
index 91b21003fb..a1b80f4c5f 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -8,6 +8,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "e_os.h"
#include <ctype.h>
#include <stdio.h>
diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c
index 8c7df51fe4..32074c460e 100644
--- a/crypto/asn1/ameth_lib.c
+++ b/crypto/asn1/ameth_lib.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "e_os.h" /* for strncasecmp */
#include "internal/cryptlib.h"
#include <stdio.h>
diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c
index 3ddc56d408..a4d240e7c4 100644
--- a/crypto/asn1/d2i_pr.c
+++ b/crypto/asn1/d2i_pr.c
@@ -7,6 +7,9 @@
* 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>
diff --git a/crypto/conf/conf_mall.c b/crypto/conf/conf_mall.c
index 033c1ada18..9852f0212e 100644
--- a/crypto/conf/conf_mall.c
+++ b/crypto/conf/conf_mall.c
@@ -7,6 +7,9 @@
* 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"
diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c
index 9d3db8eb31..64473417e9 100644
--- a/crypto/conf/conf_mod.c
+++ b/crypto/conf/conf_mod.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "internal/cryptlib.h"
#include <stdio.h>
#include <ctype.h>
diff --git a/crypto/engine/eng_cnf.c b/crypto/engine/eng_cnf.c
index 0ddad7dd80..dcc30b6c62 100644
--- a/crypto/engine/eng_cnf.c
+++ b/crypto/engine/eng_cnf.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "eng_local.h"
#include <openssl/conf.h>
#include <openssl/trace.h>
diff --git a/crypto/engine/eng_ctrl.c b/crypto/engine/eng_ctrl.c
index 39cfb17089..1cc4f545af 100644
--- a/crypto/engine/eng_ctrl.c
+++ b/crypto/engine/eng_ctrl.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "eng_local.h"
/*
diff --git a/crypto/engine/eng_dyn.c b/crypto/engine/eng_dyn.c
index 798ff1e3af..73d7b14ae6 100644
--- a/crypto/engine/eng_dyn.c
+++ b/crypto/engine/eng_dyn.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "eng_local.h"
#include "internal/dso.h"
#include <openssl/crypto.h>
diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c
index 428e66733b..e0de95d11b 100644
--- a/crypto/engine/eng_fat.c
+++ b/crypto/engine/eng_fat.c
@@ -8,6 +8,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "eng_local.h"
#include <openssl/conf.h>
diff --git a/crypto/engine/eng_init.c b/crypto/engine/eng_init.c
index 34f01388a2..7303426e81 100644
--- a/crypto/engine/eng_init.c
+++ b/crypto/engine/eng_init.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "e_os.h"
#include "eng_local.h"
diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c
index 167c24cb23..cb9ad78838 100644
--- a/crypto/engine/eng_list.c
+++ b/crypto/engine/eng_list.c
@@ -8,6 +8,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "eng_local.h"
/*
diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c
index 8b2b8c1ff4..32e6f4e19f 100644
--- a/crypto/engine/eng_openssl.c
+++ b/crypto/engine/eng_openssl.c
@@ -8,6 +8,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
/*
* RC4 and SHA-1 low level APIs are deprecated for public use, but still ok
* for internal use.
diff --git a/crypto/engine/eng_pkey.c b/crypto/engine/eng_pkey.c
index b8853df1cf..68df415475 100644
--- a/crypto/engine/eng_pkey.c
+++ b/crypto/engine/eng_pkey.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "eng_local.h"
/* Basic get/set stuff */
diff --git a/crypto/engine/eng_rdrand.c b/crypto/engine/eng_rdrand.c
index b6d1988d13..53cd34fb28 100644
--- a/crypto/engine/eng_rdrand.c
+++ b/crypto/engine/eng_rdrand.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include <openssl/opensslconf.h>
#include <stdio.h>
diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c
index 6289c225a5..3aad4e8d1c 100644
--- a/crypto/engine/tb_asnmth.c
+++ b/crypto/engine/tb_asnmth.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "e_os.h"
#include "eng_local.h"
#include <openssl/evp.h>
diff --git a/crypto/engine/tb_cipher.c b/crypto/engine/tb_cipher.c
index c669907a53..bc97deda87 100644
--- a/crypto/engine/tb_cipher.c
+++ b/crypto/engine/tb_cipher.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "eng_local.h"
static ENGINE_TABLE *cipher_table = NULL;
diff --git a/crypto/engine/tb_dh.c b/crypto/engine/tb_dh.c
index e877fce2fc..fa8b5b846b 100644
--- a/crypto/engine/tb_dh.c
+++ b/crypto/engine/tb_dh.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "eng_local.h"
static ENGINE_TABLE *dh_table = NULL;
diff --git a/crypto/engine/tb_digest.c b/crypto/engine/tb_digest.c
index 8a5a8332a9..5e75e64e69 100644
--- a/crypto/engine/tb_digest.c
+++ b/crypto/engine/tb_digest.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "eng_local.h"
static ENGINE_TABLE *digest_table = NULL;
diff --git a/crypto/engine/tb_dsa.c b/crypto/engine/tb_dsa.c
index a22e8f6941..65dbe64df9 100644
--- a/crypto/engine/tb_dsa.c
+++ b/crypto/engine/tb_dsa.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "eng_local.h"
static ENGINE_TABLE *dsa_table = NULL;
diff --git a/crypto/engine/tb_eckey.c b/crypto/engine/tb_eckey.c
index 397dad8855..ae7ef5ebdf 100644
--- a/crypto/engine/tb_eckey.c
+++ b/crypto/engine/tb_eckey.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "eng_local.h"
static ENGINE_TABLE *dh_table = NULL;
diff --git a/crypto/engine/tb_pkmeth.c b/crypto/engine/tb_pkmeth.c
index beb4fd7371..2d0cbff497 100644
--- a/crypto/engine/tb_pkmeth.c
+++ b/crypto/engine/tb_pkmeth.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "eng_local.h"
#include <openssl/evp.h>
diff --git a/crypto/engine/tb_rand.c b/crypto/engine/tb_rand.c
index d7c7ef485f..9996cf67d6 100644
--- a/crypto/engine/tb_rand.c
+++ b/crypto/engine/tb_rand.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "eng_local.h"
static ENGINE_TABLE *rand_table = NULL;
diff --git a/crypto/engine/tb_rsa.c b/crypto/engine/tb_rsa.c
index 5b7d6717ae..35f6c68e54 100644
--- a/crypto/engine/tb_rsa.c
+++ b/crypto/engine/tb_rsa.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "eng_local.h"
static ENGINE_TABLE *rsa_table = NULL;
diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c
index 92e9b7bfb0..3d25b75be7 100644
--- a/crypto/evp/digest.c
+++ b/crypto/evp/digest.c
@@ -7,6 +7,9 @@
* 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>
diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
index ec966a0ed5..b8cb5daad0 100644
--- a/crypto/evp/evp_enc.c
+++ b/crypto/evp/evp_enc.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include <stdio.h>
#include <assert.h>
#include "internal/cryptlib.h"
diff --git a/crypto/evp/pkey_mac.c b/crypto/evp/pkey_mac.c
index 55badea7e9..784fca956d 100644
--- a/crypto/evp/pkey_mac.c
+++ b/crypto/evp/pkey_mac.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include <string.h>
#include <openssl/err.h>
#include <openssl/evp.h>
diff --git a/crypto/init.c b/crypto/init.c
index 4aa3fc83da..8c1fc2598f 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "e_os.h"
#include "crypto/cryptlib.h"
#include <openssl/err.h>
diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index bd20bbb783..71074b5b16 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include <stdio.h>
#include "crypto/ctype.h"
#include <string.h>
diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index e7dfb07de2..d43b4fb8db 100644
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -7,6 +7,9 @@
* 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 "internal/cryptlib.h"
diff --git a/crypto/store/loader_file.c b/crypto/store/loader_file.c
index 9a2ada335d..30f4e6ecaf 100644
--- a/crypto/store/loader_file.c
+++ b/crypto/store/loader_file.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "e_os.h"
#include <string.h>
#include <sys/stat.h>
diff --git a/crypto/trace.c b/crypto/trace.c
index 18a8c64135..e6628f9bae 100755
--- a/crypto/trace.c
+++ b/crypto/trace.c
@@ -126,8 +126,10 @@ static const struct trace_category_st trace_categories[] = {
TRACE_CATEGORY_(TLS),
TRACE_CATEGORY_(TLS_CIPHER),
TRACE_CATEGORY_(CONF),
+#ifndef OPENSSL_NO_ENGINE
TRACE_CATEGORY_(ENGINE_TABLE),
TRACE_CATEGORY_(ENGINE_REF_COUNT),
+#endif
TRACE_CATEGORY_(PKCS5V2),
TRACE_CATEGORY_(PKCS12_KEYGEN),
TRACE_CATEGORY_(PKCS12_DECRYPT),
diff --git a/crypto/ts/ts_conf.c b/crypto/ts/ts_conf.c
index 9044920e3f..199a3b82e3 100644
--- a/crypto/ts/ts_conf.c
+++ b/crypto/ts/ts_conf.c
@@ -7,6 +7,9 @@
* 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>
diff --git a/doc/man1/openssl-ca.pod.in b/doc/man1/openssl-ca.pod.in
index 519f5f4eed..5f7dc2d16f 100644
--- a/doc/man1/openssl-ca.pod.in
+++ b/doc/man1/openssl-ca.pod.in
@@ -794,6 +794,8 @@ The B<-certform> option has become obsolete in OpenSSL 3.0.0 and has no effect.
All B<-keyform> values except B<ENGINE> have become obsolete in OpenSSL 3.0.0
and have no effect.
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 SEE ALSO
L<openssl(1)>,
diff --git a/doc/man1/openssl-cmp.pod.in b/doc/man1/openssl-cmp.pod.in
index b148afb2dc..6ed11f442f 100644
--- a/doc/man1/openssl-cmp.pod.in
+++ b/doc/man1/openssl-cmp.pod.in
@@ -71,7 +71,7 @@ B<openssl> B<cmp>
[B<-keyform> I<PEM|DER|P12|ENGINE>]
[B<-certsform> I<PEM|DER|P12>]
[B<-otherpass> I<arg>]
-[B<-engine> I<id>]
+{- $OpenSSL::safe::opt_engine_synopsis -}
{- $OpenSSL::safe::opt_provider_synopsis -}
[B<-tls_used>]
@@ -698,6 +698,7 @@ If not given here, the password will be prompted for if needed.
For more information about the format of B<arg> see the
B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
+{- output_off() if $disabled{"deprecated-3.0"}; "" -}
=item B<-engine> I<id>
@@ -714,6 +715,7 @@ the engine.
as supported, e.g., by libp11:
C<-key engine:pkcs11:object=my-private-key;type=private;pin-value=1234>
+{- output_on() if $disabled{"deprecated-3.0"}; "" -}
{- $OpenSSL::safe::opt_provider_item -}
=back
diff --git a/doc/man1/openssl-cms.pod.in b/doc/man1/openssl-cms.pod.in
index b4c57d37ff..6ee411d550 100644
--- a/doc/man1/openssl-cms.pod.in
+++ b/doc/man1/openssl-cms.pod.in
@@ -781,6 +781,8 @@ and have no effect.
The B<-nameopt> option was added in OpenSSL 3.0.0.
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2008-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-dgst.pod.in b/doc/man1/openssl-dgst.pod.in
index 22c07a5a7f..6a5bb28a69 100644
--- a/doc/man1/openssl-dgst.pod.in
+++ b/doc/man1/openssl-dgst.pod.in
@@ -30,7 +30,9 @@ B<openssl> B<dgst>|I<digest>
[B<-macopt> I<nm>:I<v>]
[B<-fips-fingerprint>]
{- $OpenSSL::safe::opt_engine_synopsis -}
-[B<-engine_impl> I<id>]
+{- output_off() if $disabled{"deprecated-3.0"}; ""
+-}[B<-engine_impl> I<id>]{-
+ output_on() if $disabled{"deprecated-3.0"}; "" -}
{- $OpenSSL::safe::opt_r_synopsis -}
{- $OpenSSL::safe::opt_provider_synopsis -}
[I<file> ...]
@@ -178,6 +180,7 @@ Compute HMAC using a specific key for certain OpenSSL-FIPS operations.
{- $OpenSSL::safe::opt_r_item -}
{- $OpenSSL::safe::opt_engine_item -}
+{- output_off() if $disabled{"deprecated-3.0"}; "" -}
The engine is not used for digests unless the B<-engine_impl> option is
used or it is configured to do so, see L<config(5)/Engine Configuration Module>.
@@ -186,6 +189,7 @@ used or it is configured to do so, see L<config(5)/Engine Configuration Module>.
When used with the B<-engine> option, it specifies to also use
engine I<id> for digest operations.
+{- output_on() if $disabled{"deprecated-3.0"}; "" -}
{- $OpenSSL::safe::opt_provider_item -}
=item I<file> ...
@@ -251,6 +255,8 @@ The FIPS-related options were removed in OpenSSL 1.1.0.
All B<-keyform> values except B<ENGINE> have become obsolete in OpenSSL 3.0.0
and have no effect.
+The B<-engine> and B<-engine_impl> options were deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-dhparam.pod.in b/doc/man1/openssl-dhparam.pod.in
index 91883fb840..d6fcb59751 100644
--- a/doc/man1/openssl-dhparam.pod.in
+++ b/doc/man1/openssl-dhparam.pod.in
@@ -135,7 +135,7 @@ L<openssl-dsaparam(1)>
=head1 HISTORY
-The B<-dsaparam> option was deprecated in OpenSSL 3.0.
+The B<-dsaparam> and B<-engine> options were deprecated in OpenSSL 3.0.
=head1 COPYRIGHT
diff --git a/doc/man1/openssl-dsa.pod.in b/doc/man1/openssl-dsa.pod.in
index 2db0407821..9ab1b3818a 100644
--- a/doc/man1/openssl-dsa.pod.in
+++ b/doc/man1/openssl-dsa.pod.in
@@ -159,6 +159,10 @@ L<openssl-gendsa(1)>,
L<openssl-rsa(1)>,
L<openssl-genrsa(1)>
+=head1 HISTORY
+
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-dsaparam.pod.in b/doc/man1/openssl-dsaparam.pod.in
index 27bd6517e1..0e6e6cb6de 100644
--- a/doc/man1/openssl-dsaparam.pod.in
+++ b/doc/man1/openssl-dsaparam.pod.in
@@ -104,6 +104,10 @@ L<openssl-dsa(1)>,
L<openssl-genrsa(1)>,
L<openssl-rsa(1)>
+=head1 HISTORY
+
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-ec.pod.in b/doc/man1/openssl-ec.pod.in
index c1e92ef51e..9a12f40f80 100644
--- a/doc/man1/openssl-ec.pod.in
+++ b/doc/man1/openssl-ec.pod.in
@@ -186,6 +186,10 @@ L<openssl-ecparam(1)>,
L<openssl-dsa(1)>,
L<openssl-rsa(1)>
+=head1 HISTORY
+
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2003-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-ecparam.pod.in b/doc/man1/openssl-ecparam.pod.in
index ff4d97ea5d..9c9b098270 100644
--- a/doc/man1/openssl-ecparam.pod.in
+++ b/doc/man1/openssl-ecparam.pod.in
@@ -168,6 +168,10 @@ L<openssl-genpkey(1)>,
L<openssl-ec(1)>,
L<openssl-dsaparam(1)>
+=head1 HISTORY
+
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2003-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-enc.pod.in b/doc/man1/openssl-enc.pod.in
index dcbeb8877b..954b17e778 100644
--- a/doc/man1/openssl-enc.pod.in
+++ b/doc/man1/openssl-enc.pod.in
@@ -426,7 +426,7 @@ The default digest was changed from MD5 to SHA256 in OpenSSL 1.1.0.
The B<-list> option was added in OpenSSL 1.1.1e.
-The B<-ciphers> option was deprecated in OpenSSL 3.0.
+The B<-ciphers> and B<-engine> options were deprecated in OpenSSL 3.0.
=head1 COPYRIGHT
diff --git a/doc/man1/openssl-engine.pod.in b/doc/man1/openssl-engine.pod.in
index c669213491..bcc31ebad1 100644
--- a/doc/man1/openssl-engine.pod.in
+++ b/doc/man1/openssl-engine.pod.in
@@ -22,6 +22,8 @@ B<openssl engine>
=head1 DESCRIPTION
+This command has been deprecated. Providers should be used instead of engines.
+
This command is used to query the status and capabilities
of the specified I<engine>s.
Engines may be specified before and after all other command-line flags.
@@ -114,6 +116,10 @@ The path to the engines directory.
L<openssl(1)>,
L<config(5)>
+=head1 HISTORY
+
+This command was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-gendsa.pod.in b/doc/man1/openssl-gendsa.pod.in
index aca9bb5165..cba85f41fa 100644
--- a/doc/man1/openssl-gendsa.pod.in
+++ b/doc/man1/openssl-gendsa.pod.in
@@ -92,6 +92,10 @@ L<openssl-dsa(1)>,
L<openssl-genrsa(1)>,
L<openssl-rsa(1)>
+=head1 HISTORY
+
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-genpkey.pod.in b/doc/man1/openssl-genpkey.pod.in
index d38c1422b2..4334d0c3c1 100644
--- a/doc/man1/openssl-genpkey.pod.in
+++ b/doc/man1/openssl-genpkey.pod.in
@@ -359,6 +359,8 @@ were added in OpenSSL 1.0.2.
The ability to generate X25519 keys was added in OpenSSL 1.1.0.
The ability to generate X448, ED25519 and ED448 keys was added in OpenSSL 1.1.1.
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-list.pod.in b/doc/man1/openssl-list.pod.in
index 1eb62d3feb..527e96a084 100644
--- a/doc/man1/openssl-list.pod.in
+++ b/doc/man1/openssl-list.pod.in
@@ -21,7 +21,9 @@ B<openssl list>
[B<-cipher-algorithms>]
[B<-public-key-algorithms>]
[B<-public-key-methods>]
+{- output_off() if $disabled{"deprecated-3.0"}; "" -}
[B<-engines>]
+{- output_on() if $disabled{"deprecated-3.0"}; "" -}
[B<-disabled>]
[B<-objects>]
[B<-options> I<command>]
@@ -92,11 +94,15 @@ a block of multiple lines, all but the first are indented.
=item B<-public-key-methods>
Display a list of public key method OIDs.
+{- output_off() if $disabled{"deprecated-3.0"}; "" -}
=item B<-engines>
+This option is deprecated.
+
Display a list of loaded engines.
+{- output_on() if $disabled{"deprecated-3.0"}; "" -}
=item B<-disabled>
Display a list of disabled features, those that were compiled out
@@ -146,6 +152,10 @@ In both cases, C<bar> is the name of the provider.
=back
+=head1 HISTORY
+
+The B<-engines> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-pkcs12.pod.in b/doc/man1/openssl-pkcs12.pod.in
index 7d0629b376..8c819c56f8 100644
--- a/doc/man1/openssl-pkcs12.pod.in
+++ b/doc/man1/openssl-pkcs12.pod.in
@@ -365,6 +365,10 @@ L<openssl(1)>,
L<openssl-pkcs8(1)>,
L<ossl_store-file(7)>
+=head1 HISTORY
+
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-pkcs7.pod.in b/doc/man1/openssl-pkcs7.pod.in
index 6a05dd4149..fb6b9b4ebc 100644
--- a/doc/man1/openssl-pkcs7.pod.in
+++ b/doc/man1/openssl-pkcs7.pod.in
@@ -97,6 +97,10 @@ Output all certificates in a file:
L<openssl(1)>,
L<openssl-crl2pkcs7(1)>
+=head1 HISTORY
+
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-pkcs8.pod.in b/doc/man1/openssl-pkcs8.pod.in
index 719e3d9168..6955b441be 100644
--- a/doc/man1/openssl-pkcs8.pod.in
+++ b/doc/man1/openssl-pkcs8.pod.in
@@ -273,6 +273,8 @@ L<openssl-gendsa(1)>
The B<-iter> option was added in OpenSSL 1.1.0.
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-pkey.pod.in b/doc/man1/openssl-pkey.pod.in
index de1bef954c..1fe94c8efc 100644
--- a/doc/man1/openssl-pkey.pod.in
+++ b/doc/man1/openssl-pkey.pod.in
@@ -197,6 +197,10 @@ L<openssl-dsa(1)>,
L<openssl-genrsa(1)>,
L<openssl-gendsa(1)>
+=head1 HISTORY
+
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-pkeyparam.pod.in b/doc/man1/openssl-pkeyparam.pod.in
index c5f949cfd1..3e7f60a6b7 100644
--- a/doc/man1/openssl-pkeyparam.pod.in
+++ b/doc/man1/openssl-pkeyparam.pod.in
@@ -85,6 +85,10 @@ L<openssl-dsa(1)>,
L<openssl-genrsa(1)>,
L<openssl-gendsa(1)>
+=head1 HISTORY
+
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-pkeyutl.pod.in b/doc/man1/openssl-pkeyutl.pod.in
index 2bcbb54c57..378cfccad6 100644
--- a/doc/man1/openssl-pkeyutl.pod.in
+++ b/doc/man1/openssl-pkeyutl.pod.in
@@ -409,6 +409,8 @@ L<EVP_PKEY_CTX_set_tls1_prf_md(3)>,
All B<-keyform> values except B<ENGINE> have become obsolete in OpenSSL 3.0.0
and have no effect.
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-rand.pod.in b/doc/man1/openssl-rand.pod.in
index 7299f5c653..67696ee413 100644
--- a/doc/man1/openssl-rand.pod.in
+++ b/doc/man1/openssl-rand.pod.in
@@ -65,6 +65,10 @@ L<RAND_bytes(3)>,
L<RAND(7)>,
L<RAND_DRBG(7)>
+=head1 HISTORY
+
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-req.pod.in b/doc/man1/openssl-req.pod.in
index 25295d02fc..07354453be 100644
--- a/doc/man1/openssl-req.pod.in
+++ b/doc/man1/openssl-req.pod.in
@@ -695,6 +695,8 @@ The B<-section> option was added in OpenSSL 3.0.0.
All B<-keyform> values except B<ENGINE> have become obsolete in OpenSSL 3.0.0
and have no effect.
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-rsa.pod.in b/doc/man1/openssl-rsa.pod.in
index b2477b2b2c..4f9c41d668 100644
--- a/doc/man1/openssl-rsa.pod.in
+++ b/doc/man1/openssl-rsa.pod.in
@@ -187,6 +187,10 @@ L<openssl-dsa(1)>,
L<openssl-genrsa(1)>,
L<openssl-gendsa(1)>
+=head1 HISTORY
+
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-rsautl.pod.in b/doc/man1/openssl-rsautl.pod.in
index 5383fe2116..477e4a1ece 100644
--- a/doc/man1/openssl-rsautl.pod.in
+++ b/doc/man1/openssl-rsautl.pod.in
@@ -241,6 +241,8 @@ This command was deprecated in OpenSSL 3.0.
All B<-keyform> values except B<ENGINE> have become obsolete in OpenSSL 3.0.0
and have no effect.
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-s_client.pod.in b/doc/man1/openssl-s_client.pod.in
index e8f73cdb99..78f4cc679c 100644
--- a/doc/man1/openssl-s_client.pod.in
+++ b/doc/man1/openssl-s_client.pod.in
@@ -910,6 +910,8 @@ The B<-certform> option has become obsolete in OpenSSL 3.0.0 and has no effect.
All B<-keyform> values except B<ENGINE> have become obsolete in OpenSSL 3.0.0
and have no effect.
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-s_server.pod.in b/doc/man1/openssl-s_server.pod.in
index 07cde67cde..47515af42a 100644
--- a/doc/man1/openssl-s_server.pod.in
+++ b/doc/man1/openssl-s_server.pod.in
@@ -840,6 +840,8 @@ have become obsolete in OpenSSL 3.0.0 and have no effect.
The B<-certform> and B<-dcertform> options have become obsolete in OpenSSL 3.0.0
and have no effect.
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-smime.pod.in b/doc/man1/openssl-smime.pod.in
index 4dce01a46e..b15be731c0 100644
--- a/doc/man1/openssl-smime.pod.in
+++ b/doc/man1/openssl-smime.pod.in
@@ -483,6 +483,8 @@ The -no_alt_chains option was added in OpenSSL 1.1.0.
All B<-keyform> values except B<ENGINE> have become obsolete in OpenSSL 3.0.0
and have no effect.
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-speed.pod.in b/doc/man1/openssl-speed.pod.in
index b3e2a80769..cbcc776f14 100644
--- a/doc/man1/openssl-speed.pod.in
+++ b/doc/man1/openssl-speed.pod.in
@@ -113,6 +113,10 @@ pre-compiled grand selection is tested.
=back
+=head1 HISTORY
+
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-spkac.pod.in b/doc/man1/openssl-spkac.pod.in
index ca7d097d85..7a95dd6ff3 100644
--- a/doc/man1/openssl-spkac.pod.in
+++ b/doc/man1/openssl-spkac.pod.in
@@ -154,6 +154,8 @@ L<openssl-ca(1)>
All B<-keyform> values except B<ENGINE> have become obsolete in OpenSSL 3.0.0
and have no effect.
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-srp.pod.in b/doc/man1/openssl-srp.pod.in
index 5f4a36c60a..e2b04fe91e 100644
--- a/doc/man1/openssl-srp.pod.in
+++ b/doc/man1/openssl-srp.pod.in
@@ -81,6 +81,10 @@ see L<openssl(1)/Pass Phrase Options>.
=back
+=head1 HISTORY
+
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-storeutl.pod.in b/doc/man1/openssl-storeutl.pod.in
index 70e9ca6566..2c92f825a0 100644
--- a/doc/man1/openssl-storeutl.pod.in
+++ b/doc/man1/openssl-storeutl.pod.in
@@ -123,6 +123,8 @@ L<openssl(1)>
This command was added in OpenSSL 1.1.1.
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-ts.pod.in b/doc/man1/openssl-ts.pod.in
index e7bc607a1f..7a1ed418ce 100644
--- a/doc/man1/openssl-ts.pod.in
+++ b/doc/man1/openssl-ts.pod.in
@@ -626,6 +626,8 @@ seeding mechanism. The new seeding mechanism makes it unnecessary to
define a RANDFILE for saving and restoring randomness. This option is
retained mainly for compatibility reasons.
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 SEE ALSO
L<openssl(1)>,
diff --git a/doc/man1/openssl-verify.pod.in b/doc/man1/openssl-verify.pod.in
index bccaa2642f..ff4d88f577 100644
--- a/doc/man1/openssl-verify.pod.in
+++ b/doc/man1/openssl-verify.pod.in
@@ -153,6 +153,8 @@ L<ossl_store-file(7)>
The B<-show_chain> option was added in OpenSSL 1.1.0.
+The B<-engine option> was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man1/openssl-x509.pod.in b/doc/man1/openssl-x509.pod.in
index 918c91b34b..33e24ac6e9 100644
--- a/doc/man1/openssl-x509.pod.in
+++ b/doc/man1/openssl-x509.pod.in
@@ -835,6 +835,8 @@ have become obsolete in OpenSSL 3.0.0 and have no effect.
The B<-CAform> option has become obsolete in OpenSSL 3.0.0 and has no effect.
+The B<-engine> option was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man3/BIO_get_ex_new_index.pod b/doc/man3/BIO_get_ex_new_index.pod
index 2380ad79a6..7e5c2852a6 100644
--- a/doc/man3/BIO_get_ex_new_index.pod
+++ b/doc/man3/BIO_get_ex_new_index.pod
@@ -85,6 +85,11 @@ TYPE_get_ex_data() returns the application data or NULL if an error occurred.
L<CRYPTO_get_ex_new_index(3)>.
+=head1 HISTORY
+
+The ENGINE_get_ex_new_index(), ENGINE_set_ex_data() and ENGINE_get_ex_data()
+functions were deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man3/CRYPTO_get_ex_new_index.pod b/doc/man3/CRYPTO_get_ex_new_index.pod
index fcedd0ec88..8311685501 100644
--- a/doc/man3/CRYPTO_get_ex_new_index.pod
+++ b/doc/man3/CRYPTO_get_ex_new_index.pod
@@ -163,9 +163,12 @@ dup_func() should return 0 for failure and 1 for success.
=head1 HISTORY
CRYPTO_alloc_ex_data() was added in OpenSSL 3.0.
+
The signature of the dup_func() callback was changed in OpenSSL 3.0 to use the
type B<void **> for B<from_d>. Previously this parameter was of type B<void *>.
+Support for ENGINE "exdata" was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man3/ENGINE_add.pod b/doc/man3/ENGINE_add.pod
index 1d07f5df83..f2c112dcd8 100644
--- a/doc/man3/ENGINE_add.pod
+++ b/doc/man3/ENGINE_add.pod
@@ -46,6 +46,10 @@ ENGINE_unregister_digests
#include <openssl/engine.h>
+Deprecated since OpenSSL 3.0, can be hidden entirely by defining
+B<OPENSSL_API_COMPAT> with a suitable version value, see
+L<openssl_user_macros(7)>:
+
ENGINE *ENGINE_get_first(void);
ENGINE *ENGINE_get_last(void);
ENGINE *ENGINE_get_next(ENGINE *e);
@@ -162,6 +166,9 @@ L<openssl_user_macros(7)>:
=head1 DESCRIPTION
+All of the functions described on this page are deprecated.
+Applications should instead use the provider APIs.
+
These functions create, manipulate, and use cryptographic modules in the
form of B<ENGINE> objects. These objects act as containers for
implementations of cryptographic algorithms, and support a
@@ -651,6 +658,8 @@ L<RAND_bytes(3)>, L<config(5)>
=head1 HISTORY
+All of these functions were deprecated in OpenSSL 3.0.
+
ENGINE_cleanup() was deprecated in OpenSSL 1.1.0 by the automatic cleanup
done by OPENSSL_cleanup()
and should not be used.
diff --git a/doc/man3/OPENSSL_init_crypto.pod b/doc/man3/OPENSSL_init_crypto.pod
index 8a8f4615e5..7e7b1ef69c 100644
--- a/doc/man3/OPENSSL_init_crypto.pod
+++ b/doc/man3/OPENSSL_init_crypto.pod
@@ -122,43 +122,51 @@ sub-library (see L<ASYNC_start_job(3)>). This is a default option.
=item OPENSSL_INIT_ENGINE_RDRAND
With this option the library will automatically load and initialise the
-RDRAND engine (if available). This not a default option.
+RDRAND engine (if available). This not a default option and is deprecated
+in OpenSSL 3.0.
=item OPENSSL_INIT_ENGINE_DYNAMIC
With this option the library will automatically load and initialise the
-dynamic engine. This not a default option.
+dynamic engine. This not a default option and is deprecated
+in OpenSSL 3.0.
=item OPENSSL_INIT_ENGINE_OPENSSL
With this option the library will automatically load and initialise the
-openssl engine. This not a default option.
+openssl engine. This not a default option and is deprecated
+in OpenSSL 3.0.
=item OPENSSL_INIT_ENGINE_CRYPTODEV
With this option the library will automatically load and initialise the
-cryptodev engine (if available). This not a default option.
+cryptodev engine (if available). This not a default option and is deprecated
+in OpenSSL 3.0.
=item OPENSSL_INIT_ENGINE_CAPI
With this option the library will automatically load and initialise the
-CAPI engine (if available). This not a default option.
+CAPI engine (if available). This not a default option and is deprecated
+in OpenSSL 3.0.
=item OPENSSL_INIT_ENGINE_PADLOCK
With this option the library will automatically load and initialise the
-padlock engine (if available). This not a default option.
+padlock engine (if available). This not a default option and is deprecated
+in OpenSSL 3.0.
=item OPENSSL_INIT_ENGINE_AFALG
With this option the library will automatically load and initialise the
-AFALG engine. This not a default option.
+AFALG engine. This not a default option and is deprecated
+in OpenSSL 3.0.
=item OPENSSL_INIT_ENGINE_ALL_BUILTIN
With this option the library will automatically load and initialise all the
built in engines listed above with the exception of the openssl and afalg
-engines. This not a default option.
+engines. This not a default option and is deprecated
+in OpenSSL 3.0.
=item OPENSSL_INIT_ATFORK
diff --git a/doc/man3/OPENSSL_load_builtin_modules.pod b/doc/man3/OPENSSL_load_builtin_modules.pod
index 0abbe73f4c..2ff53ae9d8 100644
--- a/doc/man3/OPENSSL_load_builtin_modules.pod
+++ b/doc/man3/OPENSSL_load_builtin_modules.pod
@@ -44,6 +44,10 @@ None of the functions return a value.
L<config(5)>, L<OPENSSL_config(3)>
+=head1 HISTORY
+
+ENGINE_add_conf_module() was deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2004-2018 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man3/OSSL_trace_set_channel.pod b/doc/man3/OSSL_trace_set_channel.pod
index 57a5a1c8c9..7ae19aedd3 100644
--- a/doc/man3/OSSL_trace_set_channel.pod
+++ b/doc/man3/OSSL_trace_set_channel.pod
@@ -136,10 +136,6 @@ Traces the TLS/SSL protocol.
Traces the ciphers used by the TLS/SSL protocol.
-=item C<OSSL_TRACE_CATEGORY_ENGINE_CONF>
-
-Traces the ENGINE configuration.
-
=item C<OSSL_TRACE_CATEGORY_ENGINE_TABLE>
Traces the ENGINE algorithm table selection.
diff --git a/doc/man3/OpenSSL_version.pod b/doc/man3/OpenSSL_version.pod
index b3d5b72928..5342bc985d 100644
--- a/doc/man3/OpenSSL_version.pod
+++ b/doc/man3/OpenSSL_version.pod
@@ -120,7 +120,8 @@ if available, or C<OPENSSLDIR: N/A> otherwise.
=item OPENSSL_ENGINES_DIR
The B<ENGINESDIR> setting of the library build in the form C<ENGINESDIR: "...">
-if available, or C<ENGINESDIR: N/A> otherwise.
+if available, or C<ENGINESDIR: N/A> otherwise. This option is deprecated in
+OpenSSL 3.0.
=item OPENSSL_MODULES_DIR
diff --git a/doc/man3/RAND_set_rand_method.pod b/doc/man3/RAND_set_rand_method.pod
index bd6606c81f..a989c1c9b4 100644
--- a/doc/man3/RAND_set_rand_method.pod
+++ b/doc/man3/RAND_set_rand_method.pod
@@ -23,7 +23,8 @@ RAND_OpenSSL() returns the default B<RAND_METHOD> implementation by OpenSSL.
This implementation ensures that the PRNG state is unique for each thread.
If an B<ENGINE> is loaded that provides the RAND API, however, it will
-be used instead of the method returned by RAND_OpenSSL().
+be used instead of the method returned by RAND_OpenSSL(). This is deprecated
+in OpenSSL 3.0.
RAND_set_rand_method() makes B<meth> the method for PRNG use. If an
ENGINE was providing the method, it will be released first.
@@ -58,6 +59,11 @@ L<RAND_bytes(3)>,
L<ENGINE_by_id(3)>,
L<RAND(7)>
+=head1 HISTORY
+
+The ability for an B<ENGINE> to replace the RAND API was deprecated in
+OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/perlvars.pm b/doc/perlvars.pm
index 6d77ce77cb..98c348859f 100644
--- a/doc/perlvars.pm
+++ b/doc/perlvars.pm
@@ -8,6 +8,8 @@
# Set some Perl variables for use by util/dofile.pl when processing
# POD files (mainly man1).
+use configdata;
+
# Verify options
$OpenSSL::safe::opt_v_synopsis = ""
. "[B<-allow_proxy_certs>]\n"
@@ -100,12 +102,17 @@ $OpenSSL::safe::opt_provider_item = ""
. "See L<openssl(1)/Provider Options>.";
# Engine option
-$OpenSSL::safe::opt_engine_synopsis = ""
-. "[B<-engine> I<id>]";
-$OpenSSL::safe::opt_engine_item = ""
-. "=item B<-engine> I<id>\n"
-. "\n"
-. "See L<openssl(1)/Engine Options>.";
+$OpenSSL::safe::opt_engine_synopsis = "";
+$OpenSSL::safe::opt_engine_item = "";
+if (!$disabled{"deprecated-3.0"}) {
+ $OpenSSL::safe::opt_engine_synopsis = ""
+ . "[B<-engine> I<id>]";
+ $OpenSSL::safe::opt_engine_item = ""
+ . "=item B<-engine> I<id>\n"
+ . "\n"
+ . "See L<openssl(1)/Engine Options>.\n"
+ . "This option is deprecated.";
+}
# Trusted certs options
$OpenSSL::safe::opt_trust_synopsis = ""
diff --git a/engines/e_afalg.c b/engines/e_afalg.c
index c644fa15a2..a3e6a69011 100644
--- a/engines/e_afalg.c
+++ b/engines/e_afalg.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
/* Required for vmsplice */
#ifndef _GNU_SOURCE
# define _GNU_SOURCE
diff --git a/engines/e_capi.c b/engines/e_capi.c
index 4ac559026a..0662dcab56 100644
--- a/engines/e_capi.c
+++ b/engines/e_capi.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#ifdef _WIN32
# ifndef _WIN32_WINNT
# define _WIN32_WINNT 0x0400
diff --git a/engines/e_dasync.c b/engines/e_dasync.c
index 34936b5fe6..b817b2ba5f 100644
--- a/engines/e_dasync.c
+++ b/engines/e_dasync.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
/*
* SHA-1 low level APIs are deprecated for public use, but still ok for
* internal use. Note, that due to symbols not being exported, only the
diff --git a/engines/e_devcrypto.c b/engines/e_devcrypto.c
index 489109a80d..e8d5d5dd5a 100644
--- a/engines/e_devcrypto.c
+++ b/engines/e_devcrypto.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "../e_os.h"
#include <string.h>
#include <sys/types.h>
diff --git a/engines/e_ossltest.c b/engines/e_ossltest.c
index 6b5fb561a0..df2a3e14e8 100644
--- a/engines/e_ossltest.c
+++ b/engines/e_ossltest.c
@@ -13,6 +13,9 @@
* used for any purpose except testing
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
/*
* SHA low level APIs are deprecated for public use, but still ok for
* internal use. Note, that due to symbols not being exported, only the
diff --git a/engines/e_padlock.c b/engines/e_padlock.c
index af5ac24a21..713a79a368 100644
--- a/engines/e_padlock.c
+++ b/engines/e_padlock.c
@@ -8,8 +8,8 @@
*/
/*
- * This file uses the low level AES functions (which are deprecated for
- * non-internal use) in order to implement the padlock engine AES ciphers.
+ * This file uses the low level AES and engine functions (which are deprecated
+ * for non-internal use) in order to implement the padlock engine AES ciphers.
*/
#define OPENSSL_SUPPRESS_DEPRECATED
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index 33296b6ada..abd3a68cd4 100644
--- a/include/openssl/crypto.h
+++ b/include/openssl/crypto.h
@@ -434,7 +434,6 @@ int CRYPTO_memcmp(const void * in_a, const void * in_b, size_t len);
| OPENSSL_INIT_ENGINE_CRYPTODEV | OPENSSL_INIT_ENGINE_CAPI | \
OPENSSL_INIT_ENGINE_PADLOCK)
-
/* Library initialisation functions */
void OPENSSL_cleanup(void);
int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
diff --git a/include/openssl/engine.h b/include/openssl/engine.h
index 3c9648dc02..76ab29815f 100644
--- a/include/openssl/engine.h
+++ b/include/openssl/engine.h
@@ -20,40 +20,40 @@
# include <openssl/opensslconf.h>
# ifndef OPENSSL_NO_ENGINE
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-# include <openssl/bn.h>
-# include <openssl/rsa.h>
-# include <openssl/dsa.h>
-# include <openssl/dh.h>
-# include <openssl/ec.h>
-# include <openssl/rand.h>
-# include <openssl/ui.h>
-# include <openssl/err.h>
-# endif
-# include <openssl/types.h>
-# include <openssl/symhacks.h>
-# include <openssl/x509.h>
-# include <openssl/engineerr.h>
-# ifdef __cplusplus
+# ifndef OPENSSL_NO_DEPRECATED_1_1_0
+# include <openssl/bn.h>
+# include <openssl/rsa.h>
+# include <openssl/dsa.h>
+# include <openssl/dh.h>
+# include <openssl/ec.h>
+# include <openssl/rand.h>
+# include <openssl/ui.h>
+# include <openssl/err.h>
+# endif
+# include <openssl/types.h>
+# include <openssl/symhacks.h>
+# include <openssl/x509.h>
+# include <openssl/engineerr.h>
+# ifdef __cplusplus
extern "C" {
-# endif
+# endif
/*
* These flags are used to control combinations of algorithm (methods) by
* bitwise "OR"ing.
*/
-# define ENGINE_METHOD_RSA (unsigned int)0x0001
-# define ENGINE_METHOD_DSA (unsigned int)0x0002
-# define ENGINE_METHOD_DH (unsigned int)0x0004
-# define ENGINE_METHOD_RAND (unsigned int)0x0008
-# define ENGINE_METHOD_CIPHERS (unsigned int)0x0040
-# define ENGINE_METHOD_DIGESTS (unsigned int)0x0080
-# define ENGINE_METHOD_PKEY_METHS (unsigned int)0x0200
-# define ENGINE_METHOD_PKEY_ASN1_METHS (unsigned int)0x0400
-# define ENGINE_METHOD_EC (unsigned int)0x0800
+# define ENGINE_METHOD_RSA (unsigned int)0x0001
+# define ENGINE_METHOD_DSA (unsigned int)0x0002
+# define ENGINE_METHOD_DH (unsigned int)0x0004
+# define ENGINE_METHOD_RAND (unsigned int)0x0008
+# define ENGINE_METHOD_CIPHERS (unsigned int)0x0040
+# define ENGINE_METHOD_DIGESTS (unsigned int)0x0080
+# define ENGINE_METHOD_PKEY_METHS (unsigned int)0x0200
+# define ENGINE_METHOD_PKEY_ASN1_METHS (unsigned int)0x0400
+# define ENGINE_METHOD_EC (unsigned int)0x0800
/* Obvious all-or-nothing cases. */
-# define ENGINE_METHOD_ALL (unsigned int)0xFFFF
-# define ENGINE_METHOD_NONE (unsigned int)0x0000
+# define ENGINE_METHOD_ALL (unsigned int)0xFFFF
+# define ENGINE_METHOD_NONE (unsigned int)0x0000
/*
* This(ese) flag(s) controls behaviour of the ENGINE_TABLE mechanism used
@@ -61,7 +61,7 @@ extern "C" {
* set by ENGINE_set_table_flags(). The "NOINIT" flag prevents attempts to
* initialise registered ENGINEs if they are not already initialised.
*/
-# define ENGINE_TABLE_FLAG_NOINIT (unsigned int)0x0001
+# define ENGINE_TABLE_FLAG_NOINIT (unsigned int)0x0001
/* ENGINE flags that can be set by ENGINE_set_flags(). */
/* Not used */
@@ -73,7 +73,7 @@ extern "C" {
* these control commands on behalf of the ENGINE using their "cmd_defns"
* data.
*/
-# define ENGINE_FLAGS_MANUAL_CMD_CTRL (int)0x0002
+# define ENGINE_FLAGS_MANUAL_CMD_CTRL (int)0x0002
/*
* This flag is for ENGINEs who return new duplicate structures when found
@@ -85,7 +85,7 @@ extern "C" {
* ENGINE_by_id() just increments the existing ENGINE's structural reference
* count.
*/
-# define ENGINE_FLAGS_BY_ID_COPY (int)0x0004
+# define ENGINE_FLAGS_BY_ID_COPY (int)0x0004
/*
* This flag if for an ENGINE that does not want its methods registered as
@@ -93,7 +93,7 @@ extern "C" {
* usable as default methods.
*/
-# define ENGINE_FLAGS_NO_REGISTER_ALL (int)0x0008
+# define ENGINE_FLAGS_NO_REGISTER_ALL (int)0x0008
/*
* ENGINEs can support their own command types, and these flags are used in
@@ -108,23 +108,23 @@ extern "C" {
*/
/* accepts a 'long' input value (3rd parameter to ENGINE_ctrl) */
-# define ENGINE_CMD_FLAG_NUMERIC (unsigned int)0x0001
+# define ENGINE_CMD_FLAG_NUMERIC (unsigned int)0x0001
/*
* accepts string input (cast from 'void*' to 'const char *', 4th parameter
* to ENGINE_ctrl)
*/
-# define ENGINE_CMD_FLAG_STRING (unsigned int)0x0002
+# define ENGINE_CMD_FLAG_STRING (unsigned int)0x0002
/*
* Indicates that the control command takes *no* input. Ie. the control
* command is unparameterised.
*/
-# define ENGINE_CMD_FLAG_NO_INPUT (unsigned int)0x0004
+# define ENGINE_CMD_FLAG_NO_INPUT (unsigned int)0x0004
/*
* Indicates that the control command is internal. This control command won't
* be shown in any output, and is only usable through the ENGINE_ctrl_cmd()
* function.
*/
-# define ENGINE_CMD_FLAG_INTERNAL (unsigned int)0x0008
+# define ENGINE_CMD_FLAG_INTERNAL (unsigned int)0x0008
/*
* NB: These 3 control commands are deprecated and should not be used.
@@ -143,21 +143,21 @@ extern "C" {
* sense to some engines. In such a case, they do nothing but return the
* error ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED.
*/
-# define ENGINE_CTRL_SET_LOGSTREAM 1
-# define ENGINE_CTRL_SET_PASSWORD_CALLBACK 2
-# define ENGINE_CTRL_HUP 3/* Close and reinitialise
+# define ENGINE_CTRL_SET_LOGSTREAM 1
+# define ENGINE_CTRL_SET_PASSWORD_CALLBACK 2
+# define ENGINE_CTRL_HUP 3/* Close and reinitialise
* any handles/connections
* etc. */
-# define ENGINE_CTRL_SET_USER_INTERFACE 4/* Alternative to callback */
-# define ENGINE_CTRL_SET_CALLBACK_DATA 5/* User-specific data, used
+# define ENGINE_CTRL_SET_USER_INTERFACE 4/* Alternative to callback */
+# define ENGINE_CTRL_SET_CALLBACK_DATA 5/* User-specific data, used
* when calling the password
* callback and the user
* interface */
-# define ENGINE_CTRL_LOAD_CONFIGURATION 6/* Load a configuration,
+# define ENGINE_CTRL_LOAD_CONFIGURATION 6/* Load a configuration,
* given a string that
* represents a file name
* or so */
-# define ENGINE_CTRL_LOAD_SECTION 7/* Load data from a given
+# define ENGINE_CTRL_LOAD_SECTION 7/* Load data from a given
* section in the already
* loaded configuration */
@@ -181,22 +181,22 @@ extern "C" {
* worth checking this first if the caller is trying to "discover" the
* engine's capabilities and doesn't want errors generated unnecessarily.
*/
-# define ENGINE_CTRL_HAS_CTRL_FUNCTION 10
+# define ENGINE_CTRL_HAS_CTRL_FUNCTION 10
/*
* Returns a positive command number for the first command supported by the
* engine. Returns zero if no ctrl commands are supported.
*/
-# define ENGINE_CTRL_GET_FIRST_CMD_TYPE 11
+# define ENGINE_CTRL_GET_FIRST_CMD_TYPE 11
/*
* The 'long' argument specifies a command implemented by the engine, and the
* return value is the next command supported, or zero if there are no more.
*/
-# define ENGINE_CTRL_GET_NEXT_CMD_TYPE 12
+# define ENGINE_CTRL_GET_NEXT_CMD_TYPE 12
/*
* The 'void*' argument is a command name (cast from 'const char *'), and the
* return value is the command that corresponds to it.
*/
-# define ENGINE_CTRL_GET_CMD_FROM_NAME 13
+# define ENGINE_CTRL_GET_CMD_FROM_NAME 13
/*
* The next two allow a command to be converted into its corresponding string
* form. In each case, the 'long' argument supplies the command. In the
@@ -205,23 +205,23 @@ extern "C" {
* string buffer large enough, and it will be populated with the name of the
* command (WITH a trailing EOL).
*/
-# define ENGINE_CTRL_GET_NAME_LEN_FROM_CMD 14
-# define ENGINE_CTRL_GET_NAME_FROM_CMD 15
+# define ENGINE_CTRL_GET_NAME_LEN_FROM_CMD 14
+# define ENGINE_CTRL_GET_NAME_FROM_CMD 15
/* The next two are similar but give a "short description" of a command. */
-# define ENGINE_CTRL_GET_DESC_LEN_FROM_CMD 16
-# define ENGINE_CTRL_GET_DESC_FROM_CMD 17
+# define ENGINE_CTRL_GET_DESC_LEN_FROM_CMD 16
+# define ENGINE_CTRL_GET_DESC_FROM_CMD 17
/*
* With this command, the return value is the OR'd combination of
* ENGINE_CMD_FLAG_*** values that indicate what kind of input a given
* engine-specific ctrl command expects.
*/
-# define ENGINE_CTRL_GET_CMD_FLAGS 18
+# define ENGINE_CTRL_GET_CMD_FLAGS 18
/*
* ENGINE implementations should start the numbering of their own control
* commands from this value. (ie. ENGINE_CMD_BASE, ENGINE_CMD_BASE + 1, etc).
*/
-# define ENGINE_CMD_BASE 200
+# define ENGINE_CMD_BASE 200
/*
* NB: These 2 nCipher "chil" control commands are deprecated, and their
@@ -232,17 +232,17 @@ extern "C" {
*/
/* Flags specific to the nCipher "chil" engine */
-# define ENGINE_CTRL_CHIL_SET_FORKCHECK 100
- /*
- * Depending on the value of the (long)i argument, this sets or
- * unsets the SimpleForkCheck flag in the CHIL API to enable or
- * disable checking and workarounds for applications that fork().
- */
-# define ENGINE_CTRL_CHIL_NO_LOCKING 101
- /*
- * This prevents the initialisation function from providing mutex
- * callbacks to the nCipher library.
- */
+# define ENGINE_CTRL_CHIL_SET_FORKCHECK 100
+ /*
+ * Depending on the value of the (long)i argument, this sets or
+ * unsets the SimpleForkCheck flag in the CHIL API to enable or
+ * disable checking and workarounds for applications that fork().
+ */
+# define ENGINE_CTRL_CHIL_NO_LOCKING 101
+ /*
+ * This prevents the initialisation function from providing mutex
+ * callbacks to the nCipher library.
+ */
/*
* If an ENGINE supports its own specific control commands and wishes the
@@ -314,44 +314,44 @@ typedef int (*ENGINE_PKEY_ASN1_METHS_PTR) (ENGINE *, EVP_PKEY_ASN1_METHOD **,
*/
/* Get the first/last "ENGINE" type available. */
-ENGINE *ENGINE_get_first(void);
-ENGINE *ENGINE_get_last(void);
+DEPRECATEDIN_3_0(ENGINE *ENGINE_get_first(void))
+DEPRECATEDIN_3_0(ENGINE *ENGINE_get_last(void))
/* Iterate to the next/previous "ENGINE" type (NULL = end of the list). */
-ENGINE *ENGINE_get_next(ENGINE *e);
-ENGINE *ENGINE_get_prev(ENGINE *e);
+DEPRECATEDIN_3_0(ENGINE *ENGINE_get_next(ENGINE *e))
+DEPRECATEDIN_3_0(ENGINE *ENGINE_get_prev(ENGINE *e))
/* Add another "ENGINE" type into the array. */
-int ENGINE_add(ENGINE *e);
+DEPRECATEDIN_3_0(int ENGINE_add(ENGINE *e))
/* Remove an existing "ENGINE" type from the array. */
-int ENGINE_remove(ENGINE *e);
+DEPRECATEDIN_3_0(int ENGINE_remove(ENGINE *e))
/* Retrieve an engine from the list by its unique "id" value. */
-ENGINE *ENGINE_by_id(const char *id);
-
-#ifndef OPENSSL_NO_DEPRECATED_1_1_0
-# define ENGINE_load_openssl() \
- OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_OPENSSL, NULL)
-# define ENGINE_load_dynamic() \
- OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_DYNAMIC, NULL)
-# ifndef OPENSSL_NO_STATIC_ENGINE
-# define ENGINE_load_padlock() \
- OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_PADLOCK, NULL)
-# define ENGINE_load_capi() \
- OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_CAPI, NULL)
-# define ENGINE_load_afalg() \
- OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_AFALG, NULL)
-# endif
-# define ENGINE_load_cryptodev() \
- OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_CRYPTODEV, NULL)
-# define ENGINE_load_rdrand() \
- OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_RDRAND, NULL)
-#endif
-void ENGINE_load_builtin_engines(void);
+DEPRECATEDIN_3_0(ENGINE *ENGINE_by_id(const char *id))
+
+# ifndef OPENSSL_NO_DEPRECATED_1_1_0
+# define ENGINE_load_openssl() \
+ OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_OPENSSL, NULL)
+# define ENGINE_load_dynamic() \
+ OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_DYNAMIC, NULL)
+# ifndef OPENSSL_NO_STATIC_ENGINE
+# define ENGINE_load_padlock() \
+ OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_PADLOCK, NULL)
+# define ENGINE_load_capi() \
+ OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_CAPI, NULL)
+# define ENGINE_load_afalg() \
+ OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_AFALG, NULL)
+# endif
+# define ENGINE_load_cryptodev() \
+ OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_CRYPTODEV, NULL)
+# define ENGINE_load_rdrand() \
+ OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_RDRAND, NULL)
+# endif
+DEPRECATEDIN_3_0(void ENGINE_load_builtin_engines(void))
/*
* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation
* "registry" handling.
*/
-unsigned int ENGINE_get_table_flags(void);
-void ENGINE_set_table_flags(unsigned int flags);
+DEPRECATEDIN_3_0(unsigned int ENGINE_get_table_flags(void))
+DEPRECATEDIN_3_0(void ENGINE_set_table_flags(unsigned int flags))
/*- Manage registration of ENGINEs per "table". For each type, there are 3
* functions;
@@ -361,41 +361,41 @@ void ENGINE_set_table_flags(unsigned int flags);
* Cleanup is automatically registered from each table when required.
*/
-int ENGINE_register_RSA(ENGINE *e);
-void ENGINE_unregister_RSA(ENGINE *e);
-void ENGINE_register_all_RSA(void);
+DEPRECATEDIN_3_0(int ENGINE_register_RSA(ENGINE *e))
+DEPRECATEDIN_3_0(void ENGINE_unregister_RSA(ENGINE *e))
+DEPRECATEDIN_3_0(void ENGINE_register_all_RSA(void))
-int ENGINE_register_DSA(ENGINE *e);
-void ENGINE_unregister_DSA(ENGINE *e);
-void ENGINE_register_all_DSA(void);
+DEPRECATEDIN_3_0(int ENGINE_register_DSA(ENGINE *e))
+DEPRECATEDIN_3_0(void ENGINE_unregister_DSA(ENGINE *e))
+DEPRECATEDIN_3_0(void ENGINE_register_all_DSA(void))
-int ENGINE_register_EC(ENGINE *e);
-void ENGINE_unregister_EC(ENGINE *e);
-void ENGINE_register_all_EC(void);
+DEPRECATEDIN_3_0(int ENGINE_register_EC(ENGINE *e))
+DEPRECATEDIN_3_0(void ENGINE_unregister_EC(ENGINE *e))
+DEPRECATEDIN_3_0(void ENGINE_register_all_EC(void))
-int ENGINE_register_DH(ENGINE *e);
-void ENGINE_unregister_DH(ENGINE *e);
-void ENGINE_register_all_DH(void);
+DEPRECATEDIN_3_0(int ENGINE_register_DH(ENGINE *e))
+DEPRECATEDIN_3_0(void ENGINE_unregister_DH(ENGINE *e))
+DEPRECATEDIN_3_0(void ENGINE_register_all_DH(void))
-int ENGINE_register_RAND(ENGINE *e);
-void ENGINE_unregister_RAND(ENGINE *e);
-void ENGINE_register_all_RAND(void);
+DEPRECATEDIN_3_0(int ENGINE_register_RAND(ENGINE *e))
+DEPRECATEDIN_3_0(void ENGINE_unregister_RAND(ENGINE *e))
+DEPRECATEDIN_3_0(void ENGINE_register_all_RAND(void))
-int ENGINE_register_ciphers(ENGINE *e);
-void ENGINE_unregister_ciphers(ENGINE *e);
-void ENGINE_register_all_ciphers(void);
+DEPRECATEDIN_3_0(int ENGINE_register_ciphers(ENGINE *e))
+DEPRECATEDIN_3_0(void ENGINE_unregister_ciphers(ENGINE *e))
+DEPRECATEDIN_3_0(void ENGINE_register_all_ciphers(void))
-int ENGINE_register_digests(ENGINE *e);
-void ENGINE_unregister_digests(ENGINE *e);
-void ENGINE_register_all_digests(void);
+DEPRECATEDIN_3_0(int ENGINE_register_digests(ENGINE *e))
+DEPRECATEDIN_3_0(void ENGINE_unregister_digests(ENGINE *e))
+DEPRECATEDIN_3_0(void ENGINE_register_all_digests(void))
-int ENGINE_register_pkey_meths(ENGINE *e);
-void ENGINE_unregister_pkey_meths(ENGINE *e);
-void ENGINE_register_all_pkey_meths(void);
+DEPRECATEDIN_3_0(int ENGINE_register_pkey_meths(ENGINE *e))
+DEPRECATEDIN_3_0(void ENGINE_unregister_pkey_meths(ENGINE *e))
+DEPRECATEDIN_3_0(void ENGINE_register_all_pkey_meths(void))
-int ENGINE_register_pkey_asn1_meths(ENGINE *e);
-void ENGINE_unregister_pkey_asn1_meths(ENGINE *e);
-void ENGINE_register_all_pkey_asn1_meths(void);
+DEPRECATEDIN_3_0(int ENGINE_register_pkey_asn1_meths(ENGINE *e))
+DEPRECATEDIN_3_0(void ENGINE_unregister_pkey_asn1_meths(ENGINE *e))
+DEPRECATEDIN_3_0(void ENGINE_register_all_pkey_asn1_meths(void))
/*
* These functions register all support from the above categories. Note, use
@@ -403,8 +403,8 @@ void ENGINE_register_all_pkey_asn1_meths(void);
* may not need. If you only need a subset of functionality, consider using
* more selective initialisation.
*/
-int ENGINE_register_complete(ENGINE *e);
-int ENGINE_register_all_complete(void);
+DEPRECATEDIN_3_0(int ENGINE_register_complete(ENGINE *e))
+DEPRECATEDIN_3_0(int ENGINE_register_all_complete(void))
/*
* Send parameterised control commands to the engine. The possibilities to
@@ -416,7 +416,8 @@ int ENGINE_register_all_complete(void);
* commands that require an operational ENGINE, and only use functional
* references in such situations.
*/
-int ENGINE_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void));
+DEPRECATEDIN_3_0(int ENGINE_ctrl(ENGINE *e, int cmd, long i, void *p,
+ void (*f) (void)))
/*
* This function tests if an ENGINE-specific command is usable as a
@@ -424,7 +425,7 @@ int ENGINE_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void));
* ENGINE_ctrl_cmd_string(). If this returns zero, it is not available to
* ENGINE_ctrl_cmd_string(), only ENGINE_ctrl().
*/
-int ENGINE_cmd_is_executable(ENGINE *e, int cmd);
+DEPRECATEDIN_3_0(int ENGINE_cmd_is_executable(ENGINE *e, int cmd))
/*
* This function works like ENGINE_ctrl() with the exception of taking a
@@ -432,8 +433,9 @@ int ENGINE_cmd_is_executable(ENGINE *e, int cmd);
* commands. See the comment on ENGINE_ctrl_cmd_string() for an explanation
* on how to use the cmd_name and cmd_optional.
*/
-int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name,
- long i, void *p, void (*f) (void), int cmd_optional);
+DEPRECATEDIN_3_0(int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name,
+ long i, void *p, void (*f) (void),
+ int cmd_optional))
/*
* This function passes a command-name and argument to an ENGINE. The
@@ -457,8 +459,8 @@ int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name,
* applications can work consistently with the same configuration for the
* same ENGINE-enabled devices, across applications.
*/
-int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name, const char *arg,
- int cmd_optional);
+DEPRECATEDIN_3_0(int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name,
+ const char *arg, int cmd_optional))
/*
* These functions are useful for manufacturing new ENGINE structures. They
@@ -468,45 +470,51 @@ int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name, const char *arg,
* These are also here so that the ENGINE structure doesn't have to be
* exposed and break binary compatibility!
*/
-ENGINE *ENGINE_new(void);
-int ENGINE_free(ENGINE *e);
-int ENGINE_up_ref(ENGINE *e);
-int ENGINE_set_id(ENGINE *e, const char *id);
-int ENGINE_set_name(ENGINE *e, const char *name);
-int ENGINE_set_RSA(ENGINE *e, const RSA_METHOD *rsa_meth);
-int ENGINE_set_DSA(ENGINE *e, const DSA_METHOD *dsa_meth);
-int ENGINE_set_EC(ENGINE *e, const EC_KEY_METHOD *ecdsa_meth);
-int ENGINE_set_DH(ENGINE *e, const DH_METHOD *dh_meth);
-int ENGINE_set_RAND(ENGINE *e, const RAND_METHOD *rand_meth);
-int ENGINE_set_destroy_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR destroy_f);
-int ENGINE_set_init_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR init_f);
-int ENGINE_set_finish_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR finish_f);
-int ENGINE_set_ctrl_function(ENGINE *e, ENGINE_CTRL_FUNC_PTR ctrl_f);
-int ENGINE_set_load_privkey_function(ENGINE *e,
- ENGINE_LOAD_KEY_PTR loadpriv_f);
-int ENGINE_set_load_pubkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpub_f);
-int ENGINE_set_load_ssl_client_cert_function(ENGINE *e,
- ENGINE_SSL_CLIENT_CERT_PTR
- loadssl_f);
-int ENGINE_set_ciphers(ENGINE *e, ENGINE_CIPHERS_PTR f);
-int ENGINE_set_digests(ENGINE *e, ENGINE_DIGESTS_PTR f);
-int ENGINE_set_pkey_meths(ENGINE *e, ENGINE_PKEY_METHS_PTR f);
-int ENGINE_set_pkey_asn1_meths(ENGINE *e, ENGINE_PKEY_ASN1_METHS_PTR f);
-int ENGINE_set_flags(ENGINE *e, int flags);
-int ENGINE_set_cmd_defns(ENGINE *e, const ENGINE_CMD_DEFN *defns);
+DEPRECATEDIN_3_0(ENGINE *ENGINE_new(void))
+DEPRECATEDIN_3_0(int ENGINE_free(ENGINE *e))
+DEPRECATEDIN_3_0(int ENGINE_up_ref(ENGINE *e))
+DEPRECATEDIN_3_0(int ENGINE_set_id(ENGINE *e, const char *id))
+DEPRECATEDIN_3_0(int ENGINE_set_name(ENGINE *e, const char *name))
+DEPRECATEDIN_3_0(int ENGINE_set_RSA(ENGINE *e, const RSA_METHOD *rsa_meth))
+DEPRECATEDIN_3_0(int ENGINE_set_DSA(ENGINE *e, const DSA_METHOD *dsa_meth))
+DEPRECATEDIN_3_0(int ENGINE_set_EC(ENGINE *e, const EC_KEY_METHOD *ecdsa_meth))
+DEPRECATEDIN_3_0(int ENGINE_set_DH(ENGINE *e, const DH_METHOD *dh_meth))
+DEPRECATEDIN_3_0(int ENGINE_set_RAND(ENGINE *e, const RAND_METHOD *rand_meth))
+DEPRECATEDIN_3_0(int ENGINE_set_destroy_function
+ (ENGINE *e,ENGINE_GEN_INT_FUNC_PTR destroy_f))
+DEPRECATEDIN_3_0(int ENGINE_set_init_function
+ (ENGINE *e, ENGINE_GEN_INT_FUNC_PTR init_f))
+DEPRECATEDIN_3_0(int ENGINE_set_finish_function
+ (ENGINE *e, ENGINE_GEN_INT_FUNC_PTR finish_f))
+DEPRECATEDIN_3_0(int ENGINE_set_ctrl_function
+ (ENGINE *e, ENGINE_CTRL_FUNC_PTR ctrl_f))
+DEPRECATEDIN_3_0(int ENGINE_set_load_privkey_function
+ (ENGINE *e, ENGINE_LOAD_KEY_PTR loadpriv_f))
+DEPRECATEDIN_3_0(int ENGINE_set_load_pubkey_function
+ (ENGINE *e, ENGINE_LOAD_KEY_PTR loadpub_f))
+DEPRECATEDIN_3_0(int ENGINE_set_load_ssl_client_cert_function
+ (ENGINE *e, ENGINE_SSL_CLIENT_CERT_PTR loadssl_f))
+DEPRECATEDIN_3_0(int ENGINE_set_ciphers(ENGINE *e, ENGINE_CIPHERS_PTR f))
+DEPRECATEDIN_3_0(int ENGINE_set_digests(ENGINE *e, ENGINE_DIGESTS_PTR f))
+DEPRECATEDIN_3_0(int ENGINE_set_pkey_meths(ENGINE *e, ENGINE_PKEY_METHS_PTR f))
+DEPRECATEDIN_3_0(int ENGINE_set_pkey_asn1_meths(ENGINE *e,
+ ENGINE_PKEY_ASN1_METHS_PTR f))
+DEPRECATEDIN_3_0(int ENGINE_set_flags(ENGINE *e, int flags))
+DEPRECATEDIN_3_0(int ENGINE_set_cmd_defns(ENGINE *e,
+ const ENGINE_CMD_DEFN *defns))
/* These functions allow control over any per-structure ENGINE data. */
-#define ENGINE_get_ex_new_index(l, p, newf, dupf, freef) \
+# define ENGINE_get_ex_new_index(l, p, newf, dupf, freef) \
CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_ENGINE, l, p, newf, dupf, freef)
-int ENGINE_set_ex_data(ENGINE *e, int idx, void *arg);
-void *ENGINE_get_ex_data(const ENGINE *e, int idx);
+DEPRECATEDIN_3_0(int ENGINE_set_ex_data(ENGINE *e, int idx, void *arg))
+DEPRECATEDIN_3_0(void *ENGINE_get_ex_data(const ENGINE *e, int idx))
-#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+# ifndef OPENSSL_NO_DEPRECATED_1_1_0
/*
* This function previously cleaned up anything that needs it. Auto-deinit will
* now take care of it so it is no longer required to call this function.
*/
-# define ENGINE_cleanup() while(0) continue
-#endif
+# define ENGINE_cleanup() while(0) continue
+# endif
/*
* These return values from within the ENGINE structure. These can be useful
@@ -514,37 +522,44 @@ void *ENGINE_get_ex_data(const ENGINE *e, int idx);
* which you obtained. Using the result for functional purposes if you only
* obtained a structural reference may be problematic!
*/
-const char *ENGINE_get_id(const ENGINE *e);
-const char *ENGINE_get_name(const ENGINE *e);
-const RSA_METHOD *ENGINE_get_RSA(const ENGINE *e);
-const DSA_METHOD *ENGINE_get_DSA(const ENGINE *e);
-const EC_KEY_METHOD *ENGINE_get_EC(const ENGINE *e);
-const DH_METHOD *ENGINE_get_DH(const ENGINE *e);
-const RAND_METHOD *ENGINE_get_RAND(const ENGINE *e);
-ENGINE_GEN_INT_FUNC_PTR ENGINE_get_destroy_function(const ENGINE *e);
-ENGINE_GEN_INT_FUNC_PTR ENGINE_get_init_function(const ENGINE *e);
-ENGINE_GEN_INT_FUNC_PTR ENGINE_get_finish_function(const ENGINE *e);
-ENGINE_CTRL_FUNC_PTR ENGINE_get_ctrl_function(const ENGINE *e);
-ENGINE_LOAD_KEY_PTR ENGINE_get_load_privkey_function(const ENGINE *e);
-ENGINE_LOAD_KEY_PTR ENGINE_get_load_pubkey_function(const ENGINE *e);
-ENGINE_SSL_CLIENT_CERT_PTR ENGINE_get_ssl_client_cert_function(const ENGINE
- *e);
-ENGINE_CIPHERS_PTR ENGINE_get_ciphers(const ENGINE *e);
-ENGINE_DIGESTS_PTR ENGINE_get_digests(const ENGINE *e);
-ENGINE_PKEY_METHS_PTR ENGINE_get_pkey_meths(const ENGINE *e);
-ENGINE_PKEY_ASN1_METHS_PTR ENGINE_get_pkey_asn1_meths(const ENGINE *e);
-const EVP_CIPHER *ENGINE_get_cipher(ENGINE *e, int nid);
-const EVP_MD *ENGINE_get_digest(ENGINE *e, int nid);
-const EVP_PKEY_METHOD *ENGINE_get_pkey_meth(ENGINE *e, int nid);
-const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth(ENGINE *e, int nid);
-const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth_str(ENGINE *e,
- const char *str,
- int len);
-const EVP_PKEY_ASN1_METHOD *ENGINE_pkey_asn1_find_str(ENGINE **pe,
- const char *str,
- int len);
-const ENGINE_CMD_DEFN *ENGINE_get_cmd_defns(const ENGINE *e);
-int ENGINE_get_flags(const ENGINE *e);
+DEPRECATEDIN_3_0(const char *ENGINE_get_id(const ENGINE *e))
+DEPRECATEDIN_3_0(const char *ENGINE_get_name(const ENGINE *e))
+DEPRECATEDIN_3_0(const RSA_METHOD *ENGINE_get_RSA(const ENGINE *e))
+DEPRECATEDIN_3_0(const DSA_METHOD *ENGINE_get_DSA(const ENGINE *e))
+DEPRECATEDIN_3_0(const EC_KEY_METHOD *ENGINE_get_EC(const ENGINE *e))
+DEPRECATEDIN_3_0(const DH_METHOD *ENGINE_get_DH(const ENGINE *e))
+DEPRECATEDIN_3_0(const RAND_METHOD *ENGINE_get_RAND(const ENGINE *e))
+DEPRECATEDIN_3_0(ENGINE_GEN_INT_FUNC_PTR ENGINE_get_destroy_function
+ (const ENGINE *e))
+DEPRECATEDIN_3_0(ENGINE_GEN_INT_FUNC_PTR ENGINE_get_init_function
+ (const ENGINE *e))
+DEPRECATEDIN_3_0(ENGINE_GEN_INT_FUNC_PTR ENGINE_get_finish_function
+ (const ENGINE *e))
+DEPRECATEDIN_3_0(ENGINE_CTRL_FUNC_PTR ENGINE_get_ctrl_function
+ (const ENGINE *e))
+DEPRECATEDIN_3_0(ENGINE_LOAD_KEY_PTR ENGINE_get_load_privkey_function
+ (const ENGINE *e))
+DEPRECATEDIN_3_0(ENGINE_LOAD_KEY_PTR ENGINE_get_load_pubkey_function
+ (const ENGINE *e))
+DEPRECATEDIN_3_0(ENGINE_SSL_CLIENT_CERT_PTR ENGINE_get_ssl_client_cert_function
+ (const ENGINE *e))
+DEPRECATEDIN_3_0(ENGINE_CIPHERS_PTR ENGINE_get_ciphers(const ENGINE *e))
+DEPRECATEDIN_3_0(ENGINE_DIGESTS_PTR ENGINE_get_digests(const ENGINE *e))
+DEPRECATEDIN_3_0(ENGINE_PKEY_METHS_PTR ENGINE_get_pkey_meths(const ENGINE *e))
+DEPRECATEDIN_3_0(ENGINE_PKEY_ASN1_METHS_PTR ENGINE_get_pkey_asn1_meths
+ (const ENGINE *e))
+DEPRECATEDIN_3_0(const EVP_CIPHER *ENGINE_get_cipher(ENGINE *e, int nid))
+DEPRECATEDIN_3_0(const EVP_MD *ENGINE_get_digest(ENGINE *e, int nid))
+DEPRECATEDIN_3_0(const EVP_PKEY_METHOD *ENGINE_get_pkey_meth
+ (ENGINE *e, int nid))
+DEPRECATEDIN_3_0(const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth
+ (ENGINE *e, int nid))
+DEPRECATEDIN_3_0(const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth_str
+ (ENGINE *e, const char *str, int len))
+DEPRECATEDIN_3_0(const EVP_PKEY_ASN1_METHOD *ENGINE_pkey_asn1_find_str
+ (ENGINE **pe, const char *str, int len))
+DEPRECATEDIN_3_0(const ENGINE_CMD_DEFN *ENGINE_get_cmd_defns(const ENGINE *e))
+DEPRECATEDIN_3_0(int ENGINE_get_flags(const ENGINE *e))
/*
* FUNCTIONAL functions. These functions deal with ENGINE structures that
@@ -564,27 +579,29 @@ int ENGINE_get_flags(const ENGINE *e);
* already in use). This will fail if the engine is not currently operational
* and cannot initialise.
*/
-int ENGINE_init(ENGINE *e);
+DEPRECATEDIN_3_0(int ENGINE_init(ENGINE *e))
/*
* Free a functional reference to a engine type. This does not require a
* corresponding call to ENGINE_free as it also releases a structural
* reference.
*/
-int ENGINE_finish(ENGINE *e);
+DEPRECATEDIN_3_0(int ENGINE_finish(ENGINE *e))
/*
* The following functions handle keys that are stored in some secondary
* location, handled by the engine. The storage may be on a card or
* whatever.
*/
-EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id,
- UI_METHOD *ui_method, void *callback_data);
-EVP_PKEY *ENGINE_load_public_key(ENGINE *e, const char *key_id,
- UI_METHOD *ui_method, void *callback_data);
-int ENGINE_load_ssl_client_cert(ENGINE *e, SSL *s,
- STACK_OF(X509_NAME) *ca_dn, X509 **pcert,
- EVP_PKEY **ppkey, STACK_OF(X509) **pother,
- UI_METHOD *ui_method, void *callback_data);
+DEPRECATEDIN_3_0(EVP_PKEY *ENGINE_load_private_key
+ (ENGINE *e, const char *key_id, UI_METHOD *ui_method,
+ void *callback_data))
+DEPRECATEDIN_3_0(EVP_PKEY *ENGINE_load_public_key
+ (ENGINE *e, const char *key_id, UI_METHOD *ui_method,
+ void *callback_data))
+DEPRECATEDIN_3_0(int ENGINE_load_ssl_client_cert
+ (ENGINE *e, SSL *s, STACK_OF(X509_NAME) *ca_dn,
+ X509 **pcert, EVP_PKEY **ppkey, STACK_OF(X509) **pother,
+ UI_METHOD *ui_method, void *callback_data))
/*
* This returns a pointer for the current ENGINE structure that is (by
@@ -592,20 +609,20 @@ int ENGINE_load_ssl_client_cert(ENGINE *e, SSL *s,
* incremented reference, so it should be free'd (ENGINE_finish) before it is
* discarded.
*/
-ENGINE *ENGINE_get_default_RSA(void);
+DEPRECATEDIN_3_0(ENGINE *ENGINE_get_default_RSA(void))
/* Same for the other "methods" */
-ENGINE *ENGINE_get_default_DSA(void);
-ENGINE *ENGINE_get_default_EC(void);
-ENGINE *ENGINE_get_default_DH(void);
-ENGINE *ENGINE_get_default_RAND(void);
+DEPRECATEDIN_3_0(ENGINE *ENGINE_get_default_DSA(void))
+DEPRECATEDIN_3_0(ENGINE *ENGINE_get_default_EC(void))
+DEPRECATEDIN_3_0(ENGINE *ENGINE_get_default_DH(void))
+DEPRECATEDIN_3_0(ENGINE *ENGINE_get_default_RAND(void))
/*
* These functions can be used to get a functional reference to perform
* ciphering or digesting corresponding to "nid".
*/
-ENGINE *ENGINE_get_cipher_engine(int nid);
-ENGINE *ENGINE_get_digest_engine(int nid);
-ENGINE *ENGINE_get_pkey_meth_engine(int nid);
-ENGINE *ENGINE_get_pkey_asn1_meth_engine(int nid);
+DEPRECATEDIN_3_0(ENGINE *ENGINE_get_cipher_engine(int nid))
+DEPRECATEDIN_3_0(ENGINE *ENGINE_get_digest_engine(int nid))
+DEPRECATEDIN_3_0(ENGINE *ENGINE_get_pkey_meth_engine(int nid))
+DEPRECATEDIN_3_0(ENGINE *ENGINE_get_pkey_asn1_meth_engine(int nid))
/*
* This sets a new default ENGINE structure for performing RSA operations. If
@@ -613,17 +630,17 @@ ENGINE *ENGINE_get_pkey_asn1_meth_engine(int nid);
* its reference count up'd so the caller should still free their own
* reference 'e'.
*/
-int ENGINE_set_default_RSA(ENGINE *e);
-int ENGINE_set_default_string(ENGINE *e, const char *def_list);
+DEPRECATEDIN_3_0(int ENGINE_set_default_RSA(ENGINE *e))
+DEPRECATEDIN_3_0(int ENGINE_set_default_string(ENGINE *e, const char *def_list))
/* Same for the other "methods" */
-int ENGINE_set_default_DSA(ENGINE *e);
-int ENGINE_set_default_EC(ENGINE *e);
-int ENGINE_set_default_DH(ENGINE *e);
-int ENGINE_set_default_RAND(ENGINE *e);
-int ENGINE_set_default_ciphers(ENGINE *e);
-int ENGINE_set_default_digests(ENGINE *e);
-int ENGINE_set_default_pkey_meths(ENGINE *e);
-int ENGINE_set_default_pkey_asn1_meths(ENGINE *e);
+DEPRECATEDIN_3_0(int ENGINE_set_default_DSA(ENGINE *e))
+DEPRECATEDIN_3_0(int ENGINE_set_default_EC(ENGINE *e))
+DEPRECATEDIN_3_0(int ENGINE_set_default_DH(ENGINE *e))
+DEPRECATEDIN_3_0(int ENGINE_set_default_RAND(ENGINE *e))
+DEPRECATEDIN_3_0(int ENGINE_set_default_ciphers(ENGINE *e))
+DEPRECATEDIN_3_0(int ENGINE_set_default_digests(ENGINE *e))
+DEPRECATEDIN_3_0(int ENGINE_set_default_pkey_meths(ENGINE *e))
+DEPRECATEDIN_3_0(int ENGINE_set_default_pkey_asn1_meths(ENGINE *e))
/*
* The combination "set" - the flags are bitwise "OR"d from the
@@ -632,9 +649,9 @@ int ENGINE_set_default_pkey_asn1_meths(ENGINE *e);
* application requires only specific functionality, consider using more
* selective functions.
*/
-int ENGINE_set_default(ENGINE *e, unsigned int flags);
+DEPRECATEDIN_3_0(int ENGINE_set_default(ENGINE *e, unsigned int flags))
-void ENGINE_add_conf_module(void);
+DEPRECATEDIN_3_0(void ENGINE_add_conf_module(void))
/* Deprecated functions ... */
/* int ENGINE_clear_defaults(void); */
@@ -644,12 +661,12 @@ void ENGINE_add_conf_module(void);
/**************************/
/* Binary/behaviour compatibility levels */
-# define OSSL_DYNAMIC_VERSION (unsigned long)0x00030000
+# define OSSL_DYNAMIC_VERSION (unsigned long)0x00030000
/*
* Binary versions older than this are too old for us (whether we're a loader
* or a loadee)
*/
-# define OSSL_DYNAMIC_OLDEST (unsigned long)0x00030000
+# define OSSL_DYNAMIC_OLDEST (unsigned long)0x00030000
/*
* When compiling an ENGINE entirely as an external shared library, loadable
@@ -693,7 +710,7 @@ typedef struct st_dynamic_fns {
* IMPLEMENT_DYNAMIC_CHECK_FN().
*/
typedef unsigned long (*dynamic_v_check_fn) (unsigned long ossl_version);
-# define IMPLEMENT_DYNAMIC_CHECK_FN() \
+# define IMPLEMENT_DYNAMIC_CHECK_FN() \
OPENSSL_EXPORT unsigned long v_check(unsigned long v); \
OPENSSL_EXPORT unsigned long v_check(unsigned long v) { \
if (v >= OSSL_DYNAMIC_OLDEST) return OSSL_DYNAMIC_VERSION; \
@@ -719,7 +736,7 @@ typedef unsigned long (*dynamic_v_check_fn) (unsigned long ossl_version);
*/
typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id,
const dynamic_fns *fns);
-# define IMPLEMENT_DYNAMIC_BIND_FN(fn) \
+# define IMPLEMENT_DYNAMIC_BIND_FN(fn) \
OPENSSL_EXPORT \
int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns); \
OPENSSL_EXPORT \
@@ -745,13 +762,13 @@ typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id,
*/
void *ENGINE_get_static_state(void);
-# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
-DEPRECATEDIN_1_1_0(void ENGINE_setup_bsd_cryptodev(void))
-# endif
+# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+DEPRECATEDIN_3_0(DEPRECATEDIN_1_1_0(void ENGINE_setup_bsd_cryptodev(void)))
+# endif
# ifdef __cplusplus
}
# endif
-# endif
-#endif
+# endif /* OPENSSL_NO_ENGINE */
+#endif /* OPENSSL_ENGINE_H */
diff --git a/include/openssl/trace.h b/include/openssl/trace.h
index f71d9fb4ca..4f18e7526c 100644
--- a/include/openssl/trace.h
+++ b/include/openssl/trace.h
@@ -42,8 +42,10 @@ extern "C" {
# define OSSL_TRACE_CATEGORY_TLS 3
# define OSSL_TRACE_CATEGORY_TLS_CIPHER 4
# define OSSL_TRACE_CATEGORY_CONF 5
-# define OSSL_TRACE_CATEGORY_ENGINE_TABLE 6
-# define OSSL_TRACE_CATEGORY_ENGINE_REF_COUNT 7
+# ifndef OPENSSL_NO_ENGINE
+# define OSSL_TRACE_CATEGORY_ENGINE_TABLE 6
+# define OSSL_TRACE_CATEGORY_ENGINE_REF_COUNT 7
+# endif
# define OSSL_TRACE_CATEGORY_PKCS5V2 8
# define OSSL_TRACE_CATEGORY_PKCS12_KEYGEN 9
# define OSSL_TRACE_CATEGORY_PKCS12_DECRYPT 10
diff --git a/providers/common/provider_util.c b/providers/common/provider_util.c
index b5511dbdfa..a0787a67e5 100644
--- a/providers/common/provider_util.c
+++ b/providers/common/provider_util.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include <openssl/evp.h>
#include <openssl/core_names.h>
#include <openssl/err.h>
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 83710f8431..64d773acbd 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -9,6 +9,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include <stdio.h>
#include <ctype.h>
#include <openssl/objects.h>
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 243c0ed7c9..c92e361cde 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -9,6 +9,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include <stdio.h>
#include "ssl_local.h"
#include "e_os.h"
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 2062879406..63624e9e80 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -8,6 +8,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include <stdio.h>
#include <openssl/rand.h>
#include <openssl/engine.h>
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 9bee9cb3af..d7722d76e0 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -9,6 +9,9 @@
* 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 <assert.h>
diff --git a/test/afalgtest.c b/test/afalgtest.c
index 16e5dbd129..01a2c8bf46 100644
--- a/test/afalgtest.c
+++ b/test/afalgtest.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include <stdio.h>
#include <openssl/opensslconf.h>
diff --git a/test/enginetest.c b/test/enginetest.c
index 9957f59dc3..99d914e09a 100644
--- a/test/enginetest.c
+++ b/test/enginetest.c
@@ -7,6 +7,9 @@
* https://www.openssl.org/source/license.html
*/
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/util/libcrypto.num b/util/libcrypto.num
index 4ed13bb5ca..2627608f55 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -54,8 +54,8 @@ X509v3_asid_is_canonical 55 3_0_0 EXIST::FUNCTION:RFC3779
ASN1_ENUMERATED_get 56 3_0_0 EXIST::FUNCTION:
EVP_MD_do_all_sorted 57 3_0_0 EXIST::FUNCTION:
OCSP_crl_reason_str 58 3_0_0 EXIST::FUNCTION:OCSP
-ENGINE_ctrl_cmd_string 59 3_0_0 EXIST::FUNCTION:ENGINE
-ENGINE_finish 60 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_ctrl_cmd_string 59 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
+ENGINE_finish 60 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
SRP_Calc_client_key 61 3_0_0 EXIST::FUNCTION:SRP
X509_PUBKEY_free 62 3_0_0 EXIST::FUNCTION:
BIO_free_all 63 3_0_0 EXIST::FUNCTION:
@@ -101,7 +101,7 @@ BF_set_key 102 3_0_0 EXIST::FUNCTION:BF,DEPRECATEDI
d2i_DHparams 103 3_0_0 EXIST::FUNCTION:DH
i2d_PKCS7_ENC_CONTENT 104 3_0_0 EXIST::FUNCTION:
DH_generate_key 105 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,DH
-ENGINE_add_conf_module 106 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_add_conf_module 106 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
BIO_new_socket 107 3_0_0 EXIST::FUNCTION:SOCK
ASN1_OBJECT_free 108 3_0_0 EXIST::FUNCTION:
X509_REQ_get_extensions 109 3_0_0 EXIST::FUNCTION:
@@ -116,14 +116,14 @@ BIO_sock_non_fatal_error 117 3_0_0 EXIST::FUNCTION:SOCK
HMAC_Update 118 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0
i2d_PKCS12 119 3_0_0 EXIST::FUNCTION:
EVP_BytesToKey 120 3_0_0 EXIST::FUNCTION:
-ENGINE_set_default_pkey_asn1_meths 121 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_default_pkey_asn1_meths 121 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
OCSP_BASICRESP_add1_ext_i2d 122 3_0_0 EXIST::FUNCTION:OCSP
EVP_camellia_128_ctr 123 3_0_0 EXIST::FUNCTION:CAMELLIA
EVP_CIPHER_impl_ctx_size 124 3_0_0 EXIST::FUNCTION:
X509_CRL_get_nextUpdate 125 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_1_1_0
PKCS12_free 126 3_0_0 EXIST::FUNCTION:
CMS_signed_get_attr 127 3_0_0 EXIST::FUNCTION:CMS
-ENGINE_set_destroy_function 128 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_destroy_function 128 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
ASN1_STRING_TABLE_add 129 3_0_0 EXIST::FUNCTION:
d2i_ASIdentifiers 130 3_0_0 EXIST::FUNCTION:RFC3779
i2d_PKCS12_bio 131 3_0_0 EXIST::FUNCTION:
@@ -147,7 +147,7 @@ EVP_PKEY_asn1_set_ctrl 149 3_0_0 EXIST::FUNCTION:
EC_POINTs_mul 150 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC
ASN1_get_object 151 3_0_0 EXIST::FUNCTION:
i2d_IPAddressFamily 152 3_0_0 EXIST::FUNCTION:RFC3779
-ENGINE_get_ctrl_function 153 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_ctrl_function 153 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
X509_REVOKED_get_ext_count 154 3_0_0 EXIST::FUNCTION:
BN_is_prime_fasttest_ex 155 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0
ERR_load_PKCS12_strings 156 3_0_0 EXIST::FUNCTION:
@@ -157,7 +157,7 @@ TS_VERIFY_CTX_set_store 159 3_0_0 EXIST::FUNCTION:TS
PKCS12_verify_mac 160 3_0_0 EXIST::FUNCTION:
X509v3_addr_canonize 161 3_0_0 EXIST::FUNCTION:RFC3779
ASN1_item_ex_i2d 162 3_0_0 EXIST::FUNCTION:
-ENGINE_set_digests 163 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_digests 163 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
PEM_ASN1_read_bio 164 3_0_0 EXIST::FUNCTION:
CT_POLICY_EVAL_CTX_free 165 3_0_0 EXIST::FUNCTION:CT
CMS_RecipientInfo_kari_get0_ctx 166 3_0_0 EXIST::FUNCTION:CMS
@@ -239,20 +239,20 @@ CMS_RecipientInfo_ktri_get0_algs 243 3_0_0 EXIST::FUNCTION:CMS
i2d_EC_PUBKEY 244 3_0_0 EXIST::FUNCTION:EC
MDC2 245 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,MDC2
BN_clear_free 246 3_0_0 EXIST::FUNCTION:
-ENGINE_get_pkey_asn1_meths 247 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_pkey_asn1_meths 247 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
DSO_merge 248 3_0_0 EXIST::FUNCTION:
RSA_get_ex_data 249 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RSA
EVP_PKEY_meth_get_decrypt 250 3_0_0 EXIST::FUNCTION:
DES_cfb_encrypt 251 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,DES
CMS_SignerInfo_set1_signer_cert 252 3_0_0 EXIST::FUNCTION:CMS
X509_CRL_load_http 253 3_0_0 EXIST::FUNCTION:SOCK
-ENGINE_register_all_ciphers 254 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_register_all_ciphers 254 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
SXNET_new 255 3_0_0 EXIST::FUNCTION:
EVP_camellia_256_ctr 256 3_0_0 EXIST::FUNCTION:CAMELLIA
d2i_PKCS8_PRIV_KEY_INFO 257 3_0_0 EXIST::FUNCTION:
EVP_md2 259 3_0_0 EXIST::FUNCTION:MD2
RC2_ecb_encrypt 260 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RC2
-ENGINE_register_DH 261 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_register_DH 261 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
ASN1_NULL_free 262 3_0_0 EXIST::FUNCTION:
EC_KEY_copy 263 3_0_0 EXIST::FUNCTION:EC
EVP_des_ede3 264 3_0_0 EXIST::FUNCTION:DES
@@ -304,7 +304,7 @@ i2d_ASN1_IA5STRING 309 3_0_0 EXIST::FUNCTION:
OCSP_check_nonce 310 3_0_0 EXIST::FUNCTION:OCSP
X509_STORE_CTX_init 311 3_0_0 EXIST::FUNCTION:
OCSP_RESPONSE_free 312 3_0_0 EXIST::FUNCTION:OCSP
-ENGINE_set_DH 313 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_DH 313 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
EVP_CIPHER_CTX_set_flags 314 3_0_0 EXIST::FUNCTION:
err_free_strings_int 315 3_0_0 EXIST::FUNCTION:
PEM_write_bio_PKCS7_stream 316 3_0_0 EXIST::FUNCTION:
@@ -435,7 +435,7 @@ NCONF_load 442 3_0_0 EXIST::FUNCTION:
ASN1_put_object 443 3_0_0 EXIST::FUNCTION:
d2i_OCSP_RESPONSE 444 3_0_0 EXIST::FUNCTION:OCSP
d2i_PublicKey 445 3_0_0 EXIST::FUNCTION:
-ENGINE_set_ex_data 446 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_ex_data 446 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
X509_get_default_private_dir 447 3_0_0 EXIST::FUNCTION:
X509_STORE_CTX_set0_dane 448 3_0_0 EXIST::FUNCTION:
EVP_des_ecb 449 3_0_0 EXIST::FUNCTION:DES
@@ -443,7 +443,7 @@ OCSP_resp_get0 450 3_0_0 EXIST::FUNCTION:OCSP
RSA_X931_generate_key_ex 452 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RSA
X509_get_serialNumber 453 3_0_0 EXIST::FUNCTION:
BIO_sock_should_retry 454 3_0_0 EXIST::FUNCTION:SOCK
-ENGINE_get_digests 455 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_digests 455 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
TS_MSG_IMPRINT_get_algo 456 3_0_0 EXIST::FUNCTION:TS
DH_new_method 457 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,DH
BF_ecb_encrypt 458 3_0_0 EXIST::FUNCTION:BF,DEPRECATEDIN_3_0
@@ -464,7 +464,7 @@ SCT_set_signature_nid 473 3_0_0 EXIST::FUNCTION:CT
i2d_RSA_PUBKEY_fp 474 3_0_0 EXIST::FUNCTION:RSA,STDIO
PKCS12_BAGS_it 475 3_0_0 EXIST::FUNCTION:
X509_pubkey_digest 476 3_0_0 EXIST::FUNCTION:
-ENGINE_register_all_RSA 477 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_register_all_RSA 477 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
CRYPTO_THREAD_set_local 478 3_0_0 EXIST::FUNCTION:
X509_get_default_cert_dir_env 479 3_0_0 EXIST::FUNCTION:
X509_CRL_sort 480 3_0_0 EXIST::FUNCTION:
@@ -472,7 +472,7 @@ i2d_RSA_PUBKEY_bio 481 3_0_0 EXIST::FUNCTION:RSA
ASN1_T61STRING_free 482 3_0_0 EXIST::FUNCTION:
PEM_write_CMS 483 3_0_0 EXIST::FUNCTION:CMS,STDIO
OPENSSL_sk_find 484 3_0_0 EXIST::FUNCTION:
-ENGINE_get_ciphers 485 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_ciphers 485 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
EVP_rc2_ofb 486 3_0_0 EXIST::FUNCTION:RC2
EVP_PKEY_set1_RSA 487 3_0_0 EXIST::FUNCTION:RSA
CMS_SignerInfo_get0_md_ctx 488 3_0_0 EXIST::FUNCTION:CMS
@@ -527,7 +527,7 @@ i2d_RSAPublicKey 538 3_0_0 EXIST::FUNCTION:RSA
EC_GROUP_get_trinomial_basis 539 3_0_0 EXIST::FUNCTION:EC,EC2M
BIO_ADDRINFO_protocol 540 3_0_0 EXIST::FUNCTION:SOCK
i2d_PBKDF2PARAM 541 3_0_0 EXIST::FUNCTION:
-ENGINE_unregister_RAND 542 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_unregister_RAND 542 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
PEM_write_bio_RSAPrivateKey 543 3_0_0 EXIST::FUNCTION:RSA
CONF_get_number 544 3_0_0 EXIST::FUNCTION:
X509_EXTENSION_get_object 545 3_0_0 EXIST::FUNCTION:
@@ -542,7 +542,7 @@ OCSP_SINGLERESP_get1_ext_d2i 553 3_0_0 EXIST::FUNCTION:OCSP
RAND_status 554 3_0_0 EXIST::FUNCTION:
EVP_ripemd160 555 3_0_0 EXIST::FUNCTION:RMD160
EVP_MD_meth_set_final 556 3_0_0 EXIST::FUNCTION:
-ENGINE_get_cmd_defns 557 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_cmd_defns 557 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
d2i_PKEY_USAGE_PERIOD 558 3_0_0 EXIST::FUNCTION:
RSAPublicKey_dup 559 3_0_0 EXIST::FUNCTION:RSA
RAND_write_file 560 3_0_0 EXIST::FUNCTION:
@@ -569,7 +569,7 @@ ESS_ISSUER_SERIAL_dup 582 3_0_0 EXIST::FUNCTION:
BN_GF2m_mod_exp_arr 583 3_0_0 EXIST::FUNCTION:EC2M
ASN1_UTF8STRING_free 584 3_0_0 EXIST::FUNCTION:
BN_X931_generate_prime_ex 585 3_0_0 EXIST::FUNCTION:
-ENGINE_get_RAND 586 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_RAND 586 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
EVP_DecryptInit 587 3_0_0 EXIST::FUNCTION:
BN_bin2bn 588 3_0_0 EXIST::FUNCTION:
X509_subject_name_hash 589 3_0_0 EXIST::FUNCTION:
@@ -581,7 +581,7 @@ i2d_PKCS7_bio 594 3_0_0 EXIST::FUNCTION:
EVP_MD_meth_get_copy 595 3_0_0 EXIST::FUNCTION:
RAND_query_egd_bytes 596 3_0_0 EXIST::FUNCTION:EGD
i2d_ASN1_PRINTABLE 597 3_0_0 EXIST::FUNCTION:
-ENGINE_cmd_is_executable 598 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_cmd_is_executable 598 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
BIO_puts 599 3_0_0 EXIST::FUNCTION:
RSAPublicKey_it 601 3_0_0 EXIST::FUNCTION:RSA
ISSUING_DIST_POINT_new 602 3_0_0 EXIST::FUNCTION:
@@ -596,7 +596,7 @@ BIO_s_bio 610 3_0_0 EXIST::FUNCTION:
OBJ_NAME_add 611 3_0_0 EXIST::FUNCTION:
BIO_fd_non_fatal_error 612 3_0_0 EXIST::FUNCTION:
EVP_PKEY_set_type 613 3_0_0 EXIST::FUNCTION:
-ENGINE_get_next 614 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_next 614 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
BN_is_negative 615 3_0_0 EXIST::FUNCTION:
EVP_PKEY_get_attr_count 616 3_0_0 EXIST::FUNCTION:
X509_REVOKED_get_ext_by_critical 617 3_0_0 EXIST::FUNCTION:
@@ -647,11 +647,11 @@ CRYPTO_nistcts128_encrypt_block 663 3_0_0 EXIST::FUNCTION:
EVP_MD_do_all 664 3_0_0 EXIST::FUNCTION:
EC_KEY_oct2priv 665 3_0_0 EXIST::FUNCTION:EC
CONF_parse_list 666 3_0_0 EXIST::FUNCTION:
-ENGINE_set_table_flags 667 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_table_flags 667 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
EVP_MD_meth_get_ctrl 668 3_0_0 EXIST::FUNCTION:
ASN1_TYPE_get_int_octetstring 669 3_0_0 EXIST::FUNCTION:
PKCS5_pbe_set0_algor 670 3_0_0 EXIST::FUNCTION:
-ENGINE_get_table_flags 671 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_table_flags 671 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
PKCS12_MAC_DATA_new 672 3_0_0 EXIST::FUNCTION:
X509_chain_up_ref 673 3_0_0 EXIST::FUNCTION:
OCSP_REQINFO_it 674 3_0_0 EXIST::FUNCTION:OCSP
@@ -707,7 +707,7 @@ PEM_write_X509_REQ 725 3_0_0 EXIST::FUNCTION:STDIO
BIO_snprintf 726 3_0_0 EXIST::FUNCTION:
EC_POINT_hex2point 727 3_0_0 EXIST::FUNCTION:EC
X509v3_get_ext_by_critical 728 3_0_0 EXIST::FUNCTION:
-ENGINE_get_default_RSA 729 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_default_RSA 729 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
DSA_sign_setup 730 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,DSA
OPENSSL_sk_new_null 731 3_0_0 EXIST::FUNCTION:
PEM_read_PKCS8 732 3_0_0 EXIST::FUNCTION:STDIO
@@ -720,7 +720,7 @@ BN_mod_exp_mont 738 3_0_0 EXIST::FUNCTION:
d2i_DHxparams 739 3_0_0 EXIST::FUNCTION:DH
DH_size 740 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,DH
CONF_imodule_get_name 741 3_0_0 EXIST::FUNCTION:
-ENGINE_get_pkey_meth_engine 742 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_pkey_meth_engine 742 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
OCSP_BASICRESP_free 743 3_0_0 EXIST::FUNCTION:OCSP
BN_set_params 744 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_0_9_8
BN_add 745 3_0_0 EXIST::FUNCTION:
@@ -748,7 +748,7 @@ BN_lebin2bn 766 3_0_0 EXIST::FUNCTION:
AES_decrypt 767 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0
BIO_fd_should_retry 768 3_0_0 EXIST::FUNCTION:
ASN1_STRING_new 769 3_0_0 EXIST::FUNCTION:
-ENGINE_init 770 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_init 770 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
TS_RESP_CTX_add_flags 771 3_0_0 EXIST::FUNCTION:TS
BIO_gethostbyname 772 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_1_1_0,SOCK
X509V3_EXT_add 773 3_0_0 EXIST::FUNCTION:
@@ -818,7 +818,7 @@ OCSP_response_status_str 837 3_0_0 EXIST::FUNCTION:OCSP
CRYPTO_gcm128_new 838 3_0_0 EXIST::FUNCTION:
SMIME_read_PKCS7 839 3_0_0 EXIST::FUNCTION:
EC_GROUP_copy 840 3_0_0 EXIST::FUNCTION:EC
-ENGINE_set_ciphers 841 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_ciphers 841 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
OPENSSL_LH_doall_arg 842 3_0_0 EXIST::FUNCTION:
OCSP_REQUEST_get_ext_by_NID 843 3_0_0 EXIST::FUNCTION:OCSP
X509_REQ_get_attr_by_NID 844 3_0_0 EXIST::FUNCTION:
@@ -859,7 +859,7 @@ CMS_ReceiptRequest_create0 879 3_0_0 EXIST::FUNCTION:CMS
EVP_MD_meth_set_cleanup 880 3_0_0 EXIST::FUNCTION:
EVP_aes_128_xts 881 3_0_0 EXIST::FUNCTION:
TS_RESP_verify_signature 883 3_0_0 EXIST::FUNCTION:TS
-ENGINE_set_pkey_meths 884 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_pkey_meths 884 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
CMS_EncryptedData_decrypt 885 3_0_0 EXIST::FUNCTION:CMS
CONF_module_add 886 3_0_0 EXIST::FUNCTION:
ASN1_UTCTIME_print 887 3_0_0 EXIST::FUNCTION:
@@ -879,7 +879,7 @@ OCSP_SINGLERESP_add_ext 900 3_0_0 EXIST::FUNCTION:OCSP
d2i_X509_SIG 901 3_0_0 EXIST::FUNCTION:
X509_NAME_set 902 3_0_0 EXIST::FUNCTION:
OPENSSL_sk_pop 903 3_0_0 EXIST::FUNCTION:
-ENGINE_register_ciphers 904 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_register_ciphers 904 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
PKCS5_pbe2_set_iv 905 3_0_0 EXIST::FUNCTION:
ASN1_add_stable_module 906 3_0_0 EXIST::FUNCTION:
EVP_camellia_128_cbc 907 3_0_0 EXIST::FUNCTION:CAMELLIA
@@ -946,7 +946,7 @@ DES_options 969 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3
IPAddressChoice_it 970 3_0_0 EXIST::FUNCTION:RFC3779
ASN1_UNIVERSALSTRING_it 971 3_0_0 EXIST::FUNCTION:
d2i_DSAPublicKey 972 3_0_0 EXIST::FUNCTION:DSA
-ENGINE_get_name 973 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_name 973 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
CRYPTO_THREAD_read_lock 974 3_0_0 EXIST::FUNCTION:
ASIdentifierChoice_free 975 3_0_0 EXIST::FUNCTION:RFC3779
BIO_dgram_sctp_msg_waiting 976 3_0_0 EXIST::FUNCTION:DGRAM,SCTP
@@ -974,7 +974,7 @@ ERR_unload_strings 998 3_0_0 EXIST::FUNCTION:
SEED_cfb128_encrypt 999 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SEED
ASN1_BIT_STRING_it 1000 3_0_0 EXIST::FUNCTION:
PKCS12_decrypt_skey 1001 3_0_0 EXIST::FUNCTION:
-ENGINE_register_EC 1002 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_register_EC 1002 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
OCSP_RESPONSE_new 1003 3_0_0 EXIST::FUNCTION:OCSP
CRYPTO_cbc128_encrypt 1004 3_0_0 EXIST::FUNCTION:
i2d_RSAPublicKey_bio 1005 3_0_0 EXIST::FUNCTION:RSA
@@ -1007,7 +1007,7 @@ X509_CRL_METHOD_new 1032 3_0_0 EXIST::FUNCTION:
ASN1_ANY_it 1033 3_0_0 EXIST::FUNCTION:
d2i_DSA_SIG 1034 3_0_0 EXIST::FUNCTION:DSA
DH_free 1035 3_0_0 EXIST::FUNCTION:DH
-ENGINE_register_all_DSA 1036 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_register_all_DSA 1036 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
TS_REQ_set_msg_imprint 1037 3_0_0 EXIST::FUNCTION:TS
BN_mod_sub_quick 1038 3_0_0 EXIST::FUNCTION:
SMIME_write_CMS 1039 3_0_0 EXIST::FUNCTION:CMS
@@ -1042,7 +1042,7 @@ NETSCAPE_SPKAC_free 1068 3_0_0 EXIST::FUNCTION:
X509_CRL_diff 1069 3_0_0 EXIST::FUNCTION:
X509_VERIFY_PARAM_set_flags 1070 3_0_0 EXIST::FUNCTION:
X509_EXTENSION_set_data 1071 3_0_0 EXIST::FUNCTION:
-ENGINE_get_EC 1072 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_EC 1072 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
ASN1_STRING_copy 1073 3_0_0 EXIST::FUNCTION:
EVP_PKEY_encrypt_old 1074 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0
OPENSSL_LH_free 1075 3_0_0 EXIST::FUNCTION:
@@ -1053,19 +1053,19 @@ BIO_nread 1079 3_0_0 EXIST::FUNCTION:
PEM_read_bio_RSAPrivateKey 1080 3_0_0 EXIST::FUNCTION:RSA
OBJ_nid2obj 1081 3_0_0 EXIST::FUNCTION:
CRYPTO_ofb128_encrypt 1082 3_0_0 EXIST::FUNCTION:
-ENGINE_set_init_function 1083 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_init_function 1083 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
NCONF_default 1084 3_0_0 EXIST::FUNCTION:
-ENGINE_remove 1085 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_remove 1085 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
ASYNC_get_current_job 1086 3_0_0 EXIST::FUNCTION:
OBJ_nid2sn 1087 3_0_0 EXIST::FUNCTION:
X509_gmtime_adj 1088 3_0_0 EXIST::FUNCTION:
X509_add_ext 1089 3_0_0 EXIST::FUNCTION:
-ENGINE_set_DSA 1090 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_DSA 1090 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
EC_KEY_METHOD_set_sign 1091 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC
d2i_TS_MSG_IMPRINT 1092 3_0_0 EXIST::FUNCTION:TS
X509_print_ex_fp 1093 3_0_0 EXIST::FUNCTION:STDIO
ERR_load_PEM_strings 1094 3_0_0 EXIST::FUNCTION:
-ENGINE_unregister_pkey_asn1_meths 1095 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_unregister_pkey_asn1_meths 1095 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
IPAddressFamily_free 1096 3_0_0 EXIST::FUNCTION:RFC3779
UI_method_get_prompt_constructor 1097 3_0_0 EXIST::FUNCTION:
ASN1_NULL_it 1098 3_0_0 EXIST::FUNCTION:
@@ -1105,7 +1105,7 @@ d2i_ASN1_UTF8STRING 1131 3_0_0 EXIST::FUNCTION:
EXTENDED_KEY_USAGE_it 1132 3_0_0 EXIST::FUNCTION:
EVP_CipherInit 1133 3_0_0 EXIST::FUNCTION:
PKCS12_add_safe 1134 3_0_0 EXIST::FUNCTION:
-ENGINE_get_digest 1135 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_digest 1135 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
EC_GROUP_have_precompute_mult 1136 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC
OPENSSL_gmtime 1137 3_0_0 EXIST::FUNCTION:
X509_set_issuer_name 1138 3_0_0 EXIST::FUNCTION:
@@ -1148,13 +1148,13 @@ ASN1_PCTX_get_str_flags 1174 3_0_0 EXIST::FUNCTION:
SHA256 1175 3_0_0 EXIST::FUNCTION:
X509_LOOKUP_hash_dir 1176 3_0_0 EXIST::FUNCTION:
ASN1_BIT_STRING_check 1177 3_0_0 EXIST::FUNCTION:
-ENGINE_set_default_RAND 1178 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_default_RAND 1178 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
BIO_connect 1179 3_0_0 EXIST::FUNCTION:SOCK
TS_TST_INFO_add_ext 1180 3_0_0 EXIST::FUNCTION:TS
EVP_aes_192_ccm 1181 3_0_0 EXIST::FUNCTION:
X509V3_add_value 1182 3_0_0 EXIST::FUNCTION:
EVP_PKEY_CTX_set0_keygen_info 1183 3_0_0 EXIST::FUNCTION:
-ENGINE_unregister_digests 1184 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_unregister_digests 1184 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
IPAddressOrRange_new 1185 3_0_0 EXIST::FUNCTION:RFC3779
EVP_aes_256_ofb 1186 3_0_0 EXIST::FUNCTION:
CRYPTO_mem_debug_push 1187 3_0_0 EXIST::FUNCTION:CRYPTO_MDEBUG,DEPRECATEDIN_3_0
@@ -1178,7 +1178,7 @@ EVP_cast5_cfb64 1204 3_0_0 EXIST::FUNCTION:CAST
OPENSSL_uni2asc 1205 3_0_0 EXIST::FUNCTION:
SCT_validation_status_string 1206 3_0_0 EXIST::FUNCTION:CT
PKCS7_add_attribute 1207 3_0_0 EXIST::FUNCTION:
-ENGINE_register_DSA 1208 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_register_DSA 1208 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
OPENSSL_LH_node_stats 1209 3_0_0 EXIST::FUNCTION:STDIO
X509_policy_tree_free 1210 3_0_0 EXIST::FUNCTION:
EC_GFp_simple_method 1211 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC
@@ -1210,7 +1210,7 @@ PBKDF2PARAM_free 1236 3_0_0 EXIST::FUNCTION:
i2d_CMS_ContentInfo 1237 3_0_0 EXIST::FUNCTION:CMS
EVP_CIPHER_meth_set_ctrl 1238 3_0_0 EXIST::FUNCTION:
RSA_public_decrypt 1239 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RSA
-ENGINE_get_id 1240 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_id 1240 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
PKCS12_item_decrypt_d2i 1241 3_0_0 EXIST::FUNCTION:
PEM_read_bio_DSAparams 1242 3_0_0 EXIST::FUNCTION:DSA
X509_CRL_cmp 1243 3_0_0 EXIST::FUNCTION:
@@ -1284,7 +1284,7 @@ CMS_add_standard_smimecap 1312 3_0_0 EXIST::FUNCTION:CMS
PKCS7_add_attrib_content_type 1313 3_0_0 EXIST::FUNCTION:
BN_BLINDING_set_flags 1314 3_0_0 EXIST::FUNCTION:
ERR_peek_last_error 1315 3_0_0 EXIST::FUNCTION:
-ENGINE_set_cmd_defns 1316 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_cmd_defns 1316 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
d2i_ASN1_NULL 1317 3_0_0 EXIST::FUNCTION:
RAND_event 1318 3_0_0 EXIST:_WIN32:FUNCTION:DEPRECATEDIN_1_1_0
i2d_PKCS12_fp 1319 3_0_0 EXIST::FUNCTION:STDIO
@@ -1316,7 +1316,7 @@ EC_KEY_get0_group 1344 3_0_0 EXIST::FUNCTION:EC
PEM_write_bio_CMS_stream 1345 3_0_0 EXIST::FUNCTION:CMS
BIO_f_linebuffer 1346 3_0_0 EXIST::FUNCTION:
ASN1_item_d2i_bio 1347 3_0_0 EXIST::FUNCTION:
-ENGINE_get_flags 1348 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_flags 1348 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
OCSP_resp_find 1349 3_0_0 EXIST::FUNCTION:OCSP
OPENSSL_LH_node_usage_stats_bio 1350 3_0_0 EXIST::FUNCTION:
EVP_PKEY_encrypt 1351 3_0_0 EXIST::FUNCTION:
@@ -1342,7 +1342,7 @@ OPENSSL_sk_unshift 1372 3_0_0 EXIST::FUNCTION:
BN_GENCB_set_old 1373 3_0_0 EXIST::FUNCTION:
PEM_write_bio_X509 1374 3_0_0 EXIST::FUNCTION:
EVP_PKEY_asn1_free 1375 3_0_0 EXIST::FUNCTION:
-ENGINE_unregister_DH 1376 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_unregister_DH 1376 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
PROXY_CERT_INFO_EXTENSION_it 1377 3_0_0 EXIST::FUNCTION:
CT_POLICY_EVAL_CTX_set1_cert 1378 3_0_0 EXIST::FUNCTION:CT
X509_NAME_hash 1379 3_0_0 EXIST::FUNCTION:
@@ -1396,7 +1396,7 @@ RSA_padding_add_SSLv23 1428 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_
OCSP_RESPBYTES_it 1429 3_0_0 EXIST::FUNCTION:OCSP
EVP_aes_192_wrap 1430 3_0_0 EXIST::FUNCTION:
OCSP_CERTID_it 1431 3_0_0 EXIST::FUNCTION:OCSP
-ENGINE_get_RSA 1432 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_RSA 1432 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
RAND_get_rand_method 1433 3_0_0 EXIST::FUNCTION:
ERR_load_DSA_strings 1434 3_0_0 EXIST::FUNCTION:DSA
ASN1_check_infinite_end 1435 3_0_0 EXIST::FUNCTION:
@@ -1436,11 +1436,11 @@ EVP_get_pw_prompt 1469 3_0_0 EXIST::FUNCTION:
BN_bn2bin 1470 3_0_0 EXIST::FUNCTION:
d2i_ASN1_BIT_STRING 1471 3_0_0 EXIST::FUNCTION:
OCSP_CERTSTATUS_new 1472 3_0_0 EXIST::FUNCTION:OCSP
-ENGINE_register_RAND 1473 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_register_RAND 1473 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
X509V3_section_free 1474 3_0_0 EXIST::FUNCTION:
CRYPTO_mem_debug_free 1475 3_0_0 EXIST::FUNCTION:CRYPTO_MDEBUG,DEPRECATEDIN_3_0
d2i_OCSP_REQUEST 1476 3_0_0 EXIST::FUNCTION:OCSP
-ENGINE_get_cipher_engine 1477 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_cipher_engine 1477 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
SHA384_Final 1478 3_0_0 EXIST::FUNCTION:
TS_RESP_CTX_set_certs 1479 3_0_0 EXIST::FUNCTION:TS
BN_MONT_CTX_free 1480 3_0_0 EXIST::FUNCTION:
@@ -1456,15 +1456,15 @@ BIO_indent 1489 3_0_0 EXIST::FUNCTION:
i2d_X509_fp 1490 3_0_0 EXIST::FUNCTION:STDIO
d2i_ASN1_TYPE 1491 3_0_0 EXIST::FUNCTION:
CTLOG_STORE_free 1492 3_0_0 EXIST::FUNCTION:CT
-ENGINE_get_pkey_meths 1493 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_pkey_meths 1493 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
i2d_TS_REQ_bio 1494 3_0_0 EXIST::FUNCTION:TS
EVP_PKEY_CTX_get_operation 1495 3_0_0 EXIST::FUNCTION:
EVP_MD_meth_set_ctrl 1496 3_0_0 EXIST::FUNCTION:
X509_EXTENSION_set_critical 1497 3_0_0 EXIST::FUNCTION:
BIO_ADDR_clear 1498 3_0_0 EXIST::FUNCTION:SOCK
-ENGINE_get_DSA 1499 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_DSA 1499 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
ASYNC_get_wait_ctx 1500 3_0_0 EXIST::FUNCTION:
-ENGINE_set_load_privkey_function 1501 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_load_privkey_function 1501 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
CRYPTO_ccm128_setiv 1502 3_0_0 EXIST::FUNCTION:
PKCS7_dataFinal 1503 3_0_0 EXIST::FUNCTION:
SHA1_Final 1504 3_0_0 EXIST::FUNCTION:
@@ -1571,7 +1571,7 @@ PEM_read_bio_X509_AUX 1606 3_0_0 EXIST::FUNCTION:
TS_ext_print_bio 1607 3_0_0 EXIST::FUNCTION:TS
SCT_set1_log_id 1608 3_0_0 EXIST::FUNCTION:CT
X509_get0_pubkey_bitstr 1609 3_0_0 EXIST::FUNCTION:
-ENGINE_register_all_RAND 1610 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_register_all_RAND 1610 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
EVP_MD_meth_get_result_size 1612 3_0_0 EXIST::FUNCTION:
BIO_ADDRINFO_address 1613 3_0_0 EXIST::FUNCTION:SOCK
ASN1_STRING_print_ex 1614 3_0_0 EXIST::FUNCTION:
@@ -1592,7 +1592,7 @@ BN_BLINDING_convert 1628 3_0_0 EXIST::FUNCTION:
CRYPTO_ocb128_cleanup 1629 3_0_0 EXIST::FUNCTION:OCB
EVP_des_ede_cbc 1630 3_0_0 EXIST::FUNCTION:DES
i2d_ASN1_TIME 1631 3_0_0 EXIST::FUNCTION:
-ENGINE_register_all_pkey_asn1_meths 1632 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_register_all_pkey_asn1_meths 1632 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
OCSP_set_max_response_length 1633 3_0_0 EXIST::FUNCTION:
d2i_ISSUING_DIST_POINT 1634 3_0_0 EXIST::FUNCTION:
CMS_RecipientInfo_set0_key 1635 3_0_0 EXIST::FUNCTION:CMS
@@ -1654,14 +1654,14 @@ PEM_read_bio_ECPrivateKey 1691 3_0_0 EXIST::FUNCTION:EC
EVP_PKEY_get_attr 1692 3_0_0 EXIST::FUNCTION:
PEM_read_bio_ECPKParameters 1693 3_0_0 EXIST::FUNCTION:EC
d2i_PKCS12_MAC_DATA 1694 3_0_0 EXIST::FUNCTION:
-ENGINE_ctrl_cmd 1695 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_ctrl_cmd 1695 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
PKCS12_SAFEBAG_get_bag_nid 1696 3_0_0 EXIST::FUNCTION:
TS_CONF_set_digests 1697 3_0_0 EXIST::FUNCTION:TS
PKCS7_SIGNED_it 1698 3_0_0 EXIST::FUNCTION:
b2i_PublicKey 1699 3_0_0 EXIST::FUNCTION:DSA
X509_PURPOSE_cleanup 1700 3_0_0 EXIST::FUNCTION:
ESS_SIGNING_CERT_dup 1701 3_0_0 EXIST::FUNCTION:
-ENGINE_set_default_DSA 1702 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_default_DSA 1702 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
X509_REVOKED_new 1703 3_0_0 EXIST::FUNCTION:
NCONF_WIN32 1704 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0
RSA_padding_check_PKCS1_OAEP_mgf1 1705 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RSA
@@ -1671,7 +1671,7 @@ BIO_vfree 1709 3_0_0 EXIST::FUNCTION:
CRYPTO_cbc128_decrypt 1710 3_0_0 EXIST::FUNCTION:
UI_dup_verify_string 1711 3_0_0 EXIST::FUNCTION:
d2i_PKCS7_bio 1712 3_0_0 EXIST::FUNCTION:
-ENGINE_set_default_digests 1713 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_default_digests 1713 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
i2d_PublicKey 1714 3_0_0 EXIST::FUNCTION:
RC5_32_set_key 1715 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RC5
AES_unwrap_key 1716 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0
@@ -1681,7 +1681,7 @@ BF_ofb64_encrypt 1719 3_0_0 EXIST::FUNCTION:BF,DEPRECATED
d2i_TS_TST_INFO_fp 1720 3_0_0 EXIST::FUNCTION:STDIO,TS
X509_find_by_issuer_and_serial 1721 3_0_0 EXIST::FUNCTION:
EVP_PKEY_type 1722 3_0_0 EXIST::FUNCTION:
-ENGINE_ctrl 1723 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_ctrl 1723 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
EVP_cast5_ecb 1724 3_0_0 EXIST::FUNCTION:CAST
BIO_nwrite0 1725 3_0_0 EXIST::FUNCTION:
CAST_encrypt 1726 3_0_0 EXIST::FUNCTION:CAST,DEPRECATEDIN_3_0
@@ -1878,7 +1878,7 @@ ASN1_INTEGER_set 1922 3_0_0 EXIST::FUNCTION:
EVP_DecodeFinal 1923 3_0_0 EXIST::FUNCTION:
MD5_Transform 1925 3_0_0 EXIST::FUNCTION:MD5
SRP_create_verifier_BN 1926 3_0_0 EXIST::FUNCTION:SRP
-ENGINE_register_all_EC 1927 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_register_all_EC 1927 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
EVP_camellia_128_ofb 1928 3_0_0 EXIST::FUNCTION:CAMELLIA
PEM_write_X509_AUX 1929 3_0_0 EXIST::FUNCTION:STDIO
X509_LOOKUP_by_subject 1930 3_0_0 EXIST::FUNCTION:
@@ -1913,7 +1913,7 @@ i2d_X509_NAME 1958 3_0_0 EXIST::FUNCTION:
EVP_PKEY_add1_attr 1959 3_0_0 EXIST::FUNCTION:
X509_STORE_CTX_purpose_inherit 1960 3_0_0 EXIST::FUNCTION:
EVP_PKEY_meth_get_keygen 1961 3_0_0 EXIST::FUNCTION:
-ENGINE_get_pkey_asn1_meth 1962 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_pkey_asn1_meth 1962 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
SHA256_Update 1963 3_0_0 EXIST::FUNCTION:
d2i_PKCS7_ISSUER_AND_SERIAL 1964 3_0_0 EXIST::FUNCTION:
PKCS12_unpack_authsafes 1965 3_0_0 EXIST::FUNCTION:
@@ -1962,11 +1962,11 @@ BN_exp 2007 3_0_0 EXIST::FUNCTION:
i2d_SXNET 2008 3_0_0 EXIST::FUNCTION:
OBJ_bsearch_ 2009 3_0_0 EXIST::FUNCTION:
OPENSSL_LH_new 2010 3_0_0 EXIST::FUNCTION:
-ENGINE_register_all_pkey_meths 2011 3_0_0 EXIST::FUNCTION:ENGINE
-ENGINE_get_init_function 2012 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_register_all_pkey_meths 2011 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
+ENGINE_get_init_function 2012 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
EC_POINT_point2hex 2013 3_0_0 EXIST::FUNCTION:EC
-ENGINE_get_default_DSA 2014 3_0_0 EXIST::FUNCTION:ENGINE
-ENGINE_register_all_complete 2015 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_default_DSA 2014 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
+ENGINE_register_all_complete 2015 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
SRP_get_default_gN 2016 3_0_0 EXIST::FUNCTION:SRP
UI_dup_input_boolean 2017 3_0_0 EXIST::FUNCTION:
PKCS7_dup 2018 3_0_0 EXIST::FUNCTION:
@@ -1977,14 +1977,14 @@ SCT_get0_extensions 2022 3_0_0 EXIST::FUNCTION:CT
OPENSSL_LH_node_stats_bio 2023 3_0_0 EXIST::FUNCTION:
i2d_DIRECTORYSTRING 2024 3_0_0 EXIST::FUNCTION:
BN_X931_derive_prime_ex 2025 3_0_0 EXIST::FUNCTION:
-ENGINE_get_pkey_asn1_meth_str 2026 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_pkey_asn1_meth_str 2026 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
PKCS7_signatureVerify 2027 3_0_0 EXIST::FUNCTION:
CRYPTO_ocb128_new 2028 3_0_0 EXIST::FUNCTION:OCB
EC_curve_nist2nid 2029 3_0_0 EXIST::FUNCTION:EC
UI_get0_result 2030 3_0_0 EXIST::FUNCTION:
OCSP_request_add1_nonce 2031 3_0_0 EXIST::FUNCTION:OCSP
UI_construct_prompt 2032 3_0_0 EXIST::FUNCTION:
-ENGINE_unregister_RSA 2033 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_unregister_RSA 2033 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
EC_GROUP_order_bits 2034 3_0_0 EXIST::FUNCTION:EC
d2i_CMS_bio 2035 3_0_0 EXIST::FUNCTION:CMS
OPENSSL_sk_num 2036 3_0_0 EXIST::FUNCTION:
@@ -2007,7 +2007,7 @@ i2d_ECPrivateKey_fp 2053 3_0_0 EXIST::FUNCTION:EC,STDIO
EVP_CIPHER_CTX_original_iv 2054 3_0_0 EXIST::FUNCTION:
PKCS7_SIGNED_free 2055 3_0_0 EXIST::FUNCTION:
X509_TRUST_get0_name 2056 3_0_0 EXIST::FUNCTION:
-ENGINE_get_load_pubkey_function 2057 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_load_pubkey_function 2057 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
UI_get_default_method 2058 3_0_0 EXIST::FUNCTION:
PKCS12_add_CSPName_asc 2059 3_0_0 EXIST::FUNCTION:
PEM_write_PUBKEY 2060 3_0_0 EXIST::FUNCTION:STDIO
@@ -2058,8 +2058,8 @@ CRYPTO_cts128_decrypt 2104 3_0_0 EXIST::FUNCTION:
ASYNC_WAIT_CTX_get_fd 2105 3_0_0 EXIST::FUNCTION:
i2d_TS_REQ 2106 3_0_0 EXIST::FUNCTION:TS
OCSP_ONEREQ_add1_ext_i2d 2107 3_0_0 EXIST::FUNCTION:OCSP
-ENGINE_register_pkey_meths 2108 3_0_0 EXIST::FUNCTION:ENGINE
-ENGINE_load_public_key 2109 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_register_pkey_meths 2108 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
+ENGINE_load_public_key 2109 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
ASIdOrRange_it 2110 3_0_0 EXIST::FUNCTION:RFC3779
DHparams_print_fp 2111 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,DH,STDIO
ERR_load_CRYPTO_strings 2112 3_0_0 EXIST:!VMS:FUNCTION:
@@ -2072,7 +2072,7 @@ CAST_ecb_encrypt 2117 3_0_0 EXIST::FUNCTION:CAST,DEPRECAT
BIO_s_file 2118 3_0_0 EXIST::FUNCTION:
RSA_X931_derive_ex 2119 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RSA
EVP_PKEY_decrypt_init 2120 3_0_0 EXIST::FUNCTION:
-ENGINE_get_destroy_function 2121 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_destroy_function 2121 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
SHA224_Init 2122 3_0_0 EXIST::FUNCTION:
X509V3_EXT_add_conf 2123 3_0_0 EXIST::FUNCTION:
ASN1_object_size 2124 3_0_0 EXIST::FUNCTION:
@@ -2184,18 +2184,18 @@ OTHERNAME_new 2231 3_0_0 EXIST::FUNCTION:
BN_rshift 2232 3_0_0 EXIST::FUNCTION:
i2d_GENERAL_NAMES 2233 3_0_0 EXIST::FUNCTION:
EC_METHOD_get_field_type 2234 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC
-ENGINE_set_name 2235 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_name 2235 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
TS_TST_INFO_get_policy_id 2236 3_0_0 EXIST::FUNCTION:TS
PKCS7_SIGNER_INFO_set 2237 3_0_0 EXIST::FUNCTION:
PEM_write_bio_PKCS8_PRIV_KEY_INFO 2238 3_0_0 EXIST::FUNCTION:
EC_GROUP_set_curve_GF2m 2239 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC,EC2M
-ENGINE_load_builtin_engines 2240 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_load_builtin_engines 2240 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
SRP_VBASE_init 2241 3_0_0 EXIST::FUNCTION:SRP
SHA224_Final 2242 3_0_0 EXIST::FUNCTION:
OCSP_CERTSTATUS_free 2243 3_0_0 EXIST::FUNCTION:OCSP
d2i_TS_TST_INFO 2244 3_0_0 EXIST::FUNCTION:TS
IPAddressOrRange_it 2245 3_0_0 EXIST::FUNCTION:RFC3779
-ENGINE_get_cipher 2246 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_cipher 2246 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
TS_TST_INFO_delete_ext 2247 3_0_0 EXIST::FUNCTION:TS
TS_OBJ_print_bio 2248 3_0_0 EXIST::FUNCTION:TS
X509_time_adj_ex 2249 3_0_0 EXIST::FUNCTION:
@@ -2224,7 +2224,7 @@ NCONF_free 2271 3_0_0 EXIST::FUNCTION:
NETSCAPE_SPKI_b64_decode 2272 3_0_0 EXIST::FUNCTION:
BIO_f_md 2273 3_0_0 EXIST::FUNCTION:
EVP_MD_CTX_pkey_ctx 2274 3_0_0 EXIST::FUNCTION:
-ENGINE_set_default_EC 2275 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_default_EC 2275 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
CMS_ReceiptRequest_free 2276 3_0_0 EXIST::FUNCTION:CMS
TS_STATUS_INFO_get0_text 2277 3_0_0 EXIST::FUNCTION:TS
CRYPTO_get_ex_new_index 2278 3_0_0 EXIST::FUNCTION:
@@ -2330,7 +2330,7 @@ ASN1_SCTX_set_app_data 2378 3_0_0 EXIST::FUNCTION:
CMS_add0_cert 2379 3_0_0 EXIST::FUNCTION:CMS
i2d_GENERAL_NAME 2380 3_0_0 EXIST::FUNCTION:
BIO_ADDR_new 2381 3_0_0 EXIST::FUNCTION:SOCK
-ENGINE_get_pkey_asn1_meth_engine 2382 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_pkey_asn1_meth_engine 2382 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
d2i_ASN1_BMPSTRING 2383 3_0_0 EXIST::FUNCTION:
PKCS12_SAFEBAG_create0_p8inf 2384 3_0_0 EXIST::FUNCTION:
OBJ_cmp 2385 3_0_0 EXIST::FUNCTION:
@@ -2353,7 +2353,7 @@ EC_KEY_set_ex_data 2402 3_0_0 EXIST::FUNCTION:EC
SRP_VBASE_new 2403 3_0_0 EXIST::FUNCTION:SRP
i2d_ECDSA_SIG 2404 3_0_0 EXIST::FUNCTION:EC
BIO_dump_indent 2405 3_0_0 EXIST::FUNCTION:
-ENGINE_set_pkey_asn1_meths 2406 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_pkey_asn1_meths 2406 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
OPENSSL_gmtime_diff 2407 3_0_0 EXIST::FUNCTION:
TS_CONF_set_crypto_device 2408 3_0_0 EXIST::FUNCTION:ENGINE,TS
COMP_CTX_get_method 2409 3_0_0 EXIST::FUNCTION:COMP
@@ -2427,12 +2427,12 @@ BN_pseudo_rand_range 2477 3_0_0 EXIST::FUNCTION:
X509V3_EXT_add_nconf 2478 3_0_0 EXIST::FUNCTION:
EVP_CIPHER_CTX_ctrl 2479 3_0_0 EXIST::FUNCTION:
ASN1_T61STRING_it 2480 3_0_0 EXIST::FUNCTION:
-ENGINE_get_prev 2481 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_prev 2481 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
OCSP_accept_responses_new 2482 3_0_0 EXIST::FUNCTION:OCSP
ERR_load_EC_strings 2483 3_0_0 EXIST::FUNCTION:EC
X509V3_string_free 2484 3_0_0 EXIST::FUNCTION:
EVP_PKEY_meth_set_paramgen 2485 3_0_0 EXIST::FUNCTION:
-ENGINE_set_load_ssl_client_cert_function 2486 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_load_ssl_client_cert_function 2486 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
EVP_ENCODE_CTX_free 2487 3_0_0 EXIST::FUNCTION:
i2d_ASN1_BIT_STRING 2488 3_0_0 EXIST::FUNCTION:
EVP_PKEY_meth_set_verifyctx 2489 3_0_0 EXIST::FUNCTION:
@@ -2446,12 +2446,12 @@ BN_mod_mul 2496 3_0_0 EXIST::FUNCTION:
CMS_add0_recipient_key 2497 3_0_0 EXIST::FUNCTION:CMS
BIO_f_zlib 2498 3_0_0 EXIST::FUNCTION:COMP,ZLIB
AES_cfb128_encrypt 2499 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0
-ENGINE_set_EC 2500 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_EC 2500 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
d2i_ECPKParameters 2501 3_0_0 EXIST::FUNCTION:EC
IDEA_ofb64_encrypt 2502 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,IDEA
CAST_decrypt 2503 3_0_0 EXIST::FUNCTION:CAST,DEPRECATEDIN_3_0
TS_STATUS_INFO_get0_failure_info 2504 3_0_0 EXIST::FUNCTION:TS
-ENGINE_unregister_pkey_meths 2506 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_unregister_pkey_meths 2506 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
DISPLAYTEXT_new 2507 3_0_0 EXIST::FUNCTION:
CMS_final 2508 3_0_0 EXIST::FUNCTION:CMS
BIO_nwrite 2509 3_0_0 EXIST::FUNCTION:
@@ -2527,7 +2527,7 @@ PKCS12_SAFEBAG_get_nid 2580 3_0_0 EXIST::FUNCTION:
EVP_MD_CTX_set_update_fn 2581 3_0_0 EXIST::FUNCTION:
BIO_f_asn1 2582 3_0_0 EXIST::FUNCTION:
BIO_dump 2583 3_0_0 EXIST::FUNCTION:
-ENGINE_load_ssl_client_cert 2584 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_load_ssl_client_cert 2584 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
X509_STORE_CTX_set_verify_cb 2585 3_0_0 EXIST::FUNCTION:
CRYPTO_clear_realloc 2586 3_0_0 EXIST::FUNCTION:
OPENSSL_strnlen 2587 3_0_0 EXIST::FUNCTION:
@@ -2543,18 +2543,18 @@ X509_VERIFY_PARAM_add1_host 2596 3_0_0 EXIST::FUNCTION:
i2d_PUBKEY_bio 2597 3_0_0 EXIST::FUNCTION:
MD4_Update 2598 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,MD4
X509_STORE_CTX_set_time 2599 3_0_0 EXIST::FUNCTION:
-ENGINE_set_default_DH 2600 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_default_DH 2600 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
X509_ocspid_print 2601 3_0_0 EXIST::FUNCTION:
DH_set_method 2602 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,DH
EVP_rc2_64_cbc 2603 3_0_0 EXIST::FUNCTION:RC2
CRYPTO_THREAD_get_current_id 2604 3_0_0 EXIST::FUNCTION:
EVP_PKEY_CTX_set_cb 2605 3_0_0 EXIST::FUNCTION:
PROXY_POLICY_it 2606 3_0_0 EXIST::FUNCTION:
-ENGINE_register_complete 2607 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_register_complete 2607 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
EVP_DecodeUpdate 2609 3_0_0 EXIST::FUNCTION:
-ENGINE_get_default_RAND 2610 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_default_RAND 2610 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
ERR_peek_last_error_line 2611 3_0_0 EXIST::FUNCTION:
-ENGINE_get_ssl_client_cert_function 2612 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_ssl_client_cert_function 2612 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
OPENSSL_LH_node_usage_stats 2613 3_0_0 EXIST::FUNCTION:STDIO
DIRECTORYSTRING_it 2614 3_0_0 EXIST::FUNCTION:
BIO_write 2615 3_0_0 EXIST::FUNCTION:
@@ -2661,11 +2661,11 @@ X509_STORE_set_default_paths 2717 3_0_0 EXIST::FUNCTION:
d2i_TS_REQ 2718 3_0_0 EXIST::FUNCTION:TS
i2d_TS_TST_INFO_bio 2719 3_0_0 EXIST::FUNCTION:TS
CMS_sign_receipt 2720 3_0_0 EXIST::FUNCTION:CMS
-ENGINE_set_RAND 2721 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_RAND 2721 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
X509_REVOKED_get_ext_by_OBJ 2722 3_0_0 EXIST::FUNCTION:
SEED_decrypt 2723 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SEED
PEM_write_PKCS8PrivateKey 2724 3_0_0 EXIST::FUNCTION:STDIO
-ENGINE_new 2725 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_new 2725 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
X509_check_issued 2726 3_0_0 EXIST::FUNCTION:
EVP_CIPHER_CTX_iv_length 2727 3_0_0 EXIST::FUNCTION:
DES_string_to_2keys 2728 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,DES
@@ -2681,8 +2681,8 @@ BIO_get_ex_data 2737 3_0_0 EXIST::FUNCTION:
CMS_digest_create 2738 3_0_0 EXIST::FUNCTION:CMS
EC_KEY_METHOD_set_verify 2739 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC
PEM_read_RSAPublicKey 2740 3_0_0 EXIST::FUNCTION:RSA,STDIO
-ENGINE_pkey_asn1_find_str 2741 3_0_0 EXIST::FUNCTION:ENGINE
-ENGINE_get_load_privkey_function 2742 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_pkey_asn1_find_str 2741 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
+ENGINE_get_load_privkey_function 2742 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
d2i_IPAddressRange 2743 3_0_0 EXIST::FUNCTION:RFC3779
ERR_remove_state 2744 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_1_0_0
X509_CRL_print_fp 2745 3_0_0 EXIST::FUNCTION:STDIO
@@ -2712,7 +2712,7 @@ OCSP_RESPID_it 2769 3_0_0 EXIST::FUNCTION:OCSP
EVP_des_ede3_cbc 2770 3_0_0 EXIST::FUNCTION:DES
X509_up_ref 2771 3_0_0 EXIST::FUNCTION:
OBJ_NAME_do_all_sorted 2772 3_0_0 EXIST::FUNCTION:
-ENGINE_unregister_DSA 2773 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_unregister_DSA 2773 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
ASN1_bn_print 2774 3_0_0 EXIST::FUNCTION:
CMS_is_detached 2775 3_0_0 EXIST::FUNCTION:CMS
X509_REQ_INFO_it 2776 3_0_0 EXIST::FUNCTION:
@@ -2746,7 +2746,7 @@ EC_KEY_set_asn1_flag 2805 3_0_0 EXIST::FUNCTION:EC
EC_GFp_mont_method 2806 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC
OPENSSL_asc2uni 2807 3_0_0 EXIST::FUNCTION:
TS_REQ_new 2808 3_0_0 EXIST::FUNCTION:TS
-ENGINE_register_all_DH 2809 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_register_all_DH 2809 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
ERR_clear_error 2810 3_0_0 EXIST::FUNCTION:
EC_KEY_dup 2811 3_0_0 EXIST::FUNCTION:EC
X509_LOOKUP_init 2812 3_0_0 EXIST::FUNCTION:
@@ -2810,7 +2810,7 @@ BN_CTX_start 2871 3_0_0 EXIST::FUNCTION:
BN_print 2872 3_0_0 EXIST::FUNCTION:
EC_KEY_set_flags 2873 3_0_0 EXIST::FUNCTION:EC
EVP_PKEY_get0 2874 3_0_0 EXIST::FUNCTION:
-ENGINE_set_default 2875 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_default 2875 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
NCONF_get_number_e 2876 3_0_0 EXIST::FUNCTION:
OPENSSL_cleanse 2877 3_0_0 EXIST::FUNCTION:
SCT_set0_signature 2878 3_0_0 EXIST::FUNCTION:CT
@@ -2835,7 +2835,7 @@ X509_get_default_cert_area 2896 3_0_0 EXIST::FUNCTION:
ERR_load_DSO_strings 2897 3_0_0 EXIST::FUNCTION:
ASIdentifiers_it 2898 3_0_0 EXIST::FUNCTION:RFC3779
BN_mod_lshift 2899 3_0_0 EXIST::FUNCTION:
-ENGINE_get_last 2900 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_last 2900 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
EVP_PKEY_encrypt_init 2901 3_0_0 EXIST::FUNCTION:
i2d_RSAPrivateKey_fp 2902 3_0_0 EXIST::FUNCTION:RSA,STDIO
X509_REQ_print 2903 3_0_0 EXIST::FUNCTION:
@@ -2869,7 +2869,7 @@ BN_with_flags 2930 3_0_0 EXIST::FUNCTION:
DSO_ctrl 2931 3_0_0 EXIST::FUNCTION:
EVP_MD_meth_get_final 2932 3_0_0 EXIST::FUNCTION:
ASN1_TYPE_get_octetstring 2933 3_0_0 EXIST::FUNCTION:
-ENGINE_by_id 2934 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_by_id 2934 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
d2i_PKCS7_SIGNER_INFO 2935 3_0_0 EXIST::FUNCTION:
EVP_aes_192_cbc 2936 3_0_0 EXIST::FUNCTION:
PKCS8_pkey_set0 2937 3_0_0 EXIST::FUNCTION:
@@ -2896,10 +2896,10 @@ COMP_get_name 2958 3_0_0 EXIST::FUNCTION:COMP
EC_GROUP_new_curve_GF2m 2959 3_0_0 EXIST::FUNCTION:EC,EC2M
X509_SIG_free 2960 3_0_0 EXIST::FUNCTION:
PEM_ASN1_write 2961 3_0_0 EXIST::FUNCTION:STDIO
-ENGINE_get_digest_engine 2962 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_digest_engine 2962 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
BN_CTX_new 2963 3_0_0 EXIST::FUNCTION:
EC_curve_nid2nist 2964 3_0_0 EXIST::FUNCTION:EC
-ENGINE_get_finish_function 2965 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_finish_function 2965 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
EC_POINT_add 2966 3_0_0 EXIST::FUNCTION:EC
EC_KEY_oct2key 2967 3_0_0 EXIST::FUNCTION:EC
SHA384_Init 2968 3_0_0 EXIST::FUNCTION:
@@ -2915,7 +2915,7 @@ DH_get_ex_data 2977 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_
CRYPTO_secure_malloc 2978 3_0_0 EXIST::FUNCTION:
TS_RESP_get_status_info 2979 3_0_0 EXIST::FUNCTION:TS
HMAC_CTX_new 2980 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0
-ENGINE_get_default_DH 2981 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_default_DH 2981 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
ECDSA_do_verify 2982 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC
DSO_flags 2983 3_0_0 EXIST::FUNCTION:
RAND_add 2984 3_0_0 EXIST::FUNCTION:
@@ -3010,7 +3010,7 @@ i2d_X509_REQ_bio 3074 3_0_0 EXIST::FUNCTION:
X509_VERIFY_PARAM_set1_name 3075 3_0_0 EXIST::FUNCTION:
d2i_RSAPublicKey_bio 3076 3_0_0 EXIST::FUNCTION:RSA
X509_REQ_get_X509_PUBKEY 3077 3_0_0 EXIST::FUNCTION:
-ENGINE_load_private_key 3078 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_load_private_key 3078 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
GENERAL_NAMES_new 3079 3_0_0 EXIST::FUNCTION:
i2d_POLICYQUALINFO 3080 3_0_0 EXIST::FUNCTION:
EC_GF2m_simple_method 3081 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC,EC2M
@@ -3028,7 +3028,7 @@ EVP_EncodeInit 3092 3_0_0 EXIST::FUNCTION:
X509_get0_trust_objects 3093 3_0_0 EXIST::FUNCTION:
d2i_ECPrivateKey_bio 3094 3_0_0 EXIST::FUNCTION:EC
BIO_s_secmem 3095 3_0_0 EXIST::FUNCTION:
-ENGINE_get_default_EC 3096 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_default_EC 3096 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
TS_RESP_create_response 3097 3_0_0 EXIST::FUNCTION:TS
BIO_ADDR_rawaddress 3098 3_0_0 EXIST::FUNCTION:SOCK
PKCS7_ENCRYPT_new 3099 3_0_0 EXIST::FUNCTION:
@@ -3130,7 +3130,7 @@ CRYPTO_THREAD_run_once 3195 3_0_0 EXIST::FUNCTION:
TS_REQ_print_bio 3196 3_0_0 EXIST::FUNCTION:TS
SCT_get_version 3197 3_0_0 EXIST::FUNCTION:CT
IDEA_set_encrypt_key 3198 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,IDEA
-ENGINE_get_DH 3199 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_DH 3199 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
i2d_ASIdentifierChoice 3200 3_0_0 EXIST::FUNCTION:RFC3779
SRP_Calc_A 3201 3_0_0 EXIST::FUNCTION:SRP
OCSP_BASICRESP_add_ext 3202 3_0_0 EXIST::FUNCTION:OCSP
@@ -3162,7 +3162,7 @@ X509_NAME_print 3227 3_0_0 EXIST::FUNCTION:
ACCESS_DESCRIPTION_free 3228 3_0_0 EXIST::FUNCTION:
BN_nist_mod_384 3229 3_0_0 EXIST::FUNCTION:
i2d_EC_PUBKEY_fp 3230 3_0_0 EXIST::FUNCTION:EC,STDIO
-ENGINE_set_default_pkey_meths 3231 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_default_pkey_meths 3231 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
DH_bits 3232 3_0_0 EXIST::FUNCTION:DH
i2d_X509_ALGORS 3233 3_0_0 EXIST::FUNCTION:
EVP_camellia_192_cfb1 3234 3_0_0 EXIST::FUNCTION:CAMELLIA
@@ -3189,15 +3189,15 @@ EVP_read_pw_string_min 3254 3_0_0 EXIST::FUNCTION:
X509_set1_notBefore 3255 3_0_0 EXIST::FUNCTION:
MD4 3256 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,MD4
EVP_PKEY_CTX_dup 3257 3_0_0 EXIST::FUNCTION:
-ENGINE_setup_bsd_cryptodev 3258 3_0_0 EXIST:__FreeBSD__:FUNCTION:DEPRECATEDIN_1_1_0,ENGINE
+ENGINE_setup_bsd_cryptodev 3258 3_0_0 EXIST:__FreeBSD__:FUNCTION:DEPRECATEDIN_1_1_0,DEPRECATEDIN_3_0,ENGINE
PEM_read_bio_DHparams 3259 3_0_0 EXIST::FUNCTION:DH
CMS_SharedInfo_encode 3260 3_0_0 EXIST::FUNCTION:CMS
ASN1_OBJECT_create 3261 3_0_0 EXIST::FUNCTION:
i2d_ECParameters 3262 3_0_0 EXIST::FUNCTION:EC
BN_GF2m_mod_arr 3263 3_0_0 EXIST::FUNCTION:EC2M
-ENGINE_set_finish_function 3264 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_finish_function 3264 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
d2i_ASN1_OCTET_STRING 3265 3_0_0 EXIST::FUNCTION:
-ENGINE_set_load_pubkey_function 3266 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_load_pubkey_function 3266 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
BIO_vprintf 3267 3_0_0 EXIST::FUNCTION:
CMS_RecipientInfo_decrypt 3268 3_0_0 EXIST::FUNCTION:CMS
RSA_generate_key 3269 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_0_9_8,RSA
@@ -3295,7 +3295,7 @@ OpenSSL_version 3362 3_0_0 EXIST::FUNCTION:
OCSP_SINGLERESP_get_ext_by_OBJ 3363 3_0_0 EXIST::FUNCTION:OCSP
ECDSA_SIG_get0 3364 3_0_0 EXIST::FUNCTION:EC
BN_set_word 3365 3_0_0 EXIST::FUNCTION:
-ENGINE_set_flags 3366 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_flags 3366 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
DSA_OpenSSL 3367 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,DSA
CMS_RecipientInfo_kari_get0_alg 3368 3_0_0 EXIST::FUNCTION:CMS
PKCS7_ENVELOPE_new 3369 3_0_0 EXIST::FUNCTION:
@@ -3308,7 +3308,7 @@ PKCS12_SAFEBAGS_it 3375 3_0_0 EXIST::FUNCTION:
PKCS12_PBE_add 3376 3_0_0 EXIST::FUNCTION:
EC_KEY_set_public_key_affine_coordinates 3377 3_0_0 EXIST::FUNCTION:EC
EVP_EncryptInit_ex 3378 3_0_0 EXIST::FUNCTION:
-ENGINE_add 3379 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_add 3379 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
OPENSSL_LH_error 3380 3_0_0 EXIST::FUNCTION:
PKCS7_DIGEST_it 3381 3_0_0 EXIST::FUNCTION:
X509_CINF_new 3382 3_0_0 EXIST::FUNCTION:
@@ -3397,7 +3397,7 @@ RSA_verify_PKCS1_PSS 3467 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_
HMAC_CTX_reset 3468 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0
EVP_PKEY_meth_set_init 3469 3_0_0 EXIST::FUNCTION:
X509_REQ_extension_nid 3470 3_0_0 EXIST::FUNCTION:
-ENGINE_up_ref 3471 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_up_ref 3471 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
BN_BLINDING_invert_ex 3472 3_0_0 EXIST::FUNCTION:
RIPEMD160_Init 3473 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RMD160
ASYNC_WAIT_CTX_get_changed_fds 3474 3_0_0 EXIST::FUNCTION:
@@ -3417,7 +3417,7 @@ BN_get_params 3487 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_
PKCS5_pbkdf2_set 3488 3_0_0 EXIST::FUNCTION:
d2i_PKCS8PrivateKey_bio 3489 3_0_0 EXIST::FUNCTION:
ASN1_ENUMERATED_new 3490 3_0_0 EXIST::FUNCTION:
-ENGINE_register_digests 3491 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_register_digests 3491 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
X509_NAME_get_text_by_NID 3492 3_0_0 EXIST::FUNCTION:
SMIME_read_ASN1 3493 3_0_0 EXIST::FUNCTION:
X509_REQ_set_subject_name 3494 3_0_0 EXIST::FUNCTION:
@@ -3442,7 +3442,7 @@ d2i_ASN1_PRINTABLE 3512 3_0_0 EXIST::FUNCTION:
EVP_PKEY_add1_attr_by_NID 3513 3_0_0 EXIST::FUNCTION:
i2d_PKCS8_PRIV_KEY_INFO_bio 3514 3_0_0 EXIST::FUNCTION:
X509_NAME_get_index_by_NID 3515 3_0_0 EXIST::FUNCTION:
-ENGINE_get_first 3516 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_first 3516 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
CERTIFICATEPOLICIES_it 3517 3_0_0 EXIST::FUNCTION:
EVP_MD_CTX_ctrl 3518 3_0_0 EXIST::FUNCTION:
PKCS7_final 3519 3_0_0 EXIST::FUNCTION:
@@ -3458,7 +3458,7 @@ TS_REQ_set_policy_id 3528 3_0_0 EXIST::FUNCTION:TS
BIO_callback_ctrl 3529 3_0_0 EXIST::FUNCTION:
v2i_GENERAL_NAME 3530 3_0_0 EXIST::FUNCTION:
ERR_print_errors_cb 3531 3_0_0 EXIST::FUNCTION:
-ENGINE_set_default_string 3532 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_default_string 3532 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
BIO_number_read 3533 3_0_0 EXIST::FUNCTION:
CRYPTO_zalloc 3534 3_0_0 EXIST::FUNCTION:
EVP_PKEY_cmp_parameters 3535 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0
@@ -3466,7 +3466,7 @@ EVP_PKEY_CTX_new_id 3537 3_0_0 EXIST::FUNCTION:
TLS_FEATURE_free 3538 3_0_0 EXIST::FUNCTION:
d2i_BASIC_CONSTRAINTS 3539 3_0_0 EXIST::FUNCTION:
X509_CERT_AUX_new 3540 3_0_0 EXIST::FUNCTION:
-ENGINE_register_pkey_asn1_meths 3541 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_register_pkey_asn1_meths 3541 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
CRYPTO_ocb128_tag 3542 3_0_0 EXIST::FUNCTION:OCB
ERR_load_OBJ_strings 3544 3_0_0 EXIST::FUNCTION:
BIO_ctrl_get_read_request 3545 3_0_0 EXIST::FUNCTION:
@@ -3482,7 +3482,7 @@ EVP_CIPHER_meth_new 3555 3_0_0 EXIST::FUNCTION:
i2d_RSA_OAEP_PARAMS 3556 3_0_0 EXIST::FUNCTION:RSA
SXNET_get_id_ulong 3557 3_0_0 EXIST::FUNCTION:
BIO_get_callback_arg 3558 3_0_0 EXIST::FUNCTION:
-ENGINE_register_RSA 3559 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_register_RSA 3559 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
i2v_GENERAL_NAMES 3560 3_0_0 EXIST::FUNCTION:
PKCS7_decrypt 3562 3_0_0 EXIST::FUNCTION:
X509_STORE_set1_param 3563 3_0_0 EXIST::FUNCTION:
@@ -3510,7 +3510,7 @@ ASN1_STRING_type 3585 3_0_0 EXIST::FUNCTION:
X509_REQ_add1_attr_by_txt 3586 3_0_0 EXIST::FUNCTION:
PEM_write_RSAPublicKey 3587 3_0_0 EXIST::FUNCTION:RSA,STDIO
EVP_MD_meth_dup 3588 3_0_0 EXIST::FUNCTION:
-ENGINE_unregister_ciphers 3589 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_unregister_ciphers 3589 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
X509_issuer_and_serial_cmp 3590 3_0_0 EXIST::FUNCTION:
OCSP_response_create 3591 3_0_0 EXIST::FUNCTION:OCSP
SHA224 3592 3_0_0 EXIST::FUNCTION:
@@ -3544,10 +3544,10 @@ OBJ_new_nid 3620 3_0_0 EXIST::FUNCTION:
CMS_ReceiptRequest_new 3621 3_0_0 EXIST::FUNCTION:CMS
SRP_VBASE_get1_by_user 3622 3_0_0 EXIST::FUNCTION:SRP
UI_method_get_closer 3623 3_0_0 EXIST::FUNCTION:
-ENGINE_get_ex_data 3624 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_ex_data 3624 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
BN_print_fp 3625 3_0_0 EXIST::FUNCTION:STDIO
MD2_Update 3626 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,MD2
-ENGINE_free 3628 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_free 3628 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
d2i_X509_ATTRIBUTE 3629 3_0_0 EXIST::FUNCTION:
TS_RESP_free 3630 3_0_0 EXIST::FUNCTION:TS
PKCS5_pbe_set 3631 3_0_0 EXIST::FUNCTION:
@@ -3573,7 +3573,7 @@ RSA_null_method 3651 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_
TS_REQ_ext_free 3652 3_0_0 EXIST::FUNCTION:TS
EVP_PKEY_meth_get_encrypt 3653 3_0_0 EXIST::FUNCTION:
Camellia_ecb_encrypt 3654 3_0_0 EXIST::FUNCTION:CAMELLIA,DEPRECATEDIN_3_0
-ENGINE_set_default_RSA 3655 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_default_RSA 3655 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
EVP_EncodeBlock 3656 3_0_0 EXIST::FUNCTION:
SXNETID_free 3657 3_0_0 EXIST::FUNCTION:
SHA1_Init 3658 3_0_0 EXIST::FUNCTION:
@@ -3589,7 +3589,7 @@ d2i_PKCS7_ENVELOPE 3667 3_0_0 EXIST::FUNCTION:
ESS_CERT_ID_new 3669 3_0_0 EXIST::FUNCTION:
EC_POINT_invert 3670 3_0_0 EXIST::FUNCTION:EC
CAST_set_key 3671 3_0_0 EXIST::FUNCTION:CAST,DEPRECATEDIN_3_0
-ENGINE_get_pkey_meth 3672 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_get_pkey_meth 3672 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
BIO_ADDRINFO_free 3673 3_0_0 EXIST::FUNCTION:SOCK
DES_ede3_cbc_encrypt 3674 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,DES
X509v3_asid_canonize 3675 3_0_0 EXIST::FUNCTION:RFC3779
@@ -3630,7 +3630,7 @@ PKCS12_add_friendlyname_asc 3709 3_0_0 EXIST::FUNCTION:
X509_STORE_CTX_get1_chain 3710 3_0_0 EXIST::FUNCTION:
ASN1_mbstring_ncopy 3711 3_0_0 EXIST::FUNCTION:
PKCS7_RECIP_INFO_it 3712 3_0_0 EXIST::FUNCTION:
-ENGINE_register_all_digests 3713 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_register_all_digests 3713 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
X509_REQ_get_version 3714 3_0_0 EXIST::FUNCTION:
i2d_ASN1_UTCTIME 3715 3_0_0 EXIST::FUNCTION:
TS_STATUS_INFO_new 3716 3_0_0 EXIST::FUNCTION:TS
@@ -3647,7 +3647,7 @@ X509_STORE_CTX_get0_policy_tree 3726 3_0_0 EXIST::FUNCTION:
DES_set_key_checked 3727 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,DES
EVP_PKEY_meth_free 3728 3_0_0 EXIST::FUNCTION:
EVP_sha224 3729 3_0_0 EXIST::FUNCTION:
-ENGINE_set_id 3730 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_id 3730 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
d2i_ECPrivateKey 3731 3_0_0 EXIST::FUNCTION:EC
CMS_signed_add1_attr_by_NID 3732 3_0_0 EXIST::FUNCTION:CMS
i2d_DSAPrivateKey_fp 3733 3_0_0 EXIST::FUNCTION:DSA,STDIO
@@ -3663,13 +3663,13 @@ SCT_get_validation_status 3742 3_0_0 EXIST::FUNCTION:CT
NETSCAPE_CERT_SEQUENCE_free 3743 3_0_0 EXIST::FUNCTION:
EVP_PBE_scrypt 3744 3_0_0 EXIST::FUNCTION:SCRYPT
d2i_TS_REQ_bio 3745 3_0_0 EXIST::FUNCTION:TS
-ENGINE_set_default_ciphers 3746 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_default_ciphers 3746 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
X509_get_signature_nid 3747 3_0_0 EXIST::FUNCTION:
DES_fcrypt 3748 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,DES
PEM_write_bio_X509_REQ 3749 3_0_0 EXIST::FUNCTION:
EVP_PKEY_meth_get_sign 3750 3_0_0 EXIST::FUNCTION:
TS_REQ_get_nonce 3751 3_0_0 EXIST::FUNCTION:TS
-ENGINE_unregister_EC 3752 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_unregister_EC 3752 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
X509v3_get_ext_count 3753 3_0_0 EXIST::FUNCTION:
UI_OpenSSL 3754 3_0_0 EXIST::FUNCTION:UI_CONSOLE
CRYPTO_ccm128_decrypt 3755 3_0_0 EXIST::FUNCTION:
@@ -3689,7 +3689,7 @@ BN_mod_exp2_mont 3768 3_0_0 EXIST::FUNCTION:
ASN1_PRINTABLE_free 3769 3_0_0 EXIST::FUNCTION:
PKCS7_ATTR_SIGN_it 3771 3_0_0 EXIST::FUNCTION:
EVP_MD_CTX_copy 3772 3_0_0 EXIST::FUNCTION:
-ENGINE_set_ctrl_function 3773 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_ctrl_function 3773 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
OCSP_id_get0_info 3774 3_0_0 EXIST::FUNCTION:OCSP
BIO_ADDRINFO_next 3775 3_0_0 EXIST::FUNCTION:SOCK
OCSP_RESPBYTES_free 3776 3_0_0 EXIST::FUNCTION:OCSP
@@ -3805,7 +3805,7 @@ BN_mod_mul_montgomery 3888 3_0_0 EXIST::FUNCTION:
BN_nnmod 3889 3_0_0 EXIST::FUNCTION:
TS_RESP_CTX_set_status_info_cond 3890 3_0_0 EXIST::FUNCTION:TS
PBKDF2PARAM_new 3891 3_0_0 EXIST::FUNCTION:
-ENGINE_set_RSA 3892 3_0_0 EXIST::FUNCTION:ENGINE
+ENGINE_set_RSA 3892 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
i2d_X509_ATTRIBUTE 3893 3_0_0 EXIST::FUNCTION:
PKCS7_ctrl 3894 3_0_0 EXIST::FUNCTION:
OCSP_REVOKEDINFO_it 3895 3_0_0 EXIST::FUNCTION:OCSP
More information about the openssl-commits
mailing list