aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2017-08-24 09:52:11 +0100
committerMatt Caswell <matt@openssl.org>2017-08-25 10:50:56 +0100
commit1b3011abb36ff743c05afce1c9f2450d83d09d59 (patch)
tree486d5b9b129faeb958a5c8ae2edf55cc1dfa2e48 /apps
parenta5e65f7c5ea04f26a6c1745f9a34b63b6956c063 (diff)
downloadopenssl-1b3011abb36ff743c05afce1c9f2450d83d09d59.tar.gz
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)
Diffstat (limited to 'apps')
-rw-r--r--apps/s_server.c5
1 files changed, 2 insertions, 3 deletions
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);