summaryrefslogtreecommitdiff
path: root/src/usr.bin/nc/netcat.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/usr.bin/nc/netcat.c')
-rw-r--r--src/usr.bin/nc/netcat.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/usr.bin/nc/netcat.c b/src/usr.bin/nc/netcat.c
index 7573314615..783aea25ed 100644
--- a/src/usr.bin/nc/netcat.c
+++ b/src/usr.bin/nc/netcat.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: netcat.c,v 1.169 2016/11/05 16:03:09 jmc Exp $ */ 1/* $OpenBSD: netcat.c,v 1.170 2016/11/06 13:33:30 beck Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> 3 * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
4 * Copyright (c) 2015 Bob Beck. All rights reserved. 4 * Copyright (c) 2015 Bob Beck. All rights reserved.
@@ -67,7 +67,7 @@
67#define BUFSIZE 16384 67#define BUFSIZE 16384
68#define DEFAULT_CA_FILE "/etc/ssl/cert.pem" 68#define DEFAULT_CA_FILE "/etc/ssl/cert.pem"
69 69
70#define TLS_LEGACY (1 << 1) 70#define TLS_ALL (1 << 1)
71#define TLS_NOVERIFY (1 << 2) 71#define TLS_NOVERIFY (1 << 2)
72#define TLS_NONAME (1 << 3) 72#define TLS_NONAME (1 << 3)
73#define TLS_CCERT (1 << 4) 73#define TLS_CCERT (1 << 4)
@@ -463,7 +463,7 @@ main(int argc, char *argv[])
463 errx(1, "%s", tls_config_error(tls_cfg)); 463 errx(1, "%s", tls_config_error(tls_cfg));
464 if (oflag && tls_config_set_ocsp_staple_file(tls_cfg, oflag) == -1) 464 if (oflag && tls_config_set_ocsp_staple_file(tls_cfg, oflag) == -1)
465 errx(1, "%s", tls_config_error(tls_cfg)); 465 errx(1, "%s", tls_config_error(tls_cfg));
466 if (TLSopt & TLS_LEGACY) { 466 if (TLSopt & TLS_ALL) {
467 tls_config_set_protocols(tls_cfg, TLS_PROTOCOLS_ALL); 467 tls_config_set_protocols(tls_cfg, TLS_PROTOCOLS_ALL);
468 tls_config_set_ciphers(tls_cfg, "all"); 468 tls_config_set_ciphers(tls_cfg, "all");
469 } 469 }
@@ -1509,7 +1509,7 @@ map_tls(char *s, int *val)
1509 const char *keyword; 1509 const char *keyword;
1510 int val; 1510 int val;
1511 } *t, tlskeywords[] = { 1511 } *t, tlskeywords[] = {
1512 { "tlslegacy", TLS_LEGACY }, 1512 { "tlsall", TLS_ALL },
1513 { "noverify", TLS_NOVERIFY }, 1513 { "noverify", TLS_NOVERIFY },
1514 { "noname", TLS_NONAME }, 1514 { "noname", TLS_NONAME },
1515 { "clientcert", TLS_CCERT}, 1515 { "clientcert", TLS_CCERT},