From: Rich Salz <rsalz@akamai.com>
Date: Sun, 14 Feb 2016 21:23:27 +0000 (-0500)
Subject: Fix build-break
X-Git-Tag: OpenSSL_1_1_0-pre3~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77b8ad18408bae1166acbf73fb2acb1f92214ece;p=thirdparty%2Fopenssl.git

Fix build-break

Combination of heartbeats and unit-tests.

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

diff --git a/ssl/ssl_utst.c b/ssl/ssl_utst.c
index 1a39cec8eda..335cf0d506b 100644
--- a/ssl/ssl_utst.c
+++ b/ssl/ssl_utst.c
@@ -60,6 +60,7 @@ static const struct openssl_ssl_test_functions ssl_test_functions = {
     ssl_init_wbio_buffer,
     ssl3_setup_buffers,
 # ifndef OPENSSL_NO_HEARTBEATS
+#  undef dtls1_process_heartbeat
     dtls1_process_heartbeat
 # endif
 };