Skip to content

Improve test ALPN detection #36928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wfurt merged 4 commits into from
May 27, 2020
Merged

Improve test ALPN detection #36928

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7bf5f09
Improve test ALPN detection
May 23, 2020
ec865a0
feedback from review
May 26, 2020
21cb01a
add tvos
May 26, 2020
53387ba
update casing
May 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ public static partial class PlatformDetection
public static bool IsMonoInterpreter => GetIsRunningOnMonoInterpreter();
public static bool IsFreeBSD => RuntimeInformation.IsOSPlatform(OSPlatform.Create("FREEBSD"));
public static bool IsNetBSD => RuntimeInformation.IsOSPlatform(OSPlatform.Create("NETBSD"));
public static bool IsiOS => RuntimeInformation.IsOSPlatform(OSPlatform.Create("IOS"));
public static bool IstvOS => RuntimeInformation.IsOSPlatform(OSPlatform.Create("TVOS"));

public static bool IsArmProcess => RuntimeInformation.ProcessArchitecture == Architecture.Arm;
public static bool IsNotArmProcess => !IsArmProcess;
Expand Down Expand Up @@ -109,11 +111,13 @@ public static bool IsNonZeroLowerBoundArraySupported
// Windows - Schannel supports alpn from win8.1/2012 R2 and higher.
// Linux - OpenSsl supports alpn from openssl 1.0.2 and higher.
// OSX - SecureTransport doesn't expose alpn APIs. TODO https://github.com/dotnet/runtime/issues/27727
public static bool IsOpenSslSupported => IsLinux || IsFreeBSD;

public static bool SupportsAlpn => (IsWindows && !IsWindows7) ||
((!IsOSX && !IsWindows) &&
(IsOpenSslSupported &&
(OpenSslVersion.Major >= 1 && (OpenSslVersion.Minor >= 1 || OpenSslVersion.Build >= 2)));

public static bool SupportsClientAlpn => SupportsAlpn || (IsOSX && Environment.OSVersion.Version > new Version(10, 12));
public static bool SupportsClientAlpn => SupportsAlpn || IsOSX || IsiOS || IstvOS;

// OpenSSL 1.1.1 and above.
public static bool SupportsTls13 => GetTls13Support();
Expand Down Expand Up @@ -261,16 +265,18 @@ private static bool GetTls13Support()
// assume no if key is missing or on error.
return false;
}
else if (IsOSX)
else if (IsOSX || IsiOS || IstvOS)
{
// [ActiveIssue("https://github.com/dotnet/runtime/issues/1979")]
return false;
}
else
else if (IsOpenSslSupported)
{
// Covers Linux and FreeBSD
return OpenSslVersion >= new Version(1,1,1);
}

Copy link
Member

@mdh1418 mdh1418 May 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: remove extra line

return false;
}

private static bool GetIsRunningOnMonoInterpreter()
Expand Down