Get rid of SSL_CTX_INTERNAL and SSL_INTERNAL.

These are no longer necessary due to SSL_CTX and SSL now being fully
opaque. Merge SSL_CTX_INTERNAL back into SSL_CTX and SSL_INTERNAL back
into SSL.

Prompted by tb@

1 files changed, 93 insertions, 93 deletions

diff --git a/src/lib/libssl/ssl_srvr.c b/src/lib/libssl/ssl_srvr.c
index 821006af81..098e82e339 100644
--- a/src/lib/libssl/ssl_srvr.c
+++ b/src/lib/libssl/ssl_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_srvr.c,v 1.150 2022/10/01 16:23:15 jsing Exp $ */
+/* $OpenBSD: ssl_srvr.c,v 1.151 2022/10/02 16:36:41 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -204,7 +204,7 @@ ssl3_accept(SSL *s)
                 listen = s->d1->listen;
 
         /* init things to blank */
-        s->internal->in_handshake++;
+        s->in_handshake++;
         if (!SSL_in_init(s) || SSL_in_before(s))
                 SSL_clear(s);
 
@@ -216,7 +216,7 @@ ssl3_accept(SSL *s)
 
                 switch (s->s3->hs.state) {
                 case SSL_ST_RENEGOTIATE:
-                        s->internal->renegotiate = 1;
+                        s->renegotiate = 1;
                         /* s->s3->hs.state=SSL_ST_ACCEPT; */
 
                 case SSL_ST_BEFORE:
@@ -257,7 +257,7 @@ ssl3_accept(SSL *s)
                                 goto end;
                         }
 
-                        s->internal->init_num = 0;
+                        s->init_num = 0;
 
                         if (s->s3->hs.state != SSL_ST_RENEGOTIATE) {
                                 /*
@@ -276,7 +276,7 @@ ssl3_accept(SSL *s)
                                 }
 
                                 s->s3->hs.state = SSL3_ST_SR_CLNT_HELLO_A;
-                                s->ctx->internal->stats.sess_accept++;
+                                s->ctx->stats.sess_accept++;
                         } else if (!SSL_is_dtls(s) && !s->s3->send_connection_binding) {
                                 /*
                                  * Server attempting to renegotiate with
@@ -293,14 +293,14 @@ ssl3_accept(SSL *s)
                                  * s->s3->hs.state == SSL_ST_RENEGOTIATE,
                                  * we will just send a HelloRequest.
                                  */
-                                s->ctx->internal->stats.sess_accept_renegotiate++;
+                                s->ctx->stats.sess_accept_renegotiate++;
                                 s->s3->hs.state = SSL3_ST_SW_HELLO_REQ_A;
                         }
                         break;
 
                 case SSL3_ST_SW_HELLO_REQ_A:
                 case SSL3_ST_SW_HELLO_REQ_B:
