diff options
Diffstat (limited to '')
| -rw-r--r-- | src/usr.bin/openssl/s_server.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/usr.bin/openssl/s_server.c b/src/usr.bin/openssl/s_server.c index 066588f01b..2422642989 100644 --- a/src/usr.bin/openssl/s_server.c +++ b/src/usr.bin/openssl/s_server.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: s_server.c,v 1.12 2015/07/17 07:04:41 doug Exp $ */ | 1 | /* $OpenBSD: s_server.c,v 1.13 2015/07/17 16:09:46 doug Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -310,7 +310,6 @@ sv_usage(void) | |||
| 310 | BIO_printf(bio_err, " -cipher arg - play with 'openssl ciphers' to see what goes here\n"); | 310 | BIO_printf(bio_err, " -cipher arg - play with 'openssl ciphers' to see what goes here\n"); |
| 311 | BIO_printf(bio_err, " -serverpref - Use server's cipher preferences\n"); | 311 | BIO_printf(bio_err, " -serverpref - Use server's cipher preferences\n"); |
| 312 | BIO_printf(bio_err, " -quiet - Inhibit printing of session and certificate information\n"); | 312 | BIO_printf(bio_err, " -quiet - Inhibit printing of session and certificate information\n"); |
| 313 | BIO_printf(bio_err, " -ssl3 - Just talk SSLv3\n"); | ||
| 314 | BIO_printf(bio_err, " -tls1_2 - Just talk TLSv1.2\n"); | 313 | BIO_printf(bio_err, " -tls1_2 - Just talk TLSv1.2\n"); |
| 315 | BIO_printf(bio_err, " -tls1_1 - Just talk TLSv1.1\n"); | 314 | BIO_printf(bio_err, " -tls1_1 - Just talk TLSv1.1\n"); |
| 316 | BIO_printf(bio_err, " -tls1 - Just talk TLSv1\n"); | 315 | BIO_printf(bio_err, " -tls1 - Just talk TLSv1\n"); |
| @@ -806,12 +805,8 @@ s_server_main(int argc, char *argv[]) | |||
| 806 | off |= SSL_OP_NO_TLSv1_2; | 805 | off |= SSL_OP_NO_TLSv1_2; |
| 807 | } else if (strcmp(*argv, "-no_comp") == 0) { | 806 | } else if (strcmp(*argv, "-no_comp") == 0) { |
| 808 | off |= SSL_OP_NO_COMPRESSION; | 807 | off |= SSL_OP_NO_COMPRESSION; |
| 809 | } | 808 | } else if (strcmp(*argv, "-no_ticket") == 0) { |
| 810 | else if (strcmp(*argv, "-no_ticket") == 0) { | ||
| 811 | off |= SSL_OP_NO_TICKET; | 809 | off |= SSL_OP_NO_TICKET; |
| 812 | } | ||
| 813 | else if (strcmp(*argv, "-ssl3") == 0) { | ||
| 814 | meth = SSLv3_server_method(); | ||
| 815 | } else if (strcmp(*argv, "-tls1") == 0) { | 810 | } else if (strcmp(*argv, "-tls1") == 0) { |
| 816 | meth = TLSv1_server_method(); | 811 | meth = TLSv1_server_method(); |
| 817 | } else if (strcmp(*argv, "-tls1_1") == 0) { | 812 | } else if (strcmp(*argv, "-tls1_1") == 0) { |
