device: immediately rekey all peers after changing device private key

Reported-by: Derrick Pallas <derrick@pallas.us>

1 files changed, 6 insertions, 0 deletions

diff --git a/device/device.go b/device/device.go
index a583fa9..ab5e4b0 100644
--- a/device/device.go
+++ b/device/device.go
@@ -207,6 +207,10 @@ func (device *Device) SetPrivateKey(sk NoisePrivateKey) error {
 	device.staticIdentity.Lock()
 	defer device.staticIdentity.Unlock()
 
+	if sk.Equals(device.staticIdentity.privateKey) {
+		return nil
+	}
+
 	device.peers.Lock()
 	defer device.peers.Unlock()
 
@@ -246,6 +250,8 @@ func (device *Device) SetPrivateKey(sk NoisePrivateKey) error {
 
 		if isZero(handshake.precomputedStaticStatic[:]) {
 			unsafeRemovePeer(device, peer, key)
+		} else {
+			peer.ExpireCurrentKeypairs()
 		}
 	}