Updated code to be compatible with .NET 6.

Tape-Worm · Nov 11, 2021 · 39ed8f6 · 39ed8f6
1 parent 0afb39e
commit 39ed8f6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 27 deletions.
diff --git a/Gorgon/Gorgon.Core/Plugins/GorgonMefPluginCache.cs b/Gorgon/Gorgon.Core/Plugins/GorgonMefPluginCache.cs
@@ -329,21 +329,9 @@ public static AssemblySigningResults VerifyAssemblyStrongName(string assemblyPat
                 return AssemblySigningResults.NotSigned;
             }
 
-            var clrStrongNameClsId = new Guid("B79B0ACD-F5CD-409b-B5A5-A16244610B92");
-            var clrStrongNameriid = new Guid("9FD93CCF-3280-4391-B3A9-96E1CDE77C8D");
-
-            var strongName = (IClrStrongName)RuntimeEnvironment.GetRuntimeInterfaceAsObject(clrStrongNameClsId, clrStrongNameriid);
-
-            int result = strongName.StrongNameSignatureVerificationEx(assemblyPath, true, out bool wasVerified);
-
-            if ((result != 0) || (!wasVerified))
-            {
-                return AssemblySigningResults.NotSigned;
-            }
-
             if (publicKey is null)
             {
-                return AssemblySigningResults.Signed;
+                return AssemblySigningResults.NotSigned;
             }
 
             var assemblyName = AssemblyName.GetAssemblyName(assemblyPath);

diff --git a/Gorgon/Gorgon.Core/Security/Aes256Encryption.cs b/Gorgon/Gorgon.Core/Security/Aes256Encryption.cs
@@ -72,7 +72,7 @@ public byte[] Decrypt(byte[] data)
                 return Array.Empty<byte>();
             }
 
-            using var aes = new AesManaged();
+            using var aes = Aes.Create();
             using ICryptoTransform transform = aes.CreateDecryptor(_ivKey.Key, _ivKey.IV);
             using MemoryStream stream = _streamManager.GetStream();
             using var writer = new CryptoStream(stream, transform, CryptoStreamMode.Write);
@@ -104,7 +104,7 @@ public byte[] Encrypt(byte[] data)
                 return Array.Empty<byte>();
             }
 
-            using var aes = new AesManaged();
+            using var aes = Aes.Create();
             using ICryptoTransform transform = aes.CreateEncryptor(_ivKey.Key, _ivKey.IV);
             using MemoryStream stream = _streamManager.GetStream();
             using var writer = new CryptoStream(stream, transform, CryptoStreamMode.Write);
@@ -208,7 +208,7 @@ public static (byte[] IV, byte[] Key) GenerateIvKey(string password, byte[] salt
                 rndGen.GetBytes(salt);
             }
 
-            using var aes = new AesManaged();
+            using var aes = Aes.Create();
             using var hashGen = new Rfc2898DeriveBytes(password, salt, 100);
             return (hashGen.GetBytes(aes.BlockSize / 8), hashGen.GetBytes(aes.KeySize / 8));
         }

diff --git a/Gorgon/Gorgon.Core/Security/PasswordHasher.cs b/Gorgon/Gorgon.Core/Security/PasswordHasher.cs
@@ -58,21 +58,13 @@ public static class PasswordHasher
 		#endregion
 
 		#region Methods.
+#if NET6_0_OR_GREATER
 		/// <summary>
 		/// Function to generate a salt value.
 		/// </summary>
 		/// <returns>A byte array containing the salt data.</returns>
-		public static byte[] GenerateSalt()
-		{
-			byte[] result = new byte[SaltLength];
-
-			using (var cryptoRngProvider = new RNGCryptoServiceProvider())
-			{
-				cryptoRngProvider.GetBytes(result);
-			}
-
-			return result;
-		}
+		public static byte[] GenerateSalt() => RandomNumberGenerator.GetBytes(SaltLength);
+#endif
 
 		/// <summary>
 		/// Function to hash and salt a password and return a base-64 encoded string containing encrypted hash and salt values.