summaryrefslogtreecommitdiffstats
path: root/lib/libssl/d1_lib.c
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2015-02-09 10:53:28 +0000
committerjsing <jsing@openbsd.org>2015-02-09 10:53:28 +0000
commit006f529189f9c141d7a2d953ac580657fcd07af8 (patch)
treebea488cda3f2a2364d3f659592a834725a56770b /lib/libssl/d1_lib.c
parentif isascii isn't defined, don't define a retarded version (diff)
downloadwireguard-openbsd-006f529189f9c141d7a2d953ac580657fcd07af8.tar.xz
wireguard-openbsd-006f529189f9c141d7a2d953ac580657fcd07af8.zip
Jettison DTLS over SCTP.
OpenBSD does not have SCTP support and it sees little use in the wild. OPENSSL_NO_SCTP is already specified via opensslfeatures.h, hence this is a code removal only and symbols should remain unchanged. ok beck@ miod@ tedu@
Diffstat (limited to 'lib/libssl/d1_lib.c')
-rw-r--r--lib/libssl/d1_lib.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/libssl/d1_lib.c b/lib/libssl/d1_lib.c
index 26f5901cc49..9d9a90d76a0 100644
--- a/lib/libssl/d1_lib.c
+++ b/lib/libssl/d1_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_lib.c,v 1.26 2014/12/14 15:30:50 jsing Exp $ */
+/* $OpenBSD: d1_lib.c,v 1.27 2015/02/09 10:53:28 jsing Exp $ */
/*
* DTLS implementation written by Nagendra Modadugu
* (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -297,13 +297,6 @@ dtls1_get_cipher(unsigned int u)
void
dtls1_start_timer(SSL *s)
{
-#ifndef OPENSSL_NO_SCTP
- /* Disable timer for SCTP */
- if (BIO_dgram_is_sctp(SSL_get_wbio(s))) {
- memset(&(s->d1->next_timeout), 0, sizeof(struct timeval));
- return;
- }
-#endif
/* If timer is not set, initialize duration with 1 second */
if (s->d1->next_timeout.tv_sec == 0 && s->d1->next_timeout.tv_usec == 0) {