hesoyam/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2026-07-06 19:58:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Salamander finalmask: Replace math/rand with crypto/rand in salt generation (#6228)

Browse Source 
And https://github.com/XTLS/Xray-core/pull/6228#issuecomment-4612712100

Fixes https://github.com/XTLS/Xray-core/pull/6228#issuecomment-4599037015
This commit is contained in:
IconHHw
2026-06-09 03:55:06 +08:00
committed by GitHub
parent 2249f8b5c6
commit 83cf229909
4 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
transport/internet/finalmask/sudoku/codec.go
+6 -6
View File
@@ -2,7 +2,7 @@ package sudoku
import (
"fmt"
"math/rand"
"math/rand/v2"
)
var perm4 = [24][4]byte{
@@ -67,7 +67,7 @@ func pickPaddingChance(rng *rand.Rand, pMin, pMax int) int {
if pMax == pMin {
return pMin
}
return pMin + rng.Intn(pMax-pMin+1)
return pMin + rng.IntN(pMax-pMin+1)
}
func (c *codec) shouldPad() bool {
@@ -77,7 +77,7 @@ func (c *codec) shouldPad() bool {
if c.paddingChance >= 100 {
return true
}
return c.rng.Intn(100) < c.paddingChance
return c.rng.IntN(100) < c.paddingChance
}
func (c *codec) currentTable() *table {
@@ -89,7 +89,7 @@ func (c *codec) currentTable() *table {
func (c *codec) randomPadding(t *table) byte {
pool := t.layout.paddingPool
return pool[c.rng.Intn(len(pool))]
return pool[c.rng.IntN(len(pool))]
}
func (c *codec) encode(in []byte) ([]byte, error) {
@@ -112,8 +112,8 @@ func (c *codec) encode(in []byte) ([]byte, error) {
return nil, fmt.Errorf("sudoku encode table missing for byte %d", b)
}
hints := enc[c.rng.Intn(len(enc))]
perm := perm4[c.rng.Intn(len(perm4))]
hints := enc[c.rng.IntN(len(enc))]
perm := perm4[c.rng.IntN(len(perm4))]
for _, idx := range perm {
if c.shouldPad() {
out = append(out, c.randomPadding(t))