removed obsolete INTEGRITY_TEST and fips signer code

--enable-integrity-test now conditionally builds libchecksum
This commit is contained in:
Martin Willi
2009-06-22 15:47:17 +02:00
parent f1f51395d5
commit e3b7be91e1
16 changed files with 7 additions and 657 deletions
-5
View File
@@ -110,11 +110,6 @@ if USE_SMARTCARD
AM_CFLAGS += -DSMARTCARD
endif
# This compile option activates the integrity test of libstrongswan
if USE_INTEGRITY_TEST
AM_CFLAGS += -DINTEGRITY_TEST
endif
if USE_CAPABILITIES
pluto_LDADD += -lcap
endif
-18
View File
@@ -43,11 +43,6 @@
#include <utils/enumerator.h>
#include <utils/optionsfrom.h>
#ifdef INTEGRITY_TEST
#include <fips/fips.h>
#include <fips/fips_signature.h>
#endif /* INTEGRITY_TEST */
#include <pfkeyv2.h>
#include <pfkey.h>
@@ -645,19 +640,6 @@ int main(int argc, char **argv)
lib->settings->get_str(lib->settings, "pluto.load", PLUGINS));
print_plugins();
#ifdef INTEGRITY_TEST
DBG1("integrity test of libstrongswan code");
if (fips_verify_hmac_signature(hmac_key, hmac_signature))
{
DBG1(" integrity test passed");
}
else
{
DBG1(" integrity test failed");
abort();
}
#endif /* INTEGRITY_TEST */
init_nat_traversal(nat_traversal, keep_alive, force_keepalive, nat_t_spf);
init_virtual_ip(virtual_private);
scx_init(pkcs11_module_path, pkcs11_init_args);