Initial OpenSSL 3.6 integration

Author: Futaura

CHANGES.md

@@ -1,3 +1,18 @@
+## AmiSSL 5.25 (x.10.2025)
+
+- Switched to OpenSSL 3.6, with full compatibility with the latest
+  OpenSSL 3.6.0 (1.10.2025) version, which provides new features and
+  improvements, including:
+  + Added NIST security categories for PKEY objects.
+  + Added support for EVP_SKEY opaque symmetric key objects to the key
+    derivation and key exchange provider methods.
+  + Added EVP_KDF_CTX_set_SKEY(), EVP_KDF_derive_SKEY(), and
+    EVP_PKEY_derive_SKEY() functions.
+  + Added LMS signature verification support as per [SP 800-208].
+  + Added an openssl configutl utility for processing the OpenSSL
+    configuration file and dumping the equal configuration file.
+  + Deprecated EVP_PKEY_ASN1_METHOD-related functions.
+
 ## AmiSSL 5.24 (30.9.2025)
 
 - Updated OpenSSL backend to full compatibility with the latest

Makefile

@@ -152,7 +152,7 @@ endif
 # none - because we want to compile with -Wall all the time
 
 VERSION=5
-REVISION=24
+REVISION=25
 
 include openssl/VERSION.dat
 VERSIONNAME=$(MAJOR)$(MINOR)$(PATCH)

README.md

@@ -24,7 +24,7 @@ it being a shared library, it can be used by several Amiga applications at
 the same time, without wasting resources.
 
 AmiSSL v5 is a new major release which has been updated with full
-compatibility with OpenSSL 3.5. This includes important security related
+compatibility with OpenSSL 3.6. This includes important security related
 fixes, a built-in HTTP(S) client and comes with the latest encryption
 ciphers which are required nowadays to connect to modern SSL-based services
 such as HTTPS and SSH.
@@ -79,7 +79,7 @@ A port of the OpenSSL tool is also included and usually installed to `AmiSSL:`
 or `C:` during installation. It is a "command line tool for using the various
 cryptography functions of OpenSSL's crypto library from the shell". The
 documentation for the OpenSSL tool is included in the archive and can also
