diff options
| author | Kurt Roeckx <kurt@roeckx.be> | 2015-12-12 11:12:22 +0100 |
|---|---|---|
| committer | Kurt Roeckx <kurt@roeckx.be> | 2015-12-12 12:07:14 +0100 |
| commit | a5ecdc6af8f36d034ede991c8524b70d9ee72be6 (patch) | |
| tree | 73fe272d21271f6a3022bc25b89b4394fad259d6 /apps | |
| parent | 8ca8fc480469e60d73997f5db5a6d07744fe031e (diff) | |
| download | openssl-new-a5ecdc6af8f36d034ede991c8524b70d9ee72be6.tar.gz | |
Use OPENSSL_NO_DTLS instead of OPENSSL_NO_DTLS1
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/openssl.c | 4 | ||||
| -rw-r--r-- | apps/s_client.c | 4 | ||||
| -rw-r--r-- | apps/s_server.c | 24 |
3 files changed, 13 insertions, 19 deletions
diff --git a/apps/openssl.c b/apps/openssl.c index 1fd3e73a48..592095e5f9 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -761,8 +761,8 @@ static void list_disabled(void) #ifdef OPENSSL_NO_DSA BIO_puts(bio_out, "DSA\n"); #endif -#if defined(OPENSSL_NO_DTLS1) || defined(OPENSSL_NO_DTLS) - BIO_puts(bio_out, "DTLS1\n"); +#if defined(OPENSSL_NO_DTLS) + BIO_puts(bio_out, "DTLS\n"); #endif #ifdef OPENSSL_NO_EC BIO_puts(bio_out, "EC\n"); diff --git a/apps/s_client.c b/apps/s_client.c index e3ab42b534..f93ae35f56 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -567,7 +567,7 @@ OPTIONS s_client_options[] = { #ifndef OPENSSL_NO_SSL3 {"ssl3", OPT_SSL3, '-', "Just use SSLv3"}, #endif -#ifndef OPENSSL_NO_DTLS1 +#ifndef OPENSSL_NO_DTLS {"dtls", OPT_DTLS, '-'}, {"dtls1", OPT_DTLS1, '-', "Just use DTLSv1"}, {"dtls1_2", OPT_DTLS1_2, '-'}, @@ -954,7 +954,7 @@ int s_client_main(int argc, char **argv) case OPT_TLS1: meth = TLSv1_client_method(); break; -#ifndef OPENSSL_NO_DTLS1 +#ifndef OPENSSL_NO_DTLS case OPT_DTLS: meth = DTLS_client_method(); socket_type = SOCK_DGRAM; diff --git a/apps/s_server.c b/apps/s_server.c index 4c3ca792e2..ba88bd702a 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -259,7 +259,7 @@ static const char *session_id_prefix = NULL; static int enable_timeouts = 0; static long socket_mtu; -#ifndef OPENSSL_NO_DTLS1 +#ifndef OPENSSL_NO_DTLS static int cert_chain = 0; #endif static int dtlslisten = 0; @@ -936,7 +936,7 @@ OPTIONS s_server_options[] = { #ifndef OPENSSL_NO_SSL3 {"ssl3", OPT_SSL3, '-', "Just talk SSLv3"}, #endif -#ifndef OPENSSL_NO_DTLS1 +#ifndef OPENSSL_NO_DTLS {"dtls", OPT_DTLS, '-'}, {"dtls1", OPT_DTLS1, '-', "Just talk DTLSv1"}, {"dtls1_2", OPT_DTLS1_2, '-', "Just talk DTLSv1.2"}, @@ -1044,13 +1044,14 @@ int s_server_main(int argc, char *argv[]) case OPT_PSK_HINT: case OPT_PSK: #endif -#ifdef OPENSSL_NO_DTLS1 +#ifdef OPENSSL_NO_DTLS case OPT_DTLS: case OPT_DTLS1: case OPT_DTLS1_2: case OPT_TIMEOUT: case OPT_MTU: case OPT_CHAIN: + case OPT_LISTEN: #endif case OPT_EOF: case OPT_ERR: @@ -1355,7 +1356,7 @@ int s_server_main(int argc, char *argv[]) case OPT_TLS1: meth = TLSv1_server_method(); break; -#ifndef OPENSSL_NO_DTLS1 +#ifndef OPENSSL_NO_DTLS case OPT_DTLS: meth = DTLS_server_method(); socket_type = SOCK_DGRAM; @@ -1380,15 +1381,6 @@ int s_server_main(int argc, char *argv[]) case OPT_LISTEN: dtlslisten = 1; break; -#else - case OPT_DTLS: - case OPT_DTLS1: - case OPT_DTLS1_2: - case OPT_TIMEOUT: - case OPT_MTU: - case OPT_CHAIN: - case OPT_LISTEN: - break; #endif case OPT_ID_PREFIX: session_id_prefix = opt_arg(); @@ -1444,7 +1436,7 @@ int s_server_main(int argc, char *argv[]) argc = opt_num_rest(); argv = opt_rest(); -#ifndef OPENSSL_NO_DTLS1 +#ifndef OPENSSL_NO_DTLS if (www && socket_type == SOCK_DGRAM) { BIO_printf(bio_err, "Can't use -HTTP, -www or -WWW with DTLS\n"); goto end; @@ -2419,9 +2411,11 @@ static int init_ssl_connection(SSL *con) unsigned next_proto_neg_len; #endif unsigned char *exportedkeymat; +#ifndef OPENSSL_NO_DTLS struct sockaddr_storage client; +#endif -#ifndef OPENSSL_NO_DTLS1 +#ifndef OPENSSL_NO_DTLS if(dtlslisten) { i = DTLSv1_listen(con, &client); if (i > 0) { |