diff options
| author | Hugo Landau <hlandau@openssl.org> | 2023-08-30 17:00:16 +0100 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2023-09-01 10:45:36 +0100 |
| commit | 8d7f034622c0235d06f4d6526f71dcab2f71b0c6 (patch) | |
| tree | 4afbf9655b468b1bb01f0a81e2e71da134705cd7 | |
| parent | abeb41b42fa3cdca99d3f3fef48ea6ee04023d68 (diff) | |
Minor fixes
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21715)
| -rw-r--r-- | crypto/bio/bss_dgram_pair.c | 2 | ||||
| -rw-r--r-- | doc/designs/ddd/REPORT.md | 2 | ||||
| -rw-r--r-- | doc/designs/ddd/ddd-05-mem-nonblocking.c | 6 | ||||
| -rw-r--r-- | ssl/quic/quic_impl.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/crypto/bio/bss_dgram_pair.c b/crypto/bio/bss_dgram_pair.c index a93b14154c..3d79878336 100644 --- a/crypto/bio/bss_dgram_pair.c +++ b/crypto/bio/bss_dgram_pair.c @@ -695,7 +695,7 @@ static long dgram_mem_ctrl(BIO *bio, int cmd, long num, void *ptr) /* BIO_dgram_get_local_addr_enable */ case BIO_CTRL_DGRAM_GET_LOCAL_ADDR_ENABLE: /* Non-threadsafe */ - *(int *)ptr = (long)dgram_pair_ctrl_get_local_addr_enable(bio); + *(int *)ptr = (int)dgram_pair_ctrl_get_local_addr_enable(bio); break; /* BIO_dgram_set_local_addr_enable */ diff --git a/doc/designs/ddd/REPORT.md b/doc/designs/ddd/REPORT.md index ce742507ce..195e834899 100644 --- a/doc/designs/ddd/REPORT.md +++ b/doc/designs/ddd/REPORT.md @@ -151,7 +151,7 @@ The originally planned changes to enable applications for QUIC amounted to: - A change to how the `POLLIN`/`POLLOUT`/`POLLERR` flags to pass to poll(2) need to be determined. - Note that this is a subtantially smaller list of changes than for + Note that this is a substantially smaller list of changes than for ddd-02-conn-nonblocking. ### Actual changes diff --git a/doc/designs/ddd/ddd-05-mem-nonblocking.c b/doc/designs/ddd/ddd-05-mem-nonblocking.c index 821e3fecba..abf6c3c496 100644 --- a/doc/designs/ddd/ddd-05-mem-nonblocking.c +++ b/doc/designs/ddd/ddd-05-mem-nonblocking.c @@ -189,9 +189,9 @@ int rx(APP_CONN *conn, void *buf, int buf_len) /* * Called to get data which has been enqueued for transmission to the network - * by OpenSSL. For QUIC, this always outputs a single frame. + * by OpenSSL. For QUIC, this always outputs a single datagram. * - * IMPORTANT (QUIC): If buf_len is inadequate to hold the frame, it is truncated + * IMPORTANT (QUIC): If buf_len is inadequate to hold the datagram, it is truncated * (similar to read(2)). A buffer size of at least 1472 must be used by default * to guarantee this does not occur. */ @@ -203,7 +203,7 @@ int read_net_tx(APP_CONN *conn, void *buf, int buf_len) /* * Called to feed data which has been received from the network to OpenSSL. * - * QUIC: buf must contain the entirety of a single frame. It will be consumed + * QUIC: buf must contain the entirety of a single datagram. It will be consumed * entirely (return value == buf_len) or not at all. */ int write_net_rx(APP_CONN *conn, const void *buf, int buf_len) diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c index 11c8afce8a..bf1c412a09 100644 --- a/ssl/quic/quic_impl.c +++ b/ssl/quic/quic_impl.c @@ -1607,7 +1607,7 @@ static int quic_do_handshake(QCTX *ctx) * Start connection process. Note we may come here multiple times in * non-blocking mode, which is fine. */ - if (!ensure_channel_started(qc)) /* raises on failure */ + if (!ensure_channel_started(ctx)) /* raises on failure */ return -1; /* Non-protocol error */ if (ossl_quic_channel_is_handshake_complete(qc->ch)) |