1 files changed, 1 insertions, 88 deletions

diff --git a/src/lib/libssl/d1_pkt.c b/src/lib/libssl/d1_pkt.c
index 91e9c146ac..c997b7f212 100644
--- a/src/lib/libssl/d1_pkt.c
+++ b/src/lib/libssl/d1_pkt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_pkt.c,v 1.39 2015/01/21 00:15:50 doug Exp $ */
+/* $OpenBSD: d1_pkt.c,v 1.40 2015/02/09 10:53:28 jsing Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -231,13 +231,6 @@ dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority)
 
         item->data = rdata;
 
-#ifndef OPENSSL_NO_SCTP
-        /* Store bio_dgram_sctp_rcvinfo struct */
-        if (BIO_dgram_is_sctp(SSL_get_rbio(s)) &&
-                (s->state == SSL3_ST_SR_FINISHED_A || s->state == SSL3_ST_CR_FINISHED_A)) {
-                BIO_ctrl(SSL_get_rbio(s), BIO_CTRL_DGRAM_SCTP_GET_RCVINFO, sizeof(rdata->recordinfo), &rdata->recordinfo);
-        }
-#endif
 
         s->packet = NULL;
         s->packet_length = 0;
@@ -582,10 +575,6 @@ again:
                 /* get another record */
         }
 
-#ifndef OPENSSL_NO_SCTP
-        /* Only do replay check if no SCTP bio */
-        if (!BIO_dgram_is_sctp(SSL_get_rbio(s))) {
-#endif
                 /* Check whether this is a repeat, or aged record.
                  * Don't check if we're listening and this message is
                  * a ClientHello. They can look as if they're replayed,
@@ -600,9 +589,6 @@ again:
                         goto again;
                         /* get another record */
                 }
-#ifndef OPENSSL_NO_SCTP
-        }
-#endif
 
         /* just read a 0 length packet */
         if (rr->length == 0)
@@ -692,18 +678,7 @@ dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
 
         /* Now s->d1->handshake_fragment_len == 0 if type == SSL3_RT_HANDSHAKE. */
 
-#ifndef OPENSSL_NO_SCTP
-        /* Continue handshake if it had to be interrupted to read
-         * app data with SCTP.
-         */
-        if ((!s->in_handshake && SSL_in_init(s)) ||
-            (BIO_dgram_is_sctp(SSL_get_rbio(s)) &&
-            (s->state == DTLS1_SCTP_ST_SR_READ_SOCK ||
-            s->state == DTLS1_SCTP_ST_CR_READ_SOCK) &&
-            s->s3->in_read_app_data != 2))
-#else
         if (!s->in_handshake && SSL_in_init(s))
-#endif
         {
                 /* type == SSL3_RT_APPLICATION_DATA */
                 i = s->handshake_func(s);
@@ -732,13 +707,6 @@ start:
                 pitem *item;
                 item = pqueue_pop(s->d1->buffered_app_data.q);
                 if (item) {
-#ifndef OPENSSL_NO_SCTP
-                        /* Restore bio_dgram_sctp_rcvinfo struct */
-                        if (BIO_dgram_is_sctp(SSL_get_rbio(s))) {
-                                DTLS1_RECORD_DATA *rdata = (DTLS1_RECORD_DATA *) item->data;
-                                BIO_ctrl(SSL_get_rbio(s), BIO_CTRL_DGRAM_SCTP_SET_RCVINFO, sizeof(rdata->recordinfo), &rdata->recordinfo);
-                        }
-#endif
 
                         dtls1_copy_record(s, item);
 
@@ -826,29 +794,6 @@ start:
                         }
                 }
 
-#ifndef OPENSSL_NO_SCTP
-                /* We were about to renegotiate but had to read
-                 * belated application data first, so retry.
-                 */
-                if (BIO_dgram_is_sctp(SSL_get_rbio(s)) &&
-                    rr->type == SSL3_RT_APPLICATION_DATA &&
-                    (s->state == DTLS1_SCTP_ST_SR_READ_SOCK ||
-                    s->state == DTLS1_SCTP_ST_CR_READ_SOCK)) {
-                        s->rwstate = SSL_READING;
-                        BIO_clear_retry_flags(SSL_get_rbio(s));
-                        BIO_set_retry_read(SSL_get_rbio(s));
-                }
-
-                /* We might had to delay a close_notify alert because
-                 * of reordered app data. If there was an alert and there
-                 * is no message to read anymore, finally set shutdown.
-                 */
-                if (BIO_dgram_is_sctp(SSL_get_rbio(s)) &&
-                        s->d1->shutdown_received && !BIO_dgram_sctp_msg_waiting(SSL_get_rbio(s))) {
-                        s->shutdown |= SSL_RECEIVED_SHUTDOWN;
-                        return (0);
-                }
-#endif
                 return (n);
         }
 
@@ -1006,20 +951,6 @@ start:
                 {
                         s->s3->warn_alert = alert_descr;
                         if (alert_descr == SSL_AD_CLOSE_NOTIFY) {
-#ifndef OPENSSL_NO_SCTP
-                                /* With SCTP and streams the socket may deliver app data
-                                 * after a close_notify alert. We have to check this
-                                 * first so that nothing gets discarded.
-                                 */
-                                if (BIO_dgram_is_sctp(SSL_get_rbio(s)) &&
-                                        BIO_dgram_sctp_msg_waiting(SSL_get_rbio(s))) {
-                                        s->d1->shutdown_received = 1;
-                                        s->rwstate = SSL_READING;
-                                        BIO_clear_retry_flags(SSL_get_rbio(s));
-                                        BIO_set_retry_read(SSL_get_rbio(s));
-                                        return -1;
-                                }
-#endif
                                 s->shutdown |= SSL_RECEIVED_SHUTDOWN;
                                 return (0);
                         }
@@ -1093,14 +1024,6 @@ start:
                 if (s->version == DTLS1_BAD_VER)
                         s->d1->handshake_read_seq++;
 
-#ifndef OPENSSL_NO_SCTP
-                /* Remember that a CCS has been received,
-                 * so that an old key of SCTP-Auth can be
-                 * deleted when a CCS is sent. Will be ignored
-                 * if no SCTP is used
-                 */
-                BIO_ctrl(SSL_get_wbio(s), BIO_CTRL_DGRAM_SCTP_AUTH_CCS_RCVD, 1, NULL);
-#endif
 
                 goto start;
         }
@@ -1217,17 +1140,7 @@ dtls1_write_app_data_bytes(SSL *s, int type, const void *buf_, int len)
 {
         int i;
 
-#ifndef OPENSSL_NO_SCTP
-        /* Check if we have to continue an interrupted handshake
-         * for reading belated app data with SCTP.
-         */
-        if ((SSL_in_init(s) && !s->in_handshake) ||
-            (BIO_dgram_is_sctp(SSL_get_wbio(s)) &&
-            (s->state == DTLS1_SCTP_ST_SR_READ_SOCK ||
-            s->state == DTLS1_SCTP_ST_CR_READ_SOCK)))
-#else
         if (SSL_in_init(s) && !s->in_handshake)
-#endif
         {
                 i = s->handshake_func(s);
                 if (i < 0)