[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  1b3011abb36ff743c05afce1c9f2450d83d09d59 (commit)
      from  a5e65f7c5ea04f26a6c1745f9a34b63b6956c063 (commit)


- Log -----------------------------------------------------------------
commit 1b3011abb36ff743c05afce1c9f2450d83d09d59
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Aug 24 09:52:11 2017 +0100

    Ensure we exchange cookies in s_server even if SCTP is disabled
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4243)

-----------------------------------------------------------------------

Summary of changes:
 apps/s_server.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/s_server.c b/apps/s_server.c
index 81ae6db..c45256a 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2262,11 +2262,10 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
             BIO_ctrl(sbio, BIO_CTRL_DGRAM_MTU_DISCOVER, 0, NULL);
 
 # ifndef OPENSSL_NO_SCTP
-        if (prot != IPPROTO_SCTP) {
+        if (prot != IPPROTO_SCTP)
+# endif
             /* Turn on cookie exchange. Not necessary for SCTP */
             SSL_set_options(con, SSL_OP_COOKIE_EXCHANGE);
-        }
-# endif
     } else
 #endif
         sbio = BIO_new_socket(s, BIO_NOCLOSE);