From cb7da43fe80ca586b6133317dadca59f1e2f395f Mon Sep 17 00:00:00 2001 From: Frederik Wedel-Heinen Date: Thu, 16 Jan 2025 10:27:31 +0100 Subject: [PATCH] Fix unnecessary casts between int and size_t Also update a check for a negative int length value in mem_write(). Reviewed-by: Tom Cosgrove Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/26438) --- crypto/bio/bss_mem.c | 2 +- ssl/record/rec_layer_d1.c | 2 +- ssl/statem/statem.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c index 34b5874bc2..305d2b6848 100644 --- a/crypto/bio/bss_mem.c +++ b/crypto/bio/bss_mem.c @@ -222,7 +222,7 @@ static int mem_write(BIO *b, const char *in, int inl) goto end; } BIO_clear_retry_flags(b); - if (inl == 0) + if (inl <= 0) return 0; if (in == NULL) { ERR_raise(ERR_LIB_BIO, ERR_R_PASSED_NULL_PARAMETER); diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c index 111fbaf7d3..aafe1ac15c 100644 --- a/ssl/record/rec_layer_d1.c +++ b/ssl/record/rec_layer_d1.c @@ -672,7 +672,7 @@ int do_dtls1_write(SSL_CONNECTION *sc, uint8_t type, const unsigned char *buf, sc->rlayer.wrlmethod->write_records(sc->rlayer.wrl, &tmpl, 1)); if (ret > 0) - *written = (int)len; + *written = len; return ret; } diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c index 05b491c395..864a2f1a33 100644 --- a/ssl/statem/statem.c +++ b/ssl/statem/statem.c @@ -547,7 +547,7 @@ static int grow_init_buf(SSL_CONNECTION *s, size_t size) { size_t msg_offset = (char *)s->init_msg - s->init_buf->data; - if (!BUF_MEM_grow_clean(s->init_buf, (int)size)) + if (!BUF_MEM_grow_clean(s->init_buf, size)) return 0; if (size < msg_offset)