Removed math/rand

Author: mobilarte

knx/cemi/cemi_test.go

@@ -5,12 +5,14 @@ package cemi
 
 import (
 	"bytes"
-	"math/rand"
+	"crypto/rand"
 	"testing"
+
+	"github.com/mobilarte/knx-exp/knx/util"
 )
 
 func makeRandInfoSegment() []byte {
-	n := rand.Int() % 256
+	n := util.Randint64() % 256
 
 	buffer := make([]byte, n+1)
 	buffer[0] = byte(n)
@@ -45,7 +47,7 @@ func TestUnpack(t *testing.T) {
 	ldataCodes := []MessageCode{LDataReqCode, LDataConCode, LDataIndCode}
 
 	for i := 0; i < 100; i++ {
-		code := ldataCodes[rand.Int()%3]
+		code := ldataCodes[util.Randint64()%3]
 		data := append([]byte{byte(code)}, makeRandLData()...)
 
 		var msg Message

knx/cemi/ldata_test.go

@@ -5,8 +5,8 @@ package cemi
 
 import (
 	"bytes"
+	"crypto/rand"
 	"encoding/binary"
-	"math/rand"
 	"testing"
 )
 
@@ -19,7 +19,7 @@ func makeRandBuffer(n int) []byte {
 /* unused!
 
 func makeRandTPDUSegment() []byte {
-	n := rand.Int() % 256
+	n := util.Randint64() % 256
 
 	buffer := make([]byte, n+2)
 	buffer[0] = byte(n)

knx/cemi/tpdu_test.go

@@ -5,7 +5,7 @@ package cemi
 
 import (
 	"bytes"
-	"math/rand"
+	"crypto/rand"
 	"testing"
 
 	"github.com/mobilarte/knx-exp/knx/util"
@@ -14,10 +14,10 @@ import (
 func TestAppData_Pack(t *testing.T) {
 	for i := 0; i < 100; i++ {
 		app := AppData{
-			Numbered:  rand.Int()%2 == 0,
-			SeqNumber: uint8(rand.Int()) % 15,
-			Command:   APCI(rand.Int()) % 15,
-			Data:      makeRandBuffer(rand.Int() % 300),
+			Numbered:  util.Randint64()%2 == 0,
+			SeqNumber: uint8(util.Randint64()) % 15,
+			Command:   APCI(util.Randint64()) % 15,
+			Data:      makeRandBuffer(int(util.Randint64() % 300)),
 		}
 
 		if len(app.Data) > 0 {
@@ -70,9 +70,9 @@ func TestAppData_Pack(t *testing.T) {
 func TestControlData_Pack(t *testing.T) {
 	for i := 0; i < 100; i++ {
 		control := ControlData{
-			Numbered:  rand.Int()%2 == 0,
-			SeqNumber: uint8(rand.Int()) % 15,
-			Command:   uint8(rand.Int()) % 3,
+			Numbered:  util.Randint64()%2 == 0,
+			SeqNumber: uint8(util.Randint64()) % 15,
+			Command:   uint8(util.Randint64()) % 3,
 		}
 
 		data := util.AllocAndPack(&control)
@@ -107,7 +107,7 @@ func TestControlData_Pack(t *testing.T) {
 func TestUnpackTransportUnit(t *testing.T) {
 	t.Run("Control", func(t *testing.T) {
 		for i := 0; i < 100; i++ {
-			data := []byte{0, byte(rand.Int())}
+			data := []byte{0, byte(util.Randint64())}
 			data[1] |= 1 << 7
 
 			var unit TransportUnit
@@ -145,7 +145,7 @@ func TestUnpackTransportUnit(t *testing.T) {
 
 	t.Run("App", func(t *testing.T) {
 		for i := 0; i < 100; i++ {
-			data := make([]byte, 3+rand.Int()%255)
+			data := make([]byte, 3+util.Randint64()%255)
 			rand.Read(data[1:])
 
 			data[0] = byte(len(data) - 2)

knx/knxnet/hpai_test.go

@@ -52,7 +52,7 @@ func makeRandBuffer(size int) []byte {
 
 func TestHostInfo_Unpack(t *testing.T) {
 	for i := 0; i < 100; i++ {
-		proto := byte(1 + (rand.Int() % 2))
+		proto := byte(1 + (util.Randint64() % 2))
 		data := append([]byte{8, proto}, makeRandBuffer(6)...)
 
 		var hi HostInfo
@@ -87,8 +87,8 @@ func TestHostInfo_Unpack(t *testing.T) {
 func TestHostInfo_Pack(t *testing.T) {
 	for i := 0; i < 100; i++ {
 		hi := HostInfo{
-			Protocol: Protocol(1 + (rand.Int() % 2)),
-			Port:     Port(rand.Int()),
+			Protocol: Protocol(1 + (util.Randint64() % 2)),
+			Port:     Port(util.Randint64()),
 		}
 		copy(hi.Address[:], makeRandBuffer(4))
 

knx/util/rand.go

@@ -0,0 +1,18 @@
+// Copyright 2024 Martin Müller.
+// Licensed under the MIT license which can be found in the LICENSE file.
+
+package util
+
+import (
+	"crypto/rand"
+	"math"
+	"math/big"
+)
+
+func Randint64() int64 {
+	val, err := rand.Int(rand.Reader, big.NewInt(int64(math.MaxInt64)))
+	if err != nil {
+		return 0
+	}
+	return val.Int64()
+}