diff --git a/include/defines/amisslext.h b/include/defines/amisslext.h
index 8b45c64c8..5375e2aeb 100644
--- a/include/defines/amisslext.h
+++ b/include/defines/amisslext.h
@@ -6638,7 +6638,7 @@ typedef ULONG _sfdc_vararg;
#define OSSL_STACK_OF_X509_free(___certs) \
AROS_LC1(void, OSSL_STACK_OF_X509_free, \
- AROS_LCA(struct stack_st_X509 *, (___certs), A0), \
+ AROS_LCA(STACK_OF(X509) *, (___certs), A0), \
struct Library *, AMISSLEXT_BASE_NAME, 1022, Amisslext)
#define OSSL_trace_string(___out, ___text, ___full, ___data, ___size) \
@@ -6711,19 +6711,19 @@ typedef ULONG _sfdc_vararg;
#define OSSL_CMP_ITAV_new_caCerts(___caCerts) \
AROS_LC1(OSSL_CMP_ITAV *, OSSL_CMP_ITAV_new_caCerts, \
- AROS_LCA(const struct stack_st_X509 *, (___caCerts), A0), \
+ AROS_LCA(const STACK_OF(X509) *, (___caCerts), A0), \
struct Library *, AMISSLEXT_BASE_NAME, 1033, Amisslext)
#define OSSL_CMP_ITAV_get0_caCerts(___itav, ___out) \
AROS_LC2(int, OSSL_CMP_ITAV_get0_caCerts, \
AROS_LCA(const OSSL_CMP_ITAV *, (___itav), A0), \
- AROS_LCA(struct stack_st_X509 **, (___out), A1), \
+ AROS_LCA(STACK_OF(X509) **, (___out), A1), \
struct Library *, AMISSLEXT_BASE_NAME, 1034, Amisslext)
#define OSSL_CMP_get1_caCerts(___ctx, ___out) \
AROS_LC2(int, OSSL_CMP_get1_caCerts, \
AROS_LCA(OSSL_CMP_CTX *, (___ctx), A0), \
- AROS_LCA(struct stack_st_X509 **, (___out), A1), \
+ AROS_LCA(STACK_OF(X509) **, (___out), A1), \
struct Library *, AMISSLEXT_BASE_NAME, 1035, Amisslext)
#define OSSL_CMP_ITAV_new_rootCaCert(___rootCaCert) \
@@ -6825,10 +6825,10 @@ typedef ULONG _sfdc_vararg;
AROS_LC9(BIO *, CMS_SignedData_verify, \
AROS_LCA(CMS_SignedData *, (___sd), A0), \
AROS_LCA(BIO *, (___detached_data), A1), \
- AROS_LCA(struct stack_st_X509 *, (___scerts), A2), \
+ AROS_LCA(STACK_OF(X509) *, (___scerts), A2), \
AROS_LCA(X509_STORE *, (___store), A3), \
- AROS_LCA(struct stack_st_X509 *, (___extra), D0), \
- AROS_LCA(struct stack_st_X509_CRL *, (___crls), D1), \
+ AROS_LCA(STACK_OF(X509) *, (___extra), D0), \
+ AROS_LCA(STACK_OF(X509_CRL) *, (___crls), D1), \
AROS_LCA(unsigned int, (___flags), D2), \
AROS_LCA(OSSL_LIB_CTX *, (___libctx), D3), \
AROS_LCA(const char *, (___propq), D4), \
@@ -6914,7 +6914,7 @@ typedef ULONG _sfdc_vararg;
#define PKCS12_SAFEBAG_set0_attrs(___bag, ___attrs) \
AROS_LC2(void, PKCS12_SAFEBAG_set0_attrs, \
AROS_LCA(PKCS12_SAFEBAG *, (___bag), A0), \
- AROS_LCA(struct stack_st_X509_ATTRIBUTE *, (___attrs), A1), \
+ AROS_LCA(STACK_OF(X509_ATTRIBUTE) *, (___attrs), A1), \
struct Library *, AMISSLEXT_BASE_NAME, 1064, Amisslext)
#define PKCS12_create_ex2_amiga_1(___pass, ___name, ___pkey, ___cert, ___ca, ___nid_key, ___nid_cert, ___moreargs) \
@@ -6923,7 +6923,7 @@ typedef ULONG _sfdc_vararg;
AROS_LCA(const char *, (___name), A1), \
AROS_LCA(EVP_PKEY *, (___pkey), A2), \
AROS_LCA(X509 *, (___cert), A3), \
- AROS_LCA(struct stack_st_X509 *, (___ca), D0), \
+ AROS_LCA(STACK_OF(X509) *, (___ca), D0), \
AROS_LCA(int, (___nid_key), D1), \
AROS_LCA(int, (___nid_cert), D2), \
AROS_LCA(void *, (___moreargs), D3), \
diff --git a/include/inline/amisslext.h b/include/inline/amisslext.h
index d127e7b8f..098cf50db 100644
--- a/include/inline/amisslext.h
+++ b/include/inline/amisslext.h
@@ -4099,7 +4099,7 @@ typedef ULONG _sfdc_vararg;
, AMISSLEXT_BASE_NAME)
#define OSSL_STACK_OF_X509_free(___certs) \
- LP1NR(0x17f4, OSSL_STACK_OF_X509_free , struct stack_st_X509 *, ___certs, a0,\
+ LP1NR(0x17f4, OSSL_STACK_OF_X509_free , STACK_OF(X509) *, ___certs, a0,\
, AMISSLEXT_BASE_NAME)
#define OSSL_trace_string(___out, ___text, ___full, ___data, ___size) \
@@ -4143,15 +4143,15 @@ typedef ULONG _sfdc_vararg;
, AMISSLEXT_BASE_NAME)
#define OSSL_CMP_ITAV_new_caCerts(___caCerts) \
- LP1(0x1836, OSSL_CMP_ITAV *, OSSL_CMP_ITAV_new_caCerts , const struct stack_st_X509 *, ___caCerts, a0,\
+ LP1(0x1836, OSSL_CMP_ITAV *, OSSL_CMP_ITAV_new_caCerts , const STACK_OF(X509) *, ___caCerts, a0,\
, AMISSLEXT_BASE_NAME)
#define OSSL_CMP_ITAV_get0_caCerts(___itav, ___out) \
- LP2(0x183c, int, OSSL_CMP_ITAV_get0_caCerts , const OSSL_CMP_ITAV *, ___itav, a0, struct stack_st_X509 **, ___out, a1,\
+ LP2(0x183c, int, OSSL_CMP_ITAV_get0_caCerts , const OSSL_CMP_ITAV *, ___itav, a0, STACK_OF(X509) **, ___out, a1,\
, AMISSLEXT_BASE_NAME)
#define OSSL_CMP_get1_caCerts(___ctx, ___out) \
- LP2(0x1842, int, OSSL_CMP_get1_caCerts , OSSL_CMP_CTX *, ___ctx, a0, struct stack_st_X509 **, ___out, a1,\
+ LP2(0x1842, int, OSSL_CMP_get1_caCerts , OSSL_CMP_CTX *, ___ctx, a0, STACK_OF(X509) **, ___out, a1,\
, AMISSLEXT_BASE_NAME)
#define OSSL_CMP_ITAV_new_rootCaCert(___rootCaCert) \
@@ -4215,7 +4215,7 @@ typedef ULONG _sfdc_vararg;
, AMISSLEXT_BASE_NAME)
#define CMS_SignedData_verify(___sd, ___detached_data, ___scerts, ___store, ___extra, ___crls, ___flags, ___libctx, ___propq) \
- LP9(0x18a2, BIO *, CMS_SignedData_verify , CMS_SignedData *, ___sd, a0, BIO *, ___detached_data, a1, struct stack_st_X509 *, ___scerts, a2, X509_STORE *, ___store, a3, struct stack_st_X509 *, ___extra, d0, struct stack_st_X509_CRL *, ___crls, d1, unsigned int, ___flags, d2, OSSL_LIB_CTX *, ___libctx, d3, const char *, ___propq, d4,\
+ LP9(0x18a2, BIO *, CMS_SignedData_verify , CMS_SignedData *, ___sd, a0, BIO *, ___detached_data, a1, STACK_OF(X509) *, ___scerts, a2, X509_STORE *, ___store, a3, STACK_OF(X509) *, ___extra, d0, STACK_OF(X509_CRL) *, ___crls, d1, unsigned int, ___flags, d2, OSSL_LIB_CTX *, ___libctx, d3, const char *, ___propq, d4,\
, AMISSLEXT_BASE_NAME)
#define BIO_s_dgram_mem() \
@@ -4267,11 +4267,11 @@ typedef ULONG _sfdc_vararg;
, AMISSLEXT_BASE_NAME)
#define PKCS12_SAFEBAG_set0_attrs(___bag, ___attrs) \
- LP2NR(0x18f0, PKCS12_SAFEBAG_set0_attrs , PKCS12_SAFEBAG *, ___bag, a0, struct stack_st_X509_ATTRIBUTE *, ___attrs, a1,\
+ LP2NR(0x18f0, PKCS12_SAFEBAG_set0_attrs , PKCS12_SAFEBAG *, ___bag, a0, STACK_OF(X509_ATTRIBUTE) *, ___attrs, a1,\
, AMISSLEXT_BASE_NAME)
#define PKCS12_create_ex2_amiga_1(___pass, ___name, ___pkey, ___cert, ___ca, ___nid_key, ___nid_cert, ___moreargs) \
- LP8(0x18f6, PKCS12 *, PKCS12_create_ex2_amiga_1 , const char *, ___pass, a0, const char *, ___name, a1, EVP_PKEY *, ___pkey, a2, X509 *, ___cert, a3, struct stack_st_X509 *, ___ca, d0, int, ___nid_key, d1, int, ___nid_cert, d2, void *, ___moreargs, d3,\
+ LP8(0x18f6, PKCS12 *, PKCS12_create_ex2_amiga_1 , const char *, ___pass, a0, const char *, ___name, a1, EVP_PKEY *, ___pkey, a2, X509 *, ___cert, a3, STACK_OF(X509) *, ___ca, d0, int, ___nid_key, d1, int, ___nid_cert, d2, void *, ___moreargs, d3,\
, AMISSLEXT_BASE_NAME)
#define PKCS12_create_ex2_amiga_2(___iter, ___mac_iter, ___keytype, ___ctx, ___propq, ___cb, ___cbarg) \
diff --git a/include/inline/amisslext_protos.h b/include/inline/amisslext_protos.h
index 629a0aa1f..363b18e0b 100644
--- a/include/inline/amisslext_protos.h
+++ b/include/inline/amisslext_protos.h
@@ -3073,7 +3073,7 @@ const BIO_METHOD * __BIO_f_zlib(__reg("a6") struct Library * ) = "\tjsr\t-6120(a
void __X509_PUBKEY_set0_public_key(__reg("a6") struct Library * , __reg("a0") X509_PUBKEY * pub , __reg("a1") unsigned char * penc , __reg("d0") int penclen ) = "\tjsr\t-6126(a6)";
#define X509_PUBKEY_set0_public_key(pub, penc, penclen) __X509_PUBKEY_set0_public_key(AmiSSLExtBase, (pub), (penc), (penclen))
-void __OSSL_STACK_OF_X509_free(__reg("a6") struct Library * , __reg("a0") struct stack_st_X509 * certs ) = "\tjsr\t-6132(a6)";
+void __OSSL_STACK_OF_X509_free(__reg("a6") struct Library * , __reg("a0") STACK_OF(X509) * certs ) = "\tjsr\t-6132(a6)";
#define OSSL_STACK_OF_X509_free(certs) __OSSL_STACK_OF_X509_free(AmiSSLExtBase, (certs))
int __OSSL_trace_string(__reg("a6") struct Library * , __reg("a0") BIO * out , __reg("d0") int text , __reg("d1") int full , __reg("a1") const unsigned char * data , __reg("d2") size_t size ) = "\tjsr\t-6138(a6)";
@@ -3106,13 +3106,13 @@ void __ASYNC_get_mem_functions(__reg("a6") struct Library * , __reg("a0") ASYNC_
BIO_ADDR * __BIO_ADDR_dup(__reg("a6") struct Library * , __reg("a0") const BIO_ADDR * ap ) = "\tjsr\t-6192(a6)";
#define BIO_ADDR_dup(ap) __BIO_ADDR_dup(AmiSSLExtBase, (ap))
-OSSL_CMP_ITAV * __OSSL_CMP_ITAV_new_caCerts(__reg("a6") struct Library * , __reg("a0") const struct stack_st_X509 * caCerts ) = "\tjsr\t-6198(a6)";
+OSSL_CMP_ITAV * __OSSL_CMP_ITAV_new_caCerts(__reg("a6") struct Library * , __reg("a0") const STACK_OF(X509) * caCerts ) = "\tjsr\t-6198(a6)";
#define OSSL_CMP_ITAV_new_caCerts(caCerts) __OSSL_CMP_ITAV_new_caCerts(AmiSSLExtBase, (caCerts))
-int __OSSL_CMP_ITAV_get0_caCerts(__reg("a6") struct Library * , __reg("a0") const OSSL_CMP_ITAV * itav , __reg("a1") struct stack_st_X509 ** out ) = "\tjsr\t-6204(a6)";
+int __OSSL_CMP_ITAV_get0_caCerts(__reg("a6") struct Library * , __reg("a0") const OSSL_CMP_ITAV * itav , __reg("a1") STACK_OF(X509) ** out ) = "\tjsr\t-6204(a6)";
#define OSSL_CMP_ITAV_get0_caCerts(itav, out) __OSSL_CMP_ITAV_get0_caCerts(AmiSSLExtBase, (itav), (out))
-int __OSSL_CMP_get1_caCerts(__reg("a6") struct Library * , __reg("a0") OSSL_CMP_CTX * ctx , __reg("a1") struct stack_st_X509 ** out ) = "\tjsr\t-6210(a6)";
+int __OSSL_CMP_get1_caCerts(__reg("a6") struct Library * , __reg("a0") OSSL_CMP_CTX * ctx , __reg("a1") STACK_OF(X509) ** out ) = "\tjsr\t-6210(a6)";
#define OSSL_CMP_get1_caCerts(ctx, out) __OSSL_CMP_get1_caCerts(AmiSSLExtBase, (ctx), (out))
OSSL_CMP_ITAV * __OSSL_CMP_ITAV_new_rootCaCert(__reg("a6") struct Library * , __reg("a0") const X509 * rootCaCert ) = "\tjsr\t-6216(a6)";
@@ -3160,7 +3160,7 @@ void __CMS_SignedData_free(__reg("a6") struct Library * , __reg("a0") CMS_Signed
CMS_SignedData * __CMS_SignedData_new(__reg("a6") struct Library * ) = "\tjsr\t-6300(a6)";
#define CMS_SignedData_new() __CMS_SignedData_new(AmiSSLExtBase)
-BIO * __CMS_SignedData_verify(__reg("a6") struct Library * , __reg("a0") CMS_SignedData * sd , __reg("a1") BIO * detached_data , __reg("a2") struct stack_st_X509 * scerts , __reg("a3") X509_STORE * store , __reg("d0") struct stack_st_X509 * extra , __reg("d1") struct stack_st_X509_CRL * crls , __reg("d2") unsigned int flags , __reg("d3") OSSL_LIB_CTX * libctx , __reg("d4") const char * propq ) = "\tjsr\t-6306(a6)";
+BIO * __CMS_SignedData_verify(__reg("a6") struct Library * , __reg("a0") CMS_SignedData * sd , __reg("a1") BIO * detached_data , __reg("a2") STACK_OF(X509) * scerts , __reg("a3") X509_STORE * store , __reg("d0") STACK_OF(X509) * extra , __reg("d1") STACK_OF(X509_CRL) * crls , __reg("d2") unsigned int flags , __reg("d3") OSSL_LIB_CTX * libctx , __reg("d4") const char * propq ) = "\tjsr\t-6306(a6)";
#define CMS_SignedData_verify(sd, detached_data, scerts, store, extra, crls, flags, libctx, propq) __CMS_SignedData_verify(AmiSSLExtBase, (sd), (detached_data), (scerts), (store), (extra), (crls), (flags), (libctx), (propq))
const BIO_METHOD * __BIO_s_dgram_mem(__reg("a6") struct Library * ) = "\tjsr\t-6312(a6)";
@@ -3199,10 +3199,10 @@ int __EVP_PKEY_auth_encapsulate_init(__reg("a6") struct Library * , __reg("a0")
int __EVP_PKEY_auth_decapsulate_init(__reg("a6") struct Library * , __reg("a0") EVP_PKEY_CTX * ctx , __reg("a1") EVP_PKEY * authpub , __reg("a2") const OSSL_PARAM * params ) = "\tjsr\t-6378(a6)";
#define EVP_PKEY_auth_decapsulate_init(ctx, authpub, params) __EVP_PKEY_auth_decapsulate_init(AmiSSLExtBase, (ctx), (authpub), (params))
-void __PKCS12_SAFEBAG_set0_attrs(__reg("a6") struct Library * , __reg("a0") PKCS12_SAFEBAG * bag , __reg("a1") struct stack_st_X509_ATTRIBUTE * attrs ) = "\tjsr\t-6384(a6)";
+void __PKCS12_SAFEBAG_set0_attrs(__reg("a6") struct Library * , __reg("a0") PKCS12_SAFEBAG * bag , __reg("a1") STACK_OF(X509_ATTRIBUTE) * attrs ) = "\tjsr\t-6384(a6)";
#define PKCS12_SAFEBAG_set0_attrs(bag, attrs) __PKCS12_SAFEBAG_set0_attrs(AmiSSLExtBase, (bag), (attrs))
-PKCS12 * __PKCS12_create_ex2_amiga_1(__reg("a6") struct Library * , __reg("a0") const char * pass , __reg("a1") const char * name , __reg("a2") EVP_PKEY * pkey , __reg("a3") X509 * cert , __reg("d0") struct stack_st_X509 * ca , __reg("d1") int nid_key , __reg("d2") int nid_cert , __reg("d3") void * moreargs ) = "\tjsr\t-6390(a6)";
+PKCS12 * __PKCS12_create_ex2_amiga_1(__reg("a6") struct Library * , __reg("a0") const char * pass , __reg("a1") const char * name , __reg("a2") EVP_PKEY * pkey , __reg("a3") X509 * cert , __reg("d0") STACK_OF(X509) * ca , __reg("d1") int nid_key , __reg("d2") int nid_cert , __reg("d3") void * moreargs ) = "\tjsr\t-6390(a6)";
#define PKCS12_create_ex2_amiga_1(pass, name, pkey, cert, ca, nid_key, nid_cert, moreargs) __PKCS12_create_ex2_amiga_1(AmiSSLExtBase, (pass), (name), (pkey), (cert), (ca), (nid_key), (nid_cert), (moreargs))
void * __PKCS12_create_ex2_amiga_2(__reg("a6") struct Library * , __reg("d0") int iter , __reg("d1") int mac_iter , __reg("d2") int keytype , __reg("a1") OSSL_LIB_CTX * ctx , __reg("a2") const char * propq , __reg("a3") PKCS12_create_cb * cb , __reg("d3") void * cbarg ) = "\tjsr\t-6396(a6)";
diff --git a/include/interfaces/amissl.h b/include/interfaces/amissl.h
index d678060d8..552996631 100644
--- a/include/interfaces/amissl.h
+++ b/include/interfaces/amissl.h
@@ -6521,7 +6521,7 @@ struct AmiSSLIFace
APICALL int (*SSL_is_stream_local)(struct AmiSSLIFace *Self, SSL * s);
APICALL const BIO_METHOD * (*BIO_f_zlib)(struct AmiSSLIFace *Self);
APICALL void (*X509_PUBKEY_set0_public_key)(struct AmiSSLIFace *Self, X509_PUBKEY * pub, unsigned char * penc, int penclen);
- APICALL void (*OSSL_STACK_OF_X509_free)(struct AmiSSLIFace *Self, struct stack_st_X509 * certs);
+ APICALL void (*OSSL_STACK_OF_X509_free)(struct AmiSSLIFace *Self, STACK_OF(X509) * certs);
APICALL int (*OSSL_trace_string)(struct AmiSSLIFace *Self, BIO * out, int text, int full, const unsigned char * data, size_t size);
APICALL BIGNUM * (*BN_signed_bin2bn)(struct AmiSSLIFace *Self, const unsigned char * s, int len, BIGNUM * ret);
APICALL int (*BN_signed_bn2bin)(struct AmiSSLIFace *Self, const BIGNUM * a, unsigned char * to, int tolen);
@@ -6532,9 +6532,9 @@ struct AmiSSLIFace
APICALL int (*ASYNC_set_mem_functions)(struct AmiSSLIFace *Self, ASYNC_stack_alloc_fn alloc_fn, ASYNC_stack_free_fn free_fn);
APICALL void (*ASYNC_get_mem_functions)(struct AmiSSLIFace *Self, ASYNC_stack_alloc_fn * alloc_fn, ASYNC_stack_free_fn * free_fn);
APICALL BIO_ADDR * (*BIO_ADDR_dup)(struct AmiSSLIFace *Self, const BIO_ADDR * ap);
- APICALL OSSL_CMP_ITAV * (*OSSL_CMP_ITAV_new_caCerts)(struct AmiSSLIFace *Self, const struct stack_st_X509 * caCerts);
- APICALL int (*OSSL_CMP_ITAV_get0_caCerts)(struct AmiSSLIFace *Self, const OSSL_CMP_ITAV * itav, struct stack_st_X509 ** out);
- APICALL int (*OSSL_CMP_get1_caCerts)(struct AmiSSLIFace *Self, OSSL_CMP_CTX * ctx, struct stack_st_X509 ** out);
+ APICALL OSSL_CMP_ITAV * (*OSSL_CMP_ITAV_new_caCerts)(struct AmiSSLIFace *Self, const STACK_OF(X509) * caCerts);
+ APICALL int (*OSSL_CMP_ITAV_get0_caCerts)(struct AmiSSLIFace *Self, const OSSL_CMP_ITAV * itav, STACK_OF(X509) ** out);
+ APICALL int (*OSSL_CMP_get1_caCerts)(struct AmiSSLIFace *Self, OSSL_CMP_CTX * ctx, STACK_OF(X509) ** out);
APICALL OSSL_CMP_ITAV * (*OSSL_CMP_ITAV_new_rootCaCert)(struct AmiSSLIFace *Self, const X509 * rootCaCert);
APICALL int (*OSSL_CMP_ITAV_get0_rootCaCert)(struct AmiSSLIFace *Self, const OSSL_CMP_ITAV * itav, X509 ** out);
APICALL OSSL_CMP_ITAV * (*OSSL_CMP_ITAV_new_rootCaKeyUpdate)(struct AmiSSLIFace *Self, const X509 * newWithNew, const X509 * newWithOld, const X509 * oldWithNew);
@@ -6550,7 +6550,7 @@ struct AmiSSLIFace
APICALL BIO * (*CMS_EnvelopedData_decrypt)(struct AmiSSLIFace *Self, CMS_EnvelopedData * env, BIO * detached_data, EVP_PKEY * pkey, X509 * cert, ASN1_OCTET_STRING * secret, unsigned int flags, OSSL_LIB_CTX * libctx, const char * propq);
APICALL void (*CMS_SignedData_free)(struct AmiSSLIFace *Self, CMS_SignedData * a);
APICALL CMS_SignedData * (*CMS_SignedData_new)(struct AmiSSLIFace *Self);
- APICALL BIO * (*CMS_SignedData_verify)(struct AmiSSLIFace *Self, CMS_SignedData * sd, BIO * detached_data, struct stack_st_X509 * scerts, X509_STORE * store, struct stack_st_X509 * extra, struct stack_st_X509_CRL * crls, unsigned int flags, OSSL_LIB_CTX * libctx, const char * propq);
+ APICALL BIO * (*CMS_SignedData_verify)(struct AmiSSLIFace *Self, CMS_SignedData * sd, BIO * detached_data, STACK_OF(X509) * scerts, X509_STORE * store, STACK_OF(X509) * extra, STACK_OF(X509_CRL) * crls, unsigned int flags, OSSL_LIB_CTX * libctx, const char * propq);
APICALL const BIO_METHOD * (*BIO_s_dgram_mem)(struct AmiSSLIFace *Self);
APICALL int (*BIO_recvmmsg)(struct AmiSSLIFace *Self, BIO * b, BIO_MSG * msg, size_t stride, size_t num_msg, uint64_t flags, size_t * msgs_processed);
APICALL int (*BIO_sendmmsg)(struct AmiSSLIFace *Self, BIO * b, BIO_MSG * msg, size_t stride, size_t num_msg, uint64_t flags, size_t * msgs_processed);
@@ -6563,8 +6563,8 @@ struct AmiSSLIFace
APICALL int (*BIO_new_bio_dgram_pair)(struct AmiSSLIFace *Self, BIO ** bio1, size_t writebuf1, BIO ** bio2, size_t writebuf2);
APICALL int (*EVP_PKEY_auth_encapsulate_init)(struct AmiSSLIFace *Self, EVP_PKEY_CTX * ctx, EVP_PKEY * authpriv, const OSSL_PARAM * params);
APICALL int (*EVP_PKEY_auth_decapsulate_init)(struct AmiSSLIFace *Self, EVP_PKEY_CTX * ctx, EVP_PKEY * authpub, const OSSL_PARAM * params);
- APICALL void (*PKCS12_SAFEBAG_set0_attrs)(struct AmiSSLIFace *Self, PKCS12_SAFEBAG * bag, struct stack_st_X509_ATTRIBUTE * attrs);
- APICALL PKCS12 * (*PKCS12_create_ex2_amiga_1)(struct AmiSSLIFace *Self, const char * pass, const char * name, EVP_PKEY * pkey, X509 * cert, struct stack_st_X509 * ca, int nid_key, int nid_cert, void * moreargs);
+ APICALL void (*PKCS12_SAFEBAG_set0_attrs)(struct AmiSSLIFace *Self, PKCS12_SAFEBAG * bag, STACK_OF(X509_ATTRIBUTE) * attrs);
+ APICALL PKCS12 * (*PKCS12_create_ex2_amiga_1)(struct AmiSSLIFace *Self, const char * pass, const char * name, EVP_PKEY * pkey, X509 * cert, STACK_OF(X509) * ca, int nid_key, int nid_cert, void * moreargs);
APICALL void * (*PKCS12_create_ex2_amiga_2)(struct AmiSSLIFace *Self, int iter, int mac_iter, int keytype, OSSL_LIB_CTX * ctx, const char * propq, PKCS12_create_cb * cb, void * cbarg);
APICALL void (*OSSL_sleep)(struct AmiSSLIFace *Self, uint64_t millis);
APICALL uint32_t (*OSSL_get_thread_support_flags)(struct AmiSSLIFace *Self);
diff --git a/include/ppcinline/amisslext.h b/include/ppcinline/amisslext.h
index 102a45269..4f6c06f8f 100644
--- a/include/ppcinline/amisslext.h
+++ b/include/ppcinline/amisslext.h
@@ -4099,7 +4099,7 @@ typedef ULONG _sfdc_vararg;
, AMISSLEXT_BASE_NAME, 0, 0, 0, 0, 0, 0)
#define OSSL_STACK_OF_X509_free(___certs) \
- LP1NR(0x17f4, OSSL_STACK_OF_X509_free , struct stack_st_X509 *, ___certs, a0,\
+ LP1NR(0x17f4, OSSL_STACK_OF_X509_free , STACK_OF(X509) *, ___certs, a0,\
, AMISSLEXT_BASE_NAME, 0, 0, 0, 0, 0, 0)
#define OSSL_trace_string(___out, ___text, ___full, ___data, ___size) \
@@ -4143,15 +4143,15 @@ typedef ULONG _sfdc_vararg;
, AMISSLEXT_BASE_NAME, 0, 0, 0, 0, 0, 0)
#define OSSL_CMP_ITAV_new_caCerts(___caCerts) \
- LP1(0x1836, OSSL_CMP_ITAV *, OSSL_CMP_ITAV_new_caCerts , const struct stack_st_X509 *, ___caCerts, a0,\
+ LP1(0x1836, OSSL_CMP_ITAV *, OSSL_CMP_ITAV_new_caCerts , const STACK_OF(X509) *, ___caCerts, a0,\
, AMISSLEXT_BASE_NAME, 0, 0, 0, 0, 0, 0)
#define OSSL_CMP_ITAV_get0_caCerts(___itav, ___out) \
- LP2(0x183c, int, OSSL_CMP_ITAV_get0_caCerts , const OSSL_CMP_ITAV *, ___itav, a0, struct stack_st_X509 **, ___out, a1,\
+ LP2(0x183c, int, OSSL_CMP_ITAV_get0_caCerts , const OSSL_CMP_ITAV *, ___itav, a0, STACK_OF(X509) **, ___out, a1,\
, AMISSLEXT_BASE_NAME, 0, 0, 0, 0, 0, 0)
#define OSSL_CMP_get1_caCerts(___ctx, ___out) \
- LP2(0x1842, int, OSSL_CMP_get1_caCerts , OSSL_CMP_CTX *, ___ctx, a0, struct stack_st_X509 **, ___out, a1,\
+ LP2(0x1842, int, OSSL_CMP_get1_caCerts , OSSL_CMP_CTX *, ___ctx, a0, STACK_OF(X509) **, ___out, a1,\
, AMISSLEXT_BASE_NAME, 0, 0, 0, 0, 0, 0)
#define OSSL_CMP_ITAV_new_rootCaCert(___rootCaCert) \
@@ -4215,7 +4215,7 @@ typedef ULONG _sfdc_vararg;
, AMISSLEXT_BASE_NAME, 0, 0, 0, 0, 0, 0)
#define CMS_SignedData_verify(___sd, ___detached_data, ___scerts, ___store, ___extra, ___crls, ___flags, ___libctx, ___propq) \
- LP9(0x18a2, BIO *, CMS_SignedData_verify , CMS_SignedData *, ___sd, a0, BIO *, ___detached_data, a1, struct stack_st_X509 *, ___scerts, a2, X509_STORE *, ___store, a3, struct stack_st_X509 *, ___extra, d0, struct stack_st_X509_CRL *, ___crls, d1, unsigned int, ___flags, d2, OSSL_LIB_CTX *, ___libctx, d3, const char *, ___propq, d4,\
+ LP9(0x18a2, BIO *, CMS_SignedData_verify , CMS_SignedData *, ___sd, a0, BIO *, ___detached_data, a1, STACK_OF(X509) *, ___scerts, a2, X509_STORE *, ___store, a3, STACK_OF(X509) *, ___extra, d0, STACK_OF(X509_CRL) *, ___crls, d1, unsigned int, ___flags, d2, OSSL_LIB_CTX *, ___libctx, d3, const char *, ___propq, d4,\
, AMISSLEXT_BASE_NAME, 0, 0, 0, 0, 0, 0)
#define BIO_s_dgram_mem() \
@@ -4267,11 +4267,11 @@ typedef ULONG _sfdc_vararg;
, AMISSLEXT_BASE_NAME, 0, 0, 0, 0, 0, 0)
#define PKCS12_SAFEBAG_set0_attrs(___bag, ___attrs) \
- LP2NR(0x18f0, PKCS12_SAFEBAG_set0_attrs , PKCS12_SAFEBAG *, ___bag, a0, struct stack_st_X509_ATTRIBUTE *, ___attrs, a1,\
+ LP2NR(0x18f0, PKCS12_SAFEBAG_set0_attrs , PKCS12_SAFEBAG *, ___bag, a0, STACK_OF(X509_ATTRIBUTE) *, ___attrs, a1,\
, AMISSLEXT_BASE_NAME, 0, 0, 0, 0, 0, 0)
#define PKCS12_create_ex2_amiga_1(___pass, ___name, ___pkey, ___cert, ___ca, ___nid_key, ___nid_cert, ___moreargs) \
- LP8(0x18f6, PKCS12 *, PKCS12_create_ex2_amiga_1 , const char *, ___pass, a0, const char *, ___name, a1, EVP_PKEY *, ___pkey, a2, X509 *, ___cert, a3, struct stack_st_X509 *, ___ca, d0, int, ___nid_key, d1, int, ___nid_cert, d2, void *, ___moreargs, d3,\
+ LP8(0x18f6, PKCS12 *, PKCS12_create_ex2_amiga_1 , const char *, ___pass, a0, const char *, ___name, a1, EVP_PKEY *, ___pkey, a2, X509 *, ___cert, a3, STACK_OF(X509) *, ___ca, d0, int, ___nid_key, d1, int, ___nid_cert, d2, void *, ___moreargs, d3,\
, AMISSLEXT_BASE_NAME, 0, 0, 0, 0, 0, 0)
#define PKCS12_create_ex2_amiga_2(___iter, ___mac_iter, ___keytype, ___ctx, ___propq, ___cb, ___cbarg) \
diff --git a/include/sfd/amisslext_lib.sfd b/include/sfd/amisslext_lib.sfd
index 1ab9834df..f88374f83 100644
--- a/include/sfd/amisslext_lib.sfd
+++ b/include/sfd/amisslext_lib.sfd
@@ -1027,7 +1027,7 @@ const char * SSL_get0_group_name(SSL * s) (a0)
int SSL_is_stream_local(SSL * s) (a0)
const BIO_METHOD * BIO_f_zlib() ()
void X509_PUBKEY_set0_public_key(X509_PUBKEY * pub, unsigned char * penc, int penclen) (a0,a1,d0)
-void OSSL_STACK_OF_X509_free(struct stack_st_X509 * certs) (a0)
+void OSSL_STACK_OF_X509_free(STACK_OF(X509) * certs) (a0)
int OSSL_trace_string(BIO * out, int text, int full, const unsigned char * data, size_t size) (a0,d0,d1,a1,d2)
BIGNUM * BN_signed_bin2bn(const unsigned char * s, int len, BIGNUM * ret) (a0,d0,a1)
int BN_signed_bn2bin(const BIGNUM * a, unsigned char * to, int tolen) (a0,a1,d0)
@@ -1038,9 +1038,9 @@ int BN_signed_bn2native(const BIGNUM * a, unsigned char * to, int tolen) (a0,a1,
int ASYNC_set_mem_functions(ASYNC_stack_alloc_fn alloc_fn, ASYNC_stack_free_fn free_fn) (a0,a1)
void ASYNC_get_mem_functions(ASYNC_stack_alloc_fn * alloc_fn, ASYNC_stack_free_fn * free_fn) (a0,a1)
BIO_ADDR * BIO_ADDR_dup(const BIO_ADDR * ap) (a0)
-OSSL_CMP_ITAV * OSSL_CMP_ITAV_new_caCerts(const struct stack_st_X509 * caCerts) (a0)
-int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV * itav, struct stack_st_X509 ** out) (a0,a1)
-int OSSL_CMP_get1_caCerts(OSSL_CMP_CTX * ctx, struct stack_st_X509 ** out) (a0,a1)
+OSSL_CMP_ITAV * OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) * caCerts) (a0)
+int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV * itav, STACK_OF(X509) ** out) (a0,a1)
+int OSSL_CMP_get1_caCerts(OSSL_CMP_CTX * ctx, STACK_OF(X509) ** out) (a0,a1)
OSSL_CMP_ITAV * OSSL_CMP_ITAV_new_rootCaCert(const X509 * rootCaCert) (a0)
int OSSL_CMP_ITAV_get0_rootCaCert(const OSSL_CMP_ITAV * itav, X509 ** out) (a0,a1)
OSSL_CMP_ITAV * OSSL_CMP_ITAV_new_rootCaKeyUpdate(const X509 * newWithNew, const X509 * newWithOld, const X509 * oldWithNew) (a0,a1,a2)
@@ -1056,7 +1056,7 @@ const ASN1_ITEM * CMS_EnvelopedData_it() ()
BIO * CMS_EnvelopedData_decrypt(CMS_EnvelopedData * env, BIO * detached_data, EVP_PKEY * pkey, X509 * cert, ASN1_OCTET_STRING * secret, unsigned int flags, OSSL_LIB_CTX * libctx, const char * propq) (a0,a1,a2,a3,d0,d1,d2,d3)
void CMS_SignedData_free(CMS_SignedData * a) (a0)
CMS_SignedData * CMS_SignedData_new() ()
-BIO * CMS_SignedData_verify(CMS_SignedData * sd, BIO * detached_data, struct stack_st_X509 * scerts, X509_STORE * store, struct stack_st_X509 * extra, struct stack_st_X509_CRL * crls, unsigned int flags, OSSL_LIB_CTX * libctx, const char * propq) (a0,a1,a2,a3,d0,d1,d2,d3,d4)
+BIO * CMS_SignedData_verify(CMS_SignedData * sd, BIO * detached_data, STACK_OF(X509) * scerts, X509_STORE * store, STACK_OF(X509) * extra, STACK_OF(X509_CRL) * crls, unsigned int flags, OSSL_LIB_CTX * libctx, const char * propq) (a0,a1,a2,a3,d0,d1,d2,d3,d4)
const BIO_METHOD * BIO_s_dgram_mem() ()
int BIO_recvmmsg(BIO * b, BIO_MSG * msg, size_t stride, size_t num_msg, uint64_t flags, size_t * msgs_processed) (a0,a1,d0,d1,d2-d3,a2)
int BIO_sendmmsg(BIO * b, BIO_MSG * msg, size_t stride, size_t num_msg, uint64_t flags, size_t * msgs_processed) (a0,a1,d0,d1,d2-d3,a2)
@@ -1069,8 +1069,8 @@ const BIO_METHOD * BIO_s_dgram_pair() ()
int BIO_new_bio_dgram_pair(BIO ** bio1, size_t writebuf1, BIO ** bio2, size_t writebuf2) (a0,d0,a1,d1)
int EVP_PKEY_auth_encapsulate_init(EVP_PKEY_CTX * ctx, EVP_PKEY * authpriv, const OSSL_PARAM * params) (a0,a1,a2)
int EVP_PKEY_auth_decapsulate_init(EVP_PKEY_CTX * ctx, EVP_PKEY * authpub, const OSSL_PARAM * params) (a0,a1,a2)
-void PKCS12_SAFEBAG_set0_attrs(PKCS12_SAFEBAG * bag, struct stack_st_X509_ATTRIBUTE * attrs) (a0,a1)
-PKCS12 * PKCS12_create_ex2_amiga_1(const char * pass, const char * name, EVP_PKEY * pkey, X509 * cert, struct stack_st_X509 * ca, int nid_key, int nid_cert, void * moreargs) (a0,a1,a2,a3,d0,d1,d2,d3)
+void PKCS12_SAFEBAG_set0_attrs(PKCS12_SAFEBAG * bag, STACK_OF(X509_ATTRIBUTE) * attrs) (a0,a1)
+PKCS12 * PKCS12_create_ex2_amiga_1(const char * pass, const char * name, EVP_PKEY * pkey, X509 * cert, STACK_OF(X509) * ca, int nid_key, int nid_cert, void * moreargs) (a0,a1,a2,a3,d0,d1,d2,d3)
void * PKCS12_create_ex2_amiga_2(int iter, int mac_iter, int keytype, OSSL_LIB_CTX * ctx, const char * propq, PKCS12_create_cb * cb, void * cbarg) (d0,d1,d2,a1,a2,a3,d3)
void OSSL_sleep(uint64_t millis) (d0-d1)
uint32_t OSSL_get_thread_support_flags() ()
diff --git a/include/xml/amissl.xml b/include/xml/amissl.xml
index 7ea90d38e..539002091 100644
--- a/include/xml/amissl.xml
+++ b/include/xml/amissl.xml
@@ -26763,7 +26763,7 @@
-
+
@@ -26814,15 +26814,15 @@
-
+
-
+
-
+
@@ -26892,10 +26892,10 @@
-
+
-
-
+
+
@@ -26955,7 +26955,7 @@
-
+
@@ -26963,7 +26963,7 @@
-
+
diff --git a/src/amissl_glue.c b/src/amissl_glue.c
index 5681fcf61..d1dffee45 100644
--- a/src/amissl_glue.c
+++ b/src/amissl_glue.c
@@ -41125,7 +41125,7 @@ void SAVEDS ASM LIB_X509_PUBKEY_set0_public_key(REG(a6, UNUSED __IFACE_OR_BASE),
// ---
-void SAVEDS ASM LIB_OSSL_STACK_OF_X509_free(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, struct stack_st_X509 * certs))
+void SAVEDS ASM LIB_OSSL_STACK_OF_X509_free(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, STACK_OF(X509) * certs))
{
OSSL_STACK_OF_X509_free(certs);
}
@@ -41202,21 +41202,21 @@ BIO_ADDR * SAVEDS ASM LIB_BIO_ADDR_dup(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0,
// ---
-OSSL_CMP_ITAV * SAVEDS ASM LIB_OSSL_CMP_ITAV_new_caCerts(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, const struct stack_st_X509 * caCerts))
+OSSL_CMP_ITAV * SAVEDS ASM LIB_OSSL_CMP_ITAV_new_caCerts(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, const STACK_OF(X509) * caCerts))
{
return OSSL_CMP_ITAV_new_caCerts(caCerts);
}
// ---
-int SAVEDS ASM LIB_OSSL_CMP_ITAV_get0_caCerts(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, const OSSL_CMP_ITAV * itav), REG(a1, struct stack_st_X509 ** out))
+int SAVEDS ASM LIB_OSSL_CMP_ITAV_get0_caCerts(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, const OSSL_CMP_ITAV * itav), REG(a1, STACK_OF(X509) ** out))
{
return OSSL_CMP_ITAV_get0_caCerts(itav, out);
}
// ---
-int SAVEDS ASM LIB_OSSL_CMP_get1_caCerts(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, OSSL_CMP_CTX * ctx), REG(a1, struct stack_st_X509 ** out))
+int SAVEDS ASM LIB_OSSL_CMP_get1_caCerts(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, OSSL_CMP_CTX * ctx), REG(a1, STACK_OF(X509) ** out))
{
return OSSL_CMP_get1_caCerts(ctx, out);
}
@@ -41328,7 +41328,7 @@ CMS_SignedData * SAVEDS ASM LIB_CMS_SignedData_new(REG(a6, UNUSED __IFACE_OR_BAS
// ---
-BIO * SAVEDS ASM LIB_CMS_SignedData_verify(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, CMS_SignedData * sd), REG(a1, BIO * detached_data), REG(a2, struct stack_st_X509 * scerts), REG(a3, X509_STORE * store), REG(d0, struct stack_st_X509 * extra), REG(d1, struct stack_st_X509_CRL * crls), REG(d2, unsigned int flags), REG(d3, OSSL_LIB_CTX * libctx), REG(d4, const char * propq))
+BIO * SAVEDS ASM LIB_CMS_SignedData_verify(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, CMS_SignedData * sd), REG(a1, BIO * detached_data), REG(a2, STACK_OF(X509) * scerts), REG(a3, X509_STORE * store), REG(d0, STACK_OF(X509) * extra), REG(d1, STACK_OF(X509_CRL) * crls), REG(d2, unsigned int flags), REG(d3, OSSL_LIB_CTX * libctx), REG(d4, const char * propq))
{
return CMS_SignedData_verify(sd, detached_data, scerts, store, extra, crls, flags, libctx, propq);
}
@@ -41419,14 +41419,14 @@ int SAVEDS ASM LIB_EVP_PKEY_auth_decapsulate_init(REG(a6, UNUSED __IFACE_OR_BASE
// ---
-void SAVEDS ASM LIB_PKCS12_SAFEBAG_set0_attrs(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, PKCS12_SAFEBAG * bag), REG(a1, struct stack_st_X509_ATTRIBUTE * attrs))
+void SAVEDS ASM LIB_PKCS12_SAFEBAG_set0_attrs(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, PKCS12_SAFEBAG * bag), REG(a1, STACK_OF(X509_ATTRIBUTE) * attrs))
{
PKCS12_SAFEBAG_set0_attrs(bag, attrs);
}
// ---
-PKCS12 * SAVEDS ASM LIB_PKCS12_create_ex2_amiga_1(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, const char * pass), REG(a1, const char * name), REG(a2, EVP_PKEY * pkey), REG(a3, X509 * cert), REG(d0, struct stack_st_X509 * ca), REG(d1, int nid_key), REG(d2, int nid_cert), REG(d3, void * moreargs))
+PKCS12 * SAVEDS ASM LIB_PKCS12_create_ex2_amiga_1(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, const char * pass), REG(a1, const char * name), REG(a2, EVP_PKEY * pkey), REG(a3, X509 * cert), REG(d0, STACK_OF(X509) * ca), REG(d1, int nid_key), REG(d2, int nid_cert), REG(d3, void * moreargs))
{
return PKCS12_create_ex2_amiga_1(pass, name, pkey, cert, ca, nid_key, nid_cert, moreargs);
}
diff --git a/src/amissl_glue_extra.c b/src/amissl_glue_extra.c
index 7f36a5bf2..b9e97a02e 100644
--- a/src/amissl_glue_extra.c
+++ b/src/amissl_glue_extra.c
@@ -123,7 +123,7 @@ BIO * OSSL_HTTP_transfer_amiga_1(OSSL_HTTP_REQ_CTX ** prctx, const char * server
result = OSSL_HTTP_transfer(prctx, server, port, path, use_ssl, proxy, no_proxy,
bio, rbio, bio_update_fn,
(void *)a[0], (int)a[1],
- (const struct stack_st_CONF_VALUE *)a[2],
+ (const STACK_OF(CONF_VALUE) *)a[2],
(const char *)a[3], (BIO *)a[4], (const char *)a[5],
(int)a[6], (size_t)a[7], (int)a[8], (int)a[9]);
free(a);
@@ -136,7 +136,7 @@ BIO * OSSL_HTTP_transfer_amiga_1(OSSL_HTTP_REQ_CTX ** prctx, const char * server
}
void * OSSL_HTTP_transfer_amiga_2(void * arg, int buf_size,
- const struct stack_st_CONF_VALUE * headers,
+ const STACK_OF(CONF_VALUE) * headers,
const char * content_type, BIO * req,
const char * expected_content_type,
int expect_asn1, size_t max_resp_len,
diff --git a/src/amisslext_glue.h b/src/amisslext_glue.h
index 7ad8df91b..49afa6151 100644
--- a/src/amisslext_glue.h
+++ b/src/amisslext_glue.h
@@ -1058,7 +1058,7 @@ const char * SAVEDS ASM LIB_SSL_get0_group_name(REG(a6, __IFACE_OR_BASE), REG(a0
int SAVEDS ASM LIB_SSL_is_stream_local(REG(a6, __IFACE_OR_BASE), REG(a0, SSL * s));
const BIO_METHOD * SAVEDS ASM LIB_BIO_f_zlib(REG(a6, __IFACE_OR_BASE));
void SAVEDS ASM LIB_X509_PUBKEY_set0_public_key(REG(a6, __IFACE_OR_BASE), REG(a0, X509_PUBKEY * pub), REG(a1, unsigned char * penc), REG(d0, int penclen));
-void SAVEDS ASM LIB_OSSL_STACK_OF_X509_free(REG(a6, __IFACE_OR_BASE), REG(a0, struct stack_st_X509 * certs));
+void SAVEDS ASM LIB_OSSL_STACK_OF_X509_free(REG(a6, __IFACE_OR_BASE), REG(a0, STACK_OF(X509) * certs));
int SAVEDS ASM LIB_OSSL_trace_string(REG(a6, __IFACE_OR_BASE), REG(a0, BIO * out), REG(d0, int text), REG(d1, int full), REG(a1, const unsigned char * data), REG(d2, size_t size));
BIGNUM * SAVEDS ASM LIB_BN_signed_bin2bn(REG(a6, __IFACE_OR_BASE), REG(a0, const unsigned char * s), REG(d0, int len), REG(a1, BIGNUM * ret));
int SAVEDS ASM LIB_BN_signed_bn2bin(REG(a6, __IFACE_OR_BASE), REG(a0, const BIGNUM * a), REG(a1, unsigned char * to), REG(d0, int tolen));
@@ -1069,9 +1069,9 @@ int SAVEDS ASM LIB_BN_signed_bn2native(REG(a6, __IFACE_OR_BASE), REG(a0, const B
int SAVEDS ASM LIB_ASYNC_set_mem_functions(REG(a6, __IFACE_OR_BASE), REG(a0, ASYNC_stack_alloc_fn alloc_fn), REG(a1, ASYNC_stack_free_fn free_fn));
void SAVEDS ASM LIB_ASYNC_get_mem_functions(REG(a6, __IFACE_OR_BASE), REG(a0, ASYNC_stack_alloc_fn * alloc_fn), REG(a1, ASYNC_stack_free_fn * free_fn));
BIO_ADDR * SAVEDS ASM LIB_BIO_ADDR_dup(REG(a6, __IFACE_OR_BASE), REG(a0, const BIO_ADDR * ap));
-OSSL_CMP_ITAV * SAVEDS ASM LIB_OSSL_CMP_ITAV_new_caCerts(REG(a6, __IFACE_OR_BASE), REG(a0, const struct stack_st_X509 * caCerts));
-int SAVEDS ASM LIB_OSSL_CMP_ITAV_get0_caCerts(REG(a6, __IFACE_OR_BASE), REG(a0, const OSSL_CMP_ITAV * itav), REG(a1, struct stack_st_X509 ** out));
-int SAVEDS ASM LIB_OSSL_CMP_get1_caCerts(REG(a6, __IFACE_OR_BASE), REG(a0, OSSL_CMP_CTX * ctx), REG(a1, struct stack_st_X509 ** out));
+OSSL_CMP_ITAV * SAVEDS ASM LIB_OSSL_CMP_ITAV_new_caCerts(REG(a6, __IFACE_OR_BASE), REG(a0, const STACK_OF(X509) * caCerts));
+int SAVEDS ASM LIB_OSSL_CMP_ITAV_get0_caCerts(REG(a6, __IFACE_OR_BASE), REG(a0, const OSSL_CMP_ITAV * itav), REG(a1, STACK_OF(X509) ** out));
+int SAVEDS ASM LIB_OSSL_CMP_get1_caCerts(REG(a6, __IFACE_OR_BASE), REG(a0, OSSL_CMP_CTX * ctx), REG(a1, STACK_OF(X509) ** out));
OSSL_CMP_ITAV * SAVEDS ASM LIB_OSSL_CMP_ITAV_new_rootCaCert(REG(a6, __IFACE_OR_BASE), REG(a0, const X509 * rootCaCert));
int SAVEDS ASM LIB_OSSL_CMP_ITAV_get0_rootCaCert(REG(a6, __IFACE_OR_BASE), REG(a0, const OSSL_CMP_ITAV * itav), REG(a1, X509 ** out));
OSSL_CMP_ITAV * SAVEDS ASM LIB_OSSL_CMP_ITAV_new_rootCaKeyUpdate(REG(a6, __IFACE_OR_BASE), REG(a0, const X509 * newWithNew), REG(a1, const X509 * newWithOld), REG(a2, const X509 * oldWithNew));
@@ -1087,7 +1087,7 @@ const ASN1_ITEM * SAVEDS ASM LIB_CMS_EnvelopedData_it(REG(a6, __IFACE_OR_BASE));
BIO * SAVEDS ASM LIB_CMS_EnvelopedData_decrypt(REG(a6, __IFACE_OR_BASE), REG(a0, CMS_EnvelopedData * env), REG(a1, BIO * detached_data), REG(a2, EVP_PKEY * pkey), REG(a3, X509 * cert), REG(d0, ASN1_OCTET_STRING * secret), REG(d1, unsigned int flags), REG(d2, OSSL_LIB_CTX * libctx), REG(d3, const char * propq));
void SAVEDS ASM LIB_CMS_SignedData_free(REG(a6, __IFACE_OR_BASE), REG(a0, CMS_SignedData * a));
CMS_SignedData * SAVEDS ASM LIB_CMS_SignedData_new(REG(a6, __IFACE_OR_BASE));
-BIO * SAVEDS ASM LIB_CMS_SignedData_verify(REG(a6, __IFACE_OR_BASE), REG(a0, CMS_SignedData * sd), REG(a1, BIO * detached_data), REG(a2, struct stack_st_X509 * scerts), REG(a3, X509_STORE * store), REG(d0, struct stack_st_X509 * extra), REG(d1, struct stack_st_X509_CRL * crls), REG(d2, unsigned int flags), REG(d3, OSSL_LIB_CTX * libctx), REG(d4, const char * propq));
+BIO * SAVEDS ASM LIB_CMS_SignedData_verify(REG(a6, __IFACE_OR_BASE), REG(a0, CMS_SignedData * sd), REG(a1, BIO * detached_data), REG(a2, STACK_OF(X509) * scerts), REG(a3, X509_STORE * store), REG(d0, STACK_OF(X509) * extra), REG(d1, STACK_OF(X509_CRL) * crls), REG(d2, unsigned int flags), REG(d3, OSSL_LIB_CTX * libctx), REG(d4, const char * propq));
const BIO_METHOD * SAVEDS ASM LIB_BIO_s_dgram_mem(REG(a6, __IFACE_OR_BASE));
int SAVEDS ASM LIB_BIO_recvmmsg(REG(a6, __IFACE_OR_BASE), REG(a0, BIO * b), REG(a1, BIO_MSG * msg), REG(d0, size_t stride), REG(d1, size_t num_msg), REG(d2, uint64_t flags), REG(a2, size_t * msgs_processed));
int SAVEDS ASM LIB_BIO_sendmmsg(REG(a6, __IFACE_OR_BASE), REG(a0, BIO * b), REG(a1, BIO_MSG * msg), REG(d0, size_t stride), REG(d1, size_t num_msg), REG(d2, uint64_t flags), REG(a2, size_t * msgs_processed));
@@ -1100,8 +1100,8 @@ const BIO_METHOD * SAVEDS ASM LIB_BIO_s_dgram_pair(REG(a6, __IFACE_OR_BASE));
int SAVEDS ASM LIB_BIO_new_bio_dgram_pair(REG(a6, __IFACE_OR_BASE), REG(a0, BIO ** bio1), REG(d0, size_t writebuf1), REG(a1, BIO ** bio2), REG(d1, size_t writebuf2));
int SAVEDS ASM LIB_EVP_PKEY_auth_encapsulate_init(REG(a6, __IFACE_OR_BASE), REG(a0, EVP_PKEY_CTX * ctx), REG(a1, EVP_PKEY * authpriv), REG(a2, const OSSL_PARAM * params));
int SAVEDS ASM LIB_EVP_PKEY_auth_decapsulate_init(REG(a6, __IFACE_OR_BASE), REG(a0, EVP_PKEY_CTX * ctx), REG(a1, EVP_PKEY * authpub), REG(a2, const OSSL_PARAM * params));
-void SAVEDS ASM LIB_PKCS12_SAFEBAG_set0_attrs(REG(a6, __IFACE_OR_BASE), REG(a0, PKCS12_SAFEBAG * bag), REG(a1, struct stack_st_X509_ATTRIBUTE * attrs));
-PKCS12 * SAVEDS ASM LIB_PKCS12_create_ex2_amiga_1(REG(a6, __IFACE_OR_BASE), REG(a0, const char * pass), REG(a1, const char * name), REG(a2, EVP_PKEY * pkey), REG(a3, X509 * cert), REG(d0, struct stack_st_X509 * ca), REG(d1, int nid_key), REG(d2, int nid_cert), REG(d3, void * moreargs));
+void SAVEDS ASM LIB_PKCS12_SAFEBAG_set0_attrs(REG(a6, __IFACE_OR_BASE), REG(a0, PKCS12_SAFEBAG * bag), REG(a1, STACK_OF(X509_ATTRIBUTE) * attrs));
+PKCS12 * SAVEDS ASM LIB_PKCS12_create_ex2_amiga_1(REG(a6, __IFACE_OR_BASE), REG(a0, const char * pass), REG(a1, const char * name), REG(a2, EVP_PKEY * pkey), REG(a3, X509 * cert), REG(d0, STACK_OF(X509) * ca), REG(d1, int nid_key), REG(d2, int nid_cert), REG(d3, void * moreargs));
void * SAVEDS ASM LIB_PKCS12_create_ex2_amiga_2(REG(a6, __IFACE_OR_BASE), REG(d0, int iter), REG(d1, int mac_iter), REG(d2, int keytype), REG(a1, OSSL_LIB_CTX * ctx), REG(a2, const char * propq), REG(a3, PKCS12_create_cb * cb), REG(d3, void * cbarg));
void SAVEDS ASM LIB_OSSL_sleep(REG(a6, __IFACE_OR_BASE), REG(d0, uint64_t millis));
uint32_t SAVEDS ASM LIB_OSSL_get_thread_support_flags(REG(a6, __IFACE_OR_BASE));
diff --git a/src/amisslext_m68k.c b/src/amisslext_m68k.c
index 9260ea2be..c5b9aa689 100644
--- a/src/amisslext_m68k.c
+++ b/src/amisslext_m68k.c
@@ -15814,7 +15814,7 @@ STATIC void stub_ext_OSSL_STACK_OF_X509_free_PPC(uint32 *regarray)
struct AmiSSLIFace *Self = (struct AmiSSLIFace *)ExtLib->MainIFace;
Self->OSSL_STACK_OF_X509_free(
- (struct stack_st_X509 *)regarray[REG68K_A0/4]
+ (STACK_OF(X509) *)regarray[REG68K_A0/4]
);
}
STATIC CONST struct EmuTrap stub_ext_OSSL_STACK_OF_X509_free = { TRAPINST, TRAPTYPE, (uint32 (*)(uint32 *))stub_ext_OSSL_STACK_OF_X509_free_PPC };
@@ -15986,7 +15986,7 @@ STATIC OSSL_CMP_ITAV * stub_ext_OSSL_CMP_ITAV_new_caCerts_PPC(uint32 *regarray)
struct AmiSSLIFace *Self = (struct AmiSSLIFace *)ExtLib->MainIFace;
return Self->OSSL_CMP_ITAV_new_caCerts(
- (const struct stack_st_X509 *)regarray[REG68K_A0/4]
+ (const STACK_OF(X509) *)regarray[REG68K_A0/4]
);
}
STATIC CONST struct EmuTrap stub_ext_OSSL_CMP_ITAV_new_caCerts = { TRAPINST, TRAPTYPE, (uint32 (*)(uint32 *))stub_ext_OSSL_CMP_ITAV_new_caCerts_PPC };
@@ -16001,7 +16001,7 @@ STATIC int stub_ext_OSSL_CMP_ITAV_get0_caCerts_PPC(uint32 *regarray)
return Self->OSSL_CMP_ITAV_get0_caCerts(
(const OSSL_CMP_ITAV *)regarray[REG68K_A0/4],
- (struct stack_st_X509 **)regarray[REG68K_A1/4]
+ (STACK_OF(X509) **)regarray[REG68K_A1/4]
);
}
STATIC CONST struct EmuTrap stub_ext_OSSL_CMP_ITAV_get0_caCerts = { TRAPINST, TRAPTYPE, (uint32 (*)(uint32 *))stub_ext_OSSL_CMP_ITAV_get0_caCerts_PPC };
@@ -16016,7 +16016,7 @@ STATIC int stub_ext_OSSL_CMP_get1_caCerts_PPC(uint32 *regarray)
return Self->OSSL_CMP_get1_caCerts(
(OSSL_CMP_CTX *)regarray[REG68K_A0/4],
- (struct stack_st_X509 **)regarray[REG68K_A1/4]
+ (STACK_OF(X509) **)regarray[REG68K_A1/4]
);
}
STATIC CONST struct EmuTrap stub_ext_OSSL_CMP_get1_caCerts = { TRAPINST, TRAPTYPE, (uint32 (*)(uint32 *))stub_ext_OSSL_CMP_get1_caCerts_PPC };
@@ -16260,10 +16260,10 @@ STATIC BIO * stub_ext_CMS_SignedData_verify_PPC(uint32 *regarray)
return Self->CMS_SignedData_verify(
(CMS_SignedData *)regarray[REG68K_A0/4],
(BIO *)regarray[REG68K_A1/4],
- (struct stack_st_X509 *)regarray[REG68K_A2/4],
+ (STACK_OF(X509) *)regarray[REG68K_A2/4],
(X509_STORE *)regarray[REG68K_A3/4],
- (struct stack_st_X509 *)regarray[REG68K_D0/4],
- (struct stack_st_X509_CRL *)regarray[REG68K_D1/4],
+ (STACK_OF(X509) *)regarray[REG68K_D0/4],
+ (STACK_OF(X509_CRL) *)regarray[REG68K_D1/4],
(unsigned int)regarray[REG68K_D2/4],
(OSSL_LIB_CTX *)regarray[REG68K_D3/4],
(const char *)regarray[REG68K_D4/4]
@@ -16464,7 +16464,7 @@ STATIC void stub_ext_PKCS12_SAFEBAG_set0_attrs_PPC(uint32 *regarray)
Self->PKCS12_SAFEBAG_set0_attrs(
(PKCS12_SAFEBAG *)regarray[REG68K_A0/4],
- (struct stack_st_X509_ATTRIBUTE *)regarray[REG68K_A1/4]
+ (STACK_OF(X509_ATTRIBUTE) *)regarray[REG68K_A1/4]
);
}
STATIC CONST struct EmuTrap stub_ext_PKCS12_SAFEBAG_set0_attrs = { TRAPINST, TRAPTYPE, (uint32 (*)(uint32 *))stub_ext_PKCS12_SAFEBAG_set0_attrs_PPC };
@@ -16482,7 +16482,7 @@ STATIC PKCS12 * stub_ext_PKCS12_create_ex2_amiga_1_PPC(uint32 *regarray)
(const char *)regarray[REG68K_A1/4],
(EVP_PKEY *)regarray[REG68K_A2/4],
(X509 *)regarray[REG68K_A3/4],
- (struct stack_st_X509 *)regarray[REG68K_D0/4],
+ (STACK_OF(X509) *)regarray[REG68K_D0/4],
(int)regarray[REG68K_D1/4],
(int)regarray[REG68K_D2/4],
(void *)regarray[REG68K_D3/4]
diff --git a/src/amisslext_stubs_mos.c b/src/amisslext_stubs_mos.c
index 3c248b699..f9db33151 100644
--- a/src/amisslext_stubs_mos.c
+++ b/src/amisslext_stubs_mos.c
@@ -10693,11 +10693,11 @@ void LIBSTUB_X509_PUBKEY_set0_public_key(void)
return LIB_X509_PUBKEY_set0_public_key(_base, ___pub, ___penc, ___penclen);
}
-void LIB_OSSL_STACK_OF_X509_free(struct Library * _base, struct stack_st_X509 * ___certs);
+void LIB_OSSL_STACK_OF_X509_free(struct Library * _base, STACK_OF(X509) * ___certs);
void LIBSTUB_OSSL_STACK_OF_X509_free(void)
{
- struct stack_st_X509 * ___certs = (struct stack_st_X509 *)REG_A0;
+ STACK_OF(X509) * ___certs = (STACK_OF(X509) *)REG_A0;
struct Library * _base = (struct Library *)REG_A6;
return LIB_OSSL_STACK_OF_X509_free(_base, ___certs);
}
@@ -10810,31 +10810,31 @@ BIO_ADDR * LIBSTUB_BIO_ADDR_dup(void)
return LIB_BIO_ADDR_dup(_base, ___ap);
}
-OSSL_CMP_ITAV * LIB_OSSL_CMP_ITAV_new_caCerts(struct Library * _base, const struct stack_st_X509 * ___caCerts);
+OSSL_CMP_ITAV * LIB_OSSL_CMP_ITAV_new_caCerts(struct Library * _base, const STACK_OF(X509) * ___caCerts);
OSSL_CMP_ITAV * LIBSTUB_OSSL_CMP_ITAV_new_caCerts(void)
{
- const struct stack_st_X509 * ___caCerts = (const struct stack_st_X509 *)REG_A0;
+ const STACK_OF(X509) * ___caCerts = (const STACK_OF(X509) *)REG_A0;
struct Library * _base = (struct Library *)REG_A6;
return LIB_OSSL_CMP_ITAV_new_caCerts(_base, ___caCerts);
}
-int LIB_OSSL_CMP_ITAV_get0_caCerts(struct Library * _base, const OSSL_CMP_ITAV * ___itav, struct stack_st_X509 ** ___out);
+int LIB_OSSL_CMP_ITAV_get0_caCerts(struct Library * _base, const OSSL_CMP_ITAV * ___itav, STACK_OF(X509) ** ___out);
int LIBSTUB_OSSL_CMP_ITAV_get0_caCerts(void)
{
const OSSL_CMP_ITAV * ___itav = (const OSSL_CMP_ITAV *)REG_A0;
- struct stack_st_X509 ** ___out = (struct stack_st_X509 **)REG_A1;
+ STACK_OF(X509) ** ___out = (STACK_OF(X509) **)REG_A1;
struct Library * _base = (struct Library *)REG_A6;
return LIB_OSSL_CMP_ITAV_get0_caCerts(_base, ___itav, ___out);
}
-int LIB_OSSL_CMP_get1_caCerts(struct Library * _base, OSSL_CMP_CTX * ___ctx, struct stack_st_X509 ** ___out);
+int LIB_OSSL_CMP_get1_caCerts(struct Library * _base, OSSL_CMP_CTX * ___ctx, STACK_OF(X509) ** ___out);
int LIBSTUB_OSSL_CMP_get1_caCerts(void)
{
OSSL_CMP_CTX * ___ctx = (OSSL_CMP_CTX *)REG_A0;
- struct stack_st_X509 ** ___out = (struct stack_st_X509 **)REG_A1;
+ STACK_OF(X509) ** ___out = (STACK_OF(X509) **)REG_A1;
struct Library * _base = (struct Library *)REG_A6;
return LIB_OSSL_CMP_get1_caCerts(_base, ___ctx, ___out);
}
@@ -10994,16 +10994,16 @@ CMS_SignedData * LIBSTUB_CMS_SignedData_new(void)
return LIB_CMS_SignedData_new(_base);
}
-BIO * LIB_CMS_SignedData_verify(struct Library * _base, CMS_SignedData * ___sd, BIO * ___detached_data, struct stack_st_X509 * ___scerts, X509_STORE * ___store, struct stack_st_X509 * ___extra, struct stack_st_X509_CRL * ___crls, unsigned int ___flags, OSSL_LIB_CTX * ___libctx, const char * ___propq);
+BIO * LIB_CMS_SignedData_verify(struct Library * _base, CMS_SignedData * ___sd, BIO * ___detached_data, STACK_OF(X509) * ___scerts, X509_STORE * ___store, STACK_OF(X509) * ___extra, STACK_OF(X509_CRL) * ___crls, unsigned int ___flags, OSSL_LIB_CTX * ___libctx, const char * ___propq);
BIO * LIBSTUB_CMS_SignedData_verify(void)
{
CMS_SignedData * ___sd = (CMS_SignedData *)REG_A0;
BIO * ___detached_data = (BIO *)REG_A1;
- struct stack_st_X509 * ___scerts = (struct stack_st_X509 *)REG_A2;
+ STACK_OF(X509) * ___scerts = (STACK_OF(X509) *)REG_A2;
X509_STORE * ___store = (X509_STORE *)REG_A3;
- struct stack_st_X509 * ___extra = (struct stack_st_X509 *)REG_D0;
- struct stack_st_X509_CRL * ___crls = (struct stack_st_X509_CRL *)REG_D1;
+ STACK_OF(X509) * ___extra = (STACK_OF(X509) *)REG_D0;
+ STACK_OF(X509_CRL) * ___crls = (STACK_OF(X509_CRL) *)REG_D1;
unsigned int ___flags = (unsigned int)REG_D2;
OSSL_LIB_CTX * ___libctx = (OSSL_LIB_CTX *)REG_D3;
const char * ___propq = (const char *)REG_D4;
@@ -11136,17 +11136,17 @@ int LIBSTUB_EVP_PKEY_auth_decapsulate_init(void)
return LIB_EVP_PKEY_auth_decapsulate_init(_base, ___ctx, ___authpub, ___params);
}
-void LIB_PKCS12_SAFEBAG_set0_attrs(struct Library * _base, PKCS12_SAFEBAG * ___bag, struct stack_st_X509_ATTRIBUTE * ___attrs);
+void LIB_PKCS12_SAFEBAG_set0_attrs(struct Library * _base, PKCS12_SAFEBAG * ___bag, STACK_OF(X509_ATTRIBUTE) * ___attrs);
void LIBSTUB_PKCS12_SAFEBAG_set0_attrs(void)
{
PKCS12_SAFEBAG * ___bag = (PKCS12_SAFEBAG *)REG_A0;
- struct stack_st_X509_ATTRIBUTE * ___attrs = (struct stack_st_X509_ATTRIBUTE *)REG_A1;
+ STACK_OF(X509_ATTRIBUTE) * ___attrs = (STACK_OF(X509_ATTRIBUTE) *)REG_A1;
struct Library * _base = (struct Library *)REG_A6;
return LIB_PKCS12_SAFEBAG_set0_attrs(_base, ___bag, ___attrs);
}
-PKCS12 * LIB_PKCS12_create_ex2_amiga_1(struct Library * _base, const char * ___pass, const char * ___name, EVP_PKEY * ___pkey, X509 * ___cert, struct stack_st_X509 * ___ca, int ___nid_key, int ___nid_cert, void * ___moreargs);
+PKCS12 * LIB_PKCS12_create_ex2_amiga_1(struct Library * _base, const char * ___pass, const char * ___name, EVP_PKEY * ___pkey, X509 * ___cert, STACK_OF(X509) * ___ca, int ___nid_key, int ___nid_cert, void * ___moreargs);
PKCS12 * LIBSTUB_PKCS12_create_ex2_amiga_1(void)
{
@@ -11154,7 +11154,7 @@ PKCS12 * LIBSTUB_PKCS12_create_ex2_amiga_1(void)
const char * ___name = (const char *)REG_A1;
EVP_PKEY * ___pkey = (EVP_PKEY *)REG_A2;
X509 * ___cert = (X509 *)REG_A3;
- struct stack_st_X509 * ___ca = (struct stack_st_X509 *)REG_D0;
+ STACK_OF(X509) * ___ca = (STACK_OF(X509) *)REG_D0;
int ___nid_key = (int)REG_D1;
int ___nid_cert = (int)REG_D2;
void * ___moreargs = (void *)REG_D3;