summaryrefslogtreecommitdiff
path: root/src/usr.bin
diff options
context:
space:
mode:
authortedu <>2018-11-29 14:25:07 +0000
committertedu <>2018-11-29 14:25:07 +0000
commit1bda933838005af4f10d217cdb7a36a4302b1204 (patch)
tree676bc83a43d85366fc7cbb544c96a4ba95d736cf /src/usr.bin
parent8e376166426749fe5f95ab4ad9e6adfc863634d1 (diff)
downloadopenbsd-1bda933838005af4f10d217cdb7a36a4302b1204.tar.gz
openbsd-1bda933838005af4f10d217cdb7a36a4302b1204.tar.bz2
openbsd-1bda933838005af4f10d217cdb7a36a4302b1204.zip
update for libtls default cert changes.
bonus: this exposed a few missing const qualifiers.
Diffstat (limited to 'src/usr.bin')
-rw-r--r--src/usr.bin/nc/netcat.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/usr.bin/nc/netcat.c b/src/usr.bin/nc/netcat.c
index f5045013aa..e0966f1952 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.198 2018/11/09 04:05:14 bluhm Exp $ */ 1/* $OpenBSD: netcat.c,v 1.199 2018/11/29 14:25:06 tedu 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.
@@ -97,10 +97,10 @@ int Tflag = -1; /* IP Type of Service */
97int rtableid = -1; 97int rtableid = -1;
98 98
99int usetls; /* use TLS */ 99int usetls; /* use TLS */
100char *Cflag; /* Public cert file */ 100const char *Cflag; /* Public cert file */
101char *Kflag; /* Private key file */ 101const char *Kflag; /* Private key file */
102char *oflag; /* OCSP stapling file */ 102const char *oflag; /* OCSP stapling file */
103char *Rflag = TLS_CA_CERT_FILE; /* Root CA file */ 103const char *Rflag; /* Root CA file */
104int tls_cachanged; /* Using non-default CA file */ 104int tls_cachanged; /* Using non-default CA file */
105int TLSopt; /* TLS options */ 105int TLSopt; /* TLS options */
106char *tls_expectname; /* required name in peer cert */ 106char *tls_expectname; /* required name in peer cert */
@@ -167,6 +167,7 @@ main(int argc, char *argv[])
167 host = NULL; 167 host = NULL;
168 uport = NULL; 168 uport = NULL;
169 sv = NULL; 169 sv = NULL;
170 Rflag = tls_default_ca_cert_file();
170 171
171 signal(SIGPIPE, SIG_IGN); 172 signal(SIGPIPE, SIG_IGN);
172 173