/*
GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2016 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
}
// Generate ID tag from client identification and data.
-func idTag(id *PeerId, timeSync int, data []byte) []byte {
+func idTag(id *PeerID, timeSync int, data []byte) []byte {
enc := make([]byte, 8)
copy(enc, data)
AddTimeSync(timeSync, enc)
panic(err)
}
mac.Write(enc)
- mac.Sum(enc[:0])
- return enc
+ sum := mac.Sum(nil)
+ return sum[len(sum)-8:]
}
// Start handshake's procedure from the client. It is the entry point
-// for starting the handshake procedure. // First handshake packet
-// will be sent immediately.
+// for starting the handshake procedure.
+// First handshake packet will be sent immediately.
func HandshakeStart(addr string, conn io.Writer, conf *PeerConf) *Handshake {
state := NewHandshake(addr, conn, conf)
var dhPubRepr *[32]byte
chacha20.XORKeyStream(enc, enc, state.rNonce, state.dsaPubH)
}
data := append(state.rNonce[8:], enc...)
- data = append(data, idTag(state.Conf.Id, state.Conf.TimeSync, state.rNonce[8:])...)
+ data = append(data, idTag(state.Conf.ID, state.Conf.TimeSync, state.rNonce[8:])...)
state.conn.Write(data)
return state
}
// Send that to client
h.conn.Write(append(encPub, append(
- encRs, idTag(h.Conf.Id, h.Conf.TimeSync, encPub)...,
+ encRs, idTag(h.Conf.ID, h.Conf.TimeSync, encPub)...,
)...))
h.LastPing = time.Now()
} else
} else {
chacha20.XORKeyStream(enc, enc, h.rNonceNext(2), h.key)
}
- h.conn.Write(append(enc, idTag(h.Conf.Id, h.Conf.TimeSync, enc)...))
+ h.conn.Write(append(enc, idTag(h.Conf.ID, h.Conf.TimeSync, enc)...))
// Switch peer
peer := newPeer(
}
// Send that to server
- h.conn.Write(append(enc, idTag(h.Conf.Id, h.Conf.TimeSync, enc)...))
+ h.conn.Write(append(enc, idTag(h.Conf.ID, h.Conf.TimeSync, enc)...))
h.LastPing = time.Now()
} else
// ENC(K, R+2, RC) + IDtag