github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

share rand reader across auth readers

pull/1435/head
Darien Raymond 2018-11-11 16:34:58 +01:00
parent c26a4b407b
commit 3f3d00298a
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/crypto/auth.go
View File

@ -4,7 +4,6 @@ import (
"crypto/cipher" "crypto/cipher"
"io" "io"
"math/rand" "math/rand"
"time"
"v2ray.com/core/common" "v2ray.com/core/common"
"v2ray.com/core/common/buf" "v2ray.com/core/common/buf"
@ -227,7 +226,6 @@ type AuthenticationWriter struct {
sizeParser ChunkSizeEncoder sizeParser ChunkSizeEncoder
transferType protocol.TransferType transferType protocol.TransferType
padding PaddingLengthGenerator padding PaddingLengthGenerator
randReader *rand.Rand
} }
func NewAuthenticationWriter(auth Authenticator, sizeParser ChunkSizeEncoder, writer io.Writer, transferType protocol.TransferType, padding PaddingLengthGenerator) *AuthenticationWriter { func NewAuthenticationWriter(auth Authenticator, sizeParser ChunkSizeEncoder, writer io.Writer, transferType protocol.TransferType, padding PaddingLengthGenerator) *AuthenticationWriter {
@ -239,7 +237,6 @@ func NewAuthenticationWriter(auth Authenticator, sizeParser ChunkSizeEncoder, wr
} }
if padding != nil { if padding != nil {
w.padding = padding w.padding = padding
w.randReader = rand.New(rand.NewSource(time.Now().Unix()))
} }
return w return w
} }
@ -264,7 +261,8 @@ func (w *AuthenticationWriter) seal(b *buf.Buffer) (*buf.Buffer, error) {
} }
if paddingSize > 0 { if paddingSize > 0 {
// With size of the chunk and padding length encrypted, the content of padding doesn't matter much. // With size of the chunk and padding length encrypted, the content of padding doesn't matter much.
common.Must2(eb.ReadFullFrom(w.randReader, int32(paddingSize))) paddingBytes := eb.Extend(paddingSize)
common.Must2(rand.Read(paddingBytes))
} }
return eb, nil return eb, nil