iv-org-mirror/litespeed-quic
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/litespeed-quic.git synced 2024-08-15 00:53:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Release 1.19.5

Browse source 
- [BUGFIX] Use correct public key from PUBS based on KEXS index.
- [BUGFIX] Check flags before dispatching writes, avoiding assert.
- [BUGFIX] Set :scheme to "https" (instead of "HTTP").
This commit is contained in:
Dmitri Tikhonov 2019-03-05 16:56:02 -05:00
parent 90fe3b255d
commit 8437e4a4f2
5 changed files with 68 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/liblsquic/lsquic_full_conn.c
View file

@ -2655,7 +2655,8 @@ process_streams_write_events (struct full_conn *conn, int high_prio)
for (stream = lsquic_spi_first(&spi); stream && write_is_possible(conn);
stream = lsquic_spi_next(&spi))
lsquic_stream_dispatch_write_events(stream);
if (stream->stream_flags & STREAM_WRITE_Q_FLAGS)
lsquic_stream_dispatch_write_events(stream);
maybe_conn_flush_headers_stream(conn);
}

69
src/liblsquic/lsquic_handshake.c
View file

@ -109,6 +109,7 @@ typedef struct hs_ctx_st
struct lsquic_str csct;
struct lsquic_str crt; /* compressed certs buffer */
struct lsquic_str scfg_pubs; /* Need to copy PUBS, as KEXS comes after it */
} hs_ctx_t;
@ -450,6 +451,7 @@ lsquic_enc_session_destroy (lsquic_enc_session_t *enc_session)
lsquic_str_d(&hs_ctx->prof);
lsquic_str_d(&hs_ctx->csct);
lsquic_str_d(&hs_ctx->crt);
lsquic_str_d(&hs_ctx->scfg_pubs);
lsquic_str_d(&enc_session->chlo);
lsquic_str_d(&enc_session->sstk);
lsquic_str_d(&enc_session->ssno);
@ -586,18 +588,10 @@ static int parse_hs_data (lsquic_enc_session_t *enc_session, uint32_t tag,
break;
case QTAG_PUBS:
/* FIXME:Server side may send a list of pubs,
* we support only ONE kenx now.
* REJ is 35 bytes, SHLO is 32 bytes
* Only save other peer's pubs to hs_ctx
*/
if( len < 32)
break;
memcpy(hs_ctx->pubs, val + (len - 32), 32);
if (head_tag == QTAG_SCFG)
{
memcpy(enc_session->info->spubs, hs_ctx->pubs, 32);
}
lsquic_str_setto(&hs_ctx->scfg_pubs, val, len);
else if (len == 32)
memcpy(hs_ctx->pubs, val, len);
break;
case QTAG_RCID:
@ -647,7 +641,58 @@ static int parse_hs_data (lsquic_enc_session_t *enc_session, uint32_t tag,
break;
case QTAG_KEXS:
enc_session->info->kexs = get_tag_value_i32(val, len);
{
if (head_tag == QTAG_SCFG && 0 == len % 4)
{
const unsigned char *p, *end;
unsigned pub_idx, idx;
for (p = val; p < val + len; p += 4)
if (0 == memcmp(p, "C255", 4))
{
memcpy(&enc_session->info->kexs, p, 4);
pub_idx = (p - val) / 4;
LSQ_DEBUG("Parsing SCFG: supported KEXS C255 at "
"index %u", pub_idx);
break;
}
if (p >= val + len)
{
LSQ_INFO("supported KEXS not found, trouble ahead");
break;
}
if (lsquic_str_len(&hs_ctx->scfg_pubs) > 0)
{
p = (const unsigned char *)
lsquic_str_cstr(&hs_ctx->scfg_pubs);
end = p + lsquic_str_len(&hs_ctx->scfg_pubs);
for (idx = 0; p < end; ++idx)
{
uint32_t sz = 0;
if (p + 3 > end)
break;
sz |= *p++;
sz |= *p++ << 8;
sz |= *p++ << 16;
if (p + sz > end)
break;
if (idx == pub_idx)
{
if (sz == 32)
{
memcpy(hs_ctx->pubs, p, 32);
memcpy(enc_session->info->spubs, p, 32);
}
break;
}
p += sz;
}
}
else
LSQ_INFO("No PUBS from SCFG to parse");
}
}
break;
case QTAG_NONC: