Fix for encryption issue #429
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
PureWeen
requested changes
Oct 14, 2018
|
|
||
| namespace Akavache.Tests | ||
| { | ||
| public class BasicEncryptionTests |
There was a problem hiding this comment.
Fix spelling on file name
| @@ -9,6 +9,20 @@ | |||
|
|
|||
| namespace Akavache | |||
| { | |||
| #if PORTABLE ||NET_461 | |||
There was a problem hiding this comment.
The Portable target doesn't get applied to this class as nothing in shared will get applied to netstandard. I realize netstandard 2.0 include the api for this but we probably still don't want to use it. We don't really gain anything from doing that.
What if we simplify the changes in this class down to
using System;
using System.Reactive.Linq;
#if NET_461
using RxCrypt = System.Security.Cryptography;
#else
using RxCrypt = Akavache;
#endif
namespace Akavache
{
public class EncryptionProvider : IEncryptionProvider
{
public IObservable<byte[]> EncryptBlock(byte[] block)
{
return Observable.Return(RxCrypt.ProtectedData.Protect(block, null, RxCrypt.DataProtectionScope.CurrentUser));
}
public IObservable<byte[]> DecryptBlock(byte[] block)
{
return Observable.Return(RxCrypt.ProtectedData.Unprotect(block, null, RxCrypt.DataProtectionScope.CurrentUser));
}
}
}There was a problem hiding this comment.
That is much cleaner.
There was a problem hiding this comment.
I've signed the CLA. Please let me know if there is anything else I need to do.
Changes from pull request.
glennawatson
approved these changes
Oct 16, 2018
PureWeen
approved these changes
Oct 16, 2018
|
Thanks everyone! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a possible fix for #428
This should use the data protection API for .net and .net standard frameworks.