If we've not been inited don't deinit

[openssl.git] / crypto / store / str_locl.h

diff --git a/crypto/store/str_locl.h b/crypto/store/str_locl.h
index c8decfa87dfa092be79f73c3ad19cf010d519848..6ee4b93e34c1538cb6acd3caf80076bd248b7d78 100644 (file)
--- a/crypto/store/str_locl.h
+++ b/crypto/store/str_locl.h
@@ -1,6 +1,6 @@
-/* crypto/store/str_locl.h -*- mode:C; c-file-style: "eay" -*- */
-/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
- * project 2003.
+/*
+ * Written by Richard Levitte (richard@levitte.org) for the OpenSSL project
+ * 2003.
  */
 /* ====================================================================
  * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -57,65 +57,66 @@
  */
 
 #ifndef HEADER_STORE_LOCL_H
-#define HEADER_STORE_LOCL_H
+# define HEADER_STORE_LOCL_H
 
-#include <openssl/store.h>
+# include <openssl/crypto.h>
+# include <openssl/store.h>
 
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
-struct store_method_st
-       {
-       char *name;
+struct store_method_st {
+    char *name;
+    /*
+     * All the functions return a positive integer or non-NULL for success
+     * and 0, a negative integer or NULL for failure
+     */
+    /* Initialise the STORE with private data */
+    STORE_INITIALISE_FUNC_PTR init;
+    /* Initialise the STORE with private data */
+    STORE_CLEANUP_FUNC_PTR clean;
+    /* Generate an object of a given type */
+    STORE_GENERATE_OBJECT_FUNC_PTR generate_object;
+    /*
+     * Get an object of a given type.  This function isn't really very useful
+     * since the listing functions (below) can be used for the same purpose
+     * and are much more general.
+     */
+    STORE_GET_OBJECT_FUNC_PTR get_object;
+    /* Store an object of a given type. */
+    STORE_STORE_OBJECT_FUNC_PTR store_object;
+    /* Modify the attributes bound to an object of a given type. */
+    STORE_MODIFY_OBJECT_FUNC_PTR modify_object;
+    /* Revoke an object of a given type. */
+    STORE_HANDLE_OBJECT_FUNC_PTR revoke_object;
+    /* Delete an object of a given type. */
+    STORE_HANDLE_OBJECT_FUNC_PTR delete_object;
+    /*
+     * List a bunch of objects of a given type and with the associated
+     * attributes.
+     */
+    STORE_START_OBJECT_FUNC_PTR list_object_start;
+    STORE_NEXT_OBJECT_FUNC_PTR list_object_next;
+    STORE_END_OBJECT_FUNC_PTR list_object_end;
+    STORE_END_OBJECT_FUNC_PTR list_object_endp;
+    /* Store-level function to make any necessary update operations. */
+    STORE_GENERIC_FUNC_PTR update_store;
+    /* Store-level function to get exclusive access to the store. */
+    STORE_GENERIC_FUNC_PTR lock_store;
+    /* Store-level function to release exclusive access to the store. */
+    STORE_GENERIC_FUNC_PTR unlock_store;
+    /* Generic control function */
+    STORE_CTRL_FUNC_PTR ctrl;
+};
 
-       /* All the functions return a positive integer or non-NULL for success
-          and 0, a negative integer or NULL for failure */
-
-       /* Initialise the STORE with private data */
-       STORE_INITIALISE_FUNC_PTR init;
-       /* Initialise the STORE with private data */
-       STORE_CLEANUP_FUNC_PTR clean;
-       /* Generate an object of a given type */
-       STORE_GENERATE_OBJECT_FUNC_PTR generate_object;
-       /* Get an object of a given type.  This function isn't really very
-          useful since the listing functions (below) can be used for the
-          same purpose and are much more general. */
-       STORE_GET_OBJECT_FUNC_PTR get_object;
-       /* Store an object of a given type. */
-       STORE_STORE_OBJECT_FUNC_PTR store_object;
-       /* Modify the attributes bound to an object of a given type. */
-       STORE_MODIFY_OBJECT_FUNC_PTR modify_object;
-       /* Revoke an object of a given type. */
-       STORE_HANDLE_OBJECT_FUNC_PTR revoke_object;
-       /* Delete an object of a given type. */
-       STORE_HANDLE_OBJECT_FUNC_PTR delete_object;
-       /* List a bunch of objects of a given type and with the associated
-          attributes. */
-       STORE_START_OBJECT_FUNC_PTR list_object_start;
-       STORE_NEXT_OBJECT_FUNC_PTR list_object_next;
-       STORE_END_OBJECT_FUNC_PTR list_object_end;
-       STORE_END_OBJECT_FUNC_PTR list_object_endp;
-       /* Store-level function to make any necessary update operations. */
-       STORE_GENERIC_FUNC_PTR update_store;
-       /* Store-level function to get exclusive access to the store. */
-       STORE_GENERIC_FUNC_PTR lock_store;
-       /* Store-level function to release exclusive access to the store. */
-       STORE_GENERIC_FUNC_PTR unlock_store;
-
-       /* Generic control function */
-       STORE_CTRL_FUNC_PTR ctrl;
-       };
-
-struct store_st
-       {
-       const STORE_METHOD *meth;
-       /* functional reference if 'meth' is ENGINE-provided */
-       ENGINE *engine;
-
-       CRYPTO_EX_DATA ex_data;
-       int references;
-       };
+struct store_st {
+    const STORE_METHOD *meth;
+    /* functional reference if 'meth' is ENGINE-provided */
+    ENGINE *engine;
+    CRYPTO_EX_DATA ex_data;
+    int references;
+};
 #ifdef  __cplusplus
 }
 #endif