|
@@ -47,7 +47,7 @@ func (a *AesCrypto) Encrypt(data []byte) ([]byte, error) {
|
|
|
return nil, err
|
|
|
}
|
|
|
blockSize := block.BlockSize()
|
|
|
- data = pkcs5Padding(data, blockSize)
|
|
|
+ data = pkcs7Padding(data, blockSize)
|
|
|
|
|
|
blockMode := cipher.NewCBCEncrypter(block, a.IV[:blockSize])
|
|
|
crypted := make([]byte, len(data))
|
|
@@ -66,18 +66,18 @@ func (a *AesCrypto) Decrypt(crypted []byte) ([]byte, error) {
|
|
|
blockMode := cipher.NewCBCDecrypter(block, a.IV[:blockSize])
|
|
|
origData := make([]byte, len(crypted))
|
|
|
blockMode.CryptBlocks(origData, crypted)
|
|
|
- origData = pkcs5UnPadding(origData)
|
|
|
+ origData = pkcs7UnPadding(origData)
|
|
|
|
|
|
return origData, nil
|
|
|
}
|
|
|
|
|
|
-func pkcs5Padding(cipherText []byte, blockSize int) []byte {
|
|
|
+func pkcs7Padding(cipherText []byte, blockSize int) []byte {
|
|
|
padding := blockSize - len(cipherText)%blockSize
|
|
|
padtext := bytes.Repeat([]byte{byte(padding)}, padding)
|
|
|
return append(cipherText, padtext...)
|
|
|
}
|
|
|
|
|
|
-func pkcs5UnPadding(data []byte) []byte {
|
|
|
+func pkcs7UnPadding(data []byte) []byte {
|
|
|
length := len(data)
|
|
|
unpadding := int(data[length-1])
|
|
|
if unpadding >= length {
|