From fc467ef0c8f7ce69a78b11fce57aabbf9c78b886 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sat, 23 Oct 2021 13:36:03 +0000
Subject: Fold DTLS1_STATE_INTERNAL into DTLS1_STATE.

Now that DTLS1_STATE is opaque, fold DTLS1_STATE_INTERNAL back into
DTLS1_STATE and remove D1I() usage.

ok tb@
---
 src/lib/libssl/ssl_srvr.c | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'src/lib/libssl/ssl_srvr.c')

diff --git a/src/lib/libssl/ssl_srvr.c b/src/lib/libssl/ssl_srvr.c
index 1bbe551b3c..1aa0324b15 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.120 2021/10/23 08:34:36 jsing Exp $ */
+/* $OpenBSD: ssl_srvr.c,v 1.121 2021/10/23 13:36:03 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -183,7 +183,7 @@ ssl3_accept(SSL *s)
 	errno = 0;
 
 	if (SSL_is_dtls(s))
-		listen = D1I(s)->listen;
+		listen = s->d1->listen;
 
 	/* init things to blank */
 	s->internal->in_handshake++;
@@ -191,7 +191,7 @@ ssl3_accept(SSL *s)
 		SSL_clear(s);
 
 	if (SSL_is_dtls(s))
-		D1I(s)->listen = listen;
+		s->d1->listen = listen;
 
 	for (;;) {
 		state = S3I(s)->hs.state;
@@ -332,14 +332,14 @@ ssl3_accept(SSL *s)
 				/* If we're just listening, stop here */
 				if (listen && S3I(s)->hs.state == SSL3_ST_SW_SRVR_HELLO_A) {
 					ret = 2;
-					D1I(s)->listen = 0;
+					s->d1->listen = 0;
 					/*
 					 * Set expected sequence numbers to
 					 * continue the handshake.
 					 */
-					D1I(s)->handshake_read_seq = 2;
-					D1I(s)->handshake_write_seq = 1;
-					D1I(s)->next_handshake_write_seq = 1;
+					s->d1->handshake_read_seq = 2;
+					s->d1->handshake_write_seq = 1;
+					s->d1->next_handshake_write_seq = 1;
 					goto end;
 				}
 			} else {
@@ -584,7 +584,7 @@ ssl3_accept(SSL *s)
 		case SSL3_ST_SR_CERT_VRFY_A:
 		case SSL3_ST_SR_CERT_VRFY_B:
 			if (SSL_is_dtls(s))
-				D1I(s)->change_cipher_spec_ok = 1;
+				s->d1->change_cipher_spec_ok = 1;
 			else
 				s->s3->flags |= SSL3_FLAGS_CCS_OK;
 
@@ -599,7 +599,7 @@ ssl3_accept(SSL *s)
 		case SSL3_ST_SR_FINISHED_A:
 		case SSL3_ST_SR_FINISHED_B:
 			if (SSL_is_dtls(s))
-				D1I(s)->change_cipher_spec_ok = 1;
+				s->d1->change_cipher_spec_ok = 1;
 			else
 				s->s3->flags |= SSL3_FLAGS_CCS_OK;
 			ret = ssl3_get_finished(s, SSL3_ST_SR_FINISHED_A,
@@ -706,10 +706,10 @@ ssl3_accept(SSL *s)
 
 			if (SSL_is_dtls(s)) {
 				/* Done handshaking, next message is client hello. */
-				D1I(s)->handshake_read_seq = 0;
+				s->d1->handshake_read_seq = 0;
 				/* Next message is server hello. */
-				D1I(s)->handshake_write_seq = 0;
-				D1I(s)->next_handshake_write_seq = 0;
+				s->d1->handshake_write_seq = 0;
+				s->d1->next_handshake_write_seq = 0;
 			}
 			goto end;
 			/* break; */
@@ -924,7 +924,7 @@ ssl3_get_client_hello(SSL *s)
 		 * message has not been sent - make sure that it does not cause
 		 * an overflow.
 		 */
-		if (CBS_len(&cookie) > sizeof(D1I(s)->rcvd_cookie)) {
+		if (CBS_len(&cookie) > sizeof(s->d1->rcvd_cookie)) {
 			al = SSL_AD_DECODE_ERROR;
 			SSLerror(s, SSL_R_COOKIE_MISMATCH);
 			goto fatal_err;
@@ -936,21 +936,21 @@ ssl3_get_client_hello(SSL *s)
 			size_t cookie_len;
 
 			/* XXX - rcvd_cookie seems to only be used here... */
-			if (!CBS_write_bytes(&cookie, D1I(s)->rcvd_cookie,
-			    sizeof(D1I(s)->rcvd_cookie), &cookie_len))
+			if (!CBS_write_bytes(&cookie, s->d1->rcvd_cookie,
+			    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,
-				    D1I(s)->rcvd_cookie, cookie_len) == 0) {
+				    s->d1->rcvd_cookie, cookie_len) == 0) {
 					al = SSL_AD_HANDSHAKE_FAILURE;
 					SSLerror(s, SSL_R_COOKIE_MISMATCH);
 					goto fatal_err;
 				}
 				/* else cookie verification succeeded */
 			/* XXX - can d1->cookie_len > sizeof(rcvd_cookie) ? */
-			} else if (timingsafe_memcmp(D1I(s)->rcvd_cookie,
-			    D1I(s)->cookie, D1I(s)->cookie_len) != 0) {
+			} else if (timingsafe_memcmp(s->d1->rcvd_cookie,
+			    s->d1->cookie, s->d1->cookie_len) != 0) {
 				/* default verification */
 				al = SSL_AD_HANDSHAKE_FAILURE;
 				SSLerror(s, SSL_R_COOKIE_MISMATCH);
@@ -1166,8 +1166,8 @@ ssl3_send_dtls_hello_verify_request(SSL *s)
 
 	if (S3I(s)->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, D1I(s)->cookie,
-			&(D1I(s)->cookie_len)) == 0) {
+		    s->ctx->internal->app_gen_cookie_cb(s, s->d1->cookie,
+			&(s->d1->cookie_len)) == 0) {
 			SSLerror(s, ERR_R_INTERNAL_ERROR);
 			return 0;
 		}
@@ -1184,7 +1184,7 @@ ssl3_send_dtls_hello_verify_request(SSL *s)
 			goto err;
 		if (!CBB_add_u8_length_prefixed(&verify, &cookie))
 			goto err;
-		if (!CBB_add_bytes(&cookie, D1I(s)->cookie, D1I(s)->cookie_len))
+		if (!CBB_add_bytes(&cookie, s->d1->cookie, s->d1->cookie_len))
 			goto err;
 		if (!ssl3_handshake_msg_finish(s, &cbb))
 			goto err;
-- 
cgit v1.2.3-55-g6feb