diff options
| -rw-r--r-- | ssl/ssl_lib.c | 23 | ||||
| -rw-r--r-- | ssl/ssl_locl.h | 4 | ||||
| -rw-r--r-- | ssl/statem/statem.c | 20 | ||||
| -rw-r--r-- | ssl/statem/statem_clnt.c | 15 | ||||
| -rw-r--r-- | test/heartbeat_test.c | 2 |
5 files changed, 23 insertions, 41 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 9fb6e89b36..83ad9ef107 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -3220,34 +3220,27 @@ const COMP_METHOD *SSL_get_current_expansion(SSL *s) #endif } -int ssl_init_wbio_buffer(SSL *s, int push) +int ssl_init_wbio_buffer(SSL *s) { BIO *bbio; if (s->bbio == NULL) { bbio = BIO_new(BIO_f_buffer()); if (bbio == NULL) - return (0); + return 0; s->bbio = bbio; + s->wbio = BIO_push(bbio, s->wbio); } else { bbio = s->bbio; - if (s->bbio == s->wbio) - s->wbio = BIO_pop(s->wbio); + (void)BIO_reset(bbio); } - (void)BIO_reset(bbio); -/* if (!BIO_set_write_buffer_size(bbio,16*1024)) */ + if (!BIO_set_read_buffer_size(bbio, 1)) { SSLerr(SSL_F_SSL_INIT_WBIO_BUFFER, ERR_R_BUF_LIB); - return (0); - } - if (push) { - if (s->wbio != bbio) - s->wbio = BIO_push(bbio, s->wbio); - } else { - if (s->wbio == bbio) - s->wbio = BIO_pop(bbio); + return 0; } - return (1); + + return 1; } void ssl_free_wbio_buffer(SSL *s) diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 968a2ec6cc..a1f5774673 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -1787,7 +1787,7 @@ const SSL_METHOD *func_name(void) \ } struct openssl_ssl_test_functions { - int (*p_ssl_init_wbio_buffer) (SSL *s, int push); + int (*p_ssl_init_wbio_buffer) (SSL *s); int (*p_ssl3_setup_buffers) (SSL *s); # ifndef OPENSSL_NO_HEARTBEATS int (*p_dtls1_process_heartbeat) (SSL *s, @@ -1963,7 +1963,7 @@ __owur int dtls1_shutdown(SSL *s); __owur int dtls1_dispatch_alert(SSL *s); -__owur int ssl_init_wbio_buffer(SSL *s, int push); +__owur int ssl_init_wbio_buffer(SSL *s); void ssl_free_wbio_buffer(SSL *s); __owur int tls1_change_cipher_state(SSL *s, int which); diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c index d0ea55f7bf..20353c305b 100644 --- a/ssl/statem/statem.c +++ b/ssl/statem/statem.c @@ -320,20 +320,20 @@ static int state_machine(SSL *s, int server) */ s->s3->change_cipher_spec = 0; - if (!server || st->state != MSG_FLOW_RENEGOTIATE) { - /* - * Ok, we now need to push on a buffering BIO ...but not with - * SCTP - */ + + /* + * Ok, we now need to push on a buffering BIO ...but not with + * SCTP + */ #ifndef OPENSSL_NO_SCTP - if (!SSL_IS_DTLS(s) || !BIO_dgram_is_sctp(SSL_get_wbio(s))) + if (!SSL_IS_DTLS(s) || !BIO_dgram_is_sctp(SSL_get_wbio(s))) #endif - if (!ssl_init_wbio_buffer(s, server ? 1 : 0)) { - goto end; - } + if (!ssl_init_wbio_buffer(s)) { + goto end; + } + if (!server || st->state != MSG_FLOW_RENEGOTIATE) ssl3_init_finished_mac(s); - } if (server) { if (st->state != MSG_FLOW_RENEGOTIATE) { diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c index 7591bb9d22..ecbc43b3d0 100644 --- a/ssl/statem/statem_clnt.c +++ b/ssl/statem/statem_clnt.c @@ -437,20 +437,9 @@ WORK_STATE ossl_statem_client_post_work(SSL *s, WORK_STATE wst) switch(st->hand_state) { case TLS_ST_CW_CLNT_HELLO: - if (SSL_IS_DTLS(s) && s->d1->cookie_len > 0 && statem_flush(s) != 1) + if (wst == WORK_MORE_A && statem_flush(s) != 1) return WORK_MORE_A; -#ifndef OPENSSL_NO_SCTP - /* Disable buffering for SCTP */ - if (!SSL_IS_DTLS(s) || !BIO_dgram_is_sctp(SSL_get_wbio(s))) { -#endif - /* - * turn on buffering for the next lot of output - */ - if (s->bbio != s->wbio) - s->wbio = BIO_push(s->bbio, s->wbio); -#ifndef OPENSSL_NO_SCTP - } -#endif + if (SSL_IS_DTLS(s)) { /* Treat the next message as the first packet */ s->first_packet = 1; diff --git a/test/heartbeat_test.c b/test/heartbeat_test.c index f92510ade8..906736c37e 100644 --- a/test/heartbeat_test.c +++ b/test/heartbeat_test.c @@ -101,7 +101,7 @@ static HEARTBEAT_TEST_FIXTURE set_up(const char *const test_case_name, goto fail; } - if (!ssl_init_wbio_buffer(fixture.s, 1)) { + if (!ssl_init_wbio_buffer(fixture.s)) { fprintf(stderr, "Failed to set up wbio buffer for test: %s\n", test_case_name); setup_ok = 0; |