Make the naming scheme for dispatched functions more consistent

[oweals/openssl.git] / providers / implementations / serializers / serializer_ecx_priv.c

diff --git a/providers/implementations/serializers/serializer_ecx_priv.c b/providers/implementations/serializers/serializer_ecx_priv.c
index 0036ea68787df0539ec2912c467c2b027c3323d0..b74404a8863a8d5fdffb85c63d8b4ab5d63facdd 100644 (file)
--- a/providers/implementations/serializers/serializer_ecx_priv.c
+++ b/providers/implementations/serializers/serializer_ecx_priv.c
@@ -19,20 +19,20 @@
 #include "prov/provider_ctx.h"
 #include "serializer_local.h"
 
-static OSSL_OP_serializer_newctx_fn x25519_priv_newctx;
-static OSSL_OP_serializer_newctx_fn x448_priv_newctx;
-static OSSL_OP_serializer_newctx_fn ed25519_priv_newctx;
-static OSSL_OP_serializer_newctx_fn ed448_priv_newctx;
-static OSSL_OP_serializer_freectx_fn ecx_priv_freectx;
-static OSSL_OP_serializer_set_ctx_params_fn ecx_priv_set_ctx_params;
-static OSSL_OP_serializer_settable_ctx_params_fn ecx_priv_settable_ctx_params;
-static OSSL_OP_serializer_serialize_data_fn ecx_priv_der_data;
-static OSSL_OP_serializer_serialize_object_fn ecx_priv_der;
-static OSSL_OP_serializer_serialize_data_fn ecx_priv_pem_data;
-static OSSL_OP_serializer_serialize_object_fn ecx_priv_pem;
-
-static OSSL_OP_serializer_serialize_data_fn ecx_priv_print_data;
-static OSSL_OP_serializer_serialize_object_fn ecx_priv_print;
+static OSSL_FUNC_serializer_newctx_fn x25519_priv_newctx;
+static OSSL_FUNC_serializer_newctx_fn x448_priv_newctx;
+static OSSL_FUNC_serializer_newctx_fn ed25519_priv_newctx;
+static OSSL_FUNC_serializer_newctx_fn ed448_priv_newctx;
+static OSSL_FUNC_serializer_freectx_fn ecx_priv_freectx;
+static OSSL_FUNC_serializer_set_ctx_params_fn ecx_priv_set_ctx_params;
+static OSSL_FUNC_serializer_settable_ctx_params_fn ecx_priv_settable_ctx_params;
+static OSSL_FUNC_serializer_serialize_data_fn ecx_priv_der_data;
+static OSSL_FUNC_serializer_serialize_object_fn ecx_priv_der;
+static OSSL_FUNC_serializer_serialize_data_fn ecx_priv_pem_data;
+static OSSL_FUNC_serializer_serialize_object_fn ecx_priv_pem;
+
+static OSSL_FUNC_serializer_serialize_data_fn ecx_priv_print_data;
+static OSSL_FUNC_serializer_serialize_object_fn ecx_priv_print;
 
  /*
  * Context used for private key serialization.
@@ -140,9 +140,9 @@ static int ecx_priv_der_data(void *vctx, const OSSL_PARAM params[],
                              OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg)
 {
     struct ecx_priv_ctx_st *ctx = vctx;
-    OSSL_OP_keymgmt_new_fn *ecx_new;
-    OSSL_OP_keymgmt_free_fn *ecx_free;
-    OSSL_OP_keymgmt_import_fn *ecx_import;
+    OSSL_FUNC_keymgmt_new_fn *ecx_new;
+    OSSL_FUNC_keymgmt_free_fn *ecx_free;
+    OSSL_FUNC_keymgmt_import_fn *ecx_import;
     int ok = 0;
 
     ecx_get_new_free_import(ctx->type, &ecx_new, &ecx_free, &ecx_import);
@@ -190,9 +190,9 @@ static int ecx_priv_pem_data(void *vctx, const OSSL_PARAM params[],
                              OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg)
 {
     struct ecx_priv_ctx_st *ctx = vctx;
-    OSSL_OP_keymgmt_new_fn *ecx_new;
-    OSSL_OP_keymgmt_free_fn *ecx_free;
-    OSSL_OP_keymgmt_import_fn *ecx_import;
+    OSSL_FUNC_keymgmt_new_fn *ecx_new;
+    OSSL_FUNC_keymgmt_free_fn *ecx_free;
+    OSSL_FUNC_keymgmt_import_fn *ecx_import;
     int ok = 0;
 
     ecx_get_new_free_import(ctx->type, &ecx_new, &ecx_free, &ecx_import);
@@ -238,9 +238,9 @@ static int ecx_priv_print_data(void *vctx, const OSSL_PARAM params[],
                                OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg)
 {
     struct ecx_priv_ctx_st *ctx = vctx;
-    OSSL_OP_keymgmt_new_fn *ecx_new;
-    OSSL_OP_keymgmt_free_fn *ecx_free;
-    OSSL_OP_keymgmt_import_fn *ecx_import;
+    OSSL_FUNC_keymgmt_new_fn *ecx_new;
+    OSSL_FUNC_keymgmt_free_fn *ecx_free;
+    OSSL_FUNC_keymgmt_import_fn *ecx_import;
     int ok = 0;
 
     ecx_get_new_free_import(ctx->type, &ecx_new, &ecx_free, &ecx_import);