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

use crypto service

Browse source
This commit is contained in:
Kyle Spearrin 2019-04-15 07:56:46 -04:00
parent f228758fb7
commit 4aa5ba2754
2 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Core/Models/Domain/Attachment.cs
View file

@ -1,5 +1,7 @@
using Bit.Core.Models.Data; using Bit.Core.Abstractions;
using Bit.Core.Models.Data;
using Bit.Core.Models.View; using Bit.Core.Models.View;
using Bit.Core.Utilities;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -37,9 +39,21 @@ namespace Bit.Core.Models.Domain
{ {
"FileName" "FileName"
}, orgId); }, orgId);
// TODO: Decrypt key if(Key != null)
{
var cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService");
try
{
var orgKey = await cryptoService.GetOrgKeyAsync(orgId);
var decValue = await cryptoService.DecryptToBytesAsync(Key, orgKey);
view.Key = new SymmetricCryptoKey(decValue);
}
catch
{
// TODO: error?
}
}
return view; return view;
} }

24
src/Core/Models/Domain/CipherString.cs
View file

@ -1,4 +1,6 @@
using Bit.Core.Enums; using Bit.Core.Abstractions;
using Bit.Core.Enums;
using Bit.Core.Utilities;
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -14,7 +16,7 @@ namespace Bit.Core.Models.Domain
{ {
throw new ArgumentNullException(nameof(data)); throw new ArgumentNullException(nameof(data));
} }
if(!string.IsNullOrWhiteSpace(iv)) if(!string.IsNullOrWhiteSpace(iv))
{ {
EncryptedString = string.Format("{0}.{1}|{2}", (byte)encryptionType, iv, data); EncryptedString = string.Format("{0}.{1}|{2}", (byte)encryptionType, iv, data);
@ -97,14 +99,24 @@ namespace Bit.Core.Models.Domain
public string Data { get; private set; } public string Data { get; private set; }
public string Mac { get; private set; } public string Mac { get; private set; }
public Task<string> DecryptAsync(string orgId = null) public async Task<string> DecryptAsync(string orgId = null)
{ {
if(_decryptedValue == null) if(_decryptedValue != null)
{ {
// TODO return _decryptedValue;
} }
return Task.FromResult(_decryptedValue); var cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService");
try
{
var orgKey = await cryptoService.GetOrgKeyAsync(orgId);
_decryptedValue = await cryptoService.DecryptToUtf8Async(this, orgKey);
}
catch
{
_decryptedValue = "[error: cannot decrypt]";
}
return _decryptedValue;
} }
} }
} }