CORE: query for operations only once per provider (unless no_store is true)

[openssl.git] / include / internal / core.h

diff --git a/include/internal/core.h b/include/internal/core.h
index 06a0775f85b35271c452ace7390e531d5bfbd118..e2d2b28e8c07133d0d76eeae9a86f8602e0fafd7 100644 (file)
--- a/include/internal/core.h
+++ b/include/internal/core.h
@@ -28,25 +28,35 @@
  */
 typedef struct ossl_method_construct_method_st {
     /* Create store */
  */
 typedef struct ossl_method_construct_method_st {
     /* Create store */

-    void *(*alloc_tmp_store)(void);
+    void *(*alloc_tmp_store)(OPENSSL_CTX *ctx);

     /* Remove a store */
     void (*dealloc_tmp_store)(void *store);
     /* Get an already existing method from a store */
     /* Remove a store */
     void (*dealloc_tmp_store)(void *store);
     /* Get an already existing method from a store */

-    void *(*get)(OPENSSL_CTX *libctx, void *store, const char *propquery,
-                 void *data);
+    void *(*get)(OPENSSL_CTX *libctx, void *store, void *data);

     /* Store a method in a store */
     /* Store a method in a store */

-    int (*put)(OPENSSL_CTX *libctx, void *store, const char *propdef,
-               void *method, void *data);
+    int (*put)(OPENSSL_CTX *libctx, void *store, void *method,
+               const OSSL_PROVIDER *prov, int operation_id, const char *name,
+               const char *propdef, void *data);

     /* Construct a new method */
     /* Construct a new method */

-    void *(*construct)(const char *algorithm_name, const OSSL_DISPATCH *fns,
-                       OSSL_PROVIDER *prov, void *data);
+    void *(*construct)(const OSSL_ALGORITHM *algodef, OSSL_PROVIDER *prov,
+                       void *data);

     /* Destruct a method */
     void (*destruct)(void *method, void *data);
 } OSSL_METHOD_CONSTRUCT_METHOD;
 
 void *ossl_method_construct(OPENSSL_CTX *ctx, int operation_id,
     /* Destruct a method */
     void (*destruct)(void *method, void *data);
 } OSSL_METHOD_CONSTRUCT_METHOD;
 
 void *ossl_method_construct(OPENSSL_CTX *ctx, int operation_id,

-                            const char *name, const char *properties,

                             int force_cache,
                             OSSL_METHOD_CONSTRUCT_METHOD *mcm, void *mcm_data);
 
                             int force_cache,
                             OSSL_METHOD_CONSTRUCT_METHOD *mcm, void *mcm_data);
 

+void ossl_algorithm_do_all(OPENSSL_CTX *libctx, int operation_id,
+                           OSSL_PROVIDER *provider,
+                           int (*pre)(OSSL_PROVIDER *, int operation_id,
+                                      void *data, int *result),
+                           void (*fn)(OSSL_PROVIDER *provider,
+                                      const OSSL_ALGORITHM *algo,
+                                      int no_store, void *data),
+                           int (*post)(OSSL_PROVIDER *, int operation_id,
+                                       int no_store, void *data, int *result),
+                           void *data);
+

 #endif
 #endif