Skip to content

Commit a5464a9

Browse files
authored
Merge pull request #7083 from douzzer/20231219-clang-analyzer-optin.core.EnumCastOutOfRange
20231219-clang-analyzer-optin.core.EnumCastOutOfRange
2 parents 805c2d4 + f2d573f commit a5464a9

4 files changed

Lines changed: 8 additions & 1 deletion

File tree

src/ssl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16393,7 +16393,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
1639316393
/* cast so that compiler reminds us of unimplemented values */
1639416394
switch ((enum SignatureAlgorithm)sigType) {
1639516395
case anonymous_sa_algo:
16396-
*sigAlgo = (enum Key_Sum)0;
16396+
*sigAlgo = ANONk;
1639716397
break;
1639816398
case rsa_sa_algo:
1639916399
*sigAlgo = RSAk;

tests/api.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29064,7 +29064,9 @@ static int test_wc_SignatureGetSize_ecc(void)
2906429064
ExpectIntGT(wc_SignatureGetSize(sig_type, &ecc, key_len), 0);
2906529065

2906629066
/* Test bad args */
29067+
/* // NOLINTBEGIN(clang-analyzer-optin.core.EnumCastOutOfRange) */
2906729068
sig_type = (enum wc_SignatureType) 100;
29069+
/* // NOLINTEND(clang-analyzer-optin.core.EnumCastOutOfRange) */
2906829070
ExpectIntEQ(wc_SignatureGetSize(sig_type, &ecc, key_len), BAD_FUNC_ARG);
2906929071
sig_type = WC_SIGNATURE_TYPE_ECC;
2907029072
ExpectIntEQ(wc_SignatureGetSize(sig_type, NULL, key_len), 0);
@@ -29129,7 +29131,9 @@ static int test_wc_SignatureGetSize_rsa(void)
2912929131
ExpectIntGT(wc_SignatureGetSize(sig_type, &rsa_key, key_len), 0);
2913029132

2913129133
/* Test bad args */
29134+
/* // NOLINTBEGIN(clang-analyzer-optin.core.EnumCastOutOfRange) */
2913229135
sig_type = (enum wc_SignatureType)100;
29136+
/* // NOLINTEND(clang-analyzer-optin.core.EnumCastOutOfRange) */
2913329137
ExpectIntEQ(wc_SignatureGetSize(sig_type, &rsa_key, key_len), BAD_FUNC_ARG);
2913429138
sig_type = WC_SIGNATURE_TYPE_RSA;
2913529139
#ifndef HAVE_USER_RSA

tests/srp.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,11 @@ static void test_SrpInit(void)
128128
/* invalid params */
129129
AssertIntEQ(BAD_FUNC_ARG, wc_SrpInit(NULL, SRP_TYPE_TEST_DEFAULT,
130130
SRP_CLIENT_SIDE));
131+
/* // NOLINTBEGIN(clang-analyzer-optin.core.EnumCastOutOfRange) */
131132
AssertIntEQ(BAD_FUNC_ARG, wc_SrpInit(&srp, (SrpType)255, SRP_CLIENT_SIDE));
132133
AssertIntEQ(BAD_FUNC_ARG, wc_SrpInit(&srp, SRP_TYPE_TEST_DEFAULT,
133134
(SrpSide)255));
135+
/* // NOLINTEND(clang-analyzer-optin.core.EnumCastOutOfRange) */
134136

135137
/* success */
136138
AssertIntEQ(0, wc_SrpInit(&srp, SRP_TYPE_TEST_DEFAULT, SRP_CLIENT_SIDE));

wolfssl/wolfcrypt/asn.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,6 +1124,7 @@ enum Block_Sum {
11241124

11251125

11261126
enum Key_Sum {
1127+
ANONk = 0,
11271128
DSAk = 515,
11281129
RSAk = 645,
11291130
RSAPSSk = 654,

0 commit comments

Comments
 (0)