From 219e227ad1cf60a4e47340a1bac1ec1aed2f751e409b490d33a9103a7d4d316e Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 28 Apr 2024 12:29:10 +0300
Subject: [PATCH] Less magical constant

---
 cmd/client/main.go | 8 ++++----
 cmd/server/main.go | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cmd/client/main.go b/cmd/client/main.go
index 0895cd0..9be258b 100644
--- a/cmd/client/main.go
+++ b/cmd/client/main.go
@@ -264,17 +264,17 @@ func main() {
 	var keyCiphOur []byte
 	var keyMACOur []byte
 	{
-		xof, err := blake2s.NewXOF(32+16, nil)
+		xof, err := blake2s.NewXOF(chacha20.KeySize+16, nil)
 		if err != nil {
 			log.Fatalln(err)
 		}
 		xof.Write([]byte(vors.NoisePrologue))
 		xof.Write(hs.ChannelBinding())
-		buf := make([]byte, 32+16)
+		buf := make([]byte, chacha20.KeySize+16)
 		if _, err = io.ReadFull(xof, buf); err != nil {
 			log.Fatalln(err)
 		}
-		keyCiphOur, keyMACOur = buf[:32], buf[32:]
+		keyCiphOur, keyMACOur = buf[:chacha20.KeySize], buf[chacha20.KeySize:]
 	}
 
 	seen := time.Now()
@@ -351,7 +351,7 @@ func main() {
 				if err != nil {
 					log.Fatal(err)
 				}
-				keyCiph, keyMAC := key[:32], key[32:]
+				keyCiph, keyMAC := key[:chacha20.KeySize], key[chacha20.KeySize:]
 				stream := &Stream{
 					name:  name,
 					in:    make(chan []byte, 1<<10),
diff --git a/cmd/server/main.go b/cmd/server/main.go
index 4764ad1..7f475f0 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -38,6 +38,7 @@ import (
 	"github.com/jroimartin/gocui"
 	vors "go.stargrave.org/vors/internal"
 	"golang.org/x/crypto/blake2s"
+	"golang.org/x/crypto/chacha20"
 )
 
 var (
@@ -256,17 +257,17 @@ func newPeer(conn *net.TCPConn) {
 	}
 
 	{
-		xof, err := blake2s.NewXOF(32+16, nil)
+		xof, err := blake2s.NewXOF(chacha20.KeySize+16, nil)
 		if err != nil {
 			log.Fatalln(err)
 		}
 		xof.Write([]byte(vors.NoisePrologue))
 		xof.Write(hs.ChannelBinding())
-		peer.key = make([]byte, 32+16)
+		peer.key = make([]byte, chacha20.KeySize+16)
 		if _, err = io.ReadFull(xof, peer.key); err != nil {
 			log.Fatalln(err)
 		}
-		peer.mac = siphash.New(peer.key[32:])
+		peer.mac = siphash.New(peer.key[chacha20.KeySize:])
 	}
 
 	{
-- 
2.48.1