diff options
| author | Matt Caswell <matt@openssl.org> | 2021-05-07 16:42:53 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2021-05-20 09:28:38 +0100 |
| commit | e2ed740ec4dcfd32723d849a146bfc126b95d16c (patch) | |
| tree | 6b8d1e59a96b14cd7e8170c0f6ee2d260584eb04 /include | |
| parent | 87e4e9c473dd3305cb98b37c672edff8ddb436de (diff) | |
Implement the ability to convert a PROPERTY_LIST to a string
We have the ability to parse a string into a PROPERTY_LIST already. Now
we have the ability to go the other way.
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15242)
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/property.h | 4 | ||||
| -rw-r--r-- | include/openssl/lhash.h.in | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/internal/property.h b/include/internal/property.h index 58ceddbb76..85f602d1e5 100644 --- a/include/internal/property.h +++ b/include/internal/property.h @@ -64,4 +64,8 @@ __owur int ossl_method_store_flush_cache(OSSL_METHOD_STORE *store, int all); OSSL_PROPERTY_LIST *ossl_property_merge(const OSSL_PROPERTY_LIST *a, const OSSL_PROPERTY_LIST *b); +size_t ossl_property_list_to_string(OSSL_LIB_CTX *ctx, + const OSSL_PROPERTY_LIST *list, char *buf, + size_t bufsize); + #endif diff --git a/include/openssl/lhash.h.in b/include/openssl/lhash.h.in index 571dce43ea..04f6c45736 100644 --- a/include/openssl/lhash.h.in +++ b/include/openssl/lhash.h.in @@ -226,6 +226,13 @@ void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out); { \ 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) \ + { \ + OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \ + (OPENSSL_LH_DOALL_FUNCARG)doallarg, arg); \ + } \ LHASH_OF(type) #define IMPLEMENT_LHASH_DOALL_ARG_CONST(type, argtype) \ |