summaryrefslogtreecommitdiff
path: root/src/lib/libssl/d1_lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/d1_lib.c')
-rw-r--r--src/lib/libssl/d1_lib.c9
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 @@
1/* $OpenBSD: d1_lib.c,v 1.26 2014/12/14 15:30:50 jsing Exp $ */ 1/* $OpenBSD: d1_lib.c,v 1.27 2015/02/09 10:53:28 jsing Exp $ */
2/* 2/*
3 * DTLS implementation written by Nagendra Modadugu 3 * DTLS implementation written by Nagendra Modadugu
4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. 4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -297,13 +297,6 @@ dtls1_get_cipher(unsigned int u)
297void 297void
298dtls1_start_timer(SSL *s) 298dtls1_start_timer(SSL *s)
299{ 299{
300#ifndef OPENSSL_NO_SCTP
301 /* Disable timer for SCTP */
302 if (BIO_dgram_is_sctp(SSL_get_wbio(s))) {
303 memset(&(s->d1->next_timeout), 0, sizeof(struct timeval));
304 return;
305 }
306#endif
307 300
308 /* If timer is not set, initialize duration with 1 second */ 301 /* If timer is not set, initialize duration with 1 second */
309 if (s->d1->next_timeout.tv_sec == 0 && s->d1->next_timeout.tv_usec == 0) { 302 if (s->d1->next_timeout.tv_sec == 0 && s->d1->next_timeout.tv_usec == 0) {