Skip to content

[WIP] Cherry-pick changes from PR #6225 for OpenSSL TLS validation #6299

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

Closed
Copilot wants to merge 2 commits into from
+60 −0
Closed

[WIP] Cherry-pick changes from PR #6225 for OpenSSL TLS validation #6299

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
c188dbb
Initial plan
Copilot Sep 4, 2026
64aea95
Added Transport parameters extension validation in openssl (#6225)
Santhosha-bk Sep 4, 2026
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
18 changes: 18 additions & 0 deletions src/generated/linux/tls_openssl.c.clog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,24 @@ tracepoint(CLOG_TLS_OPENSSL_C, OpenSslNoMatchingAlpn , arg1);\



/*----------------------------------------------------------
// Decoder Ring for OpenSslMissingTransportParameters
// [conn][%p] No transport parameters received
// QuicTraceLogConnError(
OpenSslMissingTransportParameters,
TlsContext->Connection,
"No transport parameters received");
// arg1 = arg1 = TlsContext->Connection = arg1
----------------------------------------------------------*/
#ifndef _clog_3_ARGS_TRACE_OpenSslMissingTransportParameters
#define _clog_3_ARGS_TRACE_OpenSslMissingTransportParameters(uniqueId, arg1, encoded_arg_string)\
tracepoint(CLOG_TLS_OPENSSL_C, OpenSslMissingTransportParameters , arg1);\

#endif




/*----------------------------------------------------------
// Decoder Ring for OpenSslHandshakeDataStart
// [conn][%p] Writing Handshake data starts at %u
Expand Down
19 changes: 19 additions & 0 deletions src/generated/linux/tls_openssl.c.clog.h.lttng.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,25 @@ TRACEPOINT_EVENT(CLOG_TLS_OPENSSL_C, OpenSslNoMatchingAlpn,



/*----------------------------------------------------------
// Decoder Ring for OpenSslMissingTransportParameters
// [conn][%p] No transport parameters received
// QuicTraceLogConnError(
OpenSslMissingTransportParameters,
TlsContext->Connection,
"No transport parameters received");
// arg1 = arg1 = TlsContext->Connection = arg1
----------------------------------------------------------*/
TRACEPOINT_EVENT(CLOG_TLS_OPENSSL_C, OpenSslMissingTransportParameters,
TP_ARGS(
const void *, arg1),
TP_FIELDS(
ctf_integer_hex(uint64_t, arg1, (uint64_t)arg1)
)
)



/*----------------------------------------------------------
// Decoder Ring for OpenSslHandshakeDataStart
// [conn][%p] Writing Handshake data starts at %u
Expand Down
23 changes: 23 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 @@ -747,6 +747,15 @@ static int QuicTlsGotTp(SSL *S, const unsigned char *Params,

UNREFERENCED_PARAMETER(Arg);

if (ParamsLen == 0 || Params == NULL) {
return 0;
}

if (AData->PeerTp != NULL) {
return AData->PeerTpLen == ParamsLen &&
memcmp(AData->PeerTp, Params, ParamsLen) == 0;
}

AData->PeerTp = CXPLAT_ALLOC_NONPAGED(ParamsLen,
QUIC_POOL_TLS_TRANSPARAMS);
if (AData->PeerTp == NULL) {
Expand Down Expand Up @@ -3317,6 +3326,20 @@ CxPlatTlsProcessData(
TlsContext->ResultFlags |= CXPLAT_TLS_RESULT_ERROR;
goto Exit;
}

//
// By this point, OpenSSL should have called QuicTlsGotTp, which stores
// a non-NULL PeerTp and sets PeerTPReceived. Fail the handshake if the
// required transport parameters were not processed.
//
if (!TlsContext->PeerTPReceived) {
QuicTraceLogConnError(
OpenSslMissingTransportParameters,
TlsContext->Connection,
"No transport parameters received");
TlsContext->ResultFlags |= CXPLAT_TLS_RESULT_ERROR;
goto Exit;
}
} else if ((TlsContext->SecConfig->Flags & QUIC_CREDENTIAL_FLAG_INDICATE_CERTIFICATE_RECEIVED) &&
!TlsContext->PeerCertReceived) {
QUIC_STATUS ValidationResult =
Expand Down