Rename <openssl/core_numbers.h> -> <openssl/core_dispatch.h>

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12222)

diff --git a/apps/provider.c b/apps/provider.c
index d1a1ce7e4fcf6d553b1b5bf5b2af12f3000742a8..83fb2f3aee2c4540bc0bd7e9518d7fdd6f100311 100644 (file)
--- 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 f2e0e06fa8ee0e3d262a00ecd357ce334e71f244..b035ecfbb4cfd718bd9a9631411a6331ca2c1884 100644 (file)
--- 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 132534464fdf9508942170b8c6c71bb1e255ed42..4138ad8d9519352648863a4469a4d850990e4d56 100644 (file)
--- 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 219dbdfa07ac4550c1405b07bf9c78783c51b1e3..a328c97c0882d881dfff4f0a08548aaefbe813ad 100644 (file)
--- 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 ab5e00dfba95b84745dac73b90cb03cbd4e606a0..55dcae73e3de43ca4536970568cfc89f2cee0122 100644 (file)
--- 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 b1fadb6cebed538c15f8f5aa81283f694af3c2c8..c22ebd335fc370044ccef75169bbff3348ee5ecc 100644 (file)
--- 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 a97cf359af5b37ca3ddc66908edc213327267bf9..23b34966a564ced1e6bb5b4cd8a74b36d1dbf0be 100644 (file)
--- 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 cfaa09ff7b661ae36efb356d598c74948f1672da..20319b74178f386e6da45f4199c02889dc7edf49 100644 (file)
--- 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 44578448fc4a5b8876826bf1301ca29876bed9bf..121616d24afbb9019358eedfeb29bbe6616b9ed8 100644 (file)
--- 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 e3e77c542a65427ab4cae2eb912c07ee81d93967..b95bd14a51b527517019c9e70ff77a4dd08a9f75 100644 (file)
--- 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 4cff97def81c1f76ee87967e04a46e075544a22d..4d2f6bdd69c42678d7f6fcb72b837258c2ad772a 100644 (file)
--- 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 1da465f47b6c8f8da406cee3ca313520ae48e15e..dd4d21f7ccbd5ab33ff1fb43977ef1de10dc3fbf 100644 (file)
--- 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 91b02c5e67eb6cd392aa0012eab32fb8833f80fe..d9a51dce0001bed11255241deaf6aeeb66484876 100644 (file)
--- 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 db2d57ed59f97c63410796022e554a53d8af7cfa..36aeafec9492c6856cb3e1ef9a8e70b89618b3aa 100644 (file)
--- 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 28307a97d4095be688116077a259fa8e77f880c4..945cca0edab87ed3e8a47aada3d99e964878a107 100644 (file)
--- 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
similarity index 89%
rename from doc/man7/openssl-core_numbers.h.pod
rename to doc/man7/openssl-core_dispatch.h.pod
index d9bdcbc8105391994797ebf8a6f5629f0c9edd9b..a19e1331fa68b8529d69b2ad89e5d3946aacdcd9 100644 (file)
--- 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 a271cb408b2e1d8eecd7fe8f84fb20919b662b72..5a911f9a0ef69bf03e2873907b13e0ae03209375 100644 (file)
--- 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 69183cf28285729263085f8041c05367227a11a5..d6a510c2dca52601d366a549307f961a2a347213 100644 (file)
--- 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 24c5f40e3fdcacb5e0061c7d87687006e673f616..c3b1b77fe4cb696bce983c0cc2078cf661299cd2 100644 (file)
--- 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 01b117039ae2f1b8a6e34476e2a4cb1dae2ce808..4164e34bbe894881ecbbdbb9c02efea7e5c5a95d 100644 (file)
--- 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 59cc2033bb52cf08c9cb05e6b9e891405c55bfd9..2dcde351e65aa23c0f36e38cf2575a1da69a99ce 100644 (file)
--- 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 4202a77b54d5711e04ed3634f5145513d4f37f17..21dd51ac9ab52ceaa8d78dfd4769158d4fb9f4f8 100644 (file)
--- 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 d0a8881eef5e1d90b39b82e5837ef86c758a657c..d0b9462509841526f9b1dc587f22b1573811285d 100644 (file)
--- 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 ad3b5fdd6593ff92759fc7d4369bd8252b41ddab..8eba0e3e30169cf4a59c011424260bfc864c0173 100644 (file)
--- 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 538c342e86a94a4b7eecafcaadde0022f4b9ed2e..6b20dd9daaa7fac604a07d3f667bbb195ae7c041 100644 (file)
--- 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 d1756cf183bea0c985e91e310af8ebab2a92550d..1044cad218fe6b915e5ad2c5eb1a1e78c75e134c 100644 (file)
--- 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 3bfc1542839d9b6eb993d06487d0e53db4d5df7b..dcd57708bafe66c92e43676f0cc315ad4007e852 100644 (file)
--- 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
similarity index 100%
rename from include/openssl/core_numbers.h
rename to include/openssl/core_dispatch.h

