Adjust ChasChaPoly crypto test for mariner

dotnet · Aug 13, 2021 · 5853811 · 5853811
1 parent 2daa339
commit 5853811
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Unix.cs b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Unix.cs
@@ -28,6 +28,7 @@ public static partial class PlatformDetection
         public static bool IsUbuntu1710OrHigher => IsDistroAndVersionOrHigher("ubuntu", 17, 10);
         public static bool IsUbuntu1804 => IsDistroAndVersion("ubuntu", 18, 04);
         public static bool IsUbuntu1810OrHigher => IsDistroAndVersionOrHigher("ubuntu", 18, 10);
+        public static bool IsMariner => IsDistroAndVersion("mariner");
         public static bool IsSLES => IsDistroAndVersion("sles");
         public static bool IsTizen => IsDistroAndVersion("tizen");
         public static bool IsFedora => IsDistroAndVersion("fedora");

diff --git a/src/libraries/System.Security.Cryptography.Algorithms/tests/ChaCha20Poly1305Tests.cs b/src/libraries/System.Security.Cryptography.Algorithms/tests/ChaCha20Poly1305Tests.cs
@@ -453,6 +453,11 @@ public static void CheckIsSupported()
                 // Android with API Level 28 is the minimum API Level support for ChaChaPoly1305.
                 expectedIsSupported = OperatingSystem.IsAndroidVersionAtLeast(28);
             }
+            else if (PlatformDetection.IsMariner)
+            {
+                // OpenSSL is present, and a high enough version,
+                // but the distro build options turned off ChaCha/Poly.
+            }
             else if (PlatformDetection.OpenSslPresentOnSystem &&
                 (PlatformDetection.IsOSX || PlatformDetection.IsOpenSslSupported))
             {