Fixed types in new API functions

jens-maus · May 10, 2024 · 2046314 · 2046314
1 parent ca03fac
commit 2046314
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 64 deletions.
diff --git a/include/defines/amisslext.h b/include/defines/amisslext.h
@@ -7343,24 +7343,24 @@ typedef ULONG _sfdc_vararg;
      struct Library *, AMISSLEXT_BASE_NAME, 1127, Amisslext)
 
 #define OSSL_CMP_CTX_get0_geninfo_ITAVs(___ctx) \
-      AROS_LC1(struct stack_st_OSSL_CMP_ITAV *, OSSL_CMP_CTX_get0_geninfo_ITAVs, \
+      AROS_LC1(STACK_OF(OSSL_CMP_ITAV) *, OSSL_CMP_CTX_get0_geninfo_ITAVs, \
  AROS_LCA(const OSSL_CMP_CTX *, (___ctx), A0), \
      struct Library *, AMISSLEXT_BASE_NAME, 1128, Amisslext)
 
 #define OSSL_CMP_HDR_get0_geninfo_ITAVs(___hdr) \
-      AROS_LC1(struct stack_st_OSSL_CMP_ITAV *, OSSL_CMP_HDR_get0_geninfo_ITAVs, \
+      AROS_LC1(STACK_OF(OSSL_CMP_ITAV) *, OSSL_CMP_HDR_get0_geninfo_ITAVs, \
  AROS_LCA(const OSSL_CMP_PKIHEADER *, (___hdr), A0), \
      struct Library *, AMISSLEXT_BASE_NAME, 1129, Amisslext)
 
 #define OSSL_CMP_ITAV_new0_certProfile(___certProfile) \
       AROS_LC1(OSSL_CMP_ITAV *, OSSL_CMP_ITAV_new0_certProfile, \
- AROS_LCA(struct stack_st_ASN1_UTF8STRING *, (___certProfile), A0), \
+ AROS_LCA(STACK_OF(ASN1_UTF8STRING) *, (___certProfile), A0), \
      struct Library *, AMISSLEXT_BASE_NAME, 1130, Amisslext)
 
 #define OSSL_CMP_ITAV_get0_certProfile(___itav, ___out) \
       AROS_LC2(int, OSSL_CMP_ITAV_get0_certProfile, \
  AROS_LCA(const OSSL_CMP_ITAV *, (___itav), A0), \
- AROS_LCA(struct stack_st_ASN1_UTF8STRING **, (___out), A1), \
+ AROS_LCA(STACK_OF(ASN1_UTF8STRING) **, (___out), A1), \
      struct Library *, AMISSLEXT_BASE_NAME, 1131, Amisslext)
 
 #define OSSL_CMP_MSG_get0_certreq_publickey(___msg) \
@@ -7387,7 +7387,7 @@ typedef ULONG _sfdc_vararg;
      struct Library *, AMISSLEXT_BASE_NAME, 1135, Amisslext)
 
 #define X509_STORE_get1_objects(___xs) \
-      AROS_LC1(struct stack_st_X509_OBJECT *, X509_STORE_get1_objects, \
+      AROS_LC1(STACK_OF(X509_OBJECT) *, X509_STORE_get1_objects, \
  AROS_LCA(X509_STORE *, (___xs), A0), \
      struct Library *, AMISSLEXT_BASE_NAME, 1136, Amisslext)
 

diff --git a/include/inline/amisslext.h b/include/inline/amisslext.h
@@ -4523,19 +4523,19 @@ typedef ULONG _sfdc_vararg;
       , AMISSLEXT_BASE_NAME)
 
 #define OSSL_CMP_CTX_get0_geninfo_ITAVs(___ctx) \
-      LP1(0x1a70, struct stack_st_OSSL_CMP_ITAV *, OSSL_CMP_CTX_get0_geninfo_ITAVs , const OSSL_CMP_CTX *, ___ctx, a0,\
+      LP1(0x1a70, STACK_OF(OSSL_CMP_ITAV) *, OSSL_CMP_CTX_get0_geninfo_ITAVs , const OSSL_CMP_CTX *, ___ctx, a0,\
       , AMISSLEXT_BASE_NAME)
 
 #define OSSL_CMP_HDR_get0_geninfo_ITAVs(___hdr) \
-      LP1(0x1a76, struct stack_st_OSSL_CMP_ITAV *, OSSL_CMP_HDR_get0_geninfo_ITAVs , const OSSL_CMP_PKIHEADER *, ___hdr, a0,\
+      LP1(0x1a76, STACK_OF(OSSL_CMP_ITAV) *, OSSL_CMP_HDR_get0_geninfo_ITAVs , const OSSL_CMP_PKIHEADER *, ___hdr, a0,\
       , AMISSLEXT_BASE_NAME)
 
 #define OSSL_CMP_ITAV_new0_certProfile(___certProfile) \
-      LP1(0x1a7c, OSSL_CMP_ITAV *, OSSL_CMP_ITAV_new0_certProfile , struct stack_st_ASN1_UTF8STRING *, ___certProfile, a0,\
+      LP1(0x1a7c, OSSL_CMP_ITAV *, OSSL_CMP_ITAV_new0_certProfile , STACK_OF(ASN1_UTF8STRING) *, ___certProfile, a0,\
       , AMISSLEXT_BASE_NAME)
 
 #define OSSL_CMP_ITAV_get0_certProfile(___itav, ___out) \
-      LP2(0x1a82, int, OSSL_CMP_ITAV_get0_certProfile , const OSSL_CMP_ITAV *, ___itav, a0, struct stack_st_ASN1_UTF8STRING **, ___out, a1,\
+      LP2(0x1a82, int, OSSL_CMP_ITAV_get0_certProfile , const OSSL_CMP_ITAV *, ___itav, a0, STACK_OF(ASN1_UTF8STRING) **, ___out, a1,\
       , AMISSLEXT_BASE_NAME)
 
 #define OSSL_CMP_MSG_get0_certreq_publickey(___msg) \
@@ -4555,7 +4555,7 @@ typedef ULONG _sfdc_vararg;
       , AMISSLEXT_BASE_NAME)
 
 #define X509_STORE_get1_objects(___xs) \
-      LP1(0x1aa0, struct stack_st_X509_OBJECT *, X509_STORE_get1_objects , X509_STORE *, ___xs, a0,\
+      LP1(0x1aa0, STACK_OF(X509_OBJECT) *, X509_STORE_get1_objects , X509_STORE *, ___xs, a0,\
       , AMISSLEXT_BASE_NAME)
 
 #define OPENSSL_LH_set_thunks(___lh, ___hw, ___cw, ___daw, ___daaw) \

diff --git a/include/inline/amisslext_protos.h b/include/inline/amisslext_protos.h
@@ -3391,16 +3391,16 @@ time_t __SSL_SESSION_get_time_ex(__reg("a6") struct Library * , __reg("a0") cons
 time_t __SSL_SESSION_set_time_ex(__reg("a6") struct Library * , __reg("a0") SSL_SESSION * s , __reg("d0") time_t t ) = "\tjsr\t-6762(a6)";
 #define SSL_SESSION_set_time_ex(s, t) __SSL_SESSION_set_time_ex(AmiSSLExtBase, (s), (t))
 
-struct stack_st_OSSL_CMP_ITAV * __OSSL_CMP_CTX_get0_geninfo_ITAVs(__reg("a6") struct Library * , __reg("a0") const OSSL_CMP_CTX * ctx ) = "\tjsr\t-6768(a6)";
+STACK_OF(OSSL_CMP_ITAV) * __OSSL_CMP_CTX_get0_geninfo_ITAVs(__reg("a6") struct Library * , __reg("a0") const OSSL_CMP_CTX * ctx ) = "\tjsr\t-6768(a6)";
 #define OSSL_CMP_CTX_get0_geninfo_ITAVs(ctx) __OSSL_CMP_CTX_get0_geninfo_ITAVs(AmiSSLExtBase, (ctx))
 
-struct stack_st_OSSL_CMP_ITAV * __OSSL_CMP_HDR_get0_geninfo_ITAVs(__reg("a6") struct Library * , __reg("a0") const OSSL_CMP_PKIHEADER * hdr ) = "\tjsr\t-6774(a6)";
+STACK_OF(OSSL_CMP_ITAV) * __OSSL_CMP_HDR_get0_geninfo_ITAVs(__reg("a6") struct Library * , __reg("a0") const OSSL_CMP_PKIHEADER * hdr ) = "\tjsr\t-6774(a6)";
 #define OSSL_CMP_HDR_get0_geninfo_ITAVs(hdr) __OSSL_CMP_HDR_get0_geninfo_ITAVs(AmiSSLExtBase, (hdr))
 
-OSSL_CMP_ITAV * __OSSL_CMP_ITAV_new0_certProfile(__reg("a6") struct Library * , __reg("a0") struct stack_st_ASN1_UTF8STRING * certProfile ) = "\tjsr\t-6780(a6)";
+OSSL_CMP_ITAV * __OSSL_CMP_ITAV_new0_certProfile(__reg("a6") struct Library * , __reg("a0") STACK_OF(ASN1_UTF8STRING) * certProfile ) = "\tjsr\t-6780(a6)";
 #define OSSL_CMP_ITAV_new0_certProfile(certProfile) __OSSL_CMP_ITAV_new0_certProfile(AmiSSLExtBase, (certProfile))
 
-int __OSSL_CMP_ITAV_get0_certProfile(__reg("a6") struct Library * , __reg("a0") const OSSL_CMP_ITAV * itav , __reg("a1") struct stack_st_ASN1_UTF8STRING ** out ) = "\tjsr\t-6786(a6)";
+int __OSSL_CMP_ITAV_get0_certProfile(__reg("a6") struct Library * , __reg("a0") const OSSL_CMP_ITAV * itav , __reg("a1") STACK_OF(ASN1_UTF8STRING) ** out ) = "\tjsr\t-6786(a6)";
 #define OSSL_CMP_ITAV_get0_certProfile(itav, out) __OSSL_CMP_ITAV_get0_certProfile(AmiSSLExtBase, (itav), (out))
 
 X509_PUBKEY * __OSSL_CMP_MSG_get0_certreq_publickey(__reg("a6") struct Library * , __reg("a0") const OSSL_CMP_MSG * msg ) = "\tjsr\t-6792(a6)";
@@ -3415,7 +3415,7 @@ int __EVP_DigestSqueeze(__reg("a6") struct Library * , __reg("a0") EVP_MD_CTX *
 int __ERR_pop(__reg("a6") struct Library * ) = "\tjsr\t-6810(a6)";
 #define ERR_pop() __ERR_pop(AmiSSLExtBase)
 
-struct stack_st_X509_OBJECT * __X509_STORE_get1_objects(__reg("a6") struct Library * , __reg("a0") X509_STORE * xs ) = "\tjsr\t-6816(a6)";
+STACK_OF(X509_OBJECT) * __X509_STORE_get1_objects(__reg("a6") struct Library * , __reg("a0") X509_STORE * xs ) = "\tjsr\t-6816(a6)";
 #define X509_STORE_get1_objects(xs) __X509_STORE_get1_objects(AmiSSLExtBase, (xs))
 
 OPENSSL_LHASH * __OPENSSL_LH_set_thunks(__reg("a6") struct Library * , __reg("a0") OPENSSL_LHASH * lh , __reg("a1") OPENSSL_LH_HASHFUNCTHUNK hw , __reg("a2") OPENSSL_LH_COMPFUNCTHUNK cw , __reg("a3") OPENSSL_LH_DOALL_FUNC_THUNK daw , __reg("d0") OPENSSL_LH_DOALL_FUNCARG_THUNK daaw ) = "\tjsr\t-6822(a6)";

diff --git a/include/interfaces/amissl.h b/include/interfaces/amissl.h
@@ -6627,15 +6627,15 @@ struct AmiSSLIFace
 	APICALL int (*SSL_poll)(struct AmiSSLIFace *Self, SSL_POLL_ITEM * items, size_t num_items, size_t stride, const struct timeval * timeout, uint64_t flags, size_t * result_count);
 	APICALL time_t (*SSL_SESSION_get_time_ex)(struct AmiSSLIFace *Self, const SSL_SESSION * s);
 	APICALL time_t (*SSL_SESSION_set_time_ex)(struct AmiSSLIFace *Self, SSL_SESSION * s, time_t t);
-	APICALL struct stack_st_OSSL_CMP_ITAV * (*OSSL_CMP_CTX_get0_geninfo_ITAVs)(struct AmiSSLIFace *Self, const OSSL_CMP_CTX * ctx);
-	APICALL struct stack_st_OSSL_CMP_ITAV * (*OSSL_CMP_HDR_get0_geninfo_ITAVs)(struct AmiSSLIFace *Self, const OSSL_CMP_PKIHEADER * hdr);
-	APICALL OSSL_CMP_ITAV * (*OSSL_CMP_ITAV_new0_certProfile)(struct AmiSSLIFace *Self, struct stack_st_ASN1_UTF8STRING * certProfile);
-	APICALL int (*OSSL_CMP_ITAV_get0_certProfile)(struct AmiSSLIFace *Self, const OSSL_CMP_ITAV * itav, struct stack_st_ASN1_UTF8STRING ** out);
+	APICALL STACK_OF(OSSL_CMP_ITAV) * (*OSSL_CMP_CTX_get0_geninfo_ITAVs)(struct AmiSSLIFace *Self, const OSSL_CMP_CTX * ctx);
+	APICALL STACK_OF(OSSL_CMP_ITAV) * (*OSSL_CMP_HDR_get0_geninfo_ITAVs)(struct AmiSSLIFace *Self, const OSSL_CMP_PKIHEADER * hdr);
+	APICALL OSSL_CMP_ITAV * (*OSSL_CMP_ITAV_new0_certProfile)(struct AmiSSLIFace *Self, STACK_OF(ASN1_UTF8STRING) * certProfile);
+	APICALL int (*OSSL_CMP_ITAV_get0_certProfile)(struct AmiSSLIFace *Self, const OSSL_CMP_ITAV * itav, STACK_OF(ASN1_UTF8STRING) ** out);
 	APICALL X509_PUBKEY * (*OSSL_CMP_MSG_get0_certreq_publickey)(struct AmiSSLIFace *Self, const OSSL_CMP_MSG * msg);
 	APICALL int (*OSSL_CMP_SRV_CTX_init_trans)(struct AmiSSLIFace *Self, OSSL_CMP_SRV_CTX * srv_ctx, OSSL_CMP_SRV_delayed_delivery_cb_t delay, OSSL_CMP_SRV_clean_transaction_cb_t clean);
 	APICALL int (*EVP_DigestSqueeze)(struct AmiSSLIFace *Self, EVP_MD_CTX * ctx, unsigned char * out, size_t outlen);
 	APICALL int (*ERR_pop)(struct AmiSSLIFace *Self);
-	APICALL struct stack_st_X509_OBJECT * (*X509_STORE_get1_objects)(struct AmiSSLIFace *Self, X509_STORE * xs);
+	APICALL STACK_OF(X509_OBJECT) * (*X509_STORE_get1_objects)(struct AmiSSLIFace *Self, X509_STORE * xs);
 	APICALL OPENSSL_LHASH * (*OPENSSL_LH_set_thunks)(struct AmiSSLIFace *Self, OPENSSL_LHASH * lh, OPENSSL_LH_HASHFUNCTHUNK hw, OPENSSL_LH_COMPFUNCTHUNK cw, OPENSSL_LH_DOALL_FUNC_THUNK daw, OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
 	APICALL void (*OPENSSL_LH_doall_arg_thunk)(struct AmiSSLIFace *Self, OPENSSL_LHASH * lh, OPENSSL_LH_DOALL_FUNCARG_THUNK daaw, OPENSSL_LH_DOALL_FUNCARG fn, void * arg);
 	APICALL void (*OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines)(struct AmiSSLIFace *Self, OSSL_HTTP_REQ_CTX * rctx, size_t count);

diff --git a/include/ppcinline/amisslext.h b/include/ppcinline/amisslext.h
@@ -4523,19 +4523,19 @@ typedef ULONG _sfdc_vararg;
       , AMISSLEXT_BASE_NAME, 0, 0, 0, 0, 0, 0)
 
 #define OSSL_CMP_CTX_get0_geninfo_ITAVs(___ctx) \
-      LP1(0x1a70, struct stack_st_OSSL_CMP_ITAV *, OSSL_CMP_CTX_get0_geninfo_ITAVs , const OSSL_CMP_CTX *, ___ctx, a0,\
+      LP1(0x1a70, STACK_OF(OSSL_CMP_ITAV) *, OSSL_CMP_CTX_get0_geninfo_ITAVs , const OSSL_CMP_CTX *, ___ctx, a0,\
       , AMISSLEXT_BASE_NAME, 0, 0, 0, 0, 0, 0)
 
 #define OSSL_CMP_HDR_get0_geninfo_ITAVs(___hdr) \
-      LP1(0x1a76, struct stack_st_OSSL_CMP_ITAV *, OSSL_CMP_HDR_get0_geninfo_ITAVs , const OSSL_CMP_PKIHEADER *, ___hdr, a0,\
+      LP1(0x1a76, STACK_OF(OSSL_CMP_ITAV) *, OSSL_CMP_HDR_get0_geninfo_ITAVs , const OSSL_CMP_PKIHEADER *, ___hdr, a0,\
       , AMISSLEXT_BASE_NAME, 0, 0, 0, 0, 0, 0)
 
 #define OSSL_CMP_ITAV_new0_certProfile(___certProfile) \
-      LP1(0x1a7c, OSSL_CMP_ITAV *, OSSL_CMP_ITAV_new0_certProfile , struct stack_st_ASN1_UTF8STRING *, ___certProfile, a0,\
+      LP1(0x1a7c, OSSL_CMP_ITAV *, OSSL_CMP_ITAV_new0_certProfile , STACK_OF(ASN1_UTF8STRING) *, ___certProfile, a0,\
       , AMISSLEXT_BASE_NAME, 0, 0, 0, 0, 0, 0)
 
 #define OSSL_CMP_ITAV_get0_certProfile(___itav, ___out) \
-      LP2(0x1a82, int, OSSL_CMP_ITAV_get0_certProfile , const OSSL_CMP_ITAV *, ___itav, a0, struct stack_st_ASN1_UTF8STRING **, ___out, a1,\
+      LP2(0x1a82, int, OSSL_CMP_ITAV_get0_certProfile , const OSSL_CMP_ITAV *, ___itav, a0, STACK_OF(ASN1_UTF8STRING) **, ___out, a1,\
       , AMISSLEXT_BASE_NAME, 0, 0, 0, 0, 0, 0)
 
 #define OSSL_CMP_MSG_get0_certreq_publickey(___msg) \
@@ -4555,7 +4555,7 @@ typedef ULONG _sfdc_vararg;
       , AMISSLEXT_BASE_NAME, 0, 0, 0, 0, 0, 0)
 
 #define X509_STORE_get1_objects(___xs) \
-      LP1(0x1aa0, struct stack_st_X509_OBJECT *, X509_STORE_get1_objects , X509_STORE *, ___xs, a0,\
+      LP1(0x1aa0, STACK_OF(X509_OBJECT) *, X509_STORE_get1_objects , X509_STORE *, ___xs, a0,\
       , AMISSLEXT_BASE_NAME, 0, 0, 0, 0, 0, 0)
 
 #define OPENSSL_LH_set_thunks(___lh, ___hw, ___cw, ___daw, ___daaw) \

diff --git a/include/sfd/amisslext_lib.sfd b/include/sfd/amisslext_lib.sfd
@@ -1133,15 +1133,15 @@ int SSL_set_value_uint(SSL * s, uint32_t class_, uint32_t id, uint64_t v) (a0,d0
 int SSL_poll(SSL_POLL_ITEM * items, size_t num_items, size_t stride, const struct timeval * timeout, uint64_t flags, size_t * result_count) (a0,d0,d1,a1,d2-d3,a2)
 time_t SSL_SESSION_get_time_ex(const SSL_SESSION * s) (a0)
 time_t SSL_SESSION_set_time_ex(SSL_SESSION * s, time_t t) (a0,d0)
-struct stack_st_OSSL_CMP_ITAV * OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX * ctx) (a0)
-struct stack_st_OSSL_CMP_ITAV * OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER * hdr) (a0)
-OSSL_CMP_ITAV * OSSL_CMP_ITAV_new0_certProfile(struct stack_st_ASN1_UTF8STRING * certProfile) (a0)
-int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV * itav, struct stack_st_ASN1_UTF8STRING ** out) (a0,a1)
+STACK_OF(OSSL_CMP_ITAV) * OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX * ctx) (a0)
+STACK_OF(OSSL_CMP_ITAV) * OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER * hdr) (a0)
+OSSL_CMP_ITAV * OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING) * certProfile) (a0)
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV * itav, STACK_OF(ASN1_UTF8STRING) ** out) (a0,a1)
 X509_PUBKEY * OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG * msg) (a0)
 int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX * srv_ctx, OSSL_CMP_SRV_delayed_delivery_cb_t delay, OSSL_CMP_SRV_clean_transaction_cb_t clean) (a0,a1,a2)
 int EVP_DigestSqueeze(EVP_MD_CTX * ctx, unsigned char * out, size_t outlen) (a0,a1,d0)
 int ERR_pop() ()
-struct stack_st_X509_OBJECT * X509_STORE_get1_objects(X509_STORE * xs) (a0)
+STACK_OF(X509_OBJECT) * X509_STORE_get1_objects(X509_STORE * xs) (a0)
 OPENSSL_LHASH * OPENSSL_LH_set_thunks(OPENSSL_LHASH * lh, OPENSSL_LH_HASHFUNCTHUNK hw, OPENSSL_LH_COMPFUNCTHUNK cw, OPENSSL_LH_DOALL_FUNC_THUNK daw, OPENSSL_LH_DOALL_FUNCARG_THUNK daaw) (a0,a1,a2,a3,d0)
 void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH * lh, OPENSSL_LH_DOALL_FUNCARG_THUNK daaw, OPENSSL_LH_DOALL_FUNCARG fn, void * arg) (a0,d0,d1,a1)
 void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX * rctx, size_t count) (a0,d0)

