Fix casts in evp.c and build issue in ParseCRL

This commit is contained in:
Eric Blankenhorn
2022-09-16 15:25:28 -05:00
parent bd83345c02
commit 4b30f47e9b
2 changed files with 4 additions and 4 deletions

View File

@@ -36359,7 +36359,7 @@ end:
} }
if (ret == 0) { if (ret == 0) {
#endif #endif
#if defined(OPENSSL_EXTRA) #ifdef OPENSSL_EXTRA
/* Parse and store the issuer name. */ /* Parse and store the issuer name. */
dcrl->issuerSz = GetASNItem_Length(dataASN[CRLASN_IDX_TBS_ISSUER], dcrl->issuerSz = GetASNItem_Length(dataASN[CRLASN_IDX_TBS_ISSUER],
buff); buff);

View File

@@ -6779,8 +6779,8 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
* combines them to a new iv. EVP is given exactly *one* iv, * combines them to a new iv. EVP is given exactly *one* iv,
* so to pass it into chacha, we have to revert that first. * so to pass it into chacha, we have to revert that first.
* The counter comes first in little-endian */ * The counter comes first in little-endian */
word32 counter = (uint32_t)iv[0] + (uint32_t)(iv[1] << 8) + word32 counter = (word32)iv[0] + (word32)(iv[1] << 8) +
(uint32_t)(iv[2] << 16) + (uint32_t)(iv[3] << 24); (word32)(iv[2] << 16) + (word32)(iv[3] << 24);
if (wc_Chacha_SetIV(&ctx->cipher.chacha, if (wc_Chacha_SetIV(&ctx->cipher.chacha,
iv + sizeof(counter), counter) != 0) { iv + sizeof(counter), counter) != 0) {