send state and rstate from ssl_st into internal. There are accessors

so these should not be diddled with directly
ok jsing@

1 files changed, 46 insertions, 46 deletions

diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c
index 78816cda46..81a05eb30e 100644
--- a/src/lib/libssl/d1_srvr.c
+++ b/src/lib/libssl/d1_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_srvr.c,v 1.76 2017/01/23 06:45:30 beck Exp $ */
+/* $OpenBSD: d1_srvr.c,v 1.77 2017/01/23 08:48:44 beck Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -209,12 +209,12 @@ dtls1_accept(SSL *s)
         }
 
         for (;;) {
-                state = s->state;
+                state = s->internal->state;
 
-                switch (s->state) {
+                switch (s->internal->state) {
                 case SSL_ST_RENEGOTIATE:
                         s->internal->renegotiate = 1;
-                        /* s->state=SSL_ST_ACCEPT; */
+                        /* s->internal->state=SSL_ST_ACCEPT; */
 
                 case SSL_ST_BEFORE:
                 case SSL_ST_ACCEPT:
@@ -243,7 +243,7 @@ dtls1_accept(SSL *s)
 
                         s->internal->init_num = 0;
 
-                        if (s->state != SSL_ST_RENEGOTIATE) {
+                        if (s->internal->state != SSL_ST_RENEGOTIATE) {
                                 /* Ok, we now need to push on a buffering BIO so that
                                  * the output is sent in a way that TCP likes :-)
                                  * ...but not with SCTP :-)
@@ -258,13 +258,13 @@ dtls1_accept(SSL *s)
                                         goto end;
                                 }
 
-                                s->state = SSL3_ST_SR_CLNT_HELLO_A;
+                                s->internal->state = SSL3_ST_SR_CLNT_HELLO_A;
                                 s->ctx->internal->stats.sess_accept++;
                         } else {
-                                /* s->state == SSL_ST_RENEGOTIATE,
+                                /* s->internal->state == SSL_ST_RENEGOTIATE,
                                  * we will just send a HelloRequest */
                                 s->ctx->internal->stats.sess_accept_renegotiate++;
-                                s->state = SSL3_ST_SW_HELLO_REQ_A;
+                                s->internal->state = SSL3_ST_SW_HELLO_REQ_A;
                         }
 
                         break;
@@ -279,7 +279,7 @@ dtls1_accept(SSL *s)
                         if (ret <= 0)
                                 goto end;
                         S3I(s)->tmp.next_state = SSL3_ST_SR_CLNT_HELLO_A;
-                        s->state = SSL3_ST_SW_FLUSH;
+                        s->internal->state = SSL3_ST_SW_FLUSH;
                         s->internal->init_num = 0;
 
                         if (!tls1_init_finished_mac(s)) {
@@ -289,7 +289,7 @@ dtls1_accept(SSL *s)
                         break;
 
                 case SSL3_ST_SW_HELLO_REQ_C:
-                        s->state = SSL_ST_OK;
+                        s->internal->state = SSL_ST_OK;
                         break;
 
                 case SSL3_ST_SR_CLNT_HELLO_A:
@@ -303,9 +303,9 @@ dtls1_accept(SSL *s)
                         dtls1_stop_timer(s);
 
                         if (ret == 1 && (SSL_get_options(s) & SSL_OP_COOKIE_EXCHANGE))
-                                s->state = DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A;
+                                s->internal->state = DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A;
                         else
-                                s->state = SSL3_ST_SW_SRVR_HELLO_A;
+                                s->internal->state = SSL3_ST_SW_SRVR_HELLO_A;
 
                         s->internal->init_num = 0;
 
@@ -315,7 +315,7 @@ dtls1_accept(SSL *s)
                         }
 
                         /* If we're just listening, stop here */
-                        if (listen && s->state == SSL3_ST_SW_SRVR_HELLO_A) {
+                        if (listen && s->internal->state == SSL3_ST_SW_SRVR_HELLO_A) {
                                 ret = 2;
                                 D1I(s)->listen = 0;
                                 /* Set expected sequence numbers
@@ -335,7 +335,7 @@ dtls1_accept(SSL *s)
                         ret = dtls1_send_hello_verify_request(s);
                         if (ret <= 0)
                                 goto end;
-                        s->state = SSL3_ST_SW_FLUSH;
+                        s->internal->state = SSL3_ST_SW_FLUSH;
                         S3I(s)->tmp.next_state = SSL3_ST_SR_CLNT_HELLO_A;
 
                         /* HelloVerifyRequest resets Finished MAC */
@@ -356,11 +356,11 @@ dtls1_accept(SSL *s)
 
                         if (s->internal->hit) {
                                 if (s->internal->tlsext_ticket_expected)
-                                        s->state = SSL3_ST_SW_SESSION_TICKET_A;
+                                        s->internal->state = SSL3_ST_SW_SESSION_TICKET_A;
                                 else
-                                        s->state = SSL3_ST_SW_CHANGE_A;
+                                        s->internal->state = SSL3_ST_SW_CHANGE_A;
                         } else
-                                s->state = SSL3_ST_SW_CERT_A;
+                                s->internal->state = SSL3_ST_SW_CERT_A;
                         s->internal->init_num = 0;
                         break;
 
@@ -374,12 +374,12 @@ dtls1_accept(SSL *s)
                                 if (ret <= 0)
                                         goto end;
                                 if (s->internal->tlsext_status_expected)
-                                        s->state = SSL3_ST_SW_CERT_STATUS_A;
+                                        s->internal->state = SSL3_ST_SW_CERT_STATUS_A;
                                 else
-                                        s->state = SSL3_ST_SW_KEY_EXCH_A;
+                                        s->internal->state = SSL3_ST_SW_KEY_EXCH_A;
                         } else {
                                 skip = 1;
-                                s->state = SSL3_ST_SW_KEY_EXCH_A;
+                                s->internal->state = SSL3_ST_SW_KEY_EXCH_A;
                         }
                         s->internal->init_num = 0;
                         break;
@@ -397,7 +397,7 @@ dtls1_accept(SSL *s)
                         } else
                                 skip = 1;
 
-                        s->state = SSL3_ST_SW_CERT_REQ_A;
+                        s->internal->state = SSL3_ST_SW_CERT_REQ_A;
                         s->internal->init_num = 0;
                         break;
 
@@ -429,14 +429,14 @@ dtls1_accept(SSL *s)
                                 /* no cert request */
                                 skip = 1;
                                 S3I(s)->tmp.cert_request = 0;
-                                s->state = SSL3_ST_SW_SRVR_DONE_A;
+                                s->internal->state = SSL3_ST_SW_SRVR_DONE_A;
                         } else {
                                 S3I(s)->tmp.cert_request = 1;
                                 dtls1_start_timer(s);
                                 ret = ssl3_send_certificate_request(s);
                                 if (ret <= 0)
                                         goto end;
-                                s->state = SSL3_ST_SW_SRVR_DONE_A;
+                                s->internal->state = SSL3_ST_SW_SRVR_DONE_A;
                                 s->internal->init_num = 0;
                         }
                         break;
