Merge pull request #3809 from embhorn/zd11773

Warnings and error fixes
This commit is contained in:
toddouska
2021-02-24 12:14:08 -08:00
committed by GitHub
2 changed files with 3 additions and 3 deletions

View File

@ -8132,7 +8132,7 @@ int wolfSSL_CTX_set_groups(WOLFSSL_CTX* ctx, int* groups, int count)
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
/* Call to wolfSSL_CTX_UseSupportedCurve also checks if input groups /* Call to wolfSSL_CTX_UseSupportedCurve also checks if input groups
* are valid */ * are valid */
if ((ret = wolfSSL_CTX_UseSupportedCurve(ctx, groups[i])) if ((ret = wolfSSL_CTX_UseSupportedCurve(ctx, (word16)groups[i]))
!= WOLFSSL_SUCCESS) { != WOLFSSL_SUCCESS) {
TLSX_Remove(&ctx->extensions, TLSX_SUPPORTED_GROUPS, ctx->heap); TLSX_Remove(&ctx->extensions, TLSX_SUPPORTED_GROUPS, ctx->heap);
return ret; return ret;
@ -8167,7 +8167,7 @@ int wolfSSL_set_groups(WOLFSSL* ssl, int* groups, int count)
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
/* Call to wolfSSL_UseSupportedCurve also checks if input groups /* Call to wolfSSL_UseSupportedCurve also checks if input groups
* are valid */ * are valid */
if ((ret = wolfSSL_UseSupportedCurve(ssl, groups[i])) if ((ret = wolfSSL_UseSupportedCurve(ssl, (word16)groups[i]))
!= WOLFSSL_SUCCESS) { != WOLFSSL_SUCCESS) {
TLSX_Remove(&ssl->extensions, TLSX_SUPPORTED_GROUPS, ssl->heap); TLSX_Remove(&ssl->extensions, TLSX_SUPPORTED_GROUPS, ssl->heap);
return ret; return ret;

View File

@ -4798,7 +4798,7 @@ static void AES_GCM_encrypt(const unsigned char *in, unsigned char *out,
const unsigned char* addt, const unsigned char* addt,
const unsigned char* ivec, unsigned char *tag, const unsigned char* ivec, unsigned char *tag,
word32 nbytes, word32 abytes, word32 ibytes, word32 nbytes, word32 abytes, word32 ibytes,
wrd32 tbytes, const unsigned char* key, int nr) word32 tbytes, const unsigned char* key, int nr)
{ {
int i, j ,k; int i, j ,k;
__m128i ctr1; __m128i ctr1;