Skip to content

Commit a59a3d1

Browse files
author
Andras Fekete
committed
Explicit cast
1 parent 12768cd commit a59a3d1

16 files changed

Lines changed: 963 additions & 962 deletions

File tree

src/bio.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
*/
5151
static int wolfSSL_BIO_BASE64_read(WOLFSSL_BIO* bio, void* buf, int len)
5252
{
53-
word32 frmtSz = len;
53+
word32 frmtSz = (word32)len;
5454

5555
WOLFSSL_ENTER("wolfSSL_BIO_BASE64_read");
5656

@@ -175,7 +175,7 @@ static int wolfSSL_BIO_MEMORY_read(WOLFSSL_BIO* bio, void* buf, int len)
175175
WOLFSSL_MSG("wolfSSL_BUF_MEM_resize error");
176176
return WOLFSSL_BIO_ERROR;
177177
}
178-
bio->mem_buf->length = bio->wrSz;
178+
bio->mem_buf->length = (size_t)bio->wrSz;
179179
bio->ptr = bio->mem_buf->data;
180180
}
181181
}
@@ -233,13 +233,13 @@ static int wolfSSL_BIO_MD_read(WOLFSSL_BIO* bio, void* buf, int sz)
233233
{
234234
if (wolfSSL_EVP_MD_CTX_type((WOLFSSL_EVP_MD_CTX*)bio->ptr) == NID_hmac) {
235235
if (wolfSSL_EVP_DigestSignUpdate((WOLFSSL_EVP_MD_CTX*)bio->ptr, buf,
236-
sz) != WOLFSSL_SUCCESS)
236+
(unsigned int)sz) != WOLFSSL_SUCCESS)
237237
{
238238
return WOLFSSL_FATAL_ERROR;
239239
}
240240
}
241241
else {
242-
if (wolfSSL_EVP_DigestUpdate((WOLFSSL_EVP_MD_CTX*)bio->ptr, buf, sz)
242+
if (wolfSSL_EVP_DigestUpdate((WOLFSSL_EVP_MD_CTX*)bio->ptr, buf, (size_t)sz)
243243
!= WOLFSSL_SUCCESS) {
244244
return WOLFSSL_FATAL_ERROR;
245245
}
@@ -305,12 +305,12 @@ int wolfSSL_BIO_read(WOLFSSL_BIO* bio, void* buf, int len)
305305
case WOLFSSL_BIO_FILE:
306306
#ifndef NO_FILESYSTEM
307307
if (bio->ptr) {
308-
ret = (int)XFREAD(buf, 1, len, (XFILE)bio->ptr);
308+
ret = (int)XFREAD(buf, 1, (size_t)len, (XFILE)bio->ptr);
309309
}
310310
else {
311311
#if !defined(USE_WINDOWS_API) && !defined(NO_WOLFSSL_DIR) && \
312312
!defined(WOLFSSL_NUCLEUS) && !defined(WOLFSSL_NUCLEUS_1_2)
313-
ret = (int)XREAD(bio->num, buf, len);
313+
ret = (int)XREAD(bio->num, buf, (size_t)len);
314314
#else
315315
WOLFSSL_MSG("No file pointer and XREAD not enabled");
316316
ret = NOT_COMPILED_IN;
@@ -448,7 +448,7 @@ static int wolfSSL_BIO_BASE64_write(WOLFSSL_BIO* bio, const void* data,
448448

449449
(void)heap;
450450

451-
return inLen;
451+
return (int)inLen;
452452
}
453453
#endif /* WOLFSSL_BASE64_ENCODE */
454454

@@ -591,12 +591,12 @@ static int wolfSSL_BIO_MD_write(WOLFSSL_BIO* bio, const void* data, int len)
591591

592592
if (wolfSSL_EVP_MD_CTX_type((WOLFSSL_EVP_MD_CTX*)bio->ptr) == NID_hmac) {
593593
if (wolfSSL_EVP_DigestSignUpdate((WOLFSSL_EVP_MD_CTX*)bio->ptr, data,
594-
len) != WOLFSSL_SUCCESS) {
594+
(unsigned int)len) != WOLFSSL_SUCCESS) {
595595
ret = WOLFSSL_BIO_ERROR;
596596
}
597597
}
598598
else {
599-
if (wolfSSL_EVP_DigestUpdate((WOLFSSL_EVP_MD_CTX*)bio->ptr, data, len)
599+
if (wolfSSL_EVP_DigestUpdate((WOLFSSL_EVP_MD_CTX*)bio->ptr, data, (size_t)len)
600600
!= WOLFSSL_SUCCESS) {
601601
ret = WOLFSSL_BIO_ERROR;
602602
}
@@ -652,7 +652,7 @@ int wolfSSL_BIO_write(WOLFSSL_BIO* bio, const void* data, int len)
652652
if (ret > 0) {
653653
/* change so that data is formatted buffer */
654654
data = frmt;
655-
len = frmtSz;
655+
len = (int)frmtSz;
656656
}
657657
#else
658658
WOLFSSL_MSG("WOLFSSL_BIO_BASE64 used without "
@@ -670,12 +670,12 @@ int wolfSSL_BIO_write(WOLFSSL_BIO* bio, const void* data, int len)
670670
case WOLFSSL_BIO_FILE:
671671
#ifndef NO_FILESYSTEM
672672
if (bio->ptr) {
673-
ret = (int)XFWRITE(data, 1, len, (XFILE)bio->ptr);
673+
ret = (int)XFWRITE(data, 1, (size_t)len, (XFILE)bio->ptr);
674674
}
675675
else {
676676
#if !defined(USE_WINDOWS_API) && !defined(NO_WOLFSSL_DIR) && \
677677
!defined(WOLFSSL_NUCLEUS) && !defined(WOLFSSL_NUCLEUS_1_2)
678-
ret = (int)XWRITE(bio->num, data, len);
678+
ret = (int)XWRITE(bio->num, data, (size_t)len);
679679
#else
680680
WOLFSSL_MSG("No file pointer and XWRITE not enabled");
681681
ret = NOT_COMPILED_IN;
@@ -972,7 +972,7 @@ int wolfSSL_BIO_gets(WOLFSSL_BIO* bio, char* buf, int sz)
972972
ret = wolfSSL_EVP_DigestFinal((WOLFSSL_EVP_MD_CTX*)bio->ptr,
973973
(unsigned char*)buf, &szOut);
974974
if (ret == WOLFSSL_SUCCESS) {
975-
ret = szOut;
975+
ret = (int)szOut;
976976
}
977977
}
978978
break;
@@ -1257,8 +1257,8 @@ int wolfSSL_BIO_set_write_buf_size(WOLFSSL_BIO *bio, long size)
12571257
bio->rdIdx = 0;
12581258
if (bio->mem_buf != NULL) {
12591259
bio->mem_buf->data = (char*)bio->ptr;
1260-
bio->mem_buf->length = bio->num;
1261-
bio->mem_buf->max = bio->num;
1260+
bio->mem_buf->length = (size_t)bio->num;
1261+
bio->mem_buf->max = (size_t)bio->num;
12621262
}
12631263

12641264
return WOLFSSL_SUCCESS;
@@ -2637,7 +2637,7 @@ int wolfSSL_BIO_flush(WOLFSSL_BIO* bio)
26372637
len = (int)XSTRLEN((const char*)buf) + 1;
26382638
}
26392639

2640-
if (len > 0 && wolfSSL_BUF_MEM_resize(bio->mem_buf, len) == 0) {
2640+
if (len > 0 && wolfSSL_BUF_MEM_resize(bio->mem_buf, (size_t)len) == 0) {
26412641
wolfSSL_BIO_free(bio);
26422642
return NULL;
26432643
}

0 commit comments

Comments
 (0)