From cb4bb63030d09afe7ee78fd49613b86709fdc006 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 4 Feb 2020 18:03:31 +0100
Subject: uapi: allow unsetting device private key with /dev/null

---
 device/noise-types.go | 9 +++++++++
 device/uapi.go        | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/device/noise-types.go b/device/noise-types.go
index 6b1f16f..a1976ff 100644
--- a/device/noise-types.go
+++ b/device/noise-types.go
@@ -52,6 +52,15 @@ func (key *NoisePrivateKey) FromHex(src string) (err error) {
 	return
 }
 
+func (key *NoisePrivateKey) FromMaybeZeroHex(src string) (err error) {
+	err = loadExactHex(key[:], src)
+	if key.IsZero() {
+		return
+	}
+	key.clamp()
+	return
+}
+
 func (key NoisePrivateKey) ToHex() string {
 	return hex.EncodeToString(key[:])
 }
diff --git a/device/uapi.go b/device/uapi.go
index 999eeb5..72611ab 100644
--- a/device/uapi.go
+++ b/device/uapi.go
@@ -138,7 +138,7 @@ func (device *Device) IpcSetOperation(socket *bufio.Reader) *IPCError {
 			switch key {
 			case "private_key":
 				var sk NoisePrivateKey
-				err := sk.FromHex(value)
+				err := sk.FromMaybeZeroHex(value)
 				if err != nil {
 					logError.Println("Failed to set private_key:", err)
 					return &IPCError{ipc.IpcErrorInvalid}
-- 
cgit v1.2.3