Skip to content

fix MAC_CTX creation with OpenSSL 3 #3436

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
merged 1 commit into from
Feb 16, 2023
Merged

fix MAC_CTX creation with OpenSSL 3 #3436

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
2 changes: 0 additions & 2 deletions .azure/azure-pipelines.ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,6 @@ stages:
platform: linux
tls: openssl3
config: Release
extraTestArgs: -Filter -*LoadBalanced*:*ResumeRejection*:*Reject0Rtt*

- stage: test_bvt_winkernel_release
displayName: BVT Windows Kernel Release
Expand Down Expand Up @@ -714,7 +713,6 @@ stages:
image: ubuntu-latest
platform: linux
tls: openssl3
extraTestArgs: -Filter -*LoadBalanced*:*ResumeRejection*:*Reject0Rtt*
- template: ./templates/run-bvt.yml
parameters:
image: macOS-12
Expand Down
6 changes: 5 additions & 1 deletion src/platform/tls_openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,7 @@ CxPlatTlsOnSessionTicketKeyNeeded(
)
{
#ifdef IS_OPENSSL_3
OSSL_PARAM params[2];
OSSL_PARAM params[3];
#endif
CXPLAT_TLS* TlsContext = SSL_get_app_data(Ssl);
QUIC_TICKET_KEY_CONFIG* TicketKey = TlsContext->SecConfig->TicketKey;
Expand Down Expand Up @@ -803,6 +803,8 @@ CxPlatTlsOnSessionTicketKeyNeeded(
TicketKey->Material,
32);
params[1] =
OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST, "sha256", 0);
params[2] =
OSSL_PARAM_construct_end();
EVP_MAC_CTX_set_params(hctx, params);
#else
Expand All @@ -824,6 +826,8 @@ CxPlatTlsOnSessionTicketKeyNeeded(
TicketKey->Material,
32);
params[1] =
OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST, "sha256", 0);
params[2] =
OSSL_PARAM_construct_end();
EVP_MAC_CTX_set_params(hctx, params);
#else
Expand Down