Make the naming scheme for dispatched functions more consistent

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

diff --git a/providers/implementations/serializers/serializer_dsa_param.c b/providers/implementations/serializers/serializer_dsa_param.c
index 23a6d1d25dd17a2d3cd98f0f18014547acd73f60..fff577df3983502a92f132b52139b74993ae46ff 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>
@@ -24,15 +24,15 @@
 #include "prov/provider_ctx.h"
 #include "serializer_local.h"
 
-static OSSL_OP_serializer_newctx_fn dsa_param_newctx;
-static OSSL_OP_serializer_freectx_fn dsa_param_freectx;
-static OSSL_OP_serializer_serialize_data_fn dsa_param_der_data;
-static OSSL_OP_serializer_serialize_object_fn dsa_param_der;
-static OSSL_OP_serializer_serialize_data_fn dsa_param_pem_data;
-static OSSL_OP_serializer_serialize_object_fn dsa_param_pem;
+static OSSL_FUNC_serializer_newctx_fn dsa_param_newctx;
+static OSSL_FUNC_serializer_freectx_fn dsa_param_freectx;
+static OSSL_FUNC_serializer_serialize_data_fn dsa_param_der_data;
+static OSSL_FUNC_serializer_serialize_object_fn dsa_param_der;
+static OSSL_FUNC_serializer_serialize_data_fn dsa_param_pem_data;
+static OSSL_FUNC_serializer_serialize_object_fn dsa_param_pem;
 
-static OSSL_OP_serializer_serialize_data_fn dsa_param_print_data;
-static OSSL_OP_serializer_serialize_object_fn dsa_param_print;
+static OSSL_FUNC_serializer_serialize_data_fn dsa_param_print_data;
+static OSSL_FUNC_serializer_serialize_object_fn dsa_param_print;
 
 /* Parameters : context */
 
@@ -53,9 +53,9 @@ static int dsa_param_der_data(void *ctx, const OSSL_PARAM params[],
                               OSSL_CORE_BIO *out,
                               OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg)
 {
-    OSSL_OP_keymgmt_new_fn *dsa_new = ossl_prov_get_keymgmt_dsa_new();
-    OSSL_OP_keymgmt_free_fn *dsa_free = ossl_prov_get_keymgmt_dsa_free();
-    OSSL_OP_keymgmt_import_fn *dsa_import = ossl_prov_get_keymgmt_dsa_import();
+    OSSL_FUNC_keymgmt_new_fn *dsa_new = ossl_prov_get_keymgmt_dsa_new();
+    OSSL_FUNC_keymgmt_free_fn *dsa_free = ossl_prov_get_keymgmt_dsa_free();
+    OSSL_FUNC_keymgmt_import_fn *dsa_import = ossl_prov_get_keymgmt_dsa_import();
     int ok = 0;
 
     if (dsa_import != NULL) {
@@ -91,9 +91,9 @@ static int dsa_param_pem_data(void *ctx, const OSSL_PARAM params[],
                               OSSL_CORE_BIO *out,
                               OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg)
 {
-    OSSL_OP_keymgmt_new_fn *dsa_new = ossl_prov_get_keymgmt_dsa_new();
-    OSSL_OP_keymgmt_free_fn *dsa_free = ossl_prov_get_keymgmt_dsa_free();
-    OSSL_OP_keymgmt_import_fn *dsa_import = ossl_prov_get_keymgmt_dsa_import();
+    OSSL_FUNC_keymgmt_new_fn *dsa_new = ossl_prov_get_keymgmt_dsa_new();
+    OSSL_FUNC_keymgmt_free_fn *dsa_free = ossl_prov_get_keymgmt_dsa_free();
+    OSSL_FUNC_keymgmt_import_fn *dsa_import = ossl_prov_get_keymgmt_dsa_import();
     int ok = 0;
 
     if (dsa_import != NULL) {
@@ -128,9 +128,9 @@ static int dsa_param_print_data(void *ctx, const OSSL_PARAM params[],
                                 OSSL_CORE_BIO *out,
                                 OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg)
 {
-    OSSL_OP_keymgmt_new_fn *dsa_new = ossl_prov_get_keymgmt_dsa_new();
-    OSSL_OP_keymgmt_free_fn *dsa_free = ossl_prov_get_keymgmt_dsa_free();
-    OSSL_OP_keymgmt_import_fn *dsa_import = ossl_prov_get_keymgmt_dsa_import();
+    OSSL_FUNC_keymgmt_new_fn *dsa_new = ossl_prov_get_keymgmt_dsa_new();
+    OSSL_FUNC_keymgmt_free_fn *dsa_free = ossl_prov_get_keymgmt_dsa_free();
+    OSSL_FUNC_keymgmt_import_fn *dsa_import = ossl_prov_get_keymgmt_dsa_import();
     int ok = 0;
 
     if (dsa_import != NULL) {