Skip to content

PoC TLS resume on Linux client #64369

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 17 commits into from
Mar 25, 2022
Merged

PoC TLS resume on Linux client #64369

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e52b12f
TLS resume on client
wfurt Jan 27, 2022
1811028
Merge branch 'main' of https://github.com/dotnet/runtime into tlsClie…
wfurt Jan 27, 2022
f9a2eab
shim functions introduced in 1.1.1
wfurt Feb 1, 2022
9b87b4e
add missing struct
wfurt Feb 1, 2022
fd5635d
disable resume on old OpenSSL
wfurt Feb 3, 2022
99240d4
feedback from review
wfurt Feb 4, 2022
342d916
fix source build
wfurt Feb 4, 2022
acd3b46
Merge branch 'main' of https://github.com/dotnet/runtime into tlsClie…
wfurt Feb 18, 2022
51ec560
update comment
wfurt Feb 18, 2022
dc453d4
Merge branch 'main' of https://github.com/dotnet/runtime into tlsClie…
wfurt Feb 25, 2022
2170ec4
feedback from review
wfurt Mar 3, 2022
929e5c7
Merge branch 'main' of https://github.com/dotnet/runtime into tlsClie…
wfurt Mar 3, 2022
c2c8580
feedback from review
wfurt Mar 3, 2022
d2ab19b
Merge branch 'main' of https://github.com/dotnet/runtime into tlsClie…
wfurt Mar 3, 2022
576d4d5
avoild client resume on old OpenSSL
wfurt Mar 5, 2022
876b5a0
Merge branch 'main' of https://github.com/dotnet/runtime into tlsClie…
wfurt Mar 7, 2022
434ab42
Merge branch 'main' of https://github.com/dotnet/runtime into tlsClie…
wfurt Mar 24, 2022
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
Prev Previous commit
Merge branch 'main' of https://github.com/dotnet/runtime into tlsClie… 
…ntResume
  • Loading branch information
@wfurt
wfurt committed Mar 24, 2022
commit 434ab421a907e107df13193c68697436cddfb184
16 changes: 8 additions & 8 deletions src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Ssl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ internal static partial class Ssl
[return: MarshalAs(UnmanagedType.Bool)]
internal static partial bool SslSetTlsExtHostName(SafeSslHandle ssl, string host);

[GeneratedDllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslGetServerName")]
[LibraryImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslGetServerName")]
internal static unsafe partial IntPtr SslGetServerName(IntPtr ssl);

[GeneratedDllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslSetSession")]
[LibraryImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslSetSession")]
internal static unsafe partial int SslSetSession(SafeSslHandle ssl, IntPtr session);

[GeneratedDllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslGet0AlpnSelected")]
[LibraryImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslGet0AlpnSelected")]
internal static partial void SslGetAlpnSelected(SafeSslHandle ssl, out IntPtr protocol, out int len);

internal static byte[]? SslGetAlpnSelected(SafeSslHandle ssl)
Expand Down Expand Up @@ -152,10 +152,10 @@ internal static partial class Ssl
[LibraryImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslGetData")]
internal static partial IntPtr SslGetData(IntPtr ssl);

[GeneratedDllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslGetData")]
[LibraryImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslGetData")]
internal static partial IntPtr SslGetData(SafeSslHandle ssl);

[GeneratedDllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslSetData")]
[LibraryImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslSetData")]
internal static partial int SslSetData(SafeSslHandle ssl, IntPtr data);

[LibraryImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslSetData")]
Expand All @@ -176,13 +176,13 @@ internal static partial class Ssl
[LibraryImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_Tls13Supported")]
private static partial int Tls13SupportedImpl();

[GeneratedDllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslSessionGetHostname")]
[LibraryImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslSessionGetHostname")]
internal static partial IntPtr SessionGetHostname(IntPtr session);

[GeneratedDllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslSessionFree")]
[LibraryImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslSessionFree")]
internal static partial void SessionFree(IntPtr session);

[GeneratedDllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslSessionSetHostname")]
[LibraryImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslSessionSetHostname")]
internal static partial int SessionSetHostname(IntPtr session, IntPtr name);

internal static class Capabilities
Expand Down
10 changes: 5 additions & 5 deletions src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.SslCtx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ internal static partial class Ssl
[LibraryImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslCtxDestroy")]
internal static partial void SslCtxDestroy(IntPtr ctx);

[GeneratedDllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslCtxGetData")]
[LibraryImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslCtxGetData")]
internal static partial IntPtr SslCtxGetData(IntPtr ctx);

[GeneratedDllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslCtxSetData")]
[LibraryImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslCtxSetData")]
internal static partial int SslCtxSetData(SafeSslContextHandle ctx, IntPtr data);

[GeneratedDllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslCtxSetData")]
[LibraryImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslCtxSetData")]
internal static partial int SslCtxSetData(IntPtr ctx, IntPtr data);

[GeneratedDllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslCtxSetAlpnSelectCb")]
[LibraryImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslCtxSetAlpnSelectCb")]
internal static unsafe partial void SslCtxSetAlpnSelectCb(SafeSslContextHandle ctx, delegate* unmanaged<IntPtr, byte**, byte*, byte*, uint, IntPtr, int> callback, IntPtr arg);

[GeneratedDllImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslCtxSetCaching")]
[LibraryImport(Libraries.CryptoNative, EntryPoint = "CryptoNative_SslCtxSetCaching")]
internal static unsafe partial int SslCtxSetCaching(SafeSslContextHandle ctx, int mode, delegate* unmanaged<IntPtr, IntPtr, int> neewSessionCallback, delegate* unmanaged<IntPtr, IntPtr, void> removeSessionCallback);

internal static bool AddExtraChainCertificates(SafeSslContextHandle ctx, X509Certificate2[] chain)
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.