]> git.deb.at Git - rhonda/impostor.hazel.git/commitdiff
Fix tests on linux
authorjs6pak <kubastaron@hotmail.com>
Wed, 31 Mar 2021 11:37:54 +0000 (13:37 +0200)
committerjs6pak <kubastaron@hotmail.com>
Fri, 2 Apr 2021 21:13:37 +0000 (23:13 +0200)
Hazel.UnitTests/Dtls/ConnectionTests.cs
Hazel.UnitTests/Utils.cs

index 0b9073e88f1d068e80adf60c62e6cf609e399534..bc8207fbae99dd9dc00351fc8bd9386ddfb1f6e6 100644 (file)
@@ -72,16 +72,13 @@ IsdbLCwHYD3GVgk/D7NVxyU=
         private static X509Certificate2 GetCertificateForServer()
         {
             RSA privateKey = Utils.DecodeRSAKeyFromPEM(TestPrivateKey);
-            X509Certificate2 privateCertificate = new X509Certificate2();
-            privateCertificate.Import(Utils.DecodePEM(TestCertificate));
-            privateCertificate.PrivateKey = privateKey;
+            X509Certificate2 privateCertificate = new X509Certificate2(Utils.DecodePEM(TestCertificate)).CopyWithPrivateKey(privateKey);
             return privateCertificate;
         }
 
         private static X509Certificate2Collection GetCertificateForClient()
         {
-            X509Certificate2 publicCertificate = new X509Certificate2();
-            publicCertificate.Import(Utils.DecodePEM(TestCertificate));
+            X509Certificate2 publicCertificate = new X509Certificate2(Utils.DecodePEM(TestCertificate));
 
             X509Certificate2Collection clientCertificates = new X509Certificate2Collection();
             clientCertificates.Add(publicCertificate);
index 988cb5874e1789f1c2577272ef9a0682be5b6f8b..ad60abc6758c894650cdcf427e28b3be452b4394 100644 (file)
@@ -87,11 +87,18 @@ namespace Hazel.UnitTests
             return result.ToArray();
         }
 
+        private static RSA CreateRSAProvider(RSAParameters rp)
+        {
+            RSACryptoServiceProvider rsaCsp = new RSACryptoServiceProvider();
+            rsaCsp.ImportParameters(rp);
+            return rsaCsp;
+        }
+
         public static RSA DecodeRSAKeyFromPEM(string pemData)
         {
             PemReader pemReader = new PemReader(new StringReader(pemData));
             RsaPrivateCrtKeyParameters keyParameters = (RsaPrivateCrtKeyParameters)pemReader.ReadObject();
-            return DotNetUtilities.ToRSA(keyParameters);
+            return CreateRSAProvider(DotNetUtilities.ToRSAParameters(keyParameters));
         }
     }
 }