From bd79bcb42bab120575fc398692b7b61b1c5e6ed2 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 20 Apr 2017 15:13:28 +0100 Subject: Remove special case code for SCTP reneg handling There was code existing which attempted to handle the case where application data is received after a reneg handshake has started in SCTP. In normal DTLS we just fail the connection if this occurs, so there doesn't seem any reason to try and work around it for SCTP. In practice it didn't work properly anyway and is probably a bad idea to start with. Fixes #3251 Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/3286) --- ssl/d1_msg.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'ssl/d1_msg.c') diff --git a/ssl/d1_msg.c b/ssl/d1_msg.c index a8253b9404..aaee3ca4d9 100644 --- a/ssl/d1_msg.c +++ b/ssl/d1_msg.c @@ -15,18 +15,7 @@ int dtls1_write_app_data_bytes(SSL *s, int type, const void *buf_, size_t 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) && !ossl_statem_get_in_handshake(s)) || - (BIO_dgram_is_sctp(SSL_get_wbio(s)) && - ossl_statem_in_sctp_read_sock(s))) -#else - if (SSL_in_init(s) && !ossl_statem_get_in_handshake(s)) -#endif - { + if (SSL_in_init(s) && !ossl_statem_get_in_handshake(s)) { i = s->handshake_func(s); if (i < 0) return (i); -- cgit v1.2.3