diff options
79 files changed, 93 insertions, 93 deletions
diff --git a/apps/provider.c b/apps/provider.c index d1a1ce7e4f..83fb2f3aee 100644 --- a/apps/provider.c +++ b/apps/provider.c @@ -18,7 +18,7 @@ #include <openssl/safestack.h> #include <openssl/provider.h> #include <openssl/core.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> DEFINE_STACK_OF_CSTRING() diff --git a/crypto/core_algorithm.c b/crypto/core_algorithm.c index f2e0e06fa8..b035ecfbb4 100644 --- a/crypto/core_algorithm.c +++ b/crypto/core_algorithm.c @@ -8,7 +8,7 @@ */ #include <openssl/core.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include "internal/core.h" #include "internal/property.h" #include "internal/provider.h" diff --git a/crypto/evp/evp_local.h b/crypto/evp/evp_local.h index 132534464f..4138ad8d95 100644 --- a/crypto/evp/evp_local.h +++ b/crypto/evp/evp_local.h @@ -9,7 +9,7 @@ /* EVP_MD_CTX related stuff */ -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include "internal/refcount.h" #define EVP_CTRL_RET_UNSUPPORTED -1 diff --git a/crypto/evp/kdf_meth.c b/crypto/evp/kdf_meth.c index 219dbdfa07..a328c97c08 100644 --- a/crypto/evp/kdf_meth.c +++ b/crypto/evp/kdf_meth.c @@ -10,7 +10,7 @@ #include <openssl/evp.h> #include <openssl/err.h> #include <openssl/core.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/kdf.h> #include "crypto/evp.h" #include "internal/provider.h" diff --git a/crypto/evp/keymgmt_meth.c b/crypto/evp/keymgmt_meth.c index ab5e00dfba..55dcae73e3 100644 --- a/crypto/evp/keymgmt_meth.c +++ b/crypto/evp/keymgmt_meth.c @@ -8,7 +8,7 @@ */ #include <openssl/crypto.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/evp.h> #include <openssl/err.h> #include "internal/provider.h" diff --git a/crypto/evp/mac_meth.c b/crypto/evp/mac_meth.c index b1fadb6ceb..c22ebd335f 100644 --- a/crypto/evp/mac_meth.c +++ b/crypto/evp/mac_meth.c @@ -1,7 +1,7 @@ #include <openssl/evp.h> #include <openssl/err.h> #include <openssl/core.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include "crypto/evp.h" #include "internal/provider.h" #include "evp_local.h" diff --git a/crypto/initthread.c b/crypto/initthread.c index a97cf359af..23b34966a5 100644 --- a/crypto/initthread.c +++ b/crypto/initthread.c @@ -8,7 +8,7 @@ */ #include <openssl/crypto.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include "crypto/cryptlib.h" #include "prov/providercommon.h" #include "internal/thread_once.h" diff --git a/crypto/provider_core.c b/crypto/provider_core.c index cfaa09ff7b..20319b7417 100644 --- a/crypto/provider_core.c +++ b/crypto/provider_core.c @@ -8,7 +8,7 @@ */ #include <openssl/core.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/provider.h> #include <openssl/params.h> diff --git a/crypto/serializer/serializer_local.h b/crypto/serializer/serializer_local.h index 44578448fc..121616d24a 100644 --- a/crypto/serializer/serializer_local.h +++ b/crypto/serializer/serializer_local.h @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/types.h> #include "internal/cryptlib.h" #include "internal/refcount.h" diff --git a/crypto/serializer/serializer_meth.c b/crypto/serializer/serializer_meth.c index e3e77c542a..b95bd14a51 100644 --- a/crypto/serializer/serializer_meth.c +++ b/crypto/serializer/serializer_meth.c @@ -8,7 +8,7 @@ */ #include <openssl/core.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/serializer.h> #include <openssl/ui.h> #include "internal/core.h" diff --git a/doc/internal/man3/evp_generic_fetch.pod b/doc/internal/man3/evp_generic_fetch.pod index 4cff97def8..4d2f6bdd69 100644 --- a/doc/internal/man3/evp_generic_fetch.pod +++ b/doc/internal/man3/evp_generic_fetch.pod @@ -78,7 +78,7 @@ This is a short example of the fictitious EVP API and operation called B<EVP_FOO>. To begin with, let's assume something like this in -F<include/openssl/core_numbers.h>: +F<include/openssl/core_dispatch.h>: #define OSSL_OP_FOO 100 diff --git a/doc/man7/OSSL_PROVIDER-FIPS.pod b/doc/man7/OSSL_PROVIDER-FIPS.pod index 1da465f47b..dd4d21f7cc 100644 --- a/doc/man7/OSSL_PROVIDER-FIPS.pod +++ b/doc/man7/OSSL_PROVIDER-FIPS.pod @@ -330,7 +330,7 @@ L<OSSL_SELF_TEST_set_callback(3)>, L<OSSL_SELF_TEST_new(3)>, L<OSSL_PARAM(3)>, L<openssl-core.h(7)>, -L<openssl-core_numbers.h(7)>, +L<openssl-core_dispatch.h(7)>, L<provider(7)> =head1 HISTORY diff --git a/doc/man7/OSSL_PROVIDER-default.pod b/doc/man7/OSSL_PROVIDER-default.pod index 91b02c5e67..d9a51dce00 100644 --- a/doc/man7/OSSL_PROVIDER-default.pod +++ b/doc/man7/OSSL_PROVIDER-default.pod @@ -214,7 +214,7 @@ provider. =head1 SEE ALSO -L<openssl-core.h(7)>, L<openssl-core_numbers.h(7)>, L<provider(7)> +L<openssl-core.h(7)>, L<openssl-core_dispatch.h(7)>, L<provider(7)> =head1 COPYRIGHT diff --git a/doc/man7/OSSL_PROVIDER-legacy.pod b/doc/man7/OSSL_PROVIDER-legacy.pod index db2d57ed59..36aeafec94 100644 --- a/doc/man7/OSSL_PROVIDER-legacy.pod +++ b/doc/man7/OSSL_PROVIDER-legacy.pod @@ -77,7 +77,7 @@ following =head2 titles are appropriate to use: L<OSSL_PARAM(3)>, L<openssl-core.h(7)>, -L<openssl-core_numbers.h(7)>, +L<openssl-core_dispatch.h(7)>, L<provider(7)> =head1 COPYRIGHT diff --git a/doc/man7/openssl-core.h.pod b/doc/man7/openssl-core.h.pod index 28307a97d4..945cca0eda 100644 --- a/doc/man7/openssl-core.h.pod +++ b/doc/man7/openssl-core.h.pod @@ -30,7 +30,7 @@ Arrays of this type must be terminated with a tuple having function identity zero and function pointer NULL. The available function identities and corresponding function -signatures are defined in L<openssl-core_numbers.h(7)>. +signatures are defined in L<openssl-core_dispatch.h(7)>. Any function identity not recognised by the recipient of this type will be ignored. @@ -111,7 +111,7 @@ callback. =head1 SEE ALSO -L<openssl-core_numbers.h(7)> +L<openssl-core_dispatch.h(7)> =head1 HISTORY diff --git a/doc/man7/openssl-core_numbers.h.pod b/doc/man7/openssl-core_dispatch.h.pod index d9bdcbc810..a19e1331fa 100644 --- a/doc/man7/openssl-core_numbers.h.pod +++ b/doc/man7/openssl-core_dispatch.h.pod @@ -2,16 +2,16 @@ =head1 NAME -openssl/core_numbers.h +openssl/core_dispatch.h - OpenSSL provider dispatch numbers and function types =head1 SYNOPSIS - #include <openssl/core_numbers.h> + #include <openssl/core_dispatch.h> =head1 DESCRIPTION -The F<< <openssl/core_numbers.h> >> header defines all the operation +The F<< <openssl/core_dispatch.h> >> header defines all the operation numbers, dispatch numbers and provider interface function types currently available. diff --git a/doc/man7/provider-asym_cipher.pod b/doc/man7/provider-asym_cipher.pod index a271cb408b..5a911f9a0e 100644 --- a/doc/man7/provider-asym_cipher.pod +++ b/doc/man7/provider-asym_cipher.pod @@ -8,7 +8,7 @@ provider-asym_cipher - The asym_cipher library E<lt>-E<gt> provider functions =for openssl multiple includes - #include <openssl/core_numbers.h> + #include <openssl/core_dispatch.h> #include <openssl/core_names.h> /* @@ -68,7 +68,7 @@ For example, the "function" OP_asym_cipher_newctx() has these: OSSL_get_OP_asym_cipher_newctx(const OSSL_DISPATCH *opf); B<OSSL_DISPATCH> arrays are indexed by numbers that are provided as -macros in L<openssl-core_numbers.h(7)>, as follows: +macros in L<openssl-core_dispatch.h(7)>, as follows: OP_asym_cipher_newctx OSSL_FUNC_ASYM_CIPHER_NEWCTX OP_asym_cipher_freectx OSSL_FUNC_ASYM_CIPHER_FREECTX diff --git a/doc/man7/provider-base.pod b/doc/man7/provider-base.pod index 69183cf282..d6a510c2dc 100644 --- a/doc/man7/provider-base.pod +++ b/doc/man7/provider-base.pod @@ -7,7 +7,7 @@ provider-base =head1 SYNOPSIS - #include <openssl/core_numbers.h> + #include <openssl/core_dispatch.h> /* * None of these are actual functions, but are displayed like this for @@ -96,7 +96,7 @@ For example, the "function" core_gettable_params() has these: OSSL_get_core_gettable_params(const OSSL_DISPATCH *opf); B<OSSL_DISPATCH> arrays are indexed by numbers that are provided as -macros in L<openssl-core_numbers.h(7)>, as follows: +macros in L<openssl-core_dispatch.h(7)>, as follows: For I<in> (the B<OSSL_DISPATCH> array passed from F<libcrypto> to the provider): @@ -419,7 +419,7 @@ operation C<BAR>. #include <malloc.h> #include <openssl/core.h> - #include <openssl/core_numbers.h> + #include <openssl/core_dispatch.h> /* Errors used in this provider */ #define E_MALLOC 1 @@ -431,7 +431,7 @@ operation C<BAR>. /* * To ensure we get the function signature right, forward declare - * them using function types provided by openssl/core_numbers.h + * them using function types provided by openssl/core_dispatch.h */ OSSL_OP_bar_newctx_fn foo_newctx; OSSL_OP_bar_freectx_fn foo_freectx; @@ -569,7 +569,7 @@ operation C<BAR>. return 1; } -This relies on a few things existing in F<openssl/core_numbers.h>: +This relies on a few things existing in F<openssl/core_dispatch.h>: #define OSSL_OP_BAR 4711 diff --git a/doc/man7/provider-cipher.pod b/doc/man7/provider-cipher.pod index 24c5f40e3f..c3b1b77fe4 100644 --- a/doc/man7/provider-cipher.pod +++ b/doc/man7/provider-cipher.pod @@ -8,7 +8,7 @@ provider-cipher - The cipher library E<lt>-E<gt> provider functions =for openssl multiple includes - #include <openssl/core_numbers.h> + #include <openssl/core_dispatch.h> #include <openssl/core_names.h> /* @@ -77,7 +77,7 @@ For example, the "function" OP_cipher_newctx() has these: OSSL_get_OP_cipher_newctx(const OSSL_DISPATCH *opf); B<OSSL_DISPATCH> arrays are indexed by numbers that are provided as -macros in L<openssl-core_numbers.h(7)>, as follows: +macros in L<openssl-core_dispatch.h(7)>, as follows: OP_cipher_newctx OSSL_FUNC_CIPHER_NEWCTX OP_cipher_freectx OSSL_FUNC_CIPHER_FREECTX diff --git a/doc/man7/provider-digest.pod b/doc/man7/provider-digest.pod index 01b117039a..4164e34bbe 100644 --- a/doc/man7/provider-digest.pod +++ b/doc/man7/provider-digest.pod @@ -8,7 +8,7 @@ provider-digest - The digest library E<lt>-E<gt> provider functions =for openssl multiple includes - #include <openssl/core_numbers.h> + #include <openssl/core_dispatch.h> #include <openssl/core_names.h> /* @@ -69,7 +69,7 @@ For example, the "function" OP_digest_newctx() has these: OSSL_get_OP_digest_newctx(const OSSL_DISPATCH *opf); B<OSSL_DISPATCH> arrays are indexed by numbers that are provided as -macros in L<openssl-core_numbers.h(7)>, as follows: +macros in L<openssl-core_dispatch.h(7)>, as follows: OP_digest_newctx OSSL_FUNC_DIGEST_NEWCTX OP_digest_freectx OSSL_FUNC_DIGEST_FREECTX diff --git a/doc/man7/provider-keyexch.pod b/doc/man7/provider-keyexch.pod index 59cc2033bb..2dcde351e6 100644 --- a/doc/man7/provider-keyexch.pod +++ b/doc/man7/provider-keyexch.pod @@ -8,7 +8,7 @@ provider-keyexch - The keyexch library E<lt>-E<gt> provider functions =for openssl multiple includes - #include <openssl/core_numbers.h> + #include <openssl/core_dispatch.h> #include <openssl/core_names.h> /* @@ -61,7 +61,7 @@ For example, the "function" OP_keyexch_newctx() has these: OSSL_get_OP_keyexch_newctx(const OSSL_DISPATCH *opf); B<OSSL_DISPATCH> arrays are indexed by numbers that are provided as -macros in L<openssl-core_numbers.h(7)>, as follows: +macros in L<openssl-core_dispatch.h(7)>, as follows: OP_keyexch_newctx OSSL_FUNC_KEYEXCH_NEWCTX OP_keyexch_freectx OSSL_FUNC_KEYEXCH_FREECTX diff --git a/doc/man7/provider-keymgmt.pod b/doc/man7/provider-keymgmt.pod index 4202a77b54..21dd51ac9a 100644 --- a/doc/man7/provider-keymgmt.pod +++ b/doc/man7/provider-keymgmt.pod @@ -6,7 +6,7 @@ provider-keymgmt - The KEYMGMT library E<lt>-E<gt> provider functions =head1 SYNOPSIS - #include <openssl/core_numbers.h> + #include <openssl/core_dispatch.h> /* * None of these are actual functions, but are displayed like this for @@ -82,7 +82,7 @@ For example, the "function" OP_keymgmt_new() has these: OSSL_get_OP_keymgmt_new(const OSSL_DISPATCH *opf); B<OSSL_DISPATCH> arrays are indexed by numbers that are provided as -macros in L<openssl-core_numbers.h(7)>, as follows: +macros in L<openssl-core_dispatch.h(7)>, as follows: OP_keymgmt_new OSSL_FUNC_KEYMGMT_NEW OP_keymgmt_free OSSL_FUNC_KEYMGMT_FREE diff --git a/doc/man7/provider-mac.pod b/doc/man7/provider-mac.pod index d0a8881eef..d0b9462509 100644 --- a/doc/man7/provider-mac.pod +++ b/doc/man7/provider-mac.pod @@ -8,7 +8,7 @@ provider-mac - The mac library E<lt>-E<gt> provider functions =for openssl multiple includes - #include <openssl/core_numbers.h> + #include <openssl/core_dispatch.h> #include <openssl/core_names.h> /* @@ -63,7 +63,7 @@ For example, the "function" OP_mac_newctx() has these: OSSL_get_OP_mac_newctx(const OSSL_DISPATCH *opf); B<OSSL_DISPATCH> arrays are indexed by numbers that are provided as -macros in L<openssl-core_numbers.h(7)>, as follows: +macros in L<openssl-core_dispatch.h(7)>, as follows: OP_mac_newctx OSSL_FUNC_MAC_NEWCTX OP_mac_freectx OSSL_FUNC_MAC_FREECTX diff --git a/doc/man7/provider-serializer.pod b/doc/man7/provider-serializer.pod index ad3b5fdd65..8eba0e3e30 100644 --- a/doc/man7/provider-serializer.pod +++ b/doc/man7/provider-serializer.pod @@ -12,7 +12,7 @@ Future development will also include deserializing functions. =end comment - #include <openssl/core_numbers.h> + #include <openssl/core_dispatch.h> /* * None of these are actual functions, but are displayed like this for @@ -76,7 +76,7 @@ For example, the "function" OP_serializer_serialize_data() has these: OSSL_get_OP_serializer_serialize_data(const OSSL_DISPATCH *opf); B<OSSL_DISPATCH> arrays are indexed by numbers that are provided as -macros in L<openssl-core_numbers.h(7)>, as follows: +macros in L<openssl-core_dispatch.h(7)>, as follows: OP_serializer_newctx OSSL_FUNC_SERIALIZER_NEWCTX OP_serializer_freectx OSSL_FUNC_SERIALIZER_FREECTX diff --git a/doc/man7/provider-signature.pod b/doc/man7/provider-signature.pod index 538c342e86..6b20dd9daa 100644 --- a/doc/man7/provider-signature.pod +++ b/doc/man7/provider-signature.pod @@ -8,7 +8,7 @@ provider-signature - The signature library E<lt>-E<gt> provider functions =for openssl multiple includes - #include <openssl/core_numbers.h> + #include <openssl/core_dispatch.h> #include <openssl/core_names.h> /* @@ -101,7 +101,7 @@ For example, the "function" OP_signature_newctx() has these: OSSL_get_OP_signature_newctx(const OSSL_DISPATCH *opf); B<OSSL_DISPATCH> arrays are indexed by numbers that are provided as -macros in L<openssl-core_numbers.h(7)>, as follows: +macros in L<openssl-core_dispatch.h(7)>, as follows: OP_signature_newctx OSSL_FUNC_SIGNATURE_NEWCTX OP_signature_freectx OSSL_FUNC_SIGNATURE_FREECTX diff --git a/include/crypto/evp.h b/include/crypto/evp.h index d1756cf183..1044cad218 100644 --- a/include/crypto/evp.h +++ b/include/crypto/evp.h @@ -8,7 +8,7 @@ */ #include <openssl/evp.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include "internal/refcount.h" #include "crypto/ecx.h" diff --git a/include/internal/provider.h b/include/internal/provider.h index 3bfc154283..dcd57708ba 100644 --- a/include/internal/provider.h +++ b/include/internal/provider.h @@ -11,7 +11,7 @@ # define OSSL_INTERNAL_PROVIDER_H # include <openssl/core.h> -# include <openssl/core_numbers.h> +# include <openssl/core_dispatch.h> # include "internal/dso.h" # include "internal/symhacks.h" diff --git a/include/openssl/core_numbers.h b/include/openssl/core_dispatch.h index af2a35efc0..af2a35efc0 100644 --- a/include/openssl/core_numbers.h +++ b/include/openssl/core_dispatch.h diff --git a/providers/common/bio_prov.c b/providers/common/bio_prov.c index 4ddfa0c414..2186894b11 100644 --- a/providers/common/bio_prov.c +++ b/providers/common/bio_prov.c @@ -8,7 +8,7 @@ */ #include <assert.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include "internal/cryptlib.h" #include "prov/bio.h" diff --git a/providers/common/capabilities.c b/providers/common/capabilities.c index 84d2006cee..a41d3990f0 100644 --- a/providers/common/capabilities.c +++ b/providers/common/capabilities.c @@ -9,7 +9,7 @@ #include <assert.h> #include <string.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> /* For TLS1_VERSION etc */ #include <openssl/ssl.h> diff --git a/providers/common/include/prov/providercommon.h b/providers/common/include/prov/providercommon.h index b9fcf3d52e..2a614f5d81 100644 --- a/providers/common/include/prov/providercommon.h +++ b/providers/common/include/prov/providercommon.h @@ -8,7 +8,7 @@ */ #include <openssl/provider.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> const OSSL_CORE_HANDLE *FIPS_get_core_handle(OPENSSL_CTX *ctx); diff --git a/providers/defltprov.c b/providers/defltprov.c index 7c1ffc7763..1ea3604377 100644 --- a/providers/defltprov.c +++ b/providers/defltprov.c @@ -11,7 +11,7 @@ #include <stdio.h> #include <openssl/opensslconf.h> #include <openssl/core.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/params.h> #include "prov/bio.h" diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index 6a1b56eeae..d847d5c903 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -10,7 +10,7 @@ #include <string.h> #include <stdio.h> #include <openssl/core.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/params.h> #include <openssl/err.h> diff --git a/providers/fips/self_test.h b/providers/fips/self_test.h index ad693aa9a2..77ef6314ef 100644 --- a/providers/fips/self_test.h +++ b/providers/fips/self_test.h @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/types.h> #include <openssl/self_test.h> diff --git a/providers/implementations/asymciphers/rsa_enc.c b/providers/implementations/asymciphers/rsa_enc.c index db89de8a26..86d4b878fa 100644 --- a/providers/implementations/asymciphers/rsa_enc.c +++ b/providers/implementations/asymciphers/rsa_enc.c @@ -15,7 +15,7 @@ #include <openssl/crypto.h> #include <openssl/evp.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/rsa.h> #include <openssl/params.h> diff --git a/providers/implementations/ciphers/cipher_null.c b/providers/implementations/ciphers/cipher_null.c index 6443e65742..20567279eb 100644 --- a/providers/implementations/ciphers/cipher_null.c +++ b/providers/implementations/ciphers/cipher_null.c @@ -9,7 +9,7 @@ #include <string.h> #include <openssl/crypto.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include "prov/implementations.h" #include "prov/ciphercommon.h" #include "prov/providercommonerr.h" diff --git a/providers/implementations/ciphers/cipher_tdes.h b/providers/implementations/ciphers/cipher_tdes.h index 98bb32ee3c..8455cc4660 100644 --- a/providers/implementations/ciphers/cipher_tdes.h +++ b/providers/implementations/ciphers/cipher_tdes.h @@ -8,7 +8,7 @@ */ #include <openssl/des.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include "crypto/des_platform.h" #define DES_BLOCK_SIZE 8 diff --git a/providers/implementations/digests/sha2_prov.c b/providers/implementations/digests/sha2_prov.c index 91be5087f5..4cabd323de 100644 --- a/providers/implementations/digests/sha2_prov.c +++ b/providers/implementations/digests/sha2_prov.c @@ -14,7 +14,7 @@ #include "internal/deprecated.h" #include <openssl/crypto.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/evp.h> #include <openssl/sha.h> #include <openssl/evp.h> diff --git a/providers/implementations/exchange/dh_exch.c b/providers/implementations/exchange/dh_exch.c index 3830e0e0be..c8ed76e8b1 100644 --- a/providers/implementations/exchange/dh_exch.c +++ b/providers/implementations/exchange/dh_exch.c @@ -14,7 +14,7 @@ #include "internal/deprecated.h" #include <openssl/crypto.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/dh.h> #include <openssl/params.h> diff --git a/providers/implementations/exchange/ecdh_exch.c b/providers/implementations/exchange/ecdh_exch.c index ae0720d90d..686559d561 100644 --- a/providers/implementations/exchange/ecdh_exch.c +++ b/providers/implementations/exchange/ecdh_exch.c @@ -16,7 +16,7 @@ #include <string.h> #include <openssl/crypto.h> #include <openssl/evp.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/ec.h> #include <openssl/params.h> diff --git a/providers/implementations/exchange/ecx_exch.c b/providers/implementations/exchange/ecx_exch.c index ea12628937..311a31d36a 100644 --- a/providers/implementations/exchange/ecx_exch.c +++ b/providers/implementations/exchange/ecx_exch.c @@ -8,7 +8,7 @@ */ #include <openssl/crypto.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/params.h> #include <openssl/err.h> diff --git a/providers/implementations/include/prov/ciphercommon.h b/providers/implementations/include/prov/ciphercommon.h index d4dc5ed1db..fe3b3143c4 100644 --- a/providers/implementations/include/prov/ciphercommon.h +++ b/providers/implementations/include/prov/ciphercommon.h @@ -8,7 +8,7 @@ */ #include <openssl/params.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/evp.h> #include "internal/cryptlib.h" diff --git a/providers/implementations/include/prov/digestcommon.h b/providers/implementations/include/prov/digestcommon.h index e5b76ff49f..99fe09cbe6 100644 --- a/providers/implementations/include/prov/digestcommon.h +++ b/providers/implementations/include/prov/digestcommon.h @@ -10,7 +10,7 @@ #ifndef OSSL_PROVIDERS_DIGESTCOMMON_H # define OSSL_PROVIDERS_DIGESTCOMMON_H -# include <openssl/core_numbers.h> +# include <openssl/core_dispatch.h> # include <openssl/core_names.h> # include <openssl/params.h> diff --git a/providers/implementations/keymgmt/dh_kmgmt.c b/providers/implementations/keymgmt/dh_kmgmt.c index 82fbdc8bb4..52709b4e2d 100644 --- a/providers/implementations/keymgmt/dh_kmgmt.c +++ b/providers/implementations/keymgmt/dh_kmgmt.c @@ -14,7 +14,7 @@ #include "internal/deprecated.h" #include <string.h> /* strcmp */ -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/bn.h> #include <openssl/err.h> diff --git a/providers/implementations/keymgmt/dsa_kmgmt.c b/providers/implementations/keymgmt/dsa_kmgmt.c index 5fa3e08af9..feadb875dc 100644 --- a/providers/implementations/keymgmt/dsa_kmgmt.c +++ b/providers/implementations/keymgmt/dsa_kmgmt.c @@ -14,7 +14,7 @@ #include "internal/deprecated.h" #include "e_os.h" /* strcasecmp */ -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/bn.h> #include <openssl/err.h> diff --git a/providers/implementations/keymgmt/ec_kmgmt.c b/providers/implementations/keymgmt/ec_kmgmt.c index cd8e7f5ece..7212ddf973 100644 --- a/providers/implementations/keymgmt/ec_kmgmt.c +++ b/providers/implementations/keymgmt/ec_kmgmt.c @@ -13,7 +13,7 @@ */ #include "internal/deprecated.h" -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/bn.h> #include <openssl/err.h> diff --git a/providers/implementations/keymgmt/ecx_kmgmt.c b/providers/implementations/keymgmt/ecx_kmgmt.c index 813604f7b1..33fecba8b8 100644 --- a/providers/implementations/keymgmt/ecx_kmgmt.c +++ b/providers/implementations/keymgmt/ecx_kmgmt.c @@ -11,7 +11,7 @@ #include <string.h> /* For strcasecmp on Windows */ #include "e_os.h" -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/params.h> #include <openssl/err.h> diff --git a/providers/implementations/keymgmt/rsa_kmgmt.c b/providers/implementations/keymgmt/rsa_kmgmt.c index 313b9c292d..f8b466a603 100644 --- a/providers/implementations/keymgmt/rsa_kmgmt.c +++ b/providers/implementations/keymgmt/rsa_kmgmt.c @@ -13,7 +13,7 @@ */ #include "internal/deprecated.h" -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/bn.h> #include <openssl/err.h> diff --git a/providers/implementations/macs/blake2_mac_impl.c b/providers/implementations/macs/blake2_mac_impl.c index 6b6261f31c..64d997bd50 100644 --- a/providers/implementations/macs/blake2_mac_impl.c +++ b/providers/implementations/macs/blake2_mac_impl.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/params.h> diff --git a/providers/implementations/macs/cmac_prov.c b/providers/implementations/macs/cmac_prov.c index 1377c795df..748824782f 100644 --- a/providers/implementations/macs/cmac_prov.c +++ b/providers/implementations/macs/cmac_prov.c @@ -13,7 +13,7 @@ */ #include "internal/deprecated.h" -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/params.h> #include <openssl/engine.h> diff --git a/providers/implementations/macs/gmac_prov.c b/providers/implementations/macs/gmac_prov.c index f9e5a3a17d..5a0174573d 100644 --- a/providers/implementations/macs/gmac_prov.c +++ b/providers/implementations/macs/gmac_prov.c @@ -8,7 +8,7 @@ */ #include <stdlib.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/params.h> #include <openssl/engine.h> diff --git a/providers/implementations/macs/hmac_prov.c b/providers/implementations/macs/hmac_prov.c index bd2cff27af..6974db2944 100644 --- a/providers/implementations/macs/hmac_prov.c +++ b/providers/implementations/macs/hmac_prov.c @@ -13,7 +13,7 @@ */ #include "internal/deprecated.h" -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/params.h> #include <openssl/engine.h> diff --git a/providers/implementations/macs/kmac_prov.c b/providers/implementations/macs/kmac_prov.c index da465965de..d1ccda9b23 100644 --- a/providers/implementations/macs/kmac_prov.c +++ b/providers/implementations/macs/kmac_prov.c @@ -48,7 +48,7 @@ #include <stdlib.h> #include <string.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/params.h> #include <openssl/evp.h> diff --git a/providers/implementations/macs/poly1305_prov.c b/providers/implementations/macs/poly1305_prov.c index 1edd2dc063..b14fc35b3e 100644 --- a/providers/implementations/macs/poly1305_prov.c +++ b/providers/implementations/macs/poly1305_prov.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/params.h> #include <openssl/evp.h> diff --git a/providers/implementations/macs/siphash_prov.c b/providers/implementations/macs/siphash_prov.c index e82f94ce7b..4ddcb43d59 100644 --- a/providers/implementations/macs/siphash_prov.c +++ b/providers/implementations/macs/siphash_prov.c @@ -8,7 +8,7 @@ */ #include <string.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/params.h> #include <openssl/evp.h> diff --git a/providers/implementations/serializers/serializer_dh_param.c b/providers/implementations/serializers/serializer_dh_param.c index 4acf5caec6..7254695697 100644 --- a/providers/implementations/serializers/serializer_dh_param.c +++ b/providers/implementations/serializers/serializer_dh_param.c @@ -13,7 +13,7 @@ */ #include "internal/deprecated.h" -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/pem.h> #include <openssl/dh.h> #include <openssl/types.h> diff --git a/providers/implementations/serializers/serializer_dh_priv.c b/providers/implementations/serializers/serializer_dh_priv.c index c37eb40297..7badf827ea 100644 --- a/providers/implementations/serializers/serializer_dh_priv.c +++ b/providers/implementations/serializers/serializer_dh_priv.c @@ -13,7 +13,7 @@ */ #include "internal/deprecated.h" -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/err.h> #include <openssl/pem.h> diff --git a/providers/implementations/serializers/serializer_dh_pub.c b/providers/implementations/serializers/serializer_dh_pub.c index d1b60d87c5..45aa2a946c 100644 --- a/providers/implementations/serializers/serializer_dh_pub.c +++ b/providers/implementations/serializers/serializer_dh_pub.c @@ -13,7 +13,7 @@ */ #include "internal/deprecated.h" -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/err.h> #include <openssl/pem.h> #include <openssl/dh.h> diff --git a/providers/implementations/serializers/serializer_dsa_param.c b/providers/implementations/serializers/serializer_dsa_param.c index 23a6d1d25d..40e9a7b7ae 100644 --- a/providers/implementations/serializers/serializer_dsa_param.c +++ b/providers/implementations/serializers/serializer_dsa_param.c @@ -13,7 +13,7 @@ */ #include "internal/deprecated.h" -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/pem.h> #include <openssl/dsa.h> #include <openssl/types.h> diff --git a/providers/implementations/serializers/serializer_dsa_priv.c b/providers/implementations/serializers/serializer_dsa_priv.c index cb9136140d..4e9f80056e 100644 --- a/providers/implementations/serializers/serializer_dsa_priv.c +++ b/providers/implementations/serializers/serializer_dsa_priv.c @@ -13,7 +13,7 @@ */ #include "internal/deprecated.h" -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/err.h> #include <openssl/pem.h> diff --git a/providers/implementations/serializers/serializer_dsa_pub.c b/providers/implementations/serializers/serializer_dsa_pub.c index 5c5e61f13d..b47d0dd2d7 100644 --- a/providers/implementations/serializers/serializer_dsa_pub.c +++ b/providers/implementations/serializers/serializer_dsa_pub.c @@ -13,7 +13,7 @@ */ #include "internal/deprecated.h" -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/err.h> #include <openssl/pem.h> #include <openssl/dsa.h> diff --git a/providers/implementations/serializers/serializer_ec_param.c b/providers/implementations/serializers/serializer_ec_param.c index a82971602f..7eda31f3a0 100644 --- a/providers/implementations/serializers/serializer_ec_param.c +++ b/providers/implementations/serializers/serializer_ec_param.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/pem.h> #include <openssl/ec.h> #include <openssl/types.h> diff --git a/providers/implementations/serializers/serializer_ec_priv.c b/providers/implementations/serializers/serializer_ec_priv.c index 4a0e3d8be7..e96c08b7e7 100644 --- a/providers/implementations/serializers/serializer_ec_priv.c +++ b/providers/implementations/serializers/serializer_ec_priv.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/err.h> #include <openssl/pem.h> diff --git a/providers/implementations/serializers/serializer_ec_pub.c b/providers/implementations/serializers/serializer_ec_pub.c index 1c145cf3c0..87e7646285 100644 --- a/providers/implementations/serializers/serializer_ec_pub.c +++ b/providers/implementations/serializers/serializer_ec_pub.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/err.h> #include <openssl/pem.h> #include <openssl/types.h> diff --git a/providers/implementations/serializers/serializer_ecx_priv.c b/providers/implementations/serializers/serializer_ecx_priv.c index ea46d6c5e4..0036ea6878 100644 --- a/providers/implementations/serializers/serializer_ecx_priv.c +++ b/providers/implementations/serializers/serializer_ecx_priv.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/err.h> #include <openssl/pem.h> diff --git a/providers/implementations/serializers/serializer_ecx_pub.c b/providers/implementations/serializers/serializer_ecx_pub.c index 94483f10ed..3e2c7620ac 100644 --- a/providers/implementations/serializers/serializer_ecx_pub.c +++ b/providers/implementations/serializers/serializer_ecx_pub.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/err.h> #include <openssl/pem.h> #include <openssl/types.h> diff --git a/providers/implementations/serializers/serializer_local.h b/providers/implementations/serializers/serializer_local.h index f4aee6fc23..237e83a195 100644 --- a/providers/implementations/serializers/serializer_local.h +++ b/providers/implementations/serializers/serializer_local.h @@ -8,7 +8,7 @@ */ #include <openssl/core.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/bn.h> #include <openssl/asn1.h> /* i2d_of_void */ #include <openssl/x509.h> /* X509_SIG */ diff --git a/providers/implementations/serializers/serializer_rsa_priv.c b/providers/implementations/serializers/serializer_rsa_priv.c index 981ddcf2fc..115a8a6d7b 100644 --- a/providers/implementations/serializers/serializer_rsa_priv.c +++ b/providers/implementations/serializers/serializer_rsa_priv.c @@ -13,7 +13,7 @@ */ #include "internal/deprecated.h" -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/err.h> #include <openssl/pem.h> diff --git a/providers/implementations/serializers/serializer_rsa_pub.c b/providers/implementations/serializers/serializer_rsa_pub.c index 80e1504611..d5da6df805 100644 --- a/providers/implementations/serializers/serializer_rsa_pub.c +++ b/providers/implementations/serializers/serializer_rsa_pub.c @@ -13,7 +13,7 @@ */ #include "internal/deprecated.h" -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/pem.h> #include <openssl/rsa.h> #include <openssl/types.h> diff --git a/providers/implementations/signature/dsa.c b/providers/implementations/signature/dsa.c index a4902babcb..067f9e70c7 100644 --- a/providers/implementations/signature/dsa.c +++ b/providers/implementations/signature/dsa.c @@ -16,7 +16,7 @@ #include <string.h> #include <openssl/crypto.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/err.h> #include <openssl/dsa.h> diff --git a/providers/implementations/signature/ecdsa.c b/providers/implementations/signature/ecdsa.c index 61a13f4f2f..7ee14ff16b 100644 --- a/providers/implementations/signature/ecdsa.c +++ b/providers/implementations/signature/ecdsa.c @@ -15,7 +15,7 @@ #include <string.h> /* memcpy */ #include <openssl/crypto.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/dsa.h> #include <openssl/params.h> diff --git a/providers/implementations/signature/eddsa.c b/providers/implementations/signature/eddsa.c index 35a69504d3..9a7188ef7e 100644 --- a/providers/implementations/signature/eddsa.c +++ b/providers/implementations/signature/eddsa.c @@ -8,7 +8,7 @@ */ #include <openssl/crypto.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/err.h> #include <openssl/params.h> diff --git a/providers/implementations/signature/rsa.c b/providers/implementations/signature/rsa.c index 5af64d2a90..49334e5cf0 100644 --- a/providers/implementations/signature/rsa.c +++ b/providers/implementations/signature/rsa.c @@ -15,7 +15,7 @@ #include <string.h> #include <openssl/crypto.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/err.h> #include <openssl/rsa.h> diff --git a/providers/legacyprov.c b/providers/legacyprov.c index 886037cff9..288c17d2e4 100644 --- a/providers/legacyprov.c +++ b/providers/legacyprov.c @@ -10,7 +10,7 @@ #include <string.h> #include <stdio.h> #include <openssl/core.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/params.h> #include "prov/provider_ctx.h" diff --git a/providers/nullprov.c b/providers/nullprov.c index 945ec2fbb6..bdad5f15e6 100644 --- a/providers/nullprov.c +++ b/providers/nullprov.c @@ -10,7 +10,7 @@ #include <string.h> #include <stdio.h> #include <openssl/core.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/params.h> #include "prov/implementations.h" diff --git a/test/filterprov.c b/test/filterprov.c index c2189e25a8..03063d6206 100644 --- a/test/filterprov.c +++ b/test/filterprov.c @@ -14,7 +14,7 @@ #include <string.h> #include <openssl/core.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/provider.h> #include <openssl/crypto.h> diff --git a/test/p_test.c b/test/p_test.c index 5a491234a0..9a0f22947a 100644 --- a/test/p_test.c +++ b/test/p_test.c @@ -27,7 +27,7 @@ #endif #include <openssl/core.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> static OSSL_core_gettable_params_fn *c_gettable_params = NULL; static OSSL_core_get_params_fn *c_get_params = NULL; diff --git a/test/sslapitest.c b/test/sslapitest.c index c3ee6fa996..989d041a17 100644 --- a/test/sslapitest.c +++ b/test/sslapitest.c @@ -28,7 +28,7 @@ #include <openssl/aes.h> #include <openssl/rand.h> #include <openssl/core_names.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/provider.h> #include "ssltestlib.h" diff --git a/test/tls-provider.c b/test/tls-provider.c index 4025d9ee16..158c00747c 100644 --- a/test/tls-provider.c +++ b/test/tls-provider.c @@ -9,7 +9,7 @@ #include <string.h> #include <openssl/core_names.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include <openssl/rand.h> #include <openssl/params.h> /* For TLS1_3_VERSION */ |