diff --git a/include/xml/amissl.xml b/include/xml/amissl.xml
@@ -27224,7 +27224,7 @@
       <arg name="src" type="const BIO_ADDR *" m68kreg="a1"/>
     </method>
 
-    <!-- AmiSSL v5.13 - OpenSSL 3.2.0 -->
+    <!-- AmiSSL v5.14 - OpenSSL 3.3.0 -->
 
     <method name="SSL_write_ex2" result="int">
       <arg name="s" type="SSL *" m68kreg="a0"/>
@@ -27260,18 +27260,18 @@
       <arg name="s" type="SSL_SESSION *" m68kreg="a0"/>
       <arg name="t" type="time_t" m68kreg="d0"/>
     </method>
-    <method name="OSSL_CMP_CTX_get0_geninfo_ITAVs" result="struct stack_st_OSSL_CMP_ITAV *">
+    <method name="OSSL_CMP_CTX_get0_geninfo_ITAVs" result="STACK_OF(OSSL_CMP_ITAV) *">
       <arg name="ctx" type="const OSSL_CMP_CTX *" m68kreg="a0"/>
     </method>
-    <method name="OSSL_CMP_HDR_get0_geninfo_ITAVs" result="struct stack_st_OSSL_CMP_ITAV *">
+    <method name="OSSL_CMP_HDR_get0_geninfo_ITAVs" result="STACK_OF(OSSL_CMP_ITAV) *">
       <arg name="hdr" type="const OSSL_CMP_PKIHEADER *" m68kreg="a0"/>
     </method>
     <method name="OSSL_CMP_ITAV_new0_certProfile" result="OSSL_CMP_ITAV *">
