3 files changed, 30 insertions, 13 deletions

diff --git a/src/lib/libcrypto/man/BIO_s_accept.3 b/src/lib/libcrypto/man/BIO_s_accept.3
index 8a60eeda0a..8e88fe1c52 100644
--- a/src/lib/libcrypto/man/BIO_s_accept.3
+++ b/src/lib/libcrypto/man/BIO_s_accept.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: BIO_s_accept.3,v 1.15 2023/04/26 15:03:02 schwarze Exp $
+.\" $OpenBSD: BIO_s_accept.3,v 1.16 2023/04/29 13:06:10 schwarze Exp $
 .\" full merge up to: OpenSSL c03726ca Thu Aug 27 12:28:08 2015 -0400
 .\"
 .\" This file is a derived work.
@@ -65,7 +65,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 26 2023 $
+.Dd $Mdocdate: April 29 2023 $
 .Dt BIO_S_ACCEPT 3
 .Os
 .Sh NAME
@@ -121,7 +121,7 @@
 .Fd #define BIO_BIND_NORMAL                             0
 .Fd #define BIO_BIND_REUSEADDR_IF_UNUSED        1
 .Fd #define BIO_BIND_REUSEADDR                  2
-.Ft int
+.Ft long
 .Fo BIO_do_accept
 .Fa "BIO *b"
 .Fc
@@ -298,10 +298,16 @@ arguments correspond to macros as follows:
 .It Dv BIO_C_DO_STATE_MACHINE Ta 0       Ta Fn BIO_do_accept
 .It Dv BIO_C_GET_ACCEPT       Ta 0       Ta Fn BIO_get_accept_port
 .It Dv BIO_C_GET_BIND_MODE    Ta 0       Ta Fn BIO_get_bind_mode
+.It Dv BIO_C_GET_FD           Ta 0       Ta Xr BIO_get_fd 3
 .It Dv BIO_C_SET_ACCEPT       Ta 0       Ta Fn BIO_set_accept_port
 .It                           Ta 1       Ta Fn BIO_set_nbio_accept
 .It                           Ta 2       Ta Fn BIO_set_accept_bios
+.It Dv BIO_C_SET_FD           Ta Fa fd   Ta Xr BIO_set_fd 3
+.It Dv BIO_C_SET_NBIO         Ta Fa n    Ta Xr BIO_set_nbio 3
 .It Dv BIO_C_SET_BIND_MODE    Ta Fa mode Ta Fn BIO_set_bind_mode
+.It Dv BIO_CTRL_GET_CLOSE     Ta 0       Ta Xr BIO_get_close 3
+.It Dv BIO_CTRL_RESET         Ta 0       Ta Xr BIO_reset 3
+.It Dv BIO_CTRL_SET_CLOSE     Ta Fa flag Ta Xr BIO_set_close 3
 .El
 .Sh RETURN VALUES
 When called on an accept BIO object,
diff --git a/src/lib/libcrypto/man/BIO_s_connect.3 b/src/lib/libcrypto/man/BIO_s_connect.3
index 54fb1fe09f..580687c808 100644
--- a/src/lib/libcrypto/man/BIO_s_connect.3
+++ b/src/lib/libcrypto/man/BIO_s_connect.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: BIO_s_connect.3,v 1.17 2023/04/26 15:03:02 schwarze Exp $
+.\" $OpenBSD: BIO_s_connect.3,v 1.18 2023/04/29 13:06:10 schwarze Exp $
 .\" full merge up to: OpenSSL 0e474b8b Nov 1 15:45:49 2015 +0100
 .\"
 .\" This file is a derived work.
@@ -65,7 +65,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 26 2023 $
+.Dd $Mdocdate: April 29 2023 $
 .Dt BIO_S_CONNECT 3
 .Os
 .Sh NAME
@@ -133,7 +133,7 @@
 .Fa "BIO *b"
 .Fa "long n"
 .Fc
-.Ft int
+.Ft long
 .Fo BIO_do_connect
 .Fa "BIO *b"
 .Fc
@@ -229,7 +229,7 @@ sets the port to
 .Fa port .
 .Fa port
 is looked up as a service using