diff --git a/providers/common/bio_prov.c b/providers/common/bio_prov.c
index 4ddfa0c4148f0e0a3e5be14d14b609af16ec1d7d..2186894b11072092ce388a6dea1ad13ae6afcf83 100644 (file)
--- 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 84d2006ceeeeeddd3ca565a95f7643bd1ee8e5ac..a41d3990f0d92b5f9067d41ba15f96d4e9a0cc3c 100644 (file)
--- 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 b9fcf3d52e1eea2b71b9aefa0543e3adab23e76b..2a614f5d815461a2f3c5e1493a03c73ba981d1cd 100644 (file)
--- 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 7c1ffc7763e1ebfa9ffad36af30d2ae7e0ee85b1..1ea360437757fcfa6b77d6f77b36cd9772aa6eca 100644 (file)
--- 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 6a1b56eeae806c1678337df7497b52f3b031a42e..d847d5c903eaffceba6341b19dc2c53cc998410e 100644 (file)
--- 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 ad693aa9a24534a5434361b25d8b7ec10bf01b14..77ef6314ef84fff5332f5213c46fcc7d852fef58 100644 (file)
--- 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 db89de8a268a8f50c5bf888ee15fa5026c652c15..86d4b878fa0477742198b00850245d47d321b92c 100644 (file)
--- 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 6443e6574203ec9f90908fbf607ea2fde0db2652..20567279ebb93ee1fb53de8d8a2096c12d0ba258 100644 (file)
--- 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 98bb32ee3c5cf189d3686dce5e79adbc42d3aef5..8455cc466001225ad313df86260b9b45eb135f85 100644 (file)
--- 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 91be5087f52cffea1d67e12023207e24e2b34d5f..4cabd323dee90a51f9f57ce0e73fd6e3eae953a3 100644 (file)
--- 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 3830e0e0be3e13831facb28e303399ed11d15986..c8ed76e8b168b73420c4def6251d80d7ff5133fe 100644 (file)
--- 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 ae0720d90debc2c9a268ea51073b8053d4328644..686559d5617cc02b8c268c3c28b4e439f9878420 100644 (file)
--- 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 ea12628937392fd4d420d2eb130bebbfcfc2f953..311a31d36a933c069a1e2f4974093826ea9e4d1d 100644 (file)
--- 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 d4dc5ed1db02847f6d622d7b7e791cf223fac471..fe3b3143c47f0da345b284bb7f41c55066b98b6d 100644 (file)
--- 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 e5b76ff49f06efb5fb17d5d95a6a1436f3537c15..99fe09cbe6ee21c2c3db08370f6d156b3bd196ab 100644 (file)
--- 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 82fbdc8bb415da8bb006449634e2f7ace6630da4..52709b4e2ddb4d921466c5b6813a7bd0d19bde76 100644 (file)
--- 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 5fa3e08af9db0b3a6e9e03fa37705b7e8c55558f..feadb875dcd41c29743ca4f9095ba24fbdce545e 100644 (file)
--- 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 cd8e7f5ecec90920cf110bd6cb4786f0e5e3fe78..7212ddf9731c53fa93c2fb8f0cd785a20302abc3 100644 (file)
--- 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 813604f7b1febb770fd07d16120f5e95c3b7c8fd..33fecba8b82d27f17af307628bb5db3f4642e8d3 100644 (file)
--- 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 313b9c292df8114e4e72d87c2da743736d70e2ef..f8b466a60379d5f176a03a1ae0893d3c40cba965 100644 (file)
--- 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 6b6261f31c7bfb2772bbfc2f4bf6586d89fc2976..64d997bd50e235f0e8f8ccd8650eb0f4c59fe28f 100644 (file)
--- 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 1377c795df495be0d7593a89623e3751d7a875dd..748824782f5323d26964f406f1d77d97e4af82ad 100644 (file)
--- 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 f9e5a3a17d52e22e9b8139ba9dbea4c51446cd2e..5a0174573d12b6e514ec55d74796444822cb4756 100644 (file)
--- 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 bd2cff27affd2d20a9259fd2950c95b74c3b1164..6974db294457dcc7a79368e8f60230f8da666838 100644 (file)
--- 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 da465965de1e0855dc64fdd9ab68b2a8d43388e0..d1ccda9b23c2ba227029d6628e461eea1dcc6a42 100644 (file)
--- 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 1edd2dc06312a60270ca7c98c613f463be5ba305..b14fc35b3e9cb9283a0c674f662749686713ad9d 100644 (file)
--- 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 e82f94ce7bd939bbd4d1845c467c9b40a2022944..4ddcb43d593f7335b5d678d7af254614b754d3db 100644 (file)
--- 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 4acf5caec651f6b5f99dff103ebe284eae0d4376..725469569793d7654cced4a921980b85389d4d94 100644 (file)
--- 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 c37eb40297e61d6228be2d43383e26dc38974490..7badf827ea57a321e2d18f83a17f27eed70d5a55 100644 (file)
--- 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 d1b60d87c522ac3b4cfdb15581acc40f8a99f515..45aa2a946c91d5381cdff1ddedf61fb64f22e559 100644 (file)
--- 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 23a6d1d25dd17a2d3cd98f0f18014547acd73f60..40e9a7b7ae4ceb4073c36c484605f8583ff06eae 100644 (file)
--- 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 cb9136140ddae70eafd0307665d6b5e649d53fc5..4e9f80056e1b70a570391661042be7430af6d32d 100644 (file)
--- 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 5c5e61f13d3f1f05e173126d5fafc8f7a07f1920..b47d0dd2d7cd562692a3ee678e59f4fc3199a58b 100644 (file)
--- 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 a82971602f36f46e0a459cd0b60645ff510dfc0b..7eda31f3a0dd59864b15416fe47d422629db24f0 100644 (file)
--- 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 4a0e3d8be70bedbf08768bab61dc7a21b3e4b141..e96c08b7e73fc57a695ac55f67a0f312c0e15ef7 100644 (file)
--- 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 1c145cf3c0412a6c17d8f3e06a9106d022e9cb5d..87e7646285e7673c7594551bfe8802c261741a69 100644 (file)
--- 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 ea46d6c5e485b8fa0284508c8aaa1d85a1a623fb..0036ea68787df0539ec2912c467c2b027c3323d0 100644 (file)
--- 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 94483f10edaa9322d650188383c53c7ae559a2ad..3e2c7620ac80af6bfc7b1dc43bd423ab14666ffa 100644 (file)
--- 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 f4aee6fc23b05f8b1858798307d009e2d75d0376..237e83a195d060363851473755d319c49d5d8de7 100644 (file)
--- 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 981ddcf2fc5370c291fbba126b64e3ebd9a3f1ee..115a8a6d7bba8075db90f4b07f58a1d6888233ea 100644 (file)
--- 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 80e1504611c7a4d2ec7616f4d237e1c6303a8c8c..d5da6df80515402e359eba13f6a869dc39ce504c 100644 (file)
--- 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 a4902babcbae3c877bec76195ea02a1b62dad7a2..067f9e70c72f83f898fbcaf3346fdfcb0fec65dd 100644 (file)
--- 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 61a13f4f2f80565cce48fc1260e149cb6337bb00..7ee14ff16bcb58d4cc1cb8ff5cb1f71836ac5a1c 100644 (file)
--- 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 35a69504d37158ee45a12cab344995d339d83036..9a7188ef7e4efd6349636dd5d900e592fc8a93f3 100644 (file)
--- 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 5af64d2a9084c5b289738056894dbbb691d27eb0..49334e5cf0aa6564a58e6283b74403e95ecd87b0 100644 (file)
--- 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 886037cff9e2ff278f0d2a0be385c4bc37428583..288c17d2e4f40dbc8019f5ec40592ed183c85374 100644 (file)
--- 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 945ec2fbb6d82af7680cc7334a42174fc1f392be..bdad5f15e64613cf7383cdb5e65d3325307c8078 100644 (file)
--- 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 c2189e25a83cf3168678e1d37308fcad82321acb..03063d6206b6d883fbab063aca3594ca1f0d89b7 100644 (file)
--- 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 5a491234a06485033a0d0528bc8504d32aa78380..9a0f22947a0f175b831f4cfedf21f93169829c0b 100644 (file)
--- 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 c3ee6fa9968340aacbd8f041269ed5602c93f352..989d041a17997e681c6cd6126d46160183485e04 100644 (file)
--- 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 4025d9ee168d185d68212c20b9fac06a024570e0..158c00747c7594508643fa6ae8ebdd776491f720 100644 (file)
--- 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 */