Skip to content
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

add EventSource log to alpn on macOS #79737

Merged
merged 1 commit into from
Dec 16, 2022
Merged

add EventSource log to alpn on macOS #79737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...libraries/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Ssl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ internal static unsafe void SslCtxSetAlpnProtos(SafeSslHandle ctx, List<SslAppli
}
}

internal static unsafe bool SslCtxSetAlpnProtocol(SafeSslHandle ctx, SslApplicationProtocol protocol)
internal static unsafe int SslCtxSetAlpnProtocol(SafeSslHandle ctx, SslApplicationProtocol protocol)
{
int osStatus;

Expand All @@ -440,7 +440,7 @@ internal static unsafe bool SslCtxSetAlpnProtocol(SafeSslHandle ctx, SslApplicat
}
}

return osStatus == 0;
return osStatus;
}

internal static byte[]? SslGetAlpnSelected(SafeSslHandle ssl)
Expand Down
10 changes: 9 additions & 1 deletion src/libraries/System.Net.Security/src/System/Net/Security/SslStreamPal.OSX.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,17 @@ public static SecurityStatusPal SelectApplicationProtocol(
ReadOnlySpan<byte> protocol = protocols.Slice(1, length);
if (protocol.SequenceCompareTo<byte>(applicationProtcol.Protocol.Span) == 0)
{
if (Interop.AppleCrypto.SslCtxSetAlpnProtocol(context.SslContext, applicationProtcol))
int osStatus = Interop.AppleCrypto.SslCtxSetAlpnProtocol(context.SslContext, applicationProtcol);
if (osStatus == 0)
{
context.SelectedApplicationProtocol = applicationProtcol;
if (NetEventSource.Log.IsEnabled())
NetEventSource.Info(context, $"Selected '{applicationProtcol}' ALPN");
}
else
{
if (NetEventSource.Log.IsEnabled())
NetEventSource.Error(context, $"Failed to set ALPN: {osStatus}");
}

// We ignore failure and we will move on with ALPN
Expand Down