diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-01-27 15:14:12 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-01-27 15:14:12 -0500 |
| commit | daa48704cc04c61cf8f3e74759a7a3139b6aff01 (patch) | |
| tree | 049cb13eb8b74d8e2a0a1e2a89612db39f226152 /apps | |
| parent | 474e469bbd056aebcf7e7d3207ef820f2faed4ce (diff) | |
OPENSSL_NO_XXX cleanup: NO_TLS, NO_TLS1
TLS and TLS1 are no longer optional.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/ciphers.c | 2 | ||||
| -rw-r--r-- | apps/s_client.c | 2 | ||||
| -rw-r--r-- | apps/s_server.c | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/apps/ciphers.c b/apps/ciphers.c index f36db2096b..803b021f5c 100644 --- a/apps/ciphers.c +++ b/apps/ciphers.c @@ -129,10 +129,8 @@ int MAIN(int argc, char **argv) else if (strcmp(*argv, "-ssl3") == 0) meth = SSLv3_client_method(); #endif -#ifndef OPENSSL_NO_TLS1 else if (strcmp(*argv, "-tls1") == 0) meth = TLSv1_client_method(); -#endif else if ((strncmp(*argv, "-h", 2) == 0) || (strcmp(*argv, "-?") == 0)) { badops = 1; break; diff --git a/apps/s_client.c b/apps/s_client.c index 0c4e6bdbd9..512c2583aa 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -931,14 +931,12 @@ int MAIN(int argc, char **argv) else if (strcmp(*argv, "-ssl3") == 0) meth = SSLv3_client_method(); #endif -#ifndef OPENSSL_NO_TLS1 else if (strcmp(*argv, "-tls1_2") == 0) meth = TLSv1_2_client_method(); else if (strcmp(*argv, "-tls1_1") == 0) meth = TLSv1_1_client_method(); else if (strcmp(*argv, "-tls1") == 0) meth = TLSv1_client_method(); -#endif #ifndef OPENSSL_NO_DTLS1 else if (strcmp(*argv, "-dtls") == 0) { meth = DTLS_client_method(); diff --git a/apps/s_server.c b/apps/s_server.c index e07df85291..48ac6b3989 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -1404,7 +1404,6 @@ int MAIN(int argc, char *argv[]) meth = SSLv3_server_method(); } #endif -#ifndef OPENSSL_NO_TLS1 else if (strcmp(*argv, "-tls1") == 0) { meth = TLSv1_server_method(); } else if (strcmp(*argv, "-tls1_1") == 0) { @@ -1412,7 +1411,6 @@ int MAIN(int argc, char *argv[]) } else if (strcmp(*argv, "-tls1_2") == 0) { meth = TLSv1_2_server_method(); } -#endif #ifndef OPENSSL_NO_DTLS1 else if (strcmp(*argv, "-dtls") == 0) { meth = DTLS_server_method(); |