Merge pull request #1214 from moisesguimaraes/fix-tlsx-unreachable

Removes unreachable code in TLSX supported-curves and ec-point-format.
This commit is contained in:
dgarske 2017-11-07 08:49:15 -08:00 committed by GitHub
commit a5f7b182bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 16 deletions

View File

@ -2881,38 +2881,44 @@ static void TLSX_PointFormat_FreeAll(PointFormat* list, void* heap)
static int TLSX_SupportedCurve_Append(SupportedCurve* list, word16 name,
void* heap)
{
if (list == NULL)
return BAD_FUNC_ARG;
int ret = BAD_FUNC_ARG;
while (1) {
if (list->name == name)
return 0; /* curve alreay in use */
while (list) {
if (list->name == name) {
ret = 0; /* curve alreay in use */
break;
}
if (list->next == NULL)
return TLSX_SupportedCurve_New(&list->next, name, heap);
if (list->next == NULL) {
ret = TLSX_SupportedCurve_New(&list->next, name, heap);
break;
}
list = list->next;
}
return 0;
return ret;
}
static int TLSX_PointFormat_Append(PointFormat* list, byte format, void* heap)
{
if (list == NULL)
return BAD_FUNC_ARG;
int ret = BAD_FUNC_ARG;
while (1) {
if (list->format == format)
return 0; /* format already in use */
while (list) {
if (list->format == format) {
ret = 0; /* format already in use */
break;
}
if (list->next == NULL)
return TLSX_PointFormat_New(&list->next, format, heap);
if (list->next == NULL) {
ret = TLSX_PointFormat_New(&list->next, format, heap);
break;
}
list = list->next;
}
return 0;
return ret;
}
#ifndef NO_WOLFSSL_CLIENT