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@

1 files changed, 1 insertions, 8 deletions

diff --git a/src/lib/libssl/d1_lib.c b/src/lib/libssl/d1_lib.c
index 26f5901cc4..9d9a90d76a 100644
--- a/src/lib/libssl/d1_lib.c
+++ b/src/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) {