Make the naming scheme for dispatched functions more consistent

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

diff --git a/providers/implementations/serializers/serializer_dh.c b/providers/implementations/serializers/serializer_dh.c
index d8e85a5482b707bd6452c73021ed44356c034a6e..03bb874a6411cb1d2f0641fc90445c36fa5b8891 100644 (file)
--- a/providers/implementations/serializers/serializer_dh.c
+++ b/providers/implementations/serializers/serializer_dh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -21,17 +21,17 @@
 #include "crypto/dh.h"
 #include "serializer_local.h"
 
-OSSL_OP_keymgmt_new_fn *ossl_prov_get_keymgmt_dh_new(void)
+OSSL_FUNC_keymgmt_new_fn *ossl_prov_get_keymgmt_dh_new(void)
 {
     return ossl_prov_get_keymgmt_new(dh_keymgmt_functions);
 }
 
-OSSL_OP_keymgmt_free_fn *ossl_prov_get_keymgmt_dh_free(void)
+OSSL_FUNC_keymgmt_free_fn *ossl_prov_get_keymgmt_dh_free(void)
 {
     return ossl_prov_get_keymgmt_free(dh_keymgmt_functions);
 }
 
-OSSL_OP_keymgmt_import_fn *ossl_prov_get_keymgmt_dh_import(void)
+OSSL_FUNC_keymgmt_import_fn *ossl_prov_get_keymgmt_dh_import(void)
 {
     return ossl_prov_get_keymgmt_import(dh_keymgmt_functions);
 }
@@ -70,7 +70,7 @@ int ossl_prov_print_dh(BIO *out, DH *dh, enum dh_print_type type)
     if (p == NULL)
         goto null_err;
 
-    if (ossl_prov_bio_printf(out, "%s: (%d bit)\n", type_label, BN_num_bits(p))
+    if (BIO_printf(out, "%s: (%d bit)\n", type_label, BN_num_bits(p))
         <= 0)
         goto err;
     if (priv_key != NULL