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

fix for different reported conversion warnings

Browse Source
This commit is contained in:
JacobBarthelmeh
2025-03-07 11:52:01 -07:00
parent 53fa4ffbaf
commit 09ffdeb897
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wolfcrypt/src/pkcs7.c
View File

@@ -6617,8 +6617,14 @@ static int PKCS7_VerifySignedData(wc_PKCS7* pkcs7, const byte* hashBuf,
ret = wc_HashFinal(&pkcs7->stream->hashAlg, ret = wc_HashFinal(&pkcs7->stream->hashAlg,
pkcs7->stream->hashType, streamHash); pkcs7->stream->hashType, streamHash);
hashBuf = streamHash; hashBuf = streamHash;
hashSz = wc_HashGetDigestSize(pkcs7->stream->hashType); length = wc_HashGetDigestSize(pkcs7->stream->hashType);
if (length < 0) {
WOLFSSL_MSG("Error getting digest size");
ret = ASN_PARSE_E;
}
else {
hashSz = (word32)length;
}
wc_HashFree(&pkcs7->stream->hashAlg, wc_HashFree(&pkcs7->stream->hashAlg,
pkcs7->stream->hashType); pkcs7->stream->hashType);
if (ret != 0) if (ret != 0)
@@ -12739,7 +12745,8 @@ WOLFSSL_API int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in,
return ret; return ret;
} }
localIdx += ofsetIdx; localIdx += ofsetIdx;
pkiMsgSz = (pkcs7->stream->length > 0)? pkcs7->stream->length: inSz; pkiMsgSz = (pkcs7->stream->length > 0)?
pkcs7->stream->length: inSz;
#else #else
ret = BUFFER_E; ret = BUFFER_E;
#endif #endif
@@ -12796,7 +12803,7 @@ WOLFSSL_API int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in,
if (pkcs7->streamOutCb) { if (pkcs7->streamOutCb) {
ret = pkcs7->streamOutCb(pkcs7, ret = pkcs7->streamOutCb(pkcs7,
pkcs7->cachedEncryptedContent, pkcs7->cachedEncryptedContent,
encryptedContentSz, pkcs7->streamCtx); (word32)encryptedContentSz, pkcs7->streamCtx);
} }
#endif /* ASN_BER_TO_DER */ #endif /* ASN_BER_TO_DER */
} }
@@ -12848,7 +12855,8 @@ WOLFSSL_API int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in,
#ifdef ASN_BER_TO_DER #ifdef ASN_BER_TO_DER
if (pkcs7->streamOutCb) { if (pkcs7->streamOutCb) {
ret = pkcs7->streamOutCb(pkcs7, encryptedContent, ret = pkcs7->streamOutCb(pkcs7, encryptedContent,
encryptedContentSz - padLen, pkcs7->streamCtx); (word32)encryptedContentSz - padLen,
pkcs7->streamCtx);
if (ret != 0) { if (ret != 0) {
WOLFSSL_MSG("Stream out callback returned failure"); WOLFSSL_MSG("Stream out callback returned failure");
ret = BUFFER_E; ret = BUFFER_E;