升级至8069版本：版本号更新/代理配置系统/红包计时埋点/长连接重构/回调修复

clientsdk/android/aes.go

@@ -22,32 +22,60 @@ func unpadding(src []byte) []byte {
 }
 
 func EncryptAES(src []byte, key []byte) []byte {
-	block, _ := aes.NewCipher(key)
+	block, err := aes.NewCipher(key)
+	if err != nil {
+		return nil
+	}
 	src = padding(src, block.BlockSize())
-	blockmode := cipher.NewCBCEncrypter(block, key)
+	blockSize := block.BlockSize()
+	if len(key) < blockSize {
+		return nil
+	}
+	blockmode := cipher.NewCBCEncrypter(block, key[:blockSize])
 	blockmode.CryptBlocks(src, src)
 	return src
 }
 
 func DecryptAES(src []byte, key []byte) []byte {
-	block, _ := aes.NewCipher(key)
-	blockmode := cipher.NewCBCDecrypter(block, key)
+	block, err := aes.NewCipher(key)
+	if err != nil {
+		return nil
+	}
+	blockSize := block.BlockSize()
+	if len(key) < blockSize {
+		return nil
+	}
+	blockmode := cipher.NewCBCDecrypter(block, key[:blockSize])
 	blockmode.CryptBlocks(src, src)
 	src = unpadding(src)
 	return src
 }
 
 func AESEncrypt(src []byte, key []byte) []byte {
-	block, _ := aes.NewCipher(key)
+	block, err := aes.NewCipher(key)
+	if err != nil {
+		return nil
+	}
 	src = padding(src, block.BlockSize())
-	blockmode := cipher.NewCBCEncrypter(block, key)
+	blockSize := block.BlockSize()
+	if len(key) < blockSize {
+		return nil
+	}
+	blockmode := cipher.NewCBCEncrypter(block, key[:blockSize])
 	blockmode.CryptBlocks(src, src)
 	return src
 }
 
 func AESDecrypt(src []byte, key []byte) []byte {
-	block, _ := aes.NewCipher(key)
-	blockmode := cipher.NewCBCDecrypter(block, key)
+	block, err := aes.NewCipher(key)
+	if err != nil {
+		return nil
+	}
+	blockSize := block.BlockSize()
+	if len(key) < blockSize {
+		return nil
+	}
+	blockmode := cipher.NewCBCDecrypter(block, key[:blockSize])
 	blockmode.CryptBlocks(src, src)
 	src = unpadding(src)
 	return src
@@ -63,7 +91,7 @@ func AesEncrypt(RequestSerialize []byte, key []byte) []byte {
 	blockSize := block.BlockSize()
 	RequestSerialize = PKCS5Padding(RequestSerialize, blockSize)
 
-	blockMode := cipher.NewCBCEncrypter(block, key)
+	blockMode := cipher.NewCBCEncrypter(block, key[:blockSize])
 	crypted := make([]byte, len(RequestSerialize))
 	blockMode.CryptBlocks(crypted, RequestSerialize)
 
@@ -77,7 +105,7 @@ func AesDecrypt(body []byte, key []byte) []byte {
 	if err != nil {
 		return nil
 	}
-	blockMode := cipher.NewCBCDecrypter(block, key)
+	blockMode := cipher.NewCBCDecrypter(block, key[:block.BlockSize()])
 	origData := make([]byte, len(body))
 	blockMode.CryptBlocks(origData, body)
 	origData = PKCS5UnPadding(origData)
@@ -146,7 +174,7 @@ func DecompressAndAesDecrypt(body []byte, key []byte) []byte {
 		return nil
 	}
 
-	blockMode := cipher.NewCBCDecrypter(block, key)
+	blockMode := cipher.NewCBCDecrypter(block, key[:block.BlockSize()])
 	origData := make([]byte, len(body))
 	blockMode.CryptBlocks(origData, body)
 	origData = PKCS5UnPadding(origData)