wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-03 04:34:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix sign conversion errors

Browse Source
This commit is contained in:
Andras Fekete
2024-05-08 10:14:53 -04:00
parent 0e2bb28ff3
commit affd0a318e
15 changed files with 168 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
examples/benchmark/tls_bench.c
View File

@@ -412,7 +412,7 @@ static int ServerMemSend(info_t* info, char* buf, int sz)
}
#endif
XMEMCPY(&info->to_client.buf[info->to_client.write_idx], buf, sz);
XMEMCPY(&info->to_client.buf[info->to_client.write_idx], buf, (size_t)sz);
info->to_client.write_idx += sz;
info->to_client.write_bytes += sz;
@@ -443,7 +443,7 @@ static int ServerMemRecv(info_t* info, char* buf, int sz)
}
#endif
XMEMCPY(buf, &info->to_server.buf[info->to_server.read_idx], sz);
XMEMCPY(buf, &info->to_server.buf[info->to_server.read_idx], (size_t)sz);
info->to_server.read_idx += sz;
info->to_server.read_bytes += sz;
@@ -486,7 +486,7 @@ static int ClientMemSend(info_t* info, char* buf, int sz)
}
#endif
XMEMCPY(&info->to_server.buf[info->to_server.write_idx], buf, sz);
XMEMCPY(&info->to_server.buf[info->to_server.write_idx], buf, (size_t)sz);
info->to_server.write_idx += sz;
info->to_server.write_bytes += sz;
@@ -517,7 +517,7 @@ static int ClientMemRecv(info_t* info, char* buf, int sz)
}
#endif
XMEMCPY(buf, &info->to_client.buf[info->to_client.read_idx], sz);
XMEMCPY(buf, &info->to_client.buf[info->to_client.read_idx], (size_t)sz);
info->to_client.read_idx += sz;
info->to_client.read_bytes += sz;
@@ -544,7 +544,7 @@ static int ClientMemRecv(info_t* info, char* buf, int sz)
static int SocketRecv(int sockFd, char* buf, int sz)
{
int recvd = (int)recv(sockFd, buf, sz, 0);
int recvd = (int)recv(sockFd, buf, (size_t)sz, 0);
if (recvd == -1) {
switch (errno) {
#if EAGAIN != SOCKET_EWOULDBLOCK
@@ -572,7 +572,7 @@ static int SocketRecv(int sockFd, char* buf, int sz)
static int SocketSend(int sockFd, char* buf, int sz)
{
int sent = (int)send(sockFd, buf, sz, 0);
int sent = (int)send(sockFd, buf, (size_t)sz, 0);
if (sent == -1) {
switch (errno) {
#if EAGAIN != SOCKET_EWOULDBLOCK
@@ -618,7 +618,7 @@ static int ReceiveFrom(WOLFSSL *ssl, int sd, char *buf, int sz)
}
}
recvd = (int)recvfrom(sd, buf, sz, 0, (SOCKADDR*)&peer, &peerSz);
recvd = (int)recvfrom(sd, buf, (size_t)sz, 0, (SOCKADDR*)&peer, &peerSz);
if (recvd < 0) {
if (errno == SOCKET_EWOULDBLOCK || errno == SOCKET_EAGAIN) {
@@ -658,7 +658,7 @@ static int SendTo(int sd, char *buf, int sz, const struct sockaddr *peer,
{
int sent;
sent = (int)sendto(sd, buf, sz, 0, peer, peerSz);
sent = (int)sendto(sd, buf, (size_t)sz, 0, peer, peerSz);
if (sent < 0) {
if (errno == SOCKET_EWOULDBLOCK || errno == SOCKET_EAGAIN) {
@@ -813,13 +813,13 @@ static int SetupSocketAndConnect(info_t* info, const char* host,
/* Setup server address */
XMEMSET(&servAddr, 0, sizeof(servAddr));
servAddr.sin_family = AF_INET;
servAddr.sin_port = htons(port);
servAddr.sin_port = htons((__uint16_t)port);
/* Resolve host */
entry = gethostbyname(host);
if (entry) {
XMEMCPY(&servAddr.sin_addr.s_addr, entry->h_addr_list[0],
entry->h_length);
(size_t)entry->h_length);
}
else {
servAddr.sin_addr.s_addr = inet_addr(host);
@@ -981,7 +981,7 @@ static int bench_tls_client(info_t* info)
/* Allocate and initialize a packet sized buffer */
writeBuf = (unsigned char*)XMALLOC(info->packetSize, NULL,
writeBuf = (unsigned char*)XMALLOC((size_t)info->packetSize, NULL,
DYNAMIC_TYPE_TMP_BUFFER);
if (writeBuf == NULL) {
fprintf(stderr, "failed to allocate write memory\n");
@@ -990,7 +990,7 @@ static int bench_tls_client(info_t* info)
/* Allocate read buffer */
readBufSz = info->packetSize;
readBuf = (unsigned char*)XMALLOC(readBufSz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
readBuf = (unsigned char*)XMALLOC((size_t)readBufSz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (readBuf == NULL) {
fprintf(stderr, "failed to allocate read memory\n");
ret = MEMORY_E; goto exit;
@@ -1089,7 +1089,7 @@ static int bench_tls_client(info_t* info)
info->client.shutdown = 1;
writeSz = (int)XSTRLEN(kShutdown) + 1;
XMEMCPY(writeBuf, kShutdown, writeSz); /* include null term */
XMEMCPY(writeBuf, kShutdown, (size_t)writeSz); /* include null term */
if (info->showVerbose) {
fprintf(stderr, "Sending shutdown\n");
}
@@ -1102,8 +1102,8 @@ static int bench_tls_client(info_t* info)
}
}
else {
XMEMSET(writeBuf, 0, info->packetSize);
XSTRNCPY((char*)writeBuf, kTestStr, info->packetSize);
XMEMSET(writeBuf, 0, (size_t)info->packetSize);
XSTRNCPY((char*)writeBuf, kTestStr, (size_t)info->packetSize);
}
/* write / read echo loop */
@@ -1131,7 +1131,7 @@ static int bench_tls_client(info_t* info)
total_sz += ret;
/* read echo of message from server */
XMEMSET(readBuf, 0, readBufSz);
XMEMSET(readBuf, 0, (size_t)readBufSz);
start = gettime_secs(1);
#ifndef BENCH_USE_NONBLOCK
ret = wolfSSL_read(cli_ssl, readBuf, readBufSz);
@@ -1152,7 +1152,7 @@ static int bench_tls_client(info_t* info)
ret = 0; /* reset return code */
/* validate echo */
if (XMEMCMP((char*)writeBuf, (char*)readBuf, writeSz) != 0) {
if (XMEMCMP((char*)writeBuf, (char*)readBuf, (size_t)writeSz) != 0) {
fprintf(stderr, "echo check failed!\n");
ret = wolfSSL_get_error(cli_ssl, ret);
goto exit;
@@ -1169,7 +1169,7 @@ exit:
if (ret != 0 && ret != WOLFSSL_SUCCESS) {
fprintf(stderr, "Client Error: %d (%s)\n", ret,
wolfSSL_ERR_reason_error_string(ret));
wolfSSL_ERR_reason_error_string((unsigned long)ret));
}
/* clean up */
@@ -1224,7 +1224,7 @@ static int SetupSocketAndListen(int* listenFd, word32 port, int doDTLS)
/* Setup server address */
XMEMSET(&servAddr, 0, sizeof(servAddr));
servAddr.sin_family = AF_INET;
servAddr.sin_port = htons(port);
servAddr.sin_port = htons((__uint16_t)port);
servAddr.sin_addr.s_addr = INADDR_ANY;
#ifdef WOLFSSL_DTLS
@@ -1440,7 +1440,7 @@ static int bench_tls_server(info_t* info)
/* Allocate read buffer */
readBufSz = info->packetSize;
readBuf = (unsigned char*)XMALLOC(readBufSz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
readBuf = (unsigned char*)XMALLOC((size_t)readBufSz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (readBuf == NULL) {
fprintf(stderr, "failed to allocate read memory\n");
ret = MEMORY_E; goto exit;
@@ -1538,7 +1538,7 @@ static int bench_tls_server(info_t* info)
double rxTime;
/* read message from client */
XMEMSET(readBuf, 0, readBufSz);
XMEMSET(readBuf, 0, (size_t)readBufSz);
start = gettime_secs(1);
#ifndef BENCH_USE_NONBLOCK
ret = wolfSSL_read(srv_ssl, readBuf, readBufSz);
@@ -1615,7 +1615,7 @@ exit:
if (ret != 0 && ret != WOLFSSL_SUCCESS) {
fprintf(stderr, "Server Error: %d (%s)\n", ret,
wolfSSL_ERR_reason_error_string(ret));
wolfSSL_ERR_reason_error_string((unsigned long)ret));
}
/* clean up */
@@ -1834,7 +1834,7 @@ int bench_tls(void* args)
int argClientOnly = 0;
int argServerOnly = 0;
const char* argHost = BENCH_DEFAULT_HOST;
int argPort = BENCH_DEFAULT_PORT;
word32 argPort = BENCH_DEFAULT_PORT;
int argShowPeerInfo = 0;
#ifndef SINGLE_THREADED
int doShutdown;
@@ -1883,7 +1883,7 @@ int bench_tls(void* args)
break;
case 'P':
argPort = atoi(myoptarg);
argPort = (word32)atoi(myoptarg);
break;
case 'd' :
@@ -2003,12 +2003,12 @@ int bench_tls(void* args)
#endif
/* Allocate test info array */
theadInfo = (info_t*)XMALLOC(sizeof(info_t) * argThreadPairs, NULL,
theadInfo = (info_t*)XMALLOC(sizeof(info_t) * (size_t)argThreadPairs, NULL,
DYNAMIC_TYPE_TMP_BUFFER);
if (theadInfo == NULL) {
ret = MEMORY_E; goto exit;
}
XMEMSET(theadInfo, 0, sizeof(info_t) * argThreadPairs);
XMEMSET(theadInfo, 0, sizeof(info_t) * (size_t)argThreadPairs);
#ifndef NO_WOLFSSL_SERVER
/* Use same listen socket to avoid timing issues between client and server */
@@ -2073,7 +2073,7 @@ int bench_tls(void* args)
XMEMSET(info, 0, sizeof(info_t));
info->host = argHost;
info->port = argPort + i; /* threads must have separate ports */
info->port = argPort + (word32)i; /* threads must have separate ports */
info->cipher = cipher;
#if defined(WOLFSSL_TLS13) && defined(HAVE_SUPPORTED_CURVES)

6
examples/echoclient/echoclient.c
View File

@@ -257,7 +257,7 @@ void echoclient_test(void* args)
} while (err == WC_PENDING_E);
if (ret != WOLFSSL_SUCCESS) {
fprintf(stderr, "SSL_connect error %d, %s\n", err,
ERR_error_string(err, buffer));
ERR_error_string((unsigned long)err, buffer));
err_sys("SSL_connect failed");
}
@@ -280,7 +280,7 @@ void echoclient_test(void* args)
} while (err == WC_PENDING_E);
if (ret != sendSz) {
fprintf(stderr, "SSL_write msg error %d, %s\n", err,
ERR_error_string(err, buffer));
ERR_error_string((unsigned long)err, buffer));
err_sys("SSL_write failed");
}
@@ -329,7 +329,7 @@ void echoclient_test(void* args)
#endif
else {
fprintf(stderr, "SSL_read msg error %d, %s\n", err,
ERR_error_string(err, buffer));
ERR_error_string((unsigned long)err, buffer));
err_sys("SSL_read failed");
}
}

8
examples/echoserver/echoserver.c
View File

@@ -350,7 +350,7 @@ THREAD_RETURN WOLFSSL_THREAD echoserver_test(void* args)
} while (err == WC_PENDING_E);
if (ret != WOLFSSL_SUCCESS) {
fprintf(stderr, "SSL_accept error = %d, %s\n", err,
wolfSSL_ERR_error_string(err, buffer));
wolfSSL_ERR_error_string((unsigned long)err, buffer));
fprintf(stderr, "SSL_accept failed\n");
wolfSSL_free(ssl);
CloseSocket(clientfd);
@@ -391,7 +391,7 @@ THREAD_RETURN WOLFSSL_THREAD echoserver_test(void* args)
if (ret <= 0) {
if (err != WOLFSSL_ERROR_WANT_READ && err != WOLFSSL_ERROR_ZERO_RETURN){
fprintf(stderr, "SSL_read echo error %d, %s!\n", err,
wolfSSL_ERR_error_string(err, buffer));
wolfSSL_ERR_error_string((unsigned long)err, buffer));
}
break;
}
@@ -453,7 +453,7 @@ THREAD_RETURN WOLFSSL_THREAD echoserver_test(void* args)
} while (err == WC_PENDING_E);
if (ret != echoSz) {
fprintf(stderr, "SSL_write get error = %d, %s\n", err,
wolfSSL_ERR_error_string(err, buffer));
wolfSSL_ERR_error_string((unsigned long)err, buffer));
err_sys("SSL_write get failed");
}
break;
@@ -480,7 +480,7 @@ THREAD_RETURN WOLFSSL_THREAD echoserver_test(void* args)
if (ret != echoSz) {
fprintf(stderr, "SSL_write echo error = %d, %s\n", err,
wolfSSL_ERR_error_string(err, buffer));
wolfSSL_ERR_error_string((unsigned long)err, buffer));
err_sys("SSL_write echo failed");
}
}

31
examples/server/server.c
View File

@@ -262,7 +262,8 @@ static WC_INLINE int PeekSeq(const char* buf, word32* seq)
const char* c = buf + 3;
if ((c[0] | c[1] | c[2] | c[3]) == 0) {
*seq = (c[4] << 24) | (c[5] << 16) | (c[6] << 8) | c[7];
*seq = ((word32)c[4] << 24) | ((word32)c[5] << 16) |
((word32)c[6] << 8) | (word32)c[7];
return 1;
}
@@ -292,8 +293,8 @@ static int TestEmbedSendTo(WOLFSSL* ssl, char *buf, int sz, void *ctx)
}
}
sent = (int)sendto(sd, buf, sz, 0, (const SOCKADDR*)&dtlsCtx->peer.sa,
dtlsCtx->peer.sz);
sent = (int)sendto(sd, buf, (size_t)sz, 0,
(const SOCKADDR*)&dtlsCtx->peer.sa, dtlsCtx->peer.sz);
sent = TranslateReturnCode(sent, sd);
@@ -431,7 +432,7 @@ int ServerEchoData(SSL* ssl, int clientfd, int echoData, int block,
if (select_ret == TEST_RECV_READY) {
if (throughput)
len = min(block, (int)(throughput - xfer_bytes));
len = (int)min((word32)block, (word32)(throughput - xfer_bytes));
else
len = block;
rx_pos = 0;
@@ -479,7 +480,7 @@ int ServerEchoData(SSL* ssl, int clientfd, int echoData, int block,
/* Write data */
do {
err = 0; /* reset error */
ret = SSL_write(ssl, buffer, min(len, rx_pos));
ret = SSL_write(ssl, buffer, (int)min((word32)len, (word32)rx_pos));
if (ret <= 0) {
err = SSL_get_error(ssl, 0);
#ifdef WOLFSSL_ASYNC_CRYPT
@@ -490,7 +491,7 @@ int ServerEchoData(SSL* ssl, int clientfd, int echoData, int block,
#endif
}
} while (err == WC_PENDING_E);
if (ret != (int)min(len, rx_pos)) {
if (ret != (int)min((word32)len, (word32)rx_pos)) {
LOG_ERROR("SSL_write echo error %d\n", err);
err_sys_ex(runWithErrors, "SSL_write failed");
}
@@ -499,7 +500,7 @@ int ServerEchoData(SSL* ssl, int clientfd, int echoData, int block,
tx_time += current_time(0) - start;
}
xfer_bytes += len;
xfer_bytes += (size_t)len;
}
}
@@ -519,8 +520,8 @@ int ServerEchoData(SSL* ssl, int clientfd, int echoData, int block,
"\tRX %8.3f ms (%8.3f MBps)\n"
"\tTX %8.3f ms (%8.3f MBps)\n",
(SIZE_TYPE)throughput,
rx_time * 1000, throughput / rx_time / 1024 / 1024,
tx_time * 1000, throughput / tx_time / 1024 / 1024
(double)rx_time * 1000, throughput / rx_time / 1024 / 1024,
(double)tx_time * 1000, throughput / tx_time / 1024 / 1024
);
}
else {
@@ -582,7 +583,7 @@ static void ServerRead(WOLFSSL* ssl, char* input, int inputLen)
#endif
) {
LOG_ERROR("SSL_read input error %d, %s\n", err,
ERR_error_string(err, buffer));
ERR_error_string((unsigned long)err, buffer));
err_sys_ex(runWithErrors, "SSL_read failed");
}
}
@@ -655,7 +656,7 @@ static void ServerWrite(WOLFSSL* ssl, const char* output, int outputLen)
if (ret != outputLen) {
char buffer[WOLFSSL_MAX_ERROR_SZ];
LOG_ERROR("SSL_write msg error %d, %s\n", err,
ERR_error_string(err, buffer));
ERR_error_string((unsigned long)err, buffer));
err_sys_ex(runWithErrors, "SSL_write failed");
}
}
@@ -1984,7 +1985,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
break;
case 'B':
throughput = atol(myoptarg);
throughput = (size_t)atol(myoptarg);
for (; *myoptarg != '\0'; myoptarg++) {
if (*myoptarg == ',') {
block = atoi(myoptarg + 1);
@@ -2143,7 +2144,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
#if defined(WOLFSSL_DTLS) && defined(USE_WOLFSSL_IO)
XMEMSET(&dtlsCtx, 0, sizeof(dtlsCtx));
doBlockSeq = 1;
dtlsCtx.blockSeq = atoi(myoptarg);
dtlsCtx.blockSeq = (word32)atoi(myoptarg);
#endif
break;
@@ -3182,7 +3183,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
#ifdef CAN_FORCE_CURVE
if (force_curve_group_id > 0) {
do {
ret = wolfSSL_UseKeyShare(ssl, force_curve_group_id);
ret = wolfSSL_UseKeyShare(ssl, (word16)force_curve_group_id);
if (ret == WOLFSSL_SUCCESS) {
}
@@ -3444,7 +3445,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
if (ret != WOLFSSL_SUCCESS) {
err = SSL_get_error(ssl, 0);
LOG_ERROR("SSL_accept error %d, %s\n", err,
ERR_error_string(err, buffer));
ERR_error_string((unsigned long)err, buffer));
if (!exitWithRet) {
err_sys_ex(runWithErrors, "SSL_accept failed");
} else {

16
src/crl.c
View File

@@ -110,11 +110,11 @@ static int InitCRL_Entry(CRL_Entry* crle, DecodedCRL* dcrl, const byte* buff,
#if defined(OPENSSL_EXTRA)
crle->lastDateAsn1.length = MAX_DATE_SIZE;
XMEMCPY (crle->lastDateAsn1.data, crle->lastDate,
crle->lastDateAsn1.length);
(size_t)crle->lastDateAsn1.length);
crle->lastDateAsn1.type = crle->lastDateFormat;
crle->nextDateAsn1.length = MAX_DATE_SIZE;
XMEMCPY (crle->nextDateAsn1.data, crle->nextDate,
crle->nextDateAsn1.length);
(size_t)crle->nextDateAsn1.length);
crle->nextDateAsn1.type = crle->nextDateFormat;
crle->issuer = NULL;
@@ -318,14 +318,14 @@ static int FindRevokedSerial(RevokedCert* rc, byte* serial, int serialSz,
while (rc) {
if (serialHash == NULL) {
if (rc->serialSz == serialSz &&
XMEMCMP(rc->serialNumber, serial, rc->serialSz) == 0) {
XMEMCMP(rc->serialNumber, serial, (size_t)rc->serialSz) == 0) {
WOLFSSL_MSG("Cert revoked");
ret = CRL_CERT_REVOKED;
break;
}
}
else {
ret = CalcHashId(rc->serialNumber, rc->serialSz, hash);
ret = CalcHashId(rc->serialNumber, (word32)rc->serialSz, hash);
if (ret != 0)
break;
if (XMEMCMP(hash, serialHash, SIGNER_DIGEST_SIZE) == 0) {
@@ -362,7 +362,7 @@ static int VerifyCRLE(const WOLFSSL_CRL* crl, CRL_Entry* crle)
ret = VerifyCRL_Signature(&sigCtx, crle->toBeSigned, crle->tbsSz,
crle->signature, crle->signatureSz, crle->signatureOID,
#ifdef WC_RSA_PSS
crle->sigParams, crle->sigParamsSz,
crle->sigParams, (int)crle->sigParamsSz,
#else
NULL, 0,
#endif
@@ -528,7 +528,7 @@ int CheckCertCRL_ex(WOLFSSL_CRL* crl, byte* issuerHash, byte* serial,
url[0] = '\0';
if (extCrlInfo) {
if (extCrlInfoSz < (int)sizeof(url) -1 ) {
XMEMCPY(url, extCrlInfo, extCrlInfoSz);
XMEMCPY(url, extCrlInfo, (size_t)extCrlInfoSz);
url[extCrlInfoSz] = '\0';
}
else {
@@ -849,7 +849,7 @@ static int DupX509_CRL(WOLFSSL_X509_CRL *dupl, const WOLFSSL_X509_CRL* crl)
#ifdef HAVE_CRL_MONITOR
if (crl->monitors[0].path) {
int pathSz = (int)XSTRLEN(crl->monitors[0].path) + 1;
size_t pathSz = XSTRLEN(crl->monitors[0].path) + 1;
dupl->monitors[0].path = (char*)XMALLOC(pathSz, dupl->heap,
DYNAMIC_TYPE_CRL_MONITOR);
if (dupl->monitors[0].path != NULL) {
@@ -861,7 +861,7 @@ static int DupX509_CRL(WOLFSSL_X509_CRL *dupl, const WOLFSSL_X509_CRL* crl)
}
if (crl->monitors[1].path) {
int pathSz = (int)XSTRLEN(crl->monitors[1].path) + 1;
size_t pathSz = XSTRLEN(crl->monitors[1].path) + 1;
dupl->monitors[1].path = (char*)XMALLOC(pathSz, dupl->heap,
DYNAMIC_TYPE_CRL_MONITOR);
if (dupl->monitors[1].path != NULL) {

4
src/dtls.c
View File

@@ -187,14 +187,14 @@ typedef struct WolfSSL_CH {
byte dtls12cookieSet:1;
} WolfSSL_CH;
static int ReadVector8(const byte* input, WolfSSL_ConstVector* v)
static word32 ReadVector8(const byte* input, WolfSSL_ConstVector* v)
{
v->size = *input;
v->elements = input + OPAQUE8_LEN;
return v->size + OPAQUE8_LEN;
}
static int ReadVector16(const byte* input, WolfSSL_ConstVector* v)
static word32 ReadVector16(const byte* input, WolfSSL_ConstVector* v)
{
word16 size16;
ato16(input, &size16);

17
src/keys.c
View File

@@ -3668,7 +3668,8 @@ int SetKeysSide(WOLFSSL* ssl, enum encrypt_side side)
/* TLS can call too */
int StoreKeys(WOLFSSL* ssl, const byte* keyData, int side)
{
int sz, i = 0;
size_t sz;
int i = 0;
Keys* keys = &ssl->keys;
#ifdef WOLFSSL_DTLS
/* In case of DTLS, ssl->keys is updated here */
@@ -3712,7 +3713,7 @@ int StoreKeys(WOLFSSL* ssl, const byte* keyData, int side)
XMEMCPY(keys->client_write_MAC_secret,&keyData[i], sz);
XMEMCPY(keys->server_write_MAC_secret,&keyData[i], sz);
#endif
i += sz;
i += (int)sz;
}
sz = ssl->specs.key_size;
#ifdef WOLFSSL_DTLS
@@ -3725,7 +3726,7 @@ int StoreKeys(WOLFSSL* ssl, const byte* keyData, int side)
#endif
XMEMCPY(keys->client_write_key, &keyData[i], sz);
XMEMCPY(keys->server_write_key, &keyData[i], sz);
i += sz;
i += (int)sz;
sz = ssl->specs.iv_size;
#ifdef WOLFSSL_DTLS
@@ -3767,7 +3768,7 @@ int StoreKeys(WOLFSSL* ssl, const byte* keyData, int side)
#endif
XMEMCPY(keys->client_write_MAC_secret,&keyData[i], sz);
#endif
i += sz;
i += (int)sz;
}
if (side & PROVISION_SERVER) {
#ifndef WOLFSSL_AEAD_ONLY
@@ -3778,7 +3779,7 @@ int StoreKeys(WOLFSSL* ssl, const byte* keyData, int side)
#endif
XMEMCPY(keys->server_write_MAC_secret,&keyData[i], sz);
#endif
i += sz;
i += (int)sz;
}
}
sz = ssl->specs.key_size;
@@ -3789,7 +3790,7 @@ int StoreKeys(WOLFSSL* ssl, const byte* keyData, int side)
keys->client_write_key, sz);
#endif
XMEMCPY(keys->client_write_key, &keyData[i], sz);
i += sz;
i += (int)sz;
}
if (side & PROVISION_SERVER) {
#ifdef WOLFSSL_DTLS
@@ -3798,7 +3799,7 @@ int StoreKeys(WOLFSSL* ssl, const byte* keyData, int side)
keys->server_write_key, sz);
#endif
XMEMCPY(keys->server_write_key, &keyData[i], sz);
i += sz;
i += (int)sz;
}
sz = ssl->specs.iv_size;
@@ -3809,7 +3810,7 @@ int StoreKeys(WOLFSSL* ssl, const byte* keyData, int side)
keys->client_write_IV, sz);
#endif
XMEMCPY(keys->client_write_IV, &keyData[i], sz);
i += sz;
i += (int)sz;
}
if (side & PROVISION_SERVER) {
#ifdef WOLFSSL_DTLS

72
src/ocsp.c
View File

@@ -241,7 +241,7 @@ static int GetOcspStatus(WOLFSSL_OCSP* ocsp, OcspRequest* request,
for (*status = entry->status; *status; *status = (*status)->next)
if ((*status)->serialSz == request->serialSz
&& !XMEMCMP((*status)->serial, request->serial, (*status)->serialSz))
&& !XMEMCMP((*status)->serial, request->serial, (size_t)(*status)->serialSz))
break;
if (responseBuffer && *status && !(*status)->rawOcspResponse) {
@@ -326,8 +326,8 @@ int CheckOcspResponse(WOLFSSL_OCSP *ocsp, byte *response, int responseSz,
return MEMORY_E;
}
#endif
InitOcspResponse(ocspResponse, newSingle, newStatus, response, responseSz,
ocsp->cm->heap);
InitOcspResponse(ocspResponse, newSingle, newStatus, response,
(word32)responseSz, ocsp->cm->heap);
ret = OcspResponseDecode(ocspResponse, ocsp->cm, ocsp->cm->heap, 0);
if (ret != 0) {
@@ -350,12 +350,12 @@ int CheckOcspResponse(WOLFSSL_OCSP *ocsp, byte *response, int responseSz,
}
if (responseBuffer) {
responseBuffer->buffer = (byte*)XMALLOC(responseSz, heap,
responseBuffer->buffer = (byte*)XMALLOC((size_t)responseSz, heap,
DYNAMIC_TYPE_TMP_BUFFER);
if (responseBuffer->buffer) {
responseBuffer->length = responseSz;
XMEMCPY(responseBuffer->buffer, response, responseSz);
responseBuffer->length = (unsigned int)responseSz;
XMEMCPY(responseBuffer->buffer, response, (size_t)responseSz);
}
}
@@ -522,13 +522,13 @@ int CheckOcspRequest(WOLFSSL_OCSP* ocsp, OcspRequest* ocspRequest,
return 0;
}
request = (byte*)XMALLOC(requestSz, ocsp->cm->heap, DYNAMIC_TYPE_OCSP);
request = (byte*)XMALLOC((size_t)requestSz, ocsp->cm->heap, DYNAMIC_TYPE_OCSP);
if (request == NULL) {
WOLFSSL_LEAVE("CheckCertOCSP", MEMORY_ERROR);
return MEMORY_ERROR;
}
requestSz = EncodeOcspRequest(ocspRequest, request, requestSz);
requestSz = EncodeOcspRequest(ocspRequest, request, (word32)requestSz);
if (requestSz > 0 && ocsp->cm->ocspIOCb) {
responseSz = ocsp->cm->ocspIOCb(ioCtx, url, urlSz,
request, requestSz, &response);
@@ -663,7 +663,7 @@ int wolfSSL_OCSP_resp_find_status(WOLFSSL_OCSP_BASICRESP *bs,
single = bs->single;
while (single != NULL) {
if ((XMEMCMP(single->status->serial, id->status->serial, single->status->serialSz) == 0)
if ((XMEMCMP(single->status->serial, id->status->serial, (size_t)single->status->serialSz) == 0)
&& (XMEMCMP(single->issuerHash, id->issuerHash, OCSP_DIGEST_SIZE) == 0)
&& (XMEMCMP(single->issuerKeyHash, id->issuerKeyHash, OCSP_DIGEST_SIZE) == 0)) {
break;
@@ -790,7 +790,7 @@ WOLFSSL_OCSP_CERTID* wolfSSL_OCSP_cert_to_id(
else {
XMEMCPY(certId->issuerHash, cert->issuerHash, OCSP_DIGEST_SIZE);
XMEMCPY(certId->issuerKeyHash, cert->issuerKeyHash, OCSP_DIGEST_SIZE);
XMEMCPY(certId->status->serial, cert->serial, cert->serialSz);
XMEMCPY(certId->status->serial, cert->serial, (size_t)cert->serialSz);
certId->status->serialSz = cert->serialSz;
FreeDecodedCert(cert);
}
@@ -864,7 +864,7 @@ int wolfSSL_OCSP_basic_verify(WOLFSSL_OCSP_BASICRESP *bs,
int derSz = 0;
const byte* der = wolfSSL_X509_get_der(x, &derSz);
if (der != NULL && derSz == (int)bs->certSz &&
XMEMCMP(bs->cert, der, derSz) == 0) {
XMEMCMP(bs->cert, der, (size_t)derSz) == 0) {
ret = WOLFSSL_SUCCESS;
goto out;
}
@@ -952,7 +952,7 @@ OcspResponse* wolfSSL_d2i_OCSP_RESPONSE_bio(WOLFSSL_BIO* bio,
if (fcur > MAX_WOLFSSL_FILE_SIZE || fcur <= 0)
return NULL;
data = (byte*)XMALLOC(fcur, 0, DYNAMIC_TYPE_TMP_BUFFER);
data = (byte*)XMALLOC((size_t)fcur, 0, DYNAMIC_TYPE_TMP_BUFFER);
if (data == NULL)
return NULL;
dataAlloced = 1;
@@ -997,7 +997,7 @@ OcspResponse* wolfSSL_d2i_OCSP_RESPONSE(OcspResponse** response,
XMEMSET(resp, 0, sizeof(OcspResponse));
}
resp->source = (byte*)XMALLOC(len, NULL, DYNAMIC_TYPE_TMP_BUFFER);
resp->source = (byte*)XMALLOC((size_t)len, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (resp->source == NULL) {
XFREE(resp, NULL, DYNAMIC_TYPE_OCSP_REQUEST);
return NULL;
@@ -1021,8 +1021,8 @@ OcspResponse* wolfSSL_d2i_OCSP_RESPONSE(OcspResponse** response,
}
XMEMSET(resp->single->status, 0, sizeof(CertStatus));
XMEMCPY(resp->source, *data, len);
resp->maxIdx = len;
XMEMCPY(resp->source, *data, (size_t)len);
resp->maxIdx = (word32)len;
ret = OcspResponseDecode(resp, NULL, NULL, 1);
if (ret != 0 && ret != ASN_OCSP_CONFIRM_E) {
@@ -1032,8 +1032,8 @@ OcspResponse* wolfSSL_d2i_OCSP_RESPONSE(OcspResponse** response,
return NULL;
}
if (GetSequence(*data, &idx, &length, len) >= 0)
(*data) += idx + length;
if (GetSequence(*data, &idx, &length, (word32)len) >= 0)
(*data) += (unsigned char) ((int)idx + length);
return resp;
}
@@ -1042,10 +1042,10 @@ int wolfSSL_i2d_OCSP_RESPONSE(OcspResponse* response,
unsigned char** data)
{
if (data == NULL)
return response->maxIdx;
return (int)response->maxIdx;
XMEMCPY(*data, response->source, response->maxIdx);
return response->maxIdx;
return (int)response->maxIdx;
}
int wolfSSL_OCSP_response_status(OcspResponse *response)
@@ -1128,7 +1128,7 @@ int wolfSSL_i2d_OCSP_REQUEST(OcspRequest* request, unsigned char** data)
if (size <= 0 || data == NULL)
return size;
return EncodeOcspRequest(request, *data, size);
return EncodeOcspRequest(request, *data, (word32) size);
}
WOLFSSL_OCSP_ONEREQ* wolfSSL_OCSP_request_add0_id(OcspRequest *req,
@@ -1147,12 +1147,12 @@ WOLFSSL_OCSP_ONEREQ* wolfSSL_OCSP_request_add0_id(OcspRequest *req,
if (cid->status->serialSz > req->serialSz) {
if (req->serial != NULL)
XFREE(req->serial, req->heap, DYNAMIC_TYPE_OCSP);
req->serial = (byte*)XMALLOC(cid->status->serialSz,
req->serial = (byte*)XMALLOC((size_t)cid->status->serialSz,
req->heap, DYNAMIC_TYPE_OCSP_REQUEST);
if (req->serial == NULL)
return NULL;
}
XMEMCPY(req->serial, cid->status->serial, cid->status->serialSz);
XMEMCPY(req->serial, cid->status->serial, (size_t)cid->status->serialSz);
req->serialSz = cid->status->serialSz;
return req;
@@ -1188,7 +1188,7 @@ int wolfSSL_i2d_OCSP_REQUEST_bio(WOLFSSL_BIO* out,
size = wolfSSL_i2d_OCSP_REQUEST(req, NULL);
if (size > 0) {
data = (unsigned char*) XMALLOC(size, out->heap,
data = (unsigned char*) XMALLOC((size_t)size, out->heap,
DYNAMIC_TYPE_TMP_BUFFER);
}
@@ -1217,15 +1217,15 @@ int wolfSSL_i2d_OCSP_CERTID(WOLFSSL_OCSP_CERTID* id, unsigned char** data)
return WOLFSSL_FAILURE;
if (*data != NULL) {
XMEMCPY(*data, id->rawCertId, id->rawCertIdSize);
XMEMCPY(*data, id->rawCertId, (size_t)id->rawCertIdSize);
*data = *data + id->rawCertIdSize;
}
else {
*data = (unsigned char*)XMALLOC(id->rawCertIdSize, NULL, DYNAMIC_TYPE_OPENSSL);
*data = (unsigned char*)XMALLOC((size_t)id->rawCertIdSize, NULL, DYNAMIC_TYPE_OPENSSL);
if (*data == NULL) {
return WOLFSSL_FAILURE;
}
XMEMCPY(*data, id->rawCertId, id->rawCertIdSize);
XMEMCPY(*data, id->rawCertId, (size_t)id->rawCertIdSize);
}
return id->rawCertIdSize;
@@ -1254,9 +1254,9 @@ WOLFSSL_OCSP_CERTID* wolfSSL_d2i_OCSP_CERTID(WOLFSSL_OCSP_CERTID** cidOut,
}
if (cid != NULL) {
cid->rawCertId = (byte*)XMALLOC(length + 1, NULL, DYNAMIC_TYPE_OPENSSL);
cid->rawCertId = (byte*)XMALLOC((size_t)length + 1, NULL, DYNAMIC_TYPE_OPENSSL);
if (cid->rawCertId != NULL) {
XMEMCPY(cid->rawCertId, *derIn, length);
XMEMCPY(cid->rawCertId, *derIn, (size_t)length);
cid->rawCertIdSize = length;
/* Per spec. advance past the data that is being returned
@@ -1303,7 +1303,7 @@ int wolfSSL_OCSP_id_cmp(WOLFSSL_OCSP_CERTID *a, WOLFSSL_OCSP_CERTID *b)
if (a->status != NULL && b->status != NULL) {
if (a->status->serialSz == b->status->serialSz)
ret = XMEMCMP(a->status->serial, b->status->serial,
a->status->serialSz);
(size_t)a->status->serialSz);
else
ret = -1;
}
@@ -1432,13 +1432,13 @@ int wolfSSL_OCSP_id_get0_info(WOLFSSL_ASN1_STRING **name,
if (cid->status->serialSz > (WOLFSSL_ASN1_INTEGER_MAX - 2)) {
/* allocate data buffer, +2 for type and length */
ser->data = (unsigned char*)XMALLOC(cid->status->serialSz + 2, NULL,
ser->data = (unsigned char*)XMALLOC((size_t)cid->status->serialSz + 2, NULL,
DYNAMIC_TYPE_OPENSSL);
if (ser->data == NULL) {
wolfSSL_ASN1_INTEGER_free(ser);
return 0;
}
ser->dataMax = cid->status->serialSz + 2;
ser->dataMax = (unsigned int)cid->status->serialSz + 2;
ser->isDynamic = 1;
} else {
/* Use array instead of dynamic memory */
@@ -1448,12 +1448,12 @@ int wolfSSL_OCSP_id_get0_info(WOLFSSL_ASN1_STRING **name,
#if defined(WOLFSSL_QT) || defined(WOLFSSL_HAPROXY)
/* Serial number starts at 0 index of ser->data */
XMEMCPY(&ser->data[i], cid->status->serial, cid->status->serialSz);
XMEMCPY(&ser->data[i], cid->status->serial, (size_t)cid->status->serialSz);
ser->length = cid->status->serialSz;
#else
ser->data[i++] = ASN_INTEGER;
i += SetLength(cid->status->serialSz, ser->data + i);
XMEMCPY(&ser->data[i], cid->status->serial, cid->status->serialSz);
XMEMCPY(&ser->data[i], cid->status->serial, (size_t)cid->status->serialSz);
ser->length = i + cid->status->serialSz;
#endif
@@ -1493,7 +1493,7 @@ int wolfSSL_OCSP_request_add1_nonce(OcspRequest* req, unsigned char* val,
sz = MAX_OCSP_NONCE_SZ;
if (val != NULL) {
XMEMCPY(req->nonce, val, sz);
XMEMCPY(req->nonce, val, (size_t)sz);
}
else {
if (
@@ -1506,7 +1506,7 @@ int wolfSSL_OCSP_request_add1_nonce(OcspRequest* req, unsigned char* val,
WOLFSSL_MSG("RNG init failed");
return WOLFSSL_FAILURE;
}
if (wc_RNG_GenerateBlock(&rng, req->nonce, sz) != 0) {
if (wc_RNG_GenerateBlock(&rng, req->nonce, (word32)sz) != 0) {
WOLFSSL_MSG("wc_RNG_GenerateBlock failed");
wc_FreeRng(&rng);
return WOLFSSL_FAILURE;
@@ -1559,7 +1559,7 @@ int wolfSSL_OCSP_check_nonce(OcspRequest* req, WOLFSSL_OCSP_BASICRESP* bs)
/* nonces are present and equal, return 1. Extra NULL check for fixing
scan-build warning. */
if (reqNonceSz == rspNonceSz && reqNonce && rspNonce) {
if (XMEMCMP(reqNonce, rspNonce, reqNonceSz) == 0)
if (XMEMCMP(reqNonce, rspNonce, (size_t)reqNonceSz) == 0)
return 1;
}

26
src/quic.c
View File

@@ -82,7 +82,7 @@ static QuicRecord *quic_record_make(WOLFSSL *ssl,
qr->capacity = qr->len = (word32)len;
}
else {
qr->capacity = qr->len = qr_length(data, len);
qr->capacity = qr->len = (word32) qr_length(data, len);
if (qr->capacity > WOLFSSL_QUIC_MAX_RECORD_CAPACITY) {
WOLFSSL_MSG("QUIC length read larger than expected");
quic_record_free(ssl, qr);
@@ -123,17 +123,17 @@ static int quic_record_append(WOLFSSL *ssl, QuicRecord *qr, const uint8_t *data,
missing = 4 - qr->end;
if (len < missing) {
XMEMCPY(qr->data + qr->end, data, len);
qr->end += len;
qr->end += (word32)len;
consumed = len;
goto cleanup; /* len consumed, but qr->len still unknown */
}
XMEMCPY(qr->data + qr->end, data, missing);
qr->end += missing;
qr->end += (word32)missing;
len -= missing;
data += missing;
consumed = missing;
qr->len = qr_length(qr->data, qr->end);
qr->len = (word32)qr_length(qr->data, qr->end);
/* sanity check on length read from wire before use */
if (qr->len > WOLFSSL_QUIC_MAX_RECORD_CAPACITY) {
@@ -163,7 +163,7 @@ static int quic_record_append(WOLFSSL *ssl, QuicRecord *qr, const uint8_t *data,
len = missing;
}
XMEMCPY(qr->data + qr->end, data, len);
qr->end += len;
qr->end += (word32)len;
consumed += len;
cleanup:
@@ -172,7 +172,7 @@ cleanup:
}
static word32 add_rec_header(byte* output, word32 length, int type)
static word32 add_rec_header(byte* output, word32 length, byte type)
{
RecordLayerHeader* rl;
@@ -192,7 +192,7 @@ static word32 quic_record_transfer(QuicRecord* qr, byte* buf, word32 sz)
{
word32 len = qr->end - qr->start;
word32 offset = 0;
word16 rlen;
word32 rlen;
if (len <= 0) {
return 0;
@@ -236,7 +236,7 @@ const QuicTransportParam* QuicTransportParam_new(const uint8_t* data,
return NULL;
}
XMEMCPY((uint8_t*)tp->data, data, len);
tp->len = len;
tp->len = (word16)len;
return tp;
}
@@ -793,7 +793,7 @@ int wolfSSL_quic_receive(WOLFSSL* ssl, byte* buf, word32 sz)
}
sz -= n;
buf += n;
transferred += n;
transferred += (int)n;
}
cleanup:
WOLFSSL_LEAVE("wolfSSL_quic_receive", transferred);
@@ -836,8 +836,8 @@ static int wolfSSL_quic_send_internal(WOLFSSL* ssl)
goto cleanup;
}
output += len;
length -= len;
ssl->quic.output_rec_remain -= len;
length -= (word32)len;
ssl->quic.output_rec_remain -= (word32)len;
}
else {
/* at start of a TLS Record */
@@ -1098,7 +1098,7 @@ size_t wolfSSL_quic_get_aead_tag_len(const WOLFSSL_EVP_CIPHER* aead_cipher)
XMEMSET(ctx, 0, sizeof(*ctx));
if (wolfSSL_EVP_CipherInit(ctx, aead_cipher, NULL, NULL, 0)
== WOLFSSL_SUCCESS) {
ret = ctx->authTagSz;
ret = (size_t)ctx->authTagSz;
} else {
ret = 0;
}
@@ -1355,7 +1355,7 @@ int wolfSSL_quic_aead_decrypt(uint8_t* dest, WOLFSSL_EVP_CIPHER_CTX* ctx,
return WOLFSSL_FAILURE;
}
enclen -= ctx->authTagSz;
enclen -= (size_t)ctx->authTagSz;
tag = enc + enclen;
if (wolfSSL_EVP_CipherInit(ctx, NULL, NULL, iv, 0) != WOLFSSL_SUCCESS

14
tests/quic.c
View File

@@ -569,10 +569,10 @@ static int ctx_session_ticket_cb(WOLFSSL* ssl,
}
memset(ctx->ticket, 0, sizeof(ctx->ticket));
ctx->ticket_len = (word32)ticketSz;
memcpy(ctx->ticket, ticket, ticketSz);
memcpy(ctx->ticket, ticket, (size_t)ticketSz);
if (ctx->verbose) {
printf("Session Ticket[%s]: ", ctx->name);
dump_buffer("", ticket, ticketSz, 4);
dump_buffer("", ticket, (size_t)ticketSz, 4);
}
return 0;
}
@@ -931,7 +931,7 @@ static int QuicConversation_start(QuicConversation *conv, const byte *data,
if (ret < 0) {
int err = wolfSSL_get_error(conv->client->ssl, ret);
char lbuffer[1024];
printf("EARLY DATA ret = %d, error = %d, %s\n", ret, err, wolfSSL_ERR_error_string(err, lbuffer));
printf("EARLY DATA ret = %d, error = %d, %s\n", ret, err, wolfSSL_ERR_error_string((unsigned long)err, lbuffer));
AssertTrue(0);
}
*pwritten = (size_t)written;
@@ -991,7 +991,7 @@ static int QuicConversation_step(QuicConversation *conv, int may_fail)
}
}
else if (n > 0) {
conv->early_data_len += n;
conv->early_data_len += (size_t)n;
if (conv->verbose)
printf("RECVed early data, len now=%d\n", (int)conv->early_data_len);
}
@@ -1382,10 +1382,10 @@ static int test_quic_resumption(int verbose) {
* a session works. */
AssertTrue(tclient.ticket_len > 0);
AssertNotNull(session = wolfSSL_get1_session(tclient.ssl));
AssertTrue((session_size = wolfSSL_i2d_SSL_SESSION(session, NULL)) > 0);
AssertTrue((session_size = (unsigned int)wolfSSL_i2d_SSL_SESSION(session, NULL)) > 0);
AssertTrue((size_t)session_size < sizeof(session_buffer));
session_data2 = session_data = session_buffer;
session_size = wolfSSL_i2d_SSL_SESSION(session, &session_data);
session_size = (unsigned int)wolfSSL_i2d_SSL_SESSION(session, &session_data);
session_restored = wolfSSL_d2i_SSL_SESSION(NULL, &session_data2, session_size);
AssertNotNull(session_restored);
@@ -1550,7 +1550,7 @@ static int new_session_cb(WOLFSSL *ssl, WOLFSSL_SESSION *session)
return -1;
}
data = ctx->session;
ctx->session_len = wolfSSL_i2d_SSL_SESSION(session, &data);
ctx->session_len = (word32)wolfSSL_i2d_SSL_SESSION(session, &data);
if (ctx->verbose) {
printf("[%s]", ctx->name);
dump_buffer(" new SESSION", ctx->session, ctx->session_len, 4);

6
tests/suites.c
View File

@@ -154,7 +154,7 @@ static int IsValidCipherSuite(const char* line, char *suite, size_t suite_spc)
printf("suite too long!\n");
return 0;
}
XMEMCPY(suite, begin, len);
XMEMCPY(suite, begin, (size_t) len);
suite[len] = '\0';
}
else
@@ -660,7 +660,7 @@ static void test_harness(void* vargs)
return;
}
script = (char*)malloc(sz+1);
script = (char*)malloc((size_t)(sz+1));
if (script == 0) {
fprintf(stderr, "unable to allocate script buffer\n");
fclose(file);
@@ -668,7 +668,7 @@ static void test_harness(void* vargs)
return;
}
len = fread(script, 1, sz, file);
len = (long) fread(script, 1, (size_t)sz, file);
if (len != sz) {
fprintf(stderr, "read error\n");
fclose(file);

8
tests/utils.h
View File

@@ -41,7 +41,7 @@ char* create_tmp_dir(char *tmpDir, int len)
XMEMCPY(tmpDir, TMP_DIR_PREFIX, XSTR_SIZEOF(TMP_DIR_PREFIX));
if (mymktemp(tmpDir, len, len - XSTR_SIZEOF(TMP_DIR_PREFIX)) == NULL)
if (mymktemp(tmpDir, len, len - (int)XSTR_SIZEOF(TMP_DIR_PREFIX)) == NULL)
return NULL;
#ifdef _MSC_VER
@@ -196,7 +196,7 @@ static WC_INLINE int test_memio_write_cb(WOLFSSL *ssl, char *data, int sz,
}
}
#endif
XMEMCPY(buf + *len, data, sz);
XMEMCPY(buf + *len, data, (size_t)sz);
*len += sz;
return sz;
@@ -226,8 +226,8 @@ static WC_INLINE int test_memio_read_cb(WOLFSSL *ssl, char *data, int sz,
read_sz = sz < *len ? sz : *len;
XMEMCPY(data, buf, read_sz);
XMEMMOVE(buf, buf + read_sz, *len - read_sz);
XMEMCPY(data, buf, (size_t)read_sz);
XMEMMOVE(buf, buf + read_sz,(size_t) (*len - read_sz));
*len -= read_sz;

2
testsuite/testsuite.c
View File

@@ -615,7 +615,7 @@ void file_test(const char* file, byte* check)
fclose(f);
return;
}
ret = wc_Sha256Update(&sha256, buf, i);
ret = wc_Sha256Update(&sha256, buf, (word32)i);
if (ret != 0) {
printf("Can't wc_Sha256Update %d\n", ret);
fclose(f);

6
wolfcrypt/src/kdf.c
View File

@@ -564,14 +564,14 @@ int wc_PRF_TLS(byte* digest, word32 digLen, const byte* secret, word32 secLen,
const byte* info, word32 infoLen, int digest, void* heap)
{
int ret = 0;
int idx = 0;
int len;
word32 idx = 0;
size_t len;
byte *data;
(void)heap;
/* okmLen (2) + protocol|label len (1) + info len(1) + protocollen +
* labellen + infolen */
len = 4 + protocolLen + labelLen + infoLen;
len = (size_t)4 + protocolLen + labelLen + infoLen;
data = (byte*)XMALLOC(len, heap, DYNAMIC_TYPE_TMP_BUFFER);
if (data == NULL)

64
wolfssl/test.h
View File

@@ -1002,11 +1002,11 @@ static WC_INLINE int PasswordCallBack(char* passwd, int sz, int rw, void* userda
(void)rw;
(void)userdata;
if (userdata != NULL) {
strncpy(passwd, (char*)userdata, sz);
strncpy(passwd, (char*)userdata, (size_t) sz);
return (int)XSTRLEN((char*)userdata);
}
else {
strncpy(passwd, "yassl123", sz);
strncpy(passwd, "yassl123", (size_t) sz);
return 8;
}
}
@@ -1329,7 +1329,7 @@ static WC_INLINE void build_addr(SOCKADDR_IN_T* addr, const char* peer,
if (entry) {
XMEMCPY(&addr->sin_addr.s_addr, entry->h_addr_list[0],
entry->h_length);
(size_t) entry->h_length);
useLookup = 1;
}
#else
@@ -1867,7 +1867,7 @@ static WC_INLINE unsigned int my_psk_client_cb(WOLFSSL* ssl, const char* hint,
for (i = 0; i < 32; i++, b += 0x22) {
if (b >= 0x100)
b = 0x01;
key[i] = b;
key[i] = (unsigned char) b;
}
ret = 32; /* length of key in octets or 0 for error */
@@ -1911,7 +1911,7 @@ static WC_INLINE unsigned int my_psk_server_cb(WOLFSSL* ssl, const char* identit
for (i = 0; i < 32; i++, b += 0x22) {
if (b >= 0x100)
b = 0x01;
key[i] = b;
key[i] = (unsigned char) b;
}
ret = 32; /* length of key in octets or 0 for error */
@@ -1944,7 +1944,7 @@ static WC_INLINE unsigned int my_psk_client_tls13_cb(WOLFSSL* ssl,
for (i = 0; i < 32; i++, b += 0x22) {
if (b >= 0x100)
b = 0x01;
key[i] = b;
key[i] = (unsigned char) b;
}
*ciphersuite = userCipher ? userCipher : "TLS13-AES128-GCM-SHA256";
@@ -1967,7 +1967,7 @@ static WC_INLINE unsigned int my_psk_server_tls13_cb(WOLFSSL* ssl,
unsigned int ret;
int i;
int b = 0x01;
int kIdLen = (int)XSTRLEN(kIdentityStr);
size_t kIdLen = XSTRLEN(kIdentityStr);
const char* userCipher = (const char*)wolfSSL_get_psk_callback_ctx(ssl);
(void)ssl;
@@ -1983,7 +1983,7 @@ static WC_INLINE unsigned int my_psk_server_tls13_cb(WOLFSSL* ssl,
for (i = 0; i < 32; i++, b += 0x22) {
if (b >= 0x100)
b = 0x01;
key[i] = b;
key[i] = (unsigned char) b;
}
*ciphersuite = userCipher ? userCipher : "TLS13-AES128-GCM-SHA256";
@@ -2046,7 +2046,7 @@ static WC_INLINE int my_psk_use_session_cb(WOLFSSL* ssl,
for (i = 0; i < 32; i++, b += 0x22) {
if (b >= 0x100)
b = 0x01;
local_psk[i] = b;
local_psk[i] = (unsigned char) b;
}
*id = local_psk;
@@ -2099,7 +2099,7 @@ static WC_INLINE unsigned int my_psk_client_cs_cb(WOLFSSL* ssl,
for (i = 0; i < 32; i++, b += 0x22) {
if (b >= 0x100)
b = 0x01;
key[i] = b;
key[i] = (unsigned char) b;
}
return 32; /* length of key in octets or 0 for error */
@@ -2433,7 +2433,7 @@ static WC_INLINE int myVerify(int preverify, WOLFSSL_X509_STORE_CTX* store)
*/
fprintf(stderr, "In verification callback, error = %d, %s\n", store->error,
wolfSSL_ERR_error_string(store->error, buffer));
wolfSSL_ERR_error_string((unsigned long) store->error, buffer));
#if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL)
peer = store->current_cert;
if (peer) {
@@ -2724,7 +2724,7 @@ static WC_INLINE int myMacEncryptCb(WOLFSSL* ssl, unsigned char* macOut,
if (ret != 0)
return ret;
ret = wc_HmacSetKey(&hmac, wolfSSL_GetHmacType(ssl),
wolfSSL_GetMacSecret(ssl, macVerify), wolfSSL_GetHmacSize(ssl));
wolfSSL_GetMacSecret(ssl, macVerify), (word32) wolfSSL_GetHmacSize(ssl));
if (ret != 0)
return ret;
ret = wc_HmacUpdate(&hmac, myInner, sizeof(myInner));
@@ -2758,7 +2758,7 @@ static WC_INLINE int myMacEncryptCb(WOLFSSL* ssl, unsigned char* macOut,
fprintf(stderr, "AesInit failed in myMacEncryptCb\n");
return ret;
}
ret = wc_AesSetKey(&encCtx->aes, key, keyLen, iv, AES_ENCRYPTION);
ret = wc_AesSetKey(&encCtx->aes, key, (word32) keyLen, iv, AES_ENCRYPTION);
if (ret != 0) {
fprintf(stderr, "AesSetKey failed in myMacEncryptCb\n");
return ret;
@@ -2777,7 +2777,7 @@ static WC_INLINE int myDecryptVerifyCb(WOLFSSL* ssl,
{
AtomicDecCtx* decCtx = (AtomicDecCtx*)ctx;
int ret = 0;
int macInSz = 0;
unsigned int macInSz = 0;
int ivExtra = 0;
int digestSz = wolfSSL_GetHmacSize(ssl);
unsigned int pad = 0;
@@ -2819,7 +2819,7 @@ static WC_INLINE int myDecryptVerifyCb(WOLFSSL* ssl,
fprintf(stderr, "AesInit failed in myDecryptVerifyCb\n");
return ret;
}
ret = wc_AesSetKey(&decCtx->aes, key, keyLen, iv, AES_DECRYPTION);
ret = wc_AesSetKey(&decCtx->aes, key, (word32) keyLen, iv, AES_DECRYPTION);
if (ret != 0) {
fprintf(stderr, "AesSetKey failed in myDecryptVerifyCb\n");
return ret;
@@ -2833,7 +2833,7 @@ static WC_INLINE int myDecryptVerifyCb(WOLFSSL* ssl,
return ret;
if (wolfSSL_GetCipherType(ssl) == WOLFSSL_AEAD_TYPE) {
*padSz = wolfSSL_GetAeadMacSize(ssl);
*padSz = (unsigned int)wolfSSL_GetAeadMacSize(ssl);
return 0; /* hmac, not needed if aead mode */
}
@@ -2844,8 +2844,8 @@ static WC_INLINE int myDecryptVerifyCb(WOLFSSL* ssl,
ivExtra = wolfSSL_GetCipherBlockSize(ssl);
}
*padSz = wolfSSL_GetHmacSize(ssl) + pad + padByte;
macInSz = decSz - ivExtra - digestSz - pad - padByte;
*padSz = (unsigned int)wolfSSL_GetHmacSize(ssl) + pad + padByte;
macInSz = decSz - (unsigned int)ivExtra - (unsigned int)digestSz - pad - padByte;
wolfSSL_SetTlsHmacInner(ssl, myInner, macInSz, macContent, macVerify);
@@ -2853,7 +2853,7 @@ static WC_INLINE int myDecryptVerifyCb(WOLFSSL* ssl,
if (ret != 0)
return ret;
ret = wc_HmacSetKey(&hmac, wolfSSL_GetHmacType(ssl),
wolfSSL_GetMacSecret(ssl, macVerify), digestSz);
wolfSSL_GetMacSecret(ssl, macVerify), (unsigned int) digestSz);
if (ret != 0)
return ret;
ret = wc_HmacUpdate(&hmac, myInner, sizeof(myInner));
@@ -2867,7 +2867,7 @@ static WC_INLINE int myDecryptVerifyCb(WOLFSSL* ssl,
return ret;
if (XMEMCMP(verify, decOut + decSz - digestSz - pad - padByte,
digestSz) != 0) {
(size_t) digestSz) != 0) {
printf("myDecryptVerify verify failed\n");
return -1;
}
@@ -2918,7 +2918,7 @@ static WC_INLINE int myEncryptMacCb(WOLFSSL* ssl, unsigned char* macOut,
fprintf(stderr, "AesInit failed in myMacEncryptCb\n");
return ret;
}
ret = wc_AesSetKey(&encCtx->aes, key, keyLen, iv, AES_ENCRYPTION);
ret = wc_AesSetKey(&encCtx->aes, key, (word32) keyLen, iv, AES_ENCRYPTION);
if (ret != 0) {
fprintf(stderr, "AesSetKey failed in myMacEncryptCb\n");
return ret;
@@ -2938,7 +2938,7 @@ static WC_INLINE int myEncryptMacCb(WOLFSSL* ssl, unsigned char* macOut,
if (ret != 0)
return ret;
ret = wc_HmacSetKey(&hmac, wolfSSL_GetHmacType(ssl),
wolfSSL_GetMacSecret(ssl, macVerify), wolfSSL_GetHmacSize(ssl));
wolfSSL_GetMacSecret(ssl, macVerify), (word32) wolfSSL_GetHmacSize(ssl));
if (ret != 0)
return ret;
ret = wc_HmacUpdate(&hmac, myInner, sizeof(myInner));
@@ -2982,7 +2982,7 @@ static WC_INLINE int myVerifyDecryptCb(WOLFSSL* ssl,
if (ret != 0)
return ret;
ret = wc_HmacSetKey(&hmac, wolfSSL_GetHmacType(ssl),
wolfSSL_GetMacSecret(ssl, macVerify), digestSz);
wolfSSL_GetMacSecret(ssl, macVerify), (word32) digestSz);
if (ret != 0)
return ret;
ret = wc_HmacUpdate(&hmac, myInner, sizeof(myInner));
@@ -2995,7 +2995,7 @@ static WC_INLINE int myVerifyDecryptCb(WOLFSSL* ssl,
if (ret != 0)
return ret;
if (XMEMCMP(verify, decOut + decSz, digestSz) != 0) {
if (XMEMCMP(verify, decOut + decSz, (size_t) digestSz) != 0) {
printf("myDecryptVerify verify failed\n");
return -1;
}
@@ -3021,7 +3021,7 @@ static WC_INLINE int myVerifyDecryptCb(WOLFSSL* ssl,
fprintf(stderr, "AesInit failed in myDecryptVerifyCb\n");
return ret;
}
ret = wc_AesSetKey(&decCtx->aes, key, keyLen, iv, AES_DECRYPTION);
ret = wc_AesSetKey(&decCtx->aes, key, (word32) keyLen, iv, AES_DECRYPTION);
if (ret != 0) {
fprintf(stderr, "AesSetKey failed in myDecryptVerifyCb\n");
return ret;
@@ -3184,7 +3184,7 @@ static WC_INLINE int myEccKeyGen(WOLFSSL* ssl, ecc_key* key, word32 keySz,
WC_RNG *rng = wolfSSL_GetRNG(ssl);
/* create new key */
ret = wc_ecc_make_key_ex(rng, keySz, new_key, ecc_curve);
ret = wc_ecc_make_key_ex(rng, (int) keySz, new_key, ecc_curve);
#ifdef TEST_PK_PRIVKEY
if (ret == 0 && new_key != key) {
@@ -3380,7 +3380,7 @@ static WC_INLINE int myHkdfExtract(byte* prk, const byte* salt, word32 saltLen,
byte* ikm, word32 ikmLen, int digest, void* ctx)
{
int ret;
int len = 0;
word32 len = 0;
switch (digest) {
#ifndef NO_SHA256
@@ -3511,7 +3511,7 @@ static WC_INLINE int myX25519KeyGen(WOLFSSL* ssl, curve25519_key* key,
if (ret != 0)
return ret;
ret = wc_curve25519_make_key(&rng, keySz, key);
ret = wc_curve25519_make_key(&rng, (int) keySz, key);
wc_FreeRng(&rng);
@@ -3682,7 +3682,7 @@ static WC_INLINE int myX448KeyGen(WOLFSSL* ssl, curve448_key* key,
if (ret != 0)
return ret;
ret = wc_curve448_make_key(&rng, keySz, key);
ret = wc_curve448_make_key(&rng, (int) keySz, key);
wc_FreeRng(&rng);
@@ -3815,7 +3815,7 @@ static WC_INLINE int myRsaSign(WOLFSSL* ssl, const byte* in, word32 inSz,
if (ret == 0)
ret = wc_RsaSSL_Sign(in, inSz, out, *outSz, &myKey, &rng);
if (ret > 0) { /* save and convert to 0 success */
*outSz = ret;
*outSz = (word32) ret;
ret = 0;
}
wc_FreeRsaKey(&myKey);
@@ -3949,7 +3949,7 @@ static WC_INLINE int myRsaPssSign(WOLFSSL* ssl, const byte* in, word32 inSz,
&rng);
}
if (ret > 0) { /* save and convert to 0 success */
*outSz = ret;
*outSz = (word32) ret;
ret = 0;
}
wc_FreeRsaKey(&myKey);
@@ -4100,7 +4100,7 @@ static WC_INLINE int myRsaEnc(WOLFSSL* ssl, const byte* in, word32 inSz,
if (ret == 0) {
ret = wc_RsaPublicEncrypt(in, inSz, out, *outSz, &myKey, &rng);
if (ret > 0) {
*outSz = ret;
*outSz = (word32) ret;
ret = 0; /* reset to success */
}
}