-      <arg name="certProfile" type="struct stack_st_ASN1_UTF8STRING *" m68kreg="a0"/>
+      <arg name="certProfile" type="STACK_OF(ASN1_UTF8STRING) *" m68kreg="a0"/>
     </method>
     <method name="OSSL_CMP_ITAV_get0_certProfile" result="int">
       <arg name="itav" type="const OSSL_CMP_ITAV *" m68kreg="a0"/>
-      <arg name="out" type="struct stack_st_ASN1_UTF8STRING **" m68kreg="a1"/>
+      <arg name="out" type="STACK_OF(ASN1_UTF8STRING) **" m68kreg="a1"/>
     </method>
     <method name="OSSL_CMP_MSG_get0_certreq_publickey" result="X509_PUBKEY *">
       <arg name="msg" type="const OSSL_CMP_MSG *" m68kreg="a0"/>
@@ -27288,7 +27288,7 @@
     </method>
     <method name="ERR_pop" result="int">
     </method>
-    <method name="X509_STORE_get1_objects" result="struct stack_st_X509_OBJECT *">
+    <method name="X509_STORE_get1_objects" result="STACK_OF(X509_OBJECT) *">
       <arg name="xs" type="X509_STORE *" m68kreg="a0"/>
     </method>
     <method name="OPENSSL_LH_set_thunks" result="OPENSSL_LHASH *">

