diff options
| author | Matt Caswell <matt@openssl.org> | 2016-09-20 14:47:44 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-09-20 14:47:44 +0100 |
| commit | 08029dfa03c0ee3a50f373017143aaae5f87d17f (patch) | |
| tree | 536a5df572e89053310d4b8a4fe6dee4ce56485b /ssl/statem/statem_clnt.c | |
| parent | 85a7a5e6ef633d2b01ef9792463a36b507a35a6a (diff) | |
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>
Diffstat (limited to 'ssl/statem/statem_clnt.c')
| -rw-r--r-- | ssl/statem/statem_clnt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c index 95af064269..bb7219f369 100644 --- a/ssl/statem/statem_clnt.c +++ b/ssl/statem/statem_clnt.c @@ -782,7 +782,7 @@ int tls_construct_client_hello(SSL *s) * client_version in client hello and not resetting it to * the negotiated version. */ - if (!WPACKET_put_bytes(&pkt, s->client_version, 2) + if (!WPACKET_put_bytes_u16(&pkt, s->client_version) || !WPACKET_memcpy(&pkt, s->s3->client_random, SSL3_RANDOM_SIZE)) { SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, ERR_R_INTERNAL_ERROR); goto err; @@ -834,7 +834,7 @@ int tls_construct_client_hello(SSL *s) int compnum = sk_SSL_COMP_num(s->ctx->comp_methods); for (i = 0; i < compnum; i++) { comp = sk_SSL_COMP_value(s->ctx->comp_methods, i); - if (!WPACKET_put_bytes(&pkt, comp->id, 1)) { + if (!WPACKET_put_bytes_u8(&pkt, comp->id)) { SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, ERR_R_INTERNAL_ERROR); goto err; } @@ -842,7 +842,7 @@ int tls_construct_client_hello(SSL *s) } #endif /* Add the NULL method */ - if (!WPACKET_put_bytes(&pkt, 0, 1) || !WPACKET_close(&pkt)) { + if (!WPACKET_put_bytes_u8(&pkt, 0) || !WPACKET_close(&pkt)) { SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO, ERR_R_INTERNAL_ERROR); goto err; } @@ -2424,8 +2424,8 @@ static int tls_construct_cke_gost(SSL *s, WPACKET *pkt, int *al) goto err; } - if (!WPACKET_put_bytes(pkt, V_ASN1_SEQUENCE | V_ASN1_CONSTRUCTED, 1) - || (msglen >= 0x80 && !WPACKET_put_bytes(pkt, 0x81, 1)) + if (!WPACKET_put_bytes_u8(pkt, V_ASN1_SEQUENCE | V_ASN1_CONSTRUCTED) + || (msglen >= 0x80 && !WPACKET_put_bytes_u8(pkt, 0x81)) || !WPACKET_sub_memcpy_u8(pkt, tmp, msglen)) { *al = SSL_AD_INTERNAL_ERROR; SSLerr(SSL_F_TLS_CONSTRUCT_CKE_GOST, ERR_R_INTERNAL_ERROR); |