Fix awful bug with expected nonces

[govpn.git] / src / cypherpunks.ru / govpn / peer.go

diff --git a/src/cypherpunks.ru/govpn/peer.go b/src/cypherpunks.ru/govpn/peer.go
index 7bb978c8d0548b6e1e03f37f2a8d31d17e97f8e2..37bd8405182afea9f205afd2782c1dbd9b97593e 100644 (file)
--- a/src/cypherpunks.ru/govpn/peer.go
+++ b/src/cypherpunks.ru/govpn/peer.go
@@ -63,7 +63,7 @@ func newNonces(key *[32]byte, i uint64) chan *[NonceSize]byte {
                        buf := new([NonceSize]byte)
                        binary.BigEndian.PutUint64(buf[:], i)
                        mac.Write(buf[:])
-                       mac.Sum(sum[0:])
+                       mac.Sum(sum[:0])
                        copy(buf[:], sum)
                        nonces <- buf
                        mac.Reset()
@@ -88,7 +88,7 @@ type Peer struct {
 
        // Basic
        Addr string
-       Id   *PeerId
+       ID   *PeerID
        Conn io.Writer `json:"-"`
 
        // Traffic behaviour
@@ -98,7 +98,7 @@ type Peer struct {
        Encless     bool
        MTU         int
 
-       key *[SSize]byte `json:"-"`
+       key *[SSize]byte
 
        // Timers
        Timeout     time.Duration `json:"-"`
@@ -135,7 +135,7 @@ type Peer struct {
 }
 
 func (p *Peer) String() string {
-       return p.Id.String() + ":" + p.Addr
+       return p.ID.String() + ":" + p.Addr
 }
 
 // Zero peer's memory state.
@@ -185,7 +185,7 @@ func newPeer(isClient bool, addr string, conn io.Writer, conf *PeerConf, key *[S
 
        peer := Peer{
                Addr: addr,
-               Id:   conf.Id,
+               ID:   conf.ID,
                Conn: conn,
 
                NoiseEnable: noiseEnable,