X-Git-Url: http://www.git.cypherpunks.ru/?p=govpn.git;a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fpeer.go;h=22c893c80fb51d3bb0bb1affbfa395e32a137257;hp=5a620a9c76692d23536aa87d0c6fabc770795fac;hb=0bf04621961589bc735dc8bd8a075d7db24c4178;hpb=21dee974626eb44b6c3904621dea946fef7e17fc

diff --git a/src/cypherpunks.ru/govpn/peer.go b/src/cypherpunks.ru/govpn/peer.go
index 5a620a9..22c893c 100644
--- a/src/cypherpunks.ru/govpn/peer.go
+++ b/src/cypherpunks.ru/govpn/peer.go
@@ -28,16 +28,16 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/dchest/blake2b"
+	"chacha20"
+	"golang.org/x/crypto/blake2b"
 	"golang.org/x/crypto/poly1305"
-	"golang.org/x/crypto/salsa20"
 )
 
 const (
 	NonceSize       = 8
 	NonceBucketSize = 256
 	TagSize         = poly1305.TagSize
-	// S20BS is Salsa20's internal blocksize in bytes
+	// S20BS is ChaCha20's internal blocksize in bytes
 	S20BS = 64
 	// Maximal amount of bytes transfered with single key (4 GiB)
 	MaxBytesPerKey uint64 = 1 << 32
@@ -51,8 +51,11 @@ const (
 
 func newNonces(key *[32]byte, i uint64) chan *[NonceSize]byte {
 	macKey := make([]byte, 32)
-	salsa20.XORKeyStream(macKey, make([]byte, 32), make([]byte, 8), key)
-	mac := blake2b.NewMAC(NonceSize, macKey)
+	chacha20.XORKeyStream(macKey, make([]byte, 32), new([16]byte), key)
+	mac, err := blake2b.New256(macKey)
+	if err != nil {
+		panic(err)
+	}
 	nonces := make(chan *[NonceSize]byte, NonceBucketSize*3)
 	go func() {
 		for {
@@ -105,6 +108,7 @@ type Peer struct {
 	bufR     []byte
 	tagR     *[TagSize]byte
 	keyAuthR *[SSize]byte
+	nonceR   *[16]byte
 	pktSizeR int
 
 	// UDP-related
@@ -123,6 +127,7 @@ type Peer struct {
 	bufT     []byte
 	tagT     *[TagSize]byte
 	keyAuthT *[SSize]byte
+	nonceT   *[16]byte
 	frameT   []byte
 	noncesT  chan *[NonceSize]byte
 }
@@ -198,7 +203,9 @@ func newPeer(isClient bool, addr string, conn io.Writer, conf *PeerConf, key *[S
 		tagR:     new([TagSize]byte),
 		tagT:     new([TagSize]byte),
 		keyAuthR: new([SSize]byte),
+		nonceR:   new([16]byte),
 		keyAuthT: new([SSize]byte),
+		nonceT:   new([16]byte),
 	}
 
 	if isClient {
@@ -268,22 +275,19 @@ func (p *Peer) EthProcess(data []byte) {
 	}
 	copy(p.frameT[len(p.frameT)-NonceSize:], (<-p.noncesT)[:])
 	var out []byte
+	copy(p.nonceT[8:], p.frameT[len(p.frameT)-NonceSize:])
 	if p.Encless {
 		var err error
-		out, err = EnclessEncode(
-			p.key,
-			p.frameT[len(p.frameT)-NonceSize:],
-			p.frameT[:len(p.frameT)-NonceSize],
-		)
+		out, err = EnclessEncode(p.key, p.nonceT, p.frameT[:len(p.frameT)-NonceSize])
 		if err != nil {
 			panic(err)
 		}
 		out = append(out, p.frameT[len(p.frameT)-NonceSize:]...)
 	} else {
-		salsa20.XORKeyStream(
+		chacha20.XORKeyStream(
 			p.bufT[:S20BS+len(p.frameT)-NonceSize],
 			p.bufT[:S20BS+len(p.frameT)-NonceSize],
-			p.frameT[len(p.frameT)-NonceSize:],
+			p.nonceT,
 			p.key,
 		)
 		copy(p.keyAuthT[:], p.bufT[:SSize])
@@ -305,13 +309,10 @@ func (p *Peer) PktProcess(data []byte, tap io.Writer, reorderable bool) bool {
 	}
 	var out []byte
 	p.BusyR.Lock()
+	copy(p.nonceR[8:], data[len(data)-NonceSize:])
 	if p.Encless {
 		var err error
-		out, err = EnclessDecode(
-			p.key,
-			data[len(data)-NonceSize:],
-			data[:len(data)-NonceSize],
-		)
+		out, err = EnclessDecode(p.key, p.nonceR, data[:len(data)-NonceSize])
 		if err != nil {
 			p.FramesUnauth++
 			p.BusyR.Unlock()
@@ -322,10 +323,10 @@ func (p *Peer) PktProcess(data []byte, tap io.Writer, reorderable bool) bool {
 			p.bufR[i] = 0
 		}
 		copy(p.bufR[S20BS:], data[TagSize:])
-		salsa20.XORKeyStream(
+		chacha20.XORKeyStream(
 			p.bufR[:S20BS+len(data)-TagSize-NonceSize],
 			p.bufR[:S20BS+len(data)-TagSize-NonceSize],
-			data[len(data)-NonceSize:],
+			p.nonceR,
 			p.key,
 		)
 		copy(p.keyAuthR[:], p.bufR[:SSize])