From 7b38286642ee62f4942de2c54eebf5b0c84c4baa Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Tue, 11 Feb 2025 07:29:18 +0100 Subject: [PATCH] use better hash method --- Pilz.Cryptography/Helpers.cs | 6 +++++- Pilz.Cryptography/Pilz.Cryptography.csproj | 2 +- Pilz.Cryptography/SimpleStringCrypter.cs | 14 -------------- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/Pilz.Cryptography/Helpers.cs b/Pilz.Cryptography/Helpers.cs index 7d9ca18..e14aaed 100644 --- a/Pilz.Cryptography/Helpers.cs +++ b/Pilz.Cryptography/Helpers.cs @@ -41,7 +41,11 @@ public static class Helpers var dateTime = DateTime.UtcNow.ToString("yyyyMMddHHmmssfffffff"); var type = typeof(T).ToString(); var together = sn + dateTime + type + var; - var hash = BitConverter.ToString(new HMACMD5().ComputeHash(Encoding.Default.GetBytes(together))).Replace("-", string.Empty); +#if NET5_0_OR_GREATER + var hash = BitConverter.ToString(MD5.HashData(Encoding.Default.GetBytes(together))).Replace("-", string.Empty); +#else + var hash = BitConverter.ToString(MD5.Create().ComputeHash(Encoding.Default.GetBytes(together))).Replace("-", string.Empty); +#endif return hash; } } diff --git a/Pilz.Cryptography/Pilz.Cryptography.csproj b/Pilz.Cryptography/Pilz.Cryptography.csproj index 482feed..2b17e9f 100644 --- a/Pilz.Cryptography/Pilz.Cryptography.csproj +++ b/Pilz.Cryptography/Pilz.Cryptography.csproj @@ -6,7 +6,7 @@ - 2.1.1 + 2.1.2 diff --git a/Pilz.Cryptography/SimpleStringCrypter.cs b/Pilz.Cryptography/SimpleStringCrypter.cs index b4a4203..9100b24 100644 --- a/Pilz.Cryptography/SimpleStringCrypter.cs +++ b/Pilz.Cryptography/SimpleStringCrypter.cs @@ -1,20 +1,6 @@ using System; using System.IO; -/* Nicht gemergte Änderung aus Projekt "Pilz.Cryptography (net6.0)" -Vor: -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Security.Cryptography; -using System.IO; -Nach: -using System.IO; -using System.Linq; -using System.Security.Cryptography; -using System.Text; -using System.Threading.Tasks; -*/ using System.Security.Cryptography; using System.Text;