feat: crypto

crypto/aes.go

@@ -40,23 +40,44 @@ func PKCS5UnPadding(origData []byte) []byte {
 }
 
 // AesEncrypt AES加密
-func AesEncrypt(origData, key []byte) ([]byte, error) {
+func AesEncrypt(plainText, key, iv []byte) ([]byte, error) {
+	if plainText == nil {
+		return nil, fmt.Errorf("plain text is nil")
+	}
+	if key == nil {
+		return nil, fmt.Errorf("key is nil")
+	}
+
 	block, err := aes.NewCipher(key)
 	if err != nil {
 		return nil, err
 	}
 
-	//AES分组长度为128位，所以blockSize=16，单位字节
+	// AES分组长度为128位，所以blockSize=16，单位字节
 	blockSize := block.BlockSize()
-	origData = PKCS5Padding(origData, blockSize)
+
-	blockMode := cipher.NewCBCEncrypter(block, key[:blockSize]) //初始向量的长度必须等于块block的长度16字节
+	if iv == nil {
-	crypted := make([]byte, len(origData))
+		// 初始向量的长度必须等于块block的长度16字节
-	blockMode.CryptBlocks(crypted, origData)
+		iv = key[:blockSize]
-	return crypted, nil
+	}
+
+	plainText = PKCS5Padding(plainText, blockSize)
+
+	blockMode := cipher.NewCBCEncrypter(block, iv)
+	cryptedText := make([]byte, len(plainText))
+	blockMode.CryptBlocks(cryptedText, plainText)
+	return cryptedText, nil
 }
 
 // AesDecrypt AES解密
-func AesDecrypt(crypted, key []byte) ([]byte, error) {
+func AesDecrypt(cryptedText, key, iv []byte) ([]byte, error) {
+	if cryptedText == nil {
+		return nil, fmt.Errorf("crypted text is nil")
+	}
+	if key == nil {
+		return nil, fmt.Errorf("key is nil")
+	}
+
 	block, err := aes.NewCipher(key)
 	if err != nil {
 		return nil, err
@@ -64,9 +85,16 @@ func AesDecrypt(crypted, key []byte) ([]byte, error) {
 
 	//AES分组长度为128位，所以blockSize=16，单位字节
 	blockSize := block.BlockSize()
-	blockMode := cipher.NewCBCDecrypter(block, key[:blockSize]) //初始向量的长度必须等于块block的长度16字节
+
-	origData := make([]byte, len(crypted))
+	if iv == nil {
-	blockMode.CryptBlocks(origData, crypted)
+		// 初始向量的长度必须等于块block的长度16字节
-	origData = PKCS5UnPadding(origData)
+		iv = key[:blockSize]
-	return origData, nil
+	}
+
+	blockMode := cipher.NewCBCDecrypter(block, iv)
+
+	plainText := make([]byte, len(cryptedText))
+	blockMode.CryptBlocks(plainText, cryptedText)
+	plainText = PKCS5UnPadding(plainText)
+	return plainText, nil
 }

crypto/aes_test.go

@@ -15,7 +15,7 @@ func TestDecryptAES(t *testing.T) {
 	aesKey = DefaultAESKey
 
 	plainText := []byte("cloud123456")
-	encryptText, err := AesEncrypt(plainText, aesKey)
+	encryptText, err := AesEncrypt(plainText, aesKey, nil)
 	if err != nil {
 		fmt.Println(err)
 		return
@@ -30,7 +30,7 @@ func TestDecryptAES(t *testing.T) {
 		return
 	}
 
-	decryptText, err := AesDecrypt(bytesPass, aesKey)
+	decryptText, err := AesDecrypt(bytesPass, aesKey, nil)
 	if err != nil {
 		fmt.Println(err)
 		return

entgo/go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/go-kratos/kratos/v2 v2.8.4
 	github.com/google/uuid v1.6.0
 	github.com/stretchr/testify v1.10.0
-	github.com/tx7do/go-utils v1.1.17
+	github.com/tx7do/go-utils v1.1.18
 	go.opentelemetry.io/otel v1.35.0
 	google.golang.org/protobuf v1.36.6
 )

tag.bat

@@ -1,4 +1,4 @@
-git tag v1.1.18
+git tag v1.1.19
 
 git tag bank_card/v1.1.5
 git tag geoip/v1.1.5