streamlined integrity test output some more

src/charon/daemon.c

@@ -467,6 +467,8 @@ static bool initialize(private_daemon_t *this, bool syslog, level_t levels[])
 	if (lib->integrity)
 	{
 		DBG1(DBG_DMN, "integrity tests enabled:");
+		DBG1(DBG_DMN, "lib    'libstrongswan': passed file and segment integrity tests");
+		DBG1(DBG_DMN, "daemon 'charon': passed file integrity test");
 	}
 
 	/* load secrets, ca certificates and crls */

src/libstrongswan/plugins/plugin_loader.c

@@ -66,12 +66,9 @@ static plugin_t* load_plugin(private_plugin_loader_t *this,
 	{
 		if (!lib->integrity->check_file(lib->integrity, name, file))
 		{
-			DBG1("plugin '%s': failed file integrity test of"
+			DBG1("plugin '%s': failed file integrity test of '%s'", name, file);
-				 " 'libstrongswan-%s.so'", name, name);
 			return NULL;
 		}
-		DBG1("plugin '%s': passed file integrity test of"
-			 " 'libstrongswan-%s.so'", name, name);
 	}
 	handle = dlopen(file, RTLD_LAZY);
 	if (handle == NULL)
@@ -94,7 +91,7 @@ static plugin_t* load_plugin(private_plugin_loader_t *this,
 			dlclose(handle);
 			return NULL;
 		}
-		DBG1("plugin '%s': passed segment integrity test", name);
+		DBG1("plugin '%s': passed file and segment integrity tests", name);
 	}
 	plugin = constructor();
 	if (plugin == NULL)

src/pluto/plutomain.c

@@ -646,6 +646,8 @@ int main(int argc, char **argv)
 	if (lib->integrity)
 	{
 		plog("integrity tests enabled:");
+		plog("lib    'libstrongswan': passed file and segment integrity tests");
+		plog("daemon 'pluto': passed file integrity test");
 	}
 
 	/* load plugins, further infrastructure may need it */