aesni-x86_64.pl: make ECB subroutine Windows ABI compliant.

[oweals/openssl.git] / crypto / store / str_meth.c

diff --git a/crypto/store/str_meth.c b/crypto/store/str_meth.c
index ad6708a12f5bfa8c4597995f1771999fae82e6e9..a46de03a2600c4b5d3dff7aa55f6da832d471cf1 100644 (file)
--- a/crypto/store/str_meth.c
+++ b/crypto/store/str_meth.c
@@ -65,8 +65,10 @@ STORE_METHOD *STORE_create_method(char *name)
        STORE_METHOD *store_method = (STORE_METHOD *)OPENSSL_malloc(sizeof(STORE_METHOD));
 
        if (store_method)
+               {
                memset(store_method, 0, sizeof(*store_method));
-       store_method->name = BUF_strdup(name);
+               store_method->name = BUF_strdup(name);
+               }
        return store_method;
        }
 
@@ -81,6 +83,18 @@ void STORE_destroy_method(STORE_METHOD *store_method)
        OPENSSL_free(store_method);
        }
 
+int STORE_method_set_initialise_function(STORE_METHOD *sm, STORE_INITIALISE_FUNC_PTR init_f)
+       {
+       sm->init = init_f;
+       return 1;
+       }
+
+int STORE_method_set_cleanup_function(STORE_METHOD *sm, STORE_CLEANUP_FUNC_PTR clean_f)
+       {
+       sm->clean = clean_f;
+       return 1;
+       }
+
 int STORE_method_set_generate_function(STORE_METHOD *sm, STORE_GENERATE_OBJECT_FUNC_PTR generate_f)
        {
        sm->generate_object = generate_f;
@@ -99,6 +113,12 @@ int STORE_method_set_store_function(STORE_METHOD *sm, STORE_STORE_OBJECT_FUNC_PT
        return 1;
        }
 
+int STORE_method_set_modify_function(STORE_METHOD *sm, STORE_MODIFY_OBJECT_FUNC_PTR modify_f)
+       {
+       sm->modify_object = modify_f;
+       return 1;
+       }
+
 int STORE_method_set_revoke_function(STORE_METHOD *sm, STORE_HANDLE_OBJECT_FUNC_PTR revoke_f)
        {
        sm->revoke_object = revoke_f;
@@ -129,19 +149,19 @@ int STORE_method_set_list_end_function(STORE_METHOD *sm, STORE_END_OBJECT_FUNC_P
        return 1;
        }
 
-int STORE_method_set_update_function(STORE_METHOD *sm, STORE_GENERIC_FUNC_PTR update_f)
+int STORE_method_set_update_store_function(STORE_METHOD *sm, STORE_GENERIC_FUNC_PTR update_f)
        {
        sm->update_store = update_f;
        return 1;
        }
 
-int STORE_method_set_lock_function(STORE_METHOD *sm, STORE_GENERIC_FUNC_PTR lock_f)
+int STORE_method_set_lock_store_function(STORE_METHOD *sm, STORE_GENERIC_FUNC_PTR lock_f)
        {
        sm->lock_store = lock_f;
        return 1;
        }
 
-int STORE_method_set_unlock_function(STORE_METHOD *sm, STORE_GENERIC_FUNC_PTR unlock_f)
+int STORE_method_set_unlock_store_function(STORE_METHOD *sm, STORE_GENERIC_FUNC_PTR unlock_f)
        {
        sm->unlock_store = unlock_f;
        return 1;
@@ -153,6 +173,16 @@ int STORE_method_set_ctrl_function(STORE_METHOD *sm, STORE_CTRL_FUNC_PTR ctrl_f)
        return 1;
        }
 
+STORE_INITIALISE_FUNC_PTR STORE_method_get_initialise_function(STORE_METHOD *sm)
+       {
+       return sm->init;
+       }
+
+STORE_CLEANUP_FUNC_PTR STORE_method_get_cleanup_function(STORE_METHOD *sm)
+       {
+       return sm->clean;
+       }
+
 STORE_GENERATE_OBJECT_FUNC_PTR STORE_method_get_generate_function(STORE_METHOD *sm)
        {
        return sm->generate_object;
@@ -168,6 +198,11 @@ STORE_STORE_OBJECT_FUNC_PTR STORE_method_get_store_function(STORE_METHOD *sm)
        return sm->store_object;
        }
 
+STORE_MODIFY_OBJECT_FUNC_PTR STORE_method_get_modify_function(STORE_METHOD *sm)
+       {
+       return sm->modify_object;
+       }
+
 STORE_HANDLE_OBJECT_FUNC_PTR STORE_method_get_revoke_function(STORE_METHOD *sm)
        {
        return sm->revoke_object;
@@ -193,17 +228,17 @@ STORE_END_OBJECT_FUNC_PTR STORE_method_get_list_end_function(STORE_METHOD *sm)
        return sm->list_object_end;
        }
 
-STORE_GENERIC_FUNC_PTR STORE_method_get_update_function(STORE_METHOD *sm)
+STORE_GENERIC_FUNC_PTR STORE_method_get_update_store_function(STORE_METHOD *sm)
        {
        return sm->update_store;
        }
 
-STORE_GENERIC_FUNC_PTR STORE_method_get_lock_function(STORE_METHOD *sm)
+STORE_GENERIC_FUNC_PTR STORE_method_get_lock_store_function(STORE_METHOD *sm)
        {
        return sm->lock_store;
        }
 
-STORE_GENERIC_FUNC_PTR STORE_method_get_unlock_function(STORE_METHOD *sm)
+STORE_GENERIC_FUNC_PTR STORE_method_get_unlock_store_function(STORE_METHOD *sm)
        {
        return sm->unlock_store;
        }