diff options
| author | Renato Botelho <renato@netgate.com> | 2015-12-10 17:01:14 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-12-10 17:01:14 -0200 |
| commit | a7ed3b08bcfc9de3d1e75679fe9292e5b09aea82 (patch) | |
| tree | 71acee51f11c433be4c4a51635ce1ea4302ca4b6 /crypto/openssl/ssl/d1_both.c | |
| parent | 54cf5d1b6607c1e6f2cbf32784c33720517bce49 (diff) | |
| parent | 3bc7f4d78d27696df85e118c07aa5a2630188922 (diff) | |
| download | FreeBSD-src-a7ed3b08bcfc9de3d1e75679fe9292e5b09aea82.zip FreeBSD-src-a7ed3b08bcfc9de3d1e75679fe9292e5b09aea82.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'crypto/openssl/ssl/d1_both.c')
| -rw-r--r-- | crypto/openssl/ssl/d1_both.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crypto/openssl/ssl/d1_both.c b/crypto/openssl/ssl/d1_both.c index 8dd8ea3..d453c07 100644 --- a/crypto/openssl/ssl/d1_both.c +++ b/crypto/openssl/ssl/d1_both.c @@ -1490,9 +1490,12 @@ int dtls1_shutdown(SSL *s) { int ret; #ifndef OPENSSL_NO_SCTP - if (BIO_dgram_is_sctp(SSL_get_wbio(s)) && + BIO *wbio; + + wbio = SSL_get_wbio(s); + if (wbio != NULL && BIO_dgram_is_sctp(wbio) && !(s->shutdown & SSL_SENT_SHUTDOWN)) { - ret = BIO_dgram_sctp_wait_for_dry(SSL_get_wbio(s)); + ret = BIO_dgram_sctp_wait_for_dry(wbio); if (ret < 0) return -1; |
