From: Matt Caswell <matt@openssl.org>
Date: Thu, 24 Aug 2017 08:52:11 +0000 (+0100)
Subject: Ensure we exchange cookies in s_server even if SCTP is disabled
X-Git-Tag: OpenSSL_1_1_1-pre1~769
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=1b3011abb36ff743c05afce1c9f2450d83d09d59;hp=a5e65f7c5ea04f26a6c1745f9a34b63b6956c063

Ensure we exchange cookies in s_server even if SCTP is disabled

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4243)
---

diff --git a/apps/s_server.c b/apps/s_server.c
index 81ae6dba3e..c45256afc2 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);