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

another batch of -Wconversion fixes.

Browse Source
This commit is contained in:
Daniel Pouzzner
2023-04-15 02:12:25 -05:00
parent 42bea705d9
commit 4b9302cdb3
12 changed files with 131 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
wolfcrypt/src/aes.c
View File

@ -4483,7 +4483,7 @@ int wc_AesSetIV(Aes* aes, const byte* iv)
#if defined(HAVE_AES_ECB) && !defined(WOLFSSL_PIC32MZ_CRYPT) && \ #if defined(HAVE_AES_ECB) && !defined(WOLFSSL_PIC32MZ_CRYPT) && \
!defined(XTRANSFORM_AESCTRBLOCK) !defined(XTRANSFORM_AESCTRBLOCK)
if (in != out && sz >= AES_BLOCK_SIZE) { if (in != out && sz >= AES_BLOCK_SIZE) {
int blocks = sz / AES_BLOCK_SIZE; word32 blocks = sz / AES_BLOCK_SIZE;
byte* counter = (byte*)aes->reg; byte* counter = (byte*)aes->reg;
byte* c = out; byte* c = out;
while (blocks--) { while (blocks--) {
@ -4646,14 +4646,14 @@ static WC_INLINE void FlattenSzInBits(byte* buf, word32 sz)
sz <<= 3; sz <<= 3;
/* copy over the words of the sz into the destination buffer */ /* copy over the words of the sz into the destination buffer */
buf[0] = (szHi >> 24) & 0xff; buf[0] = (byte)(szHi >> 24);
buf[1] = (szHi >> 16) & 0xff; buf[1] = (byte)(szHi >> 16);
buf[2] = (szHi >> 8) & 0xff; buf[2] = (byte)(szHi >> 8);
buf[3] = szHi & 0xff; buf[3] = (byte)szHi;
buf[4] = (sz >> 24) & 0xff; buf[4] = (byte)(sz >> 24);
buf[5] = (sz >> 16) & 0xff; buf[5] = (byte)(sz >> 16);
buf[6] = (sz >> 8) & 0xff; buf[6] = (byte)(sz >> 8);
buf[7] = sz & 0xff; buf[7] = (byte)sz;
} }
@ -5386,7 +5386,7 @@ static WC_INLINE void GMULT(byte *x, byte m[32][AES_BLOCK_SIZE])
z8[1] ^= m8[1]; z8[1] ^= m8[1];
/* Cache top byte for remainder calculations - lost in rotate. */ /* Cache top byte for remainder calculations - lost in rotate. */
a = z8[1] >> 56; a = (byte)(z8[1] >> 56);
/* Rotate Z by 8-bits */ /* Rotate Z by 8-bits */
z8[1] = (z8[0] >> 56) | (z8[1] << 8); z8[1] = (z8[0] >> 56) | (z8[1] << 8);
@ -8555,7 +8555,7 @@ int wc_AesGcmDecryptFinal(Aes* aes, const byte* authTag, word32 authTagSz)
ret = AesGcmFinal_C(aes, calcTag, authTagSz); ret = AesGcmFinal_C(aes, calcTag, authTagSz);
if (ret == 0) { if (ret == 0) {
/* Check calculated tag matches the one passed in. */ /* Check calculated tag matches the one passed in. */
if (ConstantCompare(authTag, calcTag, authTagSz) != 0) { if (ConstantCompare(authTag, calcTag, (int)authTagSz) != 0) {
ret = AES_GCM_AUTH_E; ret = AES_GCM_AUTH_E;
} }
} }
@ -8988,22 +8988,22 @@ static WARN_UNUSED_RESULT int roll_auth(
/* encode the length in */ /* encode the length in */
if (inSz <= 0xFEFF) { if (inSz <= 0xFEFF) {
authLenSz = 2; authLenSz = 2;
out[0] ^= ((inSz & 0xFF00) >> 8); out[0] ^= (byte)(inSz >> 8);
out[1] ^= (inSz & 0x00FF); out[1] ^= (byte)inSz;
} }
else if (inSz <= 0xFFFFFFFF) { else {
authLenSz = 6; authLenSz = 6;
out[0] ^= 0xFF; out[1] ^= 0xFE; out[0] ^= 0xFF;
out[2] ^= ((inSz & 0xFF000000) >> 24); out[1] ^= 0xFE;
out[3] ^= ((inSz & 0x00FF0000) >> 16); out[2] ^= (byte)(inSz >> 24);
out[4] ^= ((inSz & 0x0000FF00) >> 8); out[3] ^= (byte)(inSz >> 16);
out[5] ^= (inSz & 0x000000FF); out[4] ^= (byte)(inSz >> 8);
out[5] ^= (byte)inSz;
} }
/* Note, the protocol handles auth data up to 2^64, but we are /* Note, the protocol handles auth data up to 2^64, but we are
* using 32-bit sizes right now, so the bigger data isn't handled * using 32-bit sizes right now, so the bigger data isn't handled
* else if (inSz <= 0xFFFFFFFFFFFFFFFF) {} */ * else {}
else */
return BAD_LENGTH_E;
/* start fill out the rest of the first block */ /* start fill out the rest of the first block */
remainder = AES_BLOCK_SIZE - authLenSz; remainder = AES_BLOCK_SIZE - authLenSz;
@ -9104,7 +9104,7 @@ int wc_AesCcmEncrypt(Aes* aes, byte* out, const byte* in, word32 inSz,
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
/* sanity check on tag size */ /* sanity check on tag size */
if (wc_AesCcmCheckTagSize(authTagSz) != 0) { if (wc_AesCcmCheckTagSize((int)authTagSz) != 0) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
@ -9122,13 +9122,13 @@ int wc_AesCcmEncrypt(Aes* aes, byte* out, const byte* in, word32 inSz,
XMEMSET(A, 0, sizeof(A)); XMEMSET(A, 0, sizeof(A));
XMEMCPY(B+1, nonce, nonceSz); XMEMCPY(B+1, nonce, nonceSz);
lenSz = AES_BLOCK_SIZE - 1 - (byte)nonceSz; lenSz = AES_BLOCK_SIZE - 1 - (byte)nonceSz;
B[0] = (authInSz > 0 ? 64 : 0) B[0] = (byte)((authInSz > 0 ? 64 : 0)
+ (8 * (((byte)authTagSz - 2) / 2)) + (8 * (((byte)authTagSz - 2) / 2))
+ (lenSz - 1); + (lenSz - 1));
for (i = 0; i < lenSz; i++) { for (i = 0; i < lenSz; i++) {
if (mask && i >= wordSz) if (mask && i >= wordSz)
mask = 0x00; mask = 0x00;
B[AES_BLOCK_SIZE - 1 - i] = (inSz >> ((8 * i) & mask)) & mask; B[AES_BLOCK_SIZE - 1 - i] = (byte)((inSz >> ((8 * i) & mask)) & mask);
} }
#ifdef WOLFSSL_CHECK_MEM_ZERO #ifdef WOLFSSL_CHECK_MEM_ZERO
@ -9283,7 +9283,7 @@ int wc_AesCcmDecrypt(Aes* aes, byte* out, const byte* in, word32 inSz,
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
/* sanity check on tag size */ /* sanity check on tag size */
if (wc_AesCcmCheckTagSize(authTagSz) != 0) { if (wc_AesCcmCheckTagSize((int)authTagSz) != 0) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
@ -9385,13 +9385,13 @@ int wc_AesCcmDecrypt(Aes* aes, byte* out, const byte* in, word32 inSz,
o = out; o = out;
oSz = inSz; oSz = inSz;
B[0] = (authInSz > 0 ? 64 : 0) B[0] = (byte)((authInSz > 0 ? 64 : 0)
+ (8 * (((byte)authTagSz - 2) / 2)) + (8 * (((byte)authTagSz - 2) / 2))
+ (lenSz - 1); + (lenSz - 1));
for (i = 0; i < lenSz; i++) { for (i = 0; i < lenSz; i++) {
if (mask && i >= wordSz) if (mask && i >= wordSz)
mask = 0x00; mask = 0x00;
B[AES_BLOCK_SIZE - 1 - i] = (inSz >> ((8 * i) & mask)) & mask; B[AES_BLOCK_SIZE - 1 - i] = (byte)((inSz >> ((8 * i) & mask)) & mask);
} }
ret = wc_AesEncrypt(aes, B, A); ret = wc_AesEncrypt(aes, B, A);
@ -9445,7 +9445,7 @@ int wc_AesCcmDecrypt(Aes* aes, byte* out, const byte* in, word32 inSz,
} }
xorbuf(A, B, authTagSz); xorbuf(A, B, authTagSz);
if (ConstantCompare(A, authTag, authTagSz) != 0) { if (ConstantCompare(A, authTag, (int)authTagSz) != 0) {
/* If the authTag check fails, don't keep the decrypted data. /* If the authTag check fails, don't keep the decrypted data.
* Unfortunately, you need the decrypted data to calculate the * Unfortunately, you need the decrypted data to calculate the
* check value. */ * check value. */
@ -9626,7 +9626,7 @@ int wc_AesInit_Id(Aes* aes, unsigned char* id, int len, void* heap, int devId)
if (ret == 0) if (ret == 0)
ret = wc_AesInit(aes, heap, devId); ret = wc_AesInit(aes, heap, devId);
if (ret == 0) { if (ret == 0) {
XMEMCPY(aes->id, id, len); XMEMCPY(aes->id, id, (size_t)len);
aes->idLen = len; aes->idLen = len;
aes->labelLen = 0; aes->labelLen = 0;
} }
@ -9637,12 +9637,12 @@ int wc_AesInit_Id(Aes* aes, unsigned char* id, int len, void* heap, int devId)
int wc_AesInit_Label(Aes* aes, const char* label, void* heap, int devId) int wc_AesInit_Label(Aes* aes, const char* label, void* heap, int devId)
{ {
int ret = 0; int ret = 0;
int labelLen = 0; size_t labelLen = 0;
if (aes == NULL || label == NULL) if (aes == NULL || label == NULL)
ret = BAD_FUNC_ARG; ret = BAD_FUNC_ARG;
if (ret == 0) { if (ret == 0) {
labelLen = (int)XSTRLEN(label); labelLen = XSTRLEN(label);
if (labelLen == 0 || labelLen > AES_MAX_LABEL_LEN) if (labelLen == 0 || labelLen > AES_MAX_LABEL_LEN)
ret = BUFFER_E; ret = BUFFER_E;
} }
@ -9651,7 +9651,7 @@ int wc_AesInit_Label(Aes* aes, const char* label, void* heap, int devId)
ret = wc_AesInit(aes, heap, devId); ret = wc_AesInit(aes, heap, devId);
if (ret == 0) { if (ret == 0) {
XMEMCPY(aes->label, label, labelLen); XMEMCPY(aes->label, label, labelLen);
aes->labelLen = labelLen; aes->labelLen = (int)labelLen;
aes->idLen = 0; aes->idLen = 0;
} }
@ -10032,7 +10032,7 @@ static WARN_UNUSED_RESULT int wc_AesFeedbackDecrypt(
#ifdef WOLFSSL_AES_CFB #ifdef WOLFSSL_AES_CFB
/* check if more input needs copied over to aes->reg */ /* check if more input needs copied over to aes->reg */
if (aes->left && sz && mode == AES_CFB_MODE) { if (aes->left && sz && mode == AES_CFB_MODE) {
int size = min(aes->left, sz); word32 size = min(aes->left, sz);
XMEMCPY((byte*)aes->reg + AES_BLOCK_SIZE - aes->left, in, size); XMEMCPY((byte*)aes->reg + AES_BLOCK_SIZE - aes->left, in, size);
} }
#endif #endif
@ -10155,7 +10155,7 @@ static void shiftLeftArray(byte* ary, byte shift)
for (i = 0; i < AES_BLOCK_SIZE - 1; i++) { for (i = 0; i < AES_BLOCK_SIZE - 1; i++) {
byte carry = ary[i+1] & (0XFF << (WOLFSSL_BIT_SIZE - shift)); byte carry = ary[i+1] & (0XFF << (WOLFSSL_BIT_SIZE - shift));
carry >>= (WOLFSSL_BIT_SIZE - shift); carry >>= (WOLFSSL_BIT_SIZE - shift);
ary[i] = (ary[i] << shift) + carry; ary[i] = (byte)((ary[i] << shift) + carry);
} }
ary[i] = ary[i] << shift; ary[i] = ary[i] << shift;
} }
@ -10400,11 +10400,11 @@ int wc_AesOfbDecrypt(Aes* aes, byte* out, const byte* in, word32 sz)
/* Initialize key wrap counter with value */ /* Initialize key wrap counter with value */
static WC_INLINE void InitKeyWrapCounter(byte* inOutCtr, word32 value) static WC_INLINE void InitKeyWrapCounter(byte* inOutCtr, word32 value)
{ {
int i; word32 i;
word32 bytes; word32 bytes;
bytes = sizeof(word32); bytes = sizeof(word32);
for (i = 0; i < (int)sizeof(word32); i++) { for (i = 0; i < sizeof(word32); i++) {
inOutCtr[i+sizeof(word32)] = (value >> ((bytes - 1) * 8)) & 0xFF; inOutCtr[i+sizeof(word32)] = (value >> ((bytes - 1) * 8)) & 0xFF;
bytes--; bytes--;
} }
@ -10495,7 +10495,7 @@ int wc_AesKeyWrap_ex(Aes *aes, const byte* in, word32 inSz, byte* out,
/* C[0] = A */ /* C[0] = A */
XMEMCPY(out, tmp, KEYWRAP_BLOCK_SIZE); XMEMCPY(out, tmp, KEYWRAP_BLOCK_SIZE);
return inSz + KEYWRAP_BLOCK_SIZE; return (int)(inSz + KEYWRAP_BLOCK_SIZE);
} }
/* perform AES key wrap (RFC3394), return out sz on success, negative on err */ /* perform AES key wrap (RFC3394), return out sz on success, negative on err */
@ -10611,7 +10611,7 @@ int wc_AesKeyUnWrap_ex(Aes *aes, const byte* in, word32 inSz, byte* out,
if (XMEMCMP(tmp, expIv, KEYWRAP_BLOCK_SIZE) != 0) if (XMEMCMP(tmp, expIv, KEYWRAP_BLOCK_SIZE) != 0)
return BAD_KEYWRAP_IV_E; return BAD_KEYWRAP_IV_E;
return inSz - KEYWRAP_BLOCK_SIZE; return (int)(inSz - KEYWRAP_BLOCK_SIZE);
} }
int wc_AesKeyUnWrap(const byte* key, word32 keySz, const byte* in, word32 inSz, int wc_AesKeyUnWrap(const byte* key, word32 keySz, const byte* in, word32 inSz,
@ -10809,7 +10809,7 @@ static WARN_UNUSED_RESULT int _AesXtsHelper(
byte tmpC; byte tmpC;
tmpC = (pt[j] >> 7) & 0x01; tmpC = (pt[j] >> 7) & 0x01;
pt[j+AES_BLOCK_SIZE] = ((pt[j] << 1) + carry) & 0xFF; pt[j+AES_BLOCK_SIZE] = (byte)((pt[j] << 1) + carry);
carry = tmpC; carry = tmpC;
} }
if (carry) { if (carry) {
@ -10912,7 +10912,7 @@ int wc_AesXtsEncrypt(XtsAes* xaes, byte* out, const byte* in, word32 sz,
byte tmpC; byte tmpC;
tmpC = (tmp[j] >> 7) & 0x01; tmpC = (tmp[j] >> 7) & 0x01;
tmp[j] = ((tmp[j] << 1) + carry) & 0xFF; tmp[j] = (byte)((tmp[j] << 1) + carry);
carry = tmpC; carry = tmpC;
} }
if (carry) { if (carry) {
@ -11049,7 +11049,7 @@ int wc_AesXtsDecrypt(XtsAes* xaes, byte* out, const byte* in, word32 sz,
byte tmpC; byte tmpC;
tmpC = (tmp[j] >> 7) & 0x01; tmpC = (tmp[j] >> 7) & 0x01;
tmp[j] = ((tmp[j] << 1) + carry) & 0xFF; tmp[j] = (byte)((tmp[j] << 1) + carry);
carry = tmpC; carry = tmpC;
} }
if (carry) { if (carry) {
@ -11073,7 +11073,7 @@ int wc_AesXtsDecrypt(XtsAes* xaes, byte* out, const byte* in, word32 sz,
byte tmpC; byte tmpC;
tmpC = (tmp[j] >> 7) & 0x01; tmpC = (tmp[j] >> 7) & 0x01;
tmp2[j] = ((tmp[j] << 1) + carry) & 0xFF; tmp2[j] = (byte)((tmp[j] << 1) + carry);
carry = tmpC; carry = tmpC;
} }
if (carry) { if (carry) {

21
wolfcrypt/src/asn.c
View File

@ -11302,21 +11302,23 @@ static int StoreKey(DecodedCert* cert, const byte* source, word32* srcIdx,
ret = CheckBitString(source, srcIdx, &length, maxIdx, 1, NULL); ret = CheckBitString(source, srcIdx, &length, maxIdx, 1, NULL);
if (ret == 0) { if (ret == 0) {
#ifdef HAVE_OCSP #ifdef HAVE_OCSP
ret = CalcHashId(source + *srcIdx, length, cert->subjectKeyHash); ret = CalcHashId(source + *srcIdx, (word32)length,
cert->subjectKeyHash);
} }
if (ret == 0) { if (ret == 0) {
#endif #endif
publicKey = (byte*)XMALLOC(length, cert->heap, DYNAMIC_TYPE_PUBLIC_KEY); publicKey = (byte*)XMALLOC((size_t)length, cert->heap,
DYNAMIC_TYPE_PUBLIC_KEY);
if (publicKey == NULL) { if (publicKey == NULL) {
ret = MEMORY_E; ret = MEMORY_E;
} }
else { else {
XMEMCPY(publicKey, &source[*srcIdx], length); XMEMCPY(publicKey, &source[*srcIdx], (size_t)length);
cert->publicKey = publicKey; cert->publicKey = publicKey;
cert->pubKeyStored = 1; cert->pubKeyStored = 1;
cert->pubKeySize = length; cert->pubKeySize = (word32)length;
*srcIdx += length; *srcIdx += (word32)length;
} }
} }
@ -26692,7 +26694,8 @@ static int EncodePublicKey(int keyType, byte* output, int outLen,
#endif /* HAVE_ECC */ #endif /* HAVE_ECC */
#ifdef HAVE_ED25519 #ifdef HAVE_ED25519
case ED25519_KEY: case ED25519_KEY:
ret = wc_Ed25519PublicKeyToDer(ed25519Key, output, outLen, 1); ret = wc_Ed25519PublicKeyToDer(ed25519Key, output,
(word32)outLen, 1);
if (ret <= 0) { if (ret <= 0) {
ret = PUBLIC_KEY_E; ret = PUBLIC_KEY_E;
} }
@ -26700,7 +26703,7 @@ static int EncodePublicKey(int keyType, byte* output, int outLen,
#endif #endif
#ifdef HAVE_ED448 #ifdef HAVE_ED448
case ED448_KEY: case ED448_KEY:
ret = wc_Ed448PublicKeyToDer(ed448Key, output, outLen, 1); ret = wc_Ed448PublicKeyToDer(ed448Key, output, (word32)outLen, 1);
if (ret <= 0) { if (ret <= 0) {
ret = PUBLIC_KEY_E; ret = PUBLIC_KEY_E;
} }
@ -27940,7 +27943,7 @@ static int MakeSignature(CertSignCtx* certSignCtx, const byte* buf, word32 sz,
ret = wc_ed25519_sign_msg(buf, sz, sig, &outSz, ed25519Key); ret = wc_ed25519_sign_msg(buf, sz, sig, &outSz, ed25519Key);
if (ret == 0) if (ret == 0)
ret = outSz; ret = (int)outSz;
} }
#endif /* HAVE_ED25519 && HAVE_ED25519_SIGN */ #endif /* HAVE_ED25519 && HAVE_ED25519_SIGN */
@ -27950,7 +27953,7 @@ static int MakeSignature(CertSignCtx* certSignCtx, const byte* buf, word32 sz,
ret = wc_ed448_sign_msg(buf, sz, sig, &outSz, ed448Key, NULL, 0); ret = wc_ed448_sign_msg(buf, sz, sig, &outSz, ed448Key, NULL, 0);
if (ret == 0) if (ret == 0)
ret = outSz; ret = (int)outSz;
} }
#endif /* HAVE_ED448 && HAVE_ED448_SIGN */ #endif /* HAVE_ED448 && HAVE_ED448_SIGN */

2
wolfcrypt/src/cmac.c
View File

@ -342,7 +342,7 @@ int wc_AesCmacVerify(const byte* check, word32 checkSz,
XMEMSET(a, 0, aSz); XMEMSET(a, 0, aSz);
ret = wc_AesCmacGenerate(a, &aSz, in, inSz, key, keySz); ret = wc_AesCmacGenerate(a, &aSz, in, inSz, key, keySz);
compareRet = ConstantCompare(check, a, min(checkSz, aSz)); compareRet = ConstantCompare(check, a, (int)min(checkSz, aSz));
if (ret == 0) if (ret == 0)
ret = compareRet ? 1 : 0; ret = compareRet ? 1 : 0;

2
wolfcrypt/src/des3.c
View File

@ -1486,7 +1486,7 @@
for (j = 0; j < 48; j++) { /* select bits individually */ for (j = 0; j < 48; j++) { /* select bits individually */
if (pcr[pc2[j] - 1]) { /* check bit that goes to ks[j] */ if (pcr[pc2[j] - 1]) { /* check bit that goes to ks[j] */
l= j % 6; /* mask it in if it's there */ l= j % 6; /* mask it in if it's there */
ks[j/6] |= bytebit[l] >> 2; ks[j/6] |= (byte)(bytebit[l] >> 2);
} }
} }

45
wolfcrypt/src/dh.c
View File

@ -1039,7 +1039,7 @@ static int _ffc_pairwise_consistency_test(DhKey* key,
* modLen - represents L, the size of p in bits * modLen - represents L, the size of p in bits
* divLen - represents N, the size of q in bits * divLen - represents N, the size of q in bits
* return 0 on success, -1 on error */ * return 0 on success, -1 on error */
static int CheckDhLN(int modLen, int divLen) static int CheckDhLN(word32 modLen, word32 divLen)
{ {
int ret = -1; int ret = -1;
@ -1076,7 +1076,8 @@ static int CheckDhLN(int modLen, int divLen)
static int GeneratePrivateDh186(DhKey* key, WC_RNG* rng, byte* priv, static int GeneratePrivateDh186(DhKey* key, WC_RNG* rng, byte* priv,
word32* privSz) word32* privSz)
{ {
int qSz, pSz, cSz, err; word32 qSz, pSz, cSz;
int err;
#if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC) #if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC)
mp_int* tmpQ = NULL; mp_int* tmpQ = NULL;
mp_int* tmpX = NULL; mp_int* tmpX = NULL;
@ -1093,8 +1094,8 @@ static int GeneratePrivateDh186(DhKey* key, WC_RNG* rng, byte* priv,
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
qSz = mp_unsigned_bin_size(&key->q); qSz = (word32)mp_unsigned_bin_size(&key->q);
pSz = mp_unsigned_bin_size(&key->p); pSz = (word32)mp_unsigned_bin_size(&key->p);
/* verify (L,N) pair bit lengths */ /* verify (L,N) pair bit lengths */
/* Trusted primes don't need to be checked. */ /* Trusted primes don't need to be checked. */
@ -1167,7 +1168,7 @@ static int GeneratePrivateDh186(DhKey* key, WC_RNG* rng, byte* priv,
/* tmpQ: M = min(2^N,q) - 1 */ /* tmpQ: M = min(2^N,q) - 1 */
if (err == MP_OKAY) if (err == MP_OKAY)
err = mp_2expt(tmpQ, *privSz * 8); err = mp_2expt(tmpQ, (int)*privSz * 8);
if (err == MP_OKAY) { if (err == MP_OKAY) {
if (mp_cmp(tmpQ, &key->q) == MP_GT) { if (mp_cmp(tmpQ, &key->q) == MP_GT) {
@ -1188,8 +1189,8 @@ static int GeneratePrivateDh186(DhKey* key, WC_RNG* rng, byte* priv,
/* copy tmpX into priv */ /* copy tmpX into priv */
if (err == MP_OKAY) { if (err == MP_OKAY) {
pSz = mp_unsigned_bin_size(tmpX); pSz = (word32)mp_unsigned_bin_size(tmpX);
if (pSz > (int)*privSz) { if (pSz > *privSz) {
WOLFSSL_MSG("DH private key output buffer too small"); WOLFSSL_MSG("DH private key output buffer too small");
err = BAD_FUNC_ARG; err = BAD_FUNC_ARG;
} else { } else {
@ -1235,7 +1236,7 @@ static int GeneratePrivateDh(DhKey* key, WC_RNG* rng, byte* priv,
#endif #endif
{ {
sz = mp_unsigned_bin_size(&key->p); sz = (word32)mp_unsigned_bin_size(&key->p);
/* Table of predetermined values from the operation /* Table of predetermined values from the operation
2 * DiscreteLogWorkFactor(sz * WOLFSSL_BIT_SIZE) / 2 * DiscreteLogWorkFactor(sz * WOLFSSL_BIT_SIZE) /
@ -1348,7 +1349,7 @@ static int GeneratePublicDh(DhKey* key, byte* priv, word32 privSz,
ret = MP_TO_E; ret = MP_TO_E;
if (ret == 0) if (ret == 0)
*pubSz = mp_unsigned_bin_size(y); *pubSz = (word32)mp_unsigned_bin_size(y);
mp_clear(y); mp_clear(y);
mp_clear(x); mp_clear(x);
@ -2157,7 +2158,7 @@ static int wc_DhAgree_Sync(DhKey* key, byte* agree, word32* agreeSz,
ret = MP_TO_E; ret = MP_TO_E;
if (ret == 0) if (ret == 0)
*agreeSz = mp_unsigned_bin_size(z); *agreeSz = (word32)mp_unsigned_bin_size(z);
mp_forcezero(z); mp_forcezero(z);
mp_clear(y); mp_clear(y);
@ -2381,7 +2382,7 @@ int wc_DhExportKeyPair(DhKey* key, byte* priv, word32* pPrivSz,
} }
if (priv) { if (priv) {
word32 privSz = mp_unsigned_bin_size(&key->priv); word32 privSz = (word32)mp_unsigned_bin_size(&key->priv);
if (privSz > *pPrivSz) { if (privSz > *pPrivSz) {
return BUFFER_E; return BUFFER_E;
} }
@ -2390,7 +2391,7 @@ int wc_DhExportKeyPair(DhKey* key, byte* priv, word32* pPrivSz,
} }
if (pub) { if (pub) {
word32 pubSz = mp_unsigned_bin_size(&key->pub); word32 pubSz = (word32)mp_unsigned_bin_size(&key->pub);
if (pubSz > *pPubSz) { if (pubSz > *pPubSz) {
return BUFFER_E; return BUFFER_E;
} }
@ -2591,7 +2592,7 @@ int wc_DhSetNamedKey(DhKey* key, int name)
word32 wc_DhGetNamedKeyMinSize(int name) word32 wc_DhGetNamedKeyMinSize(int name)
{ {
int size; word32 size;
switch (name) { switch (name) {
#ifdef HAVE_FFDHE_2048 #ifdef HAVE_FFDHE_2048
@ -2877,9 +2878,9 @@ int wc_DhGenerateParams(WC_RNG *rng, int modSz, DhKey *dh)
#else #else
mp_int tmp[1], tmp2[2]; mp_int tmp[1], tmp2[2];
#endif #endif
int groupSz = 0, bufSz = 0, word32 groupSz = 0, bufSz = 0,
primeCheckCount = 0, primeCheckCount = 0;
primeCheck = MP_NO, int primeCheck = MP_NO,
ret = 0; ret = 0;
unsigned char *buf = NULL; unsigned char *buf = NULL;
@ -2916,7 +2917,7 @@ int wc_DhGenerateParams(WC_RNG *rng, int modSz, DhKey *dh)
if (ret == 0) { if (ret == 0) {
/* modulus size in bytes */ /* modulus size in bytes */
modSz /= WOLFSSL_BIT_SIZE; modSz /= WOLFSSL_BIT_SIZE;
bufSz = modSz - groupSz; bufSz = (word32)modSz - groupSz;
/* allocate ram */ /* allocate ram */
buf = (unsigned char *)XMALLOC(bufSz, buf = (unsigned char *)XMALLOC(bufSz,
@ -2943,7 +2944,7 @@ int wc_DhGenerateParams(WC_RNG *rng, int modSz, DhKey *dh)
/* force magnitude */ /* force magnitude */
buf[0] |= 0xC0; buf[0] |= 0xC0;
/* force even */ /* force even */
buf[bufSz - 1] &= ~1; buf[bufSz - 1] &= (byte)~1U;
if (mp_init_multi(tmp, tmp2, &dh->p, &dh->q, &dh->g, 0) if (mp_init_multi(tmp, tmp2, &dh->p, &dh->q, &dh->g, 0)
!= MP_OKAY) { != MP_OKAY) {
@ -2958,7 +2959,7 @@ int wc_DhGenerateParams(WC_RNG *rng, int modSz, DhKey *dh)
/* make our prime q */ /* make our prime q */
if (ret == 0) { if (ret == 0) {
if (mp_rand_prime(&dh->q, groupSz, rng, NULL) != MP_OKAY) if (mp_rand_prime(&dh->q, (int)groupSz, rng, NULL) != MP_OKAY)
ret = PRIME_GEN_E; ret = PRIME_GEN_E;
} }
@ -3088,9 +3089,9 @@ int wc_DhExportParamsRaw(DhKey* dh, byte* p, word32* pSz,
/* get required output buffer sizes */ /* get required output buffer sizes */
if (ret == 0) { if (ret == 0) {
pLen = mp_unsigned_bin_size(&dh->p); pLen = (word32)mp_unsigned_bin_size(&dh->p);
qLen = mp_unsigned_bin_size(&dh->q); qLen = (word32)mp_unsigned_bin_size(&dh->q);
gLen = mp_unsigned_bin_size(&dh->g); gLen = (word32)mp_unsigned_bin_size(&dh->g);
/* return buffer sizes and LENGTH_ONLY_E if buffers are NULL */ /* return buffer sizes and LENGTH_ONLY_E if buffers are NULL */
if (p == NULL && q == NULL && g == NULL) { if (p == NULL && q == NULL && g == NULL) {

18
wolfcrypt/src/poly1305.c
View File

@ -211,14 +211,14 @@ extern void poly1305_final_avx2(Poly1305* ctx, byte* mac);
} }
static void U64TO8(byte* p, word64 v) { static void U64TO8(byte* p, word64 v) {
p[0] = (v ) & 0xff; p[0] = (byte)v;
p[1] = (v >> 8) & 0xff; p[1] = (byte)(v >> 8);
p[2] = (v >> 16) & 0xff; p[2] = (byte)(v >> 16);
p[3] = (v >> 24) & 0xff; p[3] = (byte)(v >> 24);
p[4] = (v >> 32) & 0xff; p[4] = (byte)(v >> 32);
p[5] = (v >> 40) & 0xff; p[5] = (byte)(v >> 40);
p[6] = (v >> 48) & 0xff; p[6] = (byte)(v >> 48);
p[7] = (v >> 56) & 0xff; p[7] = (byte)(v >> 56);
} }
#endif/* WOLFSSL_ARMASM */ #endif/* WOLFSSL_ARMASM */
#else /* if not 64 bit then use 32 bit */ #else /* if not 64 bit then use 32 bit */
@ -778,7 +778,7 @@ int wc_Poly1305Update(Poly1305* ctx, const byte* m, word32 bytes)
/* process full blocks */ /* process full blocks */
if (bytes >= POLY1305_BLOCK_SIZE) { if (bytes >= POLY1305_BLOCK_SIZE) {
size_t want = ((size_t)bytes & ~(POLY1305_BLOCK_SIZE - 1)); size_t want = ((size_t)bytes & ~((size_t)POLY1305_BLOCK_SIZE - 1));
#if !defined(WOLFSSL_ARMASM) || !defined(__aarch64__) #if !defined(WOLFSSL_ARMASM) || !defined(__aarch64__)
int ret; int ret;
ret = poly1305_blocks(ctx, m, want); ret = poly1305_blocks(ctx, m, want);

4
wolfcrypt/src/sha3.c
View File

@ -645,7 +645,7 @@ static int Sha3Update(wc_Sha3* sha3, const byte* data, word32 len, byte p)
if (sha3->i > 0) { if (sha3->i > 0) {
byte *t; byte *t;
byte l = p * 8 - sha3->i; byte l = (byte)(p * 8 - sha3->i);
if (l > len) { if (l > len) {
l = (byte)len; l = (byte)len;
} }
@ -692,7 +692,7 @@ static int Sha3Update(wc_Sha3* sha3, const byte* data, word32 len, byte p)
data += p * 8; data += p * 8;
} }
XMEMCPY(sha3->t, data, len); XMEMCPY(sha3->t, data, len);
sha3->i += len; sha3->i += (byte)len;
return 0; return 0;
} }

4
wolfcrypt/src/sha512.c
View File

@ -1073,7 +1073,7 @@ static WC_INLINE int Sha512Final(wc_Sha512* sha512)
#else #else
static int Sha512FinalRaw(wc_Sha512* sha512, byte* hash, int digestSz) static int Sha512FinalRaw(wc_Sha512* sha512, byte* hash, size_t digestSz)
{ {
#ifdef LITTLE_ENDIAN_ORDER #ifdef LITTLE_ENDIAN_ORDER
word64 digest[WC_SHA512_DIGEST_SIZE / sizeof(word64)]; word64 digest[WC_SHA512_DIGEST_SIZE / sizeof(word64)];
@ -1099,7 +1099,7 @@ int wc_Sha512FinalRaw(wc_Sha512* sha512, byte* hash)
return Sha512FinalRaw(sha512, hash, WC_SHA512_DIGEST_SIZE); return Sha512FinalRaw(sha512, hash, WC_SHA512_DIGEST_SIZE);
} }
static int Sha512_Family_Final(wc_Sha512* sha512, byte* hash, int digestSz, static int Sha512_Family_Final(wc_Sha512* sha512, byte* hash, size_t digestSz,
int (*initfp)(wc_Sha512*)) int (*initfp)(wc_Sha512*))
{ {
int ret; int ret;

4
wolfcrypt/src/siphash.c
View File

@ -258,7 +258,7 @@ int wc_SipHashUpdate(SipHash* sipHash, const unsigned char* in, word32 inSz)
if (sipHash->cacheCnt > 0) { if (sipHash->cacheCnt > 0) {
byte len = SIPHASH_BLOCK_SIZE - sipHash->cacheCnt; byte len = SIPHASH_BLOCK_SIZE - sipHash->cacheCnt;
if (len > inSz) { if (len > inSz) {
len = inSz; len = (byte)inSz;
} }
XMEMCPY(sipHash->cache + sipHash->cacheCnt, in, len); XMEMCPY(sipHash->cache + sipHash->cacheCnt, in, len);
in += len; in += len;
@ -285,7 +285,7 @@ int wc_SipHashUpdate(SipHash* sipHash, const unsigned char* in, word32 inSz)
if (inSz > 0) { if (inSz > 0) {
/* Cache remaining message bytes less than a block. */ /* Cache remaining message bytes less than a block. */
XMEMCPY(sipHash->cache, in, inSz); XMEMCPY(sipHash->cache, in, inSz);
sipHash->cacheCnt = inSz; sipHash->cacheCnt = (byte)inSz;
} }
} }

29
wolfcrypt/src/wc_encrypt.c
View File

@ -283,7 +283,7 @@ int wc_BufferKeyDecrypt(EncryptedInfo* info, byte* der, word32 derSz,
#ifndef NO_PWDBASED #ifndef NO_PWDBASED
if ((ret = wc_PBKDF1(key, password, passwordSz, info->iv, PKCS5_SALT_SZ, 1, if ((ret = wc_PBKDF1(key, password, passwordSz, info->iv, PKCS5_SALT_SZ, 1,
info->keySz, hashType)) != 0) { (int)info->keySz, hashType)) != 0) {
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(key, NULL, DYNAMIC_TYPE_SYMMETRIC_KEY); XFREE(key, NULL, DYNAMIC_TYPE_SYMMETRIC_KEY);
#elif defined(WOLFSSL_CHECK_MEM_ZERO) #elif defined(WOLFSSL_CHECK_MEM_ZERO)
@ -349,7 +349,7 @@ int wc_BufferKeyEncrypt(EncryptedInfo* info, byte* der, word32 derSz,
#ifndef NO_PWDBASED #ifndef NO_PWDBASED
if ((ret = wc_PBKDF1(key, password, passwordSz, info->iv, PKCS5_SALT_SZ, 1, if ((ret = wc_PBKDF1(key, password, passwordSz, info->iv, PKCS5_SALT_SZ, 1,
info->keySz, hashType)) != 0) { (int)info->keySz, hashType)) != 0) {
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(key, NULL, DYNAMIC_TYPE_SYMMETRIC_KEY); XFREE(key, NULL, DYNAMIC_TYPE_SYMMETRIC_KEY);
#elif defined(WOLFSSL_CHECK_MEM_ZERO) #elif defined(WOLFSSL_CHECK_MEM_ZERO)
@ -396,7 +396,7 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
int length, int version, byte* cbcIv, int enc, int shaOid) int length, int version, byte* cbcIv, int enc, int shaOid)
{ {
int typeH = WC_HASH_TYPE_NONE; int typeH = WC_HASH_TYPE_NONE;
int derivedLen = 0; word32 derivedLen = 0;
int ret = 0; int ret = 0;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
byte* key = NULL; byte* key = NULL;
@ -410,6 +410,9 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
WOLFSSL_ENTER("wc_CryptKey"); WOLFSSL_ENTER("wc_CryptKey");
if (length < 0)
ret = BAD_LENGTH_E;
switch (id) { switch (id) {
#ifndef NO_DES3 #ifndef NO_DES3
#ifndef NO_MD5 #ifndef NO_MD5
@ -512,13 +515,13 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
#ifndef NO_HMAC #ifndef NO_HMAC
case PKCS5v2: case PKCS5v2:
ret = wc_PBKDF2(key, (byte*)password, passwordSz, ret = wc_PBKDF2(key, (byte*)password, passwordSz,
salt, saltSz, iterations, derivedLen, typeH); salt, saltSz, iterations, (int)derivedLen, typeH);
break; break;
#endif #endif
#ifndef NO_SHA #ifndef NO_SHA
case PKCS5: case PKCS5:
ret = wc_PBKDF1(key, (byte*)password, passwordSz, ret = wc_PBKDF1(key, (byte*)password, passwordSz,
salt, saltSz, iterations, derivedLen, typeH); salt, saltSz, iterations, (int)derivedLen, typeH);
break; break;
#endif #endif
#ifdef HAVE_PKCS12 #ifdef HAVE_PKCS12
@ -541,7 +544,7 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
unicodePasswd[idx++] = 0x00; unicodePasswd[idx++] = 0x00;
ret = wc_PKCS12_PBKDF(key, unicodePasswd, idx, salt, saltSz, ret = wc_PKCS12_PBKDF(key, unicodePasswd, idx, salt, saltSz,
iterations, derivedLen, typeH, 1); iterations, (int)derivedLen, typeH, 1);
if (id != PBE_SHA1_RC4_128) { if (id != PBE_SHA1_RC4_128) {
ret += wc_PKCS12_PBKDF(cbcIv, unicodePasswd, idx, salt, ret += wc_PKCS12_PBKDF(cbcIv, unicodePasswd, idx, salt,
saltSz, iterations, 8, typeH, 2); saltSz, iterations, 8, typeH, 2);
@ -577,10 +580,10 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
} }
if (ret == 0) { if (ret == 0) {
if (enc) { if (enc) {
wc_Des_CbcEncrypt(&des, input, input, length); wc_Des_CbcEncrypt(&des, input, input, (word32)length);
} }
else { else {
wc_Des_CbcDecrypt(&des, input, input, length); wc_Des_CbcDecrypt(&des, input, input, (word32)length);
} }
} }
break; break;
@ -608,10 +611,10 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
} }
if (ret == 0) { if (ret == 0) {
if (enc) { if (enc) {
ret = wc_Des3_CbcEncrypt(&des, input, input, length); ret = wc_Des3_CbcEncrypt(&des, input, input, (word32)length);
} }
else { else {
ret = wc_Des3_CbcDecrypt(&des, input, input, length); ret = wc_Des3_CbcDecrypt(&des, input, input, (word32)length);
} }
} }
wc_Des3Free(&des); wc_Des3Free(&des);
@ -625,7 +628,7 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
Arc4 dec; Arc4 dec;
wc_Arc4SetKey(&dec, key, derivedLen); wc_Arc4SetKey(&dec, key, derivedLen);
wc_Arc4Process(&dec, input, input, length); wc_Arc4Process(&dec, input, input, (word32)length);
break; break;
} }
#endif #endif
@ -661,9 +664,9 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
} }
if (ret == 0) { if (ret == 0) {
if (enc) if (enc)
ret = wc_AesCbcEncrypt(aes, input, input, length); ret = wc_AesCbcEncrypt(aes, input, input, (word32)length);
else else
ret = wc_AesCbcDecrypt(aes, input, input, length); ret = wc_AesCbcDecrypt(aes, input, input, (word32)length);
} }
if (free_aes) if (free_aes)
wc_AesFree(aes); wc_AesFree(aes);

17
wolfcrypt/src/wc_port.c
View File

@ -488,7 +488,7 @@ int wc_FileLoad(const char* fname, unsigned char** buf, size_t* bufLen,
void* heap) void* heap)
{ {
int ret; int ret;
size_t fileSz; long int fileSz;
XFILE f; XFILE f;
if (fname == NULL || buf == NULL || bufLen == NULL) { if (fname == NULL || buf == NULL || bufLen == NULL) {
@ -512,13 +512,18 @@ int wc_FileLoad(const char* fname, unsigned char** buf, size_t* bufLen,
return BAD_PATH_ERROR; return BAD_PATH_ERROR;
} }
fileSz = XFTELL(f); fileSz = XFTELL(f);
if (fileSz < 0) {
WOLFSSL_MSG("wc_LoadFile ftell error");
XFCLOSE(f);
return BAD_PATH_ERROR;
}
if (XFSEEK(f, 0, XSEEK_SET) != 0) { if (XFSEEK(f, 0, XSEEK_SET) != 0) {
WOLFSSL_MSG("wc_LoadFile file seek error"); WOLFSSL_MSG("wc_LoadFile file seek error");
XFCLOSE(f); XFCLOSE(f);
return BAD_PATH_ERROR; return BAD_PATH_ERROR;
} }
if (fileSz > 0) { if (fileSz > 0) {
*bufLen = fileSz; *bufLen = (size_t)fileSz;
*buf = (byte*)XMALLOC(*bufLen, heap, DYNAMIC_TYPE_TMP_BUFFER); *buf = (byte*)XMALLOC(*bufLen, heap, DYNAMIC_TYPE_TMP_BUFFER);
if (*buf == NULL) { if (*buf == NULL) {
WOLFSSL_MSG("wc_LoadFile memory error"); WOLFSSL_MSG("wc_LoadFile memory error");
@ -727,13 +732,13 @@ int wc_ReadDirFirst(ReadDirCtx* ctx, const char* path, char** name)
ret = BAD_PATH_ERROR; ret = BAD_PATH_ERROR;
break; break;
} }
XSTRNCPY(ctx->name, path, pathLen + 1); XSTRNCPY(ctx->name, path, (size_t)pathLen + 1);
ctx->name[pathLen] = '/'; ctx->name[pathLen] = '/';
/* Use dnameLen + 1 for GCC 8 warnings of truncating d_name. Because /* Use dnameLen + 1 for GCC 8 warnings of truncating d_name. Because
* of earlier check it is known that dnameLen is less than * of earlier check it is known that dnameLen is less than
* MAX_FILENAME_SZ - (pathLen + 2) so dnameLen +1 will fit */ * MAX_FILENAME_SZ - (pathLen + 2) so dnameLen +1 will fit */
XSTRNCPY(ctx->name + pathLen + 1, ctx->entry->d_name, dnameLen + 1); XSTRNCPY(ctx->name + pathLen + 1, ctx->entry->d_name, (size_t)dnameLen + 1);
if ((ret = wc_FileExists(ctx->name)) == 0) { if ((ret = wc_FileExists(ctx->name)) == 0) {
if (name) if (name)
*name = ctx->name; *name = ctx->name;
@ -852,12 +857,12 @@ int wc_ReadDirNext(ReadDirCtx* ctx, const char* path, char** name)
ret = BAD_PATH_ERROR; ret = BAD_PATH_ERROR;
break; break;
} }
XSTRNCPY(ctx->name, path, pathLen + 1); XSTRNCPY(ctx->name, path, (size_t)pathLen + 1);
ctx->name[pathLen] = '/'; ctx->name[pathLen] = '/';
/* Use dnameLen + 1 for GCC 8 warnings of truncating d_name. Because /* Use dnameLen + 1 for GCC 8 warnings of truncating d_name. Because
* of earlier check it is known that dnameLen is less than * of earlier check it is known that dnameLen is less than
* MAX_FILENAME_SZ - (pathLen + 2) so that dnameLen +1 will fit */ * MAX_FILENAME_SZ - (pathLen + 2) so that dnameLen +1 will fit */
XSTRNCPY(ctx->name + pathLen + 1, ctx->entry->d_name, dnameLen + 1); XSTRNCPY(ctx->name + pathLen + 1, ctx->entry->d_name, (size_t)dnameLen + 1);
if ((ret = wc_FileExists(ctx->name)) == 0) { if ((ret = wc_FileExists(ctx->name)) == 0) {
if (name) if (name)

5
wolfssl/wolfcrypt/sp_int.h
View File

@ -811,6 +811,11 @@ while (0)
#define DECL_MP_INT_SIZE_DYN(name, bits, max) \ #define DECL_MP_INT_SIZE_DYN(name, bits, max) \
unsigned char name##d[MP_INT_SIZEOF(MP_BITS_CNT(bits))]; \ unsigned char name##d[MP_INT_SIZEOF(MP_BITS_CNT(bits))]; \
sp_int* (name) = (sp_int*)name##d sp_int* (name) = (sp_int*)name##d
#elif defined(__cplusplus)
/* C++ doesn't tolerate parentheses around "name" (-Wparentheses) */
#define DECL_MP_INT_SIZE_DYN(name, bits, max) \
unsigned char name##d[MP_INT_SIZEOF(MP_BITS_CNT(max))]; \
sp_int* name = (sp_int*)name##d
#else #else
/* Declare a dynamically allocated mp_int. */ /* Declare a dynamically allocated mp_int. */
#define DECL_MP_INT_SIZE_DYN(name, bits, max) \ #define DECL_MP_INT_SIZE_DYN(name, bits, max) \