aes bug fixed

ymh199478 · ymh199478 · commit f367a2c073d7 · 2017-10-30T16:02:15.000+08:00
diff --git a/src/CatLib.Framework/Encryption/AesEncrypter.cs b/src/CatLib.Framework/Encryption/AesEncrypter.cs
@@ -84,7 +84,7 @@ public byte[] Decrypt(string str, byte[] key)
 
             var aesBuffer = Convert.FromBase64String(value);
             var ivBuffer = Convert.FromBase64String(iv);
-            var ivAesBuffer = Arr.Merge(rijndaelManaged.IV, aesBuffer);
+            var ivAesBuffer = Arr.Merge(ivBuffer, aesBuffer);
 
             if (Convert.ToBase64String(HMac(ivAesBuffer, key)) != hmac)
             {
@@ -153,7 +153,7 @@ private void Decode(string str, out string iv, out string value, out string hmac
 
                 result[fragment[0]] = fragment[1];
             }
-
+           
             if (!result.TryGetValue("iv", out iv) ||
                 !result.TryGetValue("value", out value) ||
                 !result.TryGetValue("hmac", out hmac))

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public byte[] Decrypt(string str, byte[] key)`
`84`	`84`
`85`	`85`	`var aesBuffer = Convert.FromBase64String(value);`
`86`	`86`	`var ivBuffer = Convert.FromBase64String(iv);`
`87`		`- var ivAesBuffer = Arr.Merge(rijndaelManaged.IV, aesBuffer);`
	`87`	`+ var ivAesBuffer = Arr.Merge(ivBuffer, aesBuffer);`
`88`	`88`
`89`	`89`	`if (Convert.ToBase64String(HMac(ivAesBuffer, key)) != hmac)`
`90`	`90`	`{`
`@@ -153,7 +153,7 @@ private void Decode(string str, out string iv, out string value, out string hmac`
`153`	`153`
`154`	`154`	`result[fragment[0]] = fragment[1];`
`155`	`155`	`}`
`156`		`-`
	`156`	`+`
`157`	`157`	`if (!result.TryGetValue("iv", out iv) \|\|`
`158`	`158`	`!result.TryGetValue("value", out value) \|\|`
`159`	`159`	`!result.TryGetValue("hmac", out hmac))`