@@ -448,7 +448,7 @@ dtls1_accept(SSL *s)
                         if (ret <= 0)
                                 goto end;
                         S3I(s)->tmp.next_state = SSL3_ST_SR_CERT_A;
-                        s->state = SSL3_ST_SW_FLUSH;
+                        s->internal->state = SSL3_ST_SW_FLUSH;
                         s->internal->init_num = 0;
                         break;
 
@@ -458,14 +458,14 @@ dtls1_accept(SSL *s)
                                 /* If the write error was fatal, stop trying */
                                 if (!BIO_should_retry(s->wbio)) {
                                         s->internal->rwstate = SSL_NOTHING;
-                                        s->state = S3I(s)->tmp.next_state;
+                                        s->internal->state = S3I(s)->tmp.next_state;
                                 }
 
                                 ret = -1;
                                 goto end;
                         }
                         s->internal->rwstate = SSL_NOTHING;
-                        s->state = S3I(s)->tmp.next_state;
+                        s->internal->state = S3I(s)->tmp.next_state;
                         break;
 
                 case SSL3_ST_SR_CERT_A:
@@ -476,7 +476,7 @@ dtls1_accept(SSL *s)
                                         goto end;
                         }
                         s->internal->init_num = 0;
-                        s->state = SSL3_ST_SR_KEY_EXCH_A;
+                        s->internal->state = SSL3_ST_SR_KEY_EXCH_A;
                         break;
 
                 case SSL3_ST_SR_KEY_EXCH_A:
@@ -485,7 +485,7 @@ dtls1_accept(SSL *s)
                         if (ret <= 0)
                                 goto end;
 
