openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

QUIC Front End I/O API: Don't allow EPW to be enabled during AON 

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19703)
This commit is contained in:
Hugo Landau 2022-12-15 06:42:43 +00:00
parent 0651e05474
commit dfc227bd24
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/man3/SSL_CTX_set_mode.pod
View File

@ -46,6 +46,9 @@ SSL_write() returns successful, B<r> bytes have been written and the next call
to SSL_write_ex() or SSL_write() must only send the n-r bytes left, imitating
the behaviour of write().
This mode cannot be enabled while in the middle of an incomplete write
operation.
=item SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER
Make it possible to retry SSL_write_ex() or SSL_write() with changed buffer

13
ssl/quic/quic_impl.c
View File

@ -492,13 +492,6 @@ int ossl_quic_shutdown(SSL *s)
}
/* SSL_ctrl */
static void fixup_mode_change(QUIC_CONNECTION *qc)
{
/* If enabling EPW mode, cancel any AON write */
if ((qc->ssl_mode & SSL_MODE_ENABLE_PARTIAL_WRITE) != 0)
aon_write_finish(qc);
}
long ossl_quic_ctrl(SSL *s, int cmd, long larg, void *parg)
{
QUIC_CONNECTION *qc = QUIC_CONNECTION_FROM_SSL(s);
@ -508,12 +501,14 @@ long ossl_quic_ctrl(SSL *s, int cmd, long larg, void *parg)
switch (cmd) {
case SSL_CTRL_MODE:
/* Cannot enable EPW while AON write in progress. */
if (qc->aon_write_in_progress)
larg &= ~SSL_MODE_ENABLE_PARTIAL_WRITE;
qc->ssl_mode |= (uint32_t)larg;
fixup_mode_change(qc);
return qc->ssl_mode;
case SSL_CTRL_CLEAR_MODE:
qc->ssl_mode &= ~(uint32_t)larg;
fixup_mode_change(qc);
return qc->ssl_mode;
default:
return 0;