From: Richard Levitte <levitte@openssl.org>
Date: Tue, 25 Apr 2017 13:35:09 +0000 (+0200)
Subject: Add guards around one of use of IPPROTO_SCTP where it was missing
X-Git-Tag: OpenSSL_1_1_1-pre1~1683
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a5eef31e257bc6267e0973edda18ee2f180ed081;p=oweals%2Fopenssl.git

Add guards around one of use of IPPROTO_SCTP where it was missing

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3304)
---

diff --git a/apps/s_server.c b/apps/s_server.c
index 7fb7772826..ebf772da07 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2199,10 +2199,12 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
             /* want to do MTU discovery */
             BIO_ctrl(sbio, BIO_CTRL_DGRAM_MTU_DISCOVER, 0, NULL);
 
+# ifndef OPENSSL_NO_SCTP
         if (prot != IPPROTO_SCTP) {
             /* 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);