Skip to content

Commit

Permalink
Type conversion fixes: make explicit
Browse files Browse the repository at this point in the history 
Changed to types and casting so that there are no implcit conversion
warnings (gcc -Wconversion) in these files.
  • Loading branch information
@SparkiDev
SparkiDev committed Jul 12, 2023
1 parent 62c14e4 commit 2c96090
Show file tree
Hide file tree
Showing 15 changed files with 1,260 additions and 1,222 deletions.
6 changes: 3 additions & 3 deletions examples/asn1/asn1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ int main(int argc, char* argv[])
/* Default to reading STDIN. */
FILE* fp = stdin;
int file_format = FORMAT_DER;
int indent = 0;
word32 indent = 0;
int pem_skip = 0;

/* Reset options. */
Expand Down Expand Up @@ -376,7 +376,7 @@ int main(int argc, char* argv[])
argc--;
argv++;
wc_Asn1PrintOptions_Set(&opts, ASN1_PRINT_OPT_LENGTH,
atoi(argv[0]));
(word32)atoi(argv[0]));
}
/* Do not show text representations of ASN.1 item data. */
else if ((strcmp(argv[0], "-n") == 0) ||
Expand All @@ -398,7 +398,7 @@ int main(int argc, char* argv[])
argc--;
argv++;
wc_Asn1PrintOptions_Set(&opts, ASN1_PRINT_OPT_OFFSET,
atoi(argv[0]));
(word32)atoi(argv[0]));
}
/* Show wolfSSL OID value for all OBJECT_IDs. */
else if ((strcmp(argv[0], "-O") == 0) ||
Expand Down
18 changes: 9 additions & 9 deletions examples/pem/pem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ static int password_from_userdata(char* passwd, int sz, int rw, void* userdata)
{
(void)rw;
/* Copy user data into buffer. */
strncpy(passwd, (const char*)userdata, sz);
strncpy(passwd, (const char*)userdata, (size_t)sz);
passwd[sz - 1] = '\0';
/* Return length of password returned. */
return (int)XSTRLEN((const char*)passwd);
Expand Down Expand Up @@ -397,7 +397,7 @@ static int ConvPemToDer(char* in, word32 offset, word32 len, DerBuffer** der,
/* Remove padding from encryption if requested. */
if ((ret == 0) && padding) {
unsigned char pad = (*der)->buffer[(*der)->length - 1];
int i;
word32 i;

/* Simple padding validation. */
if ((pad == 0) || (pad > (*der)->length)) {
Expand Down Expand Up @@ -553,8 +553,8 @@ static int EncryptDer(unsigned char* in, word32 in_len, char* password,
if (ret == 0) {
/* Get length of encrypted DER data. */
ret = wc_CreateEncryptedPKCS8Key(in, in_len, NULL, enc_len, password,
(int)strlen(password), pbe_ver, pbe, enc_alg_id, salt, (int)salt_sz,
iterations, &rng, NULL);
(int)strlen(password), pbe_ver, pbe, enc_alg_id, salt, salt_sz,
(int)iterations, &rng, NULL);
if (ret == LENGTH_ONLY_E) {
ret = 0;
}
Expand All @@ -572,8 +572,8 @@ static int EncryptDer(unsigned char* in, word32 in_len, char* password,
if (ret == 0) {
/* Encrypt DER data. */
ret = wc_CreateEncryptedPKCS8Key(in, in_len, *enc, enc_len, password,
(int)strlen(password), pbe_ver, pbe, enc_alg_id, salt, (int)salt_sz,
iterations, &rng, NULL);
(int)strlen(password), pbe_ver, pbe, enc_alg_id, salt, salt_sz,
(int)iterations, &rng, NULL);
if (ret > 0) {
ret = 0;
}
Expand Down Expand Up @@ -601,7 +601,7 @@ static int ConvDerToPem(unsigned char* in, word32 offset, word32 len,
{
int ret = 0;
unsigned char* pem = NULL;
int pem_len = 0;
unsigned int pem_len = 0;
/* Set point to start looking and length. */
unsigned char* der = in + offset;
word32 der_len = len - offset;
Expand All @@ -611,7 +611,7 @@ static int ConvDerToPem(unsigned char* in, word32 offset, word32 len,
if (ret <= 0) {
fprintf(stderr, "Could not determine length of PEM\n");
}
pem_len = ret;
pem_len = (unsigned int)ret;
if (ret > 0) {
ret = 0;
}
Expand All @@ -631,7 +631,7 @@ static int ConvDerToPem(unsigned char* in, word32 offset, word32 len,
}
if (ret > 0) {
*out = pem;
*out_len = ret;
*out_len = (word32)ret;
ret = 0;
}
}
Expand Down
44 changes: 22 additions & 22 deletions src/ssl_certman.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,15 +291,16 @@ static WC_INLINE int wolfssl_cm_get_certs_der(WOLFSSL_CERT_MANAGER* cm,

if (!err) {
/* Allocate memory for pointers to each DER buffer. */
certBuffers = (DerBuffer**)XMALLOC(sizeof(DerBuffer*) * numCerts,
cm->heap, DYNAMIC_TYPE_TMP_BUFFER);
certBuffers = (DerBuffer**)XMALLOC(
sizeof(DerBuffer*) * (size_t)numCerts, cm->heap,
DYNAMIC_TYPE_TMP_BUFFER);
if (certBuffers == NULL) {
err = 1;
}
}
if (!err) {
/* Reset pointers. */
XMEMSET(certBuffers, 0, sizeof(DerBuffer*) * numCerts);
XMEMSET(certBuffers, 0, sizeof(DerBuffer*) * (size_t)numCerts);
}

/* Copy the certs locally so that we can release the caLock. If the lock
Expand Down Expand Up @@ -382,7 +383,7 @@ WOLFSSL_STACK* wolfSSL_CertManagerGetCerts(WOLFSSL_CERT_MANAGER* cm)
/* Get pointer to DER encoding of certificate. */
derBuffer = certBuffers[i]->buffer;
/* Decode certificate. */
wolfSSL_d2i_X509(&x509, &derBuffer, certBuffers[i]->length);
wolfSSL_d2i_X509(&x509, &derBuffer, (int)certBuffers[i]->length);
if (x509 == NULL) {
err = 1;
}
Expand Down Expand Up @@ -816,13 +817,13 @@ int wolfSSL_CertManagerVerify(WOLFSSL_CERT_MANAGER* cm, const char* fname,
#endif
{
WOLFSSL_MSG("Getting dynamic buffer");
buff = (byte*)XMALLOC(sz, cm->heap, DYNAMIC_TYPE_FILE);
buff = (byte*)XMALLOC((size_t)sz, cm->heap, DYNAMIC_TYPE_FILE);
if (buff == NULL) {
ret = WOLFSSL_BAD_FILE;
}
}
/* Read all the file into buffer. */
if ((ret == WOLFSSL_SUCCESS) && ((size_t)XFREAD(buff, 1, sz, file) !=
if ((ret == WOLFSSL_SUCCESS) && (XFREAD(buff, 1, (size_t)sz, file) !=
(size_t)sz)) {
ret = WOLFSSL_BAD_FILE;
}
Expand Down Expand Up @@ -942,7 +943,7 @@ static WC_INLINE int cm_get_signer_memory(Signer* signer)
#endif

/* Add dynamic bytes needed. */
sz += signer->pubKeySize;
sz += (int)signer->pubKeySize;
sz += signer->nameLen;

return sz;
Expand Down Expand Up @@ -1103,7 +1104,7 @@ static WC_INLINE int cm_restore_cert_row(WOLFSSL_CERT_MANAGER* cm,
/* Copy in public key. */
XMEMCPY(publicKey, current + idx, signer->pubKeySize);
signer->publicKey = publicKey;
idx += signer->pubKeySize;
idx += (int)signer->pubKeySize;

/* Copy in certificate name length. */
XMEMCPY(&signer->nameLen, current + idx, sizeof(signer->nameLen));
Expand All @@ -1117,7 +1118,7 @@ static WC_INLINE int cm_restore_cert_row(WOLFSSL_CERT_MANAGER* cm,
}
if (ret == 0) {
/* Allocate memory for public key to be stored in. */
signer->name = (char*)XMALLOC(signer->nameLen, cm->heap,
signer->name = (char*)XMALLOC((size_t)signer->nameLen, cm->heap,
DYNAMIC_TYPE_SUBJECT_CN);
if (signer->name == NULL) {
ret = MEMORY_E;
Expand All @@ -1126,7 +1127,7 @@ static WC_INLINE int cm_restore_cert_row(WOLFSSL_CERT_MANAGER* cm,

if (ret == 0) {
/* Copy in certificate name. */
XMEMCPY(signer->name, current + idx, signer->nameLen);
XMEMCPY(signer->name, current + idx, (size_t)signer->nameLen);
idx += signer->nameLen;

/* Copy in hash of subject name. */
Expand Down Expand Up @@ -1190,15 +1191,15 @@ static WC_INLINE int cm_store_cert_row(WOLFSSL_CERT_MANAGER* cm, byte* current,
added += (int)sizeof(list->keyOID);

/* Public key. */
XMEMCPY(current + added, list->publicKey, list->pubKeySize);
added += list->pubKeySize;
XMEMCPY(current + added, list->publicKey, (size_t)list->pubKeySize);
added += (int)list->pubKeySize;

/* Certificate name length. */
XMEMCPY(current + added, &list->nameLen, sizeof(list->nameLen));
added += (int)sizeof(list->nameLen);

/* Certificate name. */
XMEMCPY(current + added, list->name, list->nameLen);
XMEMCPY(current + added, list->name, (size_t)list->nameLen);
added += list->nameLen;

/* Hash of subject name. */
Expand Down Expand Up @@ -1287,8 +1288,6 @@ int CM_SaveCertCache(WOLFSSL_CERT_MANAGER* cm, const char* fname)
{
XFILE file;
int ret = WOLFSSL_SUCCESS;
int memSz;
byte* mem;

WOLFSSL_ENTER("CM_SaveCertCache");

Expand All @@ -1306,17 +1305,18 @@ int CM_SaveCertCache(WOLFSSL_CERT_MANAGER* cm, const char* fname)
}

if (ret == WOLFSSL_SUCCESS) {
byte* mem;
/* Calculate size of memory required to store CA table. */
memSz = cm_get_cert_cache_mem_size(cm);
size_t memSz = (size_t)cm_get_cert_cache_mem_size(cm);
/* Allocate memory to hold CA table. */
mem = (byte*)XMALLOC(memSz, cm->heap, DYNAMIC_TYPE_TMP_BUFFER);
mem = (byte*)XMALLOC(memSz, cm->heap, DYNAMIC_TYPE_TMP_BUFFER);
if (mem == NULL) {
WOLFSSL_MSG("Alloc for tmp buffer failed");
ret = MEMORY_E;
}
if (ret == WOLFSSL_SUCCESS) {
/* Store CA table in memory. */
ret = cm_do_mem_save_cert_cache(cm, mem, memSz);
ret = cm_do_mem_save_cert_cache(cm, mem, (int)memSz);
}
if (ret == WOLFSSL_SUCCESS) {
/* Write memory to file. */
Expand Down Expand Up @@ -1753,7 +1753,7 @@ int wolfSSL_CertManagerCheckCRL(WOLFSSL_CERT_MANAGER* cm,
#endif
{
/* Initialize decoded certificate with buffer. */
InitDecodedCert(cert, der, sz, NULL);
InitDecodedCert(cert, der, (word32)sz, NULL);

/* Parse certificate and perform CRL checks. */
ret = ParseCertRelative(cert, CERT_TYPE, VERIFY_CRL, cm);
Expand Down Expand Up @@ -2224,7 +2224,7 @@ int wolfSSL_CertManagerCheckOCSP(WOLFSSL_CERT_MANAGER* cm,
#endif
{
/* Initialize decoded certificate with buffer. */
InitDecodedCert(cert, der, sz, NULL);
InitDecodedCert(cert, der, (word32)sz, NULL);

/* Parse certificate and perform CRL checks. */
ret = ParseCertRelative(cert, CERT_TYPE, VERIFY_OCSP, cm);
Expand Down Expand Up @@ -2307,14 +2307,14 @@ int wolfSSL_CertManagerSetOCSPOverrideURL(WOLFSSL_CERT_MANAGER* cm,
/* Calculate size of URL string. Include terminator character. */
int urlSz = (int)XSTRLEN(url) + 1;
/* Allocate memory for URL to be copied into. */
cm->ocspOverrideURL = (char*)XMALLOC(urlSz, cm->heap,
cm->ocspOverrideURL = (char*)XMALLOC((size_t)urlSz, cm->heap,
DYNAMIC_TYPE_URL);
if (cm->ocspOverrideURL == NULL) {
ret = MEMORY_E;
}
if (ret == WOLFSSL_SUCCESS) {
/* Copy URL into certificate manager. */
XMEMCPY(cm->ocspOverrideURL, url, urlSz);
XMEMCPY(cm->ocspOverrideURL, url, (size_t)urlSz);
}
}
else {
Expand Down
Loading

0 comments on commit 2c96090

Please sign in to comment.