Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 26 insertions, 2 deletions

diff --git a/upstream/debian-unstable/man3/BIO_meth_new.3ssl b/upstream/debian-unstable/man3/BIO_meth_new.3ssl
index e8987619..813d656e 100644
--- a/upstream/debian-unstable/man3/BIO_meth_new.3ssl
+++ b/upstream/debian-unstable/man3/BIO_meth_new.3ssl
@@ -55,7 +55,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_METH_NEW 3SSL"
-.TH BIO_METH_NEW 3SSL 2024-02-03 3.1.5 OpenSSL
+.TH BIO_METH_NEW 3SSL 2024-04-04 3.2.2-dev OpenSSL
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -68,7 +68,8 @@ BIO_meth_set_write, BIO_meth_get_read, BIO_meth_set_read, BIO_meth_get_puts,
 BIO_meth_set_puts, BIO_meth_get_gets, BIO_meth_set_gets, BIO_meth_get_ctrl,
 BIO_meth_set_ctrl, BIO_meth_get_create, BIO_meth_set_create,
 BIO_meth_get_destroy, BIO_meth_set_destroy, BIO_meth_get_callback_ctrl,
-BIO_meth_set_callback_ctrl \- Routines to build up BIO methods
+BIO_meth_set_callback_ctrl, BIO_meth_set_sendmmsg, BIO_meth_get_sendmmsg,
+BIO_meth_set_recvmmsg, BIO_meth_get_recvmmsg \- Routines to build up BIO methods
 .SH SYNOPSIS
 .IX Header "SYNOPSIS"
 .Vb 1
@@ -114,6 +115,24 @@ BIO_meth_set_callback_ctrl \- Routines to build up BIO methods
 \& long (*BIO_meth_get_callback_ctrl(const BIO_METHOD *biom))(BIO *, int, BIO_info_cb *);
 \& int BIO_meth_set_callback_ctrl(BIO_METHOD *biom,
 \&                                long (*callback_ctrl)(BIO *, int, BIO_info_cb *));
+\&
+\& ossl_ssize_t (*BIO_meth_get_sendmmsg(const BIO_METHOD *biom))(BIO *,
+\&                                                               BIO_MSG *,
+\&                                                               size_t,
+\&                                                               size_t,
+\&                                                               uint64_t);
+\& int BIO_meth_set_sendmmsg(BIO_METHOD *biom,
+\&                           ossl_ssize_t (*f) (BIO *, BIO_MSG *, size_t,
+\&                                              size_t, uint64_t));
+\&
+\& ossl_ssize_t (*BIO_meth_get_recvmmsg(const BIO_METHOD *biom))(BIO *,
+\&                                                               BIO_MSG *,
+\&                                                               size_t,
+\&                                                               size_t,
+\&                                                               uint64_t);
+\& int BIO_meth_set_recvmmsg(BIO_METHOD *biom,
+\&                           ossl_ssize_t (*f) (BIO *, BIO_MSG *, size_t,
+\&                                              size_t, uint64_t));
 .Ve
 .SH DESCRIPTION
 .IX Header "DESCRIPTION"
@@ -194,6 +213,11 @@ function used for processing callback ctrl messages in the BIO respectively. See
 the \fBBIO_callback_ctrl\fR\|(3) page for more information. This function will be called
 in response to the application calling \fBBIO_callback_ctrl()\fR. The parameters for
 the function have the same meaning as for \fBBIO_callback_ctrl()\fR.
+.PP
+\&\fBBIO_meth_get_sendmmsg()\fR, \fBBIO_meth_set_sendmmsg()\fR, \fBBIO_meth_get_recvmmsg()\fR and
+\&\fBBIO_meth_set_recvmmsg()\fR get and set the functions used for handling
+\&\fBBIO_sendmmsg()\fR and \fBBIO_recvmmsg()\fR calls respectively. See \fBBIO_sendmmsg\fR\|(3) for
+more information.
 .SH "RETURN VALUES"
 .IX Header "RETURN VALUES"
 \&\fBBIO_get_new_index()\fR returns the new BIO type value or \-1 if an error occurred.