Move most of DTLS1_STATE to internal.

ok jsing@

1 files changed, 13 insertions, 13 deletions

diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c
index 633eabf8b4..d4b8031150 100644
--- a/src/lib/libssl/d1_clnt.c
+++ b/src/lib/libssl/d1_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_clnt.c,v 1.60 2017/01/21 06:50:02 jsing Exp $ */
+/* $OpenBSD: d1_clnt.c,v 1.61 2017/01/22 07:16:38 beck Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -247,7 +247,7 @@ dtls1_connect(SSL *s)
                         /* mark client_random uninitialized */
                         memset(s->s3->client_random, 0,
                             sizeof(s->s3->client_random));
-                        s->d1->send_cookie = 0;
+                        D1I(s)->send_cookie = 0;
                         s->hit = 0;
                         break;
 
@@ -268,7 +268,7 @@ dtls1_connect(SSL *s)
                         if (ret <= 0)
                                 goto end;
 
-                        if (s->d1->send_cookie) {
+                        if (D1I(s)->send_cookie) {
                                 s->state = SSL3_ST_CW_FLUSH;
                                 s->s3->tmp.next_state = SSL3_ST_CR_SRVR_HELLO_A;
                         } else
@@ -304,7 +304,7 @@ dtls1_connect(SSL *s)
                         if (ret <= 0)
                                 goto end;
                         dtls1_stop_timer(s);
-                        if ( s->d1->send_cookie) /* start again, with a cookie */
+                        if ( D1I(s)->send_cookie) /* start again, with a cookie */
                                 s->state = SSL3_ST_CW_CLNT_HELLO_A;
                         else
                                 s->state = SSL3_ST_CR_CERT_A;
@@ -507,7 +507,7 @@ dtls1_connect(SSL *s)
 
                 case SSL3_ST_CR_FINISHED_A:
                 case SSL3_ST_CR_FINISHED_B:
-                        s->d1->change_cipher_spec_ok = 1;
+                        D1I(s)->change_cipher_spec_ok = 1;
                         ret = ssl3_get_finished(s, SSL3_ST_CR_FINISHED_A,
                             SSL3_ST_CR_FINISHED_B);
                         if (ret <= 0)
@@ -566,8 +566,8 @@ dtls1_connect(SSL *s)
                                 cb(s, SSL_CB_HANDSHAKE_DONE, 1);
 
                         /* done with handshaking */
-                        s->d1->handshake_read_seq = 0;
-                        s->d1->next_handshake_write_seq = 0;
+                        D1I(s)->handshake_read_seq = 0;
+                        D1I(s)->next_handshake_write_seq = 0;
                         goto end;
                         /* break; */
 
@@ -619,7 +619,7 @@ dtls1_get_hello_verify(SSL *s)
                 return ((int)n);
 
         if (s->s3->tmp.message_type != DTLS1_MT_HELLO_VERIFY_REQUEST) {
-                s->d1->send_cookie = 0;
+                D1I(s)->send_cookie = 0;
                 s->s3->tmp.reuse_message = 1;
                 return (1);
         }
@@ -642,14 +642,14 @@ dtls1_get_hello_verify(SSL *s)
         if (!CBS_get_u8_length_prefixed(&hello_verify_request, &cookie))
                 goto truncated;
 
-        if (!CBS_write_bytes(&cookie, s->d1->cookie,
-            sizeof(s->d1->cookie), &cookie_len)) {
-                s->d1->cookie_len = 0;
+        if (!CBS_write_bytes(&cookie, D1I(s)->cookie,
+            sizeof(D1I(s)->cookie), &cookie_len)) {
+                D1I(s)->cookie_len = 0;
                 al = SSL_AD_ILLEGAL_PARAMETER;
                 goto f_err;
         }
-        s->d1->cookie_len = cookie_len;
-        s->d1->send_cookie = 1;
+        D1I(s)->cookie_len = cookie_len;
+        D1I(s)->send_cookie = 1;
 
         return 1;