wismna/modernkeepasslib
1
0
Fork 0
mirror of https://github.com/wismna/ModernKeePassLib.git synced 2025-10-03 15:40:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Downgrade to net standard 1.2

Browse Source
This commit is contained in:
Geoffroy BONNEVILLE
2020-03-23 18:35:00 +01:00
parent b8240d482f
commit 5067f81189
60 changed files with 1250 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ModernKeePassLib/Security/ProtectedBinary.cs
View File

@@ -21,10 +21,6 @@ using System;
using System.Diagnostics;
using System.Threading;
#if !KeePassUAP
using System.Security.Cryptography;
#endif
using ModernKeePassLib.Cryptography;
using ModernKeePassLib.Cryptography.Cipher;
using ModernKeePassLib.Native;

4
ModernKeePassLib/Security/ProtectedString.cs
View File

@@ -394,8 +394,8 @@ namespace ModernKeePassLib.Security
if(a == null) throw new ArgumentNullException("a");
if(b == null) throw new ArgumentNullException("b");
if(b.IsEmpty) return a;
if(a.IsEmpty) return b;
if(b.IsEmpty) return a.WithProtection(a.IsProtected || b.IsProtected);
if(a.IsEmpty) return b.WithProtection(a.IsProtected || b.IsProtected);
if(!a.IsProtected && !b.IsProtected)
return new ProtectedString(false, a.ReadString() + b.ReadString());