Make the naming scheme for dispatched functions more consistent
[openssl.git] / providers / implementations / serializers / serializer_ec_param.c
index 7eda31f3a0dd59864b15416fe47d422629db24f0..95fbd555a0c00ae60eece869e9cf670882755c65 100644 (file)
 #include "prov/provider_ctx.h"
 #include "serializer_local.h"
 
-static OSSL_OP_serializer_newctx_fn ec_param_newctx;
-static OSSL_OP_serializer_freectx_fn ec_param_freectx;
-static OSSL_OP_serializer_serialize_data_fn ec_param_der_data;
-static OSSL_OP_serializer_serialize_object_fn ec_param_der;
-static OSSL_OP_serializer_serialize_data_fn ec_param_pem_data;
-static OSSL_OP_serializer_serialize_object_fn ec_param_pem;
+static OSSL_FUNC_serializer_newctx_fn ec_param_newctx;
+static OSSL_FUNC_serializer_freectx_fn ec_param_freectx;
+static OSSL_FUNC_serializer_serialize_data_fn ec_param_der_data;
+static OSSL_FUNC_serializer_serialize_object_fn ec_param_der;
+static OSSL_FUNC_serializer_serialize_data_fn ec_param_pem_data;
+static OSSL_FUNC_serializer_serialize_object_fn ec_param_pem;
 
-static OSSL_OP_serializer_serialize_data_fn ec_param_print_data;
-static OSSL_OP_serializer_serialize_object_fn ec_param_print;
+static OSSL_FUNC_serializer_serialize_data_fn ec_param_print_data;
+static OSSL_FUNC_serializer_serialize_object_fn ec_param_print;
 
 
 /* There is no specific implementation context, so use the provider context */
@@ -44,9 +44,9 @@ static int ec_param_der_data(void *vctx, const OSSL_PARAM params[],
                              OSSL_CORE_BIO *out,
                              OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg)
 {
-    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);
@@ -84,9 +84,9 @@ static int ec_param_pem_data(void *vctx, const OSSL_PARAM params[],
                              OSSL_CORE_BIO *out,
                              OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg)
 {
-    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);
@@ -123,9 +123,9 @@ static int ec_param_print_data(void *vctx, const OSSL_PARAM params[],
                                OSSL_CORE_BIO *out,
                                OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg)
 {
-    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);