From 0086ca4e9bcfc9b8598c81ee356f57130f5fbe5f Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 26 Sep 2016 14:59:08 +0100 Subject: [PATCH] Convert HelloRequest construction to WPACKET Reviewed-by: Rich Salz --- ssl/statem/statem_srvr.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c index fbca5a168a..8a2791ad77 100644 --- a/ssl/statem/statem_srvr.c +++ b/ssl/statem/statem_srvr.c @@ -831,9 +831,14 @@ static int ssl_check_srp_ext_ClientHello(SSL *s, int *al) int tls_construct_hello_request(SSL *s) { - if (!ssl_set_handshake_header(s, SSL3_MT_HELLO_REQUEST, 0)) { + WPACKET pkt; + + if (!WPACKET_init(&pkt, s->init_buf) + || !ssl_set_handshake_header2(s, &pkt, SSL3_MT_HELLO_REQUEST) + || !ssl_close_construct_packet(s, &pkt)) { SSLerr(SSL_F_TLS_CONSTRUCT_HELLO_REQUEST, ERR_R_INTERNAL_ERROR); ossl_statem_set_error(s); + WPACKET_cleanup(&pkt); return 0; } -- 2.25.1