4 files changed, 10 insertions, 23 deletions

diff --git a/src/lib/libcrypto/man/BIO_ctrl.3 b/src/lib/libcrypto/man/BIO_ctrl.3
index d4515ea9ad..2c537956e1 100644
--- a/src/lib/libcrypto/man/BIO_ctrl.3
+++ b/src/lib/libcrypto/man/BIO_ctrl.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: BIO_ctrl.3,v 1.24 2023/07/26 20:01:04 tb Exp $
+.\" $OpenBSD: BIO_ctrl.3,v 1.25 2023/11/16 20:19:23 schwarze Exp $
 .\" full merge up to: OpenSSL 24a535eaf Tue Sep 22 13:14:20 2020 +0100
 .\" selective merge up to: OpenSSL 0c5bc96f Tue Mar 15 13:57:22 2022 +0000
 .\"
@@ -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: July 26 2023 $
+.Dd $Mdocdate: November 16 2023 $
 .Dt BIO_CTRL 3
 .Os
 .Sh NAME
@@ -307,11 +307,6 @@ and
 return a
 .Vt size_t
 type and are functions.
-.Fn BIO_pending
-and
-.Fn BIO_wpending
-are macros which call
-.Fn BIO_ctrl .
 .Pp
 .Fn BIO_set_info_callback
 installs the function pointer
diff --git a/src/lib/libcrypto/man/BIO_s_fd.3 b/src/lib/libcrypto/man/BIO_s_fd.3
index de5d5d7007..852a06756a 100644
--- a/src/lib/libcrypto/man/BIO_s_fd.3
+++ b/src/lib/libcrypto/man/BIO_s_fd.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: BIO_s_fd.3,v 1.12 2023/04/29 12:04:54 schwarze Exp $
+.\" $OpenBSD: BIO_s_fd.3,v 1.13 2023/11/16 20:19:23 schwarze Exp $
 .\" full merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -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 29 2023 $
+.Dd $Mdocdate: November 16 2023 $
 .Dt BIO_S_FD 3
 .Os
 .Sh NAME
@@ -147,7 +147,6 @@ to
 .Fa fd
 and the close flag to
 .Fa close_flag .
-It is currently implemented as a macro.
 .Pp
 .Fn BIO_get_fd
 places the file descriptor in
@@ -155,7 +154,6 @@ places the file descriptor in
 if it is not
 .Dv NULL
 and also returns the file descriptor.
-It is currently implemented as a macro.
 .Pp
 .Fn BIO_new_fd
 returns a file descriptor BIO using
diff --git a/src/lib/libcrypto/man/BIO_s_file.3 b/src/lib/libcrypto/man/BIO_s_file.3
index 7b58903123..14950cad13 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.16 2023/05/01 07:04:38 jsg Exp $
+.\" $OpenBSD: BIO_s_file.3,v 1.17 2023/11/16 20:19:23 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: May 1 2023 $
+.Dd $Mdocdate: November 16 2023 $
 .Dt BIO_S_FILE 3
 .Os
 .Sh NAME
@@ -196,14 +196,12 @@ sets the file pointer of a file BIO to
 .Fa flags
 has the same meaning as in
 .Fn BIO_new_fp .
-.Fn BIO_set_fp
-is a macro.
 .Pp
 .Fn BIO_get_fp
-retrieves the file pointer of a file BIO, it is a macro.
+retrieves the file pointer of a file BIO.
 .Pp
 .Xr BIO_seek 3
-is a macro that sets the position pointer to
+sets the position pointer to
 .Fa offset
 bytes from the start of file.
 .Pp
diff --git a/src/lib/libcrypto/man/BIO_s_mem.3 b/src/lib/libcrypto/man/BIO_s_mem.3
index 475cd8869f..d7bbf6af43 100644
--- a/src/lib/libcrypto/man/BIO_s_mem.3
+++ b/src/lib/libcrypto/man/BIO_s_mem.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: BIO_s_mem.3,v 1.18 2023/04/29 12:04:54 schwarze Exp $
+.\" $OpenBSD: BIO_s_mem.3,v 1.19 2023/11/16 20:19:23 schwarze Exp $
 .\" full merge up to: OpenSSL 8711efb4 Mon Apr 20 11:33:12 2009 +0000
 .\" selective merge up to: OpenSSL 36359cec Mar 7 14:37:23 2018 +0100
 .\"
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 29 2023 $
+.Dd $Mdocdate: November 16 2023 $
 .Dt BIO_S_MEM 3
 .Os
 .Sh NAME
@@ -158,7 +158,6 @@ sets
 .Pf * Fa pp
 to a pointer to the start of the memory BIO's data
 and returns the total amount of data available.
-It is implemented as a macro.
 .Pp
 .Fn BIO_set_mem_buf
 sets the internal BUF_MEM structure to
@@ -171,15 +170,12 @@ should be either
 .Dv BIO_CLOSE
 or
 .Dv BIO_NOCLOSE .
-.Fn BIO_set_mem_buf
-is a macro.
 .Pp
 .Fn BIO_get_mem_ptr
 places the underlying
 .Vt BUF_MEM
 structure in
 .Pf * Fa pp .
-It is a macro.
 .Pp
 .Fn BIO_new_mem_buf
 creates a memory BIO using