@crossbind/port-openssl-linuxmusl 2.0.0-beta.65 → 2.0.0-beta.67
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/prebuilt/linuxmusl-arm64-mt-release/crossbind-source.fingerprint +1 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/asn1.h +329 -43
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/asn1err.h +1 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/asn1t.h +45 -6
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/asyncerr.h +1 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/bio.h +53 -23
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/bioerr.h +4 -4
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/bnerr.h +1 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/buffererr.h +1 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/cmp.h +259 -30
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/cmperr.h +1 -2
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/cms.h +185 -21
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/cmserr.h +1 -2
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/comp.h +43 -5
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/comperr.h +1 -2
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/conf.h +43 -5
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/conferr.h +1 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/configuration.h +10 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/core_dispatch.h +8 -0
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/core_names.h +9 -0
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/crmf.h +129 -15
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/crmferr.h +1 -2
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/crypto.h +47 -5
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/cryptoerr.h +1 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/ct.h +95 -11
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/cterr.h +1 -2
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/decodererr.h +1 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/dherr.h +1 -2
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/dsaerr.h +1 -2
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/dtls1.h +17 -3
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/e_os2.h +19 -6
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/e_ostime.h +3 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/ec.h +0 -4
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/ecdh.h +6 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/ecdsa.h +6 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/ecerr.h +1 -2
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/ech.h +1 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/encodererr.h +1 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/ess.h +86 -10
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/esserr.h +1 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/evp.h +29 -2
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/evperr.h +1 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/kdf.h +12 -2
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/macros.h +16 -14
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/obj_mac.h +12 -2
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/objectserr.h +1 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/ocsp.h +184 -24
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/ocsperr.h +1 -2
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/opensslv.h +6 -6
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/ossl_typ.h +6 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/pem.h +38 -8
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/pemerr.h +1 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/pkcs12.h +43 -5
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/pkcs12err.h +1 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/pkcs7.h +134 -16
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/pkcs7err.h +1 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/prov_ssl.h +7 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/proverr.h +9 -0
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/randerr.h +1 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/rsaerr.h +1 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/safestack.h +157 -18
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/self_test.h +5 -0
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/srp.h +129 -15
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/ssl.h +114 -14
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/ssl3.h +6 -3
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/stack.h +2 -0
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/storeerr.h +1 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/tls1.h +0 -7
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/ts.h +4 -4
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/tserr.h +1 -2
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/types.h +1 -0
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/ui.h +43 -5
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/uierr.h +1 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/x509.h +344 -40
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/x509_acert.h +172 -20
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/x509_vfy.h +175 -21
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/x509v3.h +1085 -130
- package/dist/prebuilt/linuxmusl-arm64-mt-release/include/openssl/x509v3err.h +2 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/lib/cmake/OpenSSL/OpenSSLConfig.cmake +1 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/lib/cmake/OpenSSL/OpenSSLConfigVersion.cmake +4 -4
- package/dist/prebuilt/linuxmusl-arm64-mt-release/lib/libcrypto.a +0 -0
- package/dist/prebuilt/linuxmusl-arm64-mt-release/lib/libssl.a +0 -0
- package/dist/prebuilt/linuxmusl-arm64-mt-release/lib/ossl-modules/legacy.so +0 -0
- package/dist/prebuilt/linuxmusl-arm64-mt-release/lib/pkgconfig/libcrypto.pc +2 -2
- package/dist/prebuilt/linuxmusl-arm64-mt-release/lib/pkgconfig/libssl.pc +2 -2
- package/dist/prebuilt/linuxmusl-arm64-mt-release/lib/pkgconfig/openssl.pc +2 -2
- package/dist/prebuilt/linuxmusl-arm64-mt-release/ssl/openssl.cnf +0 -1
- package/dist/prebuilt/linuxmusl-arm64-mt-release/ssl/openssl.cnf.dist +0 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/crossbind-source.fingerprint +1 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/asn1.h +329 -43
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/asn1err.h +1 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/asn1t.h +45 -6
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/asyncerr.h +1 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/bio.h +53 -23
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/bioerr.h +4 -4
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/bnerr.h +1 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/buffererr.h +1 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/cmp.h +259 -30
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/cmperr.h +1 -2
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/cms.h +185 -21
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/cmserr.h +1 -2
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/comp.h +43 -5
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/comperr.h +1 -2
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/conf.h +43 -5
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/conferr.h +1 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/configuration.h +10 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/core_dispatch.h +8 -0
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/core_names.h +9 -0
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/crmf.h +129 -15
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/crmferr.h +1 -2
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/crypto.h +47 -5
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/cryptoerr.h +1 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/ct.h +95 -11
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/cterr.h +1 -2
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/decodererr.h +1 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/dherr.h +1 -2
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/dsaerr.h +1 -2
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/dtls1.h +17 -3
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/e_os2.h +19 -6
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/e_ostime.h +3 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/ec.h +0 -4
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/ecdh.h +6 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/ecdsa.h +6 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/ecerr.h +1 -2
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/ech.h +1 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/encodererr.h +1 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/ess.h +86 -10
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/esserr.h +1 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/evp.h +29 -2
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/evperr.h +1 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/kdf.h +12 -2
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/macros.h +16 -14
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/obj_mac.h +12 -2
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/objectserr.h +1 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/ocsp.h +184 -24
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/ocsperr.h +1 -2
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/opensslv.h +6 -6
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/ossl_typ.h +6 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/pem.h +38 -8
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/pemerr.h +1 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/pkcs12.h +43 -5
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/pkcs12err.h +1 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/pkcs7.h +134 -16
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/pkcs7err.h +1 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/prov_ssl.h +7 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/proverr.h +9 -0
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/randerr.h +1 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/rsaerr.h +1 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/safestack.h +157 -18
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/self_test.h +5 -0
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/srp.h +129 -15
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/ssl.h +114 -14
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/ssl3.h +6 -3
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/stack.h +2 -0
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/storeerr.h +1 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/tls1.h +0 -7
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/ts.h +4 -4
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/tserr.h +1 -2
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/types.h +1 -0
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/ui.h +43 -5
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/uierr.h +1 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/x509.h +344 -40
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/x509_acert.h +172 -20
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/x509_vfy.h +175 -21
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/x509v3.h +1085 -130
- package/dist/prebuilt/linuxmusl-x64-mt-release/include/openssl/x509v3err.h +2 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/lib/cmake/OpenSSL/OpenSSLConfig.cmake +1 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/lib/cmake/OpenSSL/OpenSSLConfigVersion.cmake +4 -4
- package/dist/prebuilt/linuxmusl-x64-mt-release/lib/libcrypto.a +0 -0
- package/dist/prebuilt/linuxmusl-x64-mt-release/lib/libssl.a +0 -0
- package/dist/prebuilt/linuxmusl-x64-mt-release/lib/ossl-modules/legacy.so +0 -0
- package/dist/prebuilt/linuxmusl-x64-mt-release/lib/pkgconfig/libcrypto.pc +2 -2
- package/dist/prebuilt/linuxmusl-x64-mt-release/lib/pkgconfig/libssl.pc +2 -2
- package/dist/prebuilt/linuxmusl-x64-mt-release/lib/pkgconfig/openssl.pc +2 -2
- package/dist/prebuilt/linuxmusl-x64-mt-release/ssl/openssl.cnf +0 -1
- package/dist/prebuilt/linuxmusl-x64-mt-release/ssl/openssl.cnf.dist +0 -1
- package/package.json +4 -4
|
@@ -71,9 +71,30 @@ typedef struct pkcs7_signer_info_st {
|
|
|
71
71
|
SKM_DEFINE_STACK_OF_INTERNAL(PKCS7_SIGNER_INFO, PKCS7_SIGNER_INFO, PKCS7_SIGNER_INFO)
|
|
72
72
|
#define sk_PKCS7_SIGNER_INFO_num(sk) OPENSSL_sk_num(ossl_check_const_PKCS7_SIGNER_INFO_sk_type(sk))
|
|
73
73
|
#define sk_PKCS7_SIGNER_INFO_value(sk, idx) ((PKCS7_SIGNER_INFO *)OPENSSL_sk_value(ossl_check_const_PKCS7_SIGNER_INFO_sk_type(sk), (idx)))
|
|
74
|
-
#define sk_PKCS7_SIGNER_INFO_new(cmp)
|
|
75
|
-
|
|
76
|
-
|
|
74
|
+
#define sk_PKCS7_SIGNER_INFO_new(cmp) \
|
|
75
|
+
((STACK_OF(PKCS7_SIGNER_INFO) *)OPENSSL_sk_set_thunks( \
|
|
76
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
77
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
78
|
+
OPENSSL_sk_new(ossl_check_PKCS7_SIGNER_INFO_compfunc_type(cmp)), \
|
|
79
|
+
sk_PKCS7_SIGNER_INFO_cmpfunc_thunk), \
|
|
80
|
+
sk_PKCS7_SIGNER_INFO_copyfunc_thunk), \
|
|
81
|
+
sk_PKCS7_SIGNER_INFO_freefunc_thunk))
|
|
82
|
+
#define sk_PKCS7_SIGNER_INFO_new_null() \
|
|
83
|
+
((STACK_OF(PKCS7_SIGNER_INFO) *)OPENSSL_sk_set_thunks( \
|
|
84
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
85
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
86
|
+
OPENSSL_sk_new_null(), \
|
|
87
|
+
sk_PKCS7_SIGNER_INFO_cmpfunc_thunk), \
|
|
88
|
+
sk_PKCS7_SIGNER_INFO_copyfunc_thunk), \
|
|
89
|
+
sk_PKCS7_SIGNER_INFO_freefunc_thunk))
|
|
90
|
+
#define sk_PKCS7_SIGNER_INFO_new_reserve(cmp, n) \
|
|
91
|
+
((STACK_OF(PKCS7_SIGNER_INFO) *)OPENSSL_sk_set_thunks( \
|
|
92
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
93
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
94
|
+
OPENSSL_sk_new_reserve(ossl_check_PKCS7_SIGNER_INFO_compfunc_type(cmp), (n)), \
|
|
95
|
+
sk_PKCS7_SIGNER_INFO_cmpfunc_thunk), \
|
|
96
|
+
sk_PKCS7_SIGNER_INFO_copyfunc_thunk), \
|
|
97
|
+
sk_PKCS7_SIGNER_INFO_freefunc_thunk))
|
|
77
98
|
#define sk_PKCS7_SIGNER_INFO_reserve(sk, n) OPENSSL_sk_reserve(ossl_check_PKCS7_SIGNER_INFO_sk_type(sk), (n))
|
|
78
99
|
#define sk_PKCS7_SIGNER_INFO_free(sk) OPENSSL_sk_free(ossl_check_PKCS7_SIGNER_INFO_sk_type(sk))
|
|
79
100
|
#define sk_PKCS7_SIGNER_INFO_zero(sk) OPENSSL_sk_zero(ossl_check_PKCS7_SIGNER_INFO_sk_type(sk))
|
|
@@ -91,8 +112,25 @@ SKM_DEFINE_STACK_OF_INTERNAL(PKCS7_SIGNER_INFO, PKCS7_SIGNER_INFO, PKCS7_SIGNER_
|
|
|
91
112
|
#define sk_PKCS7_SIGNER_INFO_find_all(sk, ptr, pnum) OPENSSL_sk_find_all(ossl_check_PKCS7_SIGNER_INFO_sk_type(sk), ossl_check_PKCS7_SIGNER_INFO_type(ptr), pnum)
|
|
92
113
|
#define sk_PKCS7_SIGNER_INFO_sort(sk) OPENSSL_sk_sort(ossl_check_PKCS7_SIGNER_INFO_sk_type(sk))
|
|
93
114
|
#define sk_PKCS7_SIGNER_INFO_is_sorted(sk) OPENSSL_sk_is_sorted(ossl_check_const_PKCS7_SIGNER_INFO_sk_type(sk))
|
|
94
|
-
#define sk_PKCS7_SIGNER_INFO_dup(sk)
|
|
95
|
-
|
|
115
|
+
#define sk_PKCS7_SIGNER_INFO_dup(sk) \
|
|
116
|
+
((STACK_OF(PKCS7_SIGNER_INFO) *)OPENSSL_sk_set_thunks( \
|
|
117
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
118
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
119
|
+
OPENSSL_sk_dup(ossl_check_const_PKCS7_SIGNER_INFO_sk_type(sk)), \
|
|
120
|
+
sk_PKCS7_SIGNER_INFO_cmpfunc_thunk), \
|
|
121
|
+
sk_PKCS7_SIGNER_INFO_copyfunc_thunk), \
|
|
122
|
+
sk_PKCS7_SIGNER_INFO_freefunc_thunk))
|
|
123
|
+
#define sk_PKCS7_SIGNER_INFO_deep_copy(sk, copyfunc, freefunc) \
|
|
124
|
+
((STACK_OF(PKCS7_SIGNER_INFO) *)OPENSSL_sk_set_thunks( \
|
|
125
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
126
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
127
|
+
OPENSSL_sk_deep_copy( \
|
|
128
|
+
ossl_check_const_PKCS7_SIGNER_INFO_sk_type(sk), \
|
|
129
|
+
ossl_check_PKCS7_SIGNER_INFO_copyfunc_type(copyfunc), \
|
|
130
|
+
ossl_check_PKCS7_SIGNER_INFO_freefunc_type(freefunc)), \
|
|
131
|
+
sk_PKCS7_SIGNER_INFO_cmpfunc_thunk), \
|
|
132
|
+
sk_PKCS7_SIGNER_INFO_copyfunc_thunk), \
|
|
133
|
+
sk_PKCS7_SIGNER_INFO_freefunc_thunk))
|
|
96
134
|
#define sk_PKCS7_SIGNER_INFO_set_cmp_func(sk, cmp) ((sk_PKCS7_SIGNER_INFO_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_PKCS7_SIGNER_INFO_sk_type(sk), ossl_check_PKCS7_SIGNER_INFO_compfunc_type(cmp)))
|
|
97
135
|
|
|
98
136
|
/* clang-format on */
|
|
@@ -109,9 +147,30 @@ typedef struct pkcs7_recip_info_st {
|
|
|
109
147
|
SKM_DEFINE_STACK_OF_INTERNAL(PKCS7_RECIP_INFO, PKCS7_RECIP_INFO, PKCS7_RECIP_INFO)
|
|
110
148
|
#define sk_PKCS7_RECIP_INFO_num(sk) OPENSSL_sk_num(ossl_check_const_PKCS7_RECIP_INFO_sk_type(sk))
|
|
111
149
|
#define sk_PKCS7_RECIP_INFO_value(sk, idx) ((PKCS7_RECIP_INFO *)OPENSSL_sk_value(ossl_check_const_PKCS7_RECIP_INFO_sk_type(sk), (idx)))
|
|
112
|
-
#define sk_PKCS7_RECIP_INFO_new(cmp)
|
|
113
|
-
|
|
114
|
-
|
|
150
|
+
#define sk_PKCS7_RECIP_INFO_new(cmp) \
|
|
151
|
+
((STACK_OF(PKCS7_RECIP_INFO) *)OPENSSL_sk_set_thunks( \
|
|
152
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
153
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
154
|
+
OPENSSL_sk_new(ossl_check_PKCS7_RECIP_INFO_compfunc_type(cmp)), \
|
|
155
|
+
sk_PKCS7_RECIP_INFO_cmpfunc_thunk), \
|
|
156
|
+
sk_PKCS7_RECIP_INFO_copyfunc_thunk), \
|
|
157
|
+
sk_PKCS7_RECIP_INFO_freefunc_thunk))
|
|
158
|
+
#define sk_PKCS7_RECIP_INFO_new_null() \
|
|
159
|
+
((STACK_OF(PKCS7_RECIP_INFO) *)OPENSSL_sk_set_thunks( \
|
|
160
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
161
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
162
|
+
OPENSSL_sk_new_null(), \
|
|
163
|
+
sk_PKCS7_RECIP_INFO_cmpfunc_thunk), \
|
|
164
|
+
sk_PKCS7_RECIP_INFO_copyfunc_thunk), \
|
|
165
|
+
sk_PKCS7_RECIP_INFO_freefunc_thunk))
|
|
166
|
+
#define sk_PKCS7_RECIP_INFO_new_reserve(cmp, n) \
|
|
167
|
+
((STACK_OF(PKCS7_RECIP_INFO) *)OPENSSL_sk_set_thunks( \
|
|
168
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
169
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
170
|
+
OPENSSL_sk_new_reserve(ossl_check_PKCS7_RECIP_INFO_compfunc_type(cmp), (n)), \
|
|
171
|
+
sk_PKCS7_RECIP_INFO_cmpfunc_thunk), \
|
|
172
|
+
sk_PKCS7_RECIP_INFO_copyfunc_thunk), \
|
|
173
|
+
sk_PKCS7_RECIP_INFO_freefunc_thunk))
|
|
115
174
|
#define sk_PKCS7_RECIP_INFO_reserve(sk, n) OPENSSL_sk_reserve(ossl_check_PKCS7_RECIP_INFO_sk_type(sk), (n))
|
|
116
175
|
#define sk_PKCS7_RECIP_INFO_free(sk) OPENSSL_sk_free(ossl_check_PKCS7_RECIP_INFO_sk_type(sk))
|
|
117
176
|
#define sk_PKCS7_RECIP_INFO_zero(sk) OPENSSL_sk_zero(ossl_check_PKCS7_RECIP_INFO_sk_type(sk))
|
|
@@ -129,8 +188,25 @@ SKM_DEFINE_STACK_OF_INTERNAL(PKCS7_RECIP_INFO, PKCS7_RECIP_INFO, PKCS7_RECIP_INF
|
|
|
129
188
|
#define sk_PKCS7_RECIP_INFO_find_all(sk, ptr, pnum) OPENSSL_sk_find_all(ossl_check_PKCS7_RECIP_INFO_sk_type(sk), ossl_check_PKCS7_RECIP_INFO_type(ptr), pnum)
|
|
130
189
|
#define sk_PKCS7_RECIP_INFO_sort(sk) OPENSSL_sk_sort(ossl_check_PKCS7_RECIP_INFO_sk_type(sk))
|
|
131
190
|
#define sk_PKCS7_RECIP_INFO_is_sorted(sk) OPENSSL_sk_is_sorted(ossl_check_const_PKCS7_RECIP_INFO_sk_type(sk))
|
|
132
|
-
#define sk_PKCS7_RECIP_INFO_dup(sk)
|
|
133
|
-
|
|
191
|
+
#define sk_PKCS7_RECIP_INFO_dup(sk) \
|
|
192
|
+
((STACK_OF(PKCS7_RECIP_INFO) *)OPENSSL_sk_set_thunks( \
|
|
193
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
194
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
195
|
+
OPENSSL_sk_dup(ossl_check_const_PKCS7_RECIP_INFO_sk_type(sk)), \
|
|
196
|
+
sk_PKCS7_RECIP_INFO_cmpfunc_thunk), \
|
|
197
|
+
sk_PKCS7_RECIP_INFO_copyfunc_thunk), \
|
|
198
|
+
sk_PKCS7_RECIP_INFO_freefunc_thunk))
|
|
199
|
+
#define sk_PKCS7_RECIP_INFO_deep_copy(sk, copyfunc, freefunc) \
|
|
200
|
+
((STACK_OF(PKCS7_RECIP_INFO) *)OPENSSL_sk_set_thunks( \
|
|
201
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
202
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
203
|
+
OPENSSL_sk_deep_copy( \
|
|
204
|
+
ossl_check_const_PKCS7_RECIP_INFO_sk_type(sk), \
|
|
205
|
+
ossl_check_PKCS7_RECIP_INFO_copyfunc_type(copyfunc), \
|
|
206
|
+
ossl_check_PKCS7_RECIP_INFO_freefunc_type(freefunc)), \
|
|
207
|
+
sk_PKCS7_RECIP_INFO_cmpfunc_thunk), \
|
|
208
|
+
sk_PKCS7_RECIP_INFO_copyfunc_thunk), \
|
|
209
|
+
sk_PKCS7_RECIP_INFO_freefunc_thunk))
|
|
134
210
|
#define sk_PKCS7_RECIP_INFO_set_cmp_func(sk, cmp) ((sk_PKCS7_RECIP_INFO_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_PKCS7_RECIP_INFO_sk_type(sk), ossl_check_PKCS7_RECIP_INFO_compfunc_type(cmp)))
|
|
135
211
|
|
|
136
212
|
/* clang-format on */
|
|
@@ -138,6 +214,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(PKCS7_RECIP_INFO, PKCS7_RECIP_INFO, PKCS7_RECIP_INF
|
|
|
138
214
|
typedef struct pkcs7_signed_st {
|
|
139
215
|
ASN1_INTEGER *version; /* version 1 */
|
|
140
216
|
STACK_OF(X509_ALGOR) *md_algs; /* md used */
|
|
217
|
+
/* untrusted certificates for chain building, may include signer certs: */
|
|
141
218
|
STACK_OF(X509) *cert; /* [ 0 ] */ /* name should be 'certificates' */
|
|
142
219
|
STACK_OF(X509_CRL) *crl; /* [ 1 ] */ /* name should be 'crls' */
|
|
143
220
|
STACK_OF(PKCS7_SIGNER_INFO) *signer_info;
|
|
@@ -165,6 +242,7 @@ typedef struct pkcs7_enveloped_st {
|
|
|
165
242
|
typedef struct pkcs7_signedandenveloped_st {
|
|
166
243
|
ASN1_INTEGER *version; /* version 1 */
|
|
167
244
|
STACK_OF(X509_ALGOR) *md_algs; /* md used */
|
|
245
|
+
/* untrusted certificates for chain building, may include signer certs: */
|
|
168
246
|
STACK_OF(X509) *cert; /* [ 0 ] */ /* name should be 'certificates' */
|
|
169
247
|
STACK_OF(X509_CRL) *crl; /* [ 1 ] */ /* name should be 'crls' */
|
|
170
248
|
STACK_OF(PKCS7_SIGNER_INFO) *signer_info;
|
|
@@ -225,9 +303,30 @@ typedef struct pkcs7_st {
|
|
|
225
303
|
SKM_DEFINE_STACK_OF_INTERNAL(PKCS7, PKCS7, PKCS7)
|
|
226
304
|
#define sk_PKCS7_num(sk) OPENSSL_sk_num(ossl_check_const_PKCS7_sk_type(sk))
|
|
227
305
|
#define sk_PKCS7_value(sk, idx) ((PKCS7 *)OPENSSL_sk_value(ossl_check_const_PKCS7_sk_type(sk), (idx)))
|
|
228
|
-
#define sk_PKCS7_new(cmp)
|
|
229
|
-
|
|
230
|
-
|
|
306
|
+
#define sk_PKCS7_new(cmp) \
|
|
307
|
+
((STACK_OF(PKCS7) *)OPENSSL_sk_set_thunks( \
|
|
308
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
309
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
310
|
+
OPENSSL_sk_new(ossl_check_PKCS7_compfunc_type(cmp)), \
|
|
311
|
+
sk_PKCS7_cmpfunc_thunk), \
|
|
312
|
+
sk_PKCS7_copyfunc_thunk), \
|
|
313
|
+
sk_PKCS7_freefunc_thunk))
|
|
314
|
+
#define sk_PKCS7_new_null() \
|
|
315
|
+
((STACK_OF(PKCS7) *)OPENSSL_sk_set_thunks( \
|
|
316
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
317
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
318
|
+
OPENSSL_sk_new_null(), \
|
|
319
|
+
sk_PKCS7_cmpfunc_thunk), \
|
|
320
|
+
sk_PKCS7_copyfunc_thunk), \
|
|
321
|
+
sk_PKCS7_freefunc_thunk))
|
|
322
|
+
#define sk_PKCS7_new_reserve(cmp, n) \
|
|
323
|
+
((STACK_OF(PKCS7) *)OPENSSL_sk_set_thunks( \
|
|
324
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
325
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
326
|
+
OPENSSL_sk_new_reserve(ossl_check_PKCS7_compfunc_type(cmp), (n)), \
|
|
327
|
+
sk_PKCS7_cmpfunc_thunk), \
|
|
328
|
+
sk_PKCS7_copyfunc_thunk), \
|
|
329
|
+
sk_PKCS7_freefunc_thunk))
|
|
231
330
|
#define sk_PKCS7_reserve(sk, n) OPENSSL_sk_reserve(ossl_check_PKCS7_sk_type(sk), (n))
|
|
232
331
|
#define sk_PKCS7_free(sk) OPENSSL_sk_free(ossl_check_PKCS7_sk_type(sk))
|
|
233
332
|
#define sk_PKCS7_zero(sk) OPENSSL_sk_zero(ossl_check_PKCS7_sk_type(sk))
|
|
@@ -245,8 +344,25 @@ SKM_DEFINE_STACK_OF_INTERNAL(PKCS7, PKCS7, PKCS7)
|
|
|
245
344
|
#define sk_PKCS7_find_all(sk, ptr, pnum) OPENSSL_sk_find_all(ossl_check_PKCS7_sk_type(sk), ossl_check_PKCS7_type(ptr), pnum)
|
|
246
345
|
#define sk_PKCS7_sort(sk) OPENSSL_sk_sort(ossl_check_PKCS7_sk_type(sk))
|
|
247
346
|
#define sk_PKCS7_is_sorted(sk) OPENSSL_sk_is_sorted(ossl_check_const_PKCS7_sk_type(sk))
|
|
248
|
-
#define sk_PKCS7_dup(sk)
|
|
249
|
-
|
|
347
|
+
#define sk_PKCS7_dup(sk) \
|
|
348
|
+
((STACK_OF(PKCS7) *)OPENSSL_sk_set_thunks( \
|
|
349
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
350
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
351
|
+
OPENSSL_sk_dup(ossl_check_const_PKCS7_sk_type(sk)), \
|
|
352
|
+
sk_PKCS7_cmpfunc_thunk), \
|
|
353
|
+
sk_PKCS7_copyfunc_thunk), \
|
|
354
|
+
sk_PKCS7_freefunc_thunk))
|
|
355
|
+
#define sk_PKCS7_deep_copy(sk, copyfunc, freefunc) \
|
|
356
|
+
((STACK_OF(PKCS7) *)OPENSSL_sk_set_thunks( \
|
|
357
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
358
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
359
|
+
OPENSSL_sk_deep_copy( \
|
|
360
|
+
ossl_check_const_PKCS7_sk_type(sk), \
|
|
361
|
+
ossl_check_PKCS7_copyfunc_type(copyfunc), \
|
|
362
|
+
ossl_check_PKCS7_freefunc_type(freefunc)), \
|
|
363
|
+
sk_PKCS7_cmpfunc_thunk), \
|
|
364
|
+
sk_PKCS7_copyfunc_thunk), \
|
|
365
|
+
sk_PKCS7_freefunc_thunk))
|
|
250
366
|
#define sk_PKCS7_set_cmp_func(sk, cmp) ((sk_PKCS7_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_PKCS7_sk_type(sk), ossl_check_PKCS7_compfunc_type(cmp)))
|
|
251
367
|
|
|
252
368
|
/* clang-format on */
|
|
@@ -374,7 +490,9 @@ void PKCS7_RECIP_INFO_get0_alg(PKCS7_RECIP_INFO *ri, X509_ALGOR **penc);
|
|
|
374
490
|
int PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri);
|
|
375
491
|
int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509);
|
|
376
492
|
int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher);
|
|
377
|
-
|
|
493
|
+
#if !defined(OPENSSL_NO_DEPRECATED_4_1)
|
|
494
|
+
OSSL_DEPRECATEDIN_4_1 int PKCS7_stream(unsigned char ***boundary, PKCS7 *p7);
|
|
495
|
+
#endif /* !defined(OPENSSL_NO_DEPRECATED_4_1) */
|
|
378
496
|
|
|
379
497
|
PKCS7_ISSUER_AND_SERIAL *PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx);
|
|
380
498
|
ASN1_OCTET_STRING *PKCS7_get_octet_string(PKCS7 *p7);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*
|
|
2
2
|
* Generated by util/mkerr.pl DO NOT EDIT
|
|
3
|
-
* Copyright 1995-
|
|
3
|
+
* Copyright 1995-2026 The OpenSSL Project Authors. All Rights Reserved.
|
|
4
4
|
*
|
|
5
5
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
6
6
|
* this file except in compliance with the License. You can obtain a copy
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*
|
|
2
|
-
* Copyright 2021-
|
|
2
|
+
* Copyright 2021-2026 The OpenSSL Project Authors. All Rights Reserved.
|
|
3
3
|
*
|
|
4
4
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
5
5
|
* this file except in compliance with the License. You can obtain a copy
|
|
@@ -27,11 +27,17 @@ extern "C" {
|
|
|
27
27
|
#define TLS1_3_VERSION 0x0304
|
|
28
28
|
#define DTLS1_VERSION 0xFEFF
|
|
29
29
|
#define DTLS1_2_VERSION 0xFEFD
|
|
30
|
+
#define DTLS1_3_VERSION 0xFEFC
|
|
30
31
|
#define DTLS1_BAD_VER 0x0100
|
|
31
32
|
|
|
33
|
+
#define PROTO_VERSION_UNSET 0
|
|
34
|
+
|
|
32
35
|
/* QUIC uses a 4 byte unsigned version number */
|
|
33
36
|
#define OSSL_QUIC1_VERSION 0x0000001
|
|
34
37
|
|
|
38
|
+
/* Maximum plaintext length: defined by SSL/TLS standards */
|
|
39
|
+
#define SSL3_RT_MAX_PLAIN_LENGTH 16384
|
|
40
|
+
|
|
35
41
|
#ifdef __cplusplus
|
|
36
42
|
}
|
|
37
43
|
#endif
|
|
@@ -32,7 +32,9 @@
|
|
|
32
32
|
#define PROV_R_DERIVATION_FUNCTION_INIT_FAILED 205
|
|
33
33
|
#define PROV_R_DIGEST_NOT_ALLOWED 174
|
|
34
34
|
#define PROV_R_EMS_NOT_ENABLED 233
|
|
35
|
+
#define PROV_R_ENTROPY_SOURCE_FAILED_APT_CONTINUOUS_TEST 268
|
|
35
36
|
#define PROV_R_ENTROPY_SOURCE_FAILED_CONTINUOUS_TESTS 244
|
|
37
|
+
#define PROV_R_ENTROPY_SOURCE_FAILED_RCT_CONTINUOUS_TEST 269
|
|
36
38
|
#define PROV_R_ENTROPY_SOURCE_STRENGTH_TOO_WEAK 186
|
|
37
39
|
#define PROV_R_ERROR_INSTANTIATING_DRBG 188
|
|
38
40
|
#define PROV_R_ERROR_RETRIEVING_ENTROPY 189
|
|
@@ -49,6 +51,7 @@
|
|
|
49
51
|
#define PROV_R_FIPS_MODULE_ENTERING_ERROR_STATE 224
|
|
50
52
|
#define PROV_R_FIPS_MODULE_IMPORT_PCT_ERROR 253
|
|
51
53
|
#define PROV_R_FIPS_MODULE_IN_ERROR_STATE 225
|
|
54
|
+
#define PROV_R_FIPS_MODULE_MISSING_CHECKSUM 267
|
|
52
55
|
#define PROV_R_GENERATE_ERROR 191
|
|
53
56
|
#define PROV_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE 165
|
|
54
57
|
#define PROV_R_INDICATOR_INTEGRITY_FAILURE 210
|
|
@@ -80,11 +83,14 @@
|
|
|
80
83
|
#define PROV_R_INVALID_MEMORY_SIZE 235
|
|
81
84
|
#define PROV_R_INVALID_MGF1_MD 167
|
|
82
85
|
#define PROV_R_INVALID_MODE 125
|
|
86
|
+
#define PROV_R_INVALID_NONCE_LENGTH 264
|
|
83
87
|
#define PROV_R_INVALID_OUTPUT_LENGTH 217
|
|
84
88
|
#define PROV_R_INVALID_PADDING_MODE 168
|
|
89
|
+
#define PROV_R_INVALID_PARAMETERS_FOR_DKM 261
|
|
85
90
|
#define PROV_R_INVALID_PREHASHED_DIGEST_LENGTH 241
|
|
86
91
|
#define PROV_R_INVALID_PUBINFO 198
|
|
87
92
|
#define PROV_R_INVALID_SALT_LENGTH 112
|
|
93
|
+
#define PROV_R_INVALID_SECRET_LENGTH 265
|
|
88
94
|
#define PROV_R_INVALID_SEED_LENGTH 154
|
|
89
95
|
#define PROV_R_INVALID_SIGNATURE_SIZE 179
|
|
90
96
|
#define PROV_R_INVALID_STATE 212
|
|
@@ -94,6 +100,7 @@
|
|
|
94
100
|
#define PROV_R_INVALID_UKM_LENGTH 200
|
|
95
101
|
#define PROV_R_INVALID_X931_DIGEST 170
|
|
96
102
|
#define PROV_R_IN_ERROR_STATE 192
|
|
103
|
+
#define PROV_R_KEY_IMMUTABLE_ONCE_SET 266
|
|
97
104
|
#define PROV_R_KEY_SETUP_FAILED 101
|
|
98
105
|
#define PROV_R_KEY_SIZE_TOO_SMALL 171
|
|
99
106
|
#define PROV_R_LENGTH_TOO_LARGE 202
|
|
@@ -102,10 +109,12 @@
|
|
|
102
109
|
#define PROV_R_MISSING_CIPHER 155
|
|
103
110
|
#define PROV_R_MISSING_CONFIG_DATA 213
|
|
104
111
|
#define PROV_R_MISSING_CONSTANT 156
|
|
112
|
+
#define PROV_R_MISSING_DKM 262
|
|
105
113
|
#define PROV_R_MISSING_EID 255
|
|
106
114
|
#define PROV_R_MISSING_KEY 128
|
|
107
115
|
#define PROV_R_MISSING_MAC 150
|
|
108
116
|
#define PROV_R_MISSING_MESSAGE_DIGEST 129
|
|
117
|
+
#define PROV_R_MISSING_NONCE 263
|
|
109
118
|
#define PROV_R_MISSING_OID 209
|
|
110
119
|
#define PROV_R_MISSING_PASS 130
|
|
111
120
|
#define PROV_R_MISSING_SALT 131
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*
|
|
2
2
|
* Generated by util/mkerr.pl DO NOT EDIT
|
|
3
|
-
* Copyright 1995-
|
|
3
|
+
* Copyright 1995-2026 The OpenSSL Project Authors. All Rights Reserved.
|
|
4
4
|
*
|
|
5
5
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
6
6
|
* this file except in compliance with the License. You can obtain a copy
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*
|
|
2
2
|
* Generated by util/mkerr.pl DO NOT EDIT
|
|
3
|
-
* Copyright 1995-
|
|
3
|
+
* Copyright 1995-2026 The OpenSSL Project Authors. All Rights Reserved.
|
|
4
4
|
*
|
|
5
5
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
6
6
|
* this file except in compliance with the License. You can obtain a copy
|
|
@@ -43,6 +43,11 @@ extern "C" {
|
|
|
43
43
|
sk_##t1##_freefunc freefunc = (sk_##t1##_freefunc)freefunc_arg; \
|
|
44
44
|
freefunc((t3 *)ptr); \
|
|
45
45
|
} \
|
|
46
|
+
static ossl_inline void *sk_##t1##_copyfunc_thunk(OPENSSL_sk_copyfunc copyfunc_arg, const void *ptr) \
|
|
47
|
+
{ \
|
|
48
|
+
sk_##t1##_copyfunc copyfunc = (sk_##t1##_copyfunc)copyfunc_arg; \
|
|
49
|
+
return (void *)copyfunc((const t3 *)ptr); \
|
|
50
|
+
} \
|
|
46
51
|
static ossl_inline int sk_##t1##_cmpfunc_thunk(int (*cmp)(const void *, const void *), const void *a, const void *b) \
|
|
47
52
|
{ \
|
|
48
53
|
int (*realcmp)(const t3 *const *a, const t3 *const *b) = (int (*)(const t3 *const *a, const t3 *const *b))(cmp); \
|
|
@@ -86,6 +91,11 @@ extern "C" {
|
|
|
86
91
|
sk_##t1##_freefunc freefunc = (sk_##t1##_freefunc)freefunc_arg; \
|
|
87
92
|
freefunc((t3 *)ptr); \
|
|
88
93
|
} \
|
|
94
|
+
static ossl_inline void *sk_##t1##_copyfunc_thunk(OPENSSL_sk_copyfunc copyfunc_arg, const void *ptr) \
|
|
95
|
+
{ \
|
|
96
|
+
sk_##t1##_copyfunc copyfunc = (sk_##t1##_copyfunc)copyfunc_arg; \
|
|
97
|
+
return (void *)copyfunc((const t3 *)ptr); \
|
|
98
|
+
} \
|
|
89
99
|
static ossl_inline int sk_##t1##_cmpfunc_thunk(int (*cmp)(const void *, const void *), const void *a, const void *b) \
|
|
90
100
|
{ \
|
|
91
101
|
int (*realcmp)(const t3 *const *a, const t3 *const *b) = (int (*)(const t3 *const *a, const t3 *const *b))(cmp); \
|
|
@@ -109,6 +119,7 @@ extern "C" {
|
|
|
109
119
|
\
|
|
110
120
|
f_thunk = (OPENSSL_sk_freefunc_thunk)sk_##t1##_freefunc_thunk; \
|
|
111
121
|
OPENSSL_sk_set_cmp_thunks(ret, sk_##t1##_cmpfunc_thunk); \
|
|
122
|
+
OPENSSL_sk_set_copy_thunks(ret, sk_##t1##_copyfunc_thunk); \
|
|
112
123
|
return (STACK_OF(t1) *)OPENSSL_sk_set_thunks(ret, f_thunk); \
|
|
113
124
|
} \
|
|
114
125
|
static ossl_unused ossl_inline STACK_OF(t1) *sk_##t1##_new_null(void) \
|
|
@@ -117,7 +128,8 @@ extern "C" {
|
|
|
117
128
|
OPENSSL_sk_freefunc_thunk f_thunk; \
|
|
118
129
|
\
|
|
119
130
|
f_thunk = (OPENSSL_sk_freefunc_thunk)sk_##t1##_freefunc_thunk; \
|
|
120
|
-
|
|
131
|
+
OPENSSL_sk_set_cmp_thunks(ret, sk_##t1##_cmpfunc_thunk); \
|
|
132
|
+
OPENSSL_sk_set_copy_thunks(ret, sk_##t1##_copyfunc_thunk); \
|
|
121
133
|
return (STACK_OF(t1) *)OPENSSL_sk_set_thunks(ret, f_thunk); \
|
|
122
134
|
} \
|
|
123
135
|
static ossl_unused ossl_inline STACK_OF(t1) *sk_##t1##_new_reserve(sk_##t1##_compfunc compare, int n) \
|
|
@@ -127,6 +139,7 @@ extern "C" {
|
|
|
127
139
|
\
|
|
128
140
|
f_thunk = (OPENSSL_sk_freefunc_thunk)sk_##t1##_freefunc_thunk; \
|
|
129
141
|
OPENSSL_sk_set_cmp_thunks(ret, sk_##t1##_cmpfunc_thunk); \
|
|
142
|
+
OPENSSL_sk_set_copy_thunks(ret, sk_##t1##_copyfunc_thunk); \
|
|
130
143
|
return (STACK_OF(t1) *)OPENSSL_sk_set_thunks(ret, f_thunk); \
|
|
131
144
|
} \
|
|
132
145
|
static ossl_unused ossl_inline int sk_##t1##_reserve(STACK_OF(t1) *sk, int n) \
|
|
@@ -206,15 +219,27 @@ extern "C" {
|
|
|
206
219
|
} \
|
|
207
220
|
static ossl_unused ossl_inline STACK_OF(t1) *sk_##t1##_dup(const STACK_OF(t1) *sk) \
|
|
208
221
|
{ \
|
|
209
|
-
|
|
222
|
+
OPENSSL_STACK *ret = OPENSSL_sk_dup((const OPENSSL_STACK *)sk); \
|
|
223
|
+
OPENSSL_sk_freefunc_thunk f_thunk; \
|
|
224
|
+
\
|
|
225
|
+
f_thunk = (OPENSSL_sk_freefunc_thunk)sk_##t1##_freefunc_thunk; \
|
|
226
|
+
OPENSSL_sk_set_cmp_thunks(ret, sk_##t1##_cmpfunc_thunk); \
|
|
227
|
+
OPENSSL_sk_set_copy_thunks(ret, sk_##t1##_copyfunc_thunk); \
|
|
228
|
+
return (STACK_OF(t1) *)OPENSSL_sk_set_thunks(ret, f_thunk); \
|
|
210
229
|
} \
|
|
211
230
|
static ossl_unused ossl_inline STACK_OF(t1) *sk_##t1##_deep_copy(const STACK_OF(t1) *sk, \
|
|
212
231
|
sk_##t1##_copyfunc copyfunc, \
|
|
213
232
|
sk_##t1##_freefunc freefunc) \
|
|
214
233
|
{ \
|
|
215
|
-
|
|
234
|
+
OPENSSL_STACK *ret = OPENSSL_sk_deep_copy((const OPENSSL_STACK *)sk, \
|
|
216
235
|
(OPENSSL_sk_copyfunc)copyfunc, \
|
|
217
236
|
(OPENSSL_sk_freefunc)freefunc); \
|
|
237
|
+
OPENSSL_sk_freefunc_thunk f_thunk; \
|
|
238
|
+
\
|
|
239
|
+
f_thunk = (OPENSSL_sk_freefunc_thunk)sk_##t1##_freefunc_thunk; \
|
|
240
|
+
OPENSSL_sk_set_cmp_thunks(ret, sk_##t1##_cmpfunc_thunk); \
|
|
241
|
+
OPENSSL_sk_set_copy_thunks(ret, sk_##t1##_copyfunc_thunk); \
|
|
242
|
+
return (STACK_OF(t1) *)OPENSSL_sk_set_thunks(ret, f_thunk); \
|
|
218
243
|
} \
|
|
219
244
|
static ossl_unused ossl_inline sk_##t1##_compfunc sk_##t1##_set_cmp_func(STACK_OF(t1) *sk, sk_##t1##_compfunc compare) \
|
|
220
245
|
{ \
|
|
@@ -255,9 +280,30 @@ typedef const char *OPENSSL_CSTRING;
|
|
|
255
280
|
SKM_DEFINE_STACK_OF_INTERNAL(OPENSSL_STRING, char, char)
|
|
256
281
|
#define sk_OPENSSL_STRING_num(sk) OPENSSL_sk_num(ossl_check_const_OPENSSL_STRING_sk_type(sk))
|
|
257
282
|
#define sk_OPENSSL_STRING_value(sk, idx) ((char *)OPENSSL_sk_value(ossl_check_const_OPENSSL_STRING_sk_type(sk), (idx)))
|
|
258
|
-
#define sk_OPENSSL_STRING_new(cmp)
|
|
259
|
-
|
|
260
|
-
|
|
283
|
+
#define sk_OPENSSL_STRING_new(cmp) \
|
|
284
|
+
((STACK_OF(OPENSSL_STRING) *)OPENSSL_sk_set_thunks( \
|
|
285
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
286
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
287
|
+
OPENSSL_sk_new(ossl_check_OPENSSL_STRING_compfunc_type(cmp)), \
|
|
288
|
+
sk_OPENSSL_STRING_cmpfunc_thunk), \
|
|
289
|
+
sk_OPENSSL_STRING_copyfunc_thunk), \
|
|
290
|
+
sk_OPENSSL_STRING_freefunc_thunk))
|
|
291
|
+
#define sk_OPENSSL_STRING_new_null() \
|
|
292
|
+
((STACK_OF(OPENSSL_STRING) *)OPENSSL_sk_set_thunks( \
|
|
293
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
294
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
295
|
+
OPENSSL_sk_new_null(), \
|
|
296
|
+
sk_OPENSSL_STRING_cmpfunc_thunk), \
|
|
297
|
+
sk_OPENSSL_STRING_copyfunc_thunk), \
|
|
298
|
+
sk_OPENSSL_STRING_freefunc_thunk))
|
|
299
|
+
#define sk_OPENSSL_STRING_new_reserve(cmp, n) \
|
|
300
|
+
((STACK_OF(OPENSSL_STRING) *)OPENSSL_sk_set_thunks( \
|
|
301
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
302
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
303
|
+
OPENSSL_sk_new_reserve(ossl_check_OPENSSL_STRING_compfunc_type(cmp), (n)), \
|
|
304
|
+
sk_OPENSSL_STRING_cmpfunc_thunk), \
|
|
305
|
+
sk_OPENSSL_STRING_copyfunc_thunk), \
|
|
306
|
+
sk_OPENSSL_STRING_freefunc_thunk))
|
|
261
307
|
#define sk_OPENSSL_STRING_reserve(sk, n) OPENSSL_sk_reserve(ossl_check_OPENSSL_STRING_sk_type(sk), (n))
|
|
262
308
|
#define sk_OPENSSL_STRING_free(sk) OPENSSL_sk_free(ossl_check_OPENSSL_STRING_sk_type(sk))
|
|
263
309
|
#define sk_OPENSSL_STRING_zero(sk) OPENSSL_sk_zero(ossl_check_OPENSSL_STRING_sk_type(sk))
|
|
@@ -275,15 +321,53 @@ SKM_DEFINE_STACK_OF_INTERNAL(OPENSSL_STRING, char, char)
|
|
|
275
321
|
#define sk_OPENSSL_STRING_find_all(sk, ptr, pnum) OPENSSL_sk_find_all(ossl_check_OPENSSL_STRING_sk_type(sk), ossl_check_OPENSSL_STRING_type(ptr), pnum)
|
|
276
322
|
#define sk_OPENSSL_STRING_sort(sk) OPENSSL_sk_sort(ossl_check_OPENSSL_STRING_sk_type(sk))
|
|
277
323
|
#define sk_OPENSSL_STRING_is_sorted(sk) OPENSSL_sk_is_sorted(ossl_check_const_OPENSSL_STRING_sk_type(sk))
|
|
278
|
-
#define sk_OPENSSL_STRING_dup(sk)
|
|
279
|
-
|
|
324
|
+
#define sk_OPENSSL_STRING_dup(sk) \
|
|
325
|
+
((STACK_OF(OPENSSL_STRING) *)OPENSSL_sk_set_thunks( \
|
|
326
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
327
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
328
|
+
OPENSSL_sk_dup(ossl_check_const_OPENSSL_STRING_sk_type(sk)), \
|
|
329
|
+
sk_OPENSSL_STRING_cmpfunc_thunk), \
|
|
330
|
+
sk_OPENSSL_STRING_copyfunc_thunk), \
|
|
331
|
+
sk_OPENSSL_STRING_freefunc_thunk))
|
|
332
|
+
#define sk_OPENSSL_STRING_deep_copy(sk, copyfunc, freefunc) \
|
|
333
|
+
((STACK_OF(OPENSSL_STRING) *)OPENSSL_sk_set_thunks( \
|
|
334
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
335
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
336
|
+
OPENSSL_sk_deep_copy( \
|
|
337
|
+
ossl_check_const_OPENSSL_STRING_sk_type(sk), \
|
|
338
|
+
ossl_check_OPENSSL_STRING_copyfunc_type(copyfunc), \
|
|
339
|
+
ossl_check_OPENSSL_STRING_freefunc_type(freefunc)), \
|
|
340
|
+
sk_OPENSSL_STRING_cmpfunc_thunk), \
|
|
341
|
+
sk_OPENSSL_STRING_copyfunc_thunk), \
|
|
342
|
+
sk_OPENSSL_STRING_freefunc_thunk))
|
|
280
343
|
#define sk_OPENSSL_STRING_set_cmp_func(sk, cmp) ((sk_OPENSSL_STRING_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_OPENSSL_STRING_sk_type(sk), ossl_check_OPENSSL_STRING_compfunc_type(cmp)))
|
|
281
344
|
SKM_DEFINE_STACK_OF_INTERNAL(OPENSSL_CSTRING, const char, char)
|
|
282
345
|
#define sk_OPENSSL_CSTRING_num(sk) OPENSSL_sk_num(ossl_check_const_OPENSSL_CSTRING_sk_type(sk))
|
|
283
346
|
#define sk_OPENSSL_CSTRING_value(sk, idx) ((const char *)OPENSSL_sk_value(ossl_check_const_OPENSSL_CSTRING_sk_type(sk), (idx)))
|
|
284
|
-
#define sk_OPENSSL_CSTRING_new(cmp)
|
|
285
|
-
|
|
286
|
-
|
|
347
|
+
#define sk_OPENSSL_CSTRING_new(cmp) \
|
|
348
|
+
((STACK_OF(OPENSSL_CSTRING) *)OPENSSL_sk_set_thunks( \
|
|
349
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
350
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
351
|
+
OPENSSL_sk_new(ossl_check_OPENSSL_CSTRING_compfunc_type(cmp)), \
|
|
352
|
+
sk_OPENSSL_CSTRING_cmpfunc_thunk), \
|
|
353
|
+
sk_OPENSSL_CSTRING_copyfunc_thunk), \
|
|
354
|
+
sk_OPENSSL_CSTRING_freefunc_thunk))
|
|
355
|
+
#define sk_OPENSSL_CSTRING_new_null() \
|
|
356
|
+
((STACK_OF(OPENSSL_CSTRING) *)OPENSSL_sk_set_thunks( \
|
|
357
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
358
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
359
|
+
OPENSSL_sk_new_null(), \
|
|
360
|
+
sk_OPENSSL_CSTRING_cmpfunc_thunk), \
|
|
361
|
+
sk_OPENSSL_CSTRING_copyfunc_thunk), \
|
|
362
|
+
sk_OPENSSL_CSTRING_freefunc_thunk))
|
|
363
|
+
#define sk_OPENSSL_CSTRING_new_reserve(cmp, n) \
|
|
364
|
+
((STACK_OF(OPENSSL_CSTRING) *)OPENSSL_sk_set_thunks( \
|
|
365
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
366
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
367
|
+
OPENSSL_sk_new_reserve(ossl_check_OPENSSL_CSTRING_compfunc_type(cmp), (n)), \
|
|
368
|
+
sk_OPENSSL_CSTRING_cmpfunc_thunk), \
|
|
369
|
+
sk_OPENSSL_CSTRING_copyfunc_thunk), \
|
|
370
|
+
sk_OPENSSL_CSTRING_freefunc_thunk))
|
|
287
371
|
#define sk_OPENSSL_CSTRING_reserve(sk, n) OPENSSL_sk_reserve(ossl_check_OPENSSL_CSTRING_sk_type(sk), (n))
|
|
288
372
|
#define sk_OPENSSL_CSTRING_free(sk) OPENSSL_sk_free(ossl_check_OPENSSL_CSTRING_sk_type(sk))
|
|
289
373
|
#define sk_OPENSSL_CSTRING_zero(sk) OPENSSL_sk_zero(ossl_check_OPENSSL_CSTRING_sk_type(sk))
|
|
@@ -301,8 +385,25 @@ SKM_DEFINE_STACK_OF_INTERNAL(OPENSSL_CSTRING, const char, char)
|
|
|
301
385
|
#define sk_OPENSSL_CSTRING_find_all(sk, ptr, pnum) OPENSSL_sk_find_all(ossl_check_OPENSSL_CSTRING_sk_type(sk), ossl_check_OPENSSL_CSTRING_type(ptr), pnum)
|
|
302
386
|
#define sk_OPENSSL_CSTRING_sort(sk) OPENSSL_sk_sort(ossl_check_OPENSSL_CSTRING_sk_type(sk))
|
|
303
387
|
#define sk_OPENSSL_CSTRING_is_sorted(sk) OPENSSL_sk_is_sorted(ossl_check_const_OPENSSL_CSTRING_sk_type(sk))
|
|
304
|
-
#define sk_OPENSSL_CSTRING_dup(sk)
|
|
305
|
-
|
|
388
|
+
#define sk_OPENSSL_CSTRING_dup(sk) \
|
|
389
|
+
((STACK_OF(OPENSSL_CSTRING) *)OPENSSL_sk_set_thunks( \
|
|
390
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
391
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
392
|
+
OPENSSL_sk_dup(ossl_check_const_OPENSSL_CSTRING_sk_type(sk)), \
|
|
393
|
+
sk_OPENSSL_CSTRING_cmpfunc_thunk), \
|
|
394
|
+
sk_OPENSSL_CSTRING_copyfunc_thunk), \
|
|
395
|
+
sk_OPENSSL_CSTRING_freefunc_thunk))
|
|
396
|
+
#define sk_OPENSSL_CSTRING_deep_copy(sk, copyfunc, freefunc) \
|
|
397
|
+
((STACK_OF(OPENSSL_CSTRING) *)OPENSSL_sk_set_thunks( \
|
|
398
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
399
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
400
|
+
OPENSSL_sk_deep_copy( \
|
|
401
|
+
ossl_check_const_OPENSSL_CSTRING_sk_type(sk), \
|
|
402
|
+
ossl_check_OPENSSL_CSTRING_copyfunc_type(copyfunc), \
|
|
403
|
+
ossl_check_OPENSSL_CSTRING_freefunc_type(freefunc)), \
|
|
404
|
+
sk_OPENSSL_CSTRING_cmpfunc_thunk), \
|
|
405
|
+
sk_OPENSSL_CSTRING_copyfunc_thunk), \
|
|
406
|
+
sk_OPENSSL_CSTRING_freefunc_thunk))
|
|
306
407
|
#define sk_OPENSSL_CSTRING_set_cmp_func(sk, cmp) ((sk_OPENSSL_CSTRING_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_OPENSSL_CSTRING_sk_type(sk), ossl_check_OPENSSL_CSTRING_compfunc_type(cmp)))
|
|
307
408
|
|
|
308
409
|
/* clang-format on */
|
|
@@ -317,9 +418,30 @@ typedef void *OPENSSL_BLOCK;
|
|
|
317
418
|
SKM_DEFINE_STACK_OF_INTERNAL(OPENSSL_BLOCK, void, void)
|
|
318
419
|
#define sk_OPENSSL_BLOCK_num(sk) OPENSSL_sk_num(ossl_check_const_OPENSSL_BLOCK_sk_type(sk))
|
|
319
420
|
#define sk_OPENSSL_BLOCK_value(sk, idx) ((void *)OPENSSL_sk_value(ossl_check_const_OPENSSL_BLOCK_sk_type(sk), (idx)))
|
|
320
|
-
#define sk_OPENSSL_BLOCK_new(cmp)
|
|
321
|
-
|
|
322
|
-
|
|
421
|
+
#define sk_OPENSSL_BLOCK_new(cmp) \
|
|
422
|
+
((STACK_OF(OPENSSL_BLOCK) *)OPENSSL_sk_set_thunks( \
|
|
423
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
424
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
425
|
+
OPENSSL_sk_new(ossl_check_OPENSSL_BLOCK_compfunc_type(cmp)), \
|
|
426
|
+
sk_OPENSSL_BLOCK_cmpfunc_thunk), \
|
|
427
|
+
sk_OPENSSL_BLOCK_copyfunc_thunk), \
|
|
428
|
+
sk_OPENSSL_BLOCK_freefunc_thunk))
|
|
429
|
+
#define sk_OPENSSL_BLOCK_new_null() \
|
|
430
|
+
((STACK_OF(OPENSSL_BLOCK) *)OPENSSL_sk_set_thunks( \
|
|
431
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
432
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
433
|
+
OPENSSL_sk_new_null(), \
|
|
434
|
+
sk_OPENSSL_BLOCK_cmpfunc_thunk), \
|
|
435
|
+
sk_OPENSSL_BLOCK_copyfunc_thunk), \
|
|
436
|
+
sk_OPENSSL_BLOCK_freefunc_thunk))
|
|
437
|
+
#define sk_OPENSSL_BLOCK_new_reserve(cmp, n) \
|
|
438
|
+
((STACK_OF(OPENSSL_BLOCK) *)OPENSSL_sk_set_thunks( \
|
|
439
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
440
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
441
|
+
OPENSSL_sk_new_reserve(ossl_check_OPENSSL_BLOCK_compfunc_type(cmp), (n)), \
|
|
442
|
+
sk_OPENSSL_BLOCK_cmpfunc_thunk), \
|
|
443
|
+
sk_OPENSSL_BLOCK_copyfunc_thunk), \
|
|
444
|
+
sk_OPENSSL_BLOCK_freefunc_thunk))
|
|
323
445
|
#define sk_OPENSSL_BLOCK_reserve(sk, n) OPENSSL_sk_reserve(ossl_check_OPENSSL_BLOCK_sk_type(sk), (n))
|
|
324
446
|
#define sk_OPENSSL_BLOCK_free(sk) OPENSSL_sk_free(ossl_check_OPENSSL_BLOCK_sk_type(sk))
|
|
325
447
|
#define sk_OPENSSL_BLOCK_zero(sk) OPENSSL_sk_zero(ossl_check_OPENSSL_BLOCK_sk_type(sk))
|
|
@@ -337,8 +459,25 @@ SKM_DEFINE_STACK_OF_INTERNAL(OPENSSL_BLOCK, void, void)
|
|
|
337
459
|
#define sk_OPENSSL_BLOCK_find_all(sk, ptr, pnum) OPENSSL_sk_find_all(ossl_check_OPENSSL_BLOCK_sk_type(sk), ossl_check_OPENSSL_BLOCK_type(ptr), pnum)
|
|
338
460
|
#define sk_OPENSSL_BLOCK_sort(sk) OPENSSL_sk_sort(ossl_check_OPENSSL_BLOCK_sk_type(sk))
|
|
339
461
|
#define sk_OPENSSL_BLOCK_is_sorted(sk) OPENSSL_sk_is_sorted(ossl_check_const_OPENSSL_BLOCK_sk_type(sk))
|
|
340
|
-
#define sk_OPENSSL_BLOCK_dup(sk)
|
|
341
|
-
|
|
462
|
+
#define sk_OPENSSL_BLOCK_dup(sk) \
|
|
463
|
+
((STACK_OF(OPENSSL_BLOCK) *)OPENSSL_sk_set_thunks( \
|
|
464
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
465
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
466
|
+
OPENSSL_sk_dup(ossl_check_const_OPENSSL_BLOCK_sk_type(sk)), \
|
|
467
|
+
sk_OPENSSL_BLOCK_cmpfunc_thunk), \
|
|
468
|
+
sk_OPENSSL_BLOCK_copyfunc_thunk), \
|
|
469
|
+
sk_OPENSSL_BLOCK_freefunc_thunk))
|
|
470
|
+
#define sk_OPENSSL_BLOCK_deep_copy(sk, copyfunc, freefunc) \
|
|
471
|
+
((STACK_OF(OPENSSL_BLOCK) *)OPENSSL_sk_set_thunks( \
|
|
472
|
+
OPENSSL_sk_set_copy_thunks( \
|
|
473
|
+
OPENSSL_sk_set_cmp_thunks( \
|
|
474
|
+
OPENSSL_sk_deep_copy( \
|
|
475
|
+
ossl_check_const_OPENSSL_BLOCK_sk_type(sk), \
|
|
476
|
+
ossl_check_OPENSSL_BLOCK_copyfunc_type(copyfunc), \
|
|
477
|
+
ossl_check_OPENSSL_BLOCK_freefunc_type(freefunc)), \
|
|
478
|
+
sk_OPENSSL_BLOCK_cmpfunc_thunk), \
|
|
479
|
+
sk_OPENSSL_BLOCK_copyfunc_thunk), \
|
|
480
|
+
sk_OPENSSL_BLOCK_freefunc_thunk))
|
|
342
481
|
#define sk_OPENSSL_BLOCK_set_cmp_func(sk, cmp) ((sk_OPENSSL_BLOCK_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_OPENSSL_BLOCK_sk_type(sk), ossl_check_OPENSSL_BLOCK_compfunc_type(cmp)))
|
|
343
482
|
|
|
344
483
|
/* clang-format on */
|
|
@@ -80,6 +80,11 @@ extern "C" {
|
|
|
80
80
|
#define OSSL_SELF_TEST_DESC_KA_DH "DH"
|
|
81
81
|
#define OSSL_SELF_TEST_DESC_KA_ECDH "ECDH"
|
|
82
82
|
#define OSSL_SELF_TEST_DESC_KDF_HKDF "HKDF"
|
|
83
|
+
#define OSSL_SELF_TEST_DESC_KDF_IKEV2KDF_GEN "IKEV2KDF_GEN"
|
|
84
|
+
#define OSSL_SELF_TEST_DESC_KDF_IKEV2KDF_DKM1 "IKEV2KDF_DKM"
|
|
85
|
+
#define OSSL_SELF_TEST_DESC_KDF_IKEV2KDF_DKM2 "IKEV2KDF_DKM(Child_SA)"
|
|
86
|
+
#define OSSL_SELF_TEST_DESC_KDF_IKEV2KDF_DKM3 "IKEV2KDF_DKM(Child_DH)"
|
|
87
|
+
#define OSSL_SELF_TEST_DESC_KDF_IKEV2KDF_REKEY "IKEV2KDF_REKEY"
|
|
83
88
|
#define OSSL_SELF_TEST_DESC_KDF_SSKDF "SSKDF"
|
|
84
89
|
#define OSSL_SELF_TEST_DESC_KDF_X963KDF "X963KDF"
|
|
85
90
|
#define OSSL_SELF_TEST_DESC_KDF_X942KDF "X942KDF"
|