diff options
| -rw-r--r-- | common/Makefile.am | 1 | ||||
| -rw-r--r-- | common/init.h | 94 | ||||
| -rw-r--r-- | p11-kit/client-init.c | 60 | ||||
| -rw-r--r-- | p11-kit/proxy-init.c | 59 |
4 files changed, 103 insertions, 111 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index d67028a..410d704 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -30,6 +30,7 @@ libp11_common_la_SOURCES = \ common/pkcs11.h common/pkcs11x.h common/pkcs11i.h \ common/runtime.c common/runtime.h \ common/url.c common/url.h \ + common/init.h \ $(NULL) libp11_library_la_SOURCES = \ diff --git a/common/init.h b/common/init.h new file mode 100644 index 0000000..c36b125 --- /dev/null +++ b/common/init.h @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2011 Collabora Ltd + * Copyright (c) 2012 Stef Walter + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or + * other materials provided with the distribution. + * * The names of contributors to this software may not be + * used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF + * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * + * CONTRIBUTORS + * Stef Walter <stef@thewalter.net> + */ + +#include "library.h" + +#ifdef OS_UNIX + +void INIT (void); + +void FINI (void); + +#ifdef __GNUC__ +__attribute__((constructor)) +#endif +void +INIT (void) +{ + p11_library_init (); +} + +#ifdef __GNUC__ +__attribute__((destructor)) +#endif +void +FINI (void) +{ + CLEANUP; + p11_library_uninit (); +} + +#endif /* OS_UNIX */ + +#ifdef OS_WIN32 + +BOOL WINAPI DllMain (HINSTANCE, DWORD, LPVOID); + +BOOL WINAPI +DllMain (HINSTANCE instance, + DWORD reason, + LPVOID reserved) +{ + switch (reason) { + case DLL_PROCESS_ATTACH: + p11_library_init (); + break; + case DLL_THREAD_DETACH: + p11_library_thread_cleanup (); + break; + case DLL_PROCESS_DETACH: + CLEANUP; + p11_library_uninit (); + break; + default: + break; + } + + return TRUE; +} + +#endif /* OS_WIN32 */ diff --git a/p11-kit/client-init.c b/p11-kit/client-init.c index 74e8905..04d323b 100644 --- a/p11-kit/client-init.c +++ b/p11-kit/client-init.c @@ -38,7 +38,6 @@ #include "config.h" #include "client.h" -#include "library.h" #include "pkcs11.h" /* p11_proxy_module_check() is defined as a weak symbol in modules.c */ @@ -52,58 +51,7 @@ p11_proxy_module_check (CK_FUNCTION_LIST_PTR module) } #endif -#ifdef OS_UNIX - -void _p11_kit_init (void); - -void _p11_kit_fini (void); - -#ifdef __GNUC__ -__attribute__((constructor)) -#endif -void -_p11_kit_init (void) -{ - p11_library_init (); -} - -#ifdef __GNUC__ -__attribute__((destructor)) -#endif -void -_p11_kit_fini (void) -{ - p11_client_module_cleanup (); - p11_library_uninit (); -} - -#endif /* OS_UNIX */ - -#ifdef OS_WIN32 - -BOOL WINAPI DllMain (HINSTANCE, DWORD, LPVOID); - -BOOL WINAPI -DllMain (HINSTANCE instance, - DWORD reason, - LPVOID reserved) -{ - switch (reason) { - case DLL_PROCESS_ATTACH: - p11_library_init (); - break; - case DLL_THREAD_DETACH: - p11_library_thread_cleanup (); - break; - case DLL_PROCESS_DETACH: - p11_client_module_cleanup (); - p11_library_uninit (); - break; - default: - break; - } - - return TRUE; -} - -#endif /* OS_WIN32 */ +#define INIT _p11_kit_init +#define FINI _p11_kit_fini +#define CLEANUP p11_client_module_cleanup () +#include "init.h" diff --git a/p11-kit/proxy-init.c b/p11-kit/proxy-init.c index 118478f..b0b9550 100644 --- a/p11-kit/proxy-init.c +++ b/p11-kit/proxy-init.c @@ -41,58 +41,7 @@ #include "p11-kit.h" #include "proxy.h" -#ifdef OS_UNIX - -void _p11_kit_init (void); - -void _p11_kit_fini (void); - -#ifdef __GNUC__ -__attribute__((constructor)) -#endif -void -_p11_kit_init (void) -{ - p11_library_init (); -} - -#ifdef __GNUC__ -__attribute__((destructor)) -#endif -void -_p11_kit_fini (void) -{ - p11_proxy_module_cleanup (); - p11_library_uninit (); -} - -#endif /* OS_UNIX */ - -#ifdef OS_WIN32 - -BOOL WINAPI DllMain (HINSTANCE, DWORD, LPVOID); - -BOOL WINAPI -DllMain (HINSTANCE instance, - DWORD reason, - LPVOID reserved) -{ - switch (reason) { - case DLL_PROCESS_ATTACH: - p11_library_init (); - break; - case DLL_THREAD_DETACH: - p11_library_thread_cleanup (); - break; - case DLL_PROCESS_DETACH: - p11_proxy_module_cleanup (); - p11_library_uninit (); - break; - default: - break; - } - - return TRUE; -} - -#endif /* OS_WIN32 */ +#define INIT _p11_kit_init +#define FINI _p11_kit_fini +#define CLEANUP p11_proxy_module_cleanup () +#include "init.h" |