[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  77b8ad18408bae1166acbf73fb2acb1f92214ece (commit)
      from  3544091ae07287477f13939e44d7793fe9eeaad8 (commit)


- Log -----------------------------------------------------------------
commit 77b8ad18408bae1166acbf73fb2acb1f92214ece
Author: Rich Salz <rsalz at akamai.com>
Date:   Sun Feb 14 16:23:27 2016 -0500

    Fix build-break
    
    Combination of heartbeats and unit-tests.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/ssl_utst.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ssl/ssl_utst.c b/ssl/ssl_utst.c
index 1a39cec..335cf0d 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
 };