diff --git a/src/amissl_glue.c b/src/amissl_glue.c
@@ -41867,28 +41867,28 @@ time_t SAVEDS ASM LIB_SSL_SESSION_set_time_ex(REG(a6, UNUSED __IFACE_OR_BASE), R
 
 // ---
 
-struct stack_st_OSSL_CMP_ITAV * SAVEDS ASM LIB_OSSL_CMP_CTX_get0_geninfo_ITAVs(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, const OSSL_CMP_CTX * ctx))
+STACK_OF(OSSL_CMP_ITAV) * SAVEDS ASM LIB_OSSL_CMP_CTX_get0_geninfo_ITAVs(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, const OSSL_CMP_CTX * ctx))
 {
 	return OSSL_CMP_CTX_get0_geninfo_ITAVs(ctx);
 }
 
 // ---
 
-struct stack_st_OSSL_CMP_ITAV * SAVEDS ASM LIB_OSSL_CMP_HDR_get0_geninfo_ITAVs(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, const OSSL_CMP_PKIHEADER * hdr))
+STACK_OF(OSSL_CMP_ITAV) * SAVEDS ASM LIB_OSSL_CMP_HDR_get0_geninfo_ITAVs(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, const OSSL_CMP_PKIHEADER * hdr))
 {
 	return OSSL_CMP_HDR_get0_geninfo_ITAVs(hdr);
 }
 
 // ---
 
