[openssl-commits] [openssl] master update
Ben Laurie
ben at openssl.org
Wed Dec 16 21:32:26 UTC 2015
The branch master has been updated
via a7a14a23a92a6accec3a39e979d377e1ddda2f75 (commit)
from 7644a9aef8932ed4d1c3f25ed776c997702982be (commit)
- Log -----------------------------------------------------------------
commit a7a14a23a92a6accec3a39e979d377e1ddda2f75
Author: Ben Laurie <ben at links.org>
Date: Wed Dec 16 13:25:07 2015 +0000
Fix no-dgram.
Reviewed-by: Tim Hudson <tjh at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
Configure | 4 ++++
apps/s_server.c | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Configure b/Configure
index cfb11ac..592bd77 100755
--- a/Configure
+++ b/Configure
@@ -1197,6 +1197,10 @@ if (defined($disabled{"md5"}) || defined($disabled{"sha"})
$disabled{"tls1"} = "forced";
}
+if (defined($disabled{"dgram"}))
+ {
+ $disabled{"dtls"} = "forced";
+ }
if (defined($disabled{"ec"}) || defined($disabled{"dsa"})
|| defined($disabled{"dh"}) || defined($disabled{"stdio"}))
diff --git a/apps/s_server.c b/apps/s_server.c
index 84a640e..de96445 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -257,9 +257,9 @@ static char *engine_id = NULL;
#endif
static const char *session_id_prefix = NULL;
+#ifndef OPENSSL_NO_DTLS
static int enable_timeouts = 0;
static long socket_mtu;
-#ifndef OPENSSL_NO_DTLS
static int cert_chain = 0;
#endif
static int dtlslisten = 0;
@@ -2028,7 +2028,7 @@ static int sv_body(char *hostname, int s, int stype, unsigned char *context)
ret = -1;
goto err;
}
-
+#ifndef OPENSSL_NO_DTLS
if (stype == SOCK_DGRAM) {
sbio = BIO_new_dgram(s, BIO_NOCLOSE);
@@ -2065,6 +2065,7 @@ static int sv_body(char *hostname, int s, int stype, unsigned char *context)
/* turn on cookie exchange */
SSL_set_options(con, SSL_OP_COOKIE_EXCHANGE);
} else
+#endif
sbio = BIO_new_socket(s, BIO_NOCLOSE);
if (s_nbio_test) {
More information about the openssl-commits
mailing list