feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fix conversion error in client.c

Browse Source
This commit is contained in:
Andras Fekete
2024-05-09 15:22:29 -04:00
parent 0bf69e240a
commit bf92797cbc
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
examples/client/client.c
View File

@ -461,7 +461,7 @@ static void EarlyData(WOLFSSL_CTX* ctx, WOLFSSL* ssl, const char* msg,
} while (err == WC_PENDING_E); } while (err == WC_PENDING_E);
if (ret != msgSz) { if (ret != msgSz) {
LOG_ERROR("SSL_write_early_data msg error %d, %s\n", err, LOG_ERROR("SSL_write_early_data msg error %d, %s\n", err,
wolfSSL_ERR_error_string(err, buffer)); wolfSSL_ERR_error_string((unsigned long)err, buffer));
wolfSSL_free(ssl); ssl = NULL; wolfSSL_free(ssl); ssl = NULL;
wolfSSL_CTX_free(ctx); ctx = NULL; wolfSSL_CTX_free(ctx); ctx = NULL;
err_sys("SSL_write_early_data failed"); err_sys("SSL_write_early_data failed");
@ -683,8 +683,8 @@ static int ClientBenchmarkThroughput(WOLFSSL_CTX* ctx, char* host, word16 port,
conn_time = current_time(0) - start; conn_time = current_time(0) - start;
/* Allocate TX/RX buffers */ /* Allocate TX/RX buffers */
tx_buffer = (char*)XMALLOC(block, NULL, DYNAMIC_TYPE_TMP_BUFFER); tx_buffer = (char*)XMALLOC((size_t)block, NULL, DYNAMIC_TYPE_TMP_BUFFER);
rx_buffer = (char*)XMALLOC(block, NULL, DYNAMIC_TYPE_TMP_BUFFER); rx_buffer = (char*)XMALLOC((size_t)block, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (tx_buffer && rx_buffer) { if (tx_buffer && rx_buffer) {
WC_RNG rng; WC_RNG rng;
@ -698,7 +698,7 @@ static int ClientBenchmarkThroughput(WOLFSSL_CTX* ctx, char* host, word16 port,
size_t xfer_bytes; size_t xfer_bytes;
/* Generate random data to send */ /* Generate random data to send */
ret = wc_RNG_GenerateBlock(&rng, (byte*)tx_buffer, block); ret = wc_RNG_GenerateBlock(&rng, (byte*)tx_buffer, (word32)block);
wc_FreeRng(&rng); wc_FreeRng(&rng);
if(ret != 0) { if(ret != 0) {
err_sys("wc_RNG_GenerateBlock failed"); err_sys("wc_RNG_GenerateBlock failed");
@ -710,7 +710,7 @@ static int ClientBenchmarkThroughput(WOLFSSL_CTX* ctx, char* host, word16 port,
int len, rx_pos, select_ret; int len, rx_pos, select_ret;
/* Determine packet size */ /* Determine packet size */
len = min(block, (int)(throughput - xfer_bytes)); len = (int)min((word32)block, (word32)(throughput - xfer_bytes));
/* Perform TX */ /* Perform TX */
start = current_time(1); start = current_time(1);
@ -766,7 +766,7 @@ static int ClientBenchmarkThroughput(WOLFSSL_CTX* ctx, char* host, word16 port,
} }
/* Compare TX and RX buffers */ /* Compare TX and RX buffers */
if (XMEMCMP(tx_buffer, rx_buffer, len) != 0) { if (XMEMCMP(tx_buffer, rx_buffer, (size_t)len) != 0) {
free(tx_buffer); free(tx_buffer);
tx_buffer = NULL; tx_buffer = NULL;
free(rx_buffer); free(rx_buffer);
@ -775,7 +775,7 @@ static int ClientBenchmarkThroughput(WOLFSSL_CTX* ctx, char* host, word16 port,
} }
/* Update overall position */ /* Update overall position */
xfer_bytes += len; xfer_bytes += (size_t)len;
} }
} }
else { else {
@ -815,8 +815,8 @@ doExit:
"\tRX %8.3f ms (%8.3f MBps)\n", "\tRX %8.3f ms (%8.3f MBps)\n",
(SIZE_TYPE)throughput, (SIZE_TYPE)throughput,
conn_time * 1000, conn_time * 1000,
tx_time * 1000, throughput / tx_time / 1024 / 1024, (double)tx_time * 1000, (double)throughput / tx_time / 1024 / 1024,
rx_time * 1000, throughput / rx_time / 1024 / 1024 (double)rx_time * 1000, (double)throughput / rx_time / 1024 / 1024
); );
return EXIT_SUCCESS; return EXIT_SUCCESS;
@ -852,7 +852,7 @@ static int StartTLS_Init(SOCKET_T* sockfd)
} }
/* C: EHLO mail.example.com */ /* C: EHLO mail.example.com */
if (send(*sockfd, starttlsCmd[1], (int)XSTRLEN(starttlsCmd[1]), 0) != if (send(*sockfd, starttlsCmd[1], XSTRLEN(starttlsCmd[1]), 0) !=
(int)XSTRLEN(starttlsCmd[1])) (int)XSTRLEN(starttlsCmd[1]))
err_sys("failed to send STARTTLS EHLO command\n"); err_sys("failed to send STARTTLS EHLO command\n");
@ -869,7 +869,7 @@ static int StartTLS_Init(SOCKET_T* sockfd)
} }
/* C: STARTTLS */ /* C: STARTTLS */
if (send(*sockfd, starttlsCmd[3], (int)XSTRLEN(starttlsCmd[3]), 0) != if (send(*sockfd, starttlsCmd[3], XSTRLEN(starttlsCmd[3]), 0) !=
(int)XSTRLEN(starttlsCmd[3])) { (int)XSTRLEN(starttlsCmd[3])) {
err_sys("failed to send STARTTLS command\n"); err_sys("failed to send STARTTLS command\n");
} }
@ -980,7 +980,7 @@ static int ClientWrite(WOLFSSL* ssl, const char* msg, int msgSz, const char* str
if (ret != msgSz) { if (ret != msgSz) {
char buffer[WOLFSSL_MAX_ERROR_SZ]; char buffer[WOLFSSL_MAX_ERROR_SZ];
LOG_ERROR("SSL_write%s msg error %d, %s\n", str, err, LOG_ERROR("SSL_write%s msg error %d, %s\n", str, err,
wolfSSL_ERR_error_string(err, buffer)); wolfSSL_ERR_error_string((unsigned long)err, buffer));
if (!exitWithRet) { if (!exitWithRet) {
err_sys("SSL_write failed"); err_sys("SSL_write failed");
} }
@ -1011,7 +1011,7 @@ static int ClientRead(WOLFSSL* ssl, char* reply, int replyLen, int mustRead,
if (err != WOLFSSL_ERROR_WANT_READ && if (err != WOLFSSL_ERROR_WANT_READ &&
err != WOLFSSL_ERROR_WANT_WRITE && err != APP_DATA_READY) { err != WOLFSSL_ERROR_WANT_WRITE && err != APP_DATA_READY) {
LOG_ERROR("SSL_read reply error %d, %s\n", err, LOG_ERROR("SSL_read reply error %d, %s\n", err,
wolfSSL_ERR_error_string(err, buffer)); wolfSSL_ERR_error_string((unsigned long)err, buffer));
if (!exitWithRet) { if (!exitWithRet) {
err_sys("SSL_read failed"); err_sys("SSL_read failed");
} }
@ -1090,7 +1090,7 @@ static int ClientWriteRead(WOLFSSL* ssl, const char* msg, int msgSz,
if (ret != 0) { if (ret != 0) {
char buffer[WOLFSSL_MAX_ERROR_SZ]; char buffer[WOLFSSL_MAX_ERROR_SZ];
LOG_ERROR("SSL_write%s msg error %d, %s\n", str, ret, LOG_ERROR("SSL_write%s msg error %d, %s\n", str, ret,
wolfSSL_ERR_error_string(ret, buffer)); wolfSSL_ERR_error_string((unsigned long)ret, buffer));
} }
return ret; return ret;
@ -2426,7 +2426,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
break; break;
case 'B' : case 'B' :
throughput = atol(myoptarg); throughput = (size_t)atol(myoptarg);
for (; *myoptarg != '\0'; myoptarg++) { for (; *myoptarg != '\0'; myoptarg++) {
if (*myoptarg == ',') { if (*myoptarg == ',') {
block = atoi(myoptarg + 1); block = atoi(myoptarg + 1);
@ -2489,7 +2489,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
case 'F' : case 'F' :
#ifdef HAVE_MAX_FRAGMENT #ifdef HAVE_MAX_FRAGMENT
maxFragment = atoi(myoptarg); maxFragment = (byte)atoi(myoptarg);
if (maxFragment < WOLFSSL_MFL_MIN || if (maxFragment < WOLFSSL_MFL_MIN ||
maxFragment > WOLFSSL_MFL_MAX) { maxFragment > WOLFSSL_MFL_MAX) {
Usage(); Usage();
@ -2516,7 +2516,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
{ {
word32 myoptargSz; word32 myoptargSz;
statusRequest = atoi(myoptarg); statusRequest = (byte)atoi(myoptarg);
if (statusRequest > OCSP_STAPLING_OPT_MAX) { if (statusRequest > OCSP_STAPLING_OPT_MAX) {
Usage(); Usage();
XEXIT_T(MY_EX_USAGE); XEXIT_T(MY_EX_USAGE);
@ -3929,7 +3929,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
if (ret != WOLFSSL_SUCCESS) { if (ret != WOLFSSL_SUCCESS) {
err = wolfSSL_get_error(ssl, 0); err = wolfSSL_get_error(ssl, 0);
LOG_ERROR("wolfSSL_connect error %d, %s\n", err, LOG_ERROR("wolfSSL_connect error %d, %s\n", err,
wolfSSL_ERR_error_string(err, buffer)); wolfSSL_ERR_error_string((unsigned long)err, buffer));
/* cleanup */ /* cleanup */
wolfSSL_free(ssl); ssl = NULL; wolfSSL_free(ssl); ssl = NULL;
@ -4270,11 +4270,11 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
printf("SSL connect ok, sending GET...\n"); printf("SSL connect ok, sending GET...\n");
msgSz = (int)XSTRLEN(kHttpGetMsg); msgSz = (int)XSTRLEN(kHttpGetMsg);
XMEMCPY(msg, kHttpGetMsg, msgSz); XMEMCPY(msg, kHttpGetMsg, (size_t)msgSz);
} }
else { else {
msgSz = (int)XSTRLEN(kHelloMsg); msgSz = (int)XSTRLEN(kHelloMsg);
XMEMCPY(msg, kHelloMsg, msgSz); XMEMCPY(msg, kHelloMsg, (size_t)msgSz);
} }
/* allow some time for exporting the session */ /* allow some time for exporting the session */
@ -4521,7 +4521,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
#endif #endif
if (ret != WOLFSSL_SUCCESS) { if (ret != WOLFSSL_SUCCESS) {
LOG_ERROR("wolfSSL_connect resume error %d, %s\n", err, LOG_ERROR("wolfSSL_connect resume error %d, %s\n", err,
wolfSSL_ERR_error_string(err, buffer)); wolfSSL_ERR_error_string((unsigned long)err, buffer));
wolfSSL_free(sslResume); sslResume = NULL; wolfSSL_free(sslResume); sslResume = NULL;
CloseSocket(sockfd); CloseSocket(sockfd);
wolfSSL_CTX_free(ctx); ctx = NULL; wolfSSL_CTX_free(ctx); ctx = NULL;
@ -4602,11 +4602,11 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
XMEMSET(msg, 0, sizeof(msg)); XMEMSET(msg, 0, sizeof(msg));
if (sendGET) { if (sendGET) {
msgSz = (int)XSTRLEN(kHttpGetMsg); msgSz = (int)XSTRLEN(kHttpGetMsg);
XMEMCPY(msg, kHttpGetMsg, msgSz); XMEMCPY(msg, kHttpGetMsg, (size_t)msgSz);
} }
else { else {
msgSz = (int)XSTRLEN(kResumeMsg); msgSz = (int)XSTRLEN(kResumeMsg);
XMEMCPY(msg, kResumeMsg, msgSz); XMEMCPY(msg, kResumeMsg, (size_t)msgSz);
} }
(void)ClientWriteRead(sslResume, msg, msgSz, reply, sizeof(reply)-1, (void)ClientWriteRead(sslResume, msg, msgSz, reply, sizeof(reply)-1,

6
examples/server/server.c
View File

@ -420,7 +420,7 @@ int ServerEchoData(SSL* ssl, int clientfd, int echoData, int block,
size_t xfer_bytes = 0; size_t xfer_bytes = 0;
char* buffer; char* buffer;
buffer = (char*)malloc(block); buffer = (char*)malloc((size_t)block);
if (!buffer) { if (!buffer) {
err_sys_ex(runWithErrors, "Server buffer malloc failed"); err_sys_ex(runWithErrors, "Server buffer malloc failed");
} }
@ -520,8 +520,8 @@ int ServerEchoData(SSL* ssl, int clientfd, int echoData, int block,
"\tRX %8.3f ms (%8.3f MBps)\n" "\tRX %8.3f ms (%8.3f MBps)\n"
"\tTX %8.3f ms (%8.3f MBps)\n", "\tTX %8.3f ms (%8.3f MBps)\n",
(SIZE_TYPE)throughput, (SIZE_TYPE)throughput,
(double)rx_time * 1000, throughput / rx_time / 1024 / 1024, (double)rx_time * 1000, (double)throughput / rx_time / 1024 / 1024,
(double)tx_time * 1000, throughput / tx_time / 1024 / 1024 (double)tx_time * 1000, (double)throughput / tx_time / 1024 / 1024
); );
} }
else { else {