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

lazy init of authenticator

pull/787/head
Darien Raymond 2017-11-27 10:42:51 +01:00
parent eef2a72ac0
commit 64e5430ed9
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
proxy/shadowsocks/protocol.go
View File

@ -284,9 +284,12 @@ func DecodeUDPPacket(user *protocol.User, payload *buf.Buffer) (*protocol.Reques
} }
account := rawAccount.(*ShadowsocksAccount) account := rawAccount.(*ShadowsocksAccount)
var iv []byte
var authenticator *Authenticator var authenticator *Authenticator
if !account.Cipher.IsAEAD() { if !account.Cipher.IsAEAD() {
authenticator = NewAuthenticator(HeaderKeyGenerator(account.Key, payload.BytesTo(account.Cipher.IVSize()))) // Keep track of IV as it gets removed from payload in DecodePacket.
iv = make([]byte, account.Cipher.IVSize())
copy(iv, payload.BytesTo(account.Cipher.IVSize()))
} }
if err := account.Cipher.DecodePacket(account.Key, payload); err != nil { if err := account.Cipher.DecodePacket(account.Key, payload); err != nil {
@ -316,6 +319,7 @@ func DecodeUDPPacket(user *protocol.User, payload *buf.Buffer) (*protocol.Reques
payloadLen := payload.Len() - AuthSize payloadLen := payload.Len() - AuthSize
authBytes := payload.BytesFrom(payloadLen) authBytes := payload.BytesFrom(payloadLen)
authenticator = NewAuthenticator(HeaderKeyGenerator(account.Key, iv))
actualAuth := make([]byte, AuthSize) actualAuth := make([]byte, AuthSize)
authenticator.Authenticate(payload.BytesTo(payloadLen))(actualAuth) authenticator.Authenticate(payload.BytesTo(payloadLen))(actualAuth)
if !bytes.Equal(actualAuth, authBytes) { if !bytes.Equal(actualAuth, authBytes) {