From: Mike Bland <mbland@acm.org>
Date: Thu, 22 May 2014 18:41:47 +0000 (-0400)
Subject: Fix heartbeat_test for -DOPENSSL_NO_HEARTBEATS
X-Git-Tag: OpenSSL_1_0_1h~30
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=756587dcb901d071682e1e6d7bde8a4461c60766;p=oweals%2Fopenssl.git

Fix heartbeat_test for -DOPENSSL_NO_HEARTBEATS

Replaces the entire test with a trivial implementation when
OPENSSL_NO_HEARTBEATS is defined.
---

diff --git a/ssl/heartbeat_test.c b/ssl/heartbeat_test.c
index 26a01c0804..f339c4a168 100644
--- a/ssl/heartbeat_test.c
+++ b/ssl/heartbeat_test.c
@@ -44,6 +44,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifndef OPENSSL_NO_HEARTBEATS
+
 /* As per https://tools.ietf.org/html/rfc6520#section-4 */
 #define MIN_PADDING_SIZE	16
 
@@ -453,3 +455,11 @@ int main(int argc, char *argv[])
 		}
 	return EXIT_SUCCESS;
 	}
+
+#else /* OPENSSL_NO_HEARTBEATS*/
+
+int main(int argc, char *argv[])
+	{
+		return EXIT_SUCCESS;
+	}
+#endif /* OPENSSL_NO_HEARTBEATS */