wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2871 from vaintroub/master

Browse Source 
Fix clang warnings (issue #2870)
This commit is contained in:
toddouska
2020-04-13 09:02:51 -07:00
committed by GitHub
parent 4748254b60 d57d194de3
commit aadec345ab
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ssl.c
View File

@@ -24158,7 +24158,7 @@ int wolfSSL_sk_CIPHER_description(WOLFSSL_CIPHER* cipher)
const char* name; const char* name;
const char *keaStr, *authStr, *encStr, *macStr, *protocol; const char *keaStr, *authStr, *encStr, *macStr, *protocol;
char n[MAX_SEGMENTS][MAX_SEGMENT_SZ] = {{0}}; char n[MAX_SEGMENTS][MAX_SEGMENT_SZ] = {{0}};
uint8_t len = MAX_DESCRIPTION_SZ-1; unsigned char len = MAX_DESCRIPTION_SZ-1;
const CipherSuiteInfo* cipher_names; const CipherSuiteInfo* cipher_names;
ProtocolVersion pv; ProtocolVersion pv;
WOLFSSL_ENTER("wolfSSL_sk_CIPHER_description"); WOLFSSL_ENTER("wolfSSL_sk_CIPHER_description");
@@ -36386,7 +36386,7 @@ size_t wolfSSL_EC_get_builtin_curves(WOLFSSL_EC_BUILTIN_CURVE *r, size_t nitems)
size_t ecc_sets_count; size_t ecc_sets_count;
size_t i, min_nitems; size_t i, min_nitems;
for (i = 0; ecc_sets[i].size != 0 && ecc_sets[i].name != NULL; i++); for (i = 0; ecc_sets[i].size != 0; i++);
ecc_sets_count = i; ecc_sets_count = i;
if (r == NULL || nitems == 0) if (r == NULL || nitems == 0)

2
wolfcrypt/src/asn.c
View File

@@ -5466,7 +5466,7 @@ int wc_OBJ_sn2nid(const char *sn)
if (XSTRNCMP(sn, "secp384r1", 10) == 0) if (XSTRNCMP(sn, "secp384r1", 10) == 0)
sn = "SECP384R1"; sn = "SECP384R1";
/* find based on name and return NID */ /* find based on name and return NID */
for (i = 0; ecc_sets[i].size != 0 && ecc_sets[i].name != NULL; i++) { for (i = 0; ecc_sets[i].size != 0; i++) {
if (XSTRNCMP(sn, ecc_sets[i].name, ECC_MAXNAME) == 0) { if (XSTRNCMP(sn, ecc_sets[i].name, ECC_MAXNAME) == 0) {
eccEnum = ecc_sets[i].id; eccEnum = ecc_sets[i].id;
/* Convert enum value in ecc_curve_id to OpenSSL NID */ /* Convert enum value in ecc_curve_id to OpenSSL NID */