-be reviewed [online](https://www.openssl.org/docs/man3.5/man1/openssl.html).
+be reviewed [online](https://www.openssl.org/docs/man3.6/man1/openssl.html).
 A sample openssl.cnf file is also installed to `AmiSSL:`, if it doesn't already
 exist, along with the CA.pl helper script, both of which aid the certificate
 generation features of the OpenSSL tool. The tsget.pl script is also included.

README.update-openssl

@@ -33,9 +33,9 @@ HowTo update the OpenSSL version in "openssl/":
 1. To merge in a new OpenSSL version execute the following git command
    within a working copy of the AmiSSL repository:
 
-   $ git subtree pull --prefix openssl --squash https://github.com/openssl/openssl.git openssl-3.5.0
+   $ git subtree pull --prefix openssl --squash https://github.com/openssl/openssl.git openssl-3.6.0
 
-   Note, that "openssl-3.5.0" can be replaced by any branch or tag of
+   Note, that "openssl-3.6.0" can be replaced by any branch or tag of
    the OpenSSL git repository at github.com.
 
    After execution of the above subtree command git will try to merge in all

dist/AmiSSL.readme

@@ -21,7 +21,7 @@ it being a shared library, it can be used by several Amiga applications at
 the same time, without wasting resources.
 
 AmiSSL v5 is a new major release which has been updated with full
-compatibility with OpenSSL 3.5. This includes important security related
+compatibility with OpenSSL 3.6. This includes important security related
 fixes, a built-in HTTP(S) client and comes with the latest encryption
 ciphers which are required nowadays to connect to modern SSL-based services
 such as HTTPS and SSH.
@@ -76,7 +76,7 @@ A port of the OpenSSL tool is also included and usually installed to AmiSSL:
 or C: during installation. It is a "command line tool for using the various
 cryptography functions of OpenSSL's crypto library from the shell". The
 documentation for the OpenSSL tool is included in the archive and can also
-be reviewed online: https://www.openssl.org/docs/man3.5/man1/openssl.html.
+be reviewed online: https://www.openssl.org/docs/man3.6/man1/openssl.html.
 A sample openssl.cnf file is also installed to AmiSSL:, if it doesn't already
 exist, along with the CA.pl helper script, both of which aid the certificate
 generation features of the OpenSSL tool. The tsget.pl script is also included.

include/amissl/inline.h

@@ -2,7 +2,7 @@
 
  AmiSSL - OpenSSL wrapper for AmigaOS-based systems
  Copyright (c) 1999-2006 Andrija Antonijevic, Stefan Burstroem.
- Copyright (c) 2006-2022 AmiSSL Open Source Team.
+ Copyright (c) 2006-2025 AmiSSL Open Source Team.
  All Rights Reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,6 +41,11 @@
     typedef int (*sk_##t1##_compfunc)(const t3 * const *a, const t3 *const *b); \
     typedef void (*sk_##t1##_freefunc)(t3 *a); \
     typedef t3 * (*sk_##t1##_copyfunc)(const t3 *a); \
+    static ossl_inline void sk_##t1##_freefunc_thunk(OPENSSL_sk_freefunc freefunc_arg, void *ptr) \
+    { \
+        sk_##t1##_freefunc freefunc = (sk_##t1##_freefunc) freefunc_arg;\
+        freefunc((t3 *)ptr);\
+    } \
     static ossl_unused ossl_inline int sk_##t1##_num(const STACK_OF(t1) *sk) \
     { \
         return OPENSSL_sk_num((const OPENSSL_STACK *)sk); \
@@ -51,15 +56,23 @@
     } \
     static ossl_unused ossl_inline STACK_OF(t1) *sk_##t1##_new(sk_##t1##_compfunc compare) \
     { \
-        return (STACK_OF(t1) *)OPENSSL_sk_new((OPENSSL_sk_compfunc)compare); \
+        OPENSSL_STACK *ret = OPENSSL_sk_new((OPENSSL_sk_compfunc)compare); \
+        OPENSSL_sk_freefunc_thunk f_thunk; \
+        \
+        f_thunk = (OPENSSL_sk_freefunc_thunk)sk_##t1##_freefunc_thunk; \
+        return (STACK_OF(t1) *)OPENSSL_sk_set_thunks(ret, f_thunk); \
     } \
     static ossl_unused ossl_inline STACK_OF(t1) *sk_##t1##_new_null(void) \
     { \
         return (STACK_OF(t1) *)OPENSSL_sk_new_null(); \
     } \
     static ossl_unused ossl_inline STACK_OF(t1) *sk_##t1##_new_reserve(sk_##t1##_compfunc compare, int n) \
     { \
-        return (STACK_OF(t1) *)OPENSSL_sk_new_reserve((OPENSSL_sk_compfunc)compare, n); \
+        OPENSSL_STACK *ret = OPENSSL_sk_new_reserve((OPENSSL_sk_compfunc)compare, n); \
+        OPENSSL_sk_freefunc_thunk f_thunk; \
+        \
+        f_thunk = (OPENSSL_sk_freefunc_thunk)sk_##t1##_freefunc_thunk; \
+        return (STACK_OF(t1) *)OPENSSL_sk_set_thunks(ret, f_thunk); \
     } \
     static ossl_unused ossl_inline int sk_##t1##_reserve(STACK_OF(t1) *sk, int n) \
     { \
@@ -100,6 +113,11 @@
     } \
     static ossl_unused ossl_inline void sk_##t1##_pop_free(STACK_OF(t1) *sk, sk_##t1##_freefunc freefunc) \
     { \
+        OPENSSL_sk_freefunc_thunk f_thunk; \
+        \
+        f_thunk = (OPENSSL_sk_freefunc_thunk)sk_##t1##_freefunc_thunk; \
+        sk = (STACK_OF(t1) *)OPENSSL_sk_set_thunks((OPENSSL_STACK *)sk, f_thunk); \
+        \
         OPENSSL_sk_pop_free((OPENSSL_STACK *)sk, (OPENSSL_sk_freefunc)freefunc); \
     } \
     static ossl_unused ossl_inline int sk_##t1##_insert(STACK_OF(t1) *sk, t2 *ptr, int idx) \
@@ -148,6 +166,7 @@
     }
 
 DEFINE_SPECIAL_STACK_OF(OPENSSL_PSTRING, OPENSSL_STRING)
+DEFINE_STACK_OF(OCSP_RESPONSE)
 
 # undef DEFINE_LHASH_OF
 # define DEFINE_LHASH_OF(type) \

include/defines/amissl.h

@@ -23652,10 +23652,10 @@ typedef ULONG _sfdc_vararg;
  AROS_LCA(const OPENSSL_INIT_SETTINGS *, (___settings), A0), \
      struct Library *, AMISSL_BASE_NAME, 4428, Amissl)
 
-#define SSL_add1_host(___s, ___hostname) \
+#define SSL_add1_host(___s, ___host) \
       AROS_LC2(int, SSL_add1_host, \
  AROS_LCA(SSL *, (___s), A0), \
- AROS_LCA(const char *, (___hostname), A1), \
+ AROS_LCA(const char *, (___host), A1), \
      struct Library *, AMISSL_BASE_NAME, 4429, Amissl)
 
 #define SSL_add_ssl_module() \
@@ -23917,10 +23917,10 @@ typedef ULONG _sfdc_vararg;
  AROS_LCA(void *, (___ex), A1), \
      struct Library *, AMISSL_BASE_NAME, 4475, Amissl)
 
-#define SSL_set1_host(___s, ___hostname) \
+#define SSL_set1_host(___s, ___host) \
       AROS_LC2(int, SSL_set1_host, \
  AROS_LCA(SSL *, (___s), A0), \
- AROS_LCA(const char *, (___hostname), A1), \
+ AROS_LCA(const char *, (___host), A1), \
      struct Library *, AMISSL_BASE_NAME, 4476, Amissl)
 
 #define SSL_set_default_passwd_cb(___s, ___cb) \

include/defines/amisslext.h

@@ -9677,4 +9677,169 @@ typedef ULONG _sfdc_vararg;
  AROS_LCA(void *, (___u), D5), \
      struct Library *, AMISSLEXT_BASE_NAME, 1534, Amisslext)
 
+#define EVP_PKEY_get_security_category(___pkey) \
+      AROS_LC1(int, EVP_PKEY_get_security_category, \
+ AROS_LCA(const EVP_PKEY *, (___pkey), A0), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1535, Amisslext)
+
+#define X509_STORE_CTX_set_ocsp_resp(___ctx, ___sk) \
+      AROS_LC2(void, X509_STORE_CTX_set_ocsp_resp, \
+ AROS_LCA(X509_STORE_CTX *, (___ctx), A0), \
+ AROS_LCA(STACK_OF(OCSP_RESPONSE) *, (___sk), A1), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1536, Amisslext)
+
+#define OPENSSL_sk_set_thunks(___st, ___f_thunk) \
+      AROS_LC2(OPENSSL_STACK *, OPENSSL_sk_set_thunks, \
+ AROS_LCA(OPENSSL_STACK *, (___st), A0), \
+ AROS_LCA(OPENSSL_sk_freefunc_thunk, (___f_thunk), D0), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1537, Amisslext)
+
+#define i2d_PKCS8PrivateKey(___a, ___pp) \
+      AROS_LC2(int, i2d_PKCS8PrivateKey, \
+ AROS_LCA(const EVP_PKEY *, (___a), A0), \
+ AROS_LCA(unsigned char **, (___pp), A1), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1538, Amisslext)
+
+#define OSSL_PARAM_set_octet_string_or_ptr(___p, ___val, ___len) \
+      AROS_LC3(int, OSSL_PARAM_set_octet_string_or_ptr, \
+ AROS_LCA(OSSL_PARAM *, (___p), A0), \
+ AROS_LCA(const void *, (___val), A1), \
+ AROS_LCA(size_t, (___len), D0), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1539, Amisslext)
+
+#define OSSL_STORE_LOADER_settable_ctx_params(___loader) \
+      AROS_LC1(const OSSL_PARAM *, OSSL_STORE_LOADER_settable_ctx_params, \
+ AROS_LCA(const OSSL_STORE_LOADER *, (___loader), A0), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1540, Amisslext)
+
+#define X509_CRL_get0_tbs_sigalg(___crl) \
+      AROS_LC1(const X509_ALGOR *, X509_CRL_get0_tbs_sigalg, \
+ AROS_LCA(const X509_CRL *, (___crl), A0), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1541, Amisslext)
+
+#define CMS_RecipientInfo_kemri_cert_cmp(___ri, ___cert) \
+      AROS_LC2(int, CMS_RecipientInfo_kemri_cert_cmp, \
+ AROS_LCA(CMS_RecipientInfo *, (___ri), A0), \
+ AROS_LCA(X509 *, (___cert), A1), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1542, Amisslext)
+
+#define CMS_RecipientInfo_kemri_set0_pkey(___ri, ___pk) \
+      AROS_LC2(int, CMS_RecipientInfo_kemri_set0_pkey, \
+ AROS_LCA(CMS_RecipientInfo *, (___ri), A0), \
+ AROS_LCA(EVP_PKEY *, (___pk), A1), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1543, Amisslext)
+
+#define CMS_RecipientInfo_kemri_get0_ctx(___ri) \
+      AROS_LC1(EVP_CIPHER_CTX *, CMS_RecipientInfo_kemri_get0_ctx, \
+ AROS_LCA(CMS_RecipientInfo *, (___ri), A0), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1544, Amisslext)
+
+#define CMS_RecipientInfo_kemri_get0_kdf_alg(___ri) \
+      AROS_LC1(X509_ALGOR *, CMS_RecipientInfo_kemri_get0_kdf_alg, \
+ AROS_LCA(CMS_RecipientInfo *, (___ri), A0), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1545, Amisslext)
+
+#define CMS_RecipientInfo_kemri_set_ukm(___ri, ___ukm, ___ukmLength) \
+      AROS_LC3(int, CMS_RecipientInfo_kemri_set_ukm, \
+ AROS_LCA(CMS_RecipientInfo *, (___ri), A0), \
+ AROS_LCA(const unsigned char *, (___ukm), A1), \
+ AROS_LCA(int, (___ukmLength), D0), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1546, Amisslext)
+
+#define EVP_PKEY_derive_SKEY(___ctx, ___mgmt, ___key_type, ___propquery, ___keylen, ___params) \
+      AROS_LC6(EVP_SKEY *, EVP_PKEY_derive_SKEY, \
+ AROS_LCA(EVP_PKEY_CTX *, (___ctx), A0), \
+ AROS_LCA(EVP_SKEYMGMT *, (___mgmt), A1), \
+ AROS_LCA(const char *, (___key_type), A2), \
+ AROS_LCA(const char *, (___propquery), A3), \
+ AROS_LCA(size_t, (___keylen), D0), \
+ AROS_LCA(const OSSL_PARAM *, (___params), D1), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1547, Amisslext)
+
+#define EVP_KDF_CTX_set_SKEY(___ctx, ___key, ___paramname) \
+      AROS_LC3(int, EVP_KDF_CTX_set_SKEY, \
+ AROS_LCA(EVP_KDF_CTX *, (___ctx), A0), \
+ AROS_LCA(EVP_SKEY *, (___key), A1), \
+ AROS_LCA(const char *, (___paramname), A2), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1548, Amisslext)
+
+#define EVP_KDF_derive_SKEY(___ctx, ___mgmt, ___key_type, ___propquery, ___keylen, ___params) \
+      AROS_LC6(EVP_SKEY *, EVP_KDF_derive_SKEY, \
+ AROS_LCA(EVP_KDF_CTX *, (___ctx), A0), \
+ AROS_LCA(EVP_SKEYMGMT *, (___mgmt), A1), \
+ AROS_LCA(const char *, (___key_type), A2), \
+ AROS_LCA(const char *, (___propquery), A3), \
+ AROS_LCA(size_t, (___keylen), D0), \
+ AROS_LCA(const OSSL_PARAM *, (___params), D1), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1549, Amisslext)
+
+#define EVP_SKEY_import_SKEYMGMT(___libctx, ___skeymgmt, ___selection, ___params) \
+      AROS_LC4(EVP_SKEY *, EVP_SKEY_import_SKEYMGMT, \
+ AROS_LCA(OSSL_LIB_CTX *, (___libctx), A0), \
+ AROS_LCA(EVP_SKEYMGMT *, (___skeymgmt), A1), \
+ AROS_LCA(int, (___selection), D0), \
+ AROS_LCA(const OSSL_PARAM *, (___params), A2), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1550, Amisslext)
+
+#define CRYPTO_malloc_array(___num, ___size, ___file, ___line) \
+      AROS_LC4(void *, CRYPTO_malloc_array, \
+ AROS_LCA(size_t, (___num), D0), \
+ AROS_LCA(size_t, (___size), D1), \
+ AROS_LCA(const char *, (___file), A0), \
+ AROS_LCA(int, (___line), D2), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1551, Amisslext)
+
+#define CRYPTO_calloc(___num, ___size, ___file, ___line) \
+      AROS_LC4(void *, CRYPTO_calloc, \
+ AROS_LCA(size_t, (___num), D0), \
+ AROS_LCA(size_t, (___size), D1), \
+ AROS_LCA(const char *, (___file), A0), \
+ AROS_LCA(int, (___line), D2), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1552, Amisslext)
+
+#define CRYPTO_aligned_alloc_array(___num, ___size, ___align, ___freeptr, ___file, ___line) \
+      AROS_LC6(void *, CRYPTO_aligned_alloc_array, \
+ AROS_LCA(size_t, (___num), D0), \
+ AROS_LCA(size_t, (___size), D1), \
+ AROS_LCA(size_t, (___align), D2), \
+ AROS_LCA(void **, (___freeptr), A0), \
+ AROS_LCA(const char *, (___file), A1), \
+ AROS_LCA(int, (___line), D3), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1553, Amisslext)
+
+#define CRYPTO_realloc_array(___addr, ___num, ___size, ___file, ___line) \
+      AROS_LC5(void *, CRYPTO_realloc_array, \
+ AROS_LCA(void *, (___addr), A0), \
+ AROS_LCA(size_t, (___num), D0), \
+ AROS_LCA(size_t, (___size), D1), \
+ AROS_LCA(const char *, (___file), A1), \
+ AROS_LCA(int, (___line), D2), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1554, Amisslext)
+
+#define CRYPTO_clear_realloc_array(___addr, ___old_num, ___num, ___size, ___file, ___line) \
+      AROS_LC6(void *, CRYPTO_clear_realloc_array, \
+ AROS_LCA(void *, (___addr), A0), \
+ AROS_LCA(size_t, (___old_num), D0), \
+ AROS_LCA(size_t, (___num), D1), \
+ AROS_LCA(size_t, (___size), D2), \
+ AROS_LCA(const char *, (___file), A1), \
+ AROS_LCA(int, (___line), D3), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1555, Amisslext)
+
+#define CRYPTO_secure_malloc_array(___num, ___size, ___file, ___line) \
+      AROS_LC4(void *, CRYPTO_secure_malloc_array, \
+ AROS_LCA(size_t, (___num), D0), \
+ AROS_LCA(size_t, (___size), D1), \
+ AROS_LCA(const char *, (___file), A0), \
+ AROS_LCA(int, (___line), D2), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1556, Amisslext)
+
+#define CRYPTO_secure_calloc(___num, ___size, ___file, ___line) \
+      AROS_LC4(void *, CRYPTO_secure_calloc, \
+ AROS_LCA(size_t, (___num), D0), \
+ AROS_LCA(size_t, (___size), D1), \
+ AROS_LCA(const char *, (___file), A0), \
+ AROS_LCA(int, (___line), D2), \
+     struct Library *, AMISSLEXT_BASE_NAME, 1557, Amisslext)
+
 #endif /* !_INLINE_AMISSLEXT_H */

include/fd/amissl_lib.fd

@@ -4043,7 +4043,7 @@ X509_get_extension_flags(x)(a0)
 X509_get_key_usage(x)(a0)
 DTLSv1_listen(s,client)(a0,a1)
 OPENSSL_init_ssl(opts,settings)(d0,a0)
-SSL_add1_host(s,hostname)(a0,a1)
+SSL_add1_host(s,host)(a0,a1)
 SSL_add_ssl_module()()
 SSL_CIPHER_get_cipher_nid(c)(a0)
 SSL_CIPHER_get_digest_nid(c)(a0)
@@ -4090,7 +4090,7 @@ SSL_SESSION_has_ticket(s)(a0)
 SSL_SESSION_print_keylog(bp,x)(a0,a1)
 SSL_session_reused(s)(a0)
 SSL_set0_security_ex_data(s,ex)(a0,a1)
-SSL_set1_host(s,hostname)(a0,a1)
+SSL_set1_host(s,host)(a0,a1)
 SSL_set_default_passwd_cb(s,cb)(a0,a1)
 SSL_set_default_passwd_cb_userdata(s,u)(a0,a1)
 SSL_set_hostflags(s,flags)(a0,d0)

include/fd/amisslext_lib.fd

@@ -1533,4 +1533,27 @@ OSSL_AA_DIST_POINT_free(a)(a0)
 OSSL_AA_DIST_POINT_new()()
 OSSL_AA_DIST_POINT_it()()
 PEM_ASN1_write_bio_ctx(i2d,vctx,name,bp,x,enc,kstr,klen,cb,u)(a0,a1,a2,a3,d0,d1,d2,d3,d4,d5)
+EVP_PKEY_get_security_category(pkey)(a0)
+X509_STORE_CTX_set_ocsp_resp(ctx,sk)(a0,a1)
+OPENSSL_sk_set_thunks(st,f_thunk)(a0,d0)
+i2d_PKCS8PrivateKey(a,pp)(a0,a1)
+OSSL_PARAM_set_octet_string_or_ptr(p,val,len)(a0,a1,d0)
+OSSL_STORE_LOADER_settable_ctx_params(loader)(a0)
+X509_CRL_get0_tbs_sigalg(crl)(a0)
+CMS_RecipientInfo_kemri_cert_cmp(ri,cert)(a0,a1)
+CMS_RecipientInfo_kemri_set0_pkey(ri,pk)(a0,a1)
+CMS_RecipientInfo_kemri_get0_ctx(ri)(a0)
+CMS_RecipientInfo_kemri_get0_kdf_alg(ri)(a0)
+CMS_RecipientInfo_kemri_set_ukm(ri,ukm,ukmLength)(a0,a1,d0)
+EVP_PKEY_derive_SKEY(ctx,mgmt,key_type,propquery,keylen,params)(a0,a1,a2,a3,d0,d1)
+EVP_KDF_CTX_set_SKEY(ctx,key,paramname)(a0,a1,a2)
+EVP_KDF_derive_SKEY(ctx,mgmt,key_type,propquery,keylen,params)(a0,a1,a2,a3,d0,d1)
+EVP_SKEY_import_SKEYMGMT(libctx,skeymgmt,selection,params)(a0,a1,d0,a2)
+CRYPTO_malloc_array(num,size,file,line)(d0,d1,a0,d2)
+CRYPTO_calloc(num,size,file,line)(d0,d1,a0,d2)
+CRYPTO_aligned_alloc_array(num,size,align,freeptr,file,line)(d0,d1,d2,a0,a1,d3)
+CRYPTO_realloc_array(addr,num,size,file,line)(a0,d0,d1,a1,d2)
+CRYPTO_clear_realloc_array(addr,old_num,num,size,file,line)(a0,d0,d1,d2,a1,d3)
+CRYPTO_secure_malloc_array(num,size,file,line)(d0,d1,a0,d2)
+CRYPTO_secure_calloc(num,size,file,line)(d0,d1,a0,d2)
 ##end