diff options
author | Matt Caswell <matt@openssl.org> | 2016-09-05 17:34:04 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2016-09-13 09:41:21 +0100 |
commit | ae2f7b37da3640f4cfa5df0e5bad2aa2ca5f1ba3 (patch) | |
tree | 547eb74809823ee123d66281a35f8e16884e7b19 /ssl/statem/statem_dtls.c | |
parent | 2c7b4dbc1af9cfae4e4afd7c4a07db95a1133a6a (diff) | |
download | openssl-ae2f7b37da3640f4cfa5df0e5bad2aa2ca5f1ba3.zip openssl-ae2f7b37da3640f4cfa5df0e5bad2aa2ca5f1ba3.tar.gz openssl-ae2f7b37da3640f4cfa5df0e5bad2aa2ca5f1ba3.tar.bz2 |
Rename PACKETW to WPACKET
To avoid confusion with the read PACKET structure.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl/statem/statem_dtls.c')
-rw-r--r-- | ssl/statem/statem_dtls.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ssl/statem/statem_dtls.c b/ssl/statem/statem_dtls.c index 6d6c5a3..492d377 100644 --- a/ssl/statem/statem_dtls.c +++ b/ssl/statem/statem_dtls.c @@ -1192,12 +1192,12 @@ void dtls1_get_message_header(unsigned char *data, struct hm_header_st *msg_hdr) } /* - * Temporary name. To be renamed dtls1_set_handshake_header() once all PACKETW + * Temporary name. To be renamed dtls1_set_handshake_header() once all WPACKET * conversion is complete. The old dtls1_set_handshake_heder() can be deleted * at that point. * TODO - RENAME ME */ -int dtls1_set_handshake_header2(SSL *s, PACKETW *pkt, PACKETW *body, int htype) +int dtls1_set_handshake_header2(SSL *s, WPACKET *pkt, WPACKET *body, int htype) { unsigned char *header; dtls1_set_message_header(s, htype, 0, 0, 0); @@ -1206,20 +1206,20 @@ int dtls1_set_handshake_header2(SSL *s, PACKETW *pkt, PACKETW *body, int htype) * We allocate space at the start for the message header. This gets filled * in later */ - if (!PACKETW_allocate_bytes(pkt, DTLS1_HM_HEADER_LENGTH, &header) - || !PACKETW_get_sub_packet(pkt, body)) + if (!WPACKET_allocate_bytes(pkt, DTLS1_HM_HEADER_LENGTH, &header) + || !WPACKET_get_sub_packet(pkt, body)) return 0; return 1; } -int dtls1_close_construct_packet(SSL *s, PACKETW *pkt) +int dtls1_close_construct_packet(SSL *s, WPACKET *pkt) { size_t msglen; - if (!PACKETW_get_length(pkt, &msglen) + if (!WPACKET_get_length(pkt, &msglen) || msglen > INT_MAX - || !PACKETW_close(pkt)) + || !WPACKET_close(pkt)) return 0; s->d1->w_msg_hdr.msg_len = msglen - DTLS1_HM_HEADER_LENGTH; s->d1->w_msg_hdr.frag_len = msglen - DTLS1_HM_HEADER_LENGTH; |