summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2022-08-18 18:42:13 +0000
committertb <>2022-08-18 18:42:13 +0000
commitbe73a6ddefcc4637dc9eed0c7cf94d06de600b53 (patch)
treea5bd86eab9d50d2df5c9e86dfb8f092ecd067410 /src
parent271843b081a9e280d513ad0aa65feffebe6cbcde (diff)
downloadopenbsd-be73a6ddefcc4637dc9eed0c7cf94d06de600b53.tar.gz
openbsd-be73a6ddefcc4637dc9eed0c7cf94d06de600b53.tar.bz2
openbsd-be73a6ddefcc4637dc9eed0c7cf94d06de600b53.zip
Adjust signatures of BIO_ctrl functions
In bio.h r1.54, the signature of BIO_callback_ctrl() was changed from bio_info_cb to BIO_info_cb. Adjust manual to reflect this change. At the moment, bio_info_cb and BIO_info_cb are still distinct types with our BIO_info_cb matching OpenSSL's definition. Historically, bio_info_cb had a different type, but that leads to issues with casting function pointers. The ecosystem has moved on to embrace the new type and several ports confuse the two types because OpenSSL decided to "solve" the issues with "typedef BIO_info_cb bio_info_cb; /* backward compatibilty */". We will align with this in the next bump. ok jsing
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/man/BIO_ctrl.323
1 files changed, 10 insertions, 13 deletions
diff --git a/src/lib/libcrypto/man/BIO_ctrl.3 b/src/lib/libcrypto/man/BIO_ctrl.3
index 24265c0318..762d45a5ed 100644
--- a/src/lib/libcrypto/man/BIO_ctrl.3
+++ b/src/lib/libcrypto/man/BIO_ctrl.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: BIO_ctrl.3,v 1.15 2020/12/03 22:47:21 jmc Exp $ 1.\" $OpenBSD: BIO_ctrl.3,v 1.16 2022/08/18 18:42:13 tb Exp $
2.\" OpenSSL b055fceb Thu Oct 20 09:56:18 2016 +0100 2.\" OpenSSL b055fceb Thu Oct 20 09:56:18 2016 +0100
3.\" 3.\"
4.\" This file was written by Dr. Stephen Henson <steve@openssl.org>. 4.\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -48,7 +48,7 @@
48.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 48.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
49.\" OF THE POSSIBILITY OF SUCH DAMAGE. 49.\" OF THE POSSIBILITY OF SUCH DAMAGE.
50.\" 50.\"
51.Dd $Mdocdate: December 3 2020 $ 51.Dd $Mdocdate: August 18 2022 $
52.Dt BIO_CTRL 3 52.Dt BIO_CTRL 3
53.Os 53.Os
54.Sh NAME 54.Sh NAME
@@ -69,7 +69,7 @@
69.Nm BIO_ctrl_wpending , 69.Nm BIO_ctrl_wpending ,
70.Nm BIO_get_info_callback , 70.Nm BIO_get_info_callback ,
71.Nm BIO_set_info_callback , 71.Nm BIO_set_info_callback ,
72.Nm bio_info_cb 72.Nm BIO_info_cb
73.Nd BIO control operations 73.Nd BIO control operations
74.Sh SYNOPSIS 74.Sh SYNOPSIS
75.In openssl/bio.h 75.In openssl/bio.h
@@ -84,7 +84,7 @@
84.Fo BIO_callback_ctrl 84.Fo BIO_callback_ctrl
85.Fa "BIO *b" 85.Fa "BIO *b"
86.Fa "int cmd" 86.Fa "int cmd"
87.Fa "bio_info_cb cb" 87.Fa "BIO_info_cb cb"
88.Fc 88.Fc
89.Ft char * 89.Ft char *
90.Fo BIO_ptr_ctrl 90.Fo BIO_ptr_ctrl
@@ -148,21 +148,18 @@
148.Ft int 148.Ft int
149.Fo BIO_get_info_callback 149.Fo BIO_get_info_callback
150.Fa "BIO *b" 150.Fa "BIO *b"
151.Fa "bio_info_cb **cbp" 151.Fa "BIO_info_cb **cbp"
152.Fc 152.Fc
153.Ft int 153.Ft int
154.Fo BIO_set_info_callback 154.Fo BIO_set_info_callback
155.Fa "BIO *b" 155.Fa "BIO *b"
156.Fa "bio_info_cb *cb" 156.Fa "BIO_info_cb *cb"
157.Fc 157.Fc
158.Ft typedef void 158.Ft typedef int
159.Fo bio_info_cb 159.Fo BIO_info_cb
160.Fa "BIO *b" 160.Fa "BIO *b"
161.Fa "int oper" 161.Fa "int state"
162.Fa "const char *ptr" 162.Fa "int res"
163.Fa "int arg1"
164.Fa "long arg2"
165.Fa "long arg3"
166.Fc 163.Fc
167.Sh DESCRIPTION 164.Sh DESCRIPTION
168.Fn BIO_ctrl , 165.Fn BIO_ctrl ,