library initialization fails if libstrongswan checksum is invalid

This commit is contained in:
Martin Willi
2009-06-22 15:47:17 +02:00
parent 70f59fab9b
commit a0fc89798a
4 changed files with 13 additions and 4 deletions
+4 -1
View File
@@ -686,7 +686,10 @@ int main(int argc, char *argv[])
dbg = dbg_stderr;
/* initialize library */
library_init(STRONGSWAN_CONF);
if (!library_init(STRONGSWAN_CONF))
{
exit(-1);
}
lib->printf_hook->add_handler(lib->printf_hook, 'R',
traffic_selector_printf_hook,
PRINTF_HOOK_ARGTYPE_POINTER,
+3 -1
View File
@@ -86,7 +86,7 @@ void library_deinit()
/*
* see header file
*/
void library_init(char *settings)
bool library_init(char *settings)
{
printf_hook_t *pfh;
private_library_t *this = malloc_thing(private_library_t);
@@ -136,7 +136,9 @@ void library_init(char *settings)
"libstrongswan", library_init))
{
DBG1("integrity check of libstrongswan failed");
return FALSE;
}
}
return TRUE;
}
+2 -1
View File
@@ -123,8 +123,9 @@ struct library_t {
* Initialize library, creates "lib" instance.
*
* @param settings file to read settings from, may be NULL for none
* @return FALSE if integrity check failed
*/
void library_init(char *settings);
bool library_init(char *settings);
/**
* Deinitialize library, destroys "lib" instance.
+4 -1
View File
@@ -265,7 +265,10 @@ int main(int argc, char **argv)
#endif /* CAPABILITIES */
/* initialize library and optionsfrom */
library_init(STRONGSWAN_CONF);
if (!library_init(STRONGSWAN_CONF))
{
abort();
}
options = options_create();
/* handle arguments */