diff options
| author |   Mathias Hall-Andersen <mathias@hall-andersen.dk> | 2018-02-02 17:24:29 +0100 |
|---|---|---|
| committer | Mathias Hall-Andersen <mathias@hall-andersen.dk> | 2018-02-02 17:24:29 +0100 |
| commit | 4f97b52ea60ce4f2448d8617853aa44759727197 (patch) | |
| tree | b130341a75677a627c9649bfe4532e19c946b755 /src/noise_protocol.go | |
| parent | Rework of entire locking system (diff) | |
| download | wireguard-go-4f97b52ea60ce4f2448d8617853aa44759727197.tar.xz wireguard-go-4f97b52ea60ce4f2448d8617853aa44759727197.zip | |
Clear cryptographic state when interface down
Attempts to clear the cryptographic state for every
peer when the device goes down.
Diffstat (limited to 'src/noise_protocol.go')
| -rw-r--r-- | src/noise_protocol.go | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/src/noise_protocol.go b/src/noise_protocol.go index d620a0d..c9713c0 100644 --- a/src/noise_protocol.go +++ b/src/noise_protocol.go @@ -121,6 +121,15 @@ func mixHash(dst *[blake2s.Size]byte, h *[blake2s.Size]byte, data []byte) { hsh.Reset() } +func (h *Handshake) Clear() { + setZero(h.localEphemeral[:]) + setZero(h.remoteEphemeral[:]) + setZero(h.chainKey[:]) + setZero(h.hash[:]) + h.localIndex = 0 + h.state = HandshakeZeroed +} + func (h *Handshake) mixHash(data []byte) { mixHash(&h.hash, &h.hash, data) } @@ -138,8 +147,8 @@ func init() { func (device *Device) CreateMessageInitiation(peer *Peer) (*MessageInitiation, error) { - device.noise.mutex.Lock() - defer device.noise.mutex.Unlock() + device.noise.mutex.RLock() + defer device.noise.mutex.RUnlock() handshake := &peer.handshake handshake.mutex.Lock() @@ -393,7 +402,7 @@ func (device *Device) ConsumeMessageResponse(msg *MessageResponse) *Peer { ok := func() bool { - // read lock handshake + // lock handshake state handshake.mutex.RLock() defer handshake.mutex.RUnlock() @@ -402,6 +411,11 @@ func (device *Device) ConsumeMessageResponse(msg *MessageResponse) *Peer { return false } + // lock private key for reading + + device.noise.mutex.RLock() + defer device.noise.mutex.RUnlock() + // finish 3-way DH mixHash(&hash, &handshake.hash, msg.Ephemeral[:]) @@ -432,7 +446,7 @@ func (device *Device) ConsumeMessageResponse(msg *MessageResponse) *Peer { ) mixHash(&hash, &hash, tau[:]) - // authenticate + // authenticate transcript aead, _ := chacha20poly1305.New(key[:]) _, err := aead.Open(nil, ZeroNonce[:], msg.Empty[:], hash[:]) |