-OSSL_CMP_ITAV * SAVEDS ASM LIB_OSSL_CMP_ITAV_new0_certProfile(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, struct stack_st_ASN1_UTF8STRING * certProfile))
+OSSL_CMP_ITAV * SAVEDS ASM LIB_OSSL_CMP_ITAV_new0_certProfile(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, STACK_OF(ASN1_UTF8STRING) * certProfile))
 {
 	return OSSL_CMP_ITAV_new0_certProfile(certProfile);
 }
 
 // ---
 
-int SAVEDS ASM LIB_OSSL_CMP_ITAV_get0_certProfile(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, const OSSL_CMP_ITAV * itav), REG(a1, struct stack_st_ASN1_UTF8STRING ** out))
+int SAVEDS ASM LIB_OSSL_CMP_ITAV_get0_certProfile(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, const OSSL_CMP_ITAV * itav), REG(a1, STACK_OF(ASN1_UTF8STRING) ** out))
 {
 	return OSSL_CMP_ITAV_get0_certProfile(itav, out);
 }
@@ -41923,7 +41923,7 @@ int SAVEDS ASM LIB_ERR_pop(REG(a6, UNUSED __IFACE_OR_BASE))
 
 // ---
 
-struct stack_st_X509_OBJECT * SAVEDS ASM LIB_X509_STORE_get1_objects(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, X509_STORE * xs))
+STACK_OF(X509_OBJECT) * SAVEDS ASM LIB_X509_STORE_get1_objects(REG(a6, UNUSED __IFACE_OR_BASE), REG(a0, X509_STORE * xs))
 {
 	return X509_STORE_get1_objects(xs);
 }