diff options
| author |   tedu <tedu@openbsd.org> | 2014-04-14 18:45:55 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2014-04-14 18:45:55 +0000 |
| commit | ba3e66e605b4b4f147254a0b10e9cc20ce77f3f6 (patch) | |
| tree | af5a6b1ba8701d28384a70c5fc4c5522ba1f2740 /lib/libssl/ssl.h | |
| parent | Remove eng_cryptodev.c (merged into old-name hw_cryptodev.c); move (diff) | |
| download | wireguard-openbsd-ba3e66e605b4b4f147254a0b10e9cc20ce77f3f6.tar.xz wireguard-openbsd-ba3e66e605b4b4f147254a0b10e9cc20ce77f3f6.zip | |
make OPENSSL_NO_HEARTBLEED the default and only option. ok deraadt miod
Diffstat (limited to 'lib/libssl/ssl.h')
| -rw-r--r-- | lib/libssl/ssl.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h index f524d0d80c5..bf4b2f2cb65 100644 --- a/lib/libssl/ssl.h +++ b/lib/libssl/ssl.h @@ -684,11 +684,6 @@ struct ssl_session_st #define SSL_get_secure_renegotiation_support(ssl) \ SSL_ctrl((ssl), SSL_CTRL_GET_RI_SUPPORT, 0, NULL) -#ifndef OPENSSL_NO_HEARTBEATS -#define SSL_heartbeat(ssl) \ - SSL_ctrl((ssl),SSL_CTRL_TLS_EXT_SEND_HEARTBEAT,0,NULL) -#endif - void SSL_CTX_set_msg_callback(SSL_CTX *ctx, void (*cb)(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg)); void SSL_set_msg_callback(SSL *ssl, void (*cb)(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg)); #define SSL_CTX_set_msg_callback_arg(ctx, arg) SSL_CTX_ctrl((ctx), SSL_CTRL_SET_MSG_CALLBACK_ARG, 0, (arg)) @@ -1595,11 +1590,6 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION) #define SSL_CTRL_SET_TLS_EXT_SRP_USERNAME 79 #define SSL_CTRL_SET_TLS_EXT_SRP_STRENGTH 80 #define SSL_CTRL_SET_TLS_EXT_SRP_PASSWORD 81 -#ifndef OPENSSL_NO_HEARTBEATS -#define SSL_CTRL_TLS_EXT_SEND_HEARTBEAT 85 -#define SSL_CTRL_GET_TLS_EXT_HEARTBEAT_PENDING 86 -#define SSL_CTRL_SET_TLS_EXT_HEARTBEAT_NO_REQUESTS 87 -#endif #endif #define DTLS_CTRL_GET_TIMEOUT 73 |