summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com>2020-06-21 01:21:19 +0200
committerDr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com>2020-06-24 22:01:22 +0200
commit23c48d94d4d34eedc15fa65e0fa0e38a6137e09f (patch)
tree1cb95463b3278767a65f853b2cc084790a247c44
parent5b286641efef67aed5af026302b2176e3e368ae9 (diff)
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)
-rw-r--r--apps/provider.c2
-rw-r--r--crypto/core_algorithm.c2
-rw-r--r--crypto/evp/evp_local.h2
-rw-r--r--crypto/evp/kdf_meth.c2
-rw-r--r--crypto/evp/keymgmt_meth.c2
-rw-r--r--crypto/evp/mac_meth.c2
-rw-r--r--crypto/initthread.c2
-rw-r--r--crypto/provider_core.c2
-rw-r--r--crypto/serializer/serializer_local.h2
-rw-r--r--crypto/serializer/serializer_meth.c2
-rw-r--r--doc/internal/man3/evp_generic_fetch.pod2
-rw-r--r--doc/man7/OSSL_PROVIDER-FIPS.pod2
-rw-r--r--doc/man7/OSSL_PROVIDER-default.pod2
-rw-r--r--doc/man7/OSSL_PROVIDER-legacy.pod2
-rw-r--r--doc/man7/openssl-core.h.pod4
-rw-r--r--doc/man7/openssl-core_dispatch.h.pod (renamed from doc/man7/openssl-core_numbers.h.pod)6
-rw-r--r--doc/man7/provider-asym_cipher.pod4
-rw-r--r--doc/man7/provider-base.pod10
-rw-r--r--doc/man7/provider-cipher.pod4
-rw-r--r--doc/man7/provider-digest.pod4
-rw-r--r--doc/man7/provider-keyexch.pod4
-rw-r--r--doc/man7/provider-keymgmt.pod4
-rw-r--r--doc/man7/provider-mac.pod4
-rw-r--r--doc/man7/provider-serializer.pod4
-rw-r--r--doc/man7/provider-signature.pod4
-rw-r--r--include/crypto/evp.h2
-rw-r--r--include/internal/provider.h2
-rw-r--r--include/openssl/core_dispatch.h (renamed from include/openssl/core_numbers.h)0
-rw-r--r--providers/common/bio_prov.c2
-rw-r--r--providers/common/capabilities.c2
-rw-r--r--providers/common/include/prov/providercommon.h2
-rw-r--r--providers/defltprov.c2
-rw-r--r--providers/fips/fipsprov.c2
-rw-r--r--providers/fips/self_test.h2
-rw-r--r--providers/implementations/asymciphers/rsa_enc.c2
-rw-r--r--providers/implementations/ciphers/cipher_null.c2
-rw-r--r--providers/implementations/ciphers/cipher_tdes.h2
-rw-r--r--providers/implementations/digests/sha2_prov.c2
-rw-r--r--providers/implementations/exchange/dh_exch.c2
-rw-r--r--providers/implementations/exchange/ecdh_exch.c2
-rw-r--r--providers/implementations/exchange/ecx_exch.c2
-rw-r--r--providers/implementations/include/prov/ciphercommon.h2
-rw-r--r--providers/implementations/include/prov/digestcommon.h2
-rw-r--r--providers/implementations/keymgmt/dh_kmgmt.c2
-rw-r--r--providers/implementations/keymgmt/dsa_kmgmt.c2
-rw-r--r--providers/implementations/keymgmt/ec_kmgmt.c2
-rw-r--r--providers/implementations/keymgmt/ecx_kmgmt.c2
-rw-r--r--providers/implementations/keymgmt/rsa_kmgmt.c2
-rw-r--r--providers/implementations/macs/blake2_mac_impl.c2
-rw-r--r--providers/implementations/macs/cmac_prov.c2
-rw-r--r--providers/implementations/macs/gmac_prov.c2
-rw-r--r--providers/implementations/macs/hmac_prov.c2
-rw-r--r--providers/implementations/macs/kmac_prov.c2
-rw-r--r--providers/implementations/macs/poly1305_prov.c2
-rw-r--r--providers/implementations/macs/siphash_prov.c2
-rw-r--r--providers/implementations/serializers/serializer_dh_param.c2
-rw-r--r--providers/implementations/serializers/serializer_dh_priv.c2
-rw-r--r--providers/implementations/serializers/serializer_dh_pub.c2
-rw-r--r--providers/implementations/serializers/serializer_dsa_param.c2
-rw-r--r--providers/implementations/serializers/serializer_dsa_priv.c2
-rw-r--r--providers/implementations/serializers/serializer_dsa_pub.c2
-rw-r--r--providers/implementations/serializers/serializer_ec_param.c2
-rw-r--r--providers/implementations/serializers/serializer_ec_priv.c2
-rw-r--r--providers/implementations/serializers/serializer_ec_pub.c2
-rw-r--r--providers/implementations/serializers/serializer_ecx_priv.c2
-rw-r--r--providers/implementations/serializers/serializer_ecx_pub.c2
-rw-r--r--providers/implementations/serializers/serializer_local.h2
-rw-r--r--providers/implementations/serializers/serializer_rsa_priv.c2
-rw-r--r--providers/implementations/serializers/serializer_rsa_pub.c2
-rw-r--r--providers/implementations/signature/dsa.c2
-rw-r--r--providers/implementations/signature/ecdsa.c2
-rw-r--r--providers/implementations/signature/eddsa.c2
-rw-r--r--providers/implementations/signature/rsa.c2
-rw-r--r--providers/legacyprov.c2
-rw-r--r--providers/nullprov.c2
-rw-r--r--test/filterprov.c2
-rw-r--r--test/p_test.c2
-rw-r--r--test/sslapitest.c2
-rw-r--r--test/tls-provider.c2
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(