From: Matt Caswell <matt@openssl.org>
Date: Mon, 28 Nov 2016 09:41:42 +0000 (+0000)
Subject: Revert "Fix heartbeat_test"
X-Git-Tag: OpenSSL_1_0_2k~28
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=748a2d94c07c3f3c360357db6d3299a4828bc068;p=oweals%2Fopenssl.git

Revert "Fix heartbeat_test"

Commit fa4c37457 got reverted, so this one also needs to be reverted as
a result.

This reverts commit ad69a30323cbc6723c2387d6ce546a51b10c42d0.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/ssl/heartbeat_test.c b/ssl/heartbeat_test.c
index 493bf0cd6f..7623c36ccf 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 = -1;
+    fixture.expected_return_value = 0;
     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 = -1;
+    fixture.expected_return_value = 0;
     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 = -1;
+    fixture.expected_return_value = 0;
     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 = -1;
+    fixture.expected_return_value = 0;
     fixture.expected_payload_len = payload_buf_len;
     fixture.expected_return_payload = "";
     EXECUTE_HEARTBEAT_TEST();