Resolved merge conflict

fiskaltrust · Jan 23, 2024 · 8925726 · 8925726
1 parent 4d66c72
commit 8925726
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/fiskaltrust.Launcher/Commands/Common.cs b/src/fiskaltrust.Launcher/Commands/Common.cs
@@ -301,28 +301,28 @@ public static async Task<ECDiffieHellman> LoadCurve(Guid cashboxId, string acces
                     Log.Warning($"Error loading or decrypting ECDH curve: {e.Message}. Regenerating new curve.");
                 }
 
-                // Handling offline client ECDH path
+                // Handling offline client ECDH path and regenerating curve logic
+                ECDiffieHellman clientEcdh = CashboxConfigEncryption.CreateCurve();
                 const string offlineClientEcdhPath = "/client.ecdh";
                 if (!dryRun && useOffline && File.Exists(offlineClientEcdhPath))
                 {
-                    var clientEcdh = ECDiffieHellmanExt.Deserialize(await File.ReadAllTextAsync(offlineClientEcdhPath));
                     try
                     {
+                        clientEcdh = ECDiffieHellmanExt.Deserialize(await File.ReadAllTextAsync(offlineClientEcdhPath));
                         File.Delete(offlineClientEcdhPath);
                     }
-                    catch { }
-
-                    return clientEcdh;
+                    catch (Exception ex)
+                    {
+                        Log.Warning($"Failed to use offline ECDH curve: {ex.Message}");
+                    }
                 }
 
-                // Regenerating the curve if it's not loaded or in case of an error
-                var newClientEcdh = CashboxConfigEncryption.CreateCurve();
                 if (!dryRun)
                 {
-                    await File.WriteAllTextAsync(clientEcdhPath, dataProtector.Protect(newClientEcdh.Serialize()));
+                    await File.WriteAllTextAsync(clientEcdhPath, dataProtector.Protect(clientEcdh.Serialize()));
                 }
 
-                return newClientEcdh;
+                return clientEcdh;
             }
         }
     }