[openssl] master update

Dr. Paul Dale pauli at openssl.org
Wed Jul 22 10:20:23 UTC 2020


The branch master has been updated
       via  7b9f218838ad93ab6b8dd9cd4545703839ec037a (commit)
       via  41bbba537598522daaf8369778de6d1225a4998e (commit)
       via  77ae4f6ff7af7d099206a1fc229be7a3ea0e0596 (commit)
       via  9e5f344a87f08ee2f3886fbccba1957bca86e7ef (commit)
       via  340f82a4e7afcd09480653bc5ffbab372d9a0e1d (commit)
      from  1d864f0f534fe38541c7adba5777935a0f2a2eb9 (commit)


- Log -----------------------------------------------------------------
commit 7b9f218838ad93ab6b8dd9cd4545703839ec037a
Author: Pauli <paul.dale at oracle.com>
Date:   Tue Jul 21 17:40:19 2020 +1000

    document the deprecation of the '-public-key-methods' option to list
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11082)

commit 41bbba537598522daaf8369778de6d1225a4998e
Author: Pauli <paul.dale at oracle.com>
Date:   Thu Feb 13 11:00:57 2020 +1000

    EVP: deprecate the EVP_X_meth_ functions.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11082)

commit 77ae4f6ff7af7d099206a1fc229be7a3ea0e0596
Author: Pauli <paul.dale at oracle.com>
Date:   Wed Apr 22 10:38:10 2020 +1000

    engines: fixed to work with EVP_*_meth calls deprecated
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11082)

commit 9e5f344a87f08ee2f3886fbccba1957bca86e7ef
Author: Pauli <paul.dale at oracle.com>
Date:   Wed Apr 22 10:25:23 2020 +1000

    evp_test: use correct deallocation for EVP_CIPHER
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11082)

commit 340f82a4e7afcd09480653bc5ffbab372d9a0e1d
Author: Pauli <paul.dale at oracle.com>
Date:   Wed Apr 22 10:24:05 2020 +1000

    evp_test: use correct deallocation for EVP_MD
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11082)

-----------------------------------------------------------------------

Summary of changes:
 apps/genpkey.c                       |   4 +-
 apps/list.c                          |   8 +-
 build.info                           |   6 +-
 crypto/cms/cms_kari.c                |   7 +
 crypto/engine/eng_openssl.c          |   4 +-
 crypto/engine/tb_pkmeth.c            |   4 +-
 crypto/evp/cmeth_lib.c               |   6 +
 crypto/evp/evp_lib.c                 |   6 +
 doc/man1/openssl-list.pod.in         |  15 +-
 doc/man3/EVP_CIPHER_meth_new.pod     |   9 +
 doc/man3/EVP_MD_meth_new.pod         |   9 +
 doc/man3/EVP_PKEY_meth_get_count.pod |  11 +
 doc/man3/EVP_PKEY_meth_new.pod       |  11 +
 engines/e_afalg.c                    |   2 +-
 engines/e_capi.c                     |   2 +-
 engines/e_devcrypto.c                |   2 +-
 include/openssl/evp.h                | 598 ++++++++++++++++-------------------
 test/build.info                      |   8 +-
 test/enginetest.c                    |   2 +-
 test/evp_extra_test.c                |  13 +
 test/evp_fetch_prov_test.c           |   8 +-
 test/evp_test.c                      |   4 +-
 test/pkey_meth_test.c                |   7 +
 test/recipes/30-test_engine.t        |   4 +
 util/libcrypto.num                   | 180 +++++------
 25 files changed, 488 insertions(+), 442 deletions(-)

diff --git a/apps/genpkey.c b/apps/genpkey.c
index 17fb42eba6..389f0e620c 100644
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -280,7 +280,7 @@ int init_gen_str(EVP_PKEY_CTX **pctx,
 
     ameth = EVP_PKEY_asn1_find_str(&tmpeng, algname, -1);
 
-#ifndef OPENSSL_NO_ENGINE
+#if !defined(OPENSSL_NO_ENGINE) && !defined(OPENSSL_NO_DEPRECATED_3_0)
     if (!ameth && e)
         ameth = ENGINE_get_pkey_asn1_meth_str(e, algname, -1);
 #endif
@@ -293,7 +293,7 @@ int init_gen_str(EVP_PKEY_CTX **pctx,
     ERR_clear_error();
 
     EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL, ameth);
-#ifndef OPENSSL_NO_ENGINE
+#if !defined(OPENSSL_NO_ENGINE) && !defined(OPENSSL_NO_DEPRECATED_3_0)
     ENGINE_finish(tmpeng);
 #endif
     ctx = EVP_PKEY_CTX_new_id(pkey_id, e);
diff --git a/apps/list.c b/apps/list.c
index f0ea7dc6ae..b58871b1c5 100644
--- a/apps/list.c
+++ b/apps/list.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-/* We need to use some engine deprecated APIs */
+/* We need to use some deprecated APIs */
 #define OPENSSL_SUPPRESS_DEPRECATED
 
 #include <string.h>
@@ -509,6 +509,7 @@ static void list_pkey(void)
     }
 }
 
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 static void list_pkey_meth(void)
 {
     size_t i;
@@ -524,6 +525,7 @@ static void list_pkey_meth(void)
                    pkey_flags & ASN1_PKEY_DYNAMIC ?  "External" : "Builtin");
     }
 }
+#endif
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 static void list_engines(void)
@@ -727,9 +729,9 @@ const OPTIONS list_options[] = {
      "List of cipher algorithms"},
     {"public-key-algorithms", OPT_PK_ALGORITHMS, '-',
      "List of public key algorithms"},
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     {"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
@@ -867,9 +869,9 @@ opthelp:
         list_ciphers();
     if (todo.pk_algorithms)
         list_pkey();
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     if (todo.pk_method)
         list_pkey_meth();
-#ifndef OPENSSL_NO_DEPRECATED_3_0
     if (todo.engines)
         list_engines();
 #endif
diff --git a/build.info b/build.info
index 4ad2b9af37..1c6787c800 100644
--- a/build.info
+++ b/build.info
@@ -1,6 +1,10 @@
 # Note that some of these directories are filtered in Configure.  Look for
 # %skipdir there for further explanations.
-SUBDIRS=crypto ssl apps test util tools fuzz engines providers doc
+
+SUBDIRS=crypto ssl apps test util tools fuzz providers doc
+IF[{- !$disabled{'deprecated-3.0'} -}]
+  SUBDIRS=engines
+ENDIF
 
 LIBS=libcrypto libssl
 INCLUDE[libcrypto]=. include
diff --git a/crypto/cms/cms_kari.c b/crypto/cms/cms_kari.c
index a2149ce002..30d38b5fd6 100644
--- a/crypto/cms/cms_kari.c
+++ b/crypto/cms/cms_kari.c
@@ -7,6 +7,12 @@
  * https://www.openssl.org/source/license.html
  */
 
+/*
+ * Low level key APIs (DH etc) are deprecated for public use, but still ok for
+ * internal use.
+ */
+#include "internal/deprecated.h"
+
 #include "internal/cryptlib.h"
 #include <openssl/asn1t.h>
 #include <openssl/pem.h>
@@ -429,6 +435,7 @@ static int cms_wrap_init(CMS_KeyAgreeRecipientInfo *kari,
         return 0;
     keylen = EVP_CIPHER_key_length(cipher);
     if ((EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_GET_WRAP_CIPHER) != 0) {
+        /* TODO: make this not get a method we can call directly */
         ret = EVP_CIPHER_meth_get_ctrl(cipher)(NULL, EVP_CTRL_GET_WRAP_CIPHER,
                                                0, &kekcipher);
         if (ret <= 0)
diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c
index 32e6f4e19f..2374af8ae9 100644
--- a/crypto/engine/eng_openssl.c
+++ b/crypto/engine/eng_openssl.c
@@ -12,8 +12,8 @@
 #define OPENSSL_SUPPRESS_DEPRECATED
 
 /*
- * RC4 and SHA-1 low level APIs are deprecated for public use, but still ok
- * for internal use.
+ * RC4 and SHA-1 low level APIs and EVP _meth_ APISs are deprecated for public
+ * use, but still ok for internal use.
  */
 #include "internal/deprecated.h"
 
diff --git a/crypto/engine/tb_pkmeth.c b/crypto/engine/tb_pkmeth.c
index 65ae42d33b..267640ae9b 100644
--- a/crypto/engine/tb_pkmeth.c
+++ b/crypto/engine/tb_pkmeth.c
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-/* We need to use some engine deprecated APIs */
-#define OPENSSL_SUPPRESS_DEPRECATED
+/* We need to use some  deprecated APIs */
+#include "internal/deprecated.h"
 
 #include "eng_local.h"
 #include <openssl/evp.h>
diff --git a/crypto/evp/cmeth_lib.c b/crypto/evp/cmeth_lib.c
index 37cca7a256..55f77133b5 100644
--- a/crypto/evp/cmeth_lib.c
+++ b/crypto/evp/cmeth_lib.c
@@ -7,6 +7,12 @@
  * https://www.openssl.org/source/license.html
  */
 
+/*
+ * EVP _meth_ APIs are deprecated for public use, but still ok for
+ * internal use.
+ */
+#include "internal/deprecated.h"
+
 #include <string.h>
 
 #include <openssl/evp.h>
diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c
index ef978ec6f1..9f2165dc59 100644
--- a/crypto/evp/evp_lib.c
+++ b/crypto/evp/evp_lib.c
@@ -7,6 +7,12 @@
  * https://www.openssl.org/source/license.html
  */
 
+/*
+ * EVP _meth_ APIs are deprecated for public use, but still ok for
+ * internal use.
+ */
+#include "internal/deprecated.h"
+
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
diff --git a/doc/man1/openssl-list.pod.in b/doc/man1/openssl-list.pod.in
index 527e96a084..e13b6c34cf 100644
--- a/doc/man1/openssl-list.pod.in
+++ b/doc/man1/openssl-list.pod.in
@@ -20,11 +20,11 @@ B<openssl list>
 [B<-cipher-commands>]
 [B<-cipher-algorithms>]
 [B<-public-key-algorithms>]
-[B<-public-key-methods>]
-{- output_off() if $disabled{"deprecated-3.0"}; "" -}
+{- output_off() if $disabled{"deprecated-3.0"}; ""
+-}[B<-public-key-methods>]
 [B<-engines>]
-{- output_on() if $disabled{"deprecated-3.0"}; "" -}
-[B<-disabled>]
+{- output_on() if $disabled{"deprecated-3.0"}; ""
+-}[B<-disabled>]
 [B<-objects>]
 [B<-options> I<command>]
 {- $OpenSSL::safe::opt_provider_synopsis -}
@@ -90,11 +90,13 @@ information on what parameters each implementation supports.
 
 Display a list of public key algorithms, with each algorithm as
 a block of multiple lines, all but the first are indented.
+{- output_off() if $disabled{"deprecated-3.0"}; "" -}
 
 =item B<-public-key-methods>
 
+This option is deprecated.
+
 Display a list of public key method OIDs.
-{- output_off() if $disabled{"deprecated-3.0"}; "" -}
 
 =item B<-engines>
 
@@ -154,7 +156,8 @@ In both cases, C<bar> is the name of the provider.
 
 =head1 HISTORY
 
-The B<-engines> option was deprecated in OpenSSL 3.0.
+The B<-engines> and B<-public-key-methods> options were deprecated in
+OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
diff --git a/doc/man3/EVP_CIPHER_meth_new.pod b/doc/man3/EVP_CIPHER_meth_new.pod
index 2e4cea289e..dd73ee693c 100644
--- a/doc/man3/EVP_CIPHER_meth_new.pod
+++ b/doc/man3/EVP_CIPHER_meth_new.pod
@@ -17,6 +17,10 @@ EVP_CIPHER_meth_get_ctrl
 
  #include <openssl/evp.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)>:
+
  EVP_CIPHER *EVP_CIPHER_meth_new(int cipher_type, int block_size, int key_len);
  EVP_CIPHER *EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher);
  void EVP_CIPHER_meth_free(EVP_CIPHER *cipher);
@@ -65,6 +69,9 @@ EVP_CIPHER_meth_get_ctrl
 
 =head1 DESCRIPTION
 
+All of the functions described on this page are deprecated.
+Applications should instead use the OSSL_PROVIDER APIs.
+
 The B<EVP_CIPHER> type is a structure for symmetric cipher method
 implementation.
 
@@ -234,6 +241,8 @@ L<EVP_EncryptInit(3)>
 
 =head1 HISTORY
 
+All of these functions were deprecated in OpenSSL 3.0.
+
 The functions described here were added in OpenSSL 1.1.0.
 The B<EVP_CIPHER> structure created with these functions became reference
 counted in OpenSSL 3.0.
diff --git a/doc/man3/EVP_MD_meth_new.pod b/doc/man3/EVP_MD_meth_new.pod
index 7777a33586..7beaaebc0b 100644
--- a/doc/man3/EVP_MD_meth_new.pod
+++ b/doc/man3/EVP_MD_meth_new.pod
@@ -18,6 +18,10 @@ EVP_MD_meth_get_ctrl
 
  #include <openssl/evp.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)>:
+
  EVP_MD *EVP_MD_meth_new(int md_type, int pkey_type);
  void EVP_MD_meth_free(EVP_MD *md);
  EVP_MD *EVP_MD_meth_dup(const EVP_MD *md);
@@ -56,6 +60,9 @@ EVP_MD_meth_get_ctrl
 
 =head1 DESCRIPTION
 
+All of the functions described on this page are deprecated.
+Applications should instead use the OSSL_PROVIDER APIs.
+
 The B<EVP_MD> type is a structure for digest method implementation.
 It can also have associated public/private key signing and verifying
 routines.
@@ -177,6 +184,8 @@ L<EVP_DigestInit(3)>, L<EVP_SignInit(3)>, L<EVP_VerifyInit(3)>
 
 =head1 HISTORY
 
+All of these functions were deprecated in OpenSSL 3.0.
+
 The B<EVP_MD> structure was openly available in OpenSSL before version
 1.1.
 The functions described here were added in OpenSSL 1.1.
diff --git a/doc/man3/EVP_PKEY_meth_get_count.pod b/doc/man3/EVP_PKEY_meth_get_count.pod
index 03dca86700..7b56de5c8a 100644
--- a/doc/man3/EVP_PKEY_meth_get_count.pod
+++ b/doc/man3/EVP_PKEY_meth_get_count.pod
@@ -8,6 +8,10 @@ EVP_PKEY_meth_get_count, EVP_PKEY_meth_get0, EVP_PKEY_meth_get0_info - enumerate
 
  #include <openssl/evp.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)>:
+
  size_t EVP_PKEY_meth_get_count(void);
  const EVP_PKEY_METHOD *EVP_PKEY_meth_get0(size_t idx);
  void EVP_PKEY_meth_get0_info(int *ppkey_id, int *pflags,
@@ -15,6 +19,9 @@ EVP_PKEY_meth_get_count, EVP_PKEY_meth_get0, EVP_PKEY_meth_get0_info - enumerate
 
 =head1 DESCRIPTION
 
+All of the functions described on this page are deprecated.
+Applications should instead use the OSSL_PROVIDER APIs.
+
 EVP_PKEY_meth_count() returns a count of the number of public key methods
 available: it includes standard methods and any methods added by the
 application.
@@ -38,6 +45,10 @@ EVP_PKEY_meth_get0_info() does not return a value.
 
 L<EVP_PKEY_new(3)>
 
+=head1 HISTORY
+
+All of these functions were deprecated in OpenSSL 3.0.
+
 =head1 COPYRIGHT
 
 Copyright 2002-2017 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man3/EVP_PKEY_meth_new.pod b/doc/man3/EVP_PKEY_meth_new.pod
index 643798f1fd..48df32f65b 100644
--- a/doc/man3/EVP_PKEY_meth_new.pod
+++ b/doc/man3/EVP_PKEY_meth_new.pod
@@ -29,6 +29,10 @@ EVP_PKEY_meth_remove
 
  #include <openssl/evp.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)>:
+
  typedef struct evp_pkey_method_st EVP_PKEY_METHOD;
 
  EVP_PKEY_METHOD *EVP_PKEY_meth_new(int id, int flags);
@@ -240,6 +244,9 @@ EVP_PKEY_meth_remove
 
 =head1 DESCRIPTION
 
+All of the functions described on this page are deprecated.
+Applications should instead use the OSSL_PROVIDER APIs.
+
 B<EVP_PKEY_METHOD> is a structure which holds a set of methods for a
 specific public key cryptographic algorithm. Those methods are usually
 used to perform different jobs, such as generating a key, signing or
@@ -440,6 +447,10 @@ All EVP_PKEY_meth_set and EVP_PKEY_meth_get functions have no return
 values. For the 'get' functions, function pointers are returned by
 arguments.
 
+=head1 HISTORY
+
+All of these functions were deprecated in OpenSSL 3.0.
+
 =head1 COPYRIGHT
 
 Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/engines/e_afalg.c b/engines/e_afalg.c
index a3e6a69011..3b48ffb360 100644
--- a/engines/e_afalg.c
+++ b/engines/e_afalg.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-/* We need to use some engine deprecated APIs */
+/* We need to use some deprecated APIs */
 #define OPENSSL_SUPPRESS_DEPRECATED
 
 /* Required for vmsplice */
diff --git a/engines/e_capi.c b/engines/e_capi.c
index 0662dcab56..cff57d69e8 100644
--- a/engines/e_capi.c
+++ b/engines/e_capi.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-/* We need to use some engine deprecated APIs */
+/* We need to use some deprecated APIs */
 #define OPENSSL_SUPPRESS_DEPRECATED
 
 #ifdef _WIN32
diff --git a/engines/e_devcrypto.c b/engines/e_devcrypto.c
index 160a07b641..729bb1fe95 100644
--- a/engines/e_devcrypto.c
+++ b/engines/e_devcrypto.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-/* We need to use some engine deprecated APIs */
+/* We need to use some deprecated APIs */
 #define OPENSSL_SUPPRESS_DEPRECATED
 
 #include "../e_os.h"
diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index 923550e9db..78771ca251 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -89,42 +89,47 @@ int EVP_default_properties_enable_fips(OPENSSL_CTX *libctx, int enable);
 # define EVP_PKEY_MO_DECRYPT     0x0008
 
 # ifndef EVP_MD
-EVP_MD *EVP_MD_meth_new(int md_type, int pkey_type);
-EVP_MD *EVP_MD_meth_dup(const EVP_MD *md);
-void EVP_MD_meth_free(EVP_MD *md);
-
-int EVP_MD_meth_set_input_blocksize(EVP_MD *md, int blocksize);
-int EVP_MD_meth_set_result_size(EVP_MD *md, int resultsize);
-int EVP_MD_meth_set_app_datasize(EVP_MD *md, int datasize);
-int EVP_MD_meth_set_flags(EVP_MD *md, unsigned long flags);
-int EVP_MD_meth_set_init(EVP_MD *md, int (*init)(EVP_MD_CTX *ctx));
-int EVP_MD_meth_set_update(EVP_MD *md, int (*update)(EVP_MD_CTX *ctx,
-                                                     const void *data,
-                                                     size_t count));
-int EVP_MD_meth_set_final(EVP_MD *md, int (*final)(EVP_MD_CTX *ctx,
-                                                   unsigned char *md));
-int EVP_MD_meth_set_copy(EVP_MD *md, int (*copy)(EVP_MD_CTX *to,
-                                                 const EVP_MD_CTX *from));
-int EVP_MD_meth_set_cleanup(EVP_MD *md, int (*cleanup)(EVP_MD_CTX *ctx));
-int EVP_MD_meth_set_ctrl(EVP_MD *md, int (*ctrl)(EVP_MD_CTX *ctx, int cmd,
-                                                 int p1, void *p2));
-
-int EVP_MD_meth_get_input_blocksize(const EVP_MD *md);
-int EVP_MD_meth_get_result_size(const EVP_MD *md);
-int EVP_MD_meth_get_app_datasize(const EVP_MD *md);
-unsigned long EVP_MD_meth_get_flags(const EVP_MD *md);
-int (*EVP_MD_meth_get_init(const EVP_MD *md))(EVP_MD_CTX *ctx);
-int (*EVP_MD_meth_get_update(const EVP_MD *md))(EVP_MD_CTX *ctx,
-                                                const void *data,
-                                                size_t count);
-int (*EVP_MD_meth_get_final(const EVP_MD *md))(EVP_MD_CTX *ctx,
-                                               unsigned char *md);
-int (*EVP_MD_meth_get_copy(const EVP_MD *md))(EVP_MD_CTX *to,
-                                              const EVP_MD_CTX *from);
-int (*EVP_MD_meth_get_cleanup(const EVP_MD *md))(EVP_MD_CTX *ctx);
-int (*EVP_MD_meth_get_ctrl(const EVP_MD *md))(EVP_MD_CTX *ctx, int cmd,
-                                              int p1, void *p2);
-
+DEPRECATEDIN_3_0(EVP_MD *EVP_MD_meth_new(int md_type, int pkey_type))
+DEPRECATEDIN_3_0(EVP_MD *EVP_MD_meth_dup(const EVP_MD *md))
+DEPRECATEDIN_3_0(void EVP_MD_meth_free(EVP_MD *md))
+
+DEPRECATEDIN_3_0(int EVP_MD_meth_set_input_blocksize(EVP_MD *md, int blocksize))
+DEPRECATEDIN_3_0(int EVP_MD_meth_set_result_size(EVP_MD *md, int resultsize))
+DEPRECATEDIN_3_0(int EVP_MD_meth_set_app_datasize(EVP_MD *md, int datasize))
+DEPRECATEDIN_3_0(int EVP_MD_meth_set_flags(EVP_MD *md, unsigned long flags))
+DEPRECATEDIN_3_0(int EVP_MD_meth_set_init(EVP_MD *md,
+                                          int (*init)(EVP_MD_CTX *ctx)))
+DEPRECATEDIN_3_0(int EVP_MD_meth_set_update(EVP_MD *md,
+                                            int (*update)(EVP_MD_CTX *ctx,
+                                                          const void *data,
+                                                          size_t count)))
+DEPRECATEDIN_3_0(int EVP_MD_meth_set_final(EVP_MD *md,
+                                           int (*final)(EVP_MD_CTX *ctx,
+                                                        unsigned char *md)))
+DEPRECATEDIN_3_0(int EVP_MD_meth_set_copy(EVP_MD *md,
+                                          int (*copy)(EVP_MD_CTX *to,
+                                                      const EVP_MD_CTX *from)))
+DEPRECATEDIN_3_0(int EVP_MD_meth_set_cleanup(EVP_MD *md,
+                                             int (*cleanup)(EVP_MD_CTX *ctx)))
+DEPRECATEDIN_3_0(int EVP_MD_meth_set_ctrl(EVP_MD *md,
+                                          int (*ctrl)(EVP_MD_CTX *ctx, int cmd,
+                                                      int p1, void *p2)))
+
+DEPRECATEDIN_3_0(int EVP_MD_meth_get_input_blocksize(const EVP_MD *md))
+DEPRECATEDIN_3_0(int EVP_MD_meth_get_result_size(const EVP_MD *md))
+DEPRECATEDIN_3_0(int EVP_MD_meth_get_app_datasize(const EVP_MD *md))
+DEPRECATEDIN_3_0(unsigned long EVP_MD_meth_get_flags(const EVP_MD *md))
+DEPRECATEDIN_3_0(int (*EVP_MD_meth_get_init(const EVP_MD *md))(EVP_MD_CTX *ctx))
+DEPRECATEDIN_3_0(int (*EVP_MD_meth_get_update(const EVP_MD *md))
+    (EVP_MD_CTX *ctx, const void *data, size_t count))
+DEPRECATEDIN_3_0(int (*EVP_MD_meth_get_final(const EVP_MD *md))
+    (EVP_MD_CTX *ctx, unsigned char *md))
+DEPRECATEDIN_3_0(int (*EVP_MD_meth_get_copy(const EVP_MD *md))
+    (EVP_MD_CTX *to, const EVP_MD_CTX *from))
+DEPRECATEDIN_3_0(int (*EVP_MD_meth_get_cleanup(const EVP_MD *md))
+    (EVP_MD_CTX *ctx))
+DEPRECATEDIN_3_0(int (*EVP_MD_meth_get_ctrl(const EVP_MD *md))
+    (EVP_MD_CTX *ctx, int cmd, int p1, void *p2))
 /* digest can only handle a single block */
 #  define EVP_MD_FLAG_ONESHOT     0x0001
 
@@ -199,51 +204,53 @@ int (*EVP_MD_meth_get_ctrl(const EVP_MD *md))(EVP_MD_CTX *ctx, int cmd,
 # define EVP_MD_CTX_FLAG_FINALISE        0x0200
 /* NOTE: 0x0400 is reserved for internal usage */
 
-EVP_CIPHER *EVP_CIPHER_meth_new(int cipher_type, int block_size, int key_len);
-EVP_CIPHER *EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher);
-void EVP_CIPHER_meth_free(EVP_CIPHER *cipher);
-
-int EVP_CIPHER_meth_set_iv_length(EVP_CIPHER *cipher, int iv_len);
-int EVP_CIPHER_meth_set_flags(EVP_CIPHER *cipher, unsigned long flags);
-int EVP_CIPHER_meth_set_impl_ctx_size(EVP_CIPHER *cipher, int ctx_size);
-int EVP_CIPHER_meth_set_init(EVP_CIPHER *cipher,
+DEPRECATEDIN_3_0(EVP_CIPHER *EVP_CIPHER_meth_new(int cipher_type,
+                                                 int block_size, int key_len))
+DEPRECATEDIN_3_0(EVP_CIPHER *EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher))
+DEPRECATEDIN_3_0(void EVP_CIPHER_meth_free(EVP_CIPHER *cipher))
+
+DEPRECATEDIN_3_0(int EVP_CIPHER_meth_set_iv_length(EVP_CIPHER *cipher,
+                                                   int iv_len))
+DEPRECATEDIN_3_0(int EVP_CIPHER_meth_set_flags(EVP_CIPHER *cipher,
+                                               unsigned long flags))
+DEPRECATEDIN_3_0(int EVP_CIPHER_meth_set_impl_ctx_size(EVP_CIPHER *cipher,
+                                                       int ctx_size))
+DEPRECATEDIN_3_0(int EVP_CIPHER_meth_set_init(EVP_CIPHER *cipher,
                              int (*init) (EVP_CIPHER_CTX *ctx,
                                           const unsigned char *key,
                                           const unsigned char *iv,
-                                          int enc));
-int EVP_CIPHER_meth_set_do_cipher(EVP_CIPHER *cipher,
-                                  int (*do_cipher) (EVP_CIPHER_CTX *ctx,
-                                                    unsigned char *out,
-                                                    const unsigned char *in,
-                                                    size_t inl));
-int EVP_CIPHER_meth_set_cleanup(EVP_CIPHER *cipher,
-                                int (*cleanup) (EVP_CIPHER_CTX *));
-int EVP_CIPHER_meth_set_set_asn1_params(EVP_CIPHER *cipher,
-                                        int (*set_asn1_parameters) (EVP_CIPHER_CTX *,
-                                                                    ASN1_TYPE *));
-int EVP_CIPHER_meth_set_get_asn1_params(EVP_CIPHER *cipher,
-                                        int (*get_asn1_parameters) (EVP_CIPHER_CTX *,
-                                                                    ASN1_TYPE *));
-int EVP_CIPHER_meth_set_ctrl(EVP_CIPHER *cipher,
-                             int (*ctrl) (EVP_CIPHER_CTX *, int type,
-                                          int arg, void *ptr));
-
-int (*EVP_CIPHER_meth_get_init(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *ctx,
-                                                          const unsigned char *key,
-                                                          const unsigned char *iv,
-                                                          int enc);
-int (*EVP_CIPHER_meth_get_do_cipher(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *ctx,
-                                                               unsigned char *out,
-                                                               const unsigned char *in,
-                                                               size_t inl);
-int (*EVP_CIPHER_meth_get_cleanup(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *);
-int (*EVP_CIPHER_meth_get_set_asn1_params(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *,
-                                                                     ASN1_TYPE *);
-int (*EVP_CIPHER_meth_get_get_asn1_params(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *,
-                                                               ASN1_TYPE *);
-int (*EVP_CIPHER_meth_get_ctrl(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *,
-                                                          int type, int arg,
-                                                          void *ptr);
+                                          int enc)))
+DEPRECATEDIN_3_0(int EVP_CIPHER_meth_set_do_cipher
+    (EVP_CIPHER *cipher, int (*do_cipher) (EVP_CIPHER_CTX *ctx,
+                                           unsigned char *out,
+                                           const unsigned char *in,
+                                           size_t inl)))
+DEPRECATEDIN_3_0(int EVP_CIPHER_meth_set_cleanup
+    (EVP_CIPHER *cipher, int (*cleanup) (EVP_CIPHER_CTX *)))
+DEPRECATEDIN_3_0(int EVP_CIPHER_meth_set_set_asn1_params
+    (EVP_CIPHER *cipher, int (*set_asn1_parameters) (EVP_CIPHER_CTX *,
+                                                     ASN1_TYPE *)))
+DEPRECATEDIN_3_0(int EVP_CIPHER_meth_set_get_asn1_params
+    (EVP_CIPHER *cipher, int (*get_asn1_parameters) (EVP_CIPHER_CTX *,
+                                                     ASN1_TYPE *)))
+DEPRECATEDIN_3_0(int EVP_CIPHER_meth_set_ctrl
+    (EVP_CIPHER *cipher, int (*ctrl) (EVP_CIPHER_CTX *, int type, int arg,
+                                      void *ptr)))
+
+DEPRECATEDIN_3_0(int (*EVP_CIPHER_meth_get_init
+    (const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                                const unsigned char *iv, int enc))
+DEPRECATEDIN_3_0(int (*EVP_CIPHER_meth_get_do_cipher(const EVP_CIPHER *cipher))
+    (EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in,
+     size_t inl))
+DEPRECATEDIN_3_0(int (*EVP_CIPHER_meth_get_cleanup(const EVP_CIPHER *cipher))
+    (EVP_CIPHER_CTX *))
+DEPRECATEDIN_3_0(int (*EVP_CIPHER_meth_get_set_asn1_params(const EVP_CIPHER *cipher))
+    (EVP_CIPHER_CTX *, ASN1_TYPE *))
+DEPRECATEDIN_3_0(int (*EVP_CIPHER_meth_get_get_asn1_params(const EVP_CIPHER *cipher))
+    (EVP_CIPHER_CTX *, ASN1_TYPE *))
+DEPRECATEDIN_3_0(int (*EVP_CIPHER_meth_get_ctrl(const EVP_CIPHER *cipher))
+    (EVP_CIPHER_CTX *, int type, int arg, void *ptr))
 
 /* Values for cipher flags */
 
@@ -1528,16 +1535,17 @@ int EVP_PKEY_CTX_set_signature_md(EVP_PKEY_CTX *ctx, const EVP_MD *md);
  */
 # define EVP_PKEY_FLAG_SIGCTX_CUSTOM     4
 
-const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type);
-EVP_PKEY_METHOD *EVP_PKEY_meth_new(int id, int flags);
-void EVP_PKEY_meth_get0_info(int *ppkey_id, int *pflags,
-                             const EVP_PKEY_METHOD *meth);
-void EVP_PKEY_meth_copy(EVP_PKEY_METHOD *dst, const EVP_PKEY_METHOD *src);
-void EVP_PKEY_meth_free(EVP_PKEY_METHOD *pmeth);
-int EVP_PKEY_meth_add0(const EVP_PKEY_METHOD *pmeth);
-int EVP_PKEY_meth_remove(const EVP_PKEY_METHOD *pmeth);
-size_t EVP_PKEY_meth_get_count(void);
-const EVP_PKEY_METHOD *EVP_PKEY_meth_get0(size_t idx);
+DEPRECATEDIN_3_0(const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type))
+DEPRECATEDIN_3_0(EVP_PKEY_METHOD *EVP_PKEY_meth_new(int id, int flags))
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_get0_info(int *ppkey_id, int *pflags,
+                                              const EVP_PKEY_METHOD *meth))
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_copy(EVP_PKEY_METHOD *dst,
+                                         const EVP_PKEY_METHOD *src))
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_free(EVP_PKEY_METHOD *pmeth))
+DEPRECATEDIN_3_0(int EVP_PKEY_meth_add0(const EVP_PKEY_METHOD *pmeth))
+DEPRECATEDIN_3_0(int EVP_PKEY_meth_remove(const EVP_PKEY_METHOD *pmeth))
+DEPRECATEDIN_3_0(size_t EVP_PKEY_meth_get_count(void))
+DEPRECATEDIN_3_0(const EVP_PKEY_METHOD *EVP_PKEY_meth_get0(size_t idx))
 
 EVP_KEYMGMT *EVP_KEYMGMT_fetch(OPENSSL_CTX *ctx, const char *algorithm,
                                const char *properties);
@@ -1710,243 +1718,185 @@ EVP_PKEY_gen_cb *EVP_PKEY_CTX_get_cb(EVP_PKEY_CTX *ctx);
 
 int EVP_PKEY_CTX_get_keygen_info(EVP_PKEY_CTX *ctx, int idx);
 
-void EVP_PKEY_meth_set_init(EVP_PKEY_METHOD *pmeth,
-                            int (*init) (EVP_PKEY_CTX *ctx));
-
-void EVP_PKEY_meth_set_copy(EVP_PKEY_METHOD *pmeth,
-                            int (*copy) (EVP_PKEY_CTX *dst,
-                                         const EVP_PKEY_CTX *src));
-
-void EVP_PKEY_meth_set_cleanup(EVP_PKEY_METHOD *pmeth,
-                               void (*cleanup) (EVP_PKEY_CTX *ctx));
-
-void EVP_PKEY_meth_set_paramgen(EVP_PKEY_METHOD *pmeth,
-                                int (*paramgen_init) (EVP_PKEY_CTX *ctx),
-                                int (*paramgen) (EVP_PKEY_CTX *ctx,
-                                                 EVP_PKEY *pkey));
-
-void EVP_PKEY_meth_set_keygen(EVP_PKEY_METHOD *pmeth,
-                              int (*keygen_init) (EVP_PKEY_CTX *ctx),
-                              int (*keygen) (EVP_PKEY_CTX *ctx,
-                                             EVP_PKEY *pkey));
-
-void EVP_PKEY_meth_set_sign(EVP_PKEY_METHOD *pmeth,
-                            int (*sign_init) (EVP_PKEY_CTX *ctx),
-                            int (*sign) (EVP_PKEY_CTX *ctx,
-                                         unsigned char *sig, size_t *siglen,
-                                         const unsigned char *tbs,
-                                         size_t tbslen));
-
-void EVP_PKEY_meth_set_verify(EVP_PKEY_METHOD *pmeth,
-                              int (*verify_init) (EVP_PKEY_CTX *ctx),
-                              int (*verify) (EVP_PKEY_CTX *ctx,
-                                             const unsigned char *sig,
-                                             size_t siglen,
-                                             const unsigned char *tbs,
-                                             size_t tbslen));
-
-void EVP_PKEY_meth_set_verify_recover(EVP_PKEY_METHOD *pmeth,
-                                      int (*verify_recover_init) (EVP_PKEY_CTX
-                                                                  *ctx),
-                                      int (*verify_recover) (EVP_PKEY_CTX
-                                                             *ctx,
-                                                             unsigned char
-                                                             *sig,
-                                                             size_t *siglen,
-                                                             const unsigned
-                                                             char *tbs,
-                                                             size_t tbslen));
-
-void EVP_PKEY_meth_set_signctx(EVP_PKEY_METHOD *pmeth,
-                               int (*signctx_init) (EVP_PKEY_CTX *ctx,
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_set_init(EVP_PKEY_METHOD *pmeth,
+                                             int (*init) (EVP_PKEY_CTX *ctx)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_set_copy
+    (EVP_PKEY_METHOD *pmeth, int (*copy) (EVP_PKEY_CTX *dst,
+                                          const EVP_PKEY_CTX *src)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_set_cleanup
+    (EVP_PKEY_METHOD *pmeth, void (*cleanup) (EVP_PKEY_CTX *ctx)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_set_paramgen
+    (EVP_PKEY_METHOD *pmeth, int (*paramgen_init) (EVP_PKEY_CTX *ctx),
+     int (*paramgen) (EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_set_keygen
+    (EVP_PKEY_METHOD *pmeth, int (*keygen_init) (EVP_PKEY_CTX *ctx),
+     int (*keygen) (EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_set_sign
+    (EVP_PKEY_METHOD *pmeth, int (*sign_init) (EVP_PKEY_CTX *ctx),
+     int (*sign) (EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
+                  const unsigned char *tbs, size_t tbslen)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_set_verify
+    (EVP_PKEY_METHOD *pmeth, int (*verify_init) (EVP_PKEY_CTX *ctx),
+     int (*verify) (EVP_PKEY_CTX *ctx, const unsigned char *sig, size_t siglen,
+                    const unsigned char *tbs, size_t tbslen)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_set_verify_recover
+    (EVP_PKEY_METHOD *pmeth, int (*verify_recover_init) (EVP_PKEY_CTX *ctx),
+     int (*verify_recover) (EVP_PKEY_CTX *ctx, unsigned char *sig,
+                            size_t *siglen, const unsigned char *tbs,
+                            size_t tbslen)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_set_signctx
+    (EVP_PKEY_METHOD *pmeth, int (*signctx_init) (EVP_PKEY_CTX *ctx,
+                                                  EVP_MD_CTX *mctx),
+     int (*signctx) (EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
+                     EVP_MD_CTX *mctx)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_set_verifyctx
+    (EVP_PKEY_METHOD *pmeth, int (*verifyctx_init) (EVP_PKEY_CTX *ctx,
                                                     EVP_MD_CTX *mctx),
-                               int (*signctx) (EVP_PKEY_CTX *ctx,
-                                               unsigned char *sig,
-                                               size_t *siglen,
-                                               EVP_MD_CTX *mctx));
-
-void EVP_PKEY_meth_set_verifyctx(EVP_PKEY_METHOD *pmeth,
-                                 int (*verifyctx_init) (EVP_PKEY_CTX *ctx,
-                                                        EVP_MD_CTX *mctx),
-                                 int (*verifyctx) (EVP_PKEY_CTX *ctx,
-                                                   const unsigned char *sig,
-                                                   int siglen,
-                                                   EVP_MD_CTX *mctx));
-
-void EVP_PKEY_meth_set_encrypt(EVP_PKEY_METHOD *pmeth,
-                               int (*encrypt_init) (EVP_PKEY_CTX *ctx),
-                               int (*encryptfn) (EVP_PKEY_CTX *ctx,
-                                                 unsigned char *out,
-                                                 size_t *outlen,
-                                                 const unsigned char *in,
-                                                 size_t inlen));
-
-void EVP_PKEY_meth_set_decrypt(EVP_PKEY_METHOD *pmeth,
-                               int (*decrypt_init) (EVP_PKEY_CTX *ctx),
-                               int (*decrypt) (EVP_PKEY_CTX *ctx,
-                                               unsigned char *out,
-                                               size_t *outlen,
-                                               const unsigned char *in,
-                                               size_t inlen));
-
-void EVP_PKEY_meth_set_derive(EVP_PKEY_METHOD *pmeth,
-                              int (*derive_init) (EVP_PKEY_CTX *ctx),
-                              int (*derive) (EVP_PKEY_CTX *ctx,
-                                             unsigned char *key,
-                                             size_t *keylen));
-
-void EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth,
-                            int (*ctrl) (EVP_PKEY_CTX *ctx, int type, int p1,
-                                         void *p2),
-                            int (*ctrl_str) (EVP_PKEY_CTX *ctx,
-                                             const char *type,
-                                             const char *value));
-
-void EVP_PKEY_meth_set_digestsign(EVP_PKEY_METHOD *pmeth,
-                                  int (*digestsign) (EVP_MD_CTX *ctx,
-                                                     unsigned char *sig,
-                                                     size_t *siglen,
-                                                     const unsigned char *tbs,
-                                                     size_t tbslen));
-
-void EVP_PKEY_meth_set_digestverify(EVP_PKEY_METHOD *pmeth,
-                                    int (*digestverify) (EVP_MD_CTX *ctx,
-                                                         const unsigned char *sig,
-                                                         size_t siglen,
-                                                         const unsigned char *tbs,
-                                                         size_t tbslen));
-
-void EVP_PKEY_meth_set_check(EVP_PKEY_METHOD *pmeth,
-                             int (*check) (EVP_PKEY *pkey));
-
-void EVP_PKEY_meth_set_public_check(EVP_PKEY_METHOD *pmeth,
-                                    int (*check) (EVP_PKEY *pkey));
-
-void EVP_PKEY_meth_set_param_check(EVP_PKEY_METHOD *pmeth,
-                                   int (*check) (EVP_PKEY *pkey));
-
-void EVP_PKEY_meth_set_digest_custom(EVP_PKEY_METHOD *pmeth,
-                                     int (*digest_custom) (EVP_PKEY_CTX *ctx,
-                                                           EVP_MD_CTX *mctx));
-
-void EVP_PKEY_meth_get_init(const EVP_PKEY_METHOD *pmeth,
-                            int (**pinit) (EVP_PKEY_CTX *ctx));
-
-void EVP_PKEY_meth_get_copy(const EVP_PKEY_METHOD *pmeth,
-                            int (**pcopy) (EVP_PKEY_CTX *dst,
-                                           const EVP_PKEY_CTX *src));
-
-void EVP_PKEY_meth_get_cleanup(const EVP_PKEY_METHOD *pmeth,
-                               void (**pcleanup) (EVP_PKEY_CTX *ctx));
-
-void EVP_PKEY_meth_get_paramgen(const EVP_PKEY_METHOD *pmeth,
-                                int (**pparamgen_init) (EVP_PKEY_CTX *ctx),
-                                int (**pparamgen) (EVP_PKEY_CTX *ctx,
-                                                   EVP_PKEY *pkey));
-
-void EVP_PKEY_meth_get_keygen(const EVP_PKEY_METHOD *pmeth,
-                              int (**pkeygen_init) (EVP_PKEY_CTX *ctx),
-                              int (**pkeygen) (EVP_PKEY_CTX *ctx,
-                                               EVP_PKEY *pkey));
-
-void EVP_PKEY_meth_get_sign(const EVP_PKEY_METHOD *pmeth,
-                            int (**psign_init) (EVP_PKEY_CTX *ctx),
-                            int (**psign) (EVP_PKEY_CTX *ctx,
-                                           unsigned char *sig, size_t *siglen,
-                                           const unsigned char *tbs,
-                                           size_t tbslen));
-
-void EVP_PKEY_meth_get_verify(const EVP_PKEY_METHOD *pmeth,
-                              int (**pverify_init) (EVP_PKEY_CTX *ctx),
-                              int (**pverify) (EVP_PKEY_CTX *ctx,
-                                               const unsigned char *sig,
-                                               size_t siglen,
-                                               const unsigned char *tbs,
-                                               size_t tbslen));
-
-void EVP_PKEY_meth_get_verify_recover(const EVP_PKEY_METHOD *pmeth,
-                                      int (**pverify_recover_init) (EVP_PKEY_CTX
-                                                                    *ctx),
-                                      int (**pverify_recover) (EVP_PKEY_CTX
-                                                               *ctx,
-                                                               unsigned char
-                                                               *sig,
-                                                               size_t *siglen,
-                                                               const unsigned
-                                                               char *tbs,
-                                                               size_t tbslen));
-
-void EVP_PKEY_meth_get_signctx(const EVP_PKEY_METHOD *pmeth,
-                               int (**psignctx_init) (EVP_PKEY_CTX *ctx,
-                                                      EVP_MD_CTX *mctx),
-                               int (**psignctx) (EVP_PKEY_CTX *ctx,
-                                                 unsigned char *sig,
-                                                 size_t *siglen,
-                                                 EVP_MD_CTX *mctx));
-
-void EVP_PKEY_meth_get_verifyctx(const EVP_PKEY_METHOD *pmeth,
-                                 int (**pverifyctx_init) (EVP_PKEY_CTX *ctx,
-                                                          EVP_MD_CTX *mctx),
-                                 int (**pverifyctx) (EVP_PKEY_CTX *ctx,
-                                                     const unsigned char *sig,
-                                                     int siglen,
-                                                     EVP_MD_CTX *mctx));
-
-void EVP_PKEY_meth_get_encrypt(const EVP_PKEY_METHOD *pmeth,
-                               int (**pencrypt_init) (EVP_PKEY_CTX *ctx),
-                               int (**pencryptfn) (EVP_PKEY_CTX *ctx,
-                                                   unsigned char *out,
-                                                   size_t *outlen,
-                                                   const unsigned char *in,
-                                                   size_t inlen));
-
-void EVP_PKEY_meth_get_decrypt(const EVP_PKEY_METHOD *pmeth,
-                               int (**pdecrypt_init) (EVP_PKEY_CTX *ctx),
-                               int (**pdecrypt) (EVP_PKEY_CTX *ctx,
-                                                 unsigned char *out,
-                                                 size_t *outlen,
-                                                 const unsigned char *in,
-                                                 size_t inlen));
-
-void EVP_PKEY_meth_get_derive(const EVP_PKEY_METHOD *pmeth,
-                              int (**pderive_init) (EVP_PKEY_CTX *ctx),
-                              int (**pderive) (EVP_PKEY_CTX *ctx,
-                                               unsigned char *key,
-                                               size_t *keylen));
-
-void EVP_PKEY_meth_get_ctrl(const EVP_PKEY_METHOD *pmeth,
-                            int (**pctrl) (EVP_PKEY_CTX *ctx, int type, int p1,
-                                           void *p2),
-                            int (**pctrl_str) (EVP_PKEY_CTX *ctx,
-                                               const char *type,
-                                               const char *value));
-
-void EVP_PKEY_meth_get_digestsign(EVP_PKEY_METHOD *pmeth,
-                                  int (**digestsign) (EVP_MD_CTX *ctx,
-                                                      unsigned char *sig,
-                                                      size_t *siglen,
-                                                      const unsigned char *tbs,
-                                                      size_t tbslen));
-
-void EVP_PKEY_meth_get_digestverify(EVP_PKEY_METHOD *pmeth,
-                                    int (**digestverify) (EVP_MD_CTX *ctx,
-                                                          const unsigned char *sig,
-                                                          size_t siglen,
-                                                          const unsigned char *tbs,
-                                                          size_t tbslen));
-
-void EVP_PKEY_meth_get_check(const EVP_PKEY_METHOD *pmeth,
-                             int (**pcheck) (EVP_PKEY *pkey));
-
-void EVP_PKEY_meth_get_public_check(const EVP_PKEY_METHOD *pmeth,
-                                    int (**pcheck) (EVP_PKEY *pkey));
-
-void EVP_PKEY_meth_get_param_check(const EVP_PKEY_METHOD *pmeth,
-                                   int (**pcheck) (EVP_PKEY *pkey));
-
-void EVP_PKEY_meth_get_digest_custom(EVP_PKEY_METHOD *pmeth,
-                                     int (**pdigest_custom) (EVP_PKEY_CTX *ctx,
-                                                             EVP_MD_CTX *mctx));
+     int (*verifyctx) (EVP_PKEY_CTX *ctx, const unsigned char *sig, int siglen,
+                       EVP_MD_CTX *mctx)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_set_encrypt
+    (EVP_PKEY_METHOD *pmeth, int (*encrypt_init) (EVP_PKEY_CTX *ctx),
+     int (*encryptfn) (EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
+                       const unsigned char *in, size_t inlen)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_set_decrypt
+    (EVP_PKEY_METHOD *pmeth, int (*decrypt_init) (EVP_PKEY_CTX *ctx),
+     int (*decrypt) (EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
+                     const unsigned char *in, size_t inlen)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_set_derive
+    (EVP_PKEY_METHOD *pmeth, int (*derive_init) (EVP_PKEY_CTX *ctx),
+     int (*derive) (EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_set_ctrl
+    (EVP_PKEY_METHOD *pmeth, int (*ctrl) (EVP_PKEY_CTX *ctx, int type, int p1,
+                                          void *p2),
+     int (*ctrl_str) (EVP_PKEY_CTX *ctx, const char *type, const char *value)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_set_digestsign
+    (EVP_PKEY_METHOD *pmeth,
+     int (*digestsign) (EVP_MD_CTX *ctx, unsigned char *sig, size_t *siglen,
+                        const unsigned char *tbs, size_t tbslen)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_set_digestverify
+    (EVP_PKEY_METHOD *pmeth,
+     int (*digestverify) (EVP_MD_CTX *ctx, const unsigned char *sig,
+                          size_t siglen, const unsigned char *tbs,
+                          size_t tbslen)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_set_check
+    (EVP_PKEY_METHOD *pmeth, int (*check) (EVP_PKEY *pkey)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_set_public_check
+    (EVP_PKEY_METHOD *pmeth, int (*check) (EVP_PKEY *pkey)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_set_param_check
+    (EVP_PKEY_METHOD *pmeth, int (*check) (EVP_PKEY *pkey)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_set_digest_custom
+    (EVP_PKEY_METHOD *pmeth, int (*digest_custom) (EVP_PKEY_CTX *ctx,
+                                                   EVP_MD_CTX *mctx)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_get_init
+    (const EVP_PKEY_METHOD *pmeth, int (**pinit) (EVP_PKEY_CTX *ctx)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_get_copy
+    (const EVP_PKEY_METHOD *pmeth, int (**pcopy) (EVP_PKEY_CTX *dst,
+                                                  const EVP_PKEY_CTX *src)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_get_cleanup
+    (const EVP_PKEY_METHOD *pmeth, void (**pcleanup) (EVP_PKEY_CTX *ctx)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_get_paramgen
+    (const EVP_PKEY_METHOD *pmeth, int (**pparamgen_init) (EVP_PKEY_CTX *ctx),
+     int (**pparamgen) (EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_get_keygen
+    (const EVP_PKEY_METHOD *pmeth, int (**pkeygen_init) (EVP_PKEY_CTX *ctx),
+     int (**pkeygen) (EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_get_sign
+    (const EVP_PKEY_METHOD *pmeth, int (**psign_init) (EVP_PKEY_CTX *ctx),
+     int (**psign) (EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
+                    const unsigned char *tbs, size_t tbslen)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_get_verify
+    (const EVP_PKEY_METHOD *pmeth, int (**pverify_init) (EVP_PKEY_CTX *ctx),
+     int (**pverify) (EVP_PKEY_CTX *ctx, const unsigned char *sig,
+                      size_t siglen, const unsigned char *tbs, size_t tbslen)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_get_verify_recover
+    (const EVP_PKEY_METHOD *pmeth,
+     int (**pverify_recover_init) (EVP_PKEY_CTX *ctx),
+     int (**pverify_recover) (EVP_PKEY_CTX *ctx, unsigned char *sig,
+                              size_t *siglen, const unsigned char *tbs,
+                              size_t tbslen)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_get_signctx
+    (const EVP_PKEY_METHOD *pmeth,
+     int (**psignctx_init) (EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx),
+     int (**psignctx) (EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
+                       EVP_MD_CTX *mctx)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_get_verifyctx
+    (const EVP_PKEY_METHOD *pmeth,
+     int (**pverifyctx_init) (EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx),
+     int (**pverifyctx) (EVP_PKEY_CTX *ctx, const unsigned char *sig,
+                          int siglen, EVP_MD_CTX *mctx)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_get_encrypt
+    (const EVP_PKEY_METHOD *pmeth, int (**pencrypt_init) (EVP_PKEY_CTX *ctx),
+     int (**pencryptfn) (EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
+                         const unsigned char *in, size_t inlen)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_get_decrypt
+    (const EVP_PKEY_METHOD *pmeth, int (**pdecrypt_init) (EVP_PKEY_CTX *ctx),
+     int (**pdecrypt) (EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
+                       const unsigned char *in, size_t inlen)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_get_derive
+    (const EVP_PKEY_METHOD *pmeth, int (**pderive_init) (EVP_PKEY_CTX *ctx),
+     int (**pderive) (EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_get_ctrl
+    (const EVP_PKEY_METHOD *pmeth,
+     int (**pctrl) (EVP_PKEY_CTX *ctx, int type, int p1, void *p2),
+     int (**pctrl_str) (EVP_PKEY_CTX *ctx, const char *type,
+                        const char *value)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_get_digestsign
+    (EVP_PKEY_METHOD *pmeth,
+     int (**digestsign) (EVP_MD_CTX *ctx, unsigned char *sig, size_t *siglen,
+                         const unsigned char *tbs, size_t tbslen)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_get_digestverify
+    (EVP_PKEY_METHOD *pmeth,
+     int (**digestverify) (EVP_MD_CTX *ctx, const unsigned char *sig,
+                           size_t siglen, const unsigned char *tbs,
+                           size_t tbslen)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_get_check
+    (const EVP_PKEY_METHOD *pmeth, int (**pcheck) (EVP_PKEY *pkey)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_get_public_check
+    (const EVP_PKEY_METHOD *pmeth, int (**pcheck) (EVP_PKEY *pkey)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_get_param_check
+    (const EVP_PKEY_METHOD *pmeth, int (**pcheck) (EVP_PKEY *pkey)))
+
+DEPRECATEDIN_3_0(void EVP_PKEY_meth_get_digest_custom
+    (EVP_PKEY_METHOD *pmeth,
+     int (**pdigest_custom) (EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx)))
 
 void EVP_KEYEXCH_free(EVP_KEYEXCH *exchange);
 int EVP_KEYEXCH_up_ref(EVP_KEYEXCH *exchange);
diff --git a/test/build.info b/test/build.info
index ed547d1488..a49d9c6d6e 100644
--- a/test/build.info
+++ b/test/build.info
@@ -27,14 +27,14 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[libtestutil.a]=../include ../apps/include ..
   DEPEND[libtestutil.a]=../libcrypto
 
-  PROGRAMS{noinst}=\
+  PROGRAMS{noinst}= \
           confdump \
           versions \
           aborttest test_test \
           sanitytest rsa_complex exdatatest bntest \
           ectest ecstresstest gmdifftest pbelutest \
           destest mdc2test \
-          enginetest exptest \
+          exptest \
           evp_pkey_provided_test evp_test evp_extra_test evp_extra_test2 \
           evp_fetch_prov_test acvp_test evp_libctx_test \
           v3nametest v3ext \
@@ -59,6 +59,10 @@ IF[{- !$disabled{tests} -}]
           context_internal_test aesgcmtest params_test evp_pkey_dparams_test \
           keymgmt_internal_test hexstr_test
 
+  IF[{- !$disabled{'deprecated-3.0'} -}]
+    PROGRAMS{noinst}=enginetest
+  ENDIF
+
   SOURCE[confdump]=confdump.c
   INCLUDE[confdump]=../include ../apps/include
   DEPEND[confdump]=../libcrypto
diff --git a/test/enginetest.c b/test/enginetest.c
index f3f020cc30..67e4941cdf 100644
--- a/test/enginetest.c
+++ b/test/enginetest.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-/* We need to use some engine deprecated APIs */
+/* We need to use some deprecated APIs */
 #define OPENSSL_SUPPRESS_DEPRECATED
 
 #include <stdio.h>
diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index f31ba31e09..51b517fb95 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -7,6 +7,9 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* We need to use some deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -1140,6 +1143,7 @@ static int test_set_get_raw_keys(int tst)
            && test_set_get_raw_keys_int(tst, 1, 1);
 }
 
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 static int pkey_custom_check(EVP_PKEY *pkey)
 {
     return 0xbeef;
@@ -1156,6 +1160,7 @@ static int pkey_custom_param_check(EVP_PKEY *pkey)
 }
 
 static EVP_PKEY_METHOD *custom_pmeth;
+#endif
 
 static int test_EVP_PKEY_check(int i)
 {
@@ -1166,7 +1171,9 @@ static int test_EVP_PKEY_check(int i)
     EC_KEY *eckey = NULL;
 #endif
     EVP_PKEY_CTX *ctx = NULL;
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     EVP_PKEY_CTX *ctx2 = NULL;
+#endif
     const APK_DATA *ak = &keycheckdata[i];
     const unsigned char *input = ak->kder;
     size_t input_len = ak->size;
@@ -1218,6 +1225,7 @@ static int test_EVP_PKEY_check(int i)
     if (!TEST_int_eq(EVP_PKEY_param_check(ctx), expected_param_check))
         goto done;
 
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     ctx2 = EVP_PKEY_CTX_new_id(0xdefaced, NULL);
     /* assign the pkey directly, as an internal test */
     EVP_PKEY_up_ref(pkey);
@@ -1231,12 +1239,15 @@ static int test_EVP_PKEY_check(int i)
 
     if (!TEST_int_eq(EVP_PKEY_param_check(ctx2), 0xbeef))
         goto done;
+#endif
 
     ret = 1;
 
  done:
     EVP_PKEY_CTX_free(ctx);
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     EVP_PKEY_CTX_free(ctx2);
+#endif
     EVP_PKEY_free(pkey);
     BIO_free(pubkey);
     return ret;
@@ -1822,6 +1833,7 @@ int setup_tests(void)
     ADD_TEST(test_EVP_SM2_verify);
 #endif
     ADD_ALL_TESTS(test_set_get_raw_keys, OSSL_NELEM(keys));
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     custom_pmeth = EVP_PKEY_meth_new(0xdefaced, 0);
     if (!TEST_ptr(custom_pmeth))
         return 0;
@@ -1830,6 +1842,7 @@ int setup_tests(void)
     EVP_PKEY_meth_set_param_check(custom_pmeth, pkey_custom_param_check);
     if (!TEST_int_eq(EVP_PKEY_meth_add0(custom_pmeth), 1))
         return 0;
+#endif
     ADD_ALL_TESTS(test_EVP_PKEY_check, OSSL_NELEM(keycheckdata));
 #ifndef OPENSSL_NO_CMAC
     ADD_TEST(test_CMAC_keygen);
diff --git a/test/evp_fetch_prov_test.c b/test/evp_fetch_prov_test.c
index 367493b5e7..d7f43f229d 100644
--- a/test/evp_fetch_prov_test.c
+++ b/test/evp_fetch_prov_test.c
@@ -146,7 +146,7 @@ static int test_EVP_MD_fetch(void)
         if (!TEST_true(EVP_MD_up_ref(md)))
             goto err;
         /* Ref count should now be 2. Release first one here */
-        EVP_MD_meth_free(md);
+        EVP_MD_free(md);
     } else {
         if (!TEST_ptr_null(md))
             goto err;
@@ -154,7 +154,7 @@ static int test_EVP_MD_fetch(void)
     ret = 1;
 
 err:
-    EVP_MD_meth_free(md);
+    EVP_MD_free(md);
     OSSL_PROVIDER_unload(prov[0]);
     OSSL_PROVIDER_unload(prov[1]);
     /* Not normally needed, but we would like to test that
@@ -218,7 +218,7 @@ static int test_EVP_CIPHER_fetch(void)
             if (!TEST_true(EVP_CIPHER_up_ref(cipher)))
                 goto err;
             /* Ref count should now be 2. Release first one here */
-            EVP_CIPHER_meth_free(cipher);
+            EVP_CIPHER_free(cipher);
         }
     } else {
         if (!TEST_ptr_null(cipher))
@@ -226,7 +226,7 @@ static int test_EVP_CIPHER_fetch(void)
     }
     ret = 1;
 err:
-    EVP_CIPHER_meth_free(cipher);
+    EVP_CIPHER_free(cipher);
     OSSL_PROVIDER_unload(prov[0]);
     OSSL_PROVIDER_unload(prov[1]);
     OPENSSL_CTX_free(ctx);
diff --git a/test/evp_test.c b/test/evp_test.c
index a1e205b20b..83b92a4166 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -369,7 +369,7 @@ static void digest_test_cleanup(EVP_TEST *t)
 
     sk_EVP_TEST_BUFFER_pop_free(mdat->input, evp_test_buffer_free);
     OPENSSL_free(mdat->output);
-    EVP_MD_meth_free(mdat->fetched_digest);
+    EVP_MD_free(mdat->fetched_digest);
 }
 
 static int digest_test_parse(EVP_TEST *t,
@@ -568,7 +568,7 @@ static void cipher_test_cleanup(EVP_TEST *t)
     for (i = 0; i < AAD_NUM; i++)
         OPENSSL_free(cdat->aad[i]);
     OPENSSL_free(cdat->tag);
-    EVP_CIPHER_meth_free(cdat->fetched_cipher);
+    EVP_CIPHER_free(cdat->fetched_cipher);
 }
 
 static int cipher_test_parse(EVP_TEST *t, const char *keyword,
diff --git a/test/pkey_meth_test.c b/test/pkey_meth_test.c
index 6f81249417..ecff269fec 100644
--- a/test/pkey_meth_test.c
+++ b/test/pkey_meth_test.c
@@ -9,6 +9,9 @@
 
 /* Internal tests for EVP_PKEY method ordering */
 
+/* We need to use some deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
 #include <stdio.h>
 #include <string.h>
 
@@ -47,6 +50,7 @@ static int test_asn1_meths(void)
     return good;
 }
 
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /* Test of EVP_PKEY_METHOD ordering */
 static int test_pkey_meths(void)
 {
@@ -74,10 +78,13 @@ static int test_pkey_meths(void)
     }
     return good;
 }
+#endif
 
 int setup_tests(void)
 {
     ADD_TEST(test_asn1_meths);
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     ADD_TEST(test_pkey_meths);
+#endif
     return 1;
 }
diff --git a/test/recipes/30-test_engine.t b/test/recipes/30-test_engine.t
index 2edba22599..443c0484b2 100644
--- a/test/recipes/30-test_engine.t
+++ b/test/recipes/30-test_engine.t
@@ -11,8 +11,12 @@ use strict;
 use warnings;
 
 use OpenSSL::Test;
+use OpenSSL::Test::Utils;
 
 setup("test_engine");
 
+plan skip_all => "engines are deprecated"
+    if disabled('deprecated-3.0');
+
 plan tests => 1;
 ok(run(test(["enginetest"])), "running enginetest");
diff --git a/util/libcrypto.num b/util/libcrypto.num
index ff2bf030d3..5e9fa4ac6c 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -37,7 +37,7 @@ PKCS7_set_cipher                        37	3_0_0	EXIST::FUNCTION:
 BF_decrypt                              38	3_0_0	EXIST::FUNCTION:BF,DEPRECATEDIN_3_0
 PEM_read_bio_PUBKEY                     39	3_0_0	EXIST::FUNCTION:
 X509_NAME_delete_entry                  40	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_set_verify_recover        41	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_set_verify_recover        41	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 UI_set_method                           42	3_0_0	EXIST::FUNCTION:
 PKCS7_ISSUER_AND_SERIAL_it              43	3_0_0	EXIST::FUNCTION:
 EC_GROUP_method_of                      44	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,EC
@@ -61,9 +61,9 @@ X509_PUBKEY_free                        62	3_0_0	EXIST::FUNCTION:
 BIO_free_all                            63	3_0_0	EXIST::FUNCTION:
 EVP_idea_ofb                            64	3_0_0	EXIST::FUNCTION:IDEA
 DSO_bind_func                           65	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_get_copy                  66	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_get_copy                  66	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 RSA_up_ref                              67	3_0_0	EXIST::FUNCTION:RSA
-EVP_PKEY_meth_set_ctrl                  68	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_set_ctrl                  68	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 OCSP_basic_sign                         69	3_0_0	EXIST::FUNCTION:OCSP
 BN_GENCB_set                            70	3_0_0	EXIST::FUNCTION:
 BN_generate_prime                       71	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_0_9_8
@@ -82,7 +82,7 @@ BN_add_word                             83	3_0_0	EXIST::FUNCTION:
 EVP_des_ede                             84	3_0_0	EXIST::FUNCTION:DES
 EVP_PKEY_add1_attr_by_OBJ               85	3_0_0	EXIST::FUNCTION:
 ASYNC_WAIT_CTX_get_all_fds              86	3_0_0	EXIST::FUNCTION:
-EVP_CIPHER_meth_set_do_cipher           87	3_0_0	EXIST::FUNCTION:
+EVP_CIPHER_meth_set_do_cipher           87	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 EVP_set_pw_prompt                       88	3_0_0	EXIST::FUNCTION:
 d2i_OCSP_RESPBYTES                      89	3_0_0	EXIST::FUNCTION:OCSP
 TS_REQ_get_ext_by_NID                   90	3_0_0	EXIST::FUNCTION:TS
@@ -187,7 +187,7 @@ CMS_SignerInfo_get0_signer_id           190	3_0_0	EXIST::FUNCTION:CMS
 TS_TST_INFO_new                         191	3_0_0	EXIST::FUNCTION:TS
 X509_REQ_check_private_key              192	3_0_0	EXIST::FUNCTION:
 EVP_DigestInit                          193	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_find                      194	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_find                      194	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 X509_VERIFY_PARAM_get_count             195	3_0_0	EXIST::FUNCTION:
 ASN1_BIT_STRING_get_bit                 196	3_0_0	EXIST::FUNCTION:
 EVP_PKEY_cmp                            197	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
@@ -219,14 +219,14 @@ PEM_read_bio_PKCS8                      222	3_0_0	EXIST::FUNCTION:
 X509_ATTRIBUTE_new                      223	3_0_0	EXIST::FUNCTION:
 ASN1_STRING_TABLE_cleanup               224	3_0_0	EXIST::FUNCTION:
 ASN1_put_eoc                            225	3_0_0	EXIST::FUNCTION:
-EVP_MD_meth_set_input_blocksize         226	3_0_0	EXIST::FUNCTION:
+EVP_MD_meth_set_input_blocksize         226	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 PKCS12_SAFEBAG_get0_attrs               227	3_0_0	EXIST::FUNCTION:
 PKCS8_get_attr                          228	3_0_0	EXIST::FUNCTION:
 DSAparams_print_fp                      229	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,DSA,STDIO
 EC_POINT_set_Jprojective_coordinates_GFp 230	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,EC
 DIST_POINT_NAME_new                     231	3_0_0	EXIST::FUNCTION:
 X509_LOOKUP_file                        232	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_set_decrypt               233	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_set_decrypt               233	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 EVP_rc2_ecb                             234	3_0_0	EXIST::FUNCTION:RC2
 i2b_PublicKey_bio                       235	3_0_0	EXIST::FUNCTION:DSA
 d2i_ASN1_SET_ANY                        236	3_0_0	EXIST::FUNCTION:
@@ -242,7 +242,7 @@ BN_clear_free                           246	3_0_0	EXIST::FUNCTION:
 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:
+EVP_PKEY_meth_get_decrypt               250	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 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
@@ -346,7 +346,7 @@ PKCS7_stream                            352	3_0_0	EXIST::FUNCTION:
 i2t_ASN1_OBJECT                         353	3_0_0	EXIST::FUNCTION:
 EC_GROUP_get0_generator                 354	3_0_0	EXIST::FUNCTION:EC
 RSA_padding_add_PKCS1_PSS_mgf1          355	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,RSA
-EVP_MD_meth_set_init                    356	3_0_0	EXIST::FUNCTION:
+EVP_MD_meth_set_init                    356	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 X509_get_issuer_name                    357	3_0_0	EXIST::FUNCTION:
 EVP_SignFinal                           358	3_0_0	EXIST::FUNCTION:
 PKCS12_mac_present                      359	3_0_0	EXIST::FUNCTION:
@@ -388,7 +388,7 @@ EVP_des_ede3_cfb8                       395	3_0_0	EXIST::FUNCTION:DES
 BIO_dump_indent_fp                      396	3_0_0	EXIST::FUNCTION:STDIO
 X509_NAME_ENTRY_get_data                397	3_0_0	EXIST::FUNCTION:
 BIO_socket                              398	3_0_0	EXIST::FUNCTION:SOCK
-EVP_PKEY_meth_get_derive                399	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_get_derive                399	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 ASN1_STRING_clear_free                  400	3_0_0	EXIST::FUNCTION:
 d2i_OCSP_REVOKEDINFO                    401	3_0_0	EXIST::FUNCTION:OCSP
 ASN1_STRING_print_ex_fp                 402	3_0_0	EXIST::FUNCTION:STDIO
@@ -541,7 +541,7 @@ ECParameters_print                      552	3_0_0	EXIST::FUNCTION:EC
 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:
+EVP_MD_meth_set_final                   556	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 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
@@ -557,7 +557,7 @@ RSA_get_default_method                  568	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3
 CRYPTO_cts128_encrypt_block             569	3_0_0	EXIST::FUNCTION:
 ASN1_digest                             570	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 ERR_load_X509V3_strings                 571	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_get_cleanup               572	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_get_cleanup               572	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 d2i_X509                                574	3_0_0	EXIST::FUNCTION:
 a2i_ASN1_STRING                         575	3_0_0	EXIST::FUNCTION:
 EC_GROUP_get_mont_data                  576	3_0_0	EXIST::FUNCTION:EC
@@ -573,12 +573,12 @@ ENGINE_get_RAND                         586	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3
 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:
-EVP_CIPHER_meth_set_flags               590	3_0_0	EXIST::FUNCTION:
+EVP_CIPHER_meth_set_flags               590	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 TS_CONF_set_clock_precision_digits      591	3_0_0	EXIST::FUNCTION:TS
 ASN1_TYPE_set                           592	3_0_0	EXIST::FUNCTION:
 i2d_PKCS8_PRIV_KEY_INFO                 593	3_0_0	EXIST::FUNCTION:
 i2d_PKCS7_bio                           594	3_0_0	EXIST::FUNCTION:
-EVP_MD_meth_get_copy                    595	3_0_0	EXIST::FUNCTION:
+EVP_MD_meth_get_copy                    595	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 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:DEPRECATEDIN_3_0,ENGINE
@@ -648,7 +648,7 @@ 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:DEPRECATEDIN_3_0,ENGINE
-EVP_MD_meth_get_ctrl                    668	3_0_0	EXIST::FUNCTION:
+EVP_MD_meth_get_ctrl                    668	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 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:DEPRECATEDIN_3_0,ENGINE
@@ -685,7 +685,7 @@ ASN1_item_d2i                           702	3_0_0	EXIST::FUNCTION:
 BIO_int_ctrl                            703	3_0_0	EXIST::FUNCTION:
 CMS_ReceiptRequest_it                   704	3_0_0	EXIST::FUNCTION:CMS
 X509_ATTRIBUTE_get0_type                705	3_0_0	EXIST::FUNCTION:
-EVP_MD_meth_set_copy                    706	3_0_0	EXIST::FUNCTION:
+EVP_MD_meth_set_copy                    706	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 d2i_ASN1_ENUMERATED                     707	3_0_0	EXIST::FUNCTION:
 d2i_ASIdOrRange                         708	3_0_0	EXIST::FUNCTION:RFC3779
 i2s_ASN1_OCTET_STRING                   709	3_0_0	EXIST::FUNCTION:
@@ -733,12 +733,12 @@ CRYPTO_THREAD_get_local                 751	3_0_0	EXIST::FUNCTION:
 PKCS7_to_TS_TST_INFO                    752	3_0_0	EXIST::FUNCTION:TS
 X509_STORE_CTX_new                      753	3_0_0	EXIST::FUNCTION:
 CTLOG_STORE_new                         754	3_0_0	EXIST::FUNCTION:CT
-EVP_CIPHER_meth_set_cleanup             755	3_0_0	EXIST::FUNCTION:
+EVP_CIPHER_meth_set_cleanup             755	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 d2i_PKCS12_SAFEBAG                      756	3_0_0	EXIST::FUNCTION:
 EVP_MD_pkey_type                        757	3_0_0	EXIST::FUNCTION:
 X509_policy_node_get0_qualifiers        758	3_0_0	EXIST::FUNCTION:
 OCSP_cert_status_str                    759	3_0_0	EXIST::FUNCTION:OCSP
-EVP_MD_meth_get_flags                   760	3_0_0	EXIST::FUNCTION:
+EVP_MD_meth_get_flags                   760	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 ASN1_ENUMERATED_set                     761	3_0_0	EXIST::FUNCTION:
 UI_UTIL_read_pw                         762	3_0_0	EXIST::FUNCTION:
 PKCS7_ENC_CONTENT_free                  763	3_0_0	EXIST::FUNCTION:
@@ -758,7 +758,7 @@ PKCS7_dataVerify                        776	3_0_0	EXIST::FUNCTION:
 PKCS7_SIGNER_INFO_free                  777	3_0_0	EXIST::FUNCTION:
 PKCS7_add_attrib_smimecap               778	3_0_0	EXIST::FUNCTION:
 ERR_peek_last_error_line_data           779	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
-EVP_PKEY_meth_set_sign                  780	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_set_sign                  780	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 ASN1_i2d_bio                            781	3_0_0	EXIST::FUNCTION:
 DSA_verify                              782	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,DSA
 i2a_ASN1_OBJECT                         783	3_0_0	EXIST::FUNCTION:
@@ -773,7 +773,7 @@ CRYPTO_ocb128_encrypt                   791	3_0_0	EXIST::FUNCTION:OCB
 EXTENDED_KEY_USAGE_new                  792	3_0_0	EXIST::FUNCTION:
 EVP_EncryptFinal                        793	3_0_0	EXIST::FUNCTION:
 PEM_write_ECPrivateKey                  794	3_0_0	EXIST::FUNCTION:EC,STDIO
-EVP_CIPHER_meth_set_get_asn1_params     796	3_0_0	EXIST::FUNCTION:
+EVP_CIPHER_meth_set_get_asn1_params     796	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 PKCS7_dataInit                          797	3_0_0	EXIST::FUNCTION:
 EVP_PKEY_CTX_set_app_data               798	3_0_0	EXIST::FUNCTION:
 a2i_GENERAL_NAME                        799	3_0_0	EXIST::FUNCTION:
@@ -852,11 +852,11 @@ TS_STATUS_INFO_set_status               872	3_0_0	EXIST::FUNCTION:TS
 RSA_verify                              873	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,RSA
 ASN1_FBOOLEAN_it                        874	3_0_0	EXIST::FUNCTION:
 d2i_ASN1_TIME                           875	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_get_signctx               876	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_get_signctx               876	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 EC_KEY_METHOD_set_compute_key           877	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,EC
 X509_REQ_INFO_free                      878	3_0_0	EXIST::FUNCTION:
 CMS_ReceiptRequest_create0              879	3_0_0	EXIST::FUNCTION:CMS
-EVP_MD_meth_set_cleanup                 880	3_0_0	EXIST::FUNCTION:
+EVP_MD_meth_set_cleanup                 880	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 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:DEPRECATEDIN_3_0,ENGINE
@@ -934,7 +934,7 @@ i2d_PKCS8_bio                           957	3_0_0	EXIST::FUNCTION:
 v2i_ASN1_BIT_STRING                     958	3_0_0	EXIST::FUNCTION:
 PKEY_USAGE_PERIOD_new                   959	3_0_0	EXIST::FUNCTION:
 OBJ_NAME_init                           960	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_set_keygen                961	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_set_keygen                961	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 RSA_PSS_PARAMS_new                      962	3_0_0	EXIST::FUNCTION:RSA
 RSA_sign                                963	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,RSA
 EVP_DigestVerifyFinal                   964	3_0_0	EXIST::FUNCTION:
@@ -984,7 +984,7 @@ BN_X931_generate_Xpq                    1008	3_0_0	EXIST::FUNCTION:
 ASN1_item_digest                        1009	3_0_0	EXIST::FUNCTION:
 X509_VERIFY_PARAM_set_trust             1010	3_0_0	EXIST::FUNCTION:
 X509_STORE_CTX_get_error                1011	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_set_encrypt               1012	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_set_encrypt               1012	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 ASN1_UTCTIME_it                         1013	3_0_0	EXIST::FUNCTION:
 i2d_DSA_PUBKEY_fp                       1014	3_0_0	EXIST::FUNCTION:DSA,STDIO
 X509at_get_attr_by_OBJ                  1015	3_0_0	EXIST::FUNCTION:
@@ -1033,7 +1033,7 @@ RC2_ofb64_encrypt                       1059	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_
 PKCS12_pbe_crypt                        1060	3_0_0	EXIST::FUNCTION:
 ASIdentifiers_free                      1061	3_0_0	EXIST::FUNCTION:RFC3779
 X509_VERIFY_PARAM_get0                  1062	3_0_0	EXIST::FUNCTION:
-EVP_MD_meth_get_input_blocksize         1063	3_0_0	EXIST::FUNCTION:
+EVP_MD_meth_get_input_blocksize         1063	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 TS_ACCURACY_get_micros                  1064	3_0_0	EXIST::FUNCTION:TS
 PKCS12_SAFEBAG_create_cert              1065	3_0_0	EXIST::FUNCTION:
 CRYPTO_mem_debug_malloc                 1066	3_0_0	EXIST::FUNCTION:CRYPTO_MDEBUG,DEPRECATEDIN_3_0
@@ -1099,7 +1099,7 @@ ASN1_item_new                           1125	3_0_0	EXIST::FUNCTION:
 CRYPTO_cts128_encrypt                   1126	3_0_0	EXIST::FUNCTION:
 RC2_encrypt                             1127	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,RC2
 PEM_write                               1128	3_0_0	EXIST::FUNCTION:STDIO
-EVP_CIPHER_meth_get_get_asn1_params     1129	3_0_0	EXIST::FUNCTION:
+EVP_CIPHER_meth_get_get_asn1_params     1129	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 i2d_OCSP_RESPBYTES                      1130	3_0_0	EXIST::FUNCTION:OCSP
 d2i_ASN1_UTF8STRING                     1131	3_0_0	EXIST::FUNCTION:
 EXTENDED_KEY_USAGE_it                   1132	3_0_0	EXIST::FUNCTION:
@@ -1208,7 +1208,7 @@ PKCS12_add_cert                         1234	3_0_0	EXIST::FUNCTION:
 X509_NAME_hash_old                      1235	3_0_0	EXIST::FUNCTION:
 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:
+EVP_CIPHER_meth_set_ctrl                1238	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 RSA_public_decrypt                      1239	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,RSA
 ENGINE_get_id                           1240	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
 PKCS12_item_decrypt_d2i                 1241	3_0_0	EXIST::FUNCTION:
@@ -1288,7 +1288,7 @@ ENGINE_set_cmd_defns                    1316	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_
 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
-EVP_PKEY_meth_get_init                  1320	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_get_init                  1320	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 X509_check_trust                        1321	3_0_0	EXIST::FUNCTION:
 b2i_PrivateKey                          1322	3_0_0	EXIST::FUNCTION:DSA
 HMAC_Init_ex                            1323	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
@@ -1327,7 +1327,7 @@ i2v_GENERAL_NAME                        1355	3_0_0	EXIST::FUNCTION:
 PKCS7_ENC_CONTENT_new                   1356	3_0_0	EXIST::FUNCTION:
 CRYPTO_realloc                          1357	3_0_0	EXIST::FUNCTION:
 BIO_ctrl_pending                        1358	3_0_0	EXIST::FUNCTION:
-EVP_MD_meth_new                         1360	3_0_0	EXIST::FUNCTION:
+EVP_MD_meth_new                         1360	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 X509_sign_ctx                           1361	3_0_0	EXIST::FUNCTION:
 BN_is_odd                               1362	3_0_0	EXIST::FUNCTION:
 X509_STORE_CTX_get_current_cert         1363	3_0_0	EXIST::FUNCTION:
@@ -1353,7 +1353,7 @@ i2d_PKCS12_BAGS                         1383	3_0_0	EXIST::FUNCTION:
 CERTIFICATEPOLICIES_free                1385	3_0_0	EXIST::FUNCTION:
 X509V3_get_section                      1386	3_0_0	EXIST::FUNCTION:
 BIO_parse_hostserv                      1387	3_0_0	EXIST::FUNCTION:SOCK
-EVP_PKEY_meth_set_cleanup               1388	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_set_cleanup               1388	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 PROXY_CERT_INFO_EXTENSION_free          1389	3_0_0	EXIST::FUNCTION:
 X509_dup                                1390	3_0_0	EXIST::FUNCTION:
 EDIPARTYNAME_free                       1391	3_0_0	EXIST::FUNCTION:
@@ -1372,7 +1372,7 @@ PEM_X509_INFO_write_bio                 1404	3_0_0	EXIST::FUNCTION:
 BIO_dump_cb                             1405	3_0_0	EXIST::FUNCTION:
 v2i_GENERAL_NAMES                       1406	3_0_0	EXIST::FUNCTION:
 EVP_des_ede3_ofb                        1407	3_0_0	EXIST::FUNCTION:DES
-EVP_MD_meth_get_cleanup                 1408	3_0_0	EXIST::FUNCTION:
+EVP_MD_meth_get_cleanup                 1408	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 SRP_Calc_server_key                     1409	3_0_0	EXIST::FUNCTION:SRP
 BN_mod_exp_simple                       1410	3_0_0	EXIST::FUNCTION:
 BIO_set_ex_data                         1411	3_0_0	EXIST::FUNCTION:
@@ -1459,7 +1459,7 @@ CTLOG_STORE_free                        1492	3_0_0	EXIST::FUNCTION:CT
 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:
+EVP_MD_meth_set_ctrl                    1496	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 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:DEPRECATEDIN_3_0,ENGINE
@@ -1488,7 +1488,7 @@ ASYNC_pause_job                         1521	3_0_0	EXIST::FUNCTION:
 OCSP_BASICRESP_new                      1522	3_0_0	EXIST::FUNCTION:OCSP
 EVP_camellia_256_ofb                    1523	3_0_0	EXIST::FUNCTION:CAMELLIA
 PKCS12_item_i2d_encrypt                 1524	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_set_copy                  1525	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_set_copy                  1525	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 EC_POINT_clear_free                     1526	3_0_0	EXIST::FUNCTION:EC
 i2s_ASN1_ENUMERATED_TABLE               1527	3_0_0	EXIST::FUNCTION:
 PKCS7_verify                            1528	3_0_0	EXIST::FUNCTION:
@@ -1523,7 +1523,7 @@ EVP_CIPHER_CTX_block_size               1556	3_0_0	EXIST::FUNCTION:
 DIRECTORYSTRING_free                    1557	3_0_0	EXIST::FUNCTION:
 TS_CONF_set_default_engine              1558	3_0_0	EXIST::FUNCTION:ENGINE,TS
 BN_set_bit                              1559	3_0_0	EXIST::FUNCTION:
-EVP_MD_meth_set_app_datasize            1560	3_0_0	EXIST::FUNCTION:
+EVP_MD_meth_set_app_datasize            1560	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 DSO_free                                1561	3_0_0	EXIST::FUNCTION:
 TS_TST_INFO_get_tsa                     1562	3_0_0	EXIST::FUNCTION:TS
 EC_GROUP_check                          1563	3_0_0	EXIST::FUNCTION:EC
@@ -1572,7 +1572,7 @@ 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:DEPRECATEDIN_3_0,ENGINE
-EVP_MD_meth_get_result_size             1612	3_0_0	EXIST::FUNCTION:
+EVP_MD_meth_get_result_size             1612	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 BIO_ADDRINFO_address                    1613	3_0_0	EXIST::FUNCTION:SOCK
 ASN1_STRING_print_ex                    1614	3_0_0	EXIST::FUNCTION:
 i2d_CMS_ReceiptRequest                  1615	3_0_0	EXIST::FUNCTION:CMS
@@ -1701,7 +1701,7 @@ i2d_PrivateKey                          1739	3_0_0	EXIST::FUNCTION:
 i2d_OCSP_ONEREQ                         1740	3_0_0	EXIST::FUNCTION:OCSP
 OPENSSL_issetugid                       1741	3_0_0	EXIST::FUNCTION:
 d2i_ASN1_OBJECT                         1742	3_0_0	EXIST::FUNCTION:
-EVP_MD_meth_set_flags                   1743	3_0_0	EXIST::FUNCTION:
+EVP_MD_meth_set_flags                   1743	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 EVP_idea_cbc                            1744	3_0_0	EXIST::FUNCTION:IDEA
 EC_POINT_cmp                            1745	3_0_0	EXIST::FUNCTION:EC
 ASN1_buf_print                          1746	3_0_0	EXIST::FUNCTION:
@@ -1741,7 +1741,7 @@ TS_TST_INFO_get_ext_by_NID              1781	3_0_0	EXIST::FUNCTION:TS
 EVP_aes_256_cfb1                        1782	3_0_0	EXIST::FUNCTION:
 X509_issuer_name_cmp                    1783	3_0_0	EXIST::FUNCTION:
 CMS_RecipientEncryptedKey_get0_id       1784	3_0_0	EXIST::FUNCTION:CMS
-EVP_PKEY_meth_get_verify_recover        1785	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_get_verify_recover        1785	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 NAME_CONSTRAINTS_check                  1786	3_0_0	EXIST::FUNCTION:
 X509_CERT_AUX_it                        1787	3_0_0	EXIST::FUNCTION:
 X509_get_X509_PUBKEY                    1789	3_0_0	EXIST::FUNCTION:
@@ -1789,7 +1789,7 @@ TS_TST_INFO_get_time                    1830	3_0_0	EXIST::FUNCTION:TS
 ASN1_VISIBLESTRING_it                   1831	3_0_0	EXIST::FUNCTION:
 X509V3_EXT_REQ_add_conf                 1832	3_0_0	EXIST::FUNCTION:
 ASN1_STRING_to_UTF8                     1833	3_0_0	EXIST::FUNCTION:
-EVP_MD_meth_set_update                  1835	3_0_0	EXIST::FUNCTION:
+EVP_MD_meth_set_update                  1835	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 EVP_camellia_192_cbc                    1836	3_0_0	EXIST::FUNCTION:CAMELLIA
 OPENSSL_LH_stats_bio                    1837	3_0_0	EXIST::FUNCTION:
 PKCS7_set_signed_attributes             1838	3_0_0	EXIST::FUNCTION:
@@ -1868,7 +1868,7 @@ EC_GROUP_get_degree                     1912	3_0_0	EXIST::FUNCTION:EC
 X509_ALGOR_set0                         1913	3_0_0	EXIST::FUNCTION:
 OPENSSL_LH_set_down_load                1914	3_0_0	EXIST::FUNCTION:
 X509v3_asid_inherits                    1915	3_0_0	EXIST::FUNCTION:RFC3779
-EVP_MD_meth_get_app_datasize            1916	3_0_0	EXIST::FUNCTION:
+EVP_MD_meth_get_app_datasize            1916	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 X509_STORE_CTX_get_num_untrusted        1917	3_0_0	EXIST::FUNCTION:
 RAND_poll                               1918	3_0_0	EXIST::FUNCTION:
 EVP_PKEY_print_public                   1919	3_0_0	EXIST::FUNCTION:
@@ -1912,7 +1912,7 @@ X509_get_pubkey                         1957	3_0_0	EXIST::FUNCTION:
 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:
+EVP_PKEY_meth_get_keygen                1961	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 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:
@@ -1940,7 +1940,7 @@ X509_CRL_verify                         1985	3_0_0	EXIST::FUNCTION:
 X509_get0_uids                          1986	3_0_0	EXIST::FUNCTION:
 EVP_PKEY_get0_DSA                       1987	3_0_0	EXIST::FUNCTION:DSA
 d2i_CMS_ContentInfo                     1988	3_0_0	EXIST::FUNCTION:CMS
-EVP_CIPHER_meth_get_do_cipher           1989	3_0_0	EXIST::FUNCTION:
+EVP_CIPHER_meth_get_do_cipher           1989	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 i2d_DSA_PUBKEY                          1990	3_0_0	EXIST::FUNCTION:DSA
 GENERAL_NAME_it                         1991	3_0_0	EXIST::FUNCTION:
 EVP_des_ede_ecb                         1992	3_0_0	EXIST::FUNCTION:DES
@@ -2015,7 +2015,7 @@ UI_method_set_prompt_constructor        2061	3_0_0	EXIST::FUNCTION:
 OBJ_length                              2062	3_0_0	EXIST::FUNCTION:
 BN_GENCB_get_arg                        2063	3_0_0	EXIST::FUNCTION:
 EVP_MD_CTX_clear_flags                  2064	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_get_verifyctx             2065	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_get_verifyctx             2065	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 CT_POLICY_EVAL_CTX_get0_cert            2066	3_0_0	EXIST::FUNCTION:CT
 PEM_write_DHparams                      2067	3_0_0	EXIST::FUNCTION:DH,STDIO
 DH_set_ex_data                          2068	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,DH
@@ -2388,14 +2388,14 @@ EVP_enc_null                            2438	3_0_0	EXIST::FUNCTION:
 OCSP_ONEREQ_get_ext_by_critical         2439	3_0_0	EXIST::FUNCTION:OCSP
 OCSP_request_onereq_count               2440	3_0_0	EXIST::FUNCTION:OCSP
 BN_hex2bn                               2441	3_0_0	EXIST::FUNCTION:
-EVP_CIPHER_meth_set_impl_ctx_size       2442	3_0_0	EXIST::FUNCTION:
+EVP_CIPHER_meth_set_impl_ctx_size       2442	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 ASIdentifiers_new                       2443	3_0_0	EXIST::FUNCTION:RFC3779
 CONF_imodule_get_flags                  2444	3_0_0	EXIST::FUNCTION:
 PKCS12_SAFEBAG_it                       2445	3_0_0	EXIST::FUNCTION:
-EVP_CIPHER_meth_set_set_asn1_params     2446	3_0_0	EXIST::FUNCTION:
+EVP_CIPHER_meth_set_set_asn1_params     2446	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 EC_KEY_get_enc_flags                    2447	3_0_0	EXIST::FUNCTION:EC
 X509_OBJECT_idx_by_subject              2448	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_copy                      2449	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_copy                      2449	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 NETSCAPE_CERT_SEQUENCE_new              2450	3_0_0	EXIST::FUNCTION:
 CRYPTO_ocb128_decrypt                   2451	3_0_0	EXIST::FUNCTION:OCB
 ASYNC_WAIT_CTX_free                     2452	3_0_0	EXIST::FUNCTION:
@@ -2431,11 +2431,11 @@ ENGINE_get_prev                         2481	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_
 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:
+EVP_PKEY_meth_set_paramgen              2485	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 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:
+EVP_PKEY_meth_set_verifyctx             2489	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 X509_TRUST_add                          2490	3_0_0	EXIST::FUNCTION:
 BUF_MEM_free                            2491	3_0_0	EXIST::FUNCTION:
 TS_TST_INFO_get_accuracy                2492	3_0_0	EXIST::FUNCTION:TS
@@ -2511,16 +2511,16 @@ PEM_read_bio_X509                       2564	3_0_0	EXIST::FUNCTION:
 DES_key_sched                           2565	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,DES
 GENERAL_NAME_dup                        2566	3_0_0	EXIST::FUNCTION:
 X509_STORE_CTX_get1_crls                2567	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_set_verify                2568	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_set_verify                2568	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 EVP_sha256                              2569	3_0_0	EXIST::FUNCTION:
 CMS_unsigned_delete_attr                2570	3_0_0	EXIST::FUNCTION:CMS
 EVP_md5_sha1                            2571	3_0_0	EXIST::FUNCTION:MD5
 EVP_PKEY_sign_init                      2572	3_0_0	EXIST::FUNCTION:
 OPENSSL_LH_insert                       2573	3_0_0	EXIST::FUNCTION:
-EVP_CIPHER_meth_get_cleanup             2574	3_0_0	EXIST::FUNCTION:
+EVP_CIPHER_meth_get_cleanup             2574	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 ASN1_item_ex_d2i                        2575	3_0_0	EXIST::FUNCTION:
-EVP_MD_meth_free                        2576	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_new                       2577	3_0_0	EXIST::FUNCTION:
+EVP_MD_meth_free                        2576	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
+EVP_PKEY_meth_new                       2577	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 RSA_padding_check_PKCS1_OAEP            2578	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,RSA
 OCSP_SERVICELOC_it                      2579	3_0_0	EXIST::FUNCTION:OCSP
 PKCS12_SAFEBAG_get_nid                  2580	3_0_0	EXIST::FUNCTION:
@@ -2584,7 +2584,7 @@ CRYPTO_set_mem_functions                2638	3_0_0	EXIST::FUNCTION:
 i2d_ASN1_VISIBLESTRING                  2639	3_0_0	EXIST::FUNCTION:
 d2i_PBKDF2PARAM                         2640	3_0_0	EXIST::FUNCTION:
 ERR_load_COMP_strings                   2641	3_0_0	EXIST::FUNCTION:COMP
-EVP_PKEY_meth_add0                      2642	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_add0                      2642	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 EVP_rc4_40                              2643	3_0_0	EXIST::FUNCTION:RC4
 RSA_bits                                2645	3_0_0	EXIST::FUNCTION:RSA
 ASN1_item_dup                           2646	3_0_0	EXIST::FUNCTION:
@@ -2634,7 +2634,7 @@ OCSP_check_validity                     2690	3_0_0	EXIST::FUNCTION:OCSP
 PEM_write_ECPKParameters                2691	3_0_0	EXIST::FUNCTION:EC,STDIO
 X509_VERIFY_PARAM_lookup                2692	3_0_0	EXIST::FUNCTION:
 X509_LOOKUP_by_fingerprint              2693	3_0_0	EXIST::FUNCTION:
-EVP_CIPHER_meth_free                    2694	3_0_0	EXIST::FUNCTION:
+EVP_CIPHER_meth_free                    2694	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 PKCS7_RECIP_INFO_new                    2695	3_0_0	EXIST::FUNCTION:
 d2i_ECPrivateKey_fp                     2696	3_0_0	EXIST::FUNCTION:EC,STDIO
 TS_CONF_set_ordering                    2697	3_0_0	EXIST::FUNCTION:TS
@@ -2867,7 +2867,7 @@ EVP_PKEY_asn1_set_param                 2928	3_0_0	EXIST::FUNCTION:
 BN_RECP_CTX_free                        2929	3_0_0	EXIST::FUNCTION:
 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:
+EVP_MD_meth_get_final                   2932	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 ASN1_TYPE_get_octetstring               2933	3_0_0	EXIST::FUNCTION:
 ENGINE_by_id                            2934	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
 d2i_PKCS7_SIGNER_INFO                   2935	3_0_0	EXIST::FUNCTION:
@@ -2940,9 +2940,9 @@ BIO_f_nbio_test                         3002	3_0_0	EXIST::FUNCTION:
 SEED_ofb128_encrypt                     3003	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,SEED
 d2i_RSAPrivateKey_bio                   3004	3_0_0	EXIST::FUNCTION:RSA
 DH_KDF_X9_42                            3005	3_0_0	EXIST::FUNCTION:CMS,DEPRECATEDIN_3_0,DH
-EVP_PKEY_meth_set_signctx               3006	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_set_signctx               3006	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 X509_CRL_get_version                    3007	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_get0_info                 3008	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_get0_info                 3008	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 PEM_read_bio_RSAPublicKey               3009	3_0_0	EXIST::FUNCTION:RSA
 EVP_PKEY_asn1_set_private               3010	3_0_0	EXIST::FUNCTION:
 EVP_PKEY_get0_RSA                       3011	3_0_0	EXIST::FUNCTION:RSA
@@ -3005,7 +3005,7 @@ ERR_load_BN_strings                     3069	3_0_0	EXIST::FUNCTION:
 BF_encrypt                              3070	3_0_0	EXIST::FUNCTION:BF,DEPRECATEDIN_3_0
 MD5                                     3071	3_0_0	EXIST::FUNCTION:MD5
 BN_GF2m_arr2poly                        3072	3_0_0	EXIST::FUNCTION:EC2M
-EVP_PKEY_meth_get_ctrl                  3073	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_get_ctrl                  3073	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 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
@@ -3063,7 +3063,7 @@ CRYPTO_THREAD_lock_free                 3127	3_0_0	EXIST::FUNCTION:
 TS_ACCURACY_get_seconds                 3128	3_0_0	EXIST::FUNCTION:TS
 BN_options                              3129	3_0_0	EXIST::FUNCTION:
 BIO_debug_callback                      3130	3_0_0	EXIST::FUNCTION:
-EVP_MD_meth_get_update                  3131	3_0_0	EXIST::FUNCTION:
+EVP_MD_meth_get_update                  3131	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 GENERAL_NAME_set0_othername             3132	3_0_0	EXIST::FUNCTION:
 ASN1_BIT_STRING_set_bit                 3133	3_0_0	EXIST::FUNCTION:
 EVP_aes_256_ccm                         3134	3_0_0	EXIST::FUNCTION:
@@ -3074,7 +3074,7 @@ i2d_ISSUING_DIST_POINT                  3138	3_0_0	EXIST::FUNCTION:
 TXT_DB_free                             3139	3_0_0	EXIST::FUNCTION:
 ASN1_STRING_set                         3140	3_0_0	EXIST::FUNCTION:
 d2i_ESS_CERT_ID                         3141	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_set_derive                3142	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_set_derive                3142	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 OPENSSL_LH_stats                        3143	3_0_0	EXIST::FUNCTION:STDIO
 NCONF_dump_fp                           3144	3_0_0	EXIST::FUNCTION:STDIO
 TS_STATUS_INFO_print_bio                3145	3_0_0	EXIST::FUNCTION:TS
@@ -3256,7 +3256,7 @@ PKCS12_add_friendlyname_uni             3322	3_0_0	EXIST::FUNCTION:
 X509_policy_tree_level_count            3323	3_0_0	EXIST::FUNCTION:
 OBJ_sn2nid                              3324	3_0_0	EXIST::FUNCTION:
 CTLOG_free                              3325	3_0_0	EXIST::FUNCTION:CT
-EVP_CIPHER_meth_dup                     3326	3_0_0	EXIST::FUNCTION:
+EVP_CIPHER_meth_dup                     3326	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 CMS_get1_crls                           3327	3_0_0	EXIST::FUNCTION:CMS
 X509_aux_print                          3328	3_0_0	EXIST::FUNCTION:
 OPENSSL_thread_stop                     3330	3_0_0	EXIST::FUNCTION:
@@ -3284,7 +3284,7 @@ ASN1_UTCTIME_adj                        3351	3_0_0	EXIST::FUNCTION:
 BN_mod_sqrt                             3352	3_0_0	EXIST::FUNCTION:
 OPENSSL_sk_is_sorted                    3353	3_0_0	EXIST::FUNCTION:
 OCSP_SIGNATURE_new                      3354	3_0_0	EXIST::FUNCTION:OCSP
-EVP_PKEY_meth_get_paramgen              3355	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_get_paramgen              3355	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 X509_ATTRIBUTE_create_by_OBJ            3356	3_0_0	EXIST::FUNCTION:
 RSA_generate_key_ex                     3357	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,RSA
 CMS_SignerInfo_get0_algs                3358	3_0_0	EXIST::FUNCTION:CMS
@@ -3330,10 +3330,10 @@ SHA512_Transform                        3399	3_0_0	EXIST::FUNCTION:
 ERR_add_error_vdata                     3400	3_0_0	EXIST::FUNCTION:
 OCSP_REQUEST_get_ext                    3401	3_0_0	EXIST::FUNCTION:OCSP
 NETSCAPE_SPKAC_new                      3402	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_get_verify                3403	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_get_verify                3403	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 CRYPTO_128_wrap                         3404	3_0_0	EXIST::FUNCTION:
 X509_STORE_set_lookup_crls              3405	3_0_0	EXIST::FUNCTION:
-EVP_CIPHER_meth_get_ctrl                3406	3_0_0	EXIST::FUNCTION:
+EVP_CIPHER_meth_get_ctrl                3406	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 OCSP_REQ_CTX_set1_req                   3407	3_0_0	EXIST::FUNCTION:OCSP
 CONF_imodule_get_usr_data               3408	3_0_0	EXIST::FUNCTION:
 CRYPTO_new_ex_data                      3409	3_0_0	EXIST::FUNCTION:
@@ -3355,7 +3355,7 @@ ASN1_GENERALIZEDTIME_print              3424	3_0_0	EXIST::FUNCTION:
 BIO_s_null                              3425	3_0_0	EXIST::FUNCTION:
 PEM_ASN1_read                           3426	3_0_0	EXIST::FUNCTION:STDIO
 SCT_get_log_entry_type                  3427	3_0_0	EXIST::FUNCTION:CT
-EVP_CIPHER_meth_get_init                3428	3_0_0	EXIST::FUNCTION:
+EVP_CIPHER_meth_get_init                3428	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 X509_ALGOR_free                         3429	3_0_0	EXIST::FUNCTION:
 OCSP_SINGLERESP_get_ext_count           3430	3_0_0	EXIST::FUNCTION:OCSP
 EC_POINT_free                           3431	3_0_0	EXIST::FUNCTION:EC
@@ -3365,7 +3365,7 @@ UI_method_get_writer                    3434	3_0_0	EXIST::FUNCTION:
 BN_secure_new                           3435	3_0_0	EXIST::FUNCTION:
 SHA1_Update                             3437	3_0_0	EXIST::FUNCTION:
 BIO_s_connect                           3438	3_0_0	EXIST::FUNCTION:SOCK
-EVP_MD_meth_get_init                    3439	3_0_0	EXIST::FUNCTION:
+EVP_MD_meth_get_init                    3439	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 ASN1_BIT_STRING_free                    3440	3_0_0	EXIST::FUNCTION:
 i2d_PROXY_CERT_INFO_EXTENSION           3441	3_0_0	EXIST::FUNCTION:
 ASN1_IA5STRING_new                      3442	3_0_0	EXIST::FUNCTION:
@@ -3395,7 +3395,7 @@ CRYPTO_get_ex_data                      3465	3_0_0	EXIST::FUNCTION:
 X509_PURPOSE_get0_sname                 3466	3_0_0	EXIST::FUNCTION:
 RSA_verify_PKCS1_PSS                    3467	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,RSA
 HMAC_CTX_reset                          3468	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
-EVP_PKEY_meth_set_init                  3469	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_set_init                  3469	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 X509_REQ_extension_nid                  3470	3_0_0	EXIST::FUNCTION:
 ENGINE_up_ref                           3471	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
 BN_BLINDING_invert_ex                   3472	3_0_0	EXIST::FUNCTION:
@@ -3478,7 +3478,7 @@ CMS_decrypt                             3550	3_0_0	EXIST::FUNCTION:CMS
 BN_mpi2bn                               3551	3_0_0	EXIST::FUNCTION:
 EVP_aes_128_cfb128                      3552	3_0_0	EXIST::FUNCTION:
 RC5_32_ecb_encrypt                      3554	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,RC5
-EVP_CIPHER_meth_new                     3555	3_0_0	EXIST::FUNCTION:
+EVP_CIPHER_meth_new                     3555	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 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:
@@ -3509,7 +3509,7 @@ X509_CRL_get_ext_by_critical            3584	3_0_0	EXIST::FUNCTION:
 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:
+EVP_MD_meth_dup                         3588	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 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
@@ -3571,7 +3571,7 @@ ERR_load_ERR_strings                    3649	3_0_0	EXIST::FUNCTION:
 ASN1_const_check_infinite_end           3650	3_0_0	EXIST::FUNCTION:
 RSA_null_method                         3651	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,RSA
 TS_REQ_ext_free                         3652	3_0_0	EXIST::FUNCTION:TS
-EVP_PKEY_meth_get_encrypt               3653	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_get_encrypt               3653	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 Camellia_ecb_encrypt                    3654	3_0_0	EXIST::FUNCTION:CAMELLIA,DEPRECATEDIN_3_0
 ENGINE_set_default_RSA                  3655	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
 EVP_EncodeBlock                         3656	3_0_0	EXIST::FUNCTION:
@@ -3645,13 +3645,13 @@ i2d_PKCS7_NDEF                          3724	3_0_0	EXIST::FUNCTION:
 OPENSSL_sk_pop_free                     3725	3_0_0	EXIST::FUNCTION:
 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_PKEY_meth_free                      3728	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 EVP_sha224                              3729	3_0_0	EXIST::FUNCTION:
 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
-EVP_CIPHER_meth_get_set_asn1_params     3734	3_0_0	EXIST::FUNCTION:
+EVP_CIPHER_meth_get_set_asn1_params     3734	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 X509_STORE_CTX_get_ex_data              3735	3_0_0	EXIST::FUNCTION:
 CMS_RecipientInfo_kari_set0_pkey        3736	3_0_0	EXIST::FUNCTION:CMS
 X509v3_addr_add_inherit                 3737	3_0_0	EXIST::FUNCTION:RFC3779
@@ -3667,7 +3667,7 @@ ENGINE_set_default_ciphers              3746	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_
 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:
+EVP_PKEY_meth_get_sign                  3750	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 TS_REQ_get_nonce                        3751	3_0_0	EXIST::FUNCTION:TS
 ENGINE_unregister_EC                    3752	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
 X509v3_get_ext_count                    3753	3_0_0	EXIST::FUNCTION:
@@ -3705,7 +3705,7 @@ X509_new                                3785	3_0_0	EXIST::FUNCTION:
 EC_KEY_get_conv_form                    3786	3_0_0	EXIST::FUNCTION:EC
 CTLOG_STORE_get0_log_by_id              3787	3_0_0	EXIST::FUNCTION:CT
 CMS_signed_add1_attr                    3788	3_0_0	EXIST::FUNCTION:CMS
-EVP_CIPHER_meth_set_iv_length           3789	3_0_0	EXIST::FUNCTION:
+EVP_CIPHER_meth_set_iv_length           3789	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 X509v3_asid_validate_path               3790	3_0_0	EXIST::FUNCTION:RFC3779
 CMS_RecipientInfo_set0_password         3791	3_0_0	EXIST::FUNCTION:CMS
 TS_CONF_load_cert                       3792	3_0_0	EXIST::FUNCTION:TS
@@ -3765,7 +3765,7 @@ EVP_CIPHER_iv_length                    3846	3_0_0	EXIST::FUNCTION:
 OCSP_REQ_CTX_get0_mem_bio               3847	3_0_0	EXIST::FUNCTION:
 i2d_PKCS8PrivateKeyInfo_bio             3848	3_0_0	EXIST::FUNCTION:
 d2i_OCSP_CERTID                         3849	3_0_0	EXIST::FUNCTION:OCSP
-EVP_CIPHER_meth_set_init                3850	3_0_0	EXIST::FUNCTION:
+EVP_CIPHER_meth_set_init                3850	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 RIPEMD160_Final                         3851	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,RMD160
 NETSCAPE_SPKI_free                      3852	3_0_0	EXIST::FUNCTION:
 BIO_asn1_get_prefix                     3853	3_0_0	EXIST::FUNCTION:
@@ -3796,7 +3796,7 @@ PEM_write_DSAPrivateKey                 3878	3_0_0	EXIST::FUNCTION:DSA,STDIO
 OPENSSL_sk_delete_ptr                   3879	3_0_0	EXIST::FUNCTION:
 CMS_add0_RevocationInfoChoice           3880	3_0_0	EXIST::FUNCTION:CMS
 ASN1_PCTX_get_flags                     3881	3_0_0	EXIST::FUNCTION:
-EVP_MD_meth_set_result_size             3882	3_0_0	EXIST::FUNCTION:
+EVP_MD_meth_set_result_size             3882	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 i2d_X509_CRL                            3883	3_0_0	EXIST::FUNCTION:
 ASN1_INTEGER_it                         3885	3_0_0	EXIST::FUNCTION:
 TS_ACCURACY_new                         3886	3_0_0	EXIST::FUNCTION:TS
@@ -4221,8 +4221,8 @@ i2d_SCRYPT_PARAMS                       4312	3_0_0	EXIST::FUNCTION:SCRYPT
 d2i_SCRYPT_PARAMS                       4313	3_0_0	EXIST::FUNCTION:SCRYPT
 SCRYPT_PARAMS_it                        4314	3_0_0	EXIST::FUNCTION:SCRYPT
 CRYPTO_secure_clear_free                4315	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_get0                      4316	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_get_count                 4317	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_get0                      4316	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
+EVP_PKEY_meth_get_count                 4317	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 RAND_DRBG_get0_public                   4319	3_0_0	EXIST::FUNCTION:
 RAND_priv_bytes                         4320	3_0_0	EXIST::FUNCTION:
 BN_priv_rand                            4321	3_0_0	EXIST::FUNCTION:
@@ -4244,9 +4244,9 @@ UI_get_result_length                    4337	3_0_0	EXIST::FUNCTION:
 UI_set_result_ex                        4338	3_0_0	EXIST::FUNCTION:
 UI_get_result_string_length             4339	3_0_0	EXIST::FUNCTION:
 EVP_PKEY_check                          4340	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_set_check                 4341	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_get_check                 4342	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_remove                    4343	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_set_check                 4341	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
+EVP_PKEY_meth_get_check                 4342	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
+EVP_PKEY_meth_remove                    4343	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 OPENSSL_sk_reserve                      4344	3_0_0	EXIST::FUNCTION:
 EVP_PKEY_set1_engine                    4347	3_0_0	EXIST::FUNCTION:ENGINE
 DH_new_by_nid                           4348	3_0_0	EXIST::FUNCTION:DH
@@ -4264,10 +4264,10 @@ EVP_sm3                                 4359	3_0_0	EXIST::FUNCTION:SM3
 RSA_get0_multi_prime_factors            4360	3_0_0	EXIST::FUNCTION:RSA
 EVP_PKEY_public_check                   4361	3_0_0	EXIST::FUNCTION:
 EVP_PKEY_param_check                    4362	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_set_public_check          4363	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_set_param_check           4364	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_get_public_check          4365	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_get_param_check           4366	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_set_public_check          4363	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
+EVP_PKEY_meth_set_param_check           4364	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
+EVP_PKEY_meth_get_public_check          4365	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
+EVP_PKEY_meth_get_param_check           4366	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 EVP_PKEY_asn1_set_public_check          4367	3_0_0	EXIST::FUNCTION:
 EVP_PKEY_asn1_set_param_check           4368	3_0_0	EXIST::FUNCTION:
 DH_check_ex                             4369	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,DH
@@ -4422,8 +4422,8 @@ EC_GROUP_get_curve                      4528	3_0_0	EXIST::FUNCTION:EC
 OCSP_resp_get0_tbs_sigalg               4529	3_0_0	EXIST::FUNCTION:OCSP
 OCSP_resp_get0_respdata                 4530	3_0_0	EXIST::FUNCTION:OCSP
 EVP_MD_CTX_set_pkey_ctx                 4531	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_set_digest_custom         4532	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_get_digest_custom         4533	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_set_digest_custom         4532	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
+EVP_PKEY_meth_get_digest_custom         4533	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 EVP_MAC_CTX_new                         ?	3_0_0	EXIST::FUNCTION:
 EVP_MAC_CTX_free                        ?	3_0_0	EXIST::FUNCTION:
 EVP_MAC_CTX_dup                         ?	3_0_0	EXIST::FUNCTION:
@@ -4864,10 +4864,10 @@ EVP_PKEY_CTX_set0_rsa_oaep_label        ?	3_0_0	EXIST::FUNCTION:RSA
 EVP_PKEY_CTX_get0_rsa_oaep_label        ?	3_0_0	EXIST::FUNCTION:RSA
 EVP_PKEY_CTX_get_rsa_mgf1_md_name       ?	3_0_0	EXIST::FUNCTION:RSA
 EVP_PKEY_CTX_get_rsa_oaep_md_name       ?	3_0_0	EXIST::FUNCTION:RSA
-EVP_PKEY_meth_set_digestsign            ?	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_set_digestverify          ?	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_get_digestsign            ?	3_0_0	EXIST::FUNCTION:
-EVP_PKEY_meth_get_digestverify          ?	3_0_0	EXIST::FUNCTION:
+EVP_PKEY_meth_set_digestsign            ?	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
+EVP_PKEY_meth_set_digestverify          ?	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
+EVP_PKEY_meth_get_digestsign            ?	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
+EVP_PKEY_meth_get_digestverify          ?	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0
 OSSL_SERIALIZER_up_ref                  ?	3_0_0	EXIST::FUNCTION:
 OSSL_SERIALIZER_free                    ?	3_0_0	EXIST::FUNCTION:
 OSSL_SERIALIZER_fetch                   ?	3_0_0	EXIST::FUNCTION:


More information about the openssl-commits mailing list