Skip to content

Add 1RTT secrets into TlsSecrets for openssl #5222

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
guhetier merged 5 commits into from
Jul 31, 2025
+36 −2
Merged

Add 1RTT secrets into TlsSecrets for openssl #5222

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
581a232
Add 1RTT secrets into TlsSecrets for openssl
nhorman Jul 3, 2025
8bf0eec
fixup! Add 1RTT secrets into TlsSecrets for openssl
nhorman Jul 4, 2025
2a6d17a
fixup! Add 1RTT secrets into TlsSecrets for openssl
nhorman Jul 7, 2025
7c82ab4
Update src/platform/tls_openssl.c
nhorman Jul 15, 2025
fa88d15
Make sure UniquePtrs get destructed after MsQuicRegistration
nhorman Jul 30, 2025
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
33 changes: 33 additions & 0 deletions src/platform/tls_openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,7 @@ static int QuicTlsYieldSecret(SSL *S, uint32_t ProtLevel,
// on whether we are a server, what type of key we're writing
// and the Direction (1 for write, 0 for read)
//
TlsContext->TlsSecrets->SecretLength = (uint8_t)SecretLen;
switch(KeyType) {
case QUIC_PACKET_KEY_HANDSHAKE:
if (TlsContext->IsServer) {
Expand Down Expand Up @@ -679,6 +680,38 @@ static int QuicTlsYieldSecret(SSL *S, uint32_t ProtLevel,
}
break;
case QUIC_PACKET_KEY_1_RTT:
if (TlsContext->IsServer) {
if (AData->SecretSet[ProtLevel][DIR_READ].Secret != NULL) {
memcpy(TlsContext->TlsSecrets->ClientTrafficSecret0,
AData->SecretSet[ProtLevel][DIR_READ].Secret, AData->SecretSet[ProtLevel][DIR_READ].SecretLen);
TlsContext->TlsSecrets->IsSet.ClientTrafficSecret0 = TRUE;
}
if (AData->SecretSet[ProtLevel][DIR_WRITE].Secret != NULL) {
memcpy(TlsContext->TlsSecrets->ServerTrafficSecret0,
AData->SecretSet[ProtLevel][DIR_WRITE].Secret, AData->SecretSet[ProtLevel][DIR_WRITE].SecretLen);
TlsContext->TlsSecrets->IsSet.ServerTrafficSecret0 = TRUE;
}
} else {
if (AData->SecretSet[ProtLevel][DIR_READ].Secret != NULL) {
memcpy(TlsContext->TlsSecrets->ServerTrafficSecret0,
AData->SecretSet[ProtLevel][DIR_READ].Secret, AData->SecretSet[ProtLevel][DIR_READ].SecretLen);
TlsContext->TlsSecrets->IsSet.ServerTrafficSecret0 = TRUE;
}
if (AData->SecretSet[ProtLevel][DIR_WRITE].Secret != NULL) {
memcpy(TlsContext->TlsSecrets->ClientTrafficSecret0,
AData->SecretSet[ProtLevel][DIR_WRITE].Secret, AData->SecretSet[ProtLevel][DIR_WRITE].SecretLen);
TlsContext->TlsSecrets->IsSet.ClientTrafficSecret0 = TRUE;
}
}
if (AData->SecretSet[ProtLevel][DIR_READ].Secret != NULL &&
AData->SecretSet[ProtLevel][DIR_WRITE].Secret != NULL) {
/*
Comment thread
nhorman marked this conversation as resolved.
Outdated
* We're done installing secrets
*/
TlsContext->TlsSecrets = NULL;
}

break;
default:
break;
}
Expand Down
Loading