From 6ed56ff2dfd57ba47cdf604eb3c455acb553c0df Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 4 Feb 2020 18:08:51 +0100 Subject: device: fix private key removal logic --- device/device.go | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'device') diff --git a/device/device.go b/device/device.go index 569c5a8..0b909a7 100644 --- a/device/device.go +++ b/device/device.go @@ -236,23 +236,14 @@ func (device *Device) SetPrivateKey(sk NoisePrivateKey) error { // do static-static DH pre-computations - rmKey := device.staticIdentity.privateKey.IsZero() - expiredPeers := make([]*Peer, 0, len(device.peers.keyMap)) - for key, peer := range device.peers.keyMap { + for _, peer := range device.peers.keyMap { handshake := &peer.handshake - - if rmKey { - handshake.precomputedStaticStatic = [NoisePublicKeySize]byte{} - } else { - handshake.precomputedStaticStatic = device.staticIdentity.privateKey.sharedSecret(handshake.remoteStatic) - } - + handshake.precomputedStaticStatic = device.staticIdentity.privateKey.sharedSecret(handshake.remoteStatic) if isZero(handshake.precomputedStaticStatic[:]) { - unsafeRemovePeer(device, peer, key) - } else { - expiredPeers = append(expiredPeers, peer) + panic("an invalid peer public key made it into the configuration") } + expiredPeers = append(expiredPeers, peer) } for _, peer := range lockedPeers { -- cgit v1.2.3-59-g8ed1b