aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/tools
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2017-04-20 20:21:50 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2017-04-20 22:53:00 +0200
commitc4a6adf85390e9232fc9589b95510f958c0d7d8c (patch)
treeabcacf18a75b2c3ac27ebc85c891cdc8b38dadd2 /src/tools
parenttools: argc is always 1 (diff)
downloadwireguard-monolithic-historical-c4a6adf85390e9232fc9589b95510f958c0d7d8c.tar.xz
wireguard-monolithic-historical-c4a6adf85390e9232fc9589b95510f958c0d7d8c.zip
tools: no hyphen in preshared, to keep uniformity
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/show.c2
-rw-r--r--src/tools/wg.82
-rw-r--r--src/tools/wg.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/show.c b/src/tools/show.c
index c9ba473..8134883 100644
--- a/src/tools/show.c
+++ b/src/tools/show.c
@@ -217,7 +217,7 @@ static void pretty_print(struct wgdevice *device)
if (memcmp(device->private_key, zero, WG_KEY_LEN))
terminal_printf(" " TERMINAL_BOLD "private key" TERMINAL_RESET ": %s\n", masked_key(device->private_key));
if (memcmp(device->preshared_key, zero, WG_KEY_LEN))
- terminal_printf(" " TERMINAL_BOLD "pre-shared key" TERMINAL_RESET ": %s\n", masked_key(device->preshared_key));
+ terminal_printf(" " TERMINAL_BOLD "preshared key" TERMINAL_RESET ": %s\n", masked_key(device->preshared_key));
if (device->port)
terminal_printf(" " TERMINAL_BOLD "listening port" TERMINAL_RESET ": %u\n", device->port);
if (device->fwmark)
diff --git a/src/tools/wg.8 b/src/tools/wg.8
index b4f9599..2aa800e 100644
--- a/src/tools/wg.8
+++ b/src/tools/wg.8
@@ -210,7 +210,7 @@ ignored.
If set to \fIalways\fP, always print ANSI colorized output. If set to \fInever\fP, never print ANSI colorized output. If set to \fIauto\fP, something invalid, or unset, then print ANSI colorized output only when writing to a TTY.
.TP
.I WG_HIDE_KEYS
-If set to \fInever\fP, then the pretty-printing \fBshow\fP sub-command will show private and pre-shared keys in the output. If set to \fIalways\fP, something invalid, or unset, then private and pre-shared keys will be printed as "(hidden)".
+If set to \fInever\fP, then the pretty-printing \fBshow\fP sub-command will show private and preshared keys in the output. If set to \fIalways\fP, something invalid, or unset, then private and preshared keys will be printed as "(hidden)".
.SH SEE ALSO
.BR ip (8),
diff --git a/src/tools/wg.c b/src/tools/wg.c
index 0ec64eb..e1d9a60 100644
--- a/src/tools/wg.c
+++ b/src/tools/wg.c
@@ -19,7 +19,7 @@ static const struct {
{ "setconf", setconf_main, "Applies a configuration file to a WireGuard interface" },
{ "addconf", setconf_main, "Appends a configuration file to a WireGuard interface" },
{ "genkey", genkey_main, "Generates a new private key and writes it to stdout" },
- { "genpsk", genkey_main, "Generates a new pre-shared key and writes it to stdout" },
+ { "genpsk", genkey_main, "Generates a new preshared key and writes it to stdout" },
{ "pubkey", pubkey_main, "Reads a private key from stdin and writes a public key to stdout" }
};