-                        s->internal->shutdown = 0;
+                        s->shutdown = 0;
                         if (SSL_is_dtls(s)) {
                                 dtls1_clear_record_buffer(s);
                                 dtls1_start_timer(s);
@@ -313,7 +313,7 @@ ssl3_accept(SSL *s)
                         else
                                 s->s3->hs.tls12.next_state = SSL3_ST_SW_HELLO_REQ_C;
                         s->s3->hs.state = SSL3_ST_SW_FLUSH;
-                        s->internal->init_num = 0;
+                        s->init_num = 0;
 
                         if (SSL_is_dtls(s)) {
                                 if (!tls1_transcript_init(s)) {
@@ -330,7 +330,7 @@ ssl3_accept(SSL *s)
                 case SSL3_ST_SR_CLNT_HELLO_A:
                 case SSL3_ST_SR_CLNT_HELLO_B:
                 case SSL3_ST_SR_CLNT_HELLO_C:
-                        s->internal->shutdown = 0;
+                        s->shutdown = 0;
                         if (SSL_is_dtls(s)) {
                                 ret = ssl3_get_client_hello(s);
                                 if (ret <= 0)
@@ -343,7 +343,7 @@ ssl3_accept(SSL *s)
                                 else
                                         s->s3->hs.state = SSL3_ST_SW_SRVR_HELLO_A;
 
-                                s->internal->init_num = 0;
+                                s->init_num = 0;
 
                                 /*
                                  * Reflect ClientHello sequence to remain
@@ -351,7 +351,7 @@ ssl3_accept(SSL *s)
                                  */
                                 if (listen) {
                                         tls12_record_layer_reflect_seq_num(
-                                            s->internal->rl);
+                                            s->rl);
                                 }
 
                                 /* If we're just listening, stop here */
@@ -368,15 +368,15 @@ ssl3_accept(SSL *s)
                                         goto end;
                                 }
                         } else {
-                                if (s->internal->rwstate != SSL_X509_LOOKUP) {
+                                if (s->rwstate != SSL_X509_LOOKUP) {
                                         ret = ssl3_get_client_hello(s);
                                         if (ret <= 0)
                                                 goto end;
                                 }
 
-                                s->internal->renegotiate = 2;
+                                s->renegotiate = 2;
                                 s->s3->hs.state = SSL3_ST_SW_SRVR_HELLO_A;
-                                s->internal->init_num = 0;
+                                s->init_num = 0;
                         }
                         break;
 
@@ -395,21 +395,21 @@ ssl3_accept(SSL *s)
                 case SSL3_ST_SW_SRVR_HELLO_A:
                 case SSL3_ST_SW_SRVR_HELLO_B:
                         if (SSL_is_dtls(s)) {
-                                s->internal->renegotiate = 2;
+                                s->renegotiate = 2;
                                 dtls1_start_timer(s);
                         }
                         ret = ssl3_send_server_hello(s);
                         if (ret <= 0)
                                 goto end;
-                        if (s->internal->hit) {
-                                if (s->internal->tlsext_ticket_expected)
+                        if (s->hit) {
+                                if (s->tlsext_ticket_expected)
                                         s->s3->hs.state = SSL3_ST_SW_SESSION_TICKET_A;
                                 else
                                         s->s3->hs.state = SSL3_ST_SW_CHANGE_A;
                         } else {
                                 s->s3->hs.state = SSL3_ST_SW_CERT_A;
                         }
-                        s->internal->init_num = 0;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_CERT_A:
@@ -422,7 +422,7 @@ ssl3_accept(SSL *s)
                                 ret = ssl3_send_server_certificate(s);
                                 if (ret <= 0)
                                         goto end;
-                                if (s->internal->tlsext_status_expected)
+                                if (s->tlsext_status_expected)
                                         s->s3->hs.state = SSL3_ST_SW_CERT_STATUS_A;
                                 else
                                         s->s3->hs.state = SSL3_ST_SW_KEY_EXCH_A;
@@ -430,7 +430,7 @@ ssl3_accept(SSL *s)
                                 skip = 1;
                                 s->s3->hs.state = SSL3_ST_SW_KEY_EXCH_A;
                         }
-                        s->internal->init_num = 0;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_KEY_EXCH_A:
@@ -455,7 +455,7 @@ ssl3_accept(SSL *s)
                                 skip = 1;
 
                         s->s3->hs.state = SSL3_ST_SW_CERT_REQ_A;
-                        s->internal->init_num = 0;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_CERT_REQ_A:
@@ -498,7 +498,7 @@ ssl3_accept(SSL *s)
                                 if (ret <= 0)
                                         goto end;
                                 s->s3->hs.state = SSL3_ST_SW_SRVR_DONE_A;
-                                s->internal->init_num = 0;
+                                s->init_num = 0;
                         }
                         break;
 
@@ -511,7 +511,7 @@ ssl3_accept(SSL *s)
                                 goto end;
                         s->s3->hs.tls12.next_state = SSL3_ST_SR_CERT_A;
                         s->s3->hs.state = SSL3_ST_SW_FLUSH;
-                        s->internal->init_num = 0;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_FLUSH:
@@ -525,19 +525,19 @@ ssl3_accept(SSL *s)
                          * still exist. So instead we just flush
                          * unconditionally.
                          */
-                        s->internal->rwstate = SSL_WRITING;
+                        s->rwstate = SSL_WRITING;
                         if (BIO_flush(s->wbio) <= 0) {
                                 if (SSL_is_dtls(s)) {
                                         /* If the write error was fatal, stop trying. */
                                         if (!BIO_should_retry(s->wbio)) {
-                                                s->internal->rwstate = SSL_NOTHING;
+                                                s->rwstate = SSL_NOTHING;
                                                 s->s3->hs.state = s->s3->hs.tls12.next_state;
                                         }
                                 }
                                 ret = -1;
                                 goto end;
                         }
-                        s->internal->rwstate = SSL_NOTHING;
+                        s->rwstate = SSL_NOTHING;
                         s->s3->hs.state = s->s3->hs.tls12.next_state;
                         break;
 
@@ -548,7 +548,7 @@ ssl3_accept(SSL *s)
                                 if (ret <= 0)
                                         goto end;
                         }
