Skip to content

fix(tls): validate cert/key pair and guard wildcard SAN matcher #13

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

Open
andypost wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(tls): validate cert/key pair and guard wildcard SAN matcher #13

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
7 changes: 7 additions & 0 deletions CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@

Changes with FreeUnit 1.35.4 xx xxx 2026

*) Bugfix: validate that the loaded TLS private key matches the
certificate; previously a mismatched key/cert pair was accepted
at config time and only surfaced as a handshake failure. Also
guard the wildcard-name SAN matcher against an empty name (1-byte
OOB read of item->name.start[0] when the cert had a zero-length
SAN entry).

*) Bugfix: fix router process CPU spin and connection hang under port
scanning load; CLOSE-WAIT sockets are now cleaned up properly on
client FIN, idle connection queue iteration fixed, systemd file
Expand Down
6 changes: 4 additions & 2 deletions src/nxt_openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,9 @@ nxt_openssl_chain_file(nxt_task_t *task, SSL_CTX *ctx, nxt_tls_conf_t *conf,
goto end;
}

if (SSL_CTX_use_PrivateKey(ctx, key) == 1) {
if (SSL_CTX_use_PrivateKey(ctx, key) == 1
&& SSL_CTX_check_private_key(ctx) == 1)
{
ret = NXT_OK;
}

Expand Down Expand Up @@ -983,7 +985,7 @@ nxt_openssl_bundle_hash_insert(nxt_task_t *task, nxt_lvlhsh_t *lvlhsh,

str = item->name;

if (item->name.start[0] == '*') {
if (item->name.length > 0 && item->name.start[0] == '*') {
item->name.start++;
item->name.length--;

Expand Down
Loading