From: Matt Caswell <matt@openssl.org>
Date: Thu, 22 Oct 2015 09:45:29 +0000 (+0100)
Subject: Convert DTLSv1_listen to use new state machine code
X-Git-Tag: OpenSSL_1_1_0-pre1~366
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=5e41ba031edd91bfbac6a614664f83b22fb48207;ds=sidebyside

Convert DTLSv1_listen to use new state machine code

The DTLSv1_listen code set the state value explicitly to move into init.
Change to use state_set_in_init() instead.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index 3a0a4cf443..3bc9fe7362 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -868,11 +868,8 @@ int dtls1_listen(SSL *s, struct sockaddr *client)
      */
     SSL_set_options(s, SSL_OP_COOKIE_EXCHANGE);
 
-    /*
-     * Put us into the "init" state so that dtls1_accept doesn't clear our
-     * state
-     */
-    s->state = SSL_ST_ACCEPT;
+    /* Put us into the "init" state so that we don't get our state cleared */
+    statem_set_in_init(s, 1);
 
     if(BIO_dgram_get_peer(rbio, client) <= 0) {
         SSLerr(SSL_F_DTLS1_LISTEN, ERR_R_INTERNAL_ERROR);