-                        s->state = SSL3_ST_SR_CERT_VRFY_A;
+                        s->internal->state = SSL3_ST_SR_CERT_VRFY_A;
                         s->internal->init_num = 0;
 
                         if (ret == 2) {
@@ -494,10 +494,10 @@ dtls1_accept(SSL *s)
                                  * a certificate, the CertificateVerify
                                  * message is not sent.
                                  */
-                                s->state = SSL3_ST_SR_FINISHED_A;
+                                s->internal->state = SSL3_ST_SR_FINISHED_A;
                                 s->internal->init_num = 0;
                         } else if (SSL_USE_SIGALGS(s)) {
-                                s->state = SSL3_ST_SR_CERT_VRFY_A;
+                                s->internal->state = SSL3_ST_SR_CERT_VRFY_A;
                                 s->internal->init_num = 0;
                                 if (!s->session->peer)
                                         break;
@@ -518,7 +518,7 @@ dtls1_accept(SSL *s)
                                         goto end;
                                 }
                         } else {
-                                s->state = SSL3_ST_SR_CERT_VRFY_A;
+                                s->internal->state = SSL3_ST_SR_CERT_VRFY_A;
                                 s->internal->init_num = 0;
 
                                 /* We need to get hashes here so if there is
@@ -539,7 +539,7 @@ dtls1_accept(SSL *s)
                         ret = ssl3_get_cert_verify(s);
                         if (ret <= 0)
                                 goto end;
-                        s->state = SSL3_ST_SR_FINISHED_A;
+                        s->internal->state = SSL3_ST_SR_FINISHED_A;
                         s->internal->init_num = 0;
                         break;
 
@@ -552,11 +552,11 @@ dtls1_accept(SSL *s)
                                 goto end;
                         dtls1_stop_timer(s);
                         if (s->internal->hit)
-                                s->state = SSL_ST_OK;
+                                s->internal->state = SSL_ST_OK;
                         else if (s->internal->tlsext_ticket_expected)
-                                s->state = SSL3_ST_SW_SESSION_TICKET_A;
+                                s->internal->state = SSL3_ST_SW_SESSION_TICKET_A;
                         else
-                                s->state = SSL3_ST_SW_CHANGE_A;
+                                s->internal->state = SSL3_ST_SW_CHANGE_A;
                         s->internal->init_num = 0;
                         break;
 
@@ -565,7 +565,7 @@ dtls1_accept(SSL *s)
                         ret = ssl3_send_newsession_ticket(s);
                         if (ret <= 0)
                                 goto end;
-                        s->state = SSL3_ST_SW_CHANGE_A;
+                        s->internal->state = SSL3_ST_SW_CHANGE_A;
                         s->internal->init_num = 0;
                         break;
 
@@ -574,7 +574,7 @@ dtls1_accept(SSL *s)
                         ret = ssl3_send_cert_status(s);
                         if (ret <= 0)
                                 goto end;
-                        s->state = SSL3_ST_SW_KEY_EXCH_A;
+                        s->internal->state = SSL3_ST_SW_KEY_EXCH_A;
                         s->internal->init_num = 0;
                         break;
 
@@ -595,7 +595,7 @@ dtls1_accept(SSL *s)
                                 goto end;
 
 
-                        s->state = SSL3_ST_SW_FINISHED_A;
+                        s->internal->state = SSL3_ST_SW_FINISHED_A;
                         s->internal->init_num = 0;
 
                         if (!s->method->ssl3_enc->change_cipher_state(s,
@@ -615,7 +615,7 @@ dtls1_accept(SSL *s)
                             s->method->ssl3_enc->server_finished_label_len);
                         if (ret <= 0)
                                 goto end;
-                        s->state = SSL3_ST_SW_FLUSH;
+                        s->internal->state = SSL3_ST_SW_FLUSH;
                         if (s->internal->hit) {
                                 S3I(s)->tmp.next_state = SSL3_ST_SR_FINISHED_A;
 
@@ -672,11 +672,11 @@ dtls1_accept(SSL *s)
                                         goto end;
                         }
 
-                        if ((cb != NULL) && (s->state != state)) {
-                                new_state = s->state;
-                                s->state = state;
+                        if ((cb != NULL) && (s->internal->state != state)) {
+                                new_state = s->internal->state;
+                                s->internal->state = state;
                                 cb(s, SSL_CB_ACCEPT_LOOP, 1);
-                                s->state = new_state;
+                                s->internal->state = new_state;
                         }
                 }
                 skip = 0;
@@ -697,7 +697,7 @@ dtls1_send_hello_verify_request(SSL *s)
 {
         unsigned char *d, *p;
 
-        if (s->state == DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A) {
+        if (s->internal->state == DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A) {
                 d = p = ssl3_handshake_msg_start(s,
                     DTLS1_MT_HELLO_VERIFY_REQUEST);
 
@@ -718,9 +718,9 @@ dtls1_send_hello_verify_request(SSL *s)
 
                 ssl3_handshake_msg_finish(s, p - d);
 
-                s->state = DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B;
+                s->internal->state = DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B;
         }
 
-        /* s->state = DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B */
+        /* s->internal->state = DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B */
         return (ssl3_handshake_write(s));
 }