der: _ossl prefix DER functions

[openssl.git] / providers / implementations / encode_decode / encode_key2any.c

diff --git a/providers/implementations/encode_decode/encode_key2any.c b/providers/implementations/encode_decode/encode_key2any.c
index bb82c0ad4a291fcf9e5ada1813b2dc7bce4abd85..2a4a31fe5b74f6b64c74b8c5c13fbf1d91f97a87 100644 (file)
--- a/providers/implementations/encode_decode/encode_key2any.c
+++ b/providers/implementations/encode_decode/encode_key2any.c
@@ -657,7 +657,7 @@ static int prepare_rsa_params(const void *rsa, int nid,
                     }
                     break;
                 }
-                if (!DER_w_RSASSA_PSS_params(&pkt, -1, pss)
+                if (!ossl_DER_w_RSASSA_PSS_params(&pkt, -1, pss)
                     || !WPACKET_finish(&pkt)
                     || !WPACKET_get_total_written(&pkt, &str_sz))
                     goto err;
@@ -778,7 +778,7 @@ static const OSSL_PARAM *key2any_settable_ctx_params(ossl_unused void *provctx)
 static int key2any_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 {
     struct key2any_ctx_st *ctx = vctx;
-    OPENSSL_CTX *libctx = PROV_CTX_get0_library_context(ctx->provctx);
+    OPENSSL_CTX *libctx = ossl_prov_ctx_get0_library_context(ctx->provctx);
     const OSSL_PARAM *cipherp =
         OSSL_PARAM_locate_const(params, OSSL_ENCODER_PARAM_CIPHER);
     const OSSL_PARAM *propsp =
@@ -873,12 +873,12 @@ static int key2any_encode_params(struct key2any_ctx_st *ctx,
                                     const OSSL_PARAM params[])              \
     {                                                                       \
         struct key2any_ctx_st *ctx = vctx;                                  \
-        return ossl_prov_import_key(impl##_keymgmt_functions,               \
+        return ossl_prov_import_key(ossl_##impl##_keymgmt_functions,        \
                                     ctx->provctx, selection, params);       \
     }                                                                       \
     static void impl##2##output##_free_object(void *key)                    \
     {                                                                       \
-        ossl_prov_free_key(impl##_keymgmt_functions, key);                  \
+        ossl_prov_free_key(ossl_##impl##_keymgmt_functions, key);           \
     }                                                                       \
     static int                                                              \
     impl##2##output##_encode(void *ctx, OSSL_CORE_BIO *cout,                \
@@ -915,7 +915,7 @@ static int key2any_encode_params(struct key2any_ctx_st *ctx,
         ERR_raise(ERR_LIB_PROV, ERR_R_PASSED_INVALID_ARGUMENT);             \
         return 0;                                                           \
     }                                                                       \
-    const OSSL_DISPATCH impl##_to_##output##_encoder_functions[] = {        \
+    const OSSL_DISPATCH ossl_##impl##_to_##output##_encoder_functions[] = { \
         { OSSL_FUNC_ENCODER_NEWCTX,                                         \
           (void (*)(void))key2any_newctx },                                 \
         { OSSL_FUNC_ENCODER_FREECTX,                                        \