From f85bedca82e16936ede05718145ed4bee8bd346c Mon Sep 17 00:00:00 2001 From: Geod24 Date: Mon, 23 May 2022 15:14:10 +0200 Subject: [PATCH 1/2] bio: Fix BIO ctrl callback signature (long -> c_long) --- source/deimos/openssl/bio.d | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/deimos/openssl/bio.d b/source/deimos/openssl/bio.d index 92e7885..fbc9b92 100644 --- a/source/deimos/openssl/bio.d +++ b/source/deimos/openssl/bio.d @@ -779,15 +779,15 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int function(BIO_METHOD *biom) BIO_meth_get_gets(BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, int function(BIO *, char *, int) gets); -long function(BIO_METHOD *biom) BIO_meth_get_ctrl(BIO *, int, long, void *); +c_long function(BIO_METHOD *biom) BIO_meth_get_ctrl(BIO *, int, c_long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, - long function(BIO *, int, long, void *) ctrl); + c_long function(BIO *, int, c_long, void *) ctrl); int function(BIO_METHOD *bion) BIO_meth_get_create(BIO *); int BIO_meth_set_create(BIO_METHOD *biom, int function(BIO *) create); int function(BIO_METHOD *biom) BIO_meth_get_destroy(BIO *); int BIO_meth_set_destroy(BIO_METHOD *biom, int function(BIO *) destroy); -long function(BIO *, int, BIO_info_cb *) BIO_meth_get_callback_ctrl(BIO_METHOD *biom); -int BIO_meth_set_callback_ctrl(BIO_METHOD *biom, long function(BIO *, int, BIO_info_cb *) callback_ctrl); +c_long function(BIO *, int, BIO_info_cb *) BIO_meth_get_callback_ctrl(BIO_METHOD *biom); +int BIO_meth_set_callback_ctrl(BIO_METHOD *biom, c_long function(BIO *, int, BIO_info_cb *) callback_ctrl); /* BEGIN ERROR CODES */ /* The following lines are auto generated by the script mkerr.pl. Any changes From a359cdc12e6851f1d0e88ed476295ee4858252c8 Mon Sep 17 00:00:00 2001 From: Geod24 Date: Mon, 23 May 2022 15:28:53 +0200 Subject: [PATCH 2/2] Fix BIO_meth_get_ctrl arguments swapped with return type --- source/deimos/openssl/bio.d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/deimos/openssl/bio.d b/source/deimos/openssl/bio.d index fbc9b92..ac6ad5a 100644 --- a/source/deimos/openssl/bio.d +++ b/source/deimos/openssl/bio.d @@ -779,7 +779,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, int function(BIO_METHOD *biom) BIO_meth_get_gets(BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, int function(BIO *, char *, int) gets); -c_long function(BIO_METHOD *biom) BIO_meth_get_ctrl(BIO *, int, c_long, void *); +c_long function(BIO *, int, c_long, void *) BIO_meth_get_ctrl(BIO_METHOD *biom); int BIO_meth_set_ctrl(BIO_METHOD *biom, c_long function(BIO *, int, c_long, void *) ctrl); int function(BIO_METHOD *bion) BIO_meth_get_create(BIO *);