mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-10-31 23:25:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

bug fixes

Browse source
This commit is contained in:
Kyle Spearrin 2019-04-19 16:57:34 -04:00
parent 7548122e2d
commit ea5a411f30
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Core/Models/Domain/SymmetricCryptoKey.cs
View file

@ -42,7 +42,7 @@ namespace Bit.Core.Models.Domain
EncKey = new ArraySegment<byte>(Key, 0, 16).ToArray(); EncKey = new ArraySegment<byte>(Key, 0, 16).ToArray();
MacKey = new ArraySegment<byte>(Key, 16, 16).ToArray(); MacKey = new ArraySegment<byte>(Key, 16, 16).ToArray();
} }
else if(EncType == EncryptionType.AesCbc256_HmacSha256_B64 && Key.Length == 34) else if(EncType == EncryptionType.AesCbc256_HmacSha256_B64 && Key.Length == 64)
{ {
EncKey = new ArraySegment<byte>(Key, 0, 32).ToArray(); EncKey = new ArraySegment<byte>(Key, 0, 32).ToArray();
MacKey = new ArraySegment<byte>(Key, 32, 32).ToArray(); MacKey = new ArraySegment<byte>(Key, 32, 32).ToArray();

4
src/Core/Services/CryptoService.cs
View file

@ -613,9 +613,9 @@ namespace Bit.Core.Services
Buffer.BlockCopy(dataBytes, 0, macDataBytes, ivBytes.Length, dataBytes.Length); Buffer.BlockCopy(dataBytes, 0, macDataBytes, ivBytes.Length, dataBytes.Length);
byte[] macKey = null; byte[] macKey = null;
if(key.MacKey != null) if(theKey.MacKey != null)
{ {
macKey = key.MacKey; macKey = theKey.MacKey;
} }
byte[] macBytes = null; byte[] macBytes = null;
if(mac != null) if(mac != null)