change encrypt message

utils/encrypt/msg_encrypt.go

@@ -16,41 +16,32 @@ import (
 	"bytes"
 	"crypto/aes"
 	"crypto/cipher"
-	"encoding/base64"
 	"errors"
 )
 
 // MsgEncode 使用 AES CBC 模式加密数据
 // data 为待加密数据
-func MsgEncode(data []byte, encodingAESKey, iv string) ([]byte, error) {
-	if encodingAESKey == "" {
-		return nil, errors.New("加密 EncodingAESKey 为空")
-	}
-
-	if iv == "" {
-		return nil, errors.New("加密 IV 为空")
-	}
-
+func MsgEncode(data, key []byte) ([]byte, error) {
 	if nil == data || len(data) == 0 {
 		return nil, errors.New("待加密 消息 为空")
 	}
 
-	aesKey, e1 := base64.StdEncoding.DecodeString(encodingAESKey + "=")
-	if e1 != nil {
-		return nil, e1
+	if nil == key || len(key) == 0 {
+		return nil, errors.New("加密 AESKey 为空")
 	}
 
-	block, e2 := aes.NewCipher(aesKey)
+	block, e2 := aes.NewCipher(key)
 	if e2 != nil {
 		return nil, e2
 	}
 
 	blockSize := block.BlockSize()
-	dist := pkcs7(data, blockSize)
+	cipherData := pkcs7(data, blockSize)
+	dist := make([]byte, len(cipherData))
 
 	// CBC
-	mode := cipher.NewCBCEncrypter(block, []byte(iv))
-	mode.CryptBlocks(dist, data)
+	mode := cipher.NewCBCEncrypter(block, key[:blockSize])
+	mode.CryptBlocks(dist, cipherData)
 
 	// 如果需要拿到字符串, 请使用
 	// fmt.Sprintf("%x", xxx)
@@ -60,32 +51,24 @@ func MsgEncode(data []byte, encodingAESKey, iv string) ([]byte, error) {
 
 // MsgDecode 是 MsgEncode 的反操作, 用来解密数据
 // data 为待解密数据
-func MsgDecode(data []byte, encodingAESKey, iv string) ([]byte, error) {
-	if encodingAESKey == "" {
-		return nil, errors.New("解密 EncodingAESKey 为空")
-	}
-
-	if iv == "" {
-		return nil, errors.New("解密 IV 为空")
-	}
-
+func MsgDecode(data, key []byte) ([]byte, error) {
 	if nil == data || len(data) == 0 {
 		return nil, errors.New("待解密 消息 为空")
 	}
 
-	aesKey, e1 := base64.StdEncoding.DecodeString(encodingAESKey + "=")
-	if e1 != nil {
-		return nil, e1
+	if nil == key || len(key) == 0 {
+		return nil, errors.New("解密 AESKey 为空")
 	}
 
-	block, err := aes.NewCipher(aesKey)
+	block, err := aes.NewCipher(key)
 	if err != nil {
 		return nil, err
 	}
 
+	blockSize := block.BlockSize()
 	dist := make([]byte, len(data))
 
-	mode := cipher.NewCBCDecrypter(block, []byte(iv))
+	mode := cipher.NewCBCDecrypter(block, key[:blockSize])
 	mode.CryptBlocks(dist, data)
 
 	// 如果需要拿到字符串, 请使用