summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2016-07-13 16:35:47 +0000
committerjsing <>2016-07-13 16:35:47 +0000
commit7d99259efcdd121323a579a2a013260472aed9a7 (patch)
treec5027c0a0a5e933774b15785881308736c5cbcdf
parent539943b6faad83a69d90f2bd0763dbcaee823604 (diff)
downloadopenbsd-7d99259efcdd121323a579a2a013260472aed9a7.tar.gz
openbsd-7d99259efcdd121323a579a2a013260472aed9a7.tar.bz2
openbsd-7d99259efcdd121323a579a2a013260472aed9a7.zip
Adjust existing tls_config_set_cipher() callers for TLS cipher group
changes - map the previous configuration to the equivalent in the new groups. This will be revisited post release. Discussed with beck@
-rw-r--r--src/usr.bin/nc/netcat.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/usr.bin/nc/netcat.c b/src/usr.bin/nc/netcat.c
index e3f6074ab4..72c56a60d9 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.159 2016/07/07 14:09:44 jsing Exp $ */ 1/* $OpenBSD: netcat.c,v 1.160 2016/07/13 16:35:47 jsing 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.
@@ -469,7 +469,7 @@ main(int argc, char *argv[])
469 errx(1, "unable to set TLS key file %s", Kflag); 469 errx(1, "unable to set TLS key file %s", Kflag);
470 if (TLSopt & TLS_LEGACY) { 470 if (TLSopt & TLS_LEGACY) {
471 tls_config_set_protocols(tls_cfg, TLS_PROTOCOLS_ALL); 471 tls_config_set_protocols(tls_cfg, TLS_PROTOCOLS_ALL);
472 tls_config_set_ciphers(tls_cfg, "legacy"); 472 tls_config_set_ciphers(tls_cfg, "all");
473 } 473 }
474 if (!lflag && (TLSopt & TLS_CCERT)) 474 if (!lflag && (TLSopt & TLS_CCERT))
475 errx(1, "clientcert is only valid with -l"); 475 errx(1, "clientcert is only valid with -l");