wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

simplified string parse

Browse Source
This commit is contained in:
Hideki Miyazaki
2021-06-18 11:55:09 +09:00
parent b52ff200de
commit fbb7a40295
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/ssl.c
View File

@ -12076,13 +12076,19 @@ static int CheckcipherList(const char* list)
do { do {
char* current = next; char* current = next;
char name[MAX_SUITE_NAME + 1]; char name[MAX_SUITE_NAME + 1];
word32 length; word32 length = MAX_SUITE_NAME;
word32 current_length;
next = XSTRSTR(next, ":"); next = XSTRSTR(next, ":");
length = min(sizeof(name), !next ? (word32)XSTRLEN(current) /* last */
: (word32)(next - current)); current_length = (!next) ? (word32)XSTRLEN(current)
: (word32)(next - current);
if (current_length < length) {
length = current_length;
}
XSTRNCPY(name, current, length); XSTRNCPY(name, current, length);
name[(length == sizeof(name)) ? length - 1 : length] = 0; name[length] = 0;
ret = wolfSSL_get_cipher_suite_from_name(name, &cipherSuite0, ret = wolfSSL_get_cipher_suite_from_name(name, &cipherSuite0,
&cipherSuite1, &flags); &cipherSuite1, &flags);
@ -12142,14 +12148,19 @@ static int wolfSSL_parse_cipher_list(WOLFSSL_CTX* ctx, Suites* suites,
char* current = next; char* current = next;
char name[MAX_SUITE_NAME + 1]; char name[MAX_SUITE_NAME + 1];
int i; int i;
word32 length; word32 length = MAX_SUITE_NAME;
word32 current_length;
next = XSTRSTR(next, ":"); next = XSTRSTR(next, ":");
length = min(sizeof(name), !next ? (word32)XSTRLEN(current) /*last*/
: (word32)(next - current)); current_length = (!next) ? (word32)XSTRLEN(current)
: (word32)(next - current);
if (current_length < length) {
length = current_length;
}
XSTRNCPY(name, current, length); XSTRNCPY(name, current, length);
name[(length == sizeof(name)) ? length - 1 : length] = 0; name[length] = 0;
/* check for "not" case */ /* check for "not" case */
if (name[0] == '!' && suiteSz > 0) { if (name[0] == '!' && suiteSz > 0) {