Move a large part of ssl_st into internal, so we can see what squeals.

ok jsing@

1 files changed, 75 insertions, 75 deletions

diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
index 5717d5edda..31860eb049 100644
--- a/src/lib/libssl/s3_srvr.c
+++ b/src/lib/libssl/s3_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_srvr.c,v 1.146 2017/01/23 05:13:02 jsing Exp $ */
+/* $OpenBSD: s3_srvr.c,v 1.147 2017/01/23 06:45:30 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -199,7 +199,7 @@ ssl3_accept(SSL *s)
 
                 switch (s->state) {
                 case SSL_ST_RENEGOTIATE:
-                        s->renegotiate = 1;
+                        s->internal->renegotiate = 1;
                         /* s->state=SSL_ST_ACCEPT; */
 
                 case SSL_ST_BEFORE:
@@ -216,7 +216,7 @@ ssl3_accept(SSL *s)
                                 ret = -1;
                                 goto end;
                         }
-                        s->type = SSL_ST_ACCEPT;
+                        s->internal->type = SSL_ST_ACCEPT;
 
                         if (!ssl3_setup_init_buffer(s)) {
                                 ret = -1;
@@ -227,7 +227,7 @@ ssl3_accept(SSL *s)
                                 goto end;
                         }
 
-                        s->init_num = 0;
+                        s->internal->init_num = 0;
 
                         if (s->state != SSL_ST_RENEGOTIATE) {
                                 /*
@@ -272,13 +272,13 @@ ssl3_accept(SSL *s)
                 case SSL3_ST_SW_HELLO_REQ_A:
                 case SSL3_ST_SW_HELLO_REQ_B:
 
-                        s->shutdown = 0;
+                        s->internal->shutdown = 0;
                         ret = ssl3_send_hello_request(s);
                         if (ret <= 0)
                                 goto end;
                         S3I(s)->tmp.next_state = SSL3_ST_SW_HELLO_REQ_C;
                         s->state = SSL3_ST_SW_FLUSH;
-                        s->init_num = 0;
+                        s->internal->init_num = 0;
 
                         if (!tls1_init_finished_mac(s)) {
                                 ret = -1;
@@ -294,16 +294,16 @@ ssl3_accept(SSL *s)
                 case SSL3_ST_SR_CLNT_HELLO_B:
                 case SSL3_ST_SR_CLNT_HELLO_C:
 
-                        s->shutdown = 0;
-                        if (s->rwstate != SSL_X509_LOOKUP) {
+                        s->internal->shutdown = 0;
+                        if (s->internal->rwstate != SSL_X509_LOOKUP) {
                                 ret = ssl3_get_client_hello(s);
                                 if (ret <= 0)
                                         goto end;
                         }
 
-                        s->renegotiate = 2;
+                        s->internal->renegotiate = 2;
                         s->state = SSL3_ST_SW_SRVR_HELLO_A;
-                        s->init_num = 0;
+                        s->internal->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_SRVR_HELLO_A:
@@ -311,15 +311,15 @@ ssl3_accept(SSL *s)
                         ret = ssl3_send_server_hello(s);
                         if (ret <= 0)
                                 goto end;
-                        if (s->hit) {
-                                if (s->tlsext_ticket_expected)
+                        if (s->internal->hit) {
+                                if (s->internal->tlsext_ticket_expected)
                                         s->state = SSL3_ST_SW_SESSION_TICKET_A;
                                 else
                                         s->state = SSL3_ST_SW_CHANGE_A;
                         }
                         else
                                 s->state = SSL3_ST_SW_CERT_A;
-                        s->init_num = 0;
+                        s->internal->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_CERT_A:
@@ -330,7 +330,7 @@ ssl3_accept(SSL *s)
                                 ret = ssl3_send_server_certificate(s);
                                 if (ret <= 0)
                                         goto end;
-                                if (s->tlsext_status_expected)
+                                if (s->internal->tlsext_status_expected)
                                         s->state = SSL3_ST_SW_CERT_STATUS_A;
                                 else
                                         s->state = SSL3_ST_SW_KEY_EXCH_A;
@@ -338,7 +338,7 @@ ssl3_accept(SSL *s)
                                 skip = 1;
                                 s->state = SSL3_ST_SW_KEY_EXCH_A;
                         }
-                        s->init_num = 0;
+                        s->internal->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_KEY_EXCH_A:
@@ -361,7 +361,7 @@ ssl3_accept(SSL *s)
                                 skip = 1;
 
                         s->state = SSL3_ST_SW_CERT_REQ_A;
-                        s->init_num = 0;
+                        s->internal->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_CERT_REQ_A:
@@ -405,7 +405,7 @@ ssl3_accept(SSL *s)
                                 if (ret <= 0)
                                         goto end;
                                 s->state = SSL3_ST_SW_SRVR_DONE_A;
-                                s->init_num = 0;
+                                s->internal->init_num = 0;
                         }
                         break;
 
@@ -416,7 +416,7 @@ ssl3_accept(SSL *s)
                                 goto end;
                         S3I(s)->tmp.next_state = SSL3_ST_SR_CERT_A;
                         s->state = SSL3_ST_SW_FLUSH;
-                        s->init_num = 0;
+                        s->internal->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_FLUSH:
@@ -432,12 +432,12 @@ ssl3_accept(SSL *s)
                          * unconditionally.
                          */
 
-                        s->rwstate = SSL_WRITING;
+                        s->internal->rwstate = SSL_WRITING;
                         if (BIO_flush(s->wbio) <= 0) {
                                 ret = -1;
                                 goto end;
                         }
-                        s->rwstate = SSL_NOTHING;
+                        s->internal->rwstate = SSL_NOTHING;
 
                         s->state = S3I(s)->tmp.next_state;
                         break;
@@ -449,7 +449,7 @@ ssl3_accept(SSL *s)
                                 if (ret <= 0)
                                         goto end;
                         }
-                        s->init_num = 0;
+                        s->internal->init_num = 0;
                         s->state = SSL3_ST_SR_KEY_EXCH_A;
                         break;
 
@@ -473,10 +473,10 @@ ssl3_accept(SSL *s)
                                         s->state = SSL3_ST_SR_NEXT_PROTO_A;
                                 else
                                         s->state = SSL3_ST_SR_FINISHED_A;
-                                s->init_num = 0;
+                                s->internal->init_num = 0;
                         } else if (SSL_USE_SIGALGS(s) || (alg_k & SSL_kGOST)) {
                                 s->state = SSL3_ST_SR_CERT_VRFY_A;
-                                s->init_num = 0;
+                                s->internal->init_num = 0;
                                 if (!s->session->peer)
                                         break;
                                 /*
@@ -499,7 +499,7 @@ ssl3_accept(SSL *s)
                                 int dgst_num;
 
                                 s->state = SSL3_ST_SR_CERT_VRFY_A;
-                                s->init_num = 0;
+                                s->internal->init_num = 0;
 
                                 /*
                                  * We need to get hashes here so if there is
@@ -547,7 +547,7 @@ ssl3_accept(SSL *s)
                                 s->state = SSL3_ST_SR_NEXT_PROTO_A;
                         else
                                 s->state = SSL3_ST_SR_FINISHED_A;
-                        s->init_num = 0;
+                        s->internal->init_num = 0;
                         break;
 
                 case SSL3_ST_SR_NEXT_PROTO_A:
@@ -555,7 +555,7 @@ ssl3_accept(SSL *s)
                         ret = ssl3_get_next_proto(s);
                         if (ret <= 0)
                                 goto end;
-                        s->init_num = 0;
+                        s->internal->init_num = 0;
                         s->state = SSL3_ST_SR_FINISHED_A;
                         break;
 
@@ -566,13 +566,13 @@ ssl3_accept(SSL *s)
                             SSL3_ST_SR_FINISHED_B);
                         if (ret <= 0)
                                 goto end;
-                        if (s->hit)
+                        if (s->internal->hit)
                                 s->state = SSL_ST_OK;
-                        else if (s->tlsext_ticket_expected)
+                        else if (s->internal->tlsext_ticket_expected)
                                 s->state = SSL3_ST_SW_SESSION_TICKET_A;
                         else
                                 s->state = SSL3_ST_SW_CHANGE_A;
-                        s->init_num = 0;
+                        s->internal->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_SESSION_TICKET_A:
@@ -581,7 +581,7 @@ ssl3_accept(SSL *s)
                         if (ret <= 0)
                                 goto end;
                         s->state = SSL3_ST_SW_CHANGE_A;
-                        s->init_num = 0;
+                        s->internal->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_CERT_STATUS_A:
@@ -590,7 +590,7 @@ ssl3_accept(SSL *s)
                         if (ret <= 0)
                                 goto end;
                         s->state = SSL3_ST_SW_KEY_EXCH_A;
-                        s->init_num = 0;
+                        s->internal->init_num = 0;
                         break;
 
 
@@ -609,7 +609,7 @@ ssl3_accept(SSL *s)
                         if (ret <= 0)
                                 goto end;
                         s->state = SSL3_ST_SW_FINISHED_A;
-                        s->init_num = 0;
+                        s->internal->init_num = 0;
 
                         if (!s->method->ssl3_enc->change_cipher_state(
                             s, SSL3_CHANGE_CIPHER_SERVER_WRITE)) {
@@ -628,7 +628,7 @@ ssl3_accept(SSL *s)
                         if (ret <= 0)
                                 goto end;
                         s->state = SSL3_ST_SW_FLUSH;
-                        if (s->hit) {
+                        if (s->internal->hit) {
                                 if (S3I(s)->next_proto_neg_seen) {
                                         s->s3->flags |= SSL3_FLAGS_CCS_OK;
                                         S3I(s)->tmp.next_state =
@@ -638,25 +638,25 @@ ssl3_accept(SSL *s)
                                             SSL3_ST_SR_FINISHED_A;
                         } else
                                 S3I(s)->tmp.next_state = SSL_ST_OK;
-                        s->init_num = 0;
+                        s->internal->init_num = 0;
                         break;
 
                 case SSL_ST_OK:
                         /* clean a few things up */
                         tls1_cleanup_key_block(s);
 
-                        BUF_MEM_free(s->init_buf);
-                        s->init_buf = NULL;
+                        BUF_MEM_free(s->internal->init_buf);
+                        s->internal->init_buf = NULL;
 
                         /* remove buffering on output */
                         ssl_free_wbio_buffer(s);
 
-                        s->init_num = 0;
+                        s->internal->init_num = 0;
 
                         /* skipped if we just sent a HelloRequest */
-                        if (s->renegotiate == 2) {
-                                s->renegotiate = 0;
-                                s->new_session = 0;
+                        if (s->internal->renegotiate == 2) {
+                                s->internal->renegotiate = 0;
+                                s->internal->new_session = 0;
 
                                 ssl_update_cache(s, SSL_SESS_CACHE_SERVER);
 
@@ -681,7 +681,7 @@ ssl3_accept(SSL *s)
                 }
 
                 if (!S3I(s)->tmp.reuse_message && !skip) {
-                        if (s->debug) {
+                        if (s->internal->debug) {
                                 if ((ret = BIO_flush(s->wbio)) <= 0)
                                         goto end;
                         }
@@ -741,15 +741,15 @@ ssl3_get_client_hello(SSL *s)
         if (s->state == SSL3_ST_SR_CLNT_HELLO_A) {
                 s->state = SSL3_ST_SR_CLNT_HELLO_B;
         }
-        s->first_packet = 1;
+        s->internal->first_packet = 1;
         n = s->method->ssl_get_message(s, SSL3_ST_SR_CLNT_HELLO_B,
             SSL3_ST_SR_CLNT_HELLO_C, SSL3_MT_CLIENT_HELLO,
             SSL3_RT_MAX_PLAIN_LENGTH, &ok);
 
         if (!ok)
                 return ((int)n);
-        s->first_packet = 0;
-        d = p = (unsigned char *)s->init_msg;
+        s->internal->first_packet = 0;
+        d = p = (unsigned char *)s->internal->init_msg;
 
         if (2 > n)
                 goto truncated;
@@ -765,7 +765,7 @@ ssl3_get_client_hello(SSL *s)
                 SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,
                     SSL_R_WRONG_VERSION_NUMBER);
                 if ((s->client_version >> 8) == SSL3_VERSION_MAJOR &&
-                        !s->enc_write_ctx && !s->write_hash) {
+                        !s->internal->enc_write_ctx && !s->internal->write_hash) {
                         /*
                          * Similar to ssl3_get_record, send alert using remote
                          * version number
@@ -808,7 +808,7 @@ ssl3_get_client_hello(SSL *s)
         if (p - d + j > n)
                 goto truncated;
 
-        s->hit = 0;
+        s->internal->hit = 0;
         /*
          * Versions before 0.9.7 always allow clients to resume sessions in
          * renegotiation. 0.9.7 and later allow this by default, but optionally
@@ -819,19 +819,19 @@ 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->new_session
+         * to request renegotiation but not a new session (s->internal->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->new_session && (s->options &
+        if ((s->internal->new_session && (s->options &
             SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION))) {
                 if (!ssl_get_new_session(s, 1))
                         goto err;
         } else {
                 i = ssl_get_prev_session(s, p, j, d + n);
                 if (i == 1) { /* previous session */
-                        s->hit = 1;
+                        s->internal->hit = 1;
                 } else if (i == -1)
                         goto err;
                 else {
@@ -913,7 +913,7 @@ ssl3_get_client_hello(SSL *s)
         p += i;
 
         /* If it is a hit, check that the cipher is in the list */
-        if ((s->hit) && (i > 0)) {
+        if ((s->internal->hit) && (i > 0)) {
                 j = 0;
                 id = s->session->cipher->id;
 
@@ -976,14 +976,14 @@ ssl3_get_client_hello(SSL *s)
          */
         arc4random_buf(s->s3->server_random, SSL3_RANDOM_SIZE);
 
-        if (!s->hit && s->internal->tls_session_secret_cb) {
+        if (!s->internal->hit && s->internal->tls_session_secret_cb) {
                 SSL_CIPHER *pref_cipher = NULL;
 
                 s->session->master_key_length = sizeof(s->session->master_key);
                 if (s->internal->tls_session_secret_cb(s, s->session->master_key,
                     &s->session->master_key_length, ciphers, &pref_cipher,
                     s->internal->tls_session_secret_cb_arg)) {
-                        s->hit = 1;
+                        s->internal->hit = 1;
                         s->session->ciphers = ciphers;
                         s->session->verify_result = X509_V_OK;
 
@@ -1005,11 +1005,11 @@ ssl3_get_client_hello(SSL *s)
                         if (s->cipher_list)
                                 sk_SSL_CIPHER_free(s->cipher_list);
 
-                        if (s->cipher_list_by_id)
-                                sk_SSL_CIPHER_free(s->cipher_list_by_id);
+                        if (s->internal->cipher_list_by_id)
+                                sk_SSL_CIPHER_free(s->internal->cipher_list_by_id);
 
                         s->cipher_list = sk_SSL_CIPHER_dup(s->session->ciphers);
-                        s->cipher_list_by_id =
+                        s->internal->cipher_list_by_id =
                             sk_SSL_CIPHER_dup(s->session->ciphers);
                 }
         }
@@ -1019,7 +1019,7 @@ ssl3_get_client_hello(SSL *s)
          * pick a cipher
          */
 
-        if (!s->hit) {
+        if (!s->internal->hit) {
                 if (s->session->ciphers != NULL)
                         sk_SSL_CIPHER_free(s->session->ciphers);
                 s->session->ciphers = ciphers;
@@ -1061,7 +1061,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->hit               - session reuse flag
+         * s->internal->hit             - session reuse flag
          * s->tmp.new_cipher    - the new cipher to use.
          */
 
@@ -1097,7 +1097,7 @@ ssl3_send_server_hello(SSL *s)
 
         memset(&cbb, 0, sizeof(cbb));
 
-        bufend = (unsigned char *)s->init_buf->data + SSL3_RT_MAX_PLAIN_LENGTH;
+        bufend = (unsigned char *)s->internal->init_buf->data + SSL3_RT_MAX_PLAIN_LENGTH;
 
         if (s->state == SSL3_ST_SW_SRVR_HELLO_A) {
                 d = p = ssl3_handshake_msg_start(s, SSL3_MT_SERVER_HELLO);
@@ -1125,12 +1125,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->hit is non-zero in either case of session reuse,
+                 * s->internal->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->hit)
+                    && !s->internal->hit)
                         s->session->session_id_length = 0;
 
                 sl = s->session->session_id_length;
@@ -1491,7 +1491,7 @@ ssl3_send_server_key_exchange(SSL *s)
                 type = S3I(s)->tmp.new_cipher->algorithm_mkey;
                 cert = s->cert;
 
-                buf = s->init_buf;
+                buf = s->internal->init_buf;
 
                 if (!CBB_init(&cbb, 0))
                         goto err;
@@ -1647,7 +1647,7 @@ ssl3_send_certificate_request(SSL *s)
         BUF_MEM *buf;
 
         if (s->state == SSL3_ST_SW_CERT_REQ_A) {
-                buf = s->init_buf;
+                buf = s->internal->init_buf;
 
                 d = p = ssl3_handshake_msg_start(s,
                     SSL3_MT_CERTIFICATE_REQUEST);
@@ -1986,7 +1986,7 @@ ssl3_get_client_kex_ecdhe_ecp(SSL *s, unsigned char *p, long n)
                  * p is pointing to somewhere in the buffer
                  * currently, so set it to the start.
                  */
-                p = (unsigned char *)s->init_buf->data;
+                p = (unsigned char *)s->internal->init_buf->data;
         }
 
         /* Compute the shared pre-master secret */
@@ -2169,7 +2169,7 @@ ssl3_get_client_key_exchange(SSL *s)
         if (!ok)
                 return ((int)n);
 
-        p = (unsigned char *)s->init_msg;
+        p = (unsigned char *)s->internal->init_msg;
 
         alg_k = S3I(s)->tmp.new_cipher->algorithm_mkey;
 
@@ -2261,7 +2261,7 @@ ssl3_get_cert_verify(SSL *s)
         }
 
         /* we now have a signature that we need to verify */
-        p = (unsigned char *)s->init_msg;
+        p = (unsigned char *)s->internal->init_msg;
         /*
          * Check for broken implementations of GOST ciphersuites.
          *
@@ -2477,7 +2477,7 @@ ssl3_get_client_certificate(SSL *s)
         STACK_OF(X509) *sk = NULL;
 
         n = s->method->ssl_get_message(s, SSL3_ST_SR_CERT_A, SSL3_ST_SR_CERT_B,
-            -1, s->max_cert_list, &ok);
+            -1, s->internal->max_cert_list, &ok);
 
         if (!ok)
                 return ((int)n);
@@ -2515,7 +2515,7 @@ ssl3_get_client_certificate(SSL *s)
         if (n < 0)
                 goto truncated;
 
-        CBS_init(&cbs, s->init_msg, n);
+        CBS_init(&cbs, s->internal->init_msg, n);
 
         if ((sk = sk_X509_new_null()) == NULL) {
                 SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,
@@ -2727,7 +2727,7 @@ ssl3_send_newsession_ticket(SSL *s)
                  * session_length + max_enc_block_size (max encrypted session
                  * length) + max_md_size (HMAC).
                  */
-                if (!BUF_MEM_grow(s->init_buf, ssl3_handshake_msg_hdr_len(s) +
+                if (!BUF_MEM_grow(s->internal->init_buf, ssl3_handshake_msg_hdr_len(s) +
                     22 + EVP_MAX_IV_LENGTH + EVP_MAX_BLOCK_LENGTH +
                     EVP_MAX_MD_SIZE + slen))
                         goto err;
@@ -2763,7 +2763,7 @@ ssl3_send_newsession_ticket(SSL *s)
                  * (for simplicity), and guess that tickets for new
                  * sessions will live as long as their sessions.
                  */
-                l2n(s->hit ? 0 : s->session->timeout, p);
+                l2n(s->internal->hit ? 0 : s->session->timeout, p);
 
                 /* Skip ticket length for now */
                 p += 2;
@@ -2825,17 +2825,17 @@ ssl3_send_cert_status(SSL *s)
                  * 1 (ocsp response type) + 3 (ocsp response length)
                  * + (ocsp response)
                  */
-                if (!BUF_MEM_grow(s->init_buf, SSL3_HM_HEADER_LENGTH + 4 +
-                    s->tlsext_ocsp_resplen))
+                if (!BUF_MEM_grow(s->internal->init_buf, SSL3_HM_HEADER_LENGTH + 4 +
+                    s->internal->tlsext_ocsp_resplen))
                         return (-1);
 
                 p = ssl3_handshake_msg_start(s, SSL3_MT_CERTIFICATE_STATUS);
 
                 *(p++) = s->tlsext_status_type;
-                l2n3(s->tlsext_ocsp_resplen, p);
-                memcpy(p, s->tlsext_ocsp_resp, s->tlsext_ocsp_resplen);
+                l2n3(s->internal->tlsext_ocsp_resplen, p);
+                memcpy(p, s->internal->tlsext_ocsp_resp, s->internal->tlsext_ocsp_resplen);
 
-                ssl3_handshake_msg_finish(s, s->tlsext_ocsp_resplen + 4);
+                ssl3_handshake_msg_finish(s, s->internal->tlsext_ocsp_resplen + 4);
 
                 s->state = SSL3_ST_SW_CERT_STATUS_B;
         }
@@ -2887,7 +2887,7 @@ ssl3_get_next_proto(SSL *s)
                 return (0);
         /* The body must be > 1 bytes long */
 
-        CBS_init(&cbs, s->init_msg, s->init_num);
+        CBS_init(&cbs, s->internal->init_msg, s->internal->init_num);
 
         /*
          * The payload looks like: