Don't test heartbeats when there aren't any.
authorBen Laurie <ben@links.org>
Sun, 14 Feb 2016 05:52:12 +0000 (05:52 +0000)
committerBen Laurie <ben@links.org>
Sun, 14 Feb 2016 10:55:38 +0000 (10:55 +0000)
Reviewed-by: Richard Levitte <levitte@openssl.org>
ssl/ssl_locl.h
ssl/ssl_utst.c

index dc0db1f..00136b3 100644 (file)
@@ -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
index 25ec77e..1a39cec 100644 (file)
@@ -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)