Less magical constant

diff --git a/cmd/client/main.go b/cmd/client/main.go
index 0895cd0bbcc689049c077a6c031a679f4625d665f98877d0c4909f4f3dbf90fb..9be258b61e7ec03d2bbc4ae1d5401af14ad217d65ab91c438d52e5d6962d3905 100644 (file)
--- 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 4764ad16fd177a00ab432df8d66e4d2001d823b39985e97074a0f9f08a8105ed..7f475f0e9b6bc201b780a25dce35c32b0cc42a78fd2872d040d09a488fc2bd19 100644 (file)
--- 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:])
        }
 
        {