Skip to content

Use SSL_ctrl instead of SSL_CTX_ctrl to enable client OCSP stapling #73627

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
bartonjs merged 2 commits into from
Aug 10, 2022
Merged

Use SSL_ctrl instead of SSL_CTX_ctrl to enable client OCSP stapling #73627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fedb907
Use SSL_ctrl instead of SSL_CTX_ctrl to enable client OCSP stapling
bartonjs Aug 9, 2022
c902c40
Merge remote-tracking branch 'dotnet/main' into rhel7_ocsp
bartonjs Aug 10, 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
5 changes: 0 additions & 5 deletions src/libraries/System.Net.Security/tests/FunctionalTests/CertificateValidationRemoteServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,6 @@ public Task ConnectWithRevocation_WithCallback(bool checkRevocation)
[InlineData(true)]
public Task ConnectWithRevocation_StapledOcsp(bool offlineContext)
{
if (PlatformDetection.IsRedHatFamily7 && !offlineContext)
{
throw new SkipTestException("Active test issue https://github.com/dotnet/runtime/issues/71037");
}

// Offline will only work if
// a) the revocation has been checked recently enough that it is cached, or
// b) the server stapled the response
Expand Down
19 changes: 12 additions & 7 deletions src/native/libs/System.Security.Cryptography.Native/pal_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,12 +237,6 @@ SSL_CTX* CryptoNative_SslCtxCreate(const SSL_METHOD* method)
return NULL;
}
}

// Opportunistically request the server present a stapled OCSP response.
if (SSL_CTX_ctrl(ctx, SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE, TLSEXT_STATUSTYPE_ocsp, NULL) != 1)
{
ERR_clear_error();
}
}

return ctx;
Expand Down Expand Up @@ -365,7 +359,18 @@ void CryptoNative_SslCtxSetProtocolOptions(SSL_CTX* ctx, SslProtocols protocols)
SSL* CryptoNative_SslCreate(SSL_CTX* ctx)
{
ERR_clear_error();
return SSL_new(ctx);
SSL* ret = SSL_new(ctx);

if (ret != NULL)
{
// Opportunistically request the server present a stapled OCSP response.
if (SSL_ctrl(ret, SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE, TLSEXT_STATUSTYPE_ocsp, NULL) != 1)
{
ERR_clear_error();
}
}

return ret;
}

int32_t CryptoNative_SslGetError(SSL* ssl, int32_t ret)
Expand Down