From 9a7892ef3fd9d4bd70df41fb0200782dc6134c70 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Fri, 24 Aug 2018 17:42:16 +0200 Subject: 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. --- trust/module.c | 54 ------------------------------------------------------ 1 file changed, 54 deletions(-) (limited to 'trust/module.c') 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 */ -- cgit v1.1