fixing 4.8.1 tests

Author: slorello89

tests/NRedisStack.Tests/Examples/ExamplesTests.cs

@@ -7,6 +7,7 @@
 using NRedisStack.Search;
 using NRedisStack.Search.Aggregation;
 using NRedisStack.Search.Literals.Enums;
+using Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.Crypto.Parameters;
 using Org.BouncyCastle.Math;
 using Org.BouncyCastle.OpenSsl;
@@ -300,7 +301,7 @@ public void TestJsonConvert()
 
 #if NET481
     [Fact]
-    public void TestRedisCloudConnection()
+    public void TestRedisCloudConnection_net481()
     {
         var root = Path.GetFullPath(Directory.GetCurrentDirectory());
         var redisCaPath = Path.GetFullPath(Path.Combine(root, "redis_ca.pem"));
@@ -317,12 +318,8 @@ public void TestRedisCloudConnection()
         var rsa = RSA.Create();
 
         var redisUserPrivateKeyText = File.ReadAllText(redisUserPrivateKeyPath);
-        var pemFileData = File.ReadAllLines(redisUserPrivateKeyPath).Where(x => !x.StartsWith("-"));
-        var binaryEncoding = Convert.FromBase64String(string.Join(null, pemFileData));
+        rsa.ImportParameters(ImportPrivateKey(redisUserPrivateKeyText));
 
-        rsa.ImportParameters(ImportPrivateKey(File.ReadAllText(redisUserPrivateKeyPath)));
-        redisUserCertificate.CopyWithPrivateKey(rsa);
-        rsa.ImportParameters(ImportPrivateKey(File.ReadAllText(redisUserPrivateKeyText)));
         var clientCert = redisUserCertificate.CopyWithPrivateKey(rsa);
 
         // Connect to Redis Cloud
@@ -333,7 +330,7 @@ public void TestRedisCloudConnection()
             Password = password
         };
 
-        redisConfiguration.CertificateSelection += (_, _, _, _, _) => clientCert;
+        redisConfiguration.CertificateSelection += (_, _, _, _, _) => new X509Certificate2(clientCert.Export(X509ContentType.Pfx));
 
         redisConfiguration.CertificateValidation += (_, cert, _, errors) =>
         {
@@ -373,18 +370,26 @@ public void TestRedisCloudConnection()
 
     public static RSAParameters ImportPrivateKey(string pem)
     {
-        PemReader pr = new PemReader(new StringReader(pem));
-        RsaPrivateCrtKeyParameters privKey = (RsaPrivateCrtKeyParameters)pr.ReadObject();
+        using var sr = new StringReader(pem);
+        PemReader pr = new PemReader(sr);
         RSAParameters rp = new RSAParameters();
-        rp.Modulus = privKey.Modulus.ToByteArrayUnsigned();
-        rp.Exponent = privKey.PublicExponent.ToByteArrayUnsigned();
-        rp.P = privKey.P.ToByteArrayUnsigned();
-        rp.Q = privKey.Q.ToByteArrayUnsigned();
-        rp.D = ConvertRSAParametersField(privKey.Exponent, rp.Modulus.Length);
-        rp.DP = ConvertRSAParametersField(privKey.DP, rp.P.Length);
-        rp.DQ = ConvertRSAParametersField(privKey.DQ, rp.Q.Length);
-        rp.InverseQ = ConvertRSAParametersField(privKey.QInv, rp.Q.Length);
-
+        while (sr.Peek() != -1)
+        {
+            var privKey = pr.ReadObject() as AsymmetricCipherKeyPair;
+            var pkParamaters = (RsaPrivateCrtKeyParameters)privKey.Private;
+            if (privKey != null)
+            {
+                rp.Modulus = pkParamaters.Modulus.ToByteArrayUnsigned();
+                rp.Exponent = pkParamaters.PublicExponent.ToByteArrayUnsigned();
+                rp.P = pkParamaters.P.ToByteArrayUnsigned();
+                rp.Q = pkParamaters.Q.ToByteArrayUnsigned();
+                rp.D = ConvertRSAParametersField(pkParamaters.Exponent, rp.Modulus.Length);
+                rp.DP = ConvertRSAParametersField(pkParamaters.DP, rp.P.Length);
+                rp.DQ = ConvertRSAParametersField(pkParamaters.DQ, rp.Q.Length);
+                rp.InverseQ = ConvertRSAParametersField(pkParamaters.QInv, rp.Q.Length);
+            }
+        }
+        pr.ReadObject();
         return rp;
     }