-                        s->internal->init_num = 0;
+                        s->init_num = 0;
                         s->s3->hs.state = SSL3_ST_SR_KEY_EXCH_A;
                         break;
 
@@ -560,7 +560,7 @@ ssl3_accept(SSL *s)
 
                         if (SSL_is_dtls(s)) {
                                 s->s3->hs.state = SSL3_ST_SR_CERT_VRFY_A;
-                                s->internal->init_num = 0;
+                                s->init_num = 0;
                         }
 
                         alg_k = s->s3->hs.cipher->algorithm_mkey;
@@ -571,10 +571,10 @@ ssl3_accept(SSL *s)
                                  * the CertificateVerify message is not sent.
                                  */
                                 s->s3->hs.state = SSL3_ST_SR_FINISHED_A;
-                                s->internal->init_num = 0;
+                                s->init_num = 0;
                         } else if (SSL_USE_SIGALGS(s) || (alg_k & SSL_kGOST)) {
                                 s->s3->hs.state = SSL3_ST_SR_CERT_VRFY_A;
-                                s->internal->init_num = 0;
+                                s->init_num = 0;
                                 if (!s->session->peer_cert)
                                         break;
                                 /*
@@ -584,7 +584,7 @@ ssl3_accept(SSL *s)
                                 tls1_transcript_freeze(s);
                         } else {
                                 s->s3->hs.state = SSL3_ST_SR_CERT_VRFY_A;
-                                s->internal->init_num = 0;
+                                s->init_num = 0;
 
                                 tls1_transcript_free(s);
 
@@ -614,7 +614,7 @@ ssl3_accept(SSL *s)
                         if (ret <= 0)
                                 goto end;
                         s->s3->hs.state = SSL3_ST_SR_FINISHED_A;
-                        s->internal->init_num = 0;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_SR_FINISHED_A:
@@ -628,13 +628,13 @@ ssl3_accept(SSL *s)
                                 goto end;
                         if (SSL_is_dtls(s))
                                 dtls1_stop_timer(s);
-                        if (s->internal->hit)
+                        if (s->hit)
                                 s->s3->hs.state = SSL_ST_OK;
-                        else if (s->internal->tlsext_ticket_expected)
+                        else if (s->tlsext_ticket_expected)
                                 s->s3->hs.state = SSL3_ST_SW_SESSION_TICKET_A;
                         else
                                 s->s3->hs.state = SSL3_ST_SW_CHANGE_A;
-                        s->internal->init_num = 0;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_SESSION_TICKET_A:
@@ -643,7 +643,7 @@ ssl3_accept(SSL *s)
                         if (ret <= 0)
                                 goto end;
                         s->s3->hs.state = SSL3_ST_SW_CHANGE_A;
-                        s->internal->init_num = 0;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_CERT_STATUS_A:
@@ -652,7 +652,7 @@ ssl3_accept(SSL *s)
                         if (ret <= 0)
                                 goto end;
                         s->s3->hs.state = SSL3_ST_SW_KEY_EXCH_A;
-                        s->internal->init_num = 0;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_CHANGE_A:
@@ -661,7 +661,7 @@ ssl3_accept(SSL *s)
                         if (ret <= 0)
                                 goto end;
                         s->s3->hs.state = SSL3_ST_SW_FINISHED_A;
-                        s->internal->init_num = 0;
+                        s->init_num = 0;
                         s->session->cipher = s->s3->hs.cipher;
 
                         if (!tls1_setup_key_block(s)) {
@@ -680,12 +680,12 @@ ssl3_accept(SSL *s)
                         if (ret <= 0)
                                 goto end;
                         s->s3->hs.state = SSL3_ST_SW_FLUSH;
-                        if (s->internal->hit) {
+                        if (s->hit) {
                                 s->s3->hs.tls12.next_state = SSL3_ST_SR_FINISHED_A;
                                 tls1_transcript_free(s);
                         } else
                                 s->s3->hs.tls12.next_state = SSL_ST_OK;
-                        s->internal->init_num = 0;
+                        s->init_num = 0;
                         break;
 
                 case SSL_ST_OK:
@@ -704,18 +704,18 @@ ssl3_accept(SSL *s)
                         /* remove buffering on output */
                         ssl_free_wbio_buffer(s);
 
-                        s->internal->init_num = 0;
+                        s->init_num = 0;
 
                         /* Skipped if we just sent a HelloRequest. */
-                        if (s->internal->renegotiate == 2) {
-                                s->internal->renegotiate = 0;
-                                s->internal->new_session = 0;
+                        if (s->renegotiate == 2) {
+                                s->renegotiate = 0;
+                                s->new_session = 0;
 
                                 ssl_update_cache(s, SSL_SESS_CACHE_SERVER);
 
-                                s->ctx->internal->stats.sess_accept_good++;
+                                s->ctx->stats.sess_accept_good++;
                                 /* s->server=1; */
-                                s->internal->handshake_func = ssl3_accept;
+                                s->handshake_func = ssl3_accept;
 
                                 ssl_info_callback(s, SSL_CB_HANDSHAKE_DONE, 1);
                         }
@@ -740,7 +740,7 @@ ssl3_accept(SSL *s)
                 }
 
                 if (!s->s3->hs.tls12.reuse_message && !skip) {
-                        if (s->internal->debug) {
+                        if (s->debug) {
                                 if ((ret = BIO_flush(s->wbio)) <= 0)
                                         goto end;
                         }
@@ -757,7 +757,7 @@ ssl3_accept(SSL *s)
         }
  end:
         /* BIO_flush(s->wbio); */
-        s->internal->in_handshake--;
+        s->in_handshake--;
         ssl_info_callback(s, SSL_CB_ACCEPT_EXIT, ret);
 
         return (ret);
@@ -815,19 +815,19 @@ ssl3_get_client_hello(SSL *s)
         if (s->s3->hs.state == SSL3_ST_SR_CLNT_HELLO_A)
                 s->s3->hs.state = SSL3_ST_SR_CLNT_HELLO_B;
 
-        s->internal->first_packet = 1;
+        s->first_packet = 1;
         if ((ret = ssl3_get_message(s, SSL3_ST_SR_CLNT_HELLO_B,
             SSL3_ST_SR_CLNT_HELLO_C, SSL3_MT_CLIENT_HELLO,
             SSL3_RT_MAX_PLAIN_LENGTH)) <= 0)
                 return ret;
-        s->internal->first_packet = 0;
+        s->first_packet = 0;
 
         ret = -1;
 
-        if (s->internal->init_num < 0)
+        if (s->init_num < 0)
                 goto err;
 
-        CBS_init(&cbs, s->internal->init_msg, s->internal->init_num);
+        CBS_init(&cbs, s->init_msg, s->init_num);
 
         /* Parse client hello up until the extensions (if any). */
         if (!CBS_get_u16(&cbs, &client_version))
@@ -856,7 +856,7 @@ ssl3_get_client_hello(SSL *s)
          */
         if (!ssl_max_shared_version(s, client_version, &shared_version)) {
                 if ((client_version >> 8) == SSL3_VERSION_MAJOR &&
-                    !tls12_record_layer_write_protected(s->internal->rl)) {
+                    !tls12_record_layer_write_protected(s->rl)) {
                         /*
                          * Similar to ssl3_get_record, send alert using remote
                          * version number.
@@ -898,7 +898,7 @@ ssl3_get_client_hello(SSL *s)
             sizeof(s->s3->client_random), NULL))
                 goto err;
 
-        s->internal->hit = 0;
+        s->hit = 0;
 
         /*
          * Versions before 0.9.7 always allow clients to resume sessions in
@@ -910,12 +910,12 @@ ssl3_get_client_hello(SSL *s)
          * library versions).
          *
          * 1.0.1 and later also have a function SSL_renegotiate_abbreviated()
-         * to request renegotiation but not a new session (s->internal->new_session
+         * to request renegotiation but not a new session (s->new_session
          * remains unset): for servers, this essentially just means that the
          * SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION setting will be
          * ignored.
          */
-        if ((s->internal->new_session && (s->internal->options &
+        if ((s->new_session && (s->options &
             SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION))) {
                 if (!ssl_get_new_session(s, 1))
                         goto err;
@@ -926,7 +926,7 @@ ssl3_get_client_hello(SSL *s)
 
                 i = ssl_get_prev_session(s, &session_id, &ext_block, &al);
                 if (i == 1) { /* previous session */
-                        s->internal->hit = 1;
+                        s->hit = 1;
                 } else if (i == -1)
                         goto fatal_err;
                 else {
@@ -958,8 +958,8 @@ ssl3_get_client_hello(SSL *s)
                             sizeof(s->d1->rcvd_cookie), &cookie_len))
                                 goto err;
 
-                        if (s->ctx->internal->app_verify_cookie_cb != NULL) {
-                                if (s->ctx->internal->app_verify_cookie_cb(s,
+                        if (s->ctx->app_verify_cookie_cb != NULL) {
+                                if (s->ctx->app_verify_cookie_cb(s,
                                     s->d1->rcvd_cookie, cookie_len) == 0) {
                                         al = SSL_AD_HANDSHAKE_FAILURE;
                                         SSLerror(s, SSL_R_COOKIE_MISMATCH);
@@ -994,7 +994,7 @@ ssl3_get_client_hello(SSL *s)
 
         /* If it is a hit, check that the cipher is in the list */
         /* XXX - CBS_len(&cipher_suites) will always be zero here... */
-        if (s->internal->hit && CBS_len(&cipher_suites) > 0) {
+        if (s->hit && CBS_len(&cipher_suites) > 0) {
                 j = 0;
                 id = s->session->cipher->id;
 
@@ -1037,7 +1037,7 @@ ssl3_get_client_hello(SSL *s)
         if (CBS_len(&cbs) != 0)
                 goto decode_err;
 
-        if (!s->s3->renegotiate_seen && s->internal->renegotiate) {
+        if (!s->s3->renegotiate_seen && s->renegotiate) {
                 al = SSL_AD_HANDSHAKE_FAILURE;
                 SSLerror(s, SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);
                 goto fatal_err;
@@ -1077,13 +1077,13 @@ ssl3_get_client_hello(SSL *s)
                 }
         }
 
-        if (!s->internal->hit && s->internal->tls_session_secret_cb != NULL) {
+        if (!s->hit && s->tls_session_secret_cb != NULL) {
                 SSL_CIPHER *pref_cipher = NULL;
                 int master_key_length = sizeof(s->session->master_key);
 
-                if (!s->internal->tls_session_secret_cb(s,
+                if (!s->tls_session_secret_cb(s,
                     s->session->master_key, &master_key_length, ciphers,
-                    &pref_cipher, s->internal->tls_session_secret_cb_arg)) {
+                    &pref_cipher, s->tls_session_secret_cb_arg)) {
                         SSLerror(s, ERR_R_INTERNAL_ERROR);
                         goto err;
                 }
@@ -1093,7 +1093,7 @@ ssl3_get_client_hello(SSL *s)
                 }
                 s->session->master_key_length = master_key_length;
 
-                s->internal->hit = 1;
+                s->hit = 1;
                 s->session->verify_result = X509_V_OK;
 
                 sk_SSL_CIPHER_free(s->session->ciphers);
@@ -1120,7 +1120,7 @@ ssl3_get_client_hello(SSL *s)
          * pick a cipher
          */
 
-        if (!s->internal->hit) {
+        if (!s->hit) {
                 if (ciphers == NULL) {
                         al = SSL_AD_ILLEGAL_PARAMETER;
                         SSLerror(s, SSL_R_NO_CIPHERS_PASSED);
@@ -1157,7 +1157,7 @@ ssl3_get_client_hello(SSL *s)
          * compression          - basically ignored right now
          * ssl version is set   - sslv3
          * s->session           - The ssl session has been setup.
-         * s->internal->hit             - session reuse flag
+         * s->hit               - session reuse flag
          * s->hs.cipher - the new cipher to use.
          */
 
@@ -1190,8 +1190,8 @@ ssl3_send_dtls_hello_verify_request(SSL *s)
         memset(&cbb, 0, sizeof(cbb));
 
         if (s->s3->hs.state == DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A) {
-                if (s->ctx->internal->app_gen_cookie_cb == NULL ||
-                    s->ctx->internal->app_gen_cookie_cb(s, s->d1->cookie,
+                if (s->ctx->app_gen_cookie_cb == NULL ||
+                    s->ctx->app_gen_cookie_cb(s, s->d1->cookie,
                         &(s->d1->cookie_len)) == 0) {
                         SSLerror(s, ERR_R_INTERNAL_ERROR);
                         return 0;
@@ -1259,12 +1259,12 @@ ssl3_send_server_hello(SSL *s)
                  * - However, if we want the new session to be single-use,
                  *   we send back a 0-length session ID.
                  *
-                 * s->internal->hit is non-zero in either case of session reuse,
+                 * s->hit is non-zero in either case of session reuse,
                  * so the following won't overwrite an ID that we're supposed
                  * to send back.
                  */
-                if (!(s->ctx->internal->session_cache_mode & SSL_SESS_CACHE_SERVER)
-                    && !s->internal->hit)
+                if (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_SERVER)
+                    && !s->hit)
                         s->session->session_id_length = 0;
 
                 sl = s->session->session_id_length;
@@ -1895,10 +1895,10 @@ ssl3_get_client_key_exchange(SSL *s)
             SSL3_ST_SR_KEY_EXCH_B, SSL3_MT_CLIENT_KEY_EXCHANGE, 2048)) <= 0)
                 return ret;
 
-        if (s->internal->init_num < 0)
+        if (s->init_num < 0)
                 goto err;
 
-        CBS_init(&cbs, s->internal->init_msg, s->internal->init_num);
+        CBS_init(&cbs, s->init_msg, s->init_num);
 
         alg_k = s->s3->hs.cipher->algorithm_mkey;
 
@@ -1955,13 +1955,13 @@ ssl3_get_cert_verify(SSL *s)
 
         ret = 0;
 
-        if (s->internal->init_num < 0)
+        if (s->init_num < 0)
                 goto err;
 
         if ((mctx = EVP_MD_CTX_new()) == NULL)
                 goto err;
 
-        CBS_init(&cbs, s->internal->init_msg, s->internal->init_num);
+        CBS_init(&cbs, s->init_msg, s->init_num);
 
         peer_cert = s->session->peer_cert;
         pkey = X509_get0_pubkey(peer_cert);
@@ -2178,7 +2178,7 @@ ssl3_get_client_certificate(SSL *s)
         int al, ret;
 
         if ((ret = ssl3_get_message(s, SSL3_ST_SR_CERT_A, SSL3_ST_SR_CERT_B,
-            -1, s->internal->max_cert_list)) <= 0)
+            -1, s->max_cert_list)) <= 0)
                 return ret;
 
         ret = -1;
@@ -2210,10 +2210,10 @@ ssl3_get_client_certificate(SSL *s)
                 goto fatal_err;
         }
 
-        if (s->internal->init_num < 0)
+        if (s->init_num < 0)
                 goto decode_err;
 
-        CBS_init(&cbs, s->internal->init_msg, s->internal->init_num);
+        CBS_init(&cbs, s->init_msg, s->init_num);
 
         if (!CBS_get_u24_length_prefixed(&cbs, &cert_list))
                 goto decode_err;
@@ -2367,17 +2367,17 @@ ssl3_send_newsession_ticket(SSL *s)
                  * it does all the work, otherwise use generated values from
                  * parent context.
                  */
-                if (tctx->internal->tlsext_ticket_key_cb != NULL) {
-                        if (tctx->internal->tlsext_ticket_key_cb(s,
+                if (tctx->tlsext_ticket_key_cb != NULL) {
+                        if (tctx->tlsext_ticket_key_cb(s,
                             key_name, iv, ctx, hctx, 1) < 0)
                                 goto err;
                 } else {
                         arc4random_buf(iv, 16);
                         EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL,
-                            tctx->internal->tlsext_tick_aes_key, iv);
-                        HMAC_Init_ex(hctx, tctx->internal->tlsext_tick_hmac_key,
+                            tctx->tlsext_tick_aes_key, iv);
+                        HMAC_Init_ex(hctx, tctx->tlsext_tick_hmac_key,
                             16, EVP_sha256(), NULL);
-                        memcpy(key_name, tctx->internal->tlsext_tick_key_name, 16);
+                        memcpy(key_name, tctx->tlsext_tick_key_name, 16);
                 }
 
                 /* Encrypt the session state. */
@@ -2415,7 +2415,7 @@ ssl3_send_newsession_ticket(SSL *s)
                  * sessions will live as long as their sessions.
                  */
                 if (!CBB_add_u32(&session_ticket,
-                    s->internal->hit ? 0 : s->session->timeout))
+                    s->hit ? 0 : s->session->timeout))
                         goto err;
 
                 if (!CBB_add_u16_length_prefixed(&session_ticket, &ticket))
@@ -2473,8 +2473,8 @@ ssl3_send_cert_status(SSL *s)
                         goto err;
                 if (!CBB_add_u24_length_prefixed(&certstatus, &ocspresp))
                         goto err;
-                if (!CBB_add_bytes(&ocspresp, s->internal->tlsext_ocsp_resp,
-                    s->internal->tlsext_ocsp_resp_len))
+                if (!CBB_add_bytes(&ocspresp, s->tlsext_ocsp_resp,
+                    s->tlsext_ocsp_resp_len))
                         goto err;
                 if (!ssl3_handshake_msg_finish(s, &cbb))
                         goto err;
@@ -2500,8 +2500,8 @@ ssl3_send_server_change_cipher_spec(SSL *s)
         memset(&cbb, 0, sizeof(cbb));
 
         if (s->s3->hs.state == SSL3_ST_SW_CHANGE_A) {
-                if (!CBB_init_fixed(&cbb, s->internal->init_buf->data,
-                    s->internal->init_buf->length))
+                if (!CBB_init_fixed(&cbb, s->init_buf->data,
+                    s->init_buf->length))
                         goto err;
                 if (!CBB_add_u8(&cbb, SSL3_MT_CCS))
                         goto err;
@@ -2511,8 +2511,8 @@ ssl3_send_server_change_cipher_spec(SSL *s)
                 if (outlen > INT_MAX)
                         goto err;
 
-                s->internal->init_num = (int)outlen;
-                s->internal->init_off = 0;
+                s->init_num = (int)outlen;
+                s->init_off = 0;
 
                 if (SSL_is_dtls(s)) {
                         s->d1->handshake_write_seq =
@@ -2555,13 +2555,13 @@ ssl3_get_client_finished(SSL *s)
 
         md_len = TLS1_FINISH_MAC_LENGTH;
 
-        if (s->internal->init_num < 0) {
+        if (s->init_num < 0) {
                 al = SSL_AD_DECODE_ERROR;
                 SSLerror(s, SSL_R_BAD_DIGEST_LENGTH);
                 goto fatal_err;
         }
 
-        CBS_init(&cbs, s->internal->init_msg, s->internal->init_num);
+        CBS_init(&cbs, s->init_msg, s->init_num);
 
         if (s->s3->hs.peer_finished_len != md_len ||
             CBS_len(&cbs) != md_len) {