Merge branch 'fix-conversion' of github.com:gasbytes/wolfssl into fix…

…-conversion
wolfSSL · Nov 26, 2024 · ae87fa0 · ae87fa0
2 parents a786306 + 584da13
commit ae87fa0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/ssl.c b/src/ssl.c
@@ -1645,7 +1645,7 @@ int wolfSSL_get_ciphers(char* buf, int len)
     for (i = 0; i < ciphersSz; i++) {
         int cipherNameSz = (int)XSTRLEN(ciphers[i].name);
         if (cipherNameSz + 1 < len) {
-            XSTRNCPY(buf, ciphers[i].name, (size_t)(len));
+            XSTRNCPY(buf, ciphers[i].name, (size_t)len);
             buf += cipherNameSz;
 
             if (i < ciphersSz - 1)
@@ -1708,7 +1708,7 @@ const char* wolfSSL_get_shared_ciphers(WOLFSSL* ssl, char* buf, int len)
 
     cipher = wolfSSL_get_cipher_name_iana(ssl);
     len = (int)min((word32)len, (word32)(XSTRLEN(cipher) + 1));
-    XMEMCPY(buf, cipher, (size_t)(len));
+    XMEMCPY(buf, cipher, len);
     return buf;
 }
 

diff --git a/src/ssl_sess.c b/src/ssl_sess.c
@@ -375,7 +375,7 @@ int wolfSSL_SetServerID(WOLFSSL* ssl, const byte* id, int len, int newSession)
         WOLFSSL_MSG("Valid ServerID not cached already");
 
         ssl->session->idLen = (word16)len;
-        XMEMCPY(ssl->session->serverID, id, (size_t)(len));
+        XMEMCPY(ssl->session->serverID, id, (size_t)len);
     }
 #ifdef HAVE_EXT_CACHE
     else {

diff --git a/src/tls.c b/src/tls.c
@@ -1190,8 +1190,8 @@ static int Hmac_UpdateFinal(Hmac* hmac, byte* digest, const byte* in,
     ret = wc_HmacUpdate(hmac, header, headerSz);
     if (ret == 0) {
         /* Fill the rest of the block with any available data. */
-        word32 currSz = ctMaskLT((int)(msgSz), (int)(blockSz)) & msgSz;
-        currSz |= ctMaskGTE((int)(msgSz), (int)(blockSz)) & blockSz;
+        word32 currSz = ctMaskLT((int)msgSz, blockSz) & msgSz;
+        currSz |= ctMaskGTE((int)msgSz, blockSz) & blockSz;
         currSz -= WOLFSSL_TLS_HMAC_INNER_SZ;
         currSz &= ~(0 - (currSz >> 31));
         ret = wc_HmacUpdate(hmac, in, currSz);