wg: no hyphen in preshared, to keep uniformity

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/src/show.c b/src/show.c
index c9ba473281e93b1de23b33d061ae64a7eddbda3f..813488341c6af184e7bd4361bfda5768577d3a37 100644 (file)
--- a/src/show.c
+++ b/src/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/wg.8 b/src/wg.8
index b4f959992591088aaecff05a1a62b5d2e914dc4c..2aa800ec8329baf9b6feb70817b51a226822d3da 100644 (file)
--- a/src/wg.8
+++ b/src/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/wg.c b/src/wg.c
index 0ec64ebf3921d2b88e2ccb78562102d086389a40..e1d9a6053d09d494150ab907280be07a24e19ff9 100644 (file)
--- a/src/wg.c
+++ b/src/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" }
 };