From a29fa98cebdb2904dcf844d1aea7d1be3b6b913a Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 29 Sep 2016 22:40:15 +0100 Subject: Rename ssl_set_handshake_header2() ssl_set_handshake_header2() was only ever a temporary name while we had to have ssl_set_handshake_header() for code that hadn't been converted to WPACKET yet. No code remains that needed that so we can rename it. Reviewed-by: Rich Salz --- ssl/ssl_locl.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ssl/ssl_locl.h') diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index cd44e37f41..eb29740429 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -1584,7 +1584,7 @@ typedef struct ssl3_enc_method { /* Handshake header length */ unsigned int hhlen; /* Set the handshake header */ - int (*set_handshake_header2) (SSL *s, WPACKET *pkt, int type); + int (*set_handshake_header) (SSL *s, WPACKET *pkt, int type); /* Close construction of the handshake message */ int (*close_construct_packet) (SSL *s, WPACKET *pkt); /* Write out handshake message */ @@ -1594,8 +1594,8 @@ typedef struct ssl3_enc_method { # define SSL_HM_HEADER_LENGTH(s) s->method->ssl3_enc->hhlen # define ssl_handshake_start(s) \ (((unsigned char *)s->init_buf->data) + s->method->ssl3_enc->hhlen) -# define ssl_set_handshake_header2(s, pkt, htype) \ - s->method->ssl3_enc->set_handshake_header2((s), (pkt), (htype)) +# define ssl_set_handshake_header(s, pkt, htype) \ + s->method->ssl3_enc->set_handshake_header((s), (pkt), (htype)) # define ssl_close_construct_packet(s, pkt) \ s->method->ssl3_enc->close_construct_packet((s), (pkt)) # define ssl_do_write(s) s->method->ssl3_enc->do_write(s) @@ -1899,9 +1899,9 @@ __owur long ssl3_ctx_callback_ctrl(SSL_CTX *s, int cmd, void (*fp) (void)); __owur int ssl3_do_change_cipher_spec(SSL *ssl); __owur long ssl3_default_timeout(void); -__owur int ssl3_set_handshake_header2(SSL *s, WPACKET *pkt, int htype); +__owur int ssl3_set_handshake_header(SSL *s, WPACKET *pkt, int htype); __owur int tls_close_construct_packet(SSL *s, WPACKET *pkt); -__owur int dtls1_set_handshake_header2(SSL *s, WPACKET *pkt, int htype); +__owur int dtls1_set_handshake_header(SSL *s, WPACKET *pkt, int htype); __owur int dtls1_close_construct_packet(SSL *s, WPACKET *pkt); __owur int ssl3_handshake_write(SSL *s); -- cgit v1.2.3