From cff8073b6457e70eaaa95b3e2bf21ad09cdbbfb7 Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Thu, 7 Aug 2025 23:17:18 +0200 Subject: [PATCH] Fix after renames in SharpAESCrypt --- ReleaseBuilder/Build/Command.GpgSign.cs | 2 +- ReleaseBuilder/Build/Command.cs | 4 ++-- ReleaseBuilder/CreateKey/Command.cs | 2 +- ReleaseBuilder/EncryptionHelper.cs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ReleaseBuilder/Build/Command.GpgSign.cs b/ReleaseBuilder/Build/Command.GpgSign.cs index 99b6bda16..aa837841f 100644 --- a/ReleaseBuilder/Build/Command.GpgSign.cs +++ b/ReleaseBuilder/Build/Command.GpgSign.cs @@ -96,7 +96,7 @@ public static partial class Command { using var ms = new MemoryStream(); using var fs = File.OpenRead(rtcfg.Configuration.ConfigFiles.GpgKeyfile); - SharpAESCrypt.SharpAESCrypt.Decrypt(rtcfg.KeyfilePassword, fs, ms); + SharpAESCrypt.AESCrypt.Decrypt(rtcfg.KeyfilePassword, fs, ms); var parts = System.Text.Encoding.UTF8.GetString(ms.ToArray()).Split('\n', 2, StringSplitOptions.RemoveEmptyEntries); return (parts[0], parts[1]); } diff --git a/ReleaseBuilder/Build/Command.cs b/ReleaseBuilder/Build/Command.cs index 22de7be1f..40722621c 100644 --- a/ReleaseBuilder/Build/Command.cs +++ b/ReleaseBuilder/Build/Command.cs @@ -1027,14 +1027,14 @@ public static partial class Command { using var ms = new MemoryStream(); using var fs = File.OpenRead(keyfile); - SharpAESCrypt.SharpAESCrypt.Decrypt(password, fs, ms); + SharpAESCrypt.AESCrypt.Decrypt(password, fs, ms); var rsa = RSA.Create(); rsa.FromXmlString(System.Text.Encoding.UTF8.GetString(ms.ToArray())); return rsa; } - catch (SharpAESCrypt.SharpAESCrypt.WrongPasswordException) + catch (SharpAESCrypt.WrongPasswordException) { if (!askForNewPassword) throw; diff --git a/ReleaseBuilder/CreateKey/Command.cs b/ReleaseBuilder/CreateKey/Command.cs index 8443896d7..12953bfde 100644 --- a/ReleaseBuilder/CreateKey/Command.cs +++ b/ReleaseBuilder/CreateKey/Command.cs @@ -57,7 +57,7 @@ public static class Command var newkey = RSA.Create(2048).ToXmlString(true); using (var fs = File.OpenWrite(keyfile.FullName)) using (var ms = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(newkey))) - SharpAESCrypt.SharpAESCrypt.Encrypt(keyfilePassword, ms, fs); + SharpAESCrypt.AESCrypt.Encrypt(keyfilePassword, ms, fs); Console.WriteLine($"Keyfile created at {keyfile.FullName}"); }, passwordOption, keyfileArgument); diff --git a/ReleaseBuilder/EncryptionHelper.cs b/ReleaseBuilder/EncryptionHelper.cs index 8d332e5c9..05c0336ca 100644 --- a/ReleaseBuilder/EncryptionHelper.cs +++ b/ReleaseBuilder/EncryptionHelper.cs @@ -34,7 +34,7 @@ public static class EncryptionHelper { using var ms = new MemoryStream(); using var fs = File.OpenRead(passwordfile); - SharpAESCrypt.SharpAESCrypt.Decrypt(password, fs, ms); + SharpAESCrypt.AESCrypt.Decrypt(password, fs, ms); return Encoding.UTF8.GetString(ms.ToArray()); }