generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't test heartbeats when there aren't any.

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Ben Laurie
2016-02-14 05:52:12 +00:00
parent 59d9bb591c
commit 08934f1ab2
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ssl/ssl_locl.h
View File

@@ -1826,8 +1826,10 @@ const SSL_METHOD *func_name(void) \
struct openssl_ssl_test_functions { struct openssl_ssl_test_functions {
int (*p_ssl_init_wbio_buffer) (SSL *s, int push); int (*p_ssl_init_wbio_buffer) (SSL *s, int push);
int (*p_ssl3_setup_buffers) (SSL *s); int (*p_ssl3_setup_buffers) (SSL *s);
# ifndef OPENSSL_NO_HEARTBEATS
int (*p_dtls1_process_heartbeat) (SSL *s, int (*p_dtls1_process_heartbeat) (SSL *s,
unsigned char *p, unsigned int length); unsigned char *p, unsigned int length);
# endif
}; };
# ifndef OPENSSL_UNIT_TEST # ifndef OPENSSL_UNIT_TEST

2
ssl/ssl_utst.c
View File

@@ -59,7 +59,9 @@
static const struct openssl_ssl_test_functions ssl_test_functions = { static const struct openssl_ssl_test_functions ssl_test_functions = {
ssl_init_wbio_buffer, ssl_init_wbio_buffer,
ssl3_setup_buffers, ssl3_setup_buffers,
# ifndef OPENSSL_NO_HEARTBEATS
dtls1_process_heartbeat dtls1_process_heartbeat
# endif
}; };
const struct openssl_ssl_test_functions *SSL_test_functions(void) const struct openssl_ssl_test_functions *SSL_test_functions(void)