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

View File

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