integrity checker accepts an option checksum library on construction

This commit is contained in:
Martin Willi
2009-06-22 15:47:17 +02:00
parent 059c479a2f
commit 0179d4684a
3 changed files with 24 additions and 18 deletions
+18 -16
View File
@@ -29,8 +29,6 @@
#include <debug.h>
#include <library.h>
#define CHECKSUM_LIBRARY IPSEC_DIR"/libchecksum.so"
typedef struct private_integrity_checker_t private_integrity_checker_t;
/**
@@ -239,7 +237,7 @@ static void destroy(private_integrity_checker_t *this)
/**
* See header
*/
integrity_checker_t *integrity_checker_create()
integrity_checker_t *integrity_checker_create(char *checksum_library)
{
private_integrity_checker_t *this = malloc_thing(private_integrity_checker_t);
@@ -250,26 +248,30 @@ integrity_checker_t *integrity_checker_create()
this->public.destroy = (void(*)(integrity_checker_t*))destroy;
this->checksum_count = 0;
this->handle = dlopen(CHECKSUM_LIBRARY, RTLD_LAZY);
if (this->handle)
this->handle = NULL;
if (checksum_library)
{
int *checksum_count;
this->checksums = dlsym(this->handle, "checksums");
checksum_count = dlsym(this->handle, "checksum_count");
if (this->checksums && checksum_count)
this->handle = dlopen(checksum_library, RTLD_LAZY);
if (this->handle)
{
this->checksum_count = *checksum_count;
int *checksum_count;
this->checksums = dlsym(this->handle, "checksums");
checksum_count = dlsym(this->handle, "checksum_count");
if (this->checksums && checksum_count)
{
this->checksum_count = *checksum_count;
}
else
{
DBG1("checksum library '%s' invalid", checksum_library);
}
}
else
{
DBG1("checksum library '%s' invalid", CHECKSUM_LIBRARY);
DBG1("loading checksum library '%s' failed", checksum_library);
}
}
else
{
DBG1("loading checksum library '%s' failed", CHECKSUM_LIBRARY);
}
return &this->public;
}