mirror of https://github.com/wolfSSL/wolfssl
Merge pull request #7918 from SparkiDev/type_conversion_fixes_3
Type conversion fixes
This commit is contained in:
commit
b26fa6cf59
|
@ -3225,7 +3225,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
|
|||
#if (defined(WOLFSSL_SCTP) || defined(WOLFSSL_DTLS_MTU)) && \
|
||||
defined(WOLFSSL_DTLS)
|
||||
if (dtlsMTU)
|
||||
wolfSSL_CTX_dtls_set_mtu(ctx, dtlsMTU);
|
||||
wolfSSL_CTX_dtls_set_mtu(ctx, (unsigned short)dtlsMTU);
|
||||
#endif
|
||||
|
||||
#ifndef NO_DH
|
||||
|
|
|
@ -2684,7 +2684,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
|
|||
#if (defined(WOLFSSL_SCTP) || defined(WOLFSSL_DTLS_MTU)) && \
|
||||
defined(WOLFSSL_DTLS)
|
||||
if (dtlsMTU)
|
||||
wolfSSL_CTX_dtls_set_mtu(ctx, dtlsMTU);
|
||||
wolfSSL_CTX_dtls_set_mtu(ctx, (unsigned short)dtlsMTU);
|
||||
#endif
|
||||
|
||||
#ifdef WOLFSSL_SCTP
|
||||
|
|
|
@ -1432,7 +1432,7 @@ WOLFSSL_OCSP_REQ_CTX* wolfSSL_OCSP_REQ_CTX_new(WOLFSSL_BIO *bio, int maxline)
|
|||
DYNAMIC_TYPE_OPENSSL);
|
||||
if (ret != NULL) {
|
||||
XMEMSET(ret, 0, sizeof(*ret));
|
||||
ret->buf = (byte*)XMALLOC(maxline, NULL, DYNAMIC_TYPE_OPENSSL);
|
||||
ret->buf = (byte*)XMALLOC((word32)maxline, NULL, DYNAMIC_TYPE_OPENSSL);
|
||||
if (ret->buf == NULL)
|
||||
goto error;
|
||||
ret->reqResp = wolfSSL_BIO_new(wolfSSL_BIO_s_mem());
|
||||
|
|
|
@ -5652,7 +5652,7 @@ int EncodeObjectId(const word16* in, word32 inSz, byte* out, word32* outSz)
|
|||
}
|
||||
|
||||
/* compute length of encoded OID */
|
||||
d = (in[0] * 40) + in[1];
|
||||
d = ((word32)in[0] * 40) + in[1];
|
||||
len = 0;
|
||||
for (i = 1; i < (int)inSz; i++) {
|
||||
x = 0;
|
||||
|
@ -5675,7 +5675,7 @@ int EncodeObjectId(const word16* in, word32 inSz, byte* out, word32* outSz)
|
|||
}
|
||||
|
||||
/* calc first byte */
|
||||
d = (in[0] * 40) + in[1];
|
||||
d = ((word32)in[0] * 40) + in[1];
|
||||
|
||||
/* encode bytes */
|
||||
x = 0;
|
||||
|
@ -5710,7 +5710,7 @@ int EncodeObjectId(const word16* in, word32 inSz, byte* out, word32* outSz)
|
|||
}
|
||||
|
||||
/* return length */
|
||||
*outSz = len;
|
||||
*outSz = (word32)len;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -13476,12 +13476,12 @@ static int GenerateDNSEntryRIDString(DNS_entry* entry, void* heap)
|
|||
}
|
||||
|
||||
if (i < tmpSize - 1) {
|
||||
ret = XSNPRINTF(oidName + j, MAX_OID_SZ - j, "%d.",
|
||||
tmpName[i]);
|
||||
ret = XSNPRINTF(oidName + j, (word32)(MAX_OID_SZ - j),
|
||||
"%d.", tmpName[i]);
|
||||
}
|
||||
else {
|
||||
ret = XSNPRINTF(oidName + j, MAX_OID_SZ - j, "%d",
|
||||
tmpName[i]);
|
||||
ret = XSNPRINTF(oidName + j, (word32)(MAX_OID_SZ - j),
|
||||
"%d", tmpName[i]);
|
||||
}
|
||||
|
||||
if (ret >= 0) {
|
||||
|
@ -13500,7 +13500,7 @@ static int GenerateDNSEntryRIDString(DNS_entry* entry, void* heap)
|
|||
if (ret == 0) {
|
||||
nameSz = (int)XSTRLEN((const char*)finalName);
|
||||
|
||||
entry->ridString = (char*)XMALLOC(nameSz + 1, heap,
|
||||
entry->ridString = (char*)XMALLOC((word32)(nameSz + 1), heap,
|
||||
DYNAMIC_TYPE_ALTNAME);
|
||||
|
||||
if (entry->ridString == NULL) {
|
||||
|
@ -13508,7 +13508,7 @@ static int GenerateDNSEntryRIDString(DNS_entry* entry, void* heap)
|
|||
}
|
||||
|
||||
if (ret == 0) {
|
||||
XMEMCPY(entry->ridString, finalName, nameSz + 1);
|
||||
XMEMCPY(entry->ridString, finalName, (word32)(nameSz + 1));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -28121,9 +28121,9 @@ static int EncodeName(EncodedName* name, const char* nameStr,
|
|||
break;
|
||||
#ifdef WOLFSSL_CUSTOM_OID
|
||||
case ASN_CUSTOM_NAME:
|
||||
nameSz = cname->custom.valSz;
|
||||
nameSz = (word32)cname->custom.valSz;
|
||||
oid = cname->custom.oid;
|
||||
oidSz = cname->custom.oidSz;
|
||||
oidSz = (word32)cname->custom.oidSz;
|
||||
break;
|
||||
#endif
|
||||
#ifdef WOLFSSL_CERT_REQ
|
||||
|
@ -28447,8 +28447,8 @@ static int SetNameRdnItems(ASNSetData* dataASN, ASNItem* namesASN,
|
|||
else if (type == ASN_CUSTOM_NAME) {
|
||||
#ifdef WOLFSSL_CUSTOM_OID
|
||||
SetRdnItems(namesASN + idx, dataASN + idx, name->custom.oid,
|
||||
name->custom.oidSz, name->custom.enc,
|
||||
name->custom.val, name->custom.valSz);
|
||||
(word32)name->custom.oidSz, (byte)name->custom.enc,
|
||||
name->custom.val, (word32)name->custom.valSz);
|
||||
#endif
|
||||
}
|
||||
else {
|
||||
|
@ -32486,7 +32486,7 @@ int wc_SetExtKeyUsageOID(Cert *cert, const char *in, word32 sz, byte idx,
|
|||
}
|
||||
|
||||
XMEMCPY(cert->extKeyUsageOID[idx], oid, oidSz);
|
||||
cert->extKeyUsageOIDSz[idx] = oidSz;
|
||||
cert->extKeyUsageOIDSz[idx] = (byte)oidSz;
|
||||
cert->extKeyUsage |= EXTKEYUSE_USER;
|
||||
|
||||
return 0;
|
||||
|
@ -32522,7 +32522,7 @@ int wc_SetCustomExtension(Cert *cert, int critical, const char *oid,
|
|||
ext->oid = (char*)oid;
|
||||
ext->crit = (critical == 0) ? 0 : 1;
|
||||
ext->val = (byte*)der;
|
||||
ext->valSz = derSz;
|
||||
ext->valSz = (int)derSz;
|
||||
|
||||
cert->customCertExtCount++;
|
||||
return 0;
|
||||
|
@ -38724,7 +38724,7 @@ end:
|
|||
tbsParams =
|
||||
GetASNItem_Addr(dataASN[CRLASN_IDX_TBS_SIGALGO_PARAMS],
|
||||
buff);
|
||||
tbsParamsSz =
|
||||
tbsParamsSz =(int)
|
||||
GetASNItem_Length(dataASN[CRLASN_IDX_TBS_SIGALGO_PARAMS],
|
||||
buff);
|
||||
}
|
||||
|
@ -38732,7 +38732,7 @@ end:
|
|||
sigParams =
|
||||
GetASNItem_Addr(dataASN[CRLASN_IDX_SIGALGO_PARAMS],
|
||||
buff);
|
||||
sigParamsSz =
|
||||
sigParamsSz = (int)
|
||||
GetASNItem_Length(dataASN[CRLASN_IDX_SIGALGO_PARAMS],
|
||||
buff);
|
||||
dcrl->sigParamsIndex =
|
||||
|
@ -38759,7 +38759,7 @@ end:
|
|||
ret = ASN_PARSE_E;
|
||||
}
|
||||
else if ((tbsParamsSz > 0) &&
|
||||
(XMEMCMP(tbsParams, sigParams, tbsParamsSz) != 0)) {
|
||||
(XMEMCMP(tbsParams, sigParams, (word32)tbsParamsSz) != 0)) {
|
||||
WOLFSSL_MSG("CRL TBS and signature parameter mismatch");
|
||||
ret = ASN_PARSE_E;
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -2563,7 +2563,7 @@ static wc_test_ret_t _SaveDerAndPem(const byte* der, int derSz,
|
|||
return WC_TEST_RET_ENC(calling_line, 2, WC_TEST_RET_TAG_I);
|
||||
}
|
||||
#ifndef WOLFSSL_NO_MALLOC
|
||||
pem = (byte*)XMALLOC(pemSz, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
|
||||
pem = (byte*)XMALLOC((word32)pemSz, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
|
||||
if (pem == NULL) {
|
||||
return WC_TEST_RET_ENC(calling_line, 3, WC_TEST_RET_TAG_I);
|
||||
}
|
||||
|
@ -2572,7 +2572,7 @@ static wc_test_ret_t _SaveDerAndPem(const byte* der, int derSz,
|
|||
return BAD_FUNC_ARG;
|
||||
#endif
|
||||
/* Convert to PEM */
|
||||
pemSz = wc_DerToPem(der, (word32)derSz, pem, pemSz, pemType);
|
||||
pemSz = wc_DerToPem(der, (word32)derSz, pem, (word32)pemSz, pemType);
|
||||
if (pemSz < 0) {
|
||||
XFREE(pem, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
|
||||
return WC_TEST_RET_ENC(calling_line, 4, WC_TEST_RET_TAG_I);
|
||||
|
|
|
@ -1102,8 +1102,8 @@ static WC_INLINE void ShowX509Ex(WOLFSSL_X509* x509, const char* hdr,
|
|||
* message ready to write once */
|
||||
strLen = XSNPRINTF(serialMsg, sizeof(serialMsg), " %s", words[3]);
|
||||
for (i = 0; i < sz; i++)
|
||||
strLen = XSNPRINTF(serialMsg + strLen, sizeof(serialMsg) - strLen,
|
||||
":%02x ", serial[i]);
|
||||
strLen = XSNPRINTF(serialMsg + strLen,
|
||||
sizeof(serialMsg) - (size_t)strLen, ":%02x ", serial[i]);
|
||||
printf("%s\n", serialMsg);
|
||||
}
|
||||
|
||||
|
|
|
@ -366,7 +366,7 @@ WOLFSSL_LOCAL void SetASN_OID(ASNSetData *dataASN, int oid, int oidType);
|
|||
#define GetASN_Int8Bit(dataASN, num) \
|
||||
do { \
|
||||
(dataASN)->dataType = ASN_DATA_TYPE_WORD8; \
|
||||
(dataASN)->data.u8 = num; \
|
||||
(dataASN)->data.u8 = (num); \
|
||||
} while (0)
|
||||
|
||||
/* Setup ASN data item to get a 16-bit number.
|
||||
|
@ -377,7 +377,7 @@ WOLFSSL_LOCAL void SetASN_OID(ASNSetData *dataASN, int oid, int oidType);
|
|||
#define GetASN_Int16Bit(dataASN, num) \
|
||||
do { \
|
||||
(dataASN)->dataType = ASN_DATA_TYPE_WORD16; \
|
||||
(dataASN)->data.u16 = num; \
|
||||
(dataASN)->data.u16 = (num); \
|
||||
} while (0)
|
||||
|
||||
/* Setup ASN data item to get a 32-bit number.
|
||||
|
@ -388,7 +388,7 @@ WOLFSSL_LOCAL void SetASN_OID(ASNSetData *dataASN, int oid, int oidType);
|
|||
#define GetASN_Int32Bit(dataASN, num) \
|
||||
do { \
|
||||
(dataASN)->dataType = ASN_DATA_TYPE_WORD32; \
|
||||
(dataASN)->data.u32 = num; \
|
||||
(dataASN)->data.u32 = (num); \
|
||||
} while (0)
|
||||
|
||||
/* Setup ASN data item to get data into a buffer of a specific length.
|
||||
|
@ -400,8 +400,8 @@ WOLFSSL_LOCAL void SetASN_OID(ASNSetData *dataASN, int oid, int oidType);
|
|||
#define GetASN_Buffer(dataASN, d, l) \
|
||||
do { \
|
||||
(dataASN)->dataType = ASN_DATA_TYPE_BUFFER; \
|
||||
(dataASN)->data.buffer.data = d; \
|
||||
(dataASN)->data.buffer.length = l; \
|
||||
(dataASN)->data.buffer.data = (d); \
|
||||
(dataASN)->data.buffer.length = (l); \
|
||||
} while (0)
|
||||
|
||||
/* Setup ASN data item to check parsed data against expected buffer.
|
||||
|
@ -413,8 +413,8 @@ WOLFSSL_LOCAL void SetASN_OID(ASNSetData *dataASN, int oid, int oidType);
|
|||
#define GetASN_ExpBuffer(dataASN, d, l) \
|
||||
do { \
|
||||
(dataASN)->dataType = ASN_DATA_TYPE_EXP_BUFFER; \
|
||||
(dataASN)->data.ref.data = d; \
|
||||
(dataASN)->data.ref.length = l; \
|
||||
(dataASN)->data.ref.data = (d); \
|
||||
(dataASN)->data.ref.length = (l); \
|
||||
} while (0)
|
||||
|
||||
/* Setup ASN data item to get a number into an mp_int.
|
||||
|
@ -425,7 +425,7 @@ WOLFSSL_LOCAL void SetASN_OID(ASNSetData *dataASN, int oid, int oidType);
|
|||
#define GetASN_MP(dataASN, num) \
|
||||
do { \
|
||||
(dataASN)->dataType = ASN_DATA_TYPE_MP; \
|
||||
(dataASN)->data.mp = num; \
|
||||
(dataASN)->data.mp = (num); \
|
||||
} while (0)
|
||||
|
||||
/* Setup ASN data item to get a number into an mp_int that is initialized.
|
||||
|
@ -436,7 +436,7 @@ WOLFSSL_LOCAL void SetASN_OID(ASNSetData *dataASN, int oid, int oidType);
|
|||
#define GetASN_MP_Inited(dataASN, num) \
|
||||
do { \
|
||||
(dataASN)->dataType = ASN_DATA_TYPE_MP_INITED; \
|
||||
(dataASN)->data.mp = num; \
|
||||
(dataASN)->data.mp = (num); \
|
||||
} while (0)
|
||||
|
||||
/* Setup ASN data item to get a positive or negative number into an mp_int.
|
||||
|
@ -447,7 +447,7 @@ WOLFSSL_LOCAL void SetASN_OID(ASNSetData *dataASN, int oid, int oidType);
|
|||
#define GetASN_MP_PosNeg(dataASN, num) \
|
||||
do { \
|
||||
(dataASN)->dataType = ASN_DATA_TYPE_MP_POS_NEG; \
|
||||
(dataASN)->data.mp = num; \
|
||||
(dataASN)->data.mp = (num); \
|
||||
} while (0)
|
||||
|
||||
/* Setup ASN data item to be a choice of tags.
|
||||
|
@ -458,7 +458,7 @@ WOLFSSL_LOCAL void SetASN_OID(ASNSetData *dataASN, int oid, int oidType);
|
|||
#define GetASN_Choice(dataASN, options) \
|
||||
do { \
|
||||
(dataASN)->dataType = ASN_DATA_TYPE_CHOICE; \
|
||||
(dataASN)->data.choice = options; \
|
||||
(dataASN)->data.choice = (options); \
|
||||
} while (0)
|
||||
|
||||
/* Setup ASN data item to get a boolean value.
|
||||
|
@ -469,7 +469,7 @@ WOLFSSL_LOCAL void SetASN_OID(ASNSetData *dataASN, int oid, int oidType);
|
|||
#define GetASN_Boolean(dataASN, num) \
|
||||
do { \
|
||||
(dataASN)->dataType = ASN_DATA_TYPE_NONE; \
|
||||
(dataASN)->data.u8 = num; \
|
||||
(dataASN)->data.u8 = (num); \
|
||||
} while (0)
|
||||
|
||||
/* Setup ASN data item to be a an OID of a specific type.
|
||||
|
@ -478,7 +478,7 @@ WOLFSSL_LOCAL void SetASN_OID(ASNSetData *dataASN, int oid, int oidType);
|
|||
* @param [in] oidType Type of OID to expect.
|
||||
*/
|
||||
#define GetASN_OID(dataASN, oidType) \
|
||||
(dataASN)->data.oid.type = oidType
|
||||
(dataASN)->data.oid.type = (oidType)
|
||||
|
||||
/* Get the data and length from an ASN data item.
|
||||
*
|
||||
|
@ -524,7 +524,7 @@ WOLFSSL_LOCAL void SetASN_OID(ASNSetData *dataASN, int oid, int oidType);
|
|||
#define SetASN_Boolean(dataASN, val) \
|
||||
do { \
|
||||
(dataASN)->dataType = ASN_DATA_TYPE_NONE; \
|
||||
(dataASN)->data.u8 = val; \
|
||||
(dataASN)->data.u8 = (val); \
|
||||
} while (0)
|
||||
|
||||
/* Setup an ASN data item to set an 8-bit number.
|
||||
|
@ -535,7 +535,7 @@ WOLFSSL_LOCAL void SetASN_OID(ASNSetData *dataASN, int oid, int oidType);
|
|||
#define SetASN_Int8Bit(dataASN, num) \
|
||||
do { \
|
||||
(dataASN)->dataType = ASN_DATA_TYPE_WORD8; \
|
||||
(dataASN)->data.u8 = num; \
|
||||
(dataASN)->data.u8 = (num); \
|
||||
} while (0)
|
||||
|
||||
/* Setup an ASN data item to set a 16-bit number.
|
||||
|
@ -546,7 +546,7 @@ WOLFSSL_LOCAL void SetASN_OID(ASNSetData *dataASN, int oid, int oidType);
|
|||
#define SetASN_Int16Bit(dataASN, num) \
|
||||
do { \
|
||||
(dataASN)->dataType = ASN_DATA_TYPE_WORD16; \
|
||||
(dataASN)->data.u16 = num; \
|
||||
(dataASN)->data.u16 = (num); \
|
||||
} while (0)
|
||||
|
||||
/* Setup an ASN data item to set the data in a buffer.
|
||||
|
@ -557,8 +557,8 @@ WOLFSSL_LOCAL void SetASN_OID(ASNSetData *dataASN, int oid, int oidType);
|
|||
*/
|
||||
#define SetASN_Buffer(dataASN, d, l) \
|
||||
do { \
|
||||
(dataASN)->data.buffer.data = d; \
|
||||
(dataASN)->data.buffer.length = l; \
|
||||
(dataASN)->data.buffer.data = (d); \
|
||||
(dataASN)->data.buffer.length = (word32)(l); \
|
||||
} while (0)
|
||||
|
||||
/* Setup an ASN data item to set the DER encode data in a buffer.
|
||||
|
@ -570,8 +570,8 @@ WOLFSSL_LOCAL void SetASN_OID(ASNSetData *dataASN, int oid, int oidType);
|
|||
#define SetASN_ReplaceBuffer(dataASN, d, l) \
|
||||
do { \
|
||||
(dataASN)->dataType = ASN_DATA_TYPE_REPLACE_BUFFER; \
|
||||
(dataASN)->data.buffer.data = d; \
|
||||
(dataASN)->data.buffer.length = l; \
|
||||
(dataASN)->data.buffer.data = (d); \
|
||||
(dataASN)->data.buffer.length = (l); \
|
||||
} while (0)
|
||||
|
||||
/* Setup an ASN data item to set an muli-precision number.
|
||||
|
@ -582,7 +582,7 @@ WOLFSSL_LOCAL void SetASN_OID(ASNSetData *dataASN, int oid, int oidType);
|
|||
#define SetASN_MP(dataASN, num) \
|
||||
do { \
|
||||
(dataASN)->dataType = ASN_DATA_TYPE_MP; \
|
||||
(dataASN)->data.mp = num; \
|
||||
(dataASN)->data.mp = (num); \
|
||||
} while (0)
|
||||
|
||||
/* Setup an ASN data item to set an OID based on id and type.
|
||||
|
|
Loading…
Reference in New Issue