-.Xr getaddrinfo 3
+.Xr getaddrinfo 3 .
 .Pp
 .Fn BIO_set_conn_ip
 sets the IP address to
@@ -364,11 +364,15 @@ arguments correspond to macros as follows:
 .It                           Ta 1       Ta Fn BIO_get_conn_port
 .It                           Ta 2       Ta Fn BIO_get_conn_ip
 .It                           Ta 3       Ta Fn BIO_get_conn_int_port
+.It Dv BIO_C_GET_FD           Ta 0       Ta Xr BIO_get_fd 3
 .It Dv BIO_C_SET_CONNECT      Ta 0       Ta Fn BIO_set_conn_hostname
 .It                           Ta 1       Ta Fn BIO_set_conn_port
 .It                           Ta 2       Ta Fn BIO_set_conn_ip
 .It                           Ta 3       Ta Fn BIO_set_conn_int_port
 .It Dv BIO_C_SET_NBIO         Ta Fa n    Ta Fn BIO_set_nbio
+.It Dv BIO_CTRL_GET_CLOSE     Ta 0       Ta Xr BIO_get_close 3
+.It Dv BIO_CTRL_RESET         Ta 0       Ta Xr BIO_reset 3
+.It Dv BIO_CTRL_SET_CLOSE     Ta Fa flag Ta Xr BIO_set_close 3
 .El
 .Sh RETURN VALUES
 .Fn BIO_s_connect
diff --git a/src/lib/libcrypto/man/BIO_s_file.3 b/src/lib/libcrypto/man/BIO_s_file.3
index 00a30e5c5f..ad1e8e64ce 100644
--- a/src/lib/libcrypto/man/BIO_s_file.3
+++ b/src/lib/libcrypto/man/BIO_s_file.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: BIO_s_file.3,v 1.14 2023/04/28 16:49:00 schwarze Exp $
+.\" $OpenBSD: BIO_s_file.3,v 1.15 2023/04/29 13:06:10 schwarze Exp $
 .\" full merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\" selective merge up to: OpenSSL 1212818e Sep 11 13:22:14 2018 +0100
 .\"
@@ -66,7 +66,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 28 2023 $
+.Dd $Mdocdate: April 29 2023 $
 .Dt BIO_S_FILE 3
 .Os
 .Sh NAME
@@ -108,22 +108,22 @@
 .Fa "BIO *b"
 .Fa "FILE **fpp"
 .Fc
-.Ft int
+.Ft long
 .Fo BIO_read_filename
 .Fa "BIO *b"
 .Fa "char *name"
 .Fc
-.Ft int
+.Ft long
 .Fo BIO_write_filename
 .Fa "BIO *b"
 .Fa "char *name"
 .Fc
-.Ft int
+.Ft long
 .Fo BIO_append_filename
 .Fa "BIO *b"
 .Fa "char *name"
 .Fc
-.Ft int
+.Ft long
 .Fo BIO_rw_filename
 .Fa "BIO *b"
 .Fa "char *name"
@@ -241,9 +241,16 @@ The following
 constants correspond to macros:
 .Bl -column BIO_C_GET_FILE_PTR "corresponding macro" -offset 3n
 .It Fa cmd No constant    Ta corresponding macro
+.It Dv BIO_C_FILE_SEEK    Ta Xr BIO_seek 3
+.It Dv BIO_C_FILE_TELL    Ta Xr BIO_tell 3
 .It Dv BIO_C_GET_FILE_PTR Ta Fn BIO_get_fp
 .It Dv BIO_C_SET_FILE_PTR Ta Fn BIO_set_fp
 .It Dv BIO_C_SET_FILENAME Ta various, see below
+.It Dv BIO_CTRL_EOF       Ta Xr BIO_eof 3
+.It Dv BIO_CTRL_FLUSH     Ta Xr BIO_flush 3
+.It Dv BIO_CTRL_GET_CLOSE Ta Xr BIO_get_close 3
+.It Dv BIO_CTRL_RESET     Ta Xr BIO_reset 3
+.It Dv BIO_CTRL_SET_CLOSE Ta Xr BIO_set_close 3
 .El
 .Pp
 The meaning of