|
@@ -97,13 +97,17 @@ 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
|
|
|
-void OPENSSL_LH_stats(const OPENSSL_LHASH *lh, FILE *fp);
|
|
|
-void OPENSSL_LH_node_stats(const OPENSSL_LHASH *lh, FILE *fp);
|
|
|
-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_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
|
|
|
-void OPENSSL_LH_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
|
|
|
-void OPENSSL_LH_node_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
|
|
|
-void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
|
|
|
|
|
|
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
|
|
|
# define _LHASH OPENSSL_LHASH
|
|
@@ -134,110 +138,145 @@ void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
|
|
|
|
|
|
/* Helper macro for internal use */
|
|
|
# define DEFINE_LHASH_OF_INTERNAL(type) \
|
|
|
- LHASH_OF(type) { union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; }; \
|
|
|
+ LHASH_OF(type) { \
|
|
|
+ union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
|
|
|
+ }; \
|
|
|
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
|
|
|
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
|
|
|
typedef void (*lh_##type##_doallfunc)(type *a); \
|
|
|
- static ossl_unused ossl_inline type *ossl_check_##type##_lh_plain_type(type *ptr) \
|
|
|
+ static ossl_unused ossl_inline type *\
|
|
|
+ ossl_check_##type##_lh_plain_type(type *ptr) \
|
|
|
{ \
|
|
|
return ptr; \
|
|
|
} \
|
|
|
- static ossl_unused ossl_inline const type *ossl_check_const_##type##_lh_plain_type(const type *ptr) \
|
|
|
+ static ossl_unused ossl_inline const type * \
|
|
|
+ ossl_check_const_##type##_lh_plain_type(const type *ptr) \
|
|
|
{ \
|
|
|
return ptr; \
|
|
|
} \
|
|
|
- static ossl_unused ossl_inline const OPENSSL_LHASH *ossl_check_const_##type##_lh_type(const LHASH_OF(type) *lh) \
|
|
|
+ static ossl_unused ossl_inline const OPENSSL_LHASH * \
|
|
|
+ ossl_check_const_##type##_lh_type(const LHASH_OF(type) *lh) \
|
|
|
{ \
|
|
|
return (const OPENSSL_LHASH *)lh; \
|
|
|
} \
|
|
|
- static ossl_unused ossl_inline OPENSSL_LHASH *ossl_check_##type##_lh_type(LHASH_OF(type) *lh) \
|
|
|
+ static ossl_unused ossl_inline OPENSSL_LHASH * \
|
|
|
+ ossl_check_##type##_lh_type(LHASH_OF(type) *lh) \
|
|
|
{ \
|
|
|
return (OPENSSL_LHASH *)lh; \
|
|
|
} \
|
|
|
- static ossl_unused ossl_inline OPENSSL_LH_COMPFUNC ossl_check_##type##_lh_compfunc_type(lh_##type##_compfunc cmp) \
|
|
|
+ static ossl_unused ossl_inline OPENSSL_LH_COMPFUNC \
|
|
|
+ ossl_check_##type##_lh_compfunc_type(lh_##type##_compfunc cmp) \
|
|
|
{ \
|
|
|
return (OPENSSL_LH_COMPFUNC)cmp; \
|
|
|
} \
|
|
|
- static ossl_unused ossl_inline OPENSSL_LH_HASHFUNC ossl_check_##type##_lh_hashfunc_type(lh_##type##_hashfunc hfn) \
|
|
|
+ static ossl_unused ossl_inline OPENSSL_LH_HASHFUNC \
|
|
|
+ ossl_check_##type##_lh_hashfunc_type(lh_##type##_hashfunc hfn) \
|
|
|
{ \
|
|
|
return (OPENSSL_LH_HASHFUNC)hfn; \
|
|
|
} \
|
|
|
- static ossl_unused ossl_inline OPENSSL_LH_DOALL_FUNC ossl_check_##type##_lh_doallfunc_type(lh_##type##_doallfunc dfn) \
|
|
|
+ static ossl_unused ossl_inline OPENSSL_LH_DOALL_FUNC \
|
|
|
+ ossl_check_##type##_lh_doallfunc_type(lh_##type##_doallfunc dfn) \
|
|
|
{ \
|
|
|
return (OPENSSL_LH_DOALL_FUNC)dfn; \
|
|
|
} \
|
|
|
LHASH_OF(type)
|
|
|
|
|
|
-# define DEFINE_LHASH_OF(type) \
|
|
|
- LHASH_OF(type) { union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; }; \
|
|
|
- static ossl_unused ossl_inline LHASH_OF(type) *lh_##type##_new(unsigned long (*hfn)(const type *), \
|
|
|
- int (*cfn)(const type *, const type *)) \
|
|
|
+# 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) \
|
|
|
+ { \
|
|
|
+ OPENSSL_LH_node_stats_bio((const OPENSSL_LHASH *)lh, out); \
|
|
|
+ } \
|
|
|
+ static ossl_unused ossl_inline void \
|
|
|
+ lh_##type##_node_usage_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
|
|
|
+ { \
|
|
|
+ OPENSSL_LH_node_usage_stats_bio((const OPENSSL_LHASH *)lh, out); \
|
|
|
+ } \
|
|
|
+ static ossl_unused ossl_inline void \
|
|
|
+ lh_##type##_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
|
|
|
+ { \
|
|
|
+ OPENSSL_LH_stats_bio((const OPENSSL_LHASH *)lh, out); \
|
|
|
+ }
|
|
|
+# else
|
|
|
+# define DEFINE_LHASH_OF_DEPRECATED(type)
|
|
|
+# endif
|
|
|
+
|
|
|
+# define DEFINE_LHASH_OF_EX(type) \
|
|
|
+ LHASH_OF(type) { \
|
|
|
+ union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
|
|
|
+ }; \
|
|
|
+ static ossl_unused ossl_inline LHASH_OF(type) * \
|
|
|
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
|
|
|
+ int (*cfn)(const type *, const type *)) \
|
|
|
{ \
|
|
|
return (LHASH_OF(type) *) \
|
|
|
OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
|
|
|
} \
|
|
|
- static ossl_unused ossl_inline void lh_##type##_free(LHASH_OF(type) *lh) \
|
|
|
+ static ossl_unused ossl_inline void \
|
|
|
+ lh_##type##_free(LHASH_OF(type) *lh) \
|
|
|
{ \
|
|
|
OPENSSL_LH_free((OPENSSL_LHASH *)lh); \
|
|
|
} \
|
|
|
- static ossl_unused ossl_inline void lh_##type##_flush(LHASH_OF(type) *lh) \
|
|
|
+ static ossl_unused ossl_inline void \
|
|
|
+ lh_##type##_flush(LHASH_OF(type) *lh) \
|
|
|
{ \
|
|
|
OPENSSL_LH_flush((OPENSSL_LHASH *)lh); \
|
|
|
} \
|
|
|
- static ossl_unused ossl_inline type *lh_##type##_insert(LHASH_OF(type) *lh, type *d) \
|
|
|
+ static ossl_unused ossl_inline type * \
|
|
|
+ lh_##type##_insert(LHASH_OF(type) *lh, type *d) \
|
|
|
{ \
|
|
|
return (type *)OPENSSL_LH_insert((OPENSSL_LHASH *)lh, d); \
|
|
|
} \
|
|
|
- static ossl_unused ossl_inline type *lh_##type##_delete(LHASH_OF(type) *lh, const type *d) \
|
|
|
+ static ossl_unused ossl_inline type * \
|
|
|
+ lh_##type##_delete(LHASH_OF(type) *lh, const type *d) \
|
|
|
{ \
|
|
|
return (type *)OPENSSL_LH_delete((OPENSSL_LHASH *)lh, d); \
|
|
|
} \
|
|
|
- static ossl_unused ossl_inline type *lh_##type##_retrieve(LHASH_OF(type) *lh, const type *d) \
|
|
|
+ static ossl_unused ossl_inline type * \
|
|
|
+ lh_##type##_retrieve(LHASH_OF(type) *lh, const type *d) \
|
|
|
{ \
|
|
|
return (type *)OPENSSL_LH_retrieve((OPENSSL_LHASH *)lh, d); \
|
|
|
} \
|
|
|
- static ossl_unused ossl_inline int lh_##type##_error(LHASH_OF(type) *lh) \
|
|
|
+ static ossl_unused ossl_inline int \
|
|
|
+ lh_##type##_error(LHASH_OF(type) *lh) \
|
|
|
{ \
|
|
|
return OPENSSL_LH_error((OPENSSL_LHASH *)lh); \
|
|
|
} \
|
|
|
- static ossl_unused ossl_inline unsigned long lh_##type##_num_items(LHASH_OF(type) *lh) \
|
|
|
+ static ossl_unused ossl_inline unsigned long \
|
|
|
+ lh_##type##_num_items(LHASH_OF(type) *lh) \
|
|
|
{ \
|
|
|
return OPENSSL_LH_num_items((OPENSSL_LHASH *)lh); \
|
|
|
} \
|
|
|
- static ossl_unused ossl_inline void lh_##type##_node_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
|
|
|
- { \
|
|
|
- OPENSSL_LH_node_stats_bio((const OPENSSL_LHASH *)lh, out); \
|
|
|
- } \
|
|
|
- static ossl_unused ossl_inline void lh_##type##_node_usage_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
|
|
|
- { \
|
|
|
- OPENSSL_LH_node_usage_stats_bio((const OPENSSL_LHASH *)lh, out); \
|
|
|
- } \
|
|
|
- static ossl_unused ossl_inline void lh_##type##_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
|
|
|
- { \
|
|
|
- OPENSSL_LH_stats_bio((const OPENSSL_LHASH *)lh, out); \
|
|
|
- } \
|
|
|
- static ossl_unused ossl_inline unsigned long lh_##type##_get_down_load(LHASH_OF(type) *lh) \
|
|
|
+ static ossl_unused ossl_inline unsigned long \
|
|
|
+ lh_##type##_get_down_load(LHASH_OF(type) *lh) \
|
|
|
{ \
|
|
|
return OPENSSL_LH_get_down_load((OPENSSL_LHASH *)lh); \
|
|
|
} \
|
|
|
- static ossl_unused ossl_inline void lh_##type##_set_down_load(LHASH_OF(type) *lh, unsigned long dl) \
|
|
|
+ static ossl_unused ossl_inline void \
|
|
|
+ lh_##type##_set_down_load(LHASH_OF(type) *lh, unsigned long dl) \
|
|
|
{ \
|
|
|
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
|
|
|
} \
|
|
|
- static ossl_unused ossl_inline void lh_##type##_doall(LHASH_OF(type) *lh, \
|
|
|
- void (*doall)(type *)) \
|
|
|
+ static ossl_unused ossl_inline void \
|
|
|
+ lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
|
|
|
{ \
|
|
|
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
|
|
|
} \
|
|
|
- static ossl_unused ossl_inline void lh_##type##_doall_arg(LHASH_OF(type) *lh, \
|
|
|
- void (*doallarg)(type *, void *), \
|
|
|
- void *arg) \
|
|
|
+ static ossl_unused ossl_inline void \
|
|
|
+ lh_##type##_doall_arg(LHASH_OF(type) *lh, \
|
|
|
+ void (*doallarg)(type *, void *), void *arg) \
|
|
|
{ \
|
|
|
OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
|
|
|
(OPENSSL_LH_DOALL_FUNCARG)doallarg, arg); \
|
|
|
} \
|
|
|
LHASH_OF(type)
|
|
|
|
|
|
+# define DEFINE_LHASH_OF(type) \
|
|
|
+ DEFINE_LHASH_OF_EX(type); \
|
|
|
+ DEFINE_LHASH_OF_DEPRECATED(type) \
|
|
|
+ LHASH_OF(type)
|
|
|
+
|
|
|
#define IMPLEMENT_LHASH_DOALL_ARG_CONST(type, argtype) \
|
|
|
int_implement_lhash_doall(type, argtype, const type)
|
|
|
|
|
@@ -250,7 +289,8 @@ void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
|
|
|
void (*fn)(cbargtype *, argtype *), \
|
|
|
argtype *arg) \
|
|
|
{ \
|
|
|
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
|
|
|
+ OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
|
|
|
+ (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
|
|
|
} \
|
|
|
LHASH_OF(type)
|
|
|
|