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

fix build break

pull/432/head
Darien Raymond 2017-02-06 13:49:03 +01:00
parent 47c3646162
commit ce34a25e66
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/vmess/encoding/auth.go
View File

@ -2,9 +2,9 @@ package encoding
import (
"crypto/md5"
"errors"
"hash/fnv"
"v2ray.com/core/common/crypto"
"v2ray.com/core/common/serial"
)
@ -58,7 +58,7 @@ func (v *FnvAuthenticator) Seal(dst, nonce, plaintext, additionalData []byte) []
// Open implements AEAD.Open().
func (v *FnvAuthenticator) Open(dst, nonce, ciphertext, additionalData []byte) ([]byte, error) {
if serial.BytesToUint32(ciphertext[:4]) != Authenticate(ciphertext[4:]) {
return dst, crypto.ErrAuthenticationFailed
return dst, errors.New("VMess|FNV: Invalid authentication.")
}
return append(dst, ciphertext[4:]...), nil
}

6
transport/internet/kcp/crypt.go
View File

@ -2,9 +2,9 @@ package kcp
import (
"crypto/cipher"
"errors"
"hash/fnv"
"v2ray.com/core/common/crypto"
"v2ray.com/core/common/serial"
)
@ -64,12 +64,12 @@ func (v *SimpleAuthenticator) Open(dst, nonce, cipherText, extra []byte) ([]byte
fnvHash := fnv.New32a()
fnvHash.Write(dst[4:])
if serial.BytesToUint32(dst[:4]) != fnvHash.Sum32() {
return nil, crypto.ErrAuthenticationFailed
return nil, errors.New("KCP:SimpleAuthenticator: Invalid auth.")
}
length := serial.BytesToUint16(dst[4:6])
if len(dst)-6 != int(length) {
return nil, crypto.ErrAuthenticationFailed
return nil, errors.New("KCP:SimpleAuthenticator: Invalid auth.")
}
return dst[6:], nil