Skip to content

tlshd: three small fixes (printf format, strtok_r, ALPN count bound) #60

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
warter666 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

tlshd: three small fixes (printf format, strtok_r, ALPN count bound) #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf1e8cd
tlshd: fix printf format for the certificate version
warter666 Sep 26, 2026
bd55ae7
tlshd: use strtok_r() instead of strtok()
warter666 Sep 26, 2026
3885de2
tlshd: NUL-terminate the ALPN string returned by the kernel
warter666 Sep 28, 2026
1028a0f
tlshd: skip empty ALPN tokens
warter666 Sep 28, 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
10 changes: 8 additions & 2 deletions src/tlshd/quic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,16 +360,21 @@ static int quic_session_set_priority(gnutls_session_t session, uint32_t cipher)
static int quic_session_set_alpns(gnutls_session_t session, char *alpn_data)
{
gnutls_datum_t alpns[TLSHD_QUIC_MAX_ALPNS_LEN / 2];
char *alpn = strtok(alpn_data, ",");
char *saveptr = NULL;
char *alpn = strtok_r(alpn_data, ",", &saveptr);
int count = 0, ret;

while (alpn) {
while (*alpn == ' ')
alpn++;
if (!*alpn) {
alpn = strtok_r(NULL, ",", &saveptr);
continue;
}
alpns[count].data = (unsigned char *)alpn;
alpns[count].size = strlen(alpn);
count++;
alpn = strtok(NULL, ",");
alpn = strtok_r(NULL, ",", &saveptr);
}

ret = gnutls_alpn_set_protocols(session, alpns, count, GNUTLS_ALPN_MANDATORY);
Expand Down Expand Up @@ -421,6 +426,7 @@ static int quic_conn_get_config(struct tlshd_quic_conn *conn)
tlshd_log_error("socket getsockopt alpn error %d", errno);
return -1;
}
conn->alpns[len] = '\0';
len = sizeof(conn->ticket);
if (getsockopt(sockfd, SOL_QUIC, QUIC_SOCKOPT_SESSION_TICKET, conn->ticket, &len)) {
tlshd_log_error("socket getsockopt session ticket error %d", errno);
Expand Down
2 changes: 1 addition & 1 deletion src/tlshd/tags.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1433,7 +1433,7 @@ tlshd_tags_filter_type_match_x509_tbs_version(struct tlshd_tags_filter *filter,
goto deinit;
}

snprintf(version, sizeof(version), "%u", ret);
snprintf(version, sizeof(version), "%d", ret);
res = tlshd_tags_filter_type_match_string(filter, version);
tlshd_log_debug("Filter '%s' %s version '%s'",
filter->fi_name,
Expand Down
3 changes: 2 additions & 1 deletion src/tlshd/tlshd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,8 @@ struct tlshd_quic_msg {
*/
struct tlshd_quic_conn {
struct tlshd_handshake_parms *parms;
char alpns[TLSHD_QUIC_MAX_ALPNS_LEN];
/* one byte larger than the kernel maximum, to hold the NUL */
char alpns[TLSHD_QUIC_MAX_ALPNS_LEN + 1];
uint8_t ticket[TLSHD_QUIC_MAX_DATA_LEN];
uint32_t ticket_len;
uint32_t cipher;
Expand Down