diff options
| author | Matt Caswell <matt@openssl.org> | 2023-01-23 14:04:26 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2023-01-24 17:16:29 +0000 |
| commit | e95d6e1eec2f080713aa91c12e411cea4cffee65 (patch) | |
| tree | 0775e11f18481677facd6087b98e578c7e183d21 /ssl | |
| parent | 4e3a55fd14cb4424fd62516345d918cdf0d9cdcc (diff) | |
| download | openssl-new-e95d6e1eec2f080713aa91c12e411cea4cffee65.tar.gz | |
Remove the user_ssl field
The user_ssl field in an SSL_CONNECTION is no longer used - so remove it.
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19748)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/quic/quic_impl.c | 2 | ||||
| -rw-r--r-- | ssl/ssl_lib.c | 5 | ||||
| -rw-r--r-- | ssl/ssl_local.h | 4 |
3 files changed, 0 insertions, 11 deletions
diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c index 5b895cb48a..6fb868a004 100644 --- a/ssl/quic/quic_impl.c +++ b/ssl/quic/quic_impl.c @@ -134,8 +134,6 @@ SSL *ossl_quic_new(SSL_CTX *ctx) qc->tls = ossl_ssl_connection_new_int(ctx, TLS_method()); if (qc->tls == NULL || (sc = SSL_CONNECTION_FROM_SSL(qc->tls)) == NULL) goto err; - /* override the user_ssl of the inner connection */ - sc->user_ssl = ssl_base; /* Channel is not created yet. */ qc->ssl_mode = qc->ssl.ctx->mode; diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index ffae69bc38..1e23ec55e5 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -739,11 +739,6 @@ SSL *ossl_ssl_connection_new_int(SSL_CTX *ctx, const SSL_METHOD *method) goto sslerr; } -#ifndef OPENSSL_NO_QUIC - /* set the parent (user visible) ssl to self */ - s->user_ssl = ssl; -#endif - RECORD_LAYER_init(&s->rlayer, s); s->options = ctx->options; diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h index ea8f5aa8b4..65634a24ef 100644 --- a/ssl/ssl_local.h +++ b/ssl/ssl_local.h @@ -1249,10 +1249,6 @@ struct ssl_st { struct ssl_connection_st { /* type identifier and common data */ struct ssl_st ssl; -#ifndef OPENSSL_NO_QUIC - /* pointer to parent SSL of QUIC_CONNECTION or self */ - struct ssl_st *user_ssl; -#endif /* * protocol version (one of SSL2_VERSION, SSL3_VERSION, TLS1_VERSION, * DTLS1_VERSION) |