Convert WPACKET_put_bytes to use convenience macros All the other functions that take an argument for the number of bytes use convenience macros for this purpose. We should do the same with WPACKET_put_bytes(). Reviewed-by: Rich Salz <rsalz@openssl.org>
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 3749b2c..2a4dc6d 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c
@@ -2798,7 +2798,7 @@ int ssl3_set_handshake_header2(SSL *s, WPACKET *pkt, int htype) { /* Set the content type and 3 bytes for the message len */ - if (!WPACKET_put_bytes(pkt, htype, 1) + if (!WPACKET_put_bytes_u8(pkt, htype) || !WPACKET_start_sub_packet_u24(pkt)) return 0; @@ -3598,7 +3598,7 @@ return 1; } - if (!WPACKET_put_bytes(pkt, c->id & 0xffff, 2)) + if (!WPACKET_put_bytes_u16(pkt, c->id & 0xffff)) return 0; *len = 2;