Changeset 4258

Show
Ignore:
Timestamp:
08/19/08 20:51:30 (3 months ago)
Author:
andreas
Message:

fixed libstrongswan integrity test

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/configure.in

    r4238 r4258  
    1717dnl =========================== 
    1818 
    19 AC_INIT(strongSwan,4.2.6) 
     19AC_INIT(strongSwan,4.2.6rc7) 
    2020AM_INIT_AUTOMAKE(tar-ustar) 
    2121AC_C_BIGENDIAN 
    …… 
    879879    src/libstrongswan/plugins/padlock/Makefile 
    880880    src/libstrongswan/plugins/openssl/Makefile 
     881    src/libstrongswan/fips/Makefile 
    881882    src/libcrypto/Makefile 
    882883    src/libfreeswan/Makefile 

  • trunk/src/charon/daemon.c

    r4192 r4258  
    5353#ifdef INTEGRITY_TEST 
    5454#include <fips/fips.h> 
    55 #include <fips_signature.h> 
     55#include <fips/fips_signature.h> 
    5656#endif /* INTEGRITY_TEST */ 
    5757 
    …… 
    363363    DBG1(DBG_DMN, "starting charon (strongSwan Version %s)", VERSION); 
    364364 
    365 #ifdef INTEGRITY_TEST 
    366     DBG1(DBG_DMN, "integrity test of libstrongswan code"); 
    367     if (fips_verify_hmac_signature(hmac_key, hmac_signature)) 
    368     { 
    369         DBG1(DBG_DMN, "  integrity test passed"); 
    370     } 
    371     else 
    372     { 
    373         DBG1(DBG_DMN, "  integrity test failed"); 
    374         return FALSE; 
    375     } 
    376 #endif /* INTEGRITY_TEST */ 
    377  
    378365    /* load secrets, ca certificates and crls */ 
    379366    this->public.processor = processor_create(); 
    …… 
    391378        lib->settings->get_str(lib->settings, "charon.load", PLUGINS)); 
    392379     
     380#ifdef INTEGRITY_TEST 
     381    DBG1(DBG_DMN, "integrity test of libstrongswan code"); 
     382    if (fips_verify_hmac_signature(hmac_key, hmac_signature)) 
     383    { 
     384        DBG1(DBG_DMN, "  integrity test passed"); 
     385    } 
     386    else 
     387    { 
     388        DBG1(DBG_DMN, "  integrity test failed"); 
     389        return FALSE; 
     390    } 
     391#endif /* INTEGRITY_TEST */ 
     392 
    393393    this->public.ike_sa_manager = ike_sa_manager_create(); 
    394394    if (this->public.ike_sa_manager == NULL) 

  • trunk/src/libstrongswan/Makefile.am

    r4003 r4258  
    158158 
    159159if USE_INTEGRITY_TEST 
    160   noinst_PROGRAMS = fips_signer 
    161   fips_signer_SOURCES = fips/fips_signer.c 
    162   fips_signer_LDADD = libstrongswan.la 
    163  
    164   BUILT_SOURCES += fips_signature.h 
    165   CLEANFILES = fips_signature.h fips_signer 
    166   AM_CFLAGS += -DSTRONGSWAN_CONF=\"${strongswan_conf}\" 
    167  
    168 fips_signature.h : fips_signer 
    169            ./fips_signer 
     160  SUBDIRS += fips 
    170161endif 

  • trunk/src/libstrongswan/fips/fips_signer.c

    r3964 r4258  
    2929    /* initialize library */ 
    3030    library_init(STRONGSWAN_CONF); 
    31     lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, "sha1 hmac"); 
     31#ifdef USE_SHA1 
     32    lib->plugins->load(lib->plugins, PLUGINDIR "/sha1/.libs", "sha1"); 
     33#endif 
     34#ifdef USE_OPENSSL 
     35    lib->plugins->load(lib->plugins, PLUGINDIR "/openssl/.libs", "openssl"); 
     36#endif 
     37    lib->plugins->load(lib->plugins, PLUGINDIR "/hmac/.libs", "hmac"); 
    3238 
    3339    if (!fips_compute_hmac_signature(hmac_key, hmac_signature))