- Fix tls write event for read state change to re-call SSL_write and

  not resume the TLS handshake.

git-svn-id: file:///svn/unbound/trunk@5159 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index acaa42b9b3599e3de4efcb6695da6c02311bdb6d..1083408ddb2e6528166161a9080d7221f4cbf15c 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+15 April 2019: Wouter
+       - Fix tls write event for read state change to re-call SSL_write and
+         not resume the TLS handshake.
+
 11 April 2019: George
        - Update python documentation for init_standard().
        - Typos.

diff --git a/util/netevent.c b/util/netevent.c
index 17b3f2a4938c419b4db49219879272a4c453535e..b8b2a09005eb1f3ff02a97ae056b227ca26d2e7d 100644 (file)
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -1304,7 +1304,7 @@ ssl_handle_write(struct comm_point* c)
                        if(want == SSL_ERROR_ZERO_RETURN) {
                                return 0; /* closed */
                        } else if(want == SSL_ERROR_WANT_READ) {
-                               c->ssl_shake_state = comm_ssl_shake_read;
+                               c->ssl_shake_state = comm_ssl_shake_hs_read;
                                comm_point_listen_for_rw(c, 1, 0);
                                return 1; /* wait for read condition */
                        } else if(want == SSL_ERROR_WANT_WRITE) {
@@ -1342,7 +1342,7 @@ ssl_handle_write(struct comm_point* c)
                if(want == SSL_ERROR_ZERO_RETURN) {
                        return 0; /* closed */
                } else if(want == SSL_ERROR_WANT_READ) {
-                       c->ssl_shake_state = comm_ssl_shake_read;
+                       c->ssl_shake_state = comm_ssl_shake_hs_read;
                        comm_point_listen_for_rw(c, 1, 0);
                        return 1; /* wait for read condition */
                } else if(want == SSL_ERROR_WANT_WRITE) {
@@ -2296,7 +2296,7 @@ ssl_http_write_more(struct comm_point* c)
                if(want == SSL_ERROR_ZERO_RETURN) {
                        return 0; /* closed */
                } else if(want == SSL_ERROR_WANT_READ) {
-                       c->ssl_shake_state = comm_ssl_shake_read;
+                       c->ssl_shake_state = comm_ssl_shake_hs_read;
                        comm_point_listen_for_rw(c, 1, 0);
                        return 1; /* wait for read condition */
                } else if(want == SSL_ERROR_WANT_WRITE) {