diff options
| author | Matt Caswell <matt@openssl.org> | 2016-09-06 15:09:51 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-09-13 09:41:21 +0100 |
| commit | 0217dd19c00657b8bfd2bce1090785eb32abb235 (patch) | |
| tree | 3d8d15ce4dbd512de85108994590be59fd83e801 /ssl/ssl_locl.h | |
| parent | ae2f7b37da3640f4cfa5df0e5bad2aa2ca5f1ba3 (diff) | |
| download | openssl-0217dd19c00657b8bfd2bce1090785eb32abb235.zip openssl-0217dd19c00657b8bfd2bce1090785eb32abb235.tar.gz openssl-0217dd19c00657b8bfd2bce1090785eb32abb235.tar.bz2 | |
Move from explicit sub-packets to implicit ones
No need to declare an explicit sub-packet. Just start one.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl/ssl_locl.h')
| -rw-r--r-- | ssl/ssl_locl.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index b4aa091..26485f6 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -1586,8 +1586,7 @@ typedef struct ssl3_enc_method { /* Set the handshake header */ int (*set_handshake_header) (SSL *s, int type, unsigned long len); /* Set the handshake header */ - int (*set_handshake_header2) (SSL *s, WPACKET *pkt, WPACKET *body, - int type); + int (*set_handshake_header2) (SSL *s, WPACKET *pkt, int type); /* Close construction of the handshake message */ int (*close_construct_packet) (SSL *s, WPACKET *pkt); /* Write out handshake message */ @@ -1599,8 +1598,8 @@ typedef struct ssl3_enc_method { (((unsigned char *)s->init_buf->data) + s->method->ssl3_enc->hhlen) # define ssl_set_handshake_header(s, htype, len) \ s->method->ssl3_enc->set_handshake_header(s, htype, len) -# define ssl_set_handshake_header2(s, pkt, body, htype) \ - s->method->ssl3_enc->set_handshake_header2((s), (pkt), (body), (htype)) +# define ssl_set_handshake_header2(s, pkt, htype) \ + s->method->ssl3_enc->set_handshake_header2((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) @@ -1906,11 +1905,9 @@ __owur int ssl3_do_change_cipher_spec(SSL *ssl); __owur long ssl3_default_timeout(void); __owur int ssl3_set_handshake_header(SSL *s, int htype, unsigned long len); -__owur int ssl3_set_handshake_header2(SSL *s, WPACKET *pkt, WPACKET *body, - int htype); +__owur int ssl3_set_handshake_header2(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, WPACKET *body, - int htype); +__owur int dtls1_set_handshake_header2(SSL *s, WPACKET *pkt, int htype); __owur int dtls1_close_construct_packet(SSL *s, WPACKET *pkt); __owur int ssl3_handshake_write(SSL *s); |