Make the naming scheme for dispatched functions more consistent

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

diff --git a/providers/implementations/serializers/serializer_ec_priv.c b/providers/implementations/serializers/serializer_ec_priv.c
index e96c08b7e73fc57a695ac55f67a0f312c0e15ef7..9a315dfbcf177ba20b105a23a52e4783a570fbad 100644 (file)
--- a/providers/implementations/serializers/serializer_ec_priv.c
+++ b/providers/implementations/serializers/serializer_ec_priv.c
@@ -19,19 +19,19 @@
 #include "prov/provider_ctx.h"
 #include "serializer_local.h"
 
-static OSSL_OP_serializer_newctx_fn ec_priv_newctx;
-static OSSL_OP_serializer_freectx_fn ec_priv_freectx;
-static OSSL_OP_serializer_set_ctx_params_fn ec_priv_set_ctx_params;
-static OSSL_OP_serializer_settable_ctx_params_fn ec_priv_settable_ctx_params;
-static OSSL_OP_serializer_serialize_data_fn ec_priv_der_data;
-static OSSL_OP_serializer_serialize_object_fn ec_priv_der;
-static OSSL_OP_serializer_serialize_data_fn ec_pem_priv_data;
-static OSSL_OP_serializer_serialize_object_fn ec_pem_priv;
-
-static OSSL_OP_serializer_newctx_fn ec_print_newctx;
-static OSSL_OP_serializer_freectx_fn ec_print_freectx;
-static OSSL_OP_serializer_serialize_data_fn ec_priv_print_data;
-static OSSL_OP_serializer_serialize_object_fn ec_priv_print;
+static OSSL_FUNC_serializer_newctx_fn ec_priv_newctx;
+static OSSL_FUNC_serializer_freectx_fn ec_priv_freectx;
+static OSSL_FUNC_serializer_set_ctx_params_fn ec_priv_set_ctx_params;
+static OSSL_FUNC_serializer_settable_ctx_params_fn ec_priv_settable_ctx_params;
+static OSSL_FUNC_serializer_serialize_data_fn ec_priv_der_data;
+static OSSL_FUNC_serializer_serialize_object_fn ec_priv_der;
+static OSSL_FUNC_serializer_serialize_data_fn ec_pem_priv_data;
+static OSSL_FUNC_serializer_serialize_object_fn ec_pem_priv;
+
+static OSSL_FUNC_serializer_newctx_fn ec_print_newctx;
+static OSSL_FUNC_serializer_freectx_fn ec_print_freectx;
+static OSSL_FUNC_serializer_serialize_data_fn ec_priv_print_data;
+static OSSL_FUNC_serializer_serialize_object_fn ec_priv_print;
 
  /*
  * Context used for private key serialization.
@@ -117,9 +117,9 @@ static int ec_priv_der_data(void *vctx, const OSSL_PARAM params[],
                             OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg)
 {
     struct ec_priv_ctx_st *ctx = vctx;
-    OSSL_OP_keymgmt_new_fn *ec_new;
-    OSSL_OP_keymgmt_free_fn *ec_free;
-    OSSL_OP_keymgmt_import_fn *ec_import;
+    OSSL_FUNC_keymgmt_new_fn *ec_new;
+    OSSL_FUNC_keymgmt_free_fn *ec_free;
+    OSSL_FUNC_keymgmt_import_fn *ec_import;
     int ok = 0;
 
     ec_get_new_free_import(&ec_new, &ec_free, &ec_import);
@@ -164,9 +164,9 @@ static int ec_pem_priv_data(void *vctx, const OSSL_PARAM params[],
                             OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg)
 {
     struct ec_priv_ctx_st *ctx = vctx;
-    OSSL_OP_keymgmt_new_fn *ec_new;
-    OSSL_OP_keymgmt_free_fn *ec_free;
-    OSSL_OP_keymgmt_import_fn *ec_import;
+    OSSL_FUNC_keymgmt_new_fn *ec_new;
+    OSSL_FUNC_keymgmt_free_fn *ec_free;
+    OSSL_FUNC_keymgmt_import_fn *ec_import;
     int ok = 0;
 
     ec_get_new_free_import(&ec_new, &ec_free, &ec_import);
@@ -222,9 +222,9 @@ static int ec_priv_print_data(void *vctx, const OSSL_PARAM params[],
                               OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg)
 {
     struct ec_priv_ctx_st *ctx = vctx;
-    OSSL_OP_keymgmt_new_fn *ec_new;
-    OSSL_OP_keymgmt_free_fn *ec_free;
-    OSSL_OP_keymgmt_import_fn *ec_import;
+    OSSL_FUNC_keymgmt_new_fn *ec_new;
+    OSSL_FUNC_keymgmt_free_fn *ec_free;
+    OSSL_FUNC_keymgmt_import_fn *ec_import;
     int ok = 0;
 
     ec_get_new_free_import(&ec_new, &ec_free, &ec_import);