PROV: Re-implement all the keypair decoders

[openssl.git] / providers / baseprov.c

diff --git a/providers/baseprov.c b/providers/baseprov.c
index 41dc65655e43716d3d77914ed06550943922f150..18d664aa291bdcbac520b5b9fa423184b1a1a32d 100644 (file)
--- a/providers/baseprov.c
+++ b/providers/baseprov.c
@@ -80,15 +80,11 @@ static const OSSL_ALGORITHM base_encoder[] = {
 #undef ENCODER
 
 static const OSSL_ALGORITHM base_decoder[] = {
 #undef ENCODER
 
 static const OSSL_ALGORITHM base_decoder[] = {

-#define DECODER(name, _fips, _input, func_table)                            \
-    { name,                                                                 \
-      "provider=base,fips=" _fips ",input=" _input,                         \
-      (func_table) }
-
+#define DECODER_PROVIDER "base"

 #include "decoders.inc"
     { NULL, NULL, NULL }
 #include "decoders.inc"
     { NULL, NULL, NULL }

+#undef DECODER_PROVIDER

 };
 };

-#undef DECODER

 
 static const OSSL_ALGORITHM base_store[] = {
 #define STORE(name, _fips, func_table)                           \
 
 static const OSSL_ALGORITHM base_store[] = {
 #define STORE(name, _fips, func_table)                           \


@@ -136,7 +132,7 @@ int ossl_base_provider_init(const OSSL_CORE_HANDLE *handle,
                             const OSSL_DISPATCH *in, const OSSL_DISPATCH **out,
                             void **provctx)
 {
                             const OSSL_DISPATCH *in, const OSSL_DISPATCH **out,
                             void **provctx)
 {

-    OSSL_FUNC_core_get_library_context_fn *c_get_libctx = NULL;
+    OSSL_FUNC_core_get_libctx_fn *c_get_libctx = NULL;

     BIO_METHOD *corebiometh;
 
     if (!ossl_prov_bio_from_dispatch(in))
     BIO_METHOD *corebiometh;
 
     if (!ossl_prov_bio_from_dispatch(in))


@@ -149,8 +145,8 @@ int ossl_base_provider_init(const OSSL_CORE_HANDLE *handle,
         case OSSL_FUNC_CORE_GET_PARAMS:
             c_get_params = OSSL_FUNC_core_get_params(in);
             break;
         case OSSL_FUNC_CORE_GET_PARAMS:
             c_get_params = OSSL_FUNC_core_get_params(in);
             break;

-        case OSSL_FUNC_CORE_GET_LIBRARY_CONTEXT:
-            c_get_libctx = OSSL_FUNC_core_get_library_context(in);
+        case OSSL_FUNC_CORE_GET_LIBCTX:
+            c_get_libctx = OSSL_FUNC_core_get_libctx(in);

             break;
         default:
             /* Just ignore anything we don't understand */
             break;
         default:
             /* Just ignore anything we don't understand */


@@ -175,8 +171,8 @@ int ossl_base_provider_init(const OSSL_CORE_HANDLE *handle,
         *provctx = NULL;
         return 0;
     }
         *provctx = NULL;
         return 0;
     }

-    ossl_prov_ctx_set0_library_context(*provctx,
-                                       (OPENSSL_CTX *)c_get_libctx(handle));
+    ossl_prov_ctx_set0_libctx(*provctx,
+                                       (OSSL_LIB_CTX *)c_get_libctx(handle));

     ossl_prov_ctx_set0_handle(*provctx, handle);
     ossl_prov_ctx_set0_core_bio_method(*provctx, corebiometh);
 
     ossl_prov_ctx_set0_handle(*provctx, handle);
     ossl_prov_ctx_set0_core_bio_method(*provctx, corebiometh);