Merge pull request #948 from ultramancool/master

Fix Up1 support using CLR Security Library
This commit is contained in:
Jaex 2015-08-27 03:50:04 +03:00
commit 15d94b3082

View file

@ -157,6 +157,7 @@ private static MemoryStream Encrypt(Stream source, string fileName, out string s
aes.CngMode = CngChainingMode.Ccm; aes.CngMode = CngChainingMode.Ccm;
aes.Key = key; aes.Key = key;
aes.IV = ccmIV; aes.IV = ccmIV;
aes.TagSize = MacSize;
MemoryStream ms = new MemoryStream(); MemoryStream ms = new MemoryStream();
@ -165,7 +166,8 @@ private static MemoryStream Encrypt(Stream source, string fileName, out string s
CryptoStream cs = new CryptoStream(ms, encryptor, CryptoStreamMode.Write); CryptoStream cs = new CryptoStream(ms, encryptor, CryptoStreamMode.Write);
cs.Write(data, 0, data.Length); cs.Write(data, 0, data.Length);
cs.FlushFinalBlock(); cs.FlushFinalBlock();
//tag = encryptor.GetTag(); byte[] tag = encryptor.GetTag();
ms.Write(tag, 0, tag.Length);
return ms; return ms;
} }
} }