[WRAPPER] Reworked ssl3 and crypto3 with new wrapperhelper (for #1860)

6 files changed, 532 insertions, 491 deletions

diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index a6548dcd..63c9fadf 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -589,8 +589,10 @@
 #() iFpOi
 #() iFpOu
 #() iFpSu
+#() iFpSp
 #() iFSIi
 #() iFSli
+#() iFSpi
 #() iFSpL
 #() iFSpp
 #() iFSpA
@@ -794,6 +796,7 @@
 #() pFppp
 #() pFppS
 #() pFppA
+#() pFpSp
 #() pFpbi
 #() pFSpl
 #() pFbCC
@@ -1037,6 +1040,7 @@
 #() iFipLp
 #() iFippi
 #() iFippu
+#() iFippl
 #() iFippL
 #() iFippp
 #() iFipON
@@ -1158,6 +1162,7 @@
 #() iFpppL
 #() iFpppp
 #() iFpONN
+#() iFSpii
 #() iFSpiL
 #() iFbupp
 #() IFEpIi
@@ -1282,11 +1287,13 @@
 #() pFiiup
 #() pFiiLp
 #() pFiipi
+#() pFiipp
 #() pFiIIi
 #() pFillu
 #() pFipip
 #() pFippi
 #() pFippu
+#() pFippl
 #() pFippL
 #() pFippp
 #() pFuuii
@@ -2585,6 +2592,7 @@
 #() iFppppdpu
 #() iFpppppip
 #() iFpppppLp
+#() iFppppppi
 #() iFppppppu
 #() iFppppppp
 #() uFEiipppp
@@ -2808,10 +2816,12 @@
 #() iFppuiiuuu
 #() iFppuuuuuu
 #() iFppuppppp
+#() iFppLpLpLi
 #() iFpppiiipi
 #() iFpppiiipp
 #() iFpppipipi
 #() iFppppiiup
+#() iFppppiipp
 #() iFppppippp
 #() iFppppuplu
 #() iFpppppupp
@@ -3384,9 +3394,8 @@ wrappedcrypto3:
 - pFp:
   - OPENSSL_sk_new
 - vFpp:
-  - X509_STORE_CTX_set_verify_cb
-- pFpp:
   - OPENSSL_sk_pop_free
+  - X509_STORE_CTX_set_verify_cb
 - vFppp:
   - EVP_MD_do_all_provided
 - iFppp:
diff --git a/src/wrapped/generated/wrappedcrypto3types.h b/src/wrapped/generated/wrappedcrypto3types.h
index 8097b3c1..71d09e9b 100644
--- a/src/wrapped/generated/wrappedcrypto3types.h
+++ b/src/wrapped/generated/wrappedcrypto3types.h
@@ -14,7 +14,6 @@
 typedef void (*vFp_t)(void*);
 typedef void* (*pFp_t)(void*);
 typedef void (*vFpp_t)(void*, void*);
-typedef void* (*pFpp_t)(void*, void*);
 typedef void (*vFppp_t)(void*, void*, void*);
 typedef int32_t (*iFppp_t)(void*, void*, void*);
 typedef int32_t (*iFppV_t)(void*, void*, ...);
@@ -29,8 +28,8 @@ typedef int32_t (*iFppppipp_t)(void*, void*, void*, void*, int32_t, void*, void*
 	GO(CRYPTO_set_id_callback, vFp_t) \
 	GO(CRYPTO_set_locking_callback, vFp_t) \
 	GO(OPENSSL_sk_new, pFp_t) \
+	GO(OPENSSL_sk_pop_free, vFpp_t) \
 	GO(X509_STORE_CTX_set_verify_cb, vFpp_t) \
-	GO(OPENSSL_sk_pop_free, pFpp_t) \
 	GO(EVP_MD_do_all_provided, vFppp_t) \
 	GO(ASN1_i2d_bio, iFppp_t) \
 	GO(BIO_printf, iFppV_t) \
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index d1aec022..31964dee 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -624,8 +624,10 @@ typedef int32_t (*iFppp_t)(void*, void*, void*);
 typedef int32_t (*iFpOi_t)(void*, int32_t, int32_t);
 typedef int32_t (*iFpOu_t)(void*, int32_t, uint32_t);
 typedef int32_t (*iFpSu_t)(void*, void*, uint32_t);
+typedef int32_t (*iFpSp_t)(void*, void*, void*);
 typedef int32_t (*iFSIi_t)(void*, int64_t, int32_t);
 typedef int32_t (*iFSli_t)(void*, intptr_t, int32_t);
+typedef int32_t (*iFSpi_t)(void*, void*, int32_t);
 typedef int32_t (*iFSpL_t)(void*, void*, uintptr_t);
 typedef int32_t (*iFSpp_t)(void*, void*, void*);
 typedef int32_t (*iFSpA_t)(void*, void*, void*);
@@ -825,6 +827,7 @@ typedef void* (*pFppL_t)(void*, void*, uintptr_t);
 typedef void* (*pFppp_t)(void*, void*, void*);
 typedef void* (*pFppS_t)(void*, void*, void*);
 typedef void* (*pFppA_t)(void*, void*, void*);
+typedef void* (*pFpSp_t)(void*, void*, void*);
 typedef void* (*pFpbi_t)(void*, void*, int32_t);
 typedef void* (*pFSpl_t)(void*, void*, intptr_t);
 typedef void* (*pFbCC_t)(void*, uint8_t, uint8_t);
@@ -1068,6 +1071,7 @@ typedef int32_t (*iFipLu_t)(int32_t, void*, uintptr_t, uint32_t);
 typedef int32_t (*iFipLp_t)(int32_t, void*, uintptr_t, void*);
 typedef int32_t (*iFippi_t)(int32_t, void*, void*, int32_t);
 typedef int32_t (*iFippu_t)(int32_t, void*, void*, uint32_t);
+typedef int32_t (*iFippl_t)(int32_t, void*, void*, intptr_t);
 typedef int32_t (*iFippL_t)(int32_t, void*, void*, uintptr_t);
 typedef int32_t (*iFippp_t)(int32_t, void*, void*, void*);
 typedef int32_t (*iFipON_t)(int32_t, void*, int32_t, ...);
@@ -1188,6 +1192,7 @@ typedef int32_t (*iFpppu_t)(void*, void*, void*, uint32_t);
 typedef int32_t (*iFpppL_t)(void*, void*, void*, uintptr_t);
 typedef int32_t (*iFpppp_t)(void*, void*, void*, void*);
 typedef int32_t (*iFpONN_t)(void*, int32_t, ...);
+typedef int32_t (*iFSpii_t)(void*, void*, int32_t, int32_t);
 typedef int32_t (*iFSpiL_t)(void*, void*, int32_t, uintptr_t);
 typedef int32_t (*iFbupp_t)(void*, uint32_t, void*, void*);
 typedef int64_t (*IFEpIi_t)(x64emu_t*, void*, int64_t, int32_t);
@@ -1312,11 +1317,13 @@ typedef void* (*pFiiuu_t)(int32_t, int32_t, uint32_t, uint32_t);
 typedef void* (*pFiiup_t)(int32_t, int32_t, uint32_t, void*);
 typedef void* (*pFiiLp_t)(int32_t, int32_t, uintptr_t, void*);
 typedef void* (*pFiipi_t)(int32_t, int32_t, void*, int32_t);
+typedef void* (*pFiipp_t)(int32_t, int32_t, void*, void*);
 typedef void* (*pFiIIi_t)(int32_t, int64_t, int64_t, int32_t);
 typedef void* (*pFillu_t)(int32_t, intptr_t, intptr_t, uint32_t);
 typedef void* (*pFipip_t)(int32_t, void*, int32_t, void*);
 typedef void* (*pFippi_t)(int32_t, void*, void*, int32_t);
 typedef void* (*pFippu_t)(int32_t, void*, void*, uint32_t);
+typedef void* (*pFippl_t)(int32_t, void*, void*, intptr_t);
 typedef void* (*pFippL_t)(int32_t, void*, void*, uintptr_t);
 typedef void* (*pFippp_t)(int32_t, void*, void*, void*);
 typedef void* (*pFuuii_t)(uint32_t, uint32_t, int32_t, int32_t);
@@ -2613,6 +2620,7 @@ typedef int32_t (*iFppppupu_t)(void*, void*, void*, void*, uint32_t, void*, uint
 typedef int32_t (*iFppppdpu_t)(void*, void*, void*, void*, double, void*, uint32_t);
 typedef int32_t (*iFpppppip_t)(void*, void*, void*, void*, void*, int32_t, void*);
 typedef int32_t (*iFpppppLp_t)(void*, void*, void*, void*, void*, uintptr_t, void*);
+typedef int32_t (*iFppppppi_t)(void*, void*, void*, void*, void*, void*, int32_t);
 typedef int32_t (*iFppppppu_t)(void*, void*, void*, void*, void*, void*, uint32_t);
 typedef int32_t (*iFppppppp_t)(void*, void*, void*, void*, void*, void*, void*);
 typedef uint32_t (*uFEiipppp_t)(x64emu_t*, int32_t, int32_t, void*, void*, void*, void*);
@@ -2836,10 +2844,12 @@ typedef int32_t (*iFppIIIppp_t)(void*, void*, int64_t, int64_t, int64_t, void*,
 typedef int32_t (*iFppuiiuuu_t)(void*, void*, uint32_t, int32_t, int32_t, uint32_t, uint32_t, uint32_t);
 typedef int32_t (*iFppuuuuuu_t)(void*, void*, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef int32_t (*iFppuppppp_t)(void*, void*, uint32_t, void*, void*, void*, void*, void*);
+typedef int32_t (*iFppLpLpLi_t)(void*, void*, uintptr_t, void*, uintptr_t, void*, uintptr_t, int32_t);
 typedef int32_t (*iFpppiiipi_t)(void*, void*, void*, int32_t, int32_t, int32_t, void*, int32_t);
 typedef int32_t (*iFpppiiipp_t)(void*, void*, void*, int32_t, int32_t, int32_t, void*, void*);
 typedef int32_t (*iFpppipipi_t)(void*, void*, void*, int32_t, void*, int32_t, void*, int32_t);
 typedef int32_t (*iFppppiiup_t)(void*, void*, void*, void*, int32_t, int32_t, uint32_t, void*);
+typedef int32_t (*iFppppiipp_t)(void*, void*, void*, void*, int32_t, int32_t, void*, void*);
 typedef int32_t (*iFppppippp_t)(void*, void*, void*, void*, int32_t, void*, void*, void*);
 typedef int32_t (*iFppppuplu_t)(void*, void*, void*, void*, uint32_t, void*, intptr_t, uint32_t);
 typedef int32_t (*iFpppppupp_t)(void*, void*, void*, void*, void*, uint32_t, void*, void*);
@@ -3946,8 +3956,10 @@ void iFppp(x64emu_t *emu, uintptr_t fcn) { iFppp_t fn = (iFppp_t)fcn; R_RAX=(int
 void iFpOi(x64emu_t *emu, uintptr_t fcn) { iFpOi_t fn = (iFpOi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, of_convert((int32_t)R_RSI), (int32_t)R_RDX); }
 void iFpOu(x64emu_t *emu, uintptr_t fcn) { iFpOu_t fn = (iFpOu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, of_convert((int32_t)R_RSI), (uint32_t)R_RDX); }
 void iFpSu(x64emu_t *emu, uintptr_t fcn) { iFpSu_t fn = (iFpSu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, io_convert((void*)R_RSI), (uint32_t)R_RDX); }
+void iFpSp(x64emu_t *emu, uintptr_t fcn) { iFpSp_t fn = (iFpSp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, io_convert((void*)R_RSI), (void*)R_RDX); }
 void iFSIi(x64emu_t *emu, uintptr_t fcn) { iFSIi_t fn = (iFSIi_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (int64_t)R_RSI, (int32_t)R_RDX); }
 void iFSli(x64emu_t *emu, uintptr_t fcn) { iFSli_t fn = (iFSli_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (intptr_t)R_RSI, (int32_t)R_RDX); }
+void iFSpi(x64emu_t *emu, uintptr_t fcn) { iFSpi_t fn = (iFSpi_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (void*)R_RSI, (int32_t)R_RDX); }
 void iFSpL(x64emu_t *emu, uintptr_t fcn) { iFSpL_t fn = (iFSpL_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (void*)R_RSI, (uintptr_t)R_RDX); }
 void iFSpp(x64emu_t *emu, uintptr_t fcn) { iFSpp_t fn = (iFSpp_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (void*)R_RSI, (void*)R_RDX); }
 void iFSpA(x64emu_t *emu, uintptr_t fcn) { iFSpA_t fn = (iFSpA_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (void*)R_RSI, (void*)R_RDX); }
@@ -4147,6 +4159,7 @@ void pFppL(x64emu_t *emu, uintptr_t fcn) { pFppL_t fn = (pFppL_t)fcn; R_RAX=(uin
 void pFppp(x64emu_t *emu, uintptr_t fcn) { pFppp_t fn = (pFppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void pFppS(x64emu_t *emu, uintptr_t fcn) { pFppS_t fn = (pFppS_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, io_convert((void*)R_RDX)); }
 void pFppA(x64emu_t *emu, uintptr_t fcn) { pFppA_t fn = (pFppA_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
+void pFpSp(x64emu_t *emu, uintptr_t fcn) { pFpSp_t fn = (pFpSp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, io_convert((void*)R_RSI), (void*)R_RDX); }
 void pFpbi(x64emu_t *emu, uintptr_t fcn) { pFpbi_t fn = (pFpbi_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RSI); R_RAX=(uintptr_t)fn((void*)R_RDI, aligned_xcb, (int32_t)R_RDX); unalign_xcb_connection(aligned_xcb, (void*)R_RSI); }
 void pFSpl(x64emu_t *emu, uintptr_t fcn) { pFSpl_t fn = (pFSpl_t)fcn; R_RAX=(uintptr_t)fn(io_convert((void*)R_RDI), (void*)R_RSI, (intptr_t)R_RDX); }
 void pFbCC(x64emu_t *emu, uintptr_t fcn) { pFbCC_t fn = (pFbCC_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uintptr_t)fn(aligned_xcb, (uint8_t)R_RSI, (uint8_t)R_RDX); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
@@ -4390,6 +4403,7 @@ void iFipLu(x64emu_t *emu, uintptr_t fcn) { iFipLu_t fn = (iFipLu_t)fcn; R_RAX=(
 void iFipLp(x64emu_t *emu, uintptr_t fcn) { iFipLp_t fn = (iFipLp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
 void iFippi(x64emu_t *emu, uintptr_t fcn) { iFippi_t fn = (iFippi_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void iFippu(x64emu_t *emu, uintptr_t fcn) { iFippu_t fn = (iFippu_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
+void iFippl(x64emu_t *emu, uintptr_t fcn) { iFippl_t fn = (iFippl_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (intptr_t)R_RCX); }
 void iFippL(x64emu_t *emu, uintptr_t fcn) { iFippL_t fn = (iFippL_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void iFippp(x64emu_t *emu, uintptr_t fcn) { iFippp_t fn = (iFippp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFipON(x64emu_t *emu, uintptr_t fcn) { iFipON_t fn = (iFipON_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, of_convert((int32_t)R_RDX), (void*)R_RCX); }
@@ -4510,6 +4524,7 @@ void iFpppu(x64emu_t *emu, uintptr_t fcn) { iFpppu_t fn = (iFpppu_t)fcn; R_RAX=(
 void iFpppL(x64emu_t *emu, uintptr_t fcn) { iFpppL_t fn = (iFpppL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void iFpppp(x64emu_t *emu, uintptr_t fcn) { iFpppp_t fn = (iFpppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFpONN(x64emu_t *emu, uintptr_t fcn) { iFpONN_t fn = (iFpONN_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, of_convert((int32_t)R_RSI), (void*)R_RDX, (void*)R_RCX); }
+void iFSpii(x64emu_t *emu, uintptr_t fcn) { iFSpii_t fn = (iFSpii_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void iFSpiL(x64emu_t *emu, uintptr_t fcn) { iFSpiL_t fn = (iFSpiL_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (void*)R_RSI, (int32_t)R_RDX, (uintptr_t)R_RCX); }
 void iFbupp(x64emu_t *emu, uintptr_t fcn) { iFbupp_t fn = (iFbupp_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(int32_t)fn(aligned_xcb, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
 void IFEpIi(x64emu_t *emu, uintptr_t fcn) { IFEpIi_t fn = (IFEpIi_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI, (int32_t)R_RDX); }
@@ -4634,11 +4649,13 @@ void pFiiuu(x64emu_t *emu, uintptr_t fcn) { pFiiuu_t fn = (pFiiuu_t)fcn; R_RAX=(
 void pFiiup(x64emu_t *emu, uintptr_t fcn) { pFiiup_t fn = (pFiiup_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
 void pFiiLp(x64emu_t *emu, uintptr_t fcn) { pFiiLp_t fn = (pFiiLp_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
 void pFiipi(x64emu_t *emu, uintptr_t fcn) { pFiipi_t fn = (pFiipi_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
+void pFiipp(x64emu_t *emu, uintptr_t fcn) { pFiipp_t fn = (pFiipp_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void pFiIIi(x64emu_t *emu, uintptr_t fcn) { pFiIIi_t fn = (pFiIIi_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int32_t)R_RCX); }
 void pFillu(x64emu_t *emu, uintptr_t fcn) { pFillu_t fn = (pFillu_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (uint32_t)R_RCX); }
 void pFipip(x64emu_t *emu, uintptr_t fcn) { pFipip_t fn = (pFipip_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void pFippi(x64emu_t *emu, uintptr_t fcn) { pFippi_t fn = (pFippi_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void pFippu(x64emu_t *emu, uintptr_t fcn) { pFippu_t fn = (pFippu_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
+void pFippl(x64emu_t *emu, uintptr_t fcn) { pFippl_t fn = (pFippl_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (intptr_t)R_RCX); }
 void pFippL(x64emu_t *emu, uintptr_t fcn) { pFippL_t fn = (pFippL_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void pFippp(x64emu_t *emu, uintptr_t fcn) { pFippp_t fn = (pFippp_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void pFuuii(x64emu_t *emu, uintptr_t fcn) { pFuuii_t fn = (pFuuii_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
@@ -5935,6 +5952,7 @@ void iFppppupu(x64emu_t *emu, uintptr_t fcn) { iFppppupu_t fn = (iFppppupu_t)fcn
 void iFppppdpu(x64emu_t *emu, uintptr_t fcn) { iFppppdpu_t fn = (iFppppdpu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, emu->xmm[0].d[0], (void*)R_R8, (uint32_t)R_R9); }
 void iFpppppip(x64emu_t *emu, uintptr_t fcn) { iFpppppip_t fn = (iFpppppip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
 void iFpppppLp(x64emu_t *emu, uintptr_t fcn) { iFpppppLp_t fn = (iFpppppLp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8)); }
+void iFppppppi(x64emu_t *emu, uintptr_t fcn) { iFppppppi_t fn = (iFppppppi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); }
 void iFppppppu(x64emu_t *emu, uintptr_t fcn) { iFppppppu_t fn = (iFppppppu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void iFppppppp(x64emu_t *emu, uintptr_t fcn) { iFppppppp_t fn = (iFppppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void uFEiipppp(x64emu_t *emu, uintptr_t fcn) { uFEiipppp_t fn = (uFEiipppp_t)fcn; R_RAX=(uint32_t)fn(emu, (int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
@@ -6158,10 +6176,12 @@ void iFppIIIppp(x64emu_t *emu, uintptr_t fcn) { iFppIIIppp_t fn = (iFppIIIppp_t)
 void iFppuiiuuu(x64emu_t *emu, uintptr_t fcn) { iFppuiiuuu_t fn = (iFppuiiuuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void iFppuuuuuu(x64emu_t *emu, uintptr_t fcn) { iFppuuuuuu_t fn = (iFppuuuuuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void iFppuppppp(x64emu_t *emu, uintptr_t fcn) { iFppuppppp_t fn = (iFppuppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
+void iFppLpLpLi(x64emu_t *emu, uintptr_t fcn) { iFppLpLpLi_t fn = (iFppLpLpLi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(uintptr_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void iFpppiiipi(x64emu_t *emu, uintptr_t fcn) { iFpppiiipi_t fn = (iFpppiiipi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void iFpppiiipp(x64emu_t *emu, uintptr_t fcn) { iFpppiiipp_t fn = (iFpppiiipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpppipipi(x64emu_t *emu, uintptr_t fcn) { iFpppipipi_t fn = (iFpppipipi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void iFppppiiup(x64emu_t *emu, uintptr_t fcn) { iFppppiiup_t fn = (iFppppiiup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
+void iFppppiipp(x64emu_t *emu, uintptr_t fcn) { iFppppiipp_t fn = (iFppppiipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFppppippp(x64emu_t *emu, uintptr_t fcn) { iFppppippp_t fn = (iFppppippp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFppppuplu(x64emu_t *emu, uintptr_t fcn) { iFppppuplu_t fn = (iFppppuplu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(intptr_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void iFpppppupp(x64emu_t *emu, uintptr_t fcn) { iFpppppupp_t fn = (iFpppppupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
@@ -7508,6 +7528,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFipLp) return 1;
 	if (fun == &iFippi) return 1;
 	if (fun == &iFippu) return 1;
+	if (fun == &iFippl) return 1;
 	if (fun == &iFippL) return 1;
 	if (fun == &iFippp) return 1;
 	if (fun == &iFuiup) return 1;
@@ -7711,11 +7732,13 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFiiup) return 1;
 	if (fun == &pFiiLp) return 1;
 	if (fun == &pFiipi) return 1;
+	if (fun == &pFiipp) return 1;
 	if (fun == &pFiIIi) return 1;
 	if (fun == &pFillu) return 1;
 	if (fun == &pFipip) return 1;
 	if (fun == &pFippi) return 1;
 	if (fun == &pFippu) return 1;
+	if (fun == &pFippl) return 1;
 	if (fun == &pFippL) return 1;
 	if (fun == &pFippp) return 1;
 	if (fun == &pFuuii) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index ccd32e9a..67e48a1e 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -626,8 +626,10 @@ void iFppp(x64emu_t *emu, uintptr_t fnc);
 void iFpOi(x64emu_t *emu, uintptr_t fnc);
 void iFpOu(x64emu_t *emu, uintptr_t fnc);
 void iFpSu(x64emu_t *emu, uintptr_t fnc);
+void iFpSp(x64emu_t *emu, uintptr_t fnc);
 void iFSIi(x64emu_t *emu, uintptr_t fnc);
 void iFSli(x64emu_t *emu, uintptr_t fnc);
+void iFSpi(x64emu_t *emu, uintptr_t fnc);
 void iFSpL(x64emu_t *emu, uintptr_t fnc);
 void iFSpp(x64emu_t *emu, uintptr_t fnc);
 void iFSpA(x64emu_t *emu, uintptr_t fnc);
@@ -831,6 +833,7 @@ void pFppL(x64emu_t *emu, uintptr_t fnc);
 void pFppp(x64emu_t *emu, uintptr_t fnc);
 void pFppS(x64emu_t *emu, uintptr_t fnc);
 void pFppA(x64emu_t *emu, uintptr_t fnc);
+void pFpSp(x64emu_t *emu, uintptr_t fnc);
 void pFpbi(x64emu_t *emu, uintptr_t fnc);
 void pFSpl(x64emu_t *emu, uintptr_t fnc);
 void pFbCC(x64emu_t *emu, uintptr_t fnc);
@@ -1074,6 +1077,7 @@ void iFipLu(x64emu_t *emu, uintptr_t fnc);
 void iFipLp(x64emu_t *emu, uintptr_t fnc);
 void iFippi(x64emu_t *emu, uintptr_t fnc);
 void iFippu(x64emu_t *emu, uintptr_t fnc);
+void iFippl(x64emu_t *emu, uintptr_t fnc);
 void iFippL(x64emu_t *emu, uintptr_t fnc);
 void iFippp(x64emu_t *emu, uintptr_t fnc);
 void iFipON(x64emu_t *emu, uintptr_t fnc);
@@ -1195,6 +1199,7 @@ void iFpppu(x64emu_t *emu, uintptr_t fnc);
 void iFpppL(x64emu_t *emu, uintptr_t fnc);
 void iFpppp(x64emu_t *emu, uintptr_t fnc);
 void iFpONN(x64emu_t *emu, uintptr_t fnc);
+void iFSpii(x64emu_t *emu, uintptr_t fnc);
 void iFSpiL(x64emu_t *emu, uintptr_t fnc);
 void iFbupp(x64emu_t *emu, uintptr_t fnc);
 void IFEpIi(x64emu_t *emu, uintptr_t fnc);
@@ -1319,11 +1324,13 @@ void pFiiuu(x64emu_t *emu, uintptr_t fnc);
 void pFiiup(x64emu_t *emu, uintptr_t fnc);
 void pFiiLp(x64emu_t *emu, uintptr_t fnc);
 void pFiipi(x64emu_t *emu, uintptr_t fnc);
+void pFiipp(x64emu_t *emu, uintptr_t fnc);
 void pFiIIi(x64emu_t *emu, uintptr_t fnc);
 void pFillu(x64emu_t *emu, uintptr_t fnc);
 void pFipip(x64emu_t *emu, uintptr_t fnc);
 void pFippi(x64emu_t *emu, uintptr_t fnc);
 void pFippu(x64emu_t *emu, uintptr_t fnc);
+void pFippl(x64emu_t *emu, uintptr_t fnc);
 void pFippL(x64emu_t *emu, uintptr_t fnc);
 void pFippp(x64emu_t *emu, uintptr_t fnc);
 void pFuuii(x64emu_t *emu, uintptr_t fnc);
@@ -2622,6 +2629,7 @@ void iFppppupu(x64emu_t *emu, uintptr_t fnc);
 void iFppppdpu(x64emu_t *emu, uintptr_t fnc);
 void iFpppppip(x64emu_t *emu, uintptr_t fnc);
 void iFpppppLp(x64emu_t *emu, uintptr_t fnc);
+void iFppppppi(x64emu_t *emu, uintptr_t fnc);
 void iFppppppu(x64emu_t *emu, uintptr_t fnc);
 void iFppppppp(x64emu_t *emu, uintptr_t fnc);
 void uFEiipppp(x64emu_t *emu, uintptr_t fnc);
@@ -2845,10 +2853,12 @@ void iFppIIIppp(x64emu_t *emu, uintptr_t fnc);
 void iFppuiiuuu(x64emu_t *emu, uintptr_t fnc);
 void iFppuuuuuu(x64emu_t *emu, uintptr_t fnc);
 void iFppuppppp(x64emu_t *emu, uintptr_t fnc);
+void iFppLpLpLi(x64emu_t *emu, uintptr_t fnc);
 void iFpppiiipi(x64emu_t *emu, uintptr_t fnc);
 void iFpppiiipp(x64emu_t *emu, uintptr_t fnc);
 void iFpppipipi(x64emu_t *emu, uintptr_t fnc);
 void iFppppiiup(x64emu_t *emu, uintptr_t fnc);
+void iFppppiipp(x64emu_t *emu, uintptr_t fnc);
 void iFppppippp(x64emu_t *emu, uintptr_t fnc);
 void iFppppuplu(x64emu_t *emu, uintptr_t fnc);
 void iFpppppupp(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedcrypto3_private.h b/src/wrapped/wrappedcrypto3_private.h
index 534b5956..a81711e6 100644
--- a/src/wrapped/wrappedcrypto3_private.h
+++ b/src/wrapped/wrappedcrypto3_private.h
@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(a2d_ASN1_OBJECT, iFpipi)
@@ -42,7 +42,7 @@ GO(AES_wrap_key, iFppppi)
 //GO(_armv8_sha1_probe, 
 //GO(_armv8_sha256_probe, 
 //GO(asn1_add_error, 
-//GO(ASN1_add_oid_module, 
+GO(ASN1_add_oid_module, vFv)
 GO(ASN1_BIT_STRING_check, iFppi)
 GO(ASN1_BIT_STRING_free, vFp)
 GO(ASN1_BIT_STRING_get_bit, iFpi)
@@ -59,11 +59,11 @@ GO(ASN1_check_infinite_end, iFpl)
 GO(ASN1_const_check_infinite_end, iFpl)
 //GO(asn1_const_Finish, 
 GOM(ASN1_d2i_bio, pFEpppp)
-//GO(ASN1_d2i_fp, 
+//GOM(ASN1_d2i_fp, pFEppSp)
 //GO(ASN1_digest, 
 //GO(asn1_do_adb, 
 //GO(asn1_do_lock, 
-//GO(ASN1_dup, 
+//GOM(ASN1_dup, pFEppp)
 //GO(asn1_enc_free, 
 //GO(asn1_enc_init, 
 //GO(asn1_enc_restore, 
@@ -93,7 +93,7 @@ GO(ASN1_generate_v3, pFpp)
 GO(ASN1_get_object, iFppppl)
 //GO(asn1_GetSequence, 
 GOM(ASN1_i2d_bio, iFEppp)
-//GO(ASN1_i2d_fp, 
+//GOM(ASN1_i2d_fp, iFEpSp)
 GO(ASN1_IA5STRING_free, vFp)
 GO(ASN1_IA5STRING_new, pFv)
 GO(ASN1_INTEGER_cmp, iFpp)
@@ -105,7 +105,7 @@ GO(ASN1_INTEGER_set, iFpl)
 GO(ASN1_INTEGER_to_BN, pFpp)
 GO(ASN1_item_d2i, pFpplp)
 GO(ASN1_item_d2i_bio, pFppp)
-GO(ASN1_item_d2i_fp, pFppp)
+GO(ASN1_item_d2i_fp, pFpSp)
 //GO(ASN1_item_digest, 
 GO(ASN1_item_dup, pFpp)
 //GO(ASN1_item_ex_d2i, 
@@ -113,9 +113,9 @@ GO(ASN1_item_dup, pFpp)
 //GO(ASN1_item_ex_i2d, 
 //GO(ASN1_item_ex_new, 
 GO(ASN1_item_free, vFpp)
-//GO(ASN1_item_i2d, 
+GO(ASN1_item_i2d, iFppp)
 GO(ASN1_item_i2d_bio, iFppp)
-GO(ASN1_item_i2d_fp, iFppp)
+GO(ASN1_item_i2d_fp, iFpSp)
 GO(ASN1_item_ndef_i2d, iFppp)
 GO(ASN1_item_new, pFp)
 GO(ASN1_item_pack, pFppp)
@@ -141,21 +141,21 @@ GO(ASN1_OCTET_STRING_set, iFppi)
 GO(ASN1_parse, iFppli)
 GO(ASN1_parse_dump, iFpplii)
 GO(ASN1_PCTX_free, vFp)
-//GO(ASN1_PCTX_get_cert_flags, 
-//GO(ASN1_PCTX_get_flags, 
-//GO(ASN1_PCTX_get_nm_flags, 
-//GO(ASN1_PCTX_get_oid_flags, 
+GO(ASN1_PCTX_get_cert_flags, LFp)
+GO(ASN1_PCTX_get_flags, LFp)
+GO(ASN1_PCTX_get_nm_flags, LFp)
+GO(ASN1_PCTX_get_oid_flags, LFp)
 GO(ASN1_PCTX_get_str_flags, LFp)
 GO(ASN1_PCTX_new, pFv)
-//GO(ASN1_PCTX_set_cert_flags, 
-//GO(ASN1_PCTX_set_flags, 
-//GO(ASN1_PCTX_set_nm_flags, 
-//GO(ASN1_PCTX_set_oid_flags, 
+GO(ASN1_PCTX_set_cert_flags, vFpL)
+GO(ASN1_PCTX_set_flags, vFpL)
+GO(ASN1_PCTX_set_nm_flags, vFpL)
+GO(ASN1_PCTX_set_oid_flags, vFpL)
 GO(ASN1_PCTX_set_str_flags, vFpL)
 //GO(ASN1_primitive_free, 
 //GO(ASN1_primitive_new, 
-//GO(ASN1_PRINTABLE_free, 
-//GO(ASN1_PRINTABLE_new, 
+GO(ASN1_PRINTABLE_free, vFp)
+GO(ASN1_PRINTABLE_new, pFv)
 GO(ASN1_PRINTABLESTRING_free, vFp)
 GO(ASN1_PRINTABLESTRING_new, pFv)
 GO(ASN1_PRINTABLE_type, iFpi)
@@ -165,7 +165,7 @@ GO(ASN1_put_object, vFpiiii)
 //GO(ASN1_seq_unpack, 
 //GO(asn1_set_choice_selector, 
 //GO(ASN1_sign, 
-//GO(ASN1_STRING_clear_free, 
+GO(ASN1_STRING_clear_free, vFp)
 GO(ASN1_STRING_cmp, iFpp)
 GO(ASN1_STRING_copy, iFpp)
 GO(ASN1_STRING_data, pFp)
@@ -175,17 +175,17 @@ GO(ASN1_STRING_get0_data, pFp)
 GO(ASN1_STRING_get_default_mask, LFv)
 GO(ASN1_STRING_length, iFp)
 GO(ASN1_STRING_length_set, vFpi)
-//GO(ASN1_STRING_new, 
+GO(ASN1_STRING_new, pFv)
 GO(ASN1_STRING_print, iFpp)
 GO(ASN1_STRING_print_ex, iFppL)
-GO(ASN1_STRING_print_ex_fp, iFppL)
+GO(ASN1_STRING_print_ex_fp, iFSpL)
 GO(ASN1_STRING_set, iFppi)
 GO(ASN1_STRING_set0, vFppi)
 GO(ASN1_STRING_set_by_NID, pFppiii)
 GO(ASN1_STRING_set_default_mask, vFL)
 GO(ASN1_STRING_set_default_mask_asc, iFp)
 GO(ASN1_STRING_TABLE_add, iFillLL)
-//GO(ASN1_STRING_TABLE_cleanup, 
+GO(ASN1_STRING_TABLE_cleanup, vFv)
 GO(ASN1_STRING_TABLE_get, pFi)
 GO(ASN1_STRING_to_UTF8, iFpp)
 GO(ASN1_STRING_type, iFp)
@@ -206,7 +206,7 @@ GO(ASN1_TIME_free, vFp)
 GO(ASN1_TIME_new, pFv)
 GO(ASN1_TIME_print, iFpp)
 GO(ASN1_TIME_set, pFpl)
-//GO(ASN1_TIME_set_string, 
+GO(ASN1_TIME_set_string, iFpp)
 GO(ASN1_TIME_to_generalizedtime, pFpp)
 GO(ASN1_TYPE_cmp, iFpp)
 GO(ASN1_TYPE_free, vFp)
@@ -257,48 +257,48 @@ GO(BF_ofb64_encrypt, vFpplppp)
 GO(BF_options, pFv)
 GO(BF_set_key, vFpip)
 GO(BIO_accept, iFip)
-//GO(BIO_asn1_get_prefix, 
-GO(BIO_asn1_get_suffix, iFppp)
-//GO(BIO_asn1_set_prefix, 
-//GO(BIO_asn1_set_suffix, 
-//GO(BIO_callback_ctrl, 
+//GOM(BIO_asn1_get_prefix, iFEppp)
+GO(BIO_asn1_get_suffix, iFppp)  // might need GOM, the 2 last p are functions pointers
+//GOM(BIO_asn1_set_prefix, iFEppp)
+//GOM(BIO_asn1_set_suffix, iFEppp)
+//GOM(BIO_callback_ctrl, lFEpip)
 GO(BIO_clear_flags, vFpi)
 //GO(BIO_CONNECT_free, 
 //GO(BIO_CONNECT_new, 
 GO(BIO_copy_next_retry, vFp)
 GO(BIO_ctrl, lFpilp)
 GO(BIO_ctrl_get_read_request, LFp)
-//GO(BIO_ctrl_get_write_guarantee, 
+GO(BIO_ctrl_get_write_guarantee, LFp)
 GO(BIO_ctrl_pending, LFp)
-//GO(BIO_ctrl_reset_read_request, 
+GO(BIO_ctrl_reset_read_request, iFp)
 GO(BIO_ctrl_wpending, LFp)
 GO(BIO_debug_callback, lFpipill)
-//GO(BIO_dgram_non_fatal_error, 
+GO(BIO_dgram_non_fatal_error, iFi)
 GO(BIO_dump, iFppi)
-//GO(BIO_dump_cb, 
-GO(BIO_dump_fp, iFppi)
+//GOM(BIO_dump_cb, iFEpppi)
+GO(BIO_dump_fp, iFSpi)
 GO(BIO_dump_indent, iFppii)
-//GO(BIO_dump_indent_cb, 
-GO(BIO_dump_indent_fp, iFppii)
+//GOM(BIO_dump_indent_cb, iFEpppii)
+GO(BIO_dump_indent_fp, iFSpii)
 GO(BIO_dup_chain, pFp)
 GO(BIO_eof, iFp)
 GO(BIO_f_asn1, pFv)
-//GO(BIO_f_base64, 
-//GO(BIO_f_buffer, 
-//GO(BIO_f_cipher, 
-//GO(BIO_fd_non_fatal_error, 
-//GO(BIO_fd_should_retry, 
+GO(BIO_f_base64, pFv)
+GO(BIO_f_buffer, pFv)
+GO(BIO_f_cipher, pFv)
+GO(BIO_fd_non_fatal_error, iFi)
+GO(BIO_fd_should_retry, iFi)
 GO(BIO_flush, iFp)
 GO(BIO_find_type, pFpi)
-//GO(BIO_f_md, 
-//GO(BIO_f_nbio_test, 
-//GO(BIO_f_null, 
+GO(BIO_f_md, pFv)
+GO(BIO_f_nbio_test, pFv)
+GO(BIO_f_null, pFv)
 GO(BIO_free, iFp)
 GO(BIO_free_all, vFp)
-//GO(BIO_f_reliable, 
+GO(BIO_f_reliable, pFv)
 //GO(BIO_f_zlib, 
 GO(BIO_get_accept_socket, iFpi)
-GO(BIO_get_callback, pFp)
+GO(BIO_get_callback, pFp)   // might need GOM to unwrap callback?
 GO(BIO_get_callback_arg, pFp)
 GO(BIO_get_close, iFp)
 GO(BIO_get_ex_data, pFpi)
@@ -310,7 +310,7 @@ GO(BIO_get_retry_BIO, pFpp)
 GO(BIO_get_retry_reason, iFp)
 GO(BIO_gets, iFppi)
 GO(BIO_hex_string, iFpiipi)
-//GO(BIO_indent, 
+GO(BIO_indent, iFpii)
 GO(BIO_int_ctrl, lFpili)
 GO(BIO_method_name, pFp)
 GO(BIO_method_type, iFp)
@@ -318,75 +318,75 @@ GO(BIO_new, pFp)
 GO(BIO_new_accept, pFp)
 GO(BIO_new_bio_pair, iFpLpL)
 //GO(BIO_new_CMS, 
-//GO(BIO_new_connect, 
-//GO(BIO_new_dgram, 
+GO(BIO_new_connect, pFp)
+GO(BIO_new_dgram, pFii)
 GO(BIO_new_fd, pFii)
 GO(BIO_new_file, pFpp)
-GO(BIO_new_fp, pFpi)
+GO(BIO_new_fp, pFSi)
 GO(BIO_new_mem_buf, pFpi)
 GO(BIO_new_NDEF, pFppp)
 //GO(BIO_new_PKCS7, 
-//GO(BIO_new_socket, 
-//GO(BIO_next, 
-//GO(BIO_nread, 
-//GO(BIO_nread0, 
-//GO(BIO_number_read, 
-GO(BIO_number_written, LFp)
+GO(BIO_new_socket, pFii)
+GO(BIO_next, pFp)
+GO(BIO_nread, iFppi)
+GO(BIO_nread0, iFpp)
+GO(BIO_number_read, UFp)
+GO(BIO_number_written, UFp)
 GO(BIO_nwrite, iFppi)
 GO(BIO_nwrite0, iFpp)
 GO(BIO_pending, iFp)
-//GO(BIO_pop, 
+GO(BIO_pop, pFp)
 GOM(BIO_printf, iFEppV)
 GO(BIO_ptr_ctrl, pFpil)
 GO(BIO_push, pFpp)
 GO(BIO_puts, iFpp)
 GO(BIO_read, iFppi)
 GO(BIO_reset, iFp)
-//GO(BIO_s_accept, 
-//GO(BIO_s_bio, 
-//GO(BIO_s_connect, 
+GO(BIO_s_accept, pFv)
+GO(BIO_s_bio, pFv)
+GO(BIO_s_connect, pFv)
 GO(BIO_s_datagram, pFv)
 GO(BIO_seek, iFpi)
 GO(BIO_set, iFpp)
-//GO(BIO_set_callback, 
+//GOM(BIO_set_callback, vFEpp)
 GO(BIO_set_callback_arg, vFpp)
 GO(BIO_set_close, iFpl)
-//GO(BIO_set_cipher, 
+GO(BIO_set_cipher, iFppppi)
 GO(BIO_set_ex_data, iFpip)
 GO(BIO_set_flags, vFpi)
 GO(BIO_set_tcp_ndelay, iFii)
-//GO(BIO_s_fd, 
+GO(BIO_s_fd, pFv)
 GO(BIO_s_file, pFv)
-//GO(BIO_s_log, 
+GO(BIO_s_log, pFv)
 GO(BIO_s_mem, pFv)
-//GO(BIO_snprintf, 
-//GO(BIO_s_null, 
+//GOM(BIO_snprintf, iFEpLpV)
+GO(BIO_s_null, pFv)
 //GO(BIO_sock_cleanup, 
-//GO(BIO_sock_error, 
+GO(BIO_sock_error, iFi)
 GO(BIO_socket_ioctl, iFilp)
-//GO(BIO_socket_nbio, 
+GO(BIO_socket_nbio, iFii)
 GO(BIO_sock_init, iFv)
-//GO(BIO_sock_non_fatal_error, 
-//GO(BIO_sock_should_retry, 
-//GO(BIO_s_socket, 
+GO(BIO_sock_non_fatal_error, iFi)
+GO(BIO_sock_should_retry, iFi)
+GO(BIO_s_socket, pFv)
 GO(BIO_tell, iFp)
 GO(BIO_test_flags, iFpi)
 GO(BIO_up_ref, iFp)
 GO(BIO_vfree, vFp)
-//GO(BIO_vprintf, 
-//GO(BIO_vsnprintf, 
+//GOM(BIO_vprintf, iFEppA)
+//GOM(BIO_vsnprintf, iFEpLpA)
 GO(BIO_wpending, iFp)
 GO(BIO_write, iFppi)
 GO(BN_add, iFppp)
 //GO(bn_add_part_words, 
-GO(BN_add_word, iFpu)
+GO(BN_add_word, iFpL)
 //GO(bn_add_words, 
 GO(BN_asc2bn, iFpp)
 GO(BN_bin2bn, pFpip)
-//GO(BN_BLINDING_convert, 
+GO(BN_BLINDING_convert, iFppp)
 GO(BN_BLINDING_convert_ex, iFpppp)
-//GO(BN_BLINDING_create_param, 
-//GO(BN_BLINDING_free, 
+//GOM(BN_BLINDING_create_param, pFEpppppp)
+GO(BN_BLINDING_free, vFp)
 GO(BN_BLINDING_get_flags, LFp)
 //GO(BN_BLINDING_get_thread_id, 
 GO(BN_BLINDING_invert, iFppp)
@@ -414,7 +414,7 @@ GO(BN_CTX_free, vFp)
 GO(BN_CTX_get, pFp)
 GO(BN_CTX_init, vFp)
 GO(BN_CTX_new, pFv)
-//GO(BN_CTX_start, 
+GO(BN_CTX_start, vFp)
 GO(BN_dec2bn, iFpp)
 GO(BN_div, iFppppp)
 GO(BN_div_recp, iFppppp)
@@ -428,60 +428,60 @@ GO(BN_free, vFp)
 GO(BN_from_montgomery, iFpppp)
 GO(BN_gcd, iFpppp)
 GO(BN_GENCB_call, iFpii)
-//GO(BN_generate_prime, pFpiippBp) //callback previous last argument...
+//GOM(BN_generate_prime, pFEpiipppp)
 GO(BN_generate_prime_ex, iFpiippp)
-//GO(BN_get0_nist_prime_192, 
-//GO(BN_get0_nist_prime_224, 
-//GO(BN_get0_nist_prime_256, 
-//GO(BN_get0_nist_prime_384, 
+GO(BN_get0_nist_prime_192, pFv)
+GO(BN_get0_nist_prime_224, pFv)
+GO(BN_get0_nist_prime_256, pFv)
+GO(BN_get0_nist_prime_384, pFv)
 GO(BN_get0_nist_prime_521, pFv)
 GO(BN_get_params, iFi)
 GO(BN_get_word, LFp)
-//GO(BN_GF2m_add, 
+GO(BN_GF2m_add, iFppp)
 GO(BN_GF2m_arr2poly, iFpp)
 GO(BN_GF2m_mod, iFppp)
 GO(BN_GF2m_mod_arr, iFppp)
-//GO(BN_GF2m_mod_div, 
-//GO(BN_GF2m_mod_div_arr, 
+GO(BN_GF2m_mod_div, iFppppp)
+GO(BN_GF2m_mod_div_arr, iFppppp)
 GO(BN_GF2m_mod_exp, iFppppp)
 GO(BN_GF2m_mod_exp_arr, iFppppp)
-//GO(BN_GF2m_mod_inv, 
-//GO(BN_GF2m_mod_inv_arr, 
-//GO(BN_GF2m_mod_mul, 
-//GO(BN_GF2m_mod_mul_arr, 
-//GO(BN_GF2m_mod_solve_quad, 
+GO(BN_GF2m_mod_inv, iFpppp)
+GO(BN_GF2m_mod_inv_arr, iFpppp)
+GO(BN_GF2m_mod_mul, iFppppp)
+GO(BN_GF2m_mod_mul_arr, iFppppp)
+GO(BN_GF2m_mod_solve_quad, iFpppp)
 GO(BN_GF2m_mod_solve_quad_arr, iFpppp)
-//GO(BN_GF2m_mod_sqr, 
-//GO(BN_GF2m_mod_sqr_arr, 
-//GO(BN_GF2m_mod_sqrt, 
-//GO(BN_GF2m_mod_sqrt_arr, 
+GO(BN_GF2m_mod_sqr, iFpppp)
+GO(BN_GF2m_mod_sqr_arr, iFpppp)
+GO(BN_GF2m_mod_sqrt, iFpppp)
+GO(BN_GF2m_mod_sqrt_arr, iFpppp)
 //GO(bn_GF2m_mul_2x2, 
 GO(BN_GF2m_poly2arr, iFppi)
 GO(BN_hex2bn, iFpp)
 //GO(BN_init, 
 GO(BN_is_bit_set, iFpi)
-//GO(BN_is_prime, iFpiBpp)  // third argument is a callback
+//GOM(BN_is_prime, iFEpippp)  // third argument is a callback
 GO(BN_is_prime_ex, iFpipp)
-//GO(BN_is_prime_fasttest, 
+//GOM(BN_is_prime_fasttest, iFEpipppi)
 GO(BN_is_prime_fasttest_ex, iFpipip)
-GO(BN_is_zero, iFp) 
+GO(BN_is_zero, iFp)
 GO(BN_kronecker, iFppp)
 GO(BN_lshift, iFppi)
 GO(BN_lshift1, iFpp)
 GO(BN_mask_bits, iFpi)
 GO(BN_mod_add, iFppppp)
-//GO(BN_mod_add_quick, 
+GO(BN_mod_add_quick, iFpppp)
 GO(BN_mod_exp, iFppppp)
 GO(BN_mod_exp2_mont, iFpppppppp)
-//GO(BN_mod_exp_mont, 
+GO(BN_mod_exp_mont, iFpppppp)
 GO(BN_mod_exp_mont_consttime, iFpppppp)
 GO(BN_mod_exp_mont_word, iFpLpppp)
-//GO(BN_mod_exp_recp, 
-//GO(BN_mod_exp_simple, 
+GO(BN_mod_exp_recp, iFppppp)
+GO(BN_mod_exp_simple, iFppppp)
 GO(BN_mod_inverse, pFpppp)
 GO(BN_mod_lshift, iFppipp)
-//GO(BN_mod_lshift1, 
-//GO(BN_mod_lshift1_quick, 
+GO(BN_mod_lshift1, iFpppp)
+GO(BN_mod_lshift1_quick, iFppp)
 GO(BN_mod_lshift_quick, iFppip)
 GO(BN_mod_mul, iFppppp)
 GO(BN_mod_mul_montgomery, iFppppp)
@@ -509,13 +509,13 @@ GO(BN_mul, iFpppp)
 //GO(bn_mul_normal, 
 //GO(bn_mul_part_recursive, 
 //GO(bn_mul_recursive, 
-GO(BN_mul_word, iFpu)
+GO(BN_mul_word, iFpL)
 //GO(bn_mul_words, 
 GO(BN_new, pFv)
-//GO(BN_nist_mod_192, 
-//GO(BN_nist_mod_224, 
-//GO(BN_nist_mod_256, 
-//GO(BN_nist_mod_384, 
+GO(BN_nist_mod_192, iFpppp)
+GO(BN_nist_mod_224, iFpppp)
+GO(BN_nist_mod_256, iFpppp)
+GO(BN_nist_mod_384, iFpppp)
 GO(BN_nist_mod_521, iFpppp)
 GO(BN_nnmod, iFpppp)
 GO(BN_num_bits, iFp)
@@ -523,11 +523,11 @@ GO(BN_num_bits_word, iFL)
 GO(BN_one, iFp)
 GO(BN_options, pFv)
 GO(BN_print, iFpp)
-GO(BN_print_fp, iFpp)
+GO(BN_print_fp, iFSp)
 GO(BN_pseudo_rand, iFpiii)
 GO(BN_pseudo_rand_range, iFpp)
 GO(BN_rand, iFpiii)
-//GO(BN_rand_range, 
+GO(BN_rand_range, iFpp)
 GO(BN_reciprocal, iFppip)
 GO(BN_RECP_CTX_free, vFp)
 //GO(BN_RECP_CTX_init, 
@@ -547,14 +547,14 @@ GO(BN_sqr, iFppp)
 //GO(bn_sqr_words, 
 GO(BN_sub, iFppp)
 //GO(bn_sub_part_words, 
-GO(BN_sub_word, iFpu)
+GO(BN_sub_word, iFpL)
 //GO(bn_sub_words, 
 GO(BN_swap, vFpp)
 GO(BN_to_ASN1_ENUMERATED, pFpp)
 GO(BN_to_ASN1_INTEGER, pFpp)
-//GO(BN_uadd, 
+GO(BN_uadd, iFppp)
 GO(BN_ucmp, iFpp)
-//GO(BN_usub, 
+GO(BN_usub, iFppp)
 GO(BN_value_one, pFv)
 GO(BN_X931_derive_prime_ex, iFppppppppp)
 GO(BN_X931_generate_prime_ex, iFppppppppp)
@@ -851,7 +851,7 @@ GO(CRYPTO_free_ex_data, vFipp)
 //GO(CRYPTO_get_dynlock_value, 
 GO(CRYPTO_get_ex_data, pFpi)
 //GO(CRYPTO_get_ex_data_implementation, 
-GO(CRYPTO_get_ex_new_index, iFilpppp)
+GO(CRYPTO_get_ex_new_index, iFilpppp)   // might need GOM, last 3 pointers are functions
 //GO(CRYPTO_get_id_callback, 
 //GO(CRYPTO_get_locked_mem_ex_functions, 
 //GO(CRYPTO_get_locked_mem_functions, 
@@ -860,12 +860,12 @@ GO(CRYPTO_get_ex_new_index, iFilpppp)
 //GO(CRYPTO_get_mem_debug_functions, 
 //GO(CRYPTO_get_mem_debug_options, 
 //GO(CRYPTO_get_mem_ex_functions, 
-GO(CRYPTO_get_mem_functions, vFppp)
+GO(CRYPTO_get_mem_functions, vFppp) // might need GOM, 3 function pointers retreived
 //GO(CRYPTO_get_new_dynlockid, 
 //GO(CRYPTO_get_new_lockid, 
 //GO(CRYPTO_is_mem_check_on, 
 //GO(CRYPTO_lock, 
-GO(CRYPTO_malloc, pFupi)
+GO(CRYPTO_malloc, pFLpi)
 //GO(CRYPTO_malloc_locked, 
 GO(CRYPTO_memcmp, iFppL)
 //GO(CRYPTO_mem_ctrl, 
@@ -898,7 +898,7 @@ GOM(CRYPTO_set_locking_callback, vFEp)
 //GO(CRYPTO_set_mem_debug_functions, 
 //GO(CRYPTO_set_mem_debug_options, 
 //GO(CRYPTO_set_mem_ex_functions, 
-//GO(CRYPTO_set_mem_functions, 
+//GOM(CRYPTO_set_mem_functions, iFEppp)
 GO(CRYPTO_strdup, pFppi)
 //GO(CRYPTO_thread_id, 
 //GO(CRYPTO_THREADID_cmp, 
@@ -919,13 +919,13 @@ GO(d2i_ASN1_ENUMERATED, pFppl)
 GO(d2i_ASN1_GENERALIZEDTIME, pFppl)
 GO(d2i_ASN1_GENERALSTRING, pFppl)
 GO(d2i_ASN1_IA5STRING, pFppl)
-//GO(d2i_ASN1_INTEGER, 
+GO(d2i_ASN1_INTEGER, pFppl)
 GO(d2i_ASN1_NULL, pFppl)
 GO(d2i_ASN1_OBJECT, pFppl)
 GO(d2i_ASN1_OCTET_STRING, pFppl)
-//GO(d2i_ASN1_PRINTABLE, 
+GO(d2i_ASN1_PRINTABLE, pFppl)
 GO(d2i_ASN1_PRINTABLESTRING, pFppl)
-//GO(d2i_ASN1_SEQUENCE_ANY, 
+GO(d2i_ASN1_SEQUENCE_ANY, pFppl)
 //GO(d2i_ASN1_SET, 
 GO(d2i_ASN1_SET_ANY, pFppl)
 GO(d2i_ASN1_T61STRING, pFppl)
@@ -948,7 +948,7 @@ GO(d2i_BASIC_CONSTRAINTS, pFppl)
 //GO(d2i_CRL_DIST_POINTS, 
 GO(d2i_DHparams, pFppl)
 //GO(d2i_DHxparams, 
-//GO(d2i_DIRECTORYSTRING, 
+GO(d2i_DIRECTORYSTRING, pFppl)
 GO(d2i_DISPLAYTEXT, pFppl)
 //GO(d2i_DIST_POINT, 
 //GO(d2i_DIST_POINT_NAME, 
@@ -1047,7 +1047,7 @@ GO(d2i_PKCS8_PRIV_KEY_INFO_fp, pFpp)
 //GO(d2i_PKEY_USAGE_PERIOD, 
 //GO(d2i_POLICYINFO, 
 //GO(d2i_POLICYQUALINFO, 
-GO(d2i_PrivateKey, pFppl)
+GO(d2i_PrivateKey, pFippl)
 GO(d2i_PrivateKey_bio, pFpp)
 GO(d2i_PrivateKey_fp, pFpp)
 //GO(d2i_PROXY_CERT_INFO_EXTENSION, 
@@ -1055,7 +1055,7 @@ GO(d2i_PrivateKey_fp, pFpp)
 GO(d2i_PUBKEY, pFppl)
 GO(d2i_PUBKEY_bio, pFpp)
 GO(d2i_PUBKEY_fp, pFpp)
-//GO(d2i_PublicKey, 
+GO(d2i_PublicKey, pFippl)
 //GO(d2i_RSA_NET, 
 //GO(d2i_RSA_OAEP_PARAMS, 
 GO(d2i_RSAPrivateKey, pFppl)
@@ -1178,8 +1178,8 @@ GO(DH_new, pFv)
 //GO(DH_set_method, 
 //GO(DH_size, 
 //GO(DH_up_ref, 
-//GO(DIRECTORYSTRING_free, 
-//GO(DIRECTORYSTRING_new, 
+GO(DIRECTORYSTRING_free, vFp)
+GO(DIRECTORYSTRING_new, pFv)
 GO(DISPLAYTEXT_free, vFp)
 GO(DISPLAYTEXT_new, pFv)
 //GO(DIST_POINT_free, 
@@ -1481,10 +1481,10 @@ GO(EC_POINT_method_of, pFp)
 GO(EC_POINT_mul, iFpppppp)
 GO(EC_POINT_new, pFp)
 //GO(EC_POINT_oct2point, 
-//GO(EC_POINT_point2buf,
+//GO(EC_POINT_point2buf, 
 //GO(EC_POINT_point2bn, 
 //GO(EC_POINT_point2hex, 
-//GO(EC_POINT_point2oct,
+//GO(EC_POINT_point2oct, 
 GO(EC_POINT_set_affine_coordinates, iFppppp)
 GO(EC_POINT_set_affine_coordinates_GF2m, iFppppp)
 GO(EC_POINT_set_affine_coordinates_GFp, iFppppp)
@@ -1671,36 +1671,36 @@ GO(ERR_get_error_line_data, LFpppp)
 //GO(ERR_get_state, 
 //GO(ERR_get_string_table, 
 GO(ERR_lib_error_string, pFu)
-//GO(ERR_load_ASN1_strings, 
-//GO(ERR_load_BIO_strings, 
-//GO(ERR_load_BN_strings, 
-//GO(ERR_load_BUF_strings, 
-//GO(ERR_load_CMS_strings, 
-//GO(ERR_load_COMP_strings, 
-//GO(ERR_load_CONF_strings, 
+GO(ERR_load_ASN1_strings, iFv)
+GO(ERR_load_BIO_strings, iFv)
+GO(ERR_load_BN_strings, iFv)
+GO(ERR_load_BUF_strings, iFv)
+GO(ERR_load_CMS_strings, iFv)
+GO(ERR_load_COMP_strings, iFv)
+GO(ERR_load_CONF_strings, iFv)
 GO(ERR_load_crypto_strings, vFv)
-GO(ERR_load_CRYPTO_strings, vFv)
-//GO(ERR_load_DH_strings, 
-//GO(ERR_load_DSA_strings, 
+GO(ERR_load_CRYPTO_strings, iFv)
+GO(ERR_load_DH_strings, iFv)
+GO(ERR_load_DSA_strings, iFv)
 //GO(ERR_load_DSO_strings, 
 //GO(ERR_load_ECDH_strings, 
 //GO(ERR_load_ECDSA_strings, 
-//GO(ERR_load_EC_strings, 
-//GO(ERR_load_ENGINE_strings, 
-//GO(ERR_load_ERR_strings, 
-GO(ERR_load_EVP_strings, vFv)
-//GO(ERR_load_OBJ_strings, 
-//GO(ERR_load_OCSP_strings, 
-//GO(ERR_load_PEM_strings, 
-//GO(ERR_load_PKCS12_strings, 
-GO(ERR_load_PKCS7_strings, vFv)
-//GO(ERR_load_RAND_strings, 
-//GO(ERR_load_RSA_strings, 
+GO(ERR_load_EC_strings, iFv)
+GO(ERR_load_ENGINE_strings, iFv)
+GO(ERR_load_ERR_strings, iFv)
+GO(ERR_load_EVP_strings, iFv)
+GO(ERR_load_OBJ_strings, iFv)
+GO(ERR_load_OCSP_strings, iFv)
+GO(ERR_load_PEM_strings, iFv)
+GO(ERR_load_PKCS12_strings, iFv)
+GO(ERR_load_PKCS7_strings, iFv)
+GO(ERR_load_RAND_strings, iFv)
+GO(ERR_load_RSA_strings, iFv)
 //GO(ERR_load_strings, 
-//GO(ERR_load_TS_strings, 
-//GO(ERR_load_UI_strings, 
-//GO(ERR_load_X509_strings, 
-//GO(ERR_load_X509V3_strings, 
+GO(ERR_load_TS_strings, iFv)
+GO(ERR_load_UI_strings, iFv)
+GO(ERR_load_X509_strings, iFv)
+GO(ERR_load_X509V3_strings, iFv)
 GO(ERR_new, vFv)
 GO(ERR_peek_error, LFv)
 GO(ERR_peek_error_line, LFpp)
@@ -1733,9 +1733,9 @@ GOM(ERR_vset_error, vFEiipA)
 //GO(ESS_SIGNING_CERT_dup, 
 //GO(ESS_SIGNING_CERT_free, 
 //GO(ESS_SIGNING_CERT_new, 
-//GO(EVP_add_alg_module, 
-//GO(EVP_add_cipher, 
-//GO(EVP_add_digest, 
+GO(EVP_add_alg_module, vFv)
+GO(EVP_add_cipher, iFp)
+GO(EVP_add_digest, iFp)
 GO(EVP_aes_128_cbc, pFv)
 GO(EVP_aes_128_cbc_hmac_sha1, pFv)
 GO(EVP_aes_128_cbc_hmac_sha256, pFv)
@@ -1772,52 +1772,52 @@ GO(EVP_aes_256_cfb8, pFv)
 GO(EVP_aes_256_ctr, pFv)
 GO(EVP_aes_256_ecb, pFv)
 GO(EVP_aes_256_gcm, pFv)
-//GO(EVP_aes_256_ofb, 
-//GO(EVP_aes_256_wrap, 
-//GO(EVP_aes_256_xts, 
-//GO(EVP_bf_cbc, 
+GO(EVP_aes_256_ofb, pFv)
+GO(EVP_aes_256_wrap, pFv)
+GO(EVP_aes_256_xts, pFv)
+GO(EVP_bf_cbc, pFv)
 //GO(EVP_bf_cfb, 
-//GO(EVP_bf_cfb64, 
-//GO(EVP_bf_ecb, 
-//GO(EVP_bf_ofb, 
-//GO(EVP_BytesToKey, 
-//GO(EVP_camellia_128_cbc, 
-//GO(EVP_camellia_128_cfb1, 
-//GO(EVP_camellia_128_cfb128, 
-//GO(EVP_camellia_128_cfb8, 
-//GO(EVP_camellia_128_ecb, 
-//GO(EVP_camellia_128_ofb, 
-//GO(EVP_camellia_192_cbc, 
-//GO(EVP_camellia_192_cfb1, 
-//GO(EVP_camellia_192_cfb128, 
-//GO(EVP_camellia_192_cfb8, 
-//GO(EVP_camellia_192_ecb, 
-//GO(EVP_camellia_192_ofb, 
-//GO(EVP_camellia_256_cbc, 
-//GO(EVP_camellia_256_cfb1, 
-//GO(EVP_camellia_256_cfb128, 
-//GO(EVP_camellia_256_cfb8, 
-//GO(EVP_camellia_256_ecb, 
-//GO(EVP_camellia_256_ofb, 
-//GO(EVP_cast5_cbc, 
+GO(EVP_bf_cfb64, pFv)
+GO(EVP_bf_ecb, pFv)
+GO(EVP_bf_ofb, pFv)
+GO(EVP_BytesToKey, iFppppiipp)
+GO(EVP_camellia_128_cbc, pFv)
+GO(EVP_camellia_128_cfb1, pFv)
+GO(EVP_camellia_128_cfb128, pFv)
+GO(EVP_camellia_128_cfb8, pFv)
+GO(EVP_camellia_128_ecb, pFv)
+GO(EVP_camellia_128_ofb, pFv)
+GO(EVP_camellia_192_cbc, pFv)
+GO(EVP_camellia_192_cfb1, pFv)
+GO(EVP_camellia_192_cfb128, pFv)
+GO(EVP_camellia_192_cfb8, pFv)
+GO(EVP_camellia_192_ecb, pFv)
+GO(EVP_camellia_192_ofb, pFv)
+GO(EVP_camellia_256_cbc, pFv)
+GO(EVP_camellia_256_cfb1, pFv)
+GO(EVP_camellia_256_cfb128, pFv)
+GO(EVP_camellia_256_cfb8, pFv)
+GO(EVP_camellia_256_ecb, pFv)
+GO(EVP_camellia_256_ofb, pFv)
+GO(EVP_cast5_cbc, pFv)
 //GO(EVP_cast5_cfb, 
-//GO(EVP_cast5_cfb64, 
-//GO(EVP_cast5_ecb, 
-//GO(EVP_cast5_ofb, 
+GO(EVP_cast5_cfb64, pFv)
+GO(EVP_cast5_ecb, pFv)
+GO(EVP_cast5_ofb, pFv)
 GO(EVP_chacha20, pFv)
 GO(EVP_chacha20_poly1305, pFv)
-//GO(EVP_Cipher, 
+GO(EVP_Cipher, iFpppu)
 GO(EVP_CIPHER_asn1_to_param, iFpp)
 //GO(EVP_CIPHER_block_size, 
 //GO(EVP_CIPHER_CTX_block_size, 
-//GO(EVP_CIPHER_CTX_cipher, 
+GO(EVP_CIPHER_CTX_cipher, pFp)
 GO(EVP_CIPHER_CTX_cleanup, iFp)
-//GO(EVP_CIPHER_CTX_clear_flags, 
-//GO(EVP_CIPHER_CTX_copy, 
+GO(EVP_CIPHER_CTX_clear_flags, vFpi)
+GO(EVP_CIPHER_CTX_copy, iFpp)
 GO(EVP_CIPHER_CTX_ctrl, iFpiip)
 //GO(EVP_CIPHER_CTX_flags, 
 GO(EVP_CIPHER_CTX_free, vFp)
-//GO(EVP_CIPHER_CTX_get_app_data, 
+GO(EVP_CIPHER_CTX_get_app_data, pFp)
 GO(EVP_CIPHER_CTX_get_original_iv, iFppL)
 GO(EVP_CIPHER_CTX_get_updated_iv, iFppL)
 GO(EVP_CIPHER_CTX_init, vFp)
@@ -1825,33 +1825,33 @@ GO(EVP_CIPHER_CTX_init, vFp)
 //GO(EVP_CIPHER_CTX_key_length, 
 GO(EVP_CIPHER_CTX_new, pFv)
 //GO(EVP_CIPHER_CTX_nid, 
-//GO(EVP_CIPHER_CTX_rand_key, 
+GO(EVP_CIPHER_CTX_rand_key, iFpp)
 GO(EVP_CIPHER_CTX_reset, iFp)
-//GO(EVP_CIPHER_CTX_set_app_data, 
-//GO(EVP_CIPHER_CTX_set_flags, 
+GO(EVP_CIPHER_CTX_set_app_data, vFpp)
+GO(EVP_CIPHER_CTX_set_flags, vFpi)
 GO(EVP_CIPHER_CTX_set_key_length, iFpi)
 GO(EVP_CIPHER_CTX_set_padding, iFpi)
-//GO(EVP_CIPHER_CTX_test_flags, 
-//GO(EVP_CIPHER_do_all, 
-//GO(EVP_CIPHER_do_all_sorted, 
+GO(EVP_CIPHER_CTX_test_flags, iFpi)
+//GOM(EVP_CIPHER_do_all, vFEpp)
+//GOM(EVP_CIPHER_do_all_sorted, vFEpp)
 GO(EVP_CipherFinal, iFppp)
 GO(EVP_CipherFinal_ex, iFppp)
 //GO(EVP_CIPHER_flags, 
-//GO(EVP_CIPHER_get_asn1_iv, 
+GO(EVP_CIPHER_get_asn1_iv, iFpp)
 GO(EVP_CipherInit, iFppppi)
 GO(EVP_CipherInit_ex, iFpppppi)
 //GO(EVP_CIPHER_iv_length, 
 //GO(EVP_CIPHER_key_length, 
 //GO(EVP_CIPHER_nid, 
 GO(EVP_CIPHER_param_to_asn1, iFpp)
-//GO(EVP_CIPHER_set_asn1_iv, 
+GO(EVP_CIPHER_set_asn1_iv, iFpp)
 GO(EVP_CIPHER_type, iFp)
 GO(EVP_CipherUpdate, iFppppi)
 GO(EVP_cleanup, vFv)
 GO(EVP_DecodeBlock, iFppi)
-//GO(EVP_DecodeFinal, 
-//GO(EVP_DecodeInit, 
-//GO(EVP_DecodeUpdate, 
+GO(EVP_DecodeFinal, iFppp)
+GO(EVP_DecodeInit, vFp)
+GO(EVP_DecodeUpdate, iFppppi)
 GO(EVP_DecryptFinal, iFppp)
 GO(EVP_DecryptFinal_ex, iFppp)
 GO(EVP_DecryptInit, iFpppp)
@@ -1879,9 +1879,9 @@ GO(EVP_des_ede_cfb, pFv)
 GO(EVP_des_ede_cfb64, pFv)
 GO(EVP_des_ede_ecb, pFv)
 GO(EVP_des_ede_ofb, pFv)
-//GO(EVP_des_ofb, 
-//GO(EVP_desx_cbc, 
-//GO(EVP_Digest, 
+GO(EVP_des_ofb, pFv)
+GO(EVP_desx_cbc, pFv)
+GO(EVP_Digest, iFpLpppp)
 GO(EVP_DigestFinal, iFppp)
 GO(EVP_DigestFinalXOF, iFppL)
 GO(EVP_DigestFinal_ex, iFppp)
@@ -1892,16 +1892,16 @@ GO(EVP_DigestSignFinal, iFppp)
 GO(EVP_DigestSignInit, iFppppp)
 GO(EVP_DigestUpdate, iFppL)
 GO(EVP_DigestVerify, iFppLpL)
-//GO(EVP_DigestVerifyFinal, 
+GO(EVP_DigestVerifyFinal, iFppL)
 GO(EVP_DigestVerifyInit, iFppppp)
 //GO(EVP_dss, 
 //GO(EVP_dss1, 
 //GO(EVP_ecdsa, 
-//GO(EVP_enc_null, 
+GO(EVP_enc_null, pFv)
 GO(EVP_EncodeBlock, iFppi)
-//GO(EVP_EncodeFinal, 
-//GO(EVP_EncodeInit, 
-//GO(EVP_EncodeUpdate, 
+GO(EVP_EncodeFinal, vFppp)
+GO(EVP_EncodeInit, vFp)
+GO(EVP_EncodeUpdate, iFppppi)
 GO(EVP_EncryptFinal, iFppp)
 GO(EVP_EncryptFinal_ex, iFppp)
 GO(EVP_EncryptInit, iFpppp)
@@ -1909,7 +1909,7 @@ GO(EVP_EncryptInit_ex, iFppppp)
 GO(EVP_EncryptUpdate, iFppppi)
 GO(EVP_get_cipherbyname, pFp)
 GO(EVP_get_digestbyname, pFp)
-//GO(EVP_get_pw_prompt, 
+GO(EVP_get_pw_prompt, pFv)
 //GO(EVP_idea_cbc, 
 //GO(EVP_idea_cfb, 
 //GO(EVP_idea_cfb64, 
@@ -1931,7 +1931,7 @@ GO(EVP_MD_CTX_clear_flags, vFpi)
 GO(EVP_MD_CTX_copy, iFpp)
 GO(EVP_MD_CTX_copy_ex, iFpp)
 GO(EVP_MD_CTX_create, pFv)
-GO(EVP_MD_CTX_ctrl, vFpiip)
+GO(EVP_MD_CTX_ctrl, iFpiip)
 GO(EVP_MD_CTX_destroy, vFp)
 GO(EVP_MD_CTX_free, vFp)
 GO(EVP_MD_CTX_get0_md, pFp)
@@ -1940,10 +1940,10 @@ GO(EVP_MD_CTX_md, pFp)
 GO(EVP_MD_CTX_new, pFv)
 GO(EVP_MD_CTX_reset, iFp)
 GO(EVP_MD_CTX_set_flags, vFpi)
-//GO(EVP_MD_CTX_test_flags, 
-//GO(EVP_MD_do_all, 
+GO(EVP_MD_CTX_test_flags, iFpi)
+//GOM(EVP_MD_do_all, vFEpp)
 GOM(EVP_MD_do_all_provided, vFEppp)
-//GO(EVP_MD_do_all_sorted, 
+//GOM(EVP_MD_do_all_sorted, vFEpp)
 GO(EVP_MD_fetch, pFppp)
 //GO(EVP_MD_flags, 
 GO(EVP_MD_free, vFp)
@@ -1955,13 +1955,13 @@ GO(EVP_md_null, pFv)
 GO(EVP_MD_pkey_type, iFp)
 GO(EVP_MD_type, iFp)
 GO(EVP_MD_up_ref, iFp)
-//GO(EVP_OpenFinal, 
-//GO(EVP_OpenInit, 
-//GO(EVP_PBE_alg_add, 
-//GO(EVP_PBE_alg_add_type, 
-//GO(EVP_PBE_CipherInit, 
-//GO(EVP_PBE_cleanup, 
-//GO(EVP_PBE_find, 
+GO(EVP_OpenFinal, iFppp)
+GO(EVP_OpenInit, iFpppipp)
+//GOM(EVP_PBE_alg_add, iFEippp)
+//GOM(EVP_PBE_alg_add_type, iFEiiiip)
+GO(EVP_PBE_CipherInit, iFppippi)
+GO(EVP_PBE_cleanup, vFv)
+//GOM(EVP_PBE_find, iFEiippp)
 GO(EVP_PBE_scrypt, iFpLpLUUUUpL)
 GO(EVP_PKCS82PKEY, pFp)
 GO(EVP_PKCS82PKEY_ex, pFppp)
@@ -1971,22 +1971,22 @@ GO(EVP_PKEY2PKCS8, pFp)
 //GO(EVP_PKEY_add1_attr_by_NID, 
 //GO(EVP_PKEY_add1_attr_by_OBJ, 
 //GO(EVP_PKEY_add1_attr_by_txt, 
-//GO(EVP_PKEY_asn1_add0, 
-//GO(EVP_PKEY_asn1_add_alias, 
-//GO(EVP_PKEY_asn1_copy, 
-//GO(EVP_PKEY_asn1_find, 
-//GO(EVP_PKEY_asn1_find_str, 
-//GO(EVP_PKEY_asn1_free, 
-//GO(EVP_PKEY_asn1_get0, 
-//GO(EVP_PKEY_asn1_get0_info, 
-//GO(EVP_PKEY_asn1_get_count, 
-//GO(EVP_PKEY_asn1_new, 
-//GO(EVP_PKEY_asn1_set_ctrl, 
-//GO(EVP_PKEY_asn1_set_free, 
-//GO(EVP_PKEY_asn1_set_item, 
-//GO(EVP_PKEY_asn1_set_param, 
-//GO(EVP_PKEY_asn1_set_private, 
-//GO(EVP_PKEY_asn1_set_public, 
+GO(EVP_PKEY_asn1_add0, iFp)
+GO(EVP_PKEY_asn1_add_alias, iFii)
+GO(EVP_PKEY_asn1_copy, vFpp)
+GO(EVP_PKEY_asn1_find, pFpi)
+GO(EVP_PKEY_asn1_find_str, pFppi)
+GO(EVP_PKEY_asn1_free, vFp)
+GO(EVP_PKEY_asn1_get0, pFi)
+GO(EVP_PKEY_asn1_get0_info, iFpppppp)
+GO(EVP_PKEY_asn1_get_count, iFv)
+GO(EVP_PKEY_asn1_new, pFiipp)
+//GOM(EVP_PKEY_asn1_set_ctrl, vFEpp)
+//GOM(EVP_PKEY_asn1_set_free, vFEpp)
+//GOM(EVP_PKEY_asn1_set_item, vFEppp)
+//GOM(EVP_PKEY_asn1_set_param, vFEppppppp)
+//GOM(EVP_PKEY_asn1_set_private, vFEpppp)
+//GOM(EVP_PKEY_asn1_set_public, vFEppppppp)
 GO(EVP_PKEY_assign, iFpip)
 //GO(EVP_PKEY_base_id, 
 //GO(EVP_PKEY_bits, 
@@ -2000,16 +2000,16 @@ GO(EVP_PKEY_CTX_free, vFp)
 GO(EVP_PKEY_CTX_get0_peerkey, pFp)
 GO(EVP_PKEY_CTX_get0_pkey, pFp)
 GO(EVP_PKEY_CTX_get_app_data, pFp)
-//GO(EVP_PKEY_CTX_get_cb, 
-//GO(EVP_PKEY_CTX_get_data, 
+//GOM(EVP_PKEY_CTX_get_cb, pFEp)
+GO(EVP_PKEY_CTX_get_data, pFp)
 GO(EVP_PKEY_CTX_get_keygen_info, iFpi)
-//GO(EVP_PKEY_CTX_get_operation, 
+GO(EVP_PKEY_CTX_get_operation, iFp)
 GO(EVP_PKEY_CTX_new, pFpp)
 GO(EVP_PKEY_CTX_new_id, pFip)
-//GO(EVP_PKEY_CTX_set0_keygen_info, 
+GO(EVP_PKEY_CTX_set0_keygen_info, vFppi)
 GO(EVP_PKEY_CTX_set_app_data, vFpp)
-//GO(EVP_PKEY_CTX_set_cb, 
-//GO(EVP_PKEY_CTX_set_data, 
+//GOM(EVP_PKEY_CTX_set_cb, vFEpp)
+GO(EVP_PKEY_CTX_set_data, vFpp)
 GO(EVP_PKEY_CTX_set_rsa_keygen_bits, iFpi)
 GO(EVP_PKEY_CTX_set_rsa_oaep_md, iFpp)
 GO(EVP_PKEY_CTX_set_rsa_padding, iFpi)
@@ -2018,19 +2018,19 @@ GO(EVP_PKEY_CTX_set_signature_md, iFpp)
 GO(EVP_PKEY_check, iFp)
 GO(EVP_PKEY_decrypt, iFppppL)
 GO(EVP_PKEY_decrypt_init, iFp)
-//GO(EVP_PKEY_decrypt_old, 
+GO(EVP_PKEY_decrypt_old, iFppip)
 //GO(EVP_PKEY_delete_attr, 
 GO(EVP_PKEY_derive, iFppp)
 GO(EVP_PKEY_derive_init, iFp)
-GO(EVP_PKEY_derive_set_peer, iFppi)
+GO(EVP_PKEY_derive_set_peer, iFpp)
 GO(EVP_PKEY_encrypt, iFppppL)
 GO(EVP_PKEY_encrypt_init, iFp)
-//GO(EVP_PKEY_encrypt_old, 
+GO(EVP_PKEY_encrypt_old, iFppip)
 GO(EVP_PKEY_free, vFp)
-//GO(EVP_PKEY_get0, 
-//GO(EVP_PKEY_get0_asn1, 
+GO(EVP_PKEY_get0, pFp)
+GO(EVP_PKEY_get0_asn1, pFp)
 GO(EVP_PKEY_get0_RSA, pFp)
-//GO(EVP_PKEY_get1_DH, 
+GO(EVP_PKEY_get1_DH, pFp)
 GO(EVP_PKEY_get1_DSA, pFp)
 GO(EVP_PKEY_get1_EC_KEY, pFp)
 GO(EVP_PKEY_get1_RSA, pFp)
@@ -2039,61 +2039,61 @@ GO(EVP_PKEY_get1_RSA, pFp)
 //GO(EVP_PKEY_get_attr_by_OBJ, 
 //GO(EVP_PKEY_get_attr_count, 
 GO(EVP_PKEY_get_base_id, iFp)
-//GO(EVP_PKEY_get_default_digest_nid, 
+GO(EVP_PKEY_get_default_digest_nid, iFpp)
 GO(EVP_PKEY_get_raw_private_key, iFppp)
 GO(EVP_PKEY_get_raw_public_key, iFppp)
-GO(EVP_PKEY_new_raw_private_key, pFppppL)
+GO(EVP_PKEY_new_raw_private_key, pFippL)
 GO(EVP_PKEY_new_raw_public_key, pFippL)
 GO(EVP_PKEY_get_size, iFp)
 //GO(EVP_PKEY_id, 
 GO(EVP_PKEY_keygen, iFpp)
 GO(EVP_PKEY_keygen_init, iFp)
-//GO(EVP_PKEY_meth_add0, 
-//GO(EVP_PKEY_meth_copy, 
-//GO(EVP_PKEY_meth_find, 
-//GO(EVP_PKEY_meth_free, 
-//GO(EVP_PKEY_meth_get0_info, 
-//GO(EVP_PKEY_meth_new, 
-//GO(EVP_PKEY_meth_set_cleanup, 
-//GO(EVP_PKEY_meth_set_copy, 
-//GO(EVP_PKEY_meth_set_ctrl, 
-//GO(EVP_PKEY_meth_set_decrypt, 
-//GO(EVP_PKEY_meth_set_derive, 
-//GO(EVP_PKEY_meth_set_encrypt, 
-//GO(EVP_PKEY_meth_set_init, 
-//GO(EVP_PKEY_meth_set_keygen, 
-//GO(EVP_PKEY_meth_set_paramgen, 
-//GO(EVP_PKEY_meth_set_sign, 
-//GO(EVP_PKEY_meth_set_signctx, 
-//GO(EVP_PKEY_meth_set_verify, 
-//GO(EVP_PKEY_meth_set_verifyctx, 
-//GO(EVP_PKEY_meth_set_verify_recover, 
+GO(EVP_PKEY_meth_add0, iFp)
+GO(EVP_PKEY_meth_copy, vFpp)
+GO(EVP_PKEY_meth_find, pFi)
+GO(EVP_PKEY_meth_free, vFp)
+GO(EVP_PKEY_meth_get0_info, vFppp)
+GO(EVP_PKEY_meth_new, pFii)
+//GOM(EVP_PKEY_meth_set_cleanup, vFEpp)
+//GOM(EVP_PKEY_meth_set_copy, vFEpp)
+//GOM(EVP_PKEY_meth_set_ctrl, vFEppp)
+//GOM(EVP_PKEY_meth_set_decrypt, vFEppp)
+//GOM(EVP_PKEY_meth_set_derive, vFEppp)
+//GOM(EVP_PKEY_meth_set_encrypt, vFEppp)
+//GOM(EVP_PKEY_meth_set_init, vFEpp)
+//GOM(EVP_PKEY_meth_set_keygen, vFEppp)
+//GOM(EVP_PKEY_meth_set_paramgen, vFEppp)
+//GOM(EVP_PKEY_meth_set_sign, vFEppp)
+//GOM(EVP_PKEY_meth_set_signctx, vFEppp)
+//GOM(EVP_PKEY_meth_set_verify, vFEppp)
+//GOM(EVP_PKEY_meth_set_verifyctx, vFEppp)
+//GOM(EVP_PKEY_meth_set_verify_recover, vFEppp)
 GO(EVP_PKEY_missing_parameters, iFp)
 GO(EVP_PKEY_new, pFv)
 GO(EVP_PKEY_new_mac_key, pFippi)
 GO(EVP_PKEY_paramgen, iFpp)
 GO(EVP_PKEY_paramgen_init, iFp)
-//GO(EVP_PKEY_print_params, 
-//GO(EVP_PKEY_print_private, 
-//GO(EVP_PKEY_print_public, 
+GO(EVP_PKEY_print_params, iFppip)
+GO(EVP_PKEY_print_private, iFppip)
+GO(EVP_PKEY_print_public, iFppip)
 GO(EVP_PKEY_public_check, iFp)
-//GO(EVP_PKEY_save_parameters, 
-//GO(EVP_PKEY_set1_DH, 
+GO(EVP_PKEY_save_parameters, iFpi)
+GO(EVP_PKEY_set1_DH, iFpp)
 GO(EVP_PKEY_set1_DSA, iFpp)
 GO(EVP_PKEY_set1_EC_KEY, iFpp)
 GO(EVP_PKEY_set1_RSA, iFpp)
 //GO(evp_pkey_set_cb_translate, 
-//GO(EVP_PKEY_set_type, 
-//GO(EVP_PKEY_set_type_str, 
-GO(EVP_PKEY_sign, iFppppp)
+GO(EVP_PKEY_set_type, iFpi)
+GO(EVP_PKEY_set_type_str, iFppi)
+GO(EVP_PKEY_sign, iFppppL)
 GO(EVP_PKEY_sign_init, iFp)
 //GO(EVP_PKEY_size, 
 GO(EVP_PKEY_type, iFi)
 GO(EVP_PKEY_up_ref, iFp)
 GO(EVP_PKEY_verify, iFppLpL)
 GO(EVP_PKEY_verify_init, iFp)
-//GO(EVP_PKEY_verify_recover, 
-//GO(EVP_PKEY_verify_recover_init, 
+GO(EVP_PKEY_verify_recover, iFppppL)
+GO(EVP_PKEY_verify_recover_init, iFp)
 GO(EVP_rc2_40_cbc, pFv)
 GO(EVP_rc2_64_cbc, pFv)
 GO(EVP_rc2_cbc, pFv)
@@ -2101,31 +2101,31 @@ GO(EVP_rc2_cfb, pFv)
 GO(EVP_rc2_cfb64, pFv)
 GO(EVP_rc2_ecb, pFv)
 GO(EVP_rc2_ofb, pFv)
-//GO(EVP_rc4, 
-//GO(EVP_rc4_40, 
-//GO(EVP_rc4_hmac_md5, 
-//GO(EVP_read_pw_string, 
-//GO(EVP_read_pw_string_min, 
-GO(EVP_ripemd160, pFp)
-//GO(EVP_SealFinal, 
-//GO(EVP_SealInit, 
-//GO(EVP_seed_cbc, 
-//GO(EVP_seed_cfb128, 
-//GO(EVP_seed_ecb, 
-//GO(EVP_seed_ofb, 
-//GO(EVP_set_pw_prompt, 
+GO(EVP_rc4, pFv)
+GO(EVP_rc4_40, pFv)
+GO(EVP_rc4_hmac_md5, pFv)
+GO(EVP_read_pw_string, iFpipi)
+GO(EVP_read_pw_string_min, iFpiipi)
+GO(EVP_ripemd160, pFv)
+GO(EVP_SealFinal, iFppp)
+GO(EVP_SealInit, iFppppppi)
+GO(EVP_seed_cbc, pFv)
+GO(EVP_seed_cfb128, pFv)
+GO(EVP_seed_ecb, pFv)
+GO(EVP_seed_ofb, pFv)
+GO(EVP_set_pw_prompt, vFp)
 GO(EVP_sha, pFV)
 GO(EVP_sha1, pFv)
 GO(EVP_sha224, pFv)
 GO(EVP_sha256, pFv)
 GO(EVP_sha384, pFv)
 GO(EVP_sha512, pFv)
-//GO(EVP_SignFinal, 
+GO(EVP_SignFinal, iFpppp)
 GO(EVP_VerifyFinal, iFppup)
-GO(EVP_VerifyInit, iFpp)        // 1.1.0+
-GO(EVP_VerifyInit_ex, iFppp)    // 1.1.0+
-GO(EVP_VerifyUpdate, iFppu)     // 1.1.0+
-//GO(EVP_whirlpool, 
+GO(EVP_VerifyInit, iFpp)
+GO(EVP_VerifyInit_ex, iFppp)
+GO(EVP_VerifyUpdate, iFppu)
+GO(EVP_whirlpool, pFv)
 GO(EXTENDED_KEY_USAGE_free, vFp)
 //GO(EXTENDED_KEY_USAGE_new, 
 //GO(fcrypt_body, 
@@ -2198,9 +2198,9 @@ GO(i2d_ASN1_INTEGER, iFpp)
 GO(i2d_ASN1_NULL, iFpp)
 GO(i2d_ASN1_OBJECT, iFpp)
 GO(i2d_ASN1_OCTET_STRING, iFpp)
-//GO(i2d_ASN1_PRINTABLE, 
+GO(i2d_ASN1_PRINTABLE, iFpp)
 GO(i2d_ASN1_PRINTABLESTRING, iFpp)
-//GO(i2d_ASN1_SEQUENCE_ANY, 
+GO(i2d_ASN1_SEQUENCE_ANY, iFpp)
 //GO(i2d_ASN1_SET, 
 GO(i2d_ASN1_SET_ANY, iFpp)
 GO(i2d_ASN1_T61STRING, iFpp)
@@ -2221,7 +2221,7 @@ GO(i2d_CMS_bio, iFpp)
 //GO(i2d_CRL_DIST_POINTS, 
 GO(i2d_DHparams, iFpp)
 //GO(i2d_DHxparams, 
-//GO(i2d_DIRECTORYSTRING, 
+GO(i2d_DIRECTORYSTRING, iFpp)
 GO(i2d_DISPLAYTEXT, iFpp)
 //GO(i2d_DIST_POINT, 
 //GO(i2d_DIST_POINT_NAME, 
@@ -2334,7 +2334,7 @@ GO(i2d_PROXY_POLICY, iFpp)
 GO(i2d_PUBKEY, iFpp)
 GO(i2d_PUBKEY_bio, iFpp)
 GO(i2d_PUBKEY_fp, iFpp)
-//GO(i2d_PublicKey, 
+GO(i2d_PublicKey, iFpp)
 //GO(i2d_re_X509_tbs, 
 GO(i2d_RSA_NET, iFpp)
 GO(i2d_RSA_OAEP_PARAMS, iFpp)
@@ -2507,33 +2507,33 @@ GO(NETSCAPE_X509_new, pFv)
 //GO(NOTICEREF_free, 
 //GO(NOTICEREF_new, 
 //GO(o2i_ECPublicKey, 
-//GO(OBJ_add_object, 
-//GO(OBJ_add_sigid, 
-//GO(OBJ_bsearch_, 
-//GO(OBJ_bsearch_ex_, 
+GO(OBJ_add_object, iFp)
+GO(OBJ_add_sigid, iFiii)
+//GOM(OBJ_bsearch_, pFEppiip)
+//GOM(OBJ_bsearch_ex_, pFEppiipi)
 GO(OBJ_cleanup, vFv)
 GO(OBJ_cmp, iFpp)
 GO(OBJ_create, iFppp)
-//GO(OBJ_create_objects, 
+GO(OBJ_create_objects, iFp)
 GO(OBJ_dup, pFp)
-//GO(OBJ_find_sigid_algs, 
-//GO(OBJ_find_sigid_by_algs, 
+GO(OBJ_find_sigid_algs, iFipp)
+GO(OBJ_find_sigid_by_algs, iFpii)
 GO(OBJ_ln2nid, iFp)
-//GO(OBJ_NAME_add, 
-//GO(OBJ_NAME_cleanup, 
-//GO(OBJ_NAME_do_all, 
-//GO(OBJ_NAME_do_all_sorted, 
-//GO(OBJ_NAME_get, 
-//GO(OBJ_NAME_init, 
-//GO(OBJ_NAME_new_index, 
-//GO(OBJ_NAME_remove, 
-//GO(OBJ_new_nid, 
+GO(OBJ_NAME_add, iFpip)
+GO(OBJ_NAME_cleanup, vFi)
+//GOM(OBJ_NAME_do_all, vFEipp)
+//GOM(OBJ_NAME_do_all_sorted, vFEipp)
+GO(OBJ_NAME_get, pFpi)
+GO(OBJ_NAME_init, iFv)
+//GOM(OBJ_NAME_new_index, iFEppp)
+GO(OBJ_NAME_remove, iFpi)
+GO(OBJ_new_nid, iFi)
 GO(OBJ_nid2ln, pFi)
 GO(OBJ_nid2obj, pFi)
 GO(OBJ_nid2sn, pFi)
 GO(OBJ_obj2nid, iFp)
 GO(OBJ_obj2txt, iFpipi)
-//GO(OBJ_sigid_free, 
+GO(OBJ_sigid_free, vFv)
 GO(OBJ_sn2nid, iFp)
 GO(OBJ_txt2nid, iFp)
 GO(OBJ_txt2obj, pFpi)
@@ -2674,25 +2674,25 @@ GO(OPENSSL_gmtime, pFpp)
 GO(OPENSSL_gmtime_adj, iFpil)
 GO(OPENSSL_gmtime_diff, iFpppp)
 //GO(OPENSSL_ia32cap_loc, 
-//GO(OPENSSL_init, 
-GO(OPENSSL_init_crypto, iFLp)
+GO(OPENSSL_init, vFv)
+GO(OPENSSL_init_crypto, iFUp)
 //GO(OPENSSL_instrument_bus, 
 //GO(OPENSSL_instrument_bus2, 
-//GO(OPENSSL_isservice, 
-//GO(OPENSSL_issetugid, 
+GO(OPENSSL_isservice, iFv)
+GO(OPENSSL_issetugid, iFv)
 //GO(OPENSSL_load_builtin_modules, 
 //GO(OPENSSL_memcmp, 
 GO(OPENSSL_no_config, vFv)
 //GO(OPENSSL_rdtsc, 
 GO(OPENSSL_sk_find, iFpp)
-GO(OPENSSL_sk_free, vFp)    //1.1+
+GO(OPENSSL_sk_free, vFp)
 GOM(OPENSSL_sk_new, pFEp)
-GO(OPENSSL_sk_new_null, pFv)    //1.1+
-GO(OPENSSL_sk_num, iFp) //1.1+
-GO(OPENSSL_sk_pop, pFp) //1.1+
-GOM(OPENSSL_sk_pop_free, pFEpp) //1.1+
-GO(OPENSSL_sk_push, iFpp)   //1.1+
-GO(OPENSSL_sk_value, pFpi)  //1.1+
+GO(OPENSSL_sk_new_null, pFv)
+GO(OPENSSL_sk_num, iFp)
+GO(OPENSSL_sk_pop, pFp)
+GOM(OPENSSL_sk_pop_free, vFEpp)
+GO(OPENSSL_sk_push, iFpp)
+GO(OPENSSL_sk_value, pFpi)
 //GO(OPENSSL_showfatal, 
 //GO(OPENSSL_stderr, 
 GO(OPENSSL_strcasecmp, iFpp)
@@ -2926,14 +2926,14 @@ GO(PKCS12_PBE_keyivgen, iFppipppi)
 //GO(PKCS1_MGF1, 
 //GO(PKCS5_pbe2_set, 
 //GO(PKCS5_pbe2_set_iv, 
-//GO(PKCS5_PBE_add, 
-//GO(PKCS5_PBE_keyivgen, 
+GO(PKCS5_PBE_add, vFv)
+GO(PKCS5_PBE_keyivgen, iFppipppi)
 //GO(PKCS5_pbe_set, 
 //GO(PKCS5_pbe_set0_algor, 
 GO(PKCS5_PBKDF2_HMAC, iFpipiipip)
 GO(PKCS5_PBKDF2_HMAC_SHA1, iFpipiiip)
 //GO(PKCS5_pbkdf2_set, 
-//GO(PKCS5_v2_PBE_keyivgen, 
+GO(PKCS5_v2_PBE_keyivgen, iFppipppi)
 //GO(PKCS5_v2_PBKDF2_keyivgen, 
 //GO(PKCS7_add0_attrib_signing_time, 
 //GO(PKCS7_add1_attrib_digest, 
diff --git a/src/wrapped/wrappedlibssl3_private.h b/src/wrapped/wrappedlibssl3_private.h
index e57ea37e..97fcf0f0 100644
--- a/src/wrapped/wrappedlibssl3_private.h
+++ b/src/wrapped/wrappedlibssl3_private.h
@@ -1,13 +1,13 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
-//GO(BIO_f_ssl, 
-//GO(BIO_new_buffer_ssl_connect, 
-//GO(BIO_new_ssl, 
-//GO(BIO_new_ssl_connect, 
-//GO(BIO_ssl_copy_session_id, 
-//GO(BIO_ssl_shutdown, 
+GO(BIO_f_ssl, pFv)
+GO(BIO_new_buffer_ssl_connect, pFp)
+GO(BIO_new_ssl, pFpi)
+GO(BIO_new_ssl_connect, pFp)
+GO(BIO_ssl_copy_session_id, iFpp)
+GO(BIO_ssl_shutdown, vFp)
 //GO(custom_ext_add, 
 //GO(custom_ext_init, 
 //GO(custom_ext_parse, 
@@ -65,18 +65,18 @@ GO(DTLSv1_2_server_method, pFv)
 GO(DTLSv1_client_method, pFv)
 GO(DTLSv1_method, pFv)
 GO(DTLSv1_server_method, pFv)
-//GO(ERR_load_SSL_strings, 
+GO(ERR_load_SSL_strings, iFv)
 //GO(_fini, 
 GO(i2d_SSL_SESSION, iFpp)
 //GO(_init, 
 //GO(n_ssl3_mac, 
 //GO(OBJ_bsearch_ssl_cipher_id, 
 GO(OPENSSL_init_ssl, iFUp)
-//GO(PEM_read_bio_SSL_SESSION, 
-//GO(PEM_read_SSL_SESSION, 
-//GO(PEM_write_bio_SSL_SESSION, 
-//GO(PEM_write_SSL_SESSION, 
-//GO(SRP_Calc_A_param, 
+//GOM(PEM_read_bio_SSL_SESSION, pFEpppp)
+//GOM(PEM_read_SSL_SESSION, pFESppp)
+GO(PEM_write_bio_SSL_SESSION, iFpp)
+GO(PEM_write_SSL_SESSION, iFSp)
+GO(SRP_Calc_A_param, iFp)
 //GO(SRP_generate_client_master_secret, 
 //GO(SRP_generate_server_master_secret, 
 //GO(srp_verify_server_param, 
@@ -188,15 +188,15 @@ GO(SSL_add_client_CA, iFpp)
 //GO(ssl_add_clienthello_renegotiate_ext, 
 //GO(ssl_add_clienthello_tlsext, 
 //GO(ssl_add_clienthello_use_srtp_ext, 
-//GO(SSL_add_dir_cert_subjects_to_stack, 
-//GO(SSL_add_file_cert_subjects_to_stack, 
+GO(SSL_add_dir_cert_subjects_to_stack, iFpp)
+GO(SSL_add_file_cert_subjects_to_stack, iFpp)
 //GO(ssl_add_serverhello_renegotiate_ext, 
 //GO(ssl_add_serverhello_tlsext, 
 //GO(ssl_add_serverhello_use_srtp_ext, 
-//GO(SSL_alert_desc_string, 
-//GO(SSL_alert_desc_string_long, 
-//GO(SSL_alert_type_string, 
-//GO(SSL_alert_type_string_long, 
+GO(SSL_alert_desc_string, pFi)
+GO(SSL_alert_desc_string_long, pFi)
+GO(SSL_alert_type_string, pFi)
+GO(SSL_alert_type_string_long, pFi)
 //GO(ssl_bad_method, 
 //GO(ssl_build_cert_chain, 
 //GO(ssl_bytes_to_cipher_list, 
@@ -209,7 +209,7 @@ GOM(SSL_callback_ctrl, lFEpip)
 //GO(ssl_cert_free, 
 //GO(ssl_cert_inst, 
 //GO(ssl_cert_new, 
-//GO(SSL_certs_clear, 
+GO(SSL_certs_clear, vFp)
 //GO(ssl_cert_select_current, 
 //GO(ssl_cert_set0_chain, 
 //GO(ssl_cert_set1_chain, 
@@ -218,7 +218,7 @@ GOM(SSL_callback_ctrl, lFEpip)
 //GO(ssl_cert_set_current, 
 //GO(ssl_cert_set_default_md, 
 //GO(ssl_cert_type, 
-//GO(SSL_check_chain, 
+GO(SSL_check_chain, iFpppp)
 //GO(ssl_check_clienthello_tlsext_late, 
 GO(SSL_check_private_key, iFp)
 //GO(ssl_check_serverhello_tlsext, 
@@ -243,212 +243,212 @@ GO(SSL_clear, iFp)
 //GO(ssl_clear_bad_session, 
 //GO(ssl_clear_cipher_ctx, 
 //GO(ssl_clear_hash_ctx, 
-//GO(SSL_COMP_add_compression_method, 
+GO(SSL_COMP_add_compression_method, iFip)
 //GO(SSL_COMP_free_compression_methods, 
-//GO(SSL_COMP_get_compression_methods, 
-//GO(SSL_COMP_get_name, 
-//GO(SSL_COMP_set0_compression_methods, 
-//GO(SSL_CONF_cmd, 
-//GO(SSL_CONF_cmd_argv, 
-//GO(SSL_CONF_cmd_value_type, 
-//GO(SSL_CONF_CTX_clear_flags, 
-//GO(SSL_CONF_CTX_finish, 
-//GO(SSL_CONF_CTX_free, 
-//GO(SSL_CONF_CTX_new, 
-//GO(SSL_CONF_CTX_set1_prefix, 
-//GO(SSL_CONF_CTX_set_flags, 
-//GO(SSL_CONF_CTX_set_ssl, 
-//GO(SSL_CONF_CTX_set_ssl_ctx, 
+GO(SSL_COMP_get_compression_methods, pFv)
+GO(SSL_COMP_get_name, pFp)
+GO(SSL_COMP_set0_compression_methods, pFp)
+GO(SSL_CONF_cmd, iFppp)
+GO(SSL_CONF_cmd_argv, iFppp)
+GO(SSL_CONF_cmd_value_type, iFpp)
+GO(SSL_CONF_CTX_clear_flags, uFpu)
+GO(SSL_CONF_CTX_finish, iFp)
+GO(SSL_CONF_CTX_free, vFp)
+GO(SSL_CONF_CTX_new, pFv)
+GO(SSL_CONF_CTX_set1_prefix, iFpp)
+GO(SSL_CONF_CTX_set_flags, uFpu)
+GO(SSL_CONF_CTX_set_ssl, vFpp)
+GO(SSL_CONF_CTX_set_ssl_ctx, vFpp)
 GO(SSL_connect, iFp)
-//GO(SSL_copy_session_id, 
+GO(SSL_copy_session_id, iFpp)
 //GO(ssl_create_cipher_list, 
 GO(SSL_ctrl, lFpilp)
 GO(SSL_CTX_add_client_CA, iFpp)
-//GO(SSL_CTX_add_client_custom_ext, 
-//GO(SSL_CTX_add_server_custom_ext, 
-//GO(SSL_CTX_add_session, 
+//GOM(SSL_CTX_add_client_custom_ext, iFEpuppppp)
+//GOM(SSL_CTX_add_server_custom_ext, iFEpuppppp)
+GO(SSL_CTX_add_session, iFpp)
 GOM(SSL_CTX_callback_ctrl, lFEpip)
 GO(SSL_CTX_check_private_key, iFp)
 GO(SSL_CTX_clear_options, UFpU)
 GO(SSL_CTX_config, iFpp)
 GO(SSL_CTX_ctrl, lFpilp)
-//GO(SSL_CTX_flush_sessions, 
+GO(SSL_CTX_flush_sessions, vFpl)
 GO(SSL_CTX_free, vFp)
-//GO(SSL_CTX_get0_certificate, 
+GO(SSL_CTX_get0_certificate, pFp)
 GO(SSL_CTX_get0_param, pFp)
-//GO(SSL_CTX_get0_privatekey, 
+GO(SSL_CTX_get0_privatekey, pFp)
 GO(SSL_CTX_get_cert_store, pFp)
-//GO(SSL_CTX_get_client_CA_list, 
-//GO(SSL_CTX_get_client_cert_cb, 
+GO(SSL_CTX_get_client_CA_list, pFp)
+//GOM(SSL_CTX_get_client_cert_cb, pFEp)
 GOM(SSL_CTX_get_default_passwd_cb, pFEp)
 GO(SSL_CTX_get_default_passwd_cb_userdata, pFp)
 GO(SSL_CTX_get_ex_data, pFpi)
 //GO(SSL_CTX_get_ex_new_index, 
-//GO(SSL_CTX_get_info_callback,
+//GOM(SSL_CTX_get_info_callback, pFEp)
 GO(SSL_CTX_get_num_tickets, LFp)
-GO(SSL_CTX_get_options, UFp) 
-//GO(SSL_CTX_get_quiet_shutdown, 
+GO(SSL_CTX_get_options, UFp)
+GO(SSL_CTX_get_quiet_shutdown, iFp)
 GO(SSL_CTX_get_security_level, iFp)
-//GO(SSL_CTX_get_ssl_method, 
-//GO(SSL_CTX_get_timeout, 
+GO(SSL_CTX_get_ssl_method, pFp)
+GO(SSL_CTX_get_timeout, lFp)
 GOM(SSL_CTX_get_verify_callback, pFEp)
-//GO(SSL_CTX_get_verify_depth, 
+GO(SSL_CTX_get_verify_depth, iFp)
 GO(SSL_CTX_get_verify_mode, iFp)
 GO(SSL_CTX_load_verify_dir, iFpp)
 GO(SSL_CTX_load_verify_locations, iFppp)
 GO(SSL_CTX_new, pFp)
-//GO(SSL_CTX_remove_session, 
-//GO(SSL_CTX_sess_get_get_cb, 
-//GO(SSL_CTX_sess_get_new_cb, 
-//GO(SSL_CTX_sess_get_remove_cb, 
-//GO(SSL_CTX_sessions, 
-//GO(SSL_CTX_sess_set_get_cb, 
+GO(SSL_CTX_remove_session, iFpp)
+//GOM(SSL_CTX_sess_get_get_cb, pFEp)
+//GOM(SSL_CTX_sess_get_new_cb, pFEp)
+//GOM(SSL_CTX_sess_get_remove_cb, pFEp)
+GO(SSL_CTX_sessions, pFp)
+//GOM(SSL_CTX_sess_set_get_cb, vFEpp)
 GOM(SSL_CTX_sess_set_new_cb, vFEpp)
-//GO(SSL_CTX_sess_set_remove_cb, 
-//GO(SSL_CTX_set1_param, 
+//GOM(SSL_CTX_sess_set_remove_cb, vFEpp)
+GO(SSL_CTX_set1_param, iFpp)
 GO(SSL_CTX_set_alpn_protos, iFppu)
 GOM(SSL_CTX_set_alpn_select_cb, vFEppp)
-//GO(SSL_CTX_set_cert_cb, 
+//GOM(SSL_CTX_set_cert_cb, vFEppp)
 GO(SSL_CTX_set_cert_store, vFpp)
 GOM(SSL_CTX_set_cert_verify_callback, vFEppp)
 GO(SSL_CTX_set_ciphersuites, iFpp)
 GO(SSL_CTX_set_cipher_list, iFpp)
 GO(SSL_CTX_set_client_CA_list, vFpp)
 GOM(SSL_CTX_set_client_cert_cb, vFEpp)
-//GO(SSL_CTX_set_client_cert_engine, 
+GO(SSL_CTX_set_client_cert_engine, iFpp)
 GOM(SSL_CTX_set_cookie_generate_cb, vFEpp)
 GOM(SSL_CTX_set_cookie_verify_cb, vFEpp)
 GOM(SSL_CTX_set_default_passwd_cb, vFEpp)
 GO(SSL_CTX_set_default_passwd_cb_userdata, vFpp)
 GO(SSL_CTX_set_default_verify_paths, iFp)
-//GO(SSL_CTX_set_ex_data, 
-//GO(SSL_CTX_set_generate_session_id, 
-//GO(SSL_CTX_set_info_callback, 
+GO(SSL_CTX_set_ex_data, iFpip)
+//GOM(SSL_CTX_set_generate_session_id, iFEpp)
+//GOM(SSL_CTX_set_info_callback, vFEpp)
 GOM(SSL_CTX_set_keylog_callback, vFEpp)
 GOM(SSL_CTX_set_msg_callback, vFEpp)
-//GO(SSL_CTX_set_next_protos_advertised_cb, 
+//GOM(SSL_CTX_set_next_protos_advertised_cb, vFEppp)
 GOM(SSL_CTX_set_next_proto_select_cb, vFEppp)
 GO(SSL_CTX_set_num_tickets, iFpL)
-GO(SSL_CTX_set_options, lFpl)
+GO(SSL_CTX_set_options, UFpU)
 GO(SSL_CTX_set_post_handshake_auth, vFpi)
-//GO(SSL_CTX_set_psk_client_callback, 
-//GO(SSL_CTX_set_psk_server_callback, 
-//GO(SSL_CTX_set_purpose, 
+//GOM(SSL_CTX_set_psk_client_callback, vFEpp)
+//GOM(SSL_CTX_set_psk_server_callback, vFEpp)
+GO(SSL_CTX_set_purpose, iFpi)
 GO(SSL_CTX_set_quiet_shutdown, vFpi)
 GO(SSL_CTX_set_security_level, vFpi)
 GO(SSL_CTX_set_session_id_context, iFppu)
-//GO(SSL_CTX_set_srp_cb_arg, 
-//GO(SSL_CTX_set_srp_client_pwd_callback, 
-//GO(SSL_CTX_set_srp_password, 
-//GO(SSL_CTX_set_srp_strength, 
-//GO(SSL_CTX_set_srp_username, 
-//GO(SSL_CTX_set_srp_username_callback, 
-//GO(SSL_CTX_set_srp_verify_param_callback, 
-//GO(SSL_CTX_set_ssl_version, 
-//GO(SSL_CTX_set_timeout, 
-//GO(SSL_CTX_set_tlsext_use_srtp, 
-//GO(SSL_CTX_set_tmp_dh_callback, 
+GO(SSL_CTX_set_srp_cb_arg, iFpp)
+//GOM(SSL_CTX_set_srp_client_pwd_callback, iFEpp)
+GO(SSL_CTX_set_srp_password, iFpp)
+GO(SSL_CTX_set_srp_strength, iFpi)
+GO(SSL_CTX_set_srp_username, iFpp)
+//GOM(SSL_CTX_set_srp_username_callback, iFEpp)
+//GOM(SSL_CTX_set_srp_verify_param_callback, iFEpp)
+GO(SSL_CTX_set_ssl_version, iFpp)
+GO(SSL_CTX_set_timeout, lFpl)
+GO(SSL_CTX_set_tlsext_use_srtp, iFpp)
+//GOM(SSL_CTX_set_tmp_dh_callback, vFEpp)
 //GO(SSL_CTX_set_tmp_ecdh_callback, 
 //GO(SSL_CTX_set_tmp_rsa_callback, 
-//GO(SSL_CTX_set_trust, 
+GO(SSL_CTX_set_trust, iFpi)
 GOM(SSL_CTX_set_verify, vFEpip)
 GO(SSL_CTX_set_verify_depth, vFpi)
-//GO(SSL_CTX_SRP_CTX_free, 
-//GO(SSL_CTX_SRP_CTX_init, 
+GO(SSL_CTX_SRP_CTX_free, iFp)
+GO(SSL_CTX_SRP_CTX_init, iFp)
 GO(SSL_CTX_use_certificate, iFpp)
 GO(SSL_CTX_use_certificate_ASN1, iFpip)
 GO(SSL_CTX_use_certificate_chain_file, iFpp)
 GO(SSL_CTX_use_certificate_file, iFppi)
 GO(SSL_CTX_use_PrivateKey, iFpp)
-GO(SSL_CTX_use_PrivateKey_ASN1, iFuppi)
+GO(SSL_CTX_use_PrivateKey_ASN1, iFippl)
 GO(SSL_CTX_use_PrivateKey_file, iFppi)
 GO(SSL_CTX_use_psk_identity_hint, iFpp)
 GO(SSL_CTX_use_RSAPrivateKey, iFpp)
 GO(SSL_CTX_use_RSAPrivateKey_ASN1, iFppl)
 GO(SSL_CTX_use_RSAPrivateKey_file, iFppi)
-//GO(SSL_CTX_use_serverinfo, 
-//GO(SSL_CTX_use_serverinfo_file, 
+GO(SSL_CTX_use_serverinfo, iFppL)
+GO(SSL_CTX_use_serverinfo_file, iFpp)
 //GO(ssl_do_client_cert_cb, 
 GO(SSL_do_handshake, iFp)
-//GO(SSL_dup, 
-//GO(SSL_dup_CA_list, 
-//GO(SSL_export_keying_material, 
-//GO(SSL_extension_supported, 
+GO(SSL_dup, pFp)
+GO(SSL_dup_CA_list, pFp)
+GO(SSL_export_keying_material, iFppLpLpLi)
+GO(SSL_extension_supported, iFu)
 //GO(ssl_fill_hello_random, 
 GO(SSL_free, vFp)
 //GO(ssl_free_wbio_buffer, 
-GO(SSL_get0_alpn_selected, iFppp)
+GO(SSL_get0_alpn_selected, vFppp)
 GO(SSL_get0_next_proto_negotiated, vFppp)
 GO(SSL_get0_param, pFp)
 GO(SSL_get0_peer_certificate, pFp)
-GO(SSL_get0_session, pFp)
+GO(SSL_get0_session, pFp) // Warning: failed to confirm
 GO(SSL_get0_verified_chain, pFp)
 GO(SSL_get1_peer_certificate, pFp)
 GO(SSL_get1_session, pFp)
 //GO(ssl_get_algorithm2, 
 GO(SSL_get_certificate, pFp)
 //GO(ssl_get_cipher_by_char, 
-//GO(SSL_get_cipher_list, 
+GO(SSL_get_cipher_list, pFpi)
 GO(SSL_get_ciphers, pFp)
 //GO(ssl_get_ciphers_by_id, 
 GO(SSL_get_client_CA_list, pFp)
 GO(SSL_get_client_ciphers, pFp)
 GO(SSL_get_current_cipher, pFp)
 GO(SSL_get_current_compression, pFp)
-//GO(SSL_get_current_expansion, 
-//GO(SSL_get_default_timeout, 
+GO(SSL_get_current_expansion, pFp)
+GO(SSL_get_default_timeout, lFp)
 GO(SSL_get_error, iFpi)
 GO(SSL_get_ex_data, pFpi)
 GO(SSL_get_ex_data_X509_STORE_CTX_idx, iFv)
-GOM(SSL_get_ex_new_index, iFElpppp)
-//GO(SSL_get_fd, 
+GOM(SSL_get_ex_new_index, iFElpppp) // Warning: failed to confirm
+GO(SSL_get_fd, iFp)
 GO(SSL_get_finished, LFppL)
 //GO(ssl_get_handshake_digest, 
-//GO(SSL_get_info_callback, 
+//GOM(SSL_get_info_callback, pFEp)
 //GO(ssl_get_new_session, 
 GO(SSL_get_peer_cert_chain, pFp)
 GO(SSL_get_peer_finished, LFppL)
 //GO(ssl_get_prev_session, 
 GO(SSL_get_privatekey, pFp)
-//GO(SSL_get_psk_identity, 
-//GO(SSL_get_psk_identity_hint, 
-//GO(SSL_get_quiet_shutdown, 
+GO(SSL_get_psk_identity, pFp)
+GO(SSL_get_psk_identity_hint, pFp)
+GO(SSL_get_quiet_shutdown, iFp)
 GO(SSL_get_rbio, pFp)
-//GO(SSL_get_read_ahead, 
-//GO(SSL_get_rfd, 
-//GO(SSL_get_selected_srtp_profile, 
+GO(SSL_get_read_ahead, iFp)
+GO(SSL_get_rfd, iFp)
+GO(SSL_get_selected_srtp_profile, pFp)
 //GO(ssl_get_server_cert_serverinfo, 
 GO(SSL_get_servername, pFpi)
 GO(SSL_get_servername_type, iFp)
 //GO(ssl_get_server_send_pkey, 
 GO(SSL_get_session, pFp)
-//GO(SSL_get_shared_ciphers, 
-//GO(SSL_get_shared_sigalgs, 
+GO(SSL_get_shared_ciphers, pFppi)
+GO(SSL_get_shared_sigalgs, iFpippppp)
 GO(SSL_get_shutdown, iFp)
-//GO(SSL_get_sigalgs, 
+GO(SSL_get_sigalgs, iFpippppp)
 //GO(ssl_get_sign_pkey, 
-//GO(SSL_get_srp_g, 
-//GO(SSL_get_srp_N, 
-//GO(SSL_get_srp_userinfo, 
-//GO(SSL_get_srp_username, 
-//GO(SSL_get_srtp_profiles, 
+GO(SSL_get_srp_g, pFp)
+GO(SSL_get_srp_N, pFp)
+GO(SSL_get_srp_userinfo, pFp)
+GO(SSL_get_srp_username, pFp)
+GO(SSL_get_srtp_profiles, pFp)
 GO(SSL_get_SSL_CTX, pFp)
-//GO(SSL_get_ssl_method, 
+GO(SSL_get_ssl_method, pFp)
 GOM(SSL_get_verify_callback, pFEp)
 GO(SSL_get_verify_depth, iFp)
 GO(SSL_get_verify_mode, iFp)
-GO(SSL_get_verify_result, iFp)
+GO(SSL_get_verify_result, lFp)
 GO(SSL_get_version, pFp)
 GO(SSL_get_wbio, pFp)
-//GO(SSL_get_wfd, 
-//GO(SSL_has_matching_session_id, 
+GO(SSL_get_wfd, iFp)
+GO(SSL_has_matching_session_id, iFppu)
 GO(SSL_in_init, iFp)
 //GO(ssl_init_wbio_buffer, 
 GO(SSL_is_init_finished, iFp)
 GO(SSL_is_server, iFp)
 GO(SSL_library_init, iFv)
 //GO(ssl_load_ciphers, 
-//GO(SSL_load_client_CA_file, 
+GO(SSL_load_client_CA_file, pFp)
 GO(SSL_load_error_strings, vFv)
 GO(SSL_new, pFp)
 //GO(ssl_ok, 
@@ -468,17 +468,17 @@ GO(SSL_renegotiate, iFp)
 GO(SSL_renegotiate_abbreviated, iFp)
 GO(SSL_renegotiate_pending, iFp)
 //GO(ssl_replace_hash, 
-//GO(SSL_rstate_string, 
-//GO(SSL_rstate_string_long, 
+GO(SSL_rstate_string, pFp)
+GO(SSL_rstate_string_long, pFp)
 GO(SSL_select_next_proto, iFpppupu)
 //GO(ssl_sess_cert_free, 
 //GO(ssl_sess_cert_new, 
 GO(ssl_session_dup, pFp)
 GO(SSL_SESSION_dup, pFp)
 GO(SSL_SESSION_free, vFp)
-//GO(SSL_SESSION_get0_peer, 
-//GO(SSL_SESSION_get_compress_id, 
-//GO(SSL_SESSION_get_ex_data, 
+GO(SSL_SESSION_get0_peer, pFp)
+GO(SSL_SESSION_get_compress_id, uFp)
+GO(SSL_SESSION_get_ex_data, pFpi)
 //GO(SSL_SESSION_get_ex_new_index, 
 GO(SSL_SESSION_get_id, pFpp)
 GO(SSL_SESSION_get_ticket_lifetime_hint, LFp)
@@ -486,28 +486,28 @@ GO(SSL_SESSION_get_time, lFp)
 GO(SSL_SESSION_get_timeout, lFp)
 GO(SSL_SESSION_has_ticket, iFp)
 GO(SSL_SESSION_new, pFv)
-//GO(SSL_SESSION_print, 
-//GO(SSL_SESSION_print_fp, 
+GO(SSL_SESSION_print, iFpp)
+GO(SSL_SESSION_print_fp, iFSp)
 GO(SSL_session_reused, iFp)
-//GO(SSL_SESSION_set1_id_context, 
-//GO(SSL_SESSION_set_ex_data, 
-//GO(SSL_SESSION_set_time, 
-//GO(SSL_SESSION_set_timeout, 
+GO(SSL_SESSION_set1_id_context, iFppu)
+GO(SSL_SESSION_set_ex_data, iFpip)
+GO(SSL_SESSION_set_time, lFpl)
+GO(SSL_SESSION_set_timeout, lFpl)
 GO(SSL_SESSION_up_ref, iFp)
-//GO(SSL_set1_param, 
+GO(SSL_set1_param, iFpp)
 GO(SSL_set_accept_state, vFp)
 GO(SSL_set_alpn_protos, iFppu)
 GO(SSL_set_bio, vFppp)
-//GO(SSL_set_cert_cb, 
+//GOM(SSL_set_cert_cb, vFEppp)
 //GO(ssl_set_cert_masks, 
 GO(SSL_set_cipher_list, iFpp)
 GO(SSL_set_client_CA_list, vFpp)
 //GO(ssl_set_client_disabled, 
 GO(SSL_set_connect_state, vFp)
-//GO(SSL_set_debug, 
+GO(SSL_set_debug, vFpi)
 GO(SSL_set_ex_data, iFpip)
 GO(SSL_set_fd, iFpi)
-//GO(SSL_set_generate_session_id, 
+//GOM(SSL_set_generate_session_id, iFEpp)
 GOM(SSL_set_info_callback, vFEpp)
 GOM(SSL_set_msg_callback, vFEpp)
 GO(SSL_set_options, UFpU)
@@ -516,37 +516,37 @@ GO(SSL_set_post_handshake_auth, vFpi)
 GOM(SSL_set_psk_client_callback, vFEpp)
 GOM(SSL_set_psk_use_session_callback, vFEpp)
 GOM(SSL_set_psk_server_callback, vFEpp)
-//GO(SSL_set_purpose, 
+GO(SSL_set_purpose, iFpi)
 GO(SSL_set_quiet_shutdown, vFpi)
 GO(SSL_set_read_ahead, vFpi)
 GO(SSL_set_rfd, iFpi)
 GO(SSL_set_session, iFpp)
-//GO(SSL_set_session_id_context, 
-//GO(SSL_set_session_secret_cb, 
-//GO(SSL_set_session_ticket_ext, 
-//GO(SSL_set_session_ticket_ext_cb, 
-GO(SSL_set_shutdown, iFp)
-//GO(SSL_set_srp_server_param, 
-//GO(SSL_set_srp_server_param_pw, 
+GO(SSL_set_session_id_context, iFppu)
+//GOM(SSL_set_session_secret_cb, iFEppp)
+GO(SSL_set_session_ticket_ext, iFppi)
+//GOM(SSL_set_session_ticket_ext_cb, iFEppp)
+GO(SSL_set_shutdown, vFpi)
+GO(SSL_set_srp_server_param, iFpppppp)
+GO(SSL_set_srp_server_param_pw, iFpppp)
 GO(SSL_set_SSL_CTX, pFpp)
-//GO(SSL_set_ssl_method, 
+GO(SSL_set_ssl_method, iFpp)
 //GO(SSL_set_state, 
-//GO(SSL_set_tlsext_use_srtp, 
-//GO(SSL_set_tmp_dh_callback, 
+GO(SSL_set_tlsext_use_srtp, iFpp)
+//GOM(SSL_set_tmp_dh_callback, vFEpp)
 //GO(SSL_set_tmp_ecdh_callback, 
 //GO(SSL_set_tmp_rsa_callback, 
-//GO(SSL_set_trust, 
+GO(SSL_set_trust, iFpi)
 GOM(SSL_set_verify, vFEpip)
 GO(SSL_set_verify_depth, vFpi)
-//GO(SSL_set_verify_result, 
+GO(SSL_set_verify_result, vFpl)
 GO(SSL_set_wfd, iFpi)
 GO(SSL_shutdown, iFp)
-//GO(SSL_SRP_CTX_free, 
-//GO(SSL_SRP_CTX_init, 
-//GO(SSL_srp_server_param_with_username, 
+GO(SSL_SRP_CTX_free, iFp)
+GO(SSL_SRP_CTX_init, iFp)
+GO(SSL_srp_server_param_with_username, iFpp)
 GO(SSL_state, iFp)
-//GO(SSL_state_string, 
-//GO(SSL_state_string_long, 
+GO(SSL_state_string, pFp)
+GO(SSL_state_string_long, pFp)
 //GO(ssl_undefined_const_function, 
 //GO(ssl_undefined_function, 
 //GO(ssl_undefined_void_function, 
@@ -555,9 +555,9 @@ GO(SSL_use_certificate, iFpp)
 GO(SSL_use_certificate_ASN1, iFppi)
 GO(SSL_use_certificate_file, iFppi)
 GO(SSL_use_PrivateKey, iFpp)
-GO(SSL_use_PrivateKey_ASN1, iFppl)
+GO(SSL_use_PrivateKey_ASN1, iFippl)
 GO(SSL_use_PrivateKey_file, iFppi)
-//GO(SSL_use_psk_identity_hint, 
+GO(SSL_use_psk_identity_hint, iFpp)
 GO(SSL_use_RSAPrivateKey, iFpp)
 GO(SSL_use_RSAPrivateKey_ASN1, iFppl)
 GO(SSL_use_RSAPrivateKey_file, iFppi)
@@ -574,7 +574,7 @@ GO(SSLv3_server_method, pFv)
 //GO(ssl_verify_alarm_type, 
 //GO(ssl_verify_cert_chain, 
 GO(SSL_version, iFp)
-//GO(SSL_want, 
+GO(SSL_want, iFp)
 GO(SSL_write, iFppi)
 GO(SSL_write_ex, iFppLp)
 //GO(tls12_check_peer_sigalg,