All lh_stats functions were deprecated in 3.1

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22247)

diff --git a/crypto/lhash/lh_stats.c b/crypto/lhash/lh_stats.c
index 36a177129ec45edf9d6149243f32280c3ba1a376..ea0a3252a6ba8d28ca6ed9cdf2ad38e4c80885b1 100644 (file)
--- a/crypto/lhash/lh_stats.c
+++ b/crypto/lhash/lh_stats.c
@@ -23,7 +23,7 @@
 #include "lhash_local.h"
 
 # ifndef OPENSSL_NO_STDIO
-#  ifndef OPENSSL_NO_DEPRECATED_3_2
+#  ifndef OPENSSL_NO_DEPRECATED_3_1
 void OPENSSL_LH_stats(const OPENSSL_LHASH *lh, FILE *fp)
 {
     BIO *bp;
@@ -62,7 +62,7 @@ void OPENSSL_LH_node_usage_stats(const OPENSSL_LHASH *lh, FILE *fp)
 #  endif
 # endif
 
-# ifndef OPENSSL_NO_DEPRECATED_3_2
+# ifndef OPENSSL_NO_DEPRECATED_3_1
 /*
  * These functions are implemented as separate static functions as they are
  * called from the stdio functions above and calling deprecated functions will

diff --git a/doc/internal/man7/deprecation.pod b/doc/internal/man7/deprecation.pod
index 87cdcb13c81175db016717d6e72c8e6270f96c48..de34c30fa22f2b14b25bc6dc46b3bdb245f647a0 100644 (file)
--- a/doc/internal/man7/deprecation.pod
+++ b/doc/internal/man7/deprecation.pod
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-OPENSSL_NO_DEPRECATED_3_2, OSSL_DEPRECATEDIN_3_2,
+OPENSSL_NO_DEPRECATED_3_1, OSSL_DEPRECATEDIN_3_1,
 OPENSSL_NO_DEPRECATED_3_0, OSSL_DEPRECATEDIN_3_0,
 OPENSSL_NO_DEPRECATED_1_1_1, OSSL_DEPRECATEDIN_1_1_1,
 OPENSSL_NO_DEPRECATED_1_1_0, OSSL_DEPRECATEDIN_1_1_0,

diff --git a/doc/man3/OPENSSL_LH_COMPFUNC.pod b/doc/man3/OPENSSL_LH_COMPFUNC.pod
index e1eba6b965fc45b186b0070b3dfe19b077b8a079..d3091f6a562a388d795cece28e002de546e5806d 100644 (file)
--- a/doc/man3/OPENSSL_LH_COMPFUNC.pod
+++ b/doc/man3/OPENSSL_LH_COMPFUNC.pod
@@ -280,7 +280,7 @@ L<OPENSSL_LH_stats(3)>
 In OpenSSL 1.0.0, the lhash interface was revamped for better
 type checking.
 
-In OpenSSL 3.2, B<DEFINE_LHASH_OF_EX>() was introduced and B<DEFINE_LHASH_OF>()
+In OpenSSL 3.1, B<DEFINE_LHASH_OF_EX>() was introduced and B<DEFINE_LHASH_OF>()
 was deprecated.
 
 =head1 COPYRIGHT

diff --git a/doc/man3/OPENSSL_LH_stats.pod b/doc/man3/OPENSSL_LH_stats.pod
index 01381e92167c20ee1469bf4bca9223727a1b3087..fb95928d8f200b36764f35e12915a90cd14900c3 100644 (file)
--- a/doc/man3/OPENSSL_LH_stats.pod
+++ b/doc/man3/OPENSSL_LH_stats.pod
@@ -10,16 +10,16 @@ OPENSSL_LH_node_stats_bio, OPENSSL_LH_node_usage_stats_bio - LHASH statistics
 
  #include <openssl/lhash.h>
 
+The following functions have been deprecated since OpenSSL 3.1, and can be
+hidden entirely by defining B<OPENSSL_API_COMPAT> with a suitable version value,
+see L<openssl_user_macros(7)>:
+
  void OPENSSL_LH_node_stats(LHASH *table, FILE *out);
  void OPENSSL_LH_node_usage_stats(LHASH *table, FILE *out);
 
  void OPENSSL_LH_node_stats_bio(LHASH *table, BIO *out);
  void OPENSSL_LH_node_usage_stats_bio(LHASH *table, BIO *out);
 
-The following functions have been deprecated since OpenSSL 3.2, and can be
-hidden entirely by defining B<OPENSSL_API_COMPAT> with a suitable version value,
-see L<openssl_user_macros(7)>:
-
  void OPENSSL_LH_stats(LHASH *table, FILE *out);
  void OPENSSL_LH_stats_bio(LHASH *table, BIO *out);
 
@@ -48,8 +48,7 @@ record a miss.
 OPENSSL_LH_stats_bio(), OPENSSL_LH_node_stats_bio() and OPENSSL_LH_node_usage_stats_bio()
 are the same as the above, except that the output goes to a B<BIO>.
 
-OPENSSH_LH_stats() and OPENSSH_LH_stats_bio() are deprecated and should no
-longer be used.
+These functions are deprecated and should no longer be used.
 
 =head1 RETURN VALUES
 
@@ -61,13 +60,14 @@ These calls should be made under a read lock. Refer to
 L<OPENSSL_LH_COMPFUNC(3)/NOTE> for more details about the locks required
 when using the LHASH data structure.
 
-The functions OPENSSH_LH_stats() and OPENSSH_LH_stats_bio() were deprecated in
-version 3.2.
-
 =head1 SEE ALSO
 
 L<bio(7)>, L<OPENSSL_LH_COMPFUNC(3)>
 
+=head1 HISTORY
+
+These functions were deprecated in version 3.1.
+
 =head1 COPYRIGHT
 
 Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.

diff --git a/include/openssl/lhash.h.in b/include/openssl/lhash.h.in
index 780639bd49083128a625ebe9329dc2385c686619..97dd3a4b84b24d2c06606e47701563c619f9f778 100644 (file)
--- a/include/openssl/lhash.h.in
+++ b/include/openssl/lhash.h.in
@@ -97,16 +97,16 @@ unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
 void OPENSSL_LH_set_down_load(OPENSSL_LHASH *lh, unsigned long down_load);
 
 # ifndef OPENSSL_NO_STDIO
-#  ifndef OPENSSL_NO_DEPRECATED_3_2
-OSSL_DEPRECATEDIN_3_2 void OPENSSL_LH_stats(const OPENSSL_LHASH *lh, FILE *fp);
-OSSL_DEPRECATEDIN_3_2 void OPENSSL_LH_node_stats(const OPENSSL_LHASH *lh, FILE *fp);
-OSSL_DEPRECATEDIN_3_2 void OPENSSL_LH_node_usage_stats(const OPENSSL_LHASH *lh, FILE *fp);
+#  ifndef OPENSSL_NO_DEPRECATED_3_1
+OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_stats(const OPENSSL_LHASH *lh, FILE *fp);
+OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_stats(const OPENSSL_LHASH *lh, FILE *fp);
+OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats(const OPENSSL_LHASH *lh, FILE *fp);
 #  endif
 # endif
-# ifndef OPENSSL_NO_DEPRECATED_3_2
-OSSL_DEPRECATEDIN_3_2 void OPENSSL_LH_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
-OSSL_DEPRECATEDIN_3_2 void OPENSSL_LH_node_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
-OSSL_DEPRECATEDIN_3_2 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
+# ifndef OPENSSL_NO_DEPRECATED_3_1
+OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
+OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
+OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
 # endif
 
 # ifndef OPENSSL_NO_DEPRECATED_1_1_0
@@ -181,7 +181,7 @@ OSSL_DEPRECATEDIN_3_2 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
     } \
     LHASH_OF(type)
 
-# ifndef OPENSSL_NO_DEPRECATED_3_2
+# ifndef OPENSSL_NO_DEPRECATED_3_1
 #  define DEFINE_LHASH_OF_DEPRECATED(type) \
     static ossl_unused ossl_inline void \
     lh_##type##_node_stats_bio(const LHASH_OF(type) *lh, BIO *out) \

diff --git a/util/libcrypto.num b/util/libcrypto.num
index 6af1fe1707b9a349745f8a1fc5789b80ef93347b..a16f93db47ee4f2c66071da29249242036145903 100644 (file)
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -1178,7 +1178,7 @@ OPENSSL_uni2asc                         1205      3_0_0   EXIST::FUNCTION:
 SCT_validation_status_string            1206   3_0_0   EXIST::FUNCTION:CT
 PKCS7_add_attribute                     1207   3_0_0   EXIST::FUNCTION:
 ENGINE_register_DSA                     1208   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-OPENSSL_LH_node_stats                   1209   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_2,STDIO
+OPENSSL_LH_node_stats                   1209   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_1,STDIO
 X509_policy_tree_free                   1210   3_0_0   EXIST::FUNCTION:
 EC_GFp_simple_method                    1211   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,EC
 X509_it                                 1212   3_0_0   EXIST::FUNCTION:
@@ -1317,7 +1317,7 @@ BIO_f_linebuffer                        1346      3_0_0   EXIST::FUNCTION:
 ASN1_item_d2i_bio                       1347   3_0_0   EXIST::FUNCTION:
 ENGINE_get_flags                        1348   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
 OCSP_resp_find                          1349   3_0_0   EXIST::FUNCTION:OCSP
-OPENSSL_LH_node_usage_stats_bio         1350   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_2
+OPENSSL_LH_node_usage_stats_bio         1350   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_1
 EVP_PKEY_encrypt                        1351   3_0_0   EXIST::FUNCTION:
 CRYPTO_cfb128_8_encrypt                 1352   3_0_0   EXIST::FUNCTION:
 SXNET_get_id_INTEGER                    1353   3_0_0   EXIST::FUNCTION:
@@ -1790,7 +1790,7 @@ 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:DEPRECATEDIN_3_0
 EVP_camellia_192_cbc                    1836   3_0_0   EXIST::FUNCTION:CAMELLIA
-OPENSSL_LH_stats_bio                    1837   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_2
+OPENSSL_LH_stats_bio                    1837   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_1
 PKCS7_set_signed_attributes             1838   3_0_0   EXIST::FUNCTION:
 EC_KEY_priv2buf                         1839   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,EC
 BN_BLINDING_free                        1840   3_0_0   EXIST::FUNCTION:
@@ -1973,7 +1973,7 @@ i2d_TS_REQ_fp                           2019      3_0_0   EXIST::FUNCTION:STDIO,TS
 i2d_OTHERNAME                           2020   3_0_0   EXIST::FUNCTION:
 EC_KEY_get0_private_key                 2021   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,EC
 SCT_get0_extensions                     2022   3_0_0   EXIST::FUNCTION:CT
-OPENSSL_LH_node_stats_bio               2023   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_2
+OPENSSL_LH_node_stats_bio               2023   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_1
 i2d_DIRECTORYSTRING                     2024   3_0_0   EXIST::FUNCTION:
 BN_X931_derive_prime_ex                 2025   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0
 ENGINE_get_pkey_asn1_meth_str           2026   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
@@ -2553,7 +2553,7 @@ EVP_DecodeUpdate                        2609      3_0_0   EXIST::FUNCTION:
 ENGINE_get_default_RAND                 2610   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
 ERR_peek_last_error_line                2611   3_0_0   EXIST::FUNCTION:
 ENGINE_get_ssl_client_cert_function     2612   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-OPENSSL_LH_node_usage_stats             2613   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_2,STDIO
+OPENSSL_LH_node_usage_stats             2613   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_1,STDIO
 DIRECTORYSTRING_it                      2614   3_0_0   EXIST::FUNCTION:
 BIO_write                               2615   3_0_0   EXIST::FUNCTION:
 OCSP_ONEREQ_get_ext_by_OBJ              2616   3_0_0   EXIST::FUNCTION:OCSP
@@ -3073,7 +3073,7 @@ 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:DEPRECATEDIN_3_0
-OPENSSL_LH_stats                        3143   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_2,STDIO
+OPENSSL_LH_stats                        3143   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_1,STDIO
 NCONF_dump_fp                           3144   3_0_0   EXIST::FUNCTION:STDIO
 TS_STATUS_INFO_print_bio                3145   3_0_0   EXIST::FUNCTION:TS
 OPENSSL_sk_dup                          3146   3_0_0   EXIST::FUNCTION: