[openssl-commits] [openssl] master update

[Ben Laurie]

The branch master has been updated
       via  08934f1ab2f19061139f93fe2f1ee2470485b85c (commit)
      from  59d9bb591c950062ef3721f6b58fddbaae910f2a (commit)


- Log -----------------------------------------------------------------
commit 08934f1ab2f19061139f93fe2f1ee2470485b85c
Author: Ben Laurie <ben at links.org>
Date:   Sun Feb 14 05:52:12 2016 +0000

    Don't test heartbeats when there aren't any.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 ssl/ssl_locl.h | 4 +++-
 ssl/ssl_utst.c | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index dc0db1f..00136b3 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -1165,7 +1165,7 @@ struct ssl_st {
      * basis, depending on the chosen cipher.
      */
     int (*not_resumable_session_cb) (SSL *ssl, int is_forward_secure);
-    
+
     RECORD_LAYER rlayer;
 
     /* Default password callback. */
@@ -1826,8 +1826,10 @@ const SSL_METHOD *func_name(void)  \
 struct openssl_ssl_test_functions {
     int (*p_ssl_init_wbio_buffer) (SSL *s, int push);
     int (*p_ssl3_setup_buffers) (SSL *s);
+# ifndef OPENSSL_NO_HEARTBEATS
     int (*p_dtls1_process_heartbeat) (SSL *s,
         unsigned char *p, unsigned int length);
+# endif
 };
 
 # ifndef OPENSSL_UNIT_TEST
diff --git a/ssl/ssl_utst.c b/ssl/ssl_utst.c
index 25ec77e..1a39cec 100644
--- a/ssl/ssl_utst.c
+++ b/ssl/ssl_utst.c
@@ -59,7 +59,9 @@
 static const struct openssl_ssl_test_functions ssl_test_functions = {
     ssl_init_wbio_buffer,
     ssl3_setup_buffers,
+# ifndef OPENSSL_NO_HEARTBEATS
     dtls1_process_heartbeat
+# endif
 };
 
 const struct openssl_ssl_test_functions *SSL_test_functions(void)