diff options
author | jsing <> | 2018-11-06 20:41:11 +0000 |
---|---|---|
committer | jsing <> | 2018-11-06 20:41:11 +0000 |
commit | fd25347db80b1fd9a198283b5d3e3a953fd2e011 (patch) | |
tree | a4f6975b1b7df45a59fa1b136ebb340980316959 /src/usr.bin/nc | |
parent | db941a1cfe2e8232c86adf98026bc75fdcce8760 (diff) | |
download | openbsd-fd25347db80b1fd9a198283b5d3e3a953fd2e011.tar.gz openbsd-fd25347db80b1fd9a198283b5d3e3a953fd2e011.tar.bz2 openbsd-fd25347db80b1fd9a198283b5d3e3a953fd2e011.zip |
Use TLS_CA_CERT_FILE instead of a separate define.
ok beck@ bluhm@ tb@
Diffstat (limited to 'src/usr.bin/nc')
-rw-r--r-- | src/usr.bin/nc/netcat.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/usr.bin/nc/netcat.c b/src/usr.bin/nc/netcat.c index 9ce2b6bb7a..9c19049d59 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.196 2018/10/26 07:19:26 dlg Exp $ */ | 1 | /* $OpenBSD: netcat.c,v 1.197 2018/11/06 20:39:19 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. |
@@ -66,7 +66,6 @@ | |||
66 | #define POLL_NETIN 2 | 66 | #define POLL_NETIN 2 |
67 | #define POLL_STDOUT 3 | 67 | #define POLL_STDOUT 3 |
68 | #define BUFSIZE 16384 | 68 | #define BUFSIZE 16384 |
69 | #define DEFAULT_CA_FILE "/etc/ssl/cert.pem" | ||
70 | 69 | ||
71 | #define TLS_NOVERIFY (1 << 1) | 70 | #define TLS_NOVERIFY (1 << 1) |
72 | #define TLS_NONAME (1 << 2) | 71 | #define TLS_NONAME (1 << 2) |
@@ -101,7 +100,7 @@ int usetls; /* use TLS */ | |||
101 | char *Cflag; /* Public cert file */ | 100 | char *Cflag; /* Public cert file */ |
102 | char *Kflag; /* Private key file */ | 101 | char *Kflag; /* Private key file */ |
103 | char *oflag; /* OCSP stapling file */ | 102 | char *oflag; /* OCSP stapling file */ |
104 | char *Rflag = DEFAULT_CA_FILE; /* Root CA file */ | 103 | char *Rflag = TLS_CA_CERT_FILE; /* Root CA file */ |
105 | int tls_cachanged; /* Using non-default CA file */ | 104 | int tls_cachanged; /* Using non-default CA file */ |
106 | int TLSopt; /* TLS options */ | 105 | int TLSopt; /* TLS options */ |
107 | char *tls_expectname; /* required name in peer cert */ | 106 | char *tls_expectname; /* required name in peer cert */ |