1 files changed, 18 insertions, 18 deletions

diff --git a/src/lib/libssl/s23_srvr.c b/src/lib/libssl/s23_srvr.c
index 79c2eee521..6b5ac0cc63 100644
--- a/src/lib/libssl/s23_srvr.c
+++ b/src/lib/libssl/s23_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s23_srvr.c,v 1.53 2017/01/23 04:55:26 beck Exp $ */
+/* $OpenBSD: s23_srvr.c,v 1.54 2017/01/23 06:45:30 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -152,7 +152,7 @@ ssl23_accept(SSL *s)
                                 cb(s, SSL_CB_HANDSHAKE_START, 1);
 
                         /* s->version=SSL3_VERSION; */
-                        s->type = SSL_ST_ACCEPT;
+                        s->internal->type = SSL_ST_ACCEPT;
 
                         if (!ssl3_setup_init_buffer(s)) {
                                 ret = -1;
@@ -165,13 +165,13 @@ ssl23_accept(SSL *s)
 
                         s->state = SSL23_ST_SR_CLNT_HELLO_A;
                         s->ctx->internal->stats.sess_accept++;
-                        s->init_num = 0;
+                        s->internal->init_num = 0;
                         break;
 
                 case SSL23_ST_SR_CLNT_HELLO_A:
                 case SSL23_ST_SR_CLNT_HELLO_B:
 
-                        s->shutdown = 0;
+                        s->internal->shutdown = 0;
                         ret = ssl23_get_client_hello(s);
                         if (ret >= 0)
                                 cb = NULL;
@@ -237,7 +237,7 @@ ssl23_get_client_hello(SSL *s)
                 if (n != sizeof buf)
                         return(n);
 
-                p = s->packet;
+                p = s->internal->packet;
 
                 memcpy(buf, p, n);
 
@@ -314,7 +314,7 @@ ssl23_get_client_hello(SSL *s)
                         goto unsupported;
 
                 type = 2;
-                p = s->packet;
+                p = s->internal->packet;
                 client_version = p[3] << 8 | p[4];
 
                 /* An SSLv3/TLSv1 backwards-compatible CLIENT-HELLO in an SSLv2
@@ -344,18 +344,18 @@ ssl23_get_client_hello(SSL *s)
                 if (j != n + 2)
                         return -1;
 
-                tls1_finish_mac(s, s->packet + 2, s->packet_length - 2);
+                tls1_finish_mac(s, s->internal->packet + 2, s->internal->packet_length - 2);
                 if (s->internal->msg_callback)
-                        s->internal->msg_callback(0, SSL2_VERSION, 0, s->packet + 2,
-                            s->packet_length - 2, s, s->internal->msg_callback_arg);
+                        s->internal->msg_callback(0, SSL2_VERSION, 0, s->internal->packet + 2,
+                            s->internal->packet_length - 2, s, s->internal->msg_callback_arg);
 
-                p = s->packet;
+                p = s->internal->packet;
                 p += 5;
                 n2s(p, csl);
                 n2s(p, sil);
                 n2s(p, cl);
-                d = (unsigned char *)s->init_buf->data;
-                if ((csl + sil + cl + 11) != s->packet_length) {
+                d = (unsigned char *)s->internal->init_buf->data;
+                if ((csl + sil + cl + 11) != s->internal->packet_length) {
                         /*
                          * We can't have TLS extensions in SSL 2.0 format
                          * Client Hello, can we ? Error condition should be
@@ -403,7 +403,7 @@ ssl23_get_client_hello(SSL *s)
                 *(d++) = 1;
                 *(d++) = 0;
 
-                i = (d - (unsigned char *)s->init_buf->data) - 4;
+                i = (d - (unsigned char *)s->internal->init_buf->data) - 4;
                 l2n3((long)i, d_len);
 
                 /* get the data reused from the init_buf */
@@ -428,17 +428,17 @@ ssl23_get_client_hello(SSL *s)
                         /* put the 'n' bytes we have read into the input buffer
                          * for SSLv3 */
                         s->rstate = SSL_ST_READ_HEADER;
-                        s->packet_length = n;
+                        s->internal->packet_length = n;
                         if (s->s3->rbuf.buf == NULL)
                                 if (!ssl3_setup_read_buffer(s))
                                         return -1;
 
-                        s->packet = &(s->s3->rbuf.buf[0]);
-                        memcpy(s->packet, buf, n);
+                        s->internal->packet = &(s->s3->rbuf.buf[0]);
+                        memcpy(s->internal->packet, buf, n);
                         s->s3->rbuf.left = n;
                         s->s3->rbuf.offset = 0;
                 } else {
-                        s->packet_length = 0;
+                        s->internal->packet_length = 0;
                         s->s3->rbuf.left = 0;
                         s->s3->rbuf.offset = 0;
                 }
@@ -456,7 +456,7 @@ ssl23_get_client_hello(SSL *s)
                 SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO, SSL_R_UNKNOWN_PROTOCOL);
                 return -1;
         }
-        s->init_num = 0;
+        s->internal->init_num = 0;
 
         return (SSL_accept(s));