diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2017-04-27 11:10:50 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-05-17 18:07:42 +0200 |
| commit | fabb6eca2b6fd41dd8010d40eaac3f55cec1df2c (patch) | |
| tree | 4c63e9e601daafcc7c6b57825ccb839cfbf444cf /contrib/json | |
| parent | wg-quick: auto MTU discovery (diff) | |
| download | wireguard-tools-fabb6eca2b6fd41dd8010d40eaac3f55cec1df2c.tar.xz wireguard-tools-fabb6eca2b6fd41dd8010d40eaac3f55cec1df2c.zip | |
noise: redesign preshared key mode
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'contrib/json')
| -rwxr-xr-x | contrib/json/wg-json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/json/wg-json b/contrib/json/wg-json index 90544e2..1b9a570 100755 --- a/contrib/json/wg-json +++ b/contrib/json/wg-json @@ -9,20 +9,20 @@ while read -r -d $'\t' device; do if [[ $device != "$last_device" ]]; then [[ -z $last_device ]] && printf '\n' || printf '%s,\n' "$end" last_device="$device" - read -r private_key public_key preshared_key listen_port fwmark + read -r private_key public_key listen_port fwmark printf '\t"%s": {' "$device" delim=$'\n' [[ $private_key == "(none)" ]] || { printf '%s\t\t"privateKey": "%s"' "$delim" "$private_key"; delim=$',\n'; } [[ $public_key == "(none)" ]] || { printf '%s\t\t"publicKey": "%s"' "$delim" "$public_key"; delim=$',\n'; } - [[ $preshared_key == "(none)" ]] || { printf '%s\t\t"presharedKey": "%s"' "$delim" "$preshared_key"; delim=$',\n'; } [[ $listen_port == "0" ]] || { printf '%s\t\t"listenPort": %u' "$delim" $(( $listen_port )); delim=$',\n'; } [[ $fwmark == "off" ]] || { printf '%s\t\t"fwmark": %u' "$delim" $(( $fwmark )); delim=$',\n'; } printf '%s\t\t"peers": {' "$delim"; end=$'\n\t\t}\n\t}' delim=$'\n' else - read -r public_key endpoint allowed_ips latest_handshake transfer_rx transfer_tx persistent_keepalive + read -r public_key preshared_key endpoint allowed_ips latest_handshake transfer_rx transfer_tx persistent_keepalive printf '%s\t\t\t"%s": {' "$delim" "$public_key" delim=$'\n' + [[ $preshared_key == "(none)" ]] || { printf '%s\t\t\t\t"presharedKey": "%s"' "$delim" "$preshared_key"; delim=$',\n'; } [[ $endpoint == "(none)" ]] || { printf '%s\t\t\t\t"endpoint": "%s"' "$delim" "$endpoint"; delim=$',\n'; } [[ $latest_handshake == "0" ]] || { printf '%s\t\t\t\t"latestHandshake": %u' "$delim" $(( $latest_handshake )); delim=$',\n'; } [[ $transfer_rx == "0" ]] || { printf '%s\t\t\t\t"transferRx": %u' "$delim" $(( $transfer_rx )); delim=$',\n'; } |