diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr.bin/nc/nc.1 | 8 | ||||
| -rw-r--r-- | src/usr.bin/nc/netcat.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/usr.bin/nc/nc.1 b/src/usr.bin/nc/nc.1 index 15ed5ee1aa..fcb7c1d6fa 100644 --- a/src/usr.bin/nc/nc.1 +++ b/src/usr.bin/nc/nc.1 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | .\" $OpenBSD: nc.1,v 1.78 2016/11/05 16:03:09 jmc Exp $ | 1 | .\" $OpenBSD: nc.1,v 1.79 2016/11/06 13:33:30 beck Exp $ |
| 2 | .\" | 2 | .\" |
| 3 | .\" Copyright (c) 1996 David Sacerdote | 3 | .\" Copyright (c) 1996 David Sacerdote |
| 4 | .\" All rights reserved. | 4 | .\" All rights reserved. |
| @@ -25,7 +25,7 @@ | |||
| 25 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 25 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 26 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 27 | .\" | 27 | .\" |
| 28 | .Dd $Mdocdate: November 5 2016 $ | 28 | .Dd $Mdocdate: November 6 2016 $ |
| 29 | .Dt NC 1 | 29 | .Dt NC 1 |
| 30 | .Os | 30 | .Os |
| 31 | .Sh NAME | 31 | .Sh NAME |
| @@ -231,8 +231,8 @@ Change IPv4 TOS value or TLS options. | |||
| 231 | For TLS options | 231 | For TLS options |
| 232 | .Ar keyword | 232 | .Ar keyword |
| 233 | may be one of | 233 | may be one of |
| 234 | .Ar tlslegacy , | 234 | .Ar tlsall, |
| 235 | which allows legacy TLS protocols; | 235 | which allows the use of all supported TLS protocols and ciphers, |
| 236 | .Ar noverify , | 236 | .Ar noverify , |
| 237 | which disables certificate verification; | 237 | which disables certificate verification; |
| 238 | .Ar noname , | 238 | .Ar noname , |
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}, |
