Add support of other key providers to Quick Unlock

Rookiestyle · Aug 28, 2021 · 7665433 · 7665433
1 parent 9474ba5
commit 7665433
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1")]
-[assembly: AssemblyFileVersion("1.1")]
+[assembly: AssemblyVersion("1.2")]
+[assembly: AssemblyFileVersion("1.2")]
diff --git a/src/QuickUnlockKeyProv.cs b/src/QuickUnlockKeyProv.cs
@@ -31,6 +31,8 @@ public class QuickUnlockOldKeyInfo
 		public ProtectedString QuickUnlockKey = ProtectedString.EmptyEx;
 		public ProtectedBinary pwHash = null;
 		public string keyFile = string.Empty;
+		public string CustomKeyProviderName = string.Empty;
+		public ProtectedBinary CustomKeyProviderData = null;
 		public bool account = false;
 		public ProtectedBinary PINCheck = null;
 		public bool HasPassword = false;
@@ -111,6 +113,12 @@ private static void RestoreOldMasterKeyInternal(PwDatabase db, IOConnectionInfo
 				ck.AddUserKey(p);
 			}
 			if (!string.IsNullOrEmpty(quOldKey.keyFile)) ck.AddUserKey(new KcpKeyFile(quOldKey.keyFile));
+			if (!string.IsNullOrEmpty(quOldKey.CustomKeyProviderName))
+			{
+				var ckHashedData = quOldKey.CustomKeyProviderData.ReadData();
+				ck.AddUserKey(new KcpCustomKey(quOldKey.CustomKeyProviderName, ckHashedData, false));
+				MemUtil.ZeroByteArray(ckHashedData);
+			}
 			if (quOldKey.account) ck.AddUserKey(new KcpUserAccount());
 
 			if (db != null) db.MasterKey = ck;
@@ -147,7 +155,7 @@ internal static QuickUnlockOldKeyInfo GetOldKey(PwDatabase db)
 			if ((quOldKey.pwHash != null) && (quOldKey.pwHash.Length != 0))
 				quOldKey.pwHash = DecryptKey(quOldKey.QuickUnlockKey, quOldKey.pwHash);
 			m_originalKey.Remove(db.IOConnectionInfo.Path);
-				return quOldKey;
+			return quOldKey;
 		}
 
 		internal static void AddDb(PwDatabase db, ProtectedString QuickUnlockKey, bool savePw)
@@ -171,6 +179,11 @@ private static void AddOldMasterKey(PwDatabase db, ProtectedString QuickUnlockKe
 			}
 			if (db.MasterKey.ContainsType(typeof(KcpKeyFile)))
 				quOldKey.keyFile = (db.MasterKey.GetUserKey(typeof(KcpKeyFile)) as KcpKeyFile).Path;
+			if (db.MasterKey.ContainsType(typeof(KcpCustomKey)))
+			{
+				quOldKey.CustomKeyProviderName = (db.MasterKey.GetUserKey(typeof(KcpCustomKey)) as KcpCustomKey).Name;
+				quOldKey.CustomKeyProviderData = (db.MasterKey.GetUserKey(typeof(KcpCustomKey)) as KcpCustomKey).KeyData;
+			}
 			quOldKey.account = db.MasterKey.ContainsType(typeof(KcpUserAccount));
 			quOldKey.PINCheck = EncryptKey(QuickUnlockKey, new ProtectedBinary(true, m_PINCheck));
 			int iValidity = LockAssistConfig.GetQuickUnlockOptions(db).QU_ValiditySeconds;

diff --git a/version.info b/version.info
@@ -1,4 +1,4 @@
 :
-LockAssist:1.1
+LockAssist:1.2
 LockAssist!de:2
 :