diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-03 17:09:18 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-13 11:11:32 +0100 |
| commit | 262cda1cdac3d5c8f2fdb3c30b6d1c1a982864d6 (patch) | |
| tree | a1ad4554f964534159f6387ea1fd7be8680d071b /include | |
| parent | 9cedfc90cebc905b20275d534699a1070bba65a4 (diff) | |
Remove some safestack things that are no longer needed
... and add SKM_DEFINE_STACK_OF_INTERNAL
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12781)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/safestack.h.in | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/include/openssl/safestack.h.in b/include/openssl/safestack.h.in index 943aa5861e..a8e9d7abda 100644 --- a/include/openssl/safestack.h.in +++ b/include/openssl/safestack.h.in @@ -163,28 +163,6 @@ extern "C" { typedef char *OPENSSL_STRING; typedef const char *OPENSSL_CSTRING; -# define DEFINE_STACK_OF_STRING() \ - DEFINE_SPECIAL_STACK_OF(OPENSSL_STRING, char) -# define DEFINE_STACK_OF_CSTRING() \ - DEFINE_SPECIAL_STACK_OF_CONST(OPENSSL_CSTRING, char) - -/* - * If we're building OpenSSL, or we have no-deprecated configured, - * then we don't define the inline functions (see |SKM_DEFINE_STACK_OF|, - * above), we just declare the stack datatypes. Otherwise, for compatibility - * and to not remove the API's, we define the functions. We have the - * trailing semicolon so that uses of this never need it. - */ -#if defined(OPENSSL_BUILDING_OPENSSL) || defined(OPENSSL_NO_DEPRECATED_3_0) -# define DEFINE_OR_DECLARE_STACK_OF(s) STACK_OF(s); -# define DEFINE_OR_DECLARE_STACK_OF_STRING() STACK_OF(OPENSSL_STRING); -# define DEFINE_OR_DECLARE_STACK_OF_CSTRING() STACK_OF(OPENSSL_CSTRING); -#else -# define DEFINE_OR_DECLARE_STACK_OF(s) DEFINE_STACK_OF(s) -# define DEFINE_OR_DECLARE_STACK_OF_STRING() DEFINE_STACK_OF_STRING() -# define DEFINE_OR_DECLARE_STACK_OF_CSTRING() DEFINE_STACK_OF_CSTRING() -#endif - /*- * Confusingly, LHASH_OF(STRING) deals with char ** throughout, but * STACK_OF(STRING) is really more like STACK_OF(char), only, as mentioned @@ -208,41 +186,6 @@ typedef void *OPENSSL_BLOCK; -} #endif -/* - * If called without higher optimization (min. -xO3) the Oracle Developer - * Studio compiler generates code for the defined (static inline) functions - * above. - * This would later lead to the linker complaining about missing symbols when - * this header file is included but the resulting object is not linked against - * the Crypto library (openssl#6912). - */ -# ifdef __SUNPRO_C -# pragma weak OPENSSL_sk_num -# pragma weak OPENSSL_sk_value -# pragma weak OPENSSL_sk_new -# pragma weak OPENSSL_sk_new_null -# pragma weak OPENSSL_sk_new_reserve -# pragma weak OPENSSL_sk_reserve -# pragma weak OPENSSL_sk_free -# pragma weak OPENSSL_sk_zero -# pragma weak OPENSSL_sk_delete -# pragma weak OPENSSL_sk_delete_ptr -# pragma weak OPENSSL_sk_push -# pragma weak OPENSSL_sk_unshift -# pragma weak OPENSSL_sk_pop -# pragma weak OPENSSL_sk_shift -# pragma weak OPENSSL_sk_pop_free -# pragma weak OPENSSL_sk_insert -# pragma weak OPENSSL_sk_set -# pragma weak OPENSSL_sk_find -# pragma weak OPENSSL_sk_find_ex -# pragma weak OPENSSL_sk_sort -# pragma weak OPENSSL_sk_is_sorted -# pragma weak OPENSSL_sk_dup -# pragma weak OPENSSL_sk_deep_copy -# pragma weak OPENSSL_sk_set_cmp_func -# endif /* __SUNPRO_C */ - # ifdef __cplusplus } # endif |