Drop support for go 1.20

[btrtrc.git] / mse / mse_test.go

diff --git a/mse/mse_test.go b/mse/mse_test.go
index 3efaf98d7f59be189f81a9e34c65ad4a651a22ad..f7f7fe7ab9c7f2090f2a30467cc5635414dbdc8d 100644 (file)
--- a/mse/mse_test.go
+++ b/mse/mse_test.go
@@ -5,13 +5,11 @@ import (
        "crypto/rand"
        "crypto/rc4"
        "io"
-       "io/ioutil"
        "net"
        "sync"
        "testing"
 
        _ "github.com/anacrolix/envpprof"
-       "github.com/bradfitz/iter"
        "github.com/stretchr/testify/assert"
        "github.com/stretchr/testify/require"
 )
@@ -79,14 +77,15 @@ func handshakeTest(t testing.TB, ia []byte, aData, bData string, cryptoProvides
        }()
        go func() {
                defer wg.Done()
-               b, cm, err := ReceiveHandshake(b, sliceIter([][]byte{[]byte("nope"), []byte("yep"), []byte("maybe")}), cryptoSelect)
-               require.NoError(t, err)
-               assert.Equal(t, cryptoSelect(cryptoProvides), cm)
+               res := ReceiveHandshakeEx(b, sliceIter([][]byte{[]byte("nope"), []byte("yep"), []byte("maybe")}), cryptoSelect)
+               require.NoError(t, res.error)
+               assert.EqualValues(t, "yep", res.SecretKey)
+               b := res.ReadWriter
+               assert.Equal(t, cryptoSelect(cryptoProvides), res.CryptoMethod)
                go b.Write([]byte(bData))
-               // Need to be exact here, as there are several reads, and net.Pipe is
-               // most synchronous.
+               // Need to be exact here, as there are several reads, and net.Pipe is most synchronous.
                msg := make([]byte, len(ia)+len(aData))
-               n, _ := io.ReadFull(b, msg[:])
+               n, _ := io.ReadFull(b, msg)
                if n != len(msg) {
                        t.FailNow()
                }
@@ -113,7 +112,7 @@ func TestHandshakeSelectPlaintext(t *testing.T) {
 }
 
 func BenchmarkHandshakeDefault(b *testing.B) {
-       for range iter.N(b.N) {
+       for i := 0; i < b.N; i += 1 {
                allHandshakeTests(b, AllSupportedCrypto, DefaultCryptoSelector)
        }
 }
@@ -131,7 +130,7 @@ func (tr *trackReader) Read(b []byte) (n int, err error) {
 
 func TestReceiveRandomData(t *testing.T) {
        tr := trackReader{rand.Reader, 0}
-       _, _, err := ReceiveHandshake(readWriter{&tr, ioutil.Discard}, nil, DefaultCryptoSelector)
+       _, _, err := ReceiveHandshake(readWriter{&tr, io.Discard}, nil, DefaultCryptoSelector)
        // No skey matches
        require.Error(t, err)
        // Establishing S, and then reading the maximum padding for giving up on
@@ -146,7 +145,7 @@ func fillRand(t testing.TB, bs ...[]byte) {
        }
 }
 
-func readAndWrite(rw io.ReadWriter, r []byte, w []byte) error {
+func readAndWrite(rw io.ReadWriter, r, w []byte) error {
        var wg sync.WaitGroup
        wg.Add(1)
        var wErr error
@@ -170,7 +169,7 @@ func benchmarkStream(t *testing.B, crypto CryptoMethod) {
        t.StopTimer()
        t.SetBytes(int64(len(ia) + len(a) + len(b)))
        t.ResetTimer()
-       for range iter.N(t.N) {
+       for i := 0; i < t.N; i += 1 {
                ac, bc := net.Pipe()
                ar := make([]byte, len(b))
                br := make([]byte, len(ia)+len(a))
@@ -190,6 +189,7 @@ func benchmarkStream(t *testing.B, crypto CryptoMethod) {
                        require.NoError(t, err)
                        require.NoError(t, readAndWrite(rw, br, b))
                }()
+               wg.Wait()
                t.StopTimer()
                if !bytes.Equal(ar, b) {
                        t.Fatalf("A read the wrong bytes")
@@ -237,7 +237,7 @@ func BenchmarkPipeRC4(t *testing.B) {
        b := make([]byte, len(a))
        t.SetBytes(int64(len(a)))
        t.ResetTimer()
-       for range iter.N(t.N) {
+       for i := 0; i < t.N; i += 1 {
                n, _ = w.Write(a)
                if n != len(a) {
                        t.FailNow()
@@ -251,3 +251,28 @@ func BenchmarkPipeRC4(t *testing.B) {
                }
        }
 }
+
+func BenchmarkSkeysReceive(b *testing.B) {
+       var skeys [][]byte
+       for i := 0; i < 100000; i += 1 {
+               skeys = append(skeys, make([]byte, 20))
+       }
+       fillRand(b, skeys...)
+       initSkey := skeys[len(skeys)/2]
+       // c := qt.New(b)
+       b.ReportAllocs()
+       b.ResetTimer()
+       for i := 0; i < b.N; i += 1 {
+               initiator, receiver := net.Pipe()
+               go func() {
+                       _, _, err := InitiateHandshake(initiator, initSkey, nil, AllSupportedCrypto)
+                       if err != nil {
+                               panic(err)
+                       }
+               }()
+               res := ReceiveHandshakeEx(receiver, sliceIter(skeys), DefaultCryptoSelector)
+               if res.error != nil {
+                       panic(res.error)
+               }
+       }
+}