From: Matt Caswell <matt@openssl.org>
Date: Mon, 23 Jan 2023 14:04:26 +0000 (+0000)
Subject: Remove the user_ssl field
X-Git-Tag: openssl-3.2.0-alpha1~1386
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e95d6e1eec2f080713aa91c12e411cea4cffee65;p=thirdparty%2Fopenssl.git

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)
---

diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c
index 5b895cb48a3..6fb868a0045 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 ffae69bc38b..1e23ec55e55 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 ea8f5aa8b4e..65634a24ef4 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)