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 <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26438)

diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c
index 34b5874bc249782a369d1d73276201ce8db98d39..305d2b6848dab33adb6b8c262a8ca3df2db431c4 100644 (file)
--- 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 111fbaf7d3a4028a7902f3bd20449aabbe32929d..aafe1ac15c65924168b77e271faa0099d64da650 100644 (file)
--- 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 05b491c3956af1233464f799b8a1f63b24937b04..864a2f1a339f00fd5e67bbcbb367fcf8d48425d4 100644 (file)
--- 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)