Merge pull request #8 from FishGoddess/develop

v0.5.2

Author: FishGoddess

FUTURE.md

@@ -1,11 +1,14 @@
 ## ✈️ 未来版本的新特性 (Features in future versions)
 
-### v0.6.x
+### v0.7.x
 
-* [ ] 增加 cmd 包，提供二进制 cli 使用
 * [ ] 支持 SM3 国标算法
 * [ ] 支持 SM4 国标算法
-* [ ] 支持更多的散列算法
+
+### v0.6.x
+
+* [ ] 增加 cmd 包，提供二进制 cli 使用
+* [ ] 支持 chacha20 相关算法
 
 ### v0.5.x
 

HISTORY.md

@@ -1,5 +1,11 @@
 ## 📜 历史版本的特性介绍 (Features in old versions)
 
+### v0.5.2
+
+> 此版本发布于 2025-12-09
+
+* 随机函数默认使用 crypto 包，可选弱安全性的 math 包
+
 ### v0.5.1-alpha
 
 > 此版本发布于 2025-12-07

bytes/rand/options.go

@@ -0,0 +1,34 @@
+// Copyright 2025 FishGoddess. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package rand
+
+type Config struct {
+	weak bool
+}
+
+func newConfig() *Config {
+	conf := &Config{
+		weak: false,
+	}
+
+	return conf
+}
+
+func (c *Config) Apply(opts ...Option) *Config {
+	for _, opt := range opts {
+		opt(c)
+	}
+
+	return c
+}
+
+type Option func(conf *Config)
+
+// WithWeak sets weak to config.
+func WithWeak() Option {
+	return func(conf *Config) {
+		conf.weak = true
+	}
+}

bytes/rand/options_test.go

@@ -0,0 +1,22 @@
+// Copyright 2025 FishGoddess. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package rand
+
+import (
+	"testing"
+)
+
+// go test -v -cover -run=^TestConfig$
+func TestConfig(t *testing.T) {
+	opts := []Option{
+		WithWeak(),
+	}
+
+	conf := newConfig().Apply(opts...)
+
+	if !conf.weak {
+		t.Fatalf("got %v != expect %v", conf.weak, true)
+	}
+}

bytes/rand/rand.go

@@ -5,32 +5,40 @@
 package rand
 
 import (
-	"math/rand/v2"
+	crand "crypto/rand"
+	"io"
+	mrand "math/rand/v2"
 	"unsafe"
 )
 
 var words = []byte("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
 
-func appendBytes(data []byte, n int) []byte {
-	length := len(words)
-	for i := 0; i < n; i++ {
-		index := rand.IntN(length)
-		data = append(data, words[index])
+func readFull(data []byte, n int) []byte {
+	for i := 0; i < n && i < len(data); i++ {
+		index := mrand.IntN(len(words))
+		data[i] = words[index]
 	}
 
 	return data
 }
 
 // Bytes returns n bytes in random which can be used to generate an iv.
-func Bytes(n int) []byte {
-	data := make([]byte, 0, n)
-	data = appendBytes(data, n)
+func Bytes(n int, opts ...Option) []byte {
+	conf := newConfig().Apply(opts...)
+
+	data := make([]byte, n)
+	if conf.weak {
+		readFull(data, n)
+	} else {
+		io.ReadFull(crand.Reader, data)
+	}
+
 	return data
 }
 
 // String returns a string including n bytes in random which can be used to generate an iv.
-func String(n int) string {
-	data := Bytes(n)
+func String(n int, opts ...Option) string {
+	data := Bytes(n, opts...)
 	ptr := unsafe.SliceData(data)
 	return unsafe.String(ptr, len(data))
 }

bytes/rand/rand_test.go

@@ -13,6 +13,15 @@ import (
 func TestBytes(t *testing.T) {
 	for i := 1; i <= 64; i++ {
 		data := Bytes(i)
+		if len(data) != i {
+			t.Fatalf("len(data) %d != i %d", len(data), i)
+		}
+
+		t.Logf("%s\n", data)
+	}
+
+	for i := 1; i <= 64; i++ {
+		data := Bytes(i, WithWeak())
 
 		for _, b := range data {
 			index := bytes.IndexByte(words, b)
@@ -29,11 +38,20 @@ func TestBytes(t *testing.T) {
 func TestString(t *testing.T) {
 	for i := 1; i <= 64; i++ {
 		str := String(i)
+		if len(str) != i {
+			t.Fatalf("len(str) %d != i %d", len(str), i)
+		}
+
+		t.Logf("%s\n", str)
+	}
+
+	for i := 1; i <= 64; i++ {
+		str := String(i, WithWeak())
 
 		for _, r := range str {
 			index := bytes.IndexRune(words, r)
 			if index < 0 {
-				t.Fatalf("b %+v not in words %+v", r, words)
+				t.Fatalf("r %+v not in words %+v", r, words)
 			}
 		}