diff options
| author | Matt Caswell <matt@openssl.org> | 2017-04-20 15:13:28 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-04-25 11:13:39 +0100 |
| commit | bd79bcb42bab120575fc398692b7b61b1c5e6ed2 (patch) | |
| tree | c7a3622d3da971372d037319ea956193a837ab6e /ssl/d1_msg.c | |
| parent | c4666bfa13480c1e700a0d487300da2a56e889af (diff) | |
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 <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3286)
Diffstat (limited to 'ssl/d1_msg.c')
| -rw-r--r-- | ssl/d1_msg.c | 13 |
1 files changed, 1 insertions, 12 deletions
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); |