Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/build-reuse-unix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ on:
# options:
# - ubuntu-22.04
# - ubuntu-24.04
# - ubuntu-26.04
# - macos-15
arch:
required: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:
matrix:
config: ['Debug', 'Release']
plat: [linux, android]
os: ['ubuntu-22.04', 'ubuntu-24.04']
os: ['ubuntu-22.04', 'ubuntu-24.04', 'ubuntu-26.04']
arch: [x86, x64]
tls: [quictls, openssl]
systemcrypto: ['', '-UseSystemOpenSSLCrypto']
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,16 @@ jobs:
{ config: "Debug", plat: "linux", os: "ubuntu-24.04", arch: "x64", tls: "quictls", systemcrypto: "-UseSystemOpenSSLCrypto", build: "-Test", iouring: "-UseIoUring" },
{ config: "Debug", plat: "linux", os: "ubuntu-24.04", arch: "x64", tls: "quictls", systemcrypto: "-UseSystemOpenSSLCrypto", build: "-Test", sanitize: "-SanitizeAddress", iouring: "-UseIoUring" },
{ config: "Release", plat: "linux", os: "ubuntu-24.04", arch: "x64", tls: "quictls", systemcrypto: "-UseSystemOpenSSLCrypto", build: "-Test", iouring: "-UseIoUring" },
{ config: "Debug", plat: "linux", os: "ubuntu-26.04", arch: "x64", tls: "quictls", systemcrypto: "-UseSystemOpenSSLCrypto", sanitize: "-SanitizeAddress", build: "-Test" },
{ config: "Release", plat: "linux", os: "ubuntu-26.04", arch: "x64", tls: "quictls", systemcrypto: "-UseSystemOpenSSLCrypto", build: "-Test" },
{ config: "Debug", plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl", sanitize: "-SanitizeAddress", build: "-Test" },
{ config: "Debug", plat: "linux", os: "ubuntu-24.04", arch: "x64", tls: "openssl", sanitize: "-SanitizeAddress", build: "-Test" },
{ config: "Debug", plat: "linux", os: "ubuntu-26.04", arch: "x64", tls: "openssl", sanitize: "-SanitizeAddress", build: "-Test" },
{ config: "Debug", plat: "linux", os: "ubuntu-26.04", arch: "x64", tls: "openssl", systemcrypto: "-UseSystemOpenSSLCrypto", sanitize: "-SanitizeAddress", build: "-Test" },
{ config: "Release", plat: "linux", os: "ubuntu-26.04", arch: "x64", tls: "openssl", systemcrypto: "-UseSystemOpenSSLCrypto", build: "-Test" },
{ config: "Debug", plat: "linux", os: "ubuntu-26.04", arch: "x64", tls: "openssl", systemcrypto: "-UseSystemOpenSSLCrypto", build: "-Test", iouring: "-UseIoUring" },
{ config: "Debug", plat: "linux", os: "ubuntu-26.04", arch: "x64", tls: "openssl", systemcrypto: "-UseSystemOpenSSLCrypto", sanitize: "-SanitizeAddress", build: "-Test", iouring: "-UseIoUring" },
{ config: "Release", plat: "linux", os: "ubuntu-26.04", arch: "x64", tls: "openssl", systemcrypto: "-UseSystemOpenSSLCrypto", build: "-Test", iouring: "-UseIoUring" },
]
uses: ./.github/workflows/build-reuse-unix.yml
with:
Expand Down Expand Up @@ -139,7 +147,14 @@ jobs:
{ config: "Release", plat: "linux", os: "ubuntu-24.04", arch: "x64", tls: "quictls", systemcrypto: "-UseSystemOpenSSLCrypto", build: "-Test" },
{ config: "Debug", plat: "linux", os: "ubuntu-24.04", arch: "x64", tls: "quictls", systemcrypto: "-UseSystemOpenSSLCrypto", build: "-Test", iouring: "-UseIoUring" },
{ config: "Release", plat: "linux", os: "ubuntu-24.04", arch: "x64", tls: "quictls", systemcrypto: "-UseSystemOpenSSLCrypto", build: "-Test", iouring: "-UseIoUring" },
{ config: "Debug", plat: "linux", os: "ubuntu-26.04", arch: "x64", tls: "quictls", systemcrypto: "-UseSystemOpenSSLCrypto", sanitize: "-SanitizeAddress", build: "-Test" },
{ config: "Release", plat: "linux", os: "ubuntu-26.04", arch: "x64", tls: "quictls", systemcrypto: "-UseSystemOpenSSLCrypto", build: "-Test" },
{ config: "Debug", plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl", sanitize: "-SanitizeAddress", build: "-Test" },
{ config: "Debug", plat: "linux", os: "ubuntu-26.04", arch: "x64", tls: "openssl", sanitize: "-SanitizeAddress", build: "-Test" },
{ config: "Debug", plat: "linux", os: "ubuntu-26.04", arch: "x64", tls: "openssl", systemcrypto: "-UseSystemOpenSSLCrypto", sanitize: "-SanitizeAddress", build: "-Test" },
{ config: "Release", plat: "linux", os: "ubuntu-26.04", arch: "x64", tls: "openssl", systemcrypto: "-UseSystemOpenSSLCrypto", build: "-Test" },
{ config: "Debug", plat: "linux", os: "ubuntu-26.04", arch: "x64", tls: "openssl", systemcrypto: "-UseSystemOpenSSLCrypto", build: "-Test", iouring: "-UseIoUring" },
{ config: "Release", plat: "linux", os: "ubuntu-26.04", arch: "x64", tls: "openssl", systemcrypto: "-UseSystemOpenSSLCrypto", build: "-Test", iouring: "-UseIoUring" },
{ config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "schannel", sanitize: "-SanitizeAddress", build: "-Test", log: "Full.Verbose" },
{ config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "schannel", xdp: "xdp-v1.1", sanitize: "-SanitizeAddress", build: "-Test" },
{ config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "schannel", xdp: "xdp-v1.1", qtip: "-UseQtip", sanitize: "-SanitizeAddress", build: "-Test" },
Expand Down
24 changes: 10 additions & 14 deletions src/platform/tls_openssl.c
Original file line number Diff line number Diff line change
Expand Up @@ -2868,18 +2868,6 @@ static int SplitAddRecord(RECORD_ENTRY *Entry, size_t *Consumed)
//
message_size = htonl(message_size) & 0x00ffffff;

//
//make sure our message type is valid
//
if (message_type > SSL3_MT_FINISHED) {
//
// This is not a real handshake record
//
CXPLAT_FREE(Entry, QUIC_POOL_TLS_RECORD_ENTRY);
return -1;
}


//
// Stop processing if this is a handshake finished record
//
Expand Down Expand Up @@ -3167,10 +3155,18 @@ CxPlatTlsProcessData(
*BufferLength, &Consumed);
if (MRet == 0) {
//
// There was an allocation failure
// Indicate we consumed nothing
// There was a record processing failure.
// Indicate we consumed nothing and stop the handshake path.
//
QuicTraceEvent(
TlsError,
"[ tls][%p] ERROR, %s.",
TlsContext->Connection,
"ProcessNewMessage failed");
TlsContext->ResultFlags |= CXPLAT_TLS_RESULT_ERROR;
State->AlertCode = CXPLAT_TLS_ALERT_CODE_INTERNAL_ERROR;
Consumed = 0;
goto Exit;
}
*BufferLength = *BufferLength - (uint32_t)Consumed;
}
Expand Down
1 change: 1 addition & 0 deletions src/test/bin/quic_gtest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

#include <array>
#include <vector>
#include <algorithm>

#if defined(_WIN32) && defined(QUIC_API_ENABLE_PREVIEW_FEATURES)
#define XDP_API_VERSION 3
Expand Down
Loading