generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix no-dgram.

Browse Source 
Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Ben Laurie 2015-12-16 13:25:07 +00:00
parent 7644a9aef8
commit a7a14a23a9
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Configure
View File

@ -1197,6 +1197,10 @@ if (defined($disabled{"md5"}) || defined($disabled{"sha"})
$disabled{"tls1"} = "forced"; $disabled{"tls1"} = "forced";
} }
if (defined($disabled{"dgram"}))
{
$disabled{"dtls"} = "forced";
}
if (defined($disabled{"ec"}) || defined($disabled{"dsa"}) if (defined($disabled{"ec"}) || defined($disabled{"dsa"})
|| defined($disabled{"dh"}) || defined($disabled{"stdio"})) || defined($disabled{"dh"}) || defined($disabled{"stdio"}))

5
apps/s_server.c
View File

@ -257,9 +257,9 @@ static char *engine_id = NULL;
#endif #endif
static const char *session_id_prefix = NULL; static const char *session_id_prefix = NULL;
#ifndef OPENSSL_NO_DTLS
static int enable_timeouts = 0; static int enable_timeouts = 0;
static long socket_mtu; static long socket_mtu;
#ifndef OPENSSL_NO_DTLS
static int cert_chain = 0; static int cert_chain = 0;
#endif #endif
static int dtlslisten = 0; static int dtlslisten = 0;
@ -2028,7 +2028,7 @@ static int sv_body(char *hostname, int s, int stype, unsigned char *context)
ret = -1; ret = -1;
goto err; goto err;
} }
#ifndef OPENSSL_NO_DTLS
if (stype == SOCK_DGRAM) { if (stype == SOCK_DGRAM) {
sbio = BIO_new_dgram(s, BIO_NOCLOSE); 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 */ /* turn on cookie exchange */
SSL_set_options(con, SSL_OP_COOKIE_EXCHANGE); SSL_set_options(con, SSL_OP_COOKIE_EXCHANGE);
} else } else
#endif
sbio = BIO_new_socket(s, BIO_NOCLOSE); sbio = BIO_new_socket(s, BIO_NOCLOSE);
if (s_nbio_test) { if (s_nbio_test) {