diff options
| author | Matt Caswell <matt@openssl.org> | 2021-04-27 19:56:39 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2021-05-04 12:00:21 +0100 |
| commit | b0ee1de9ab4fb8586934f3a8126432f06abf7115 (patch) | |
| tree | a835c73699f9c0b1235e5004b8af292c52fa030f /include/internal | |
| parent | e3188bae04769242e62ae2fba96a0aca5b7ce605 (diff) | |
Create libcrypto support for BIO_new_from_core_bio()
Previously the concept of wrapping an OSSL_CORE_BIO in a real BIO was an
internal only concept for our own providers. Since this is likely to be
generally useful, we make it a part of the public API.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15072)
Diffstat (limited to 'include/internal')
| -rw-r--r-- | include/internal/bio.h | 2 | ||||
| -rw-r--r-- | include/internal/cryptlib.h | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/internal/bio.h b/include/internal/bio.h index b905845a1a..2d36a7b980 100644 --- a/include/internal/bio.h +++ b/include/internal/bio.h @@ -86,4 +86,6 @@ int ossl_core_bio_up_ref(OSSL_CORE_BIO *cb); int ossl_core_bio_free(OSSL_CORE_BIO *cb); int ossl_core_bio_vprintf(OSSL_CORE_BIO *cb, const char *format, va_list args); +int ossl_bio_init_core(OSSL_LIB_CTX *libctx, const OSSL_DISPATCH *fns); + #endif diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h index e7dd1f65b4..d583153b89 100644 --- a/include/internal/cryptlib.h +++ b/include/internal/cryptlib.h @@ -156,14 +156,15 @@ typedef struct ossl_ex_data_global_st { # define OSSL_LIB_CTX_RAND_CRNGT_INDEX 7 # define OSSL_LIB_CTX_THREAD_EVENT_HANDLER_INDEX 8 # define OSSL_LIB_CTX_FIPS_PROV_INDEX 9 -# define OSSL_LIB_CTX_ENCODER_STORE_INDEX 10 -# define OSSL_LIB_CTX_DECODER_STORE_INDEX 11 +# define OSSL_LIB_CTX_ENCODER_STORE_INDEX 10 +# define OSSL_LIB_CTX_DECODER_STORE_INDEX 11 # define OSSL_LIB_CTX_SELF_TEST_CB_INDEX 12 # define OSSL_LIB_CTX_BIO_PROV_INDEX 13 # define OSSL_LIB_CTX_GLOBAL_PROPERTIES 14 # define OSSL_LIB_CTX_STORE_LOADER_STORE_INDEX 15 # define OSSL_LIB_CTX_PROVIDER_CONF_INDEX 16 -# define OSSL_LIB_CTX_MAX_INDEXES 17 +# define OSSL_LIB_CTX_BIO_CORE_INDEX 17 +# define OSSL_LIB_CTX_MAX_INDEXES 18 typedef struct ossl_lib_ctx_method { void *(*new_func)(OSSL_LIB_CTX *ctx); |