summaryrefslogtreecommitdiff
path: root/src/lib/libssl/d1_both.c
diff options
context:
space:
mode:
authorjsing <>2015-02-09 10:53:28 +0000
committerjsing <>2015-02-09 10:53:28 +0000
commitb6cf79472f84871a9cffc9c9ee7643d17e8943a4 (patch)
tree26c8e0794ca281a87b301ecbd4dde188ac6918e4 /src/lib/libssl/d1_both.c
parentba83f0a487d169240e07a7f1b6b97c6f5ae100ef (diff)
downloadopenbsd-b6cf79472f84871a9cffc9c9ee7643d17e8943a4.tar.gz
openbsd-b6cf79472f84871a9cffc9c9ee7643d17e8943a4.tar.bz2
openbsd-b6cf79472f84871a9cffc9c9ee7643d17e8943a4.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 'src/lib/libssl/d1_both.c')
-rw-r--r--src/lib/libssl/d1_both.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/lib/libssl/d1_both.c b/src/lib/libssl/d1_both.c
index bff683d06c..534db59ee8 100644
--- a/src/lib/libssl/d1_both.c
+++ b/src/lib/libssl/d1_both.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: d1_both.c,v 1.31 2014/12/14 16:07:26 jsing Exp $ */ 1/* $OpenBSD: d1_both.c,v 1.32 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.
@@ -1397,21 +1397,6 @@ dtls1_shutdown(SSL *s)
1397{ 1397{
1398 int ret; 1398 int ret;
1399 1399
1400#ifndef OPENSSL_NO_SCTP
1401 if (BIO_dgram_is_sctp(SSL_get_wbio(s)) &&
1402 !(s->shutdown & SSL_SENT_SHUTDOWN)) {
1403 ret = BIO_dgram_sctp_wait_for_dry(SSL_get_wbio(s));
1404 if (ret < 0)
1405 return -1;
1406
1407 if (ret == 0)
1408 BIO_ctrl(SSL_get_wbio(s),
1409 BIO_CTRL_DGRAM_SCTP_SAVE_SHUTDOWN, 1, NULL);
1410 }
1411#endif
1412 ret = ssl3_shutdown(s); 1400 ret = ssl3_shutdown(s);
1413#ifndef OPENSSL_NO_SCTP
1414 BIO_ctrl(SSL_get_wbio(s), BIO_CTRL_DGRAM_SCTP_SAVE_SHUTDOWN, 0, NULL);
1415#endif
1416 return ret; 1401 return ret;
1417} 1402}