summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_local.h
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2020-01-16 12:13:09 +0000
committerMatt Caswell <matt@openssl.org>2020-01-22 10:47:12 +0000
commitba18627e4ac813ef7461241663be6a366ed61c8a (patch)
treec42485291ef7909bfe2b113270d14607ab1afc22 /ssl/ssl_local.h
parent7b131de2bb2be8582c6dfc50bdd3cbc49e1a08be (diff)
Introduce SSL_CTX_new_with_libex()
We add the ability to specify an OPENSSL_CTX (which may be NULL for the default context) and a property query string for use during algorithm fetch operations. For example, in this way one SSL_CTX could be used the default provider, and another one could be used with the FIPS provider. At this stage we don't use these values. That will come later. Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/10866)
Diffstat (limited to 'ssl/ssl_local.h')
-rw-r--r--ssl/ssl_local.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h
index c6f0af7922..14515cadfe 100644
--- a/ssl/ssl_local.h
+++ b/ssl/ssl_local.h
@@ -738,6 +738,8 @@ typedef struct ssl_ctx_ext_secure_st {
} SSL_CTX_EXT_SECURE;
struct ssl_ctx_st {
+ OPENSSL_CTX *libctx;
+
const SSL_METHOD *method;
STACK_OF(SSL_CIPHER) *cipher_list;
/* same as above but sorted for lookup */
@@ -1073,6 +1075,8 @@ struct ssl_ctx_st {
/* Callback for SSL async handling */
SSL_async_callback_fn async_cb;
void *async_cb_arg;
+
+ char *propq;
};
typedef struct cert_pkey_st CERT_PKEY;