[openssl-commits] [openssl] OpenSSL_1_0_2-stable update
Matt Caswell
matt at openssl.org
Wed Nov 2 17:06:46 UTC 2016
The branch OpenSSL_1_0_2-stable has been updated
via ad69a30323cbc6723c2387d6ce546a51b10c42d0 (commit)
from ba2bf831c0f0b3468acbd433957f4c46c20cf43d (commit)
- Log -----------------------------------------------------------------
commit ad69a30323cbc6723c2387d6ce546a51b10c42d0
Author: Matt Caswell <matt at openssl.org>
Date: Wed Nov 2 15:36:06 2016 +0000
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 <levitte at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
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 7623c36..493bf0c 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();
More information about the openssl-commits
mailing list