Skip to content

Commit

Permalink
add reduced entropy experiment to shadowsocks
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaokangwang committed Jan 15, 2022
1 parent eced27b commit 0746740
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
3 changes: 3 additions & 0 deletions proxy/shadowsocks/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ type MemoryAccount struct {
Key []byte

replayFilter antireplay.GeneralizedReplayFilter

ReducedIVEntropy bool
}

// Equals implements protocol.Account.Equals().
Expand Down Expand Up @@ -101,6 +103,7 @@ func (a *Account) AsAccount() (protocol.Account, error) {
}
return nil
}(),
ReducedIVEntropy: a.ExperimentReducedInitialIvEntropy,
}, nil
}

Expand Down
12 changes: 12 additions & 0 deletions proxy/shadowsocks/protocol.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"crypto/sha256"
"hash/crc32"
"io"
mrand "math/rand"
gonet "net"

"github.com/v2fly/v2ray-core/v5/common"
Expand Down Expand Up @@ -103,6 +104,9 @@ func WriteTCPRequest(request *protocol.RequestHeader, writer io.Writer) (buf.Wri
if account.Cipher.IVSize() > 0 {
iv = make([]byte, account.Cipher.IVSize())
common.Must2(rand.Read(iv))
if account.ReducedIVEntropy {
remapToPrintable(iv[:6])
}
if ivError := account.CheckIV(iv); ivError != nil {
return nil, newError("failed to mark outgoing iv").Base(ivError)
}
Expand Down Expand Up @@ -301,3 +305,11 @@ func (w *UDPWriter) WriteTo(payload []byte, addr gonet.Addr) (n int, err error)
packet.Release()
return len(payload), err
}

func remapToPrintable(input []byte) {
const charSet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!#$%&()*+,./:;<=>?@[]^_`{|}~\\\""
seed := mrand.New(mrand.NewSource(int64(crc32.ChecksumIEEE(input))))
for i := range input {
input[i] = charSet[seed.Intn(len(charSet))]
}
}

0 comments on commit 0746740

Please sign in to comment.