From ad69a30323cbc6723c2387d6ce546a51b10c42d0 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 2 Nov 2016 15:36:06 +0000 Subject: [PATCH] Fix heartbeat_test The heartbeat_test reaches into the internals of libssl and calls some internal functions. It then checks the return value to check its what it expected. However commit fa4c37457 changed the return value of these internal functions, and now the test is failing. The solution is to update the test to look for the new return value. Reviewed-by: Richard Levitte --- ssl/heartbeat_test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ssl/heartbeat_test.c b/ssl/heartbeat_test.c index 7623c36ccf..493bf0cd6f 100644 --- a/ssl/heartbeat_test.c +++ b/ssl/heartbeat_test.c @@ -278,7 +278,7 @@ static int test_dtls1_not_bleeding() fixture.payload = &payload_buf[0]; fixture.sent_payload_len = payload_buf_len; - fixture.expected_return_value = 0; + fixture.expected_return_value = -1; fixture.expected_payload_len = payload_buf_len; fixture.expected_return_payload = "Not bleeding, sixteen spaces of padding"; @@ -301,7 +301,7 @@ static int test_dtls1_not_bleeding_empty_payload() fixture.payload = &payload_buf[0]; fixture.sent_payload_len = payload_buf_len; - fixture.expected_return_value = 0; + fixture.expected_return_value = -1; fixture.expected_payload_len = payload_buf_len; fixture.expected_return_payload = ""; EXECUTE_HEARTBEAT_TEST(); @@ -370,7 +370,7 @@ static int test_tls1_not_bleeding() fixture.payload = &payload_buf[0]; fixture.sent_payload_len = payload_buf_len; - fixture.expected_return_value = 0; + fixture.expected_return_value = -1; fixture.expected_payload_len = payload_buf_len; fixture.expected_return_payload = "Not bleeding, sixteen spaces of padding"; @@ -393,7 +393,7 @@ static int test_tls1_not_bleeding_empty_payload() fixture.payload = &payload_buf[0]; fixture.sent_payload_len = payload_buf_len; - fixture.expected_return_value = 0; + fixture.expected_return_value = -1; fixture.expected_payload_len = payload_buf_len; fixture.expected_return_payload = ""; EXECUTE_HEARTBEAT_TEST(); -- 2.25.1