Explorar el Código

fix build break

Darien Raymond hace 8 años
padre
commit
ce34a25e66
Se han modificado 2 ficheros con 5 adiciones y 5 borrados
  1. 2 2
      proxy/vmess/encoding/auth.go
  2. 3 3
      transport/internet/kcp/crypt.go

+ 2 - 2
proxy/vmess/encoding/auth.go

@@ -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
 }

+ 3 - 3
transport/internet/kcp/crypt.go

@@ -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