diff options
Diffstat (limited to 'ssl/statem')
| -rw-r--r-- | ssl/statem/statem_clnt.c | 10 | ||||
| -rw-r--r-- | ssl/statem/statem_dtls.c | 4 | ||||
| -rw-r--r-- | ssl/statem/statem_lib.c | 2 |
3 files changed, 8 insertions, 8 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); diff --git a/ssl/statem/statem_dtls.c b/ssl/statem/statem_dtls.c index 3146f77b0d..f892f0f82e 100644 --- a/ssl/statem/statem_dtls.c +++ b/ssl/statem/statem_dtls.c @@ -876,7 +876,7 @@ int dtls_construct_change_cipher_spec(SSL *s) WPACKET pkt; if (!WPACKET_init(&pkt, s->init_buf) - || !WPACKET_put_bytes(&pkt, SSL3_MT_CCS, 1)) { + || !WPACKET_put_bytes_u8(&pkt, SSL3_MT_CCS)) { SSLerr(SSL_F_TLS_CONSTRUCT_FINISHED, ERR_R_INTERNAL_ERROR); goto err; } @@ -887,7 +887,7 @@ int dtls_construct_change_cipher_spec(SSL *s) if (s->version == DTLS1_BAD_VER) { s->d1->next_handshake_write_seq++; - if (!WPACKET_put_bytes(&pkt, s->d1->handshake_write_seq, 2)) { + if (!WPACKET_put_bytes_u16(&pkt, s->d1->handshake_write_seq)) { SSLerr(SSL_F_TLS_CONSTRUCT_FINISHED, ERR_R_INTERNAL_ERROR); goto err; } diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c index 81491a2e5d..3ffe4e5751 100644 --- a/ssl/statem/statem_lib.c +++ b/ssl/statem/statem_lib.c @@ -272,7 +272,7 @@ int tls_construct_change_cipher_spec(SSL *s) WPACKET pkt; if (!WPACKET_init(&pkt, s->init_buf) - || !WPACKET_put_bytes(&pkt, SSL3_MT_CCS, 1) + || !WPACKET_put_bytes_u8(&pkt, SSL3_MT_CCS) || !WPACKET_finish(&pkt)) { WPACKET_cleanup(&pkt); ossl_statem_set_error(s); |