diff options
| author | Daiki Ueno <dueno@redhat.com> | 2018-08-24 17:42:16 +0200 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2018-08-28 14:44:56 +0200 |
| commit | 9a7892ef3fd9d4bd70df41fb0200782dc6134c70 (patch) | |
| tree | 8411d211e794aecbdb44331295c3d9230251abe6 /trust/module.c | |
| parent | 0d7fbd5189ba1414d84326ddc8e4cff98f66a44b (diff) | |
trust: Factor out module initialization into separate file
This prevents double call to p11_library_init() in test-module.c, once
from the ELF constructor, and secondly from the test itself.
Diffstat (limited to 'trust/module.c')
| -rw-r--r-- | trust/module.c | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/trust/module.c b/trust/module.c index fc67a4d..e09113b 100644 --- a/trust/module.c +++ b/trust/module.c @@ -1832,57 +1832,3 @@ p11_module_next_id (void) static CK_ULONG unique = 0x10; return (unique)++; } - -#ifdef OS_UNIX - -void p11_trust_module_init (void); - -void p11_trust_module_fini (void); - -#ifdef __GNUC__ -__attribute__((constructor)) -#endif -void -p11_trust_module_init (void) -{ - p11_library_init (); -} - -#ifdef __GNUC__ -__attribute__((destructor)) -#endif -void -p11_trust_module_fini (void) -{ - 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_library_uninit (); - break; - default: - break; - } - - return TRUE; -} - -#endif /* OS_WIN32 */ |