fixed login problem for older .2fa files

2fast-team · Mar 23, 2023 · f912da4 · f912da4
1 parent 0b996e1
commit f912da4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Project2FA.Core/Services/JSON/NewtonsoftJSONService.cs b/Project2FA.Core/Services/JSON/NewtonsoftJSONService.cs
@@ -67,7 +67,7 @@ public bool TrySerialize(object parameter, out string result)
         public string SerializeEncrypt(string key, byte[] initVectorArray, object value, int encryptionVersion)
         {
             byte[] byteArrayKey;
-            if (encryptionVersion == 1)
+            if (encryptionVersion == 1 || encryptionVersion == 0)
             {
                 byteArrayKey = CryptoService.CreateByteArrayKeyV1(key);
             }
@@ -102,7 +102,7 @@ public string SerializeEncrypt(string key, byte[] initVectorArray, object value,
         public string SerializeEncrypt(byte[] keyArray, byte[] initVectorArray, object value, int encryptionVersion)
         {
             byte[] byteArrayKey;
-            if (encryptionVersion == 1)
+            if (encryptionVersion == 1 || encryptionVersion == 0)
             {
                 byteArrayKey = CryptoService.CreateByteArrayKeyV1(keyArray);
             }
@@ -206,7 +206,7 @@ public bool TryDeserialize<T>(string value, out T result)
         public T DeserializeDecrypt<T>(string key, byte[] initVector, string value, int encryptionVersion)
         {
             byte[] byteArrayKey;
-            if (encryptionVersion == 1)
+            if (encryptionVersion == 1 || encryptionVersion == 0)
             {
                 byteArrayKey = CryptoService.CreateByteArrayKeyV1(key);
             }
@@ -236,7 +236,7 @@ public T DeserializeDecrypt<T>(string key, byte[] initVector, string value, int
         public T DeserializeDecrypt<T>(byte[] keyArray, byte[] initVector, string value, int encryptionVersion)
         {
             byte[] byteArrayKey;
-            if (encryptionVersion == 1)
+            if (encryptionVersion == 1 || encryptionVersion == 0)
             {
                 byteArrayKey = CryptoService.CreateByteArrayKeyV1(keyArray);
             }

diff --git a/Project2FA/Project2FA.UWP/Package.appxmanifest b/Project2FA/Project2FA.UWP/Package.appxmanifest
@@ -5,7 +5,7 @@
          xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
          IgnorableNamespaces="uap mp rescap">
 	<Identity Name="38343JanPhilippWeber.2fastBeta" Publisher="CN=31DBFF9D-D4FF-4E73-808A-7B49119D08D3" Version="1.2.4.0" />
-	<mp:PhoneIdentity PhoneProductId="6e07ecc6-51e6-4bf6-be38-e290abf62222" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
+	<mp:PhoneIdentity PhoneProductId="444c9c36-b7d8-48b0-a562-0a1d5d1e9658" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
 	<Properties>
 		<DisplayName>2fast (Beta)</DisplayName>
 		<PublisherDisplayName>Jan Philipp Weber</PublisherDisplayName>

diff --git a/Project2FA/Project2FA.UWP/Project2FA.UWP.csproj b/Project2FA/Project2FA.UWP/Project2FA.UWP.csproj
@@ -23,7 +23,7 @@
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxBundle>Always</AppxBundle>
-    <AppxBundlePlatforms>x86|x64|arm|arm64</AppxBundlePlatforms>
+    <AppxBundlePlatforms>x64|arm64</AppxBundlePlatforms>
     <PackageCertificateThumbprint>5603522399507011BC16B020D4E00718C66AB93F</PackageCertificateThumbprint>
     <AppInstallerUpdateFrequency>0</AppInstallerUpdateFrequency>
     <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>