X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fpeer.go;h=e43dc9c75c235f54dcf206209e17b62105cde430;hb=f47fff1e42f75b736e7067ec06c2e81394833d46;hp=081ea004b83700d772c12fd11db00468c531d136;hpb=572cac17bde738055312f7a468a0bde0e760a262;p=govpn.git

diff --git a/src/cypherpunks.ru/govpn/peer.go b/src/cypherpunks.ru/govpn/peer.go
index 081ea00..e43dc9c 100644
--- a/src/cypherpunks.ru/govpn/peer.go
+++ b/src/cypherpunks.ru/govpn/peer.go
@@ -56,13 +56,15 @@ func newNonces(key *[32]byte, i uint64) chan *[NonceSize]byte {
 	if err != nil {
 		panic(err)
 	}
+	sum := make([]byte, mac.Size())
 	nonces := make(chan *[NonceSize]byte, NonceBucketSize*3)
 	go func() {
 		for {
 			buf := new([NonceSize]byte)
 			binary.BigEndian.PutUint64(buf[:], i)
 			mac.Write(buf[:])
-			mac.Sum(buf[:0])
+			mac.Sum(sum[0:])
+			copy(buf[:], sum)
 			nonces <- buf
 			mac.Reset()
 			i += 2
@@ -86,7 +88,7 @@ type Peer struct {
 
 	// Basic
 	Addr string
-	Id   *PeerId
+	ID   *PeerID
 	Conn io.Writer `json:"-"`
 
 	// Traffic behaviour
@@ -96,7 +98,7 @@ type Peer struct {
 	Encless     bool
 	MTU         int
 
-	key *[SSize]byte `json:"-"`
+	key *[SSize]byte
 
 	// Timers
 	Timeout     time.Duration `json:"-"`
@@ -133,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.
@@ -183,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,