TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-01-07 08:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

control/noise: include the protocol version in the Noise prologue.

Browse Source 
Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2021-07-19 14:11:42 -07:00 committed by Dave Anderson
parent 5e005a658f
commit 89a68a4c22
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
control/noise/handshake.go
View File

@ -24,7 +24,12 @@
const ( const (
protocolName = "Noise_IK_25519_ChaChaPoly_BLAKE2s" protocolName = "Noise_IK_25519_ChaChaPoly_BLAKE2s"
invalidNonce = ^uint64(0) // protocolVersion is the version string that gets included as the
// Noise "prologue" in the handshake. It exists so that we can
// ensure that peer have agreed on the protocol version they're
// executing, to defeat some MITM protocol downgrade attacks.
protocolVersion = "Tailscale Control Protocol v1"
invalidNonce = ^uint64(0)
) )
// Client initiates a Noise client handshake, returning the resulting // Client initiates a Noise client handshake, returning the resulting
@ -227,8 +232,7 @@ func (s *symmetricState) Initialize() {
s.k = [chp.KeySize]byte{} s.k = [chp.KeySize]byte{}
s.n = invalidNonce s.n = invalidNonce
s.mixer = newBLAKE2s() s.mixer = newBLAKE2s()
// Mix in an empty prologue. s.MixHash([]byte(protocolVersion))
s.MixHash(nil)
} }
// MixHash updates s.h to be BLAKE2s(s.h || data), where || is // MixHash updates s.h to be BLAKE2s(s.h || data), where || is

4
control/noise/interop_test.go
View File

@ -120,7 +120,7 @@ func noiseExplorerClient(conn net.Conn, controlKey key.Public, machineKey key.Pr
private_key: machineKey, private_key: machineKey,
public_key: machineKey.Public(), public_key: machineKey.Public(),
} }
session := InitSession(true, nil, mk, controlKey) session := InitSession(true, []byte(protocolVersion), mk, controlKey)
_, msg1 := SendMessage(&session, nil) _, msg1 := SendMessage(&session, nil)
if _, err := conn.Write(msg1.ne[:]); err != nil { if _, err := conn.Write(msg1.ne[:]); err != nil {
@ -182,7 +182,7 @@ func noiseExplorerServer(conn net.Conn, controlKey key.Private, wantMachineKey k
private_key: controlKey, private_key: controlKey,
public_key: controlKey.Public(), public_key: controlKey.Public(),
} }
session := InitSession(false, nil, mk, [32]byte{}) session := InitSession(false, []byte(protocolVersion), mk, [32]byte{})
var buf [1024]byte var buf [1024]byte
if _, err := io.ReadFull(conn, buf[:96]); err != nil { if _, err := io.ReadFull(conn, buf[:96]); err != nil {