Skip to content

Commit 8f15bf6

Browse files
committed
fix : bad merge conflics leftovers.
1 parent 56e4612 commit 8f15bf6

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

tests/api/test_tls.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,6 +1103,9 @@ int test_tls12_corrupted_finished(void)
11031103
wolfSSL_CTX_free(ctx_c);
11041104
wolfSSL_free(ssl_s);
11051105
wolfSSL_CTX_free(ctx_s);
1106+
#endif
1107+
return EXPECT_RESULT();
1108+
}
11061109

11071110
int test_wolfSSL_alert_type_string(void)
11081111
{

tests/api/test_tls.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ int test_wolfSSL_alert_desc_string(void);
5353
TEST_DECL_GROUP("tls", test_tls_set_session_min_downgrade), \
5454
TEST_DECL_GROUP("tls", test_tls_set_curves_list_ecc_fallback), \
5555
TEST_DECL_GROUP("tls", test_tls12_corrupted_finished), \
56-
TEST_DECL_GROUP("tls", test_tls12_peerauth_failsafe), \
56+
TEST_DECL_GROUP("tls", test_tls12_peerauth_failsafe), \
5757
TEST_DECL_GROUP("tls", test_wolfSSL_alert_type_string), \
5858
TEST_DECL_GROUP("tls", test_wolfSSL_alert_desc_string)
5959

0 commit comments

Comments
 (0)