diff options
| author |   beck <beck@openbsd.org> | 2016-11-06 13:33:30 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2016-11-06 13:33:30 +0000 |
| commit | a05fb55858952f3bc8086c929f8ff7148adc3ee4 (patch) | |
| tree | f63460d53f05c0ca5197bbca77aaa152b04b1a85 | |
| parent | Bump ftp(1)'s cipher default from "all" to "legacy" - this really should (diff) | |
| download | wireguard-openbsd-a05fb55858952f3bc8086c929f8ff7148adc3ee4.tar.xz wireguard-openbsd-a05fb55858952f3bc8086c929f8ff7148adc3ee4.zip | |
rename tlslegacy to tlsall, and better describe what it does.
ok jsing@
| -rw-r--r-- | usr.bin/nc/nc.1 | 8 | ||||
| -rw-r--r-- | usr.bin/nc/netcat.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/nc/nc.1 b/usr.bin/nc/nc.1 index 15ed5ee1aa1..fcb7c1d6fa0 100644 --- a/usr.bin/nc/nc.1 +++ b/usr.bin/nc/nc.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: nc.1,v 1.78 2016/11/05 16:03:09 jmc Exp $ +.\" $OpenBSD: nc.1,v 1.79 2016/11/06 13:33:30 beck Exp $ .\" .\" Copyright (c) 1996 David Sacerdote .\" All rights reserved. @@ -25,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: November 5 2016 $ +.Dd $Mdocdate: November 6 2016 $ .Dt NC 1 .Os .Sh NAME @@ -231,8 +231,8 @@ Change IPv4 TOS value or TLS options. For TLS options .Ar keyword may be one of -.Ar tlslegacy , -which allows legacy TLS protocols; +.Ar tlsall, +which allows the use of all supported TLS protocols and ciphers, .Ar noverify , which disables certificate verification; .Ar noname , diff --git a/usr.bin/nc/netcat.c b/usr.bin/nc/netcat.c index 75733146158..783aea25ed5 100644 --- a/usr.bin/nc/netcat.c +++ b/usr.bin/nc/netcat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netcat.c,v 1.169 2016/11/05 16:03:09 jmc Exp $ */ +/* $OpenBSD: netcat.c,v 1.170 2016/11/06 13:33:30 beck Exp $ */ /* * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> * Copyright (c) 2015 Bob Beck. All rights reserved. @@ -67,7 +67,7 @@ #define BUFSIZE 16384 #define DEFAULT_CA_FILE "/etc/ssl/cert.pem" -#define TLS_LEGACY (1 << 1) +#define TLS_ALL (1 << 1) #define TLS_NOVERIFY (1 << 2) #define TLS_NONAME (1 << 3) #define TLS_CCERT (1 << 4) @@ -463,7 +463,7 @@ main(int argc, char *argv[]) errx(1, "%s", tls_config_error(tls_cfg)); if (oflag && tls_config_set_ocsp_staple_file(tls_cfg, oflag) == -1) errx(1, "%s", tls_config_error(tls_cfg)); - if (TLSopt & TLS_LEGACY) { + if (TLSopt & TLS_ALL) { tls_config_set_protocols(tls_cfg, TLS_PROTOCOLS_ALL); tls_config_set_ciphers(tls_cfg, "all"); } @@ -1509,7 +1509,7 @@ map_tls(char *s, int *val) const char *keyword; int val; } *t, tlskeywords[] = { - { "tlslegacy", TLS_LEGACY }, + { "tlsall", TLS_ALL }, { "noverify", TLS_NOVERIFY }, { "noname", TLS_NONAME }, { "clientcert", TLS_CCERT}, |