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/src/ssl/s3_lib.c | |
| 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/src/ssl/s3_lib.c')
| -rw-r--r-- | lib/libssl/src/ssl/s3_lib.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/lib/libssl/src/ssl/s3_lib.c b/lib/libssl/src/ssl/s3_lib.c index 926071fffaa..68a4b8ca2de 100644 --- a/lib/libssl/src/ssl/s3_lib.c +++ b/lib/libssl/src/ssl/s3_lib.c @@ -3319,27 +3319,6 @@ ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) ret = 1; break; -#ifndef OPENSSL_NO_HEARTBEATS - case SSL_CTRL_TLS_EXT_SEND_HEARTBEAT: - if (SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER) - ret = dtls1_heartbeat(s); - else - ret = tls1_heartbeat(s); - break; - - case SSL_CTRL_GET_TLS_EXT_HEARTBEAT_PENDING: - ret = s->tlsext_hb_pending; - break; - - case SSL_CTRL_SET_TLS_EXT_HEARTBEAT_NO_REQUESTS: - if (larg) - s->tlsext_heartbeat |= SSL_TLSEXT_HB_DONT_RECV_REQUESTS; - else - s->tlsext_heartbeat &= ~SSL_TLSEXT_HB_DONT_RECV_REQUESTS; - ret = 1; - break; -#endif - #endif /* !OPENSSL_NO_TLSEXT */ default: break; |