diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2008-03-26 20:16:42 +0000 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2008-03-26 20:16:42 +0000 |
| commit | 1aad8bdfade75d6ce2729ca00fc594199ee18b35 (patch) | |
| tree | 8ce430d9a240c77b34753b521e780dc09ce6f91b /src | |
| parent | dc04b7c743fe6718bd361f13adbbe5436c481486 (diff) | |
| download | strongswan-1aad8bdfade75d6ce2729ca00fc594199ee18b35.tar.bz2 strongswan-1aad8bdfade75d6ce2729ca00fc594199ee18b35.tar.xz | |
makeshift fix of --enable-integrity-test option
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstrongswan/Makefile.am | 3 | ||||
| -rw-r--r-- | src/libstrongswan/fips/fips.c | 4 | ||||
| -rw-r--r-- | src/libstrongswan/fips/fips_signer.c | 6 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am index 9b0417f05..e38f07c39 100644 --- a/src/libstrongswan/Makefile.am +++ b/src/libstrongswan/Makefile.am @@ -61,7 +61,8 @@ endif libstrongswan_la_LIBADD = -lpthread -ldl INCLUDES = -I$(top_srcdir)/src/libstrongswan -AM_CFLAGS = +AM_CFLAGS = -DIPSEC_DIR=\"${ipsecdir}\" \ + -DIPSEC_PLUGINDIR=\"${plugindir}\" if USE_LEAK_DETECTIVE AM_CFLAGS += -DLEAK_DETECTIVE diff --git a/src/libstrongswan/fips/fips.c b/src/libstrongswan/fips/fips.c index 6701e1f5d..bb8f779ba 100644 --- a/src/libstrongswan/fips/fips.c +++ b/src/libstrongswan/fips/fips.c @@ -18,7 +18,7 @@ #include <stdio.h> #include <debug.h> -#include <crypto/signers/hmac_signer.h> +#include <crypto/signers/signer.h> #include "fips.h" extern const u_char FIPS_rodata_start[]; @@ -56,7 +56,7 @@ bool fips_compute_hmac_signature(const char *key, char *signature) DBG1(" RODATA: %p + %6d = %p", FIPS_rodata_start, (int)rodata_len, FIPS_rodata_end); - signer = (signer_t *)hmac_signer_create(HASH_SHA1, HASH_SIZE_SHA1); + signer = lib->crypto->create_signer(lib->crypto, AUTH_HMAC_SHA1_128); if (signer == NULL) { DBG1(" SHA-1 HMAC signer could not be created"); diff --git a/src/libstrongswan/fips/fips_signer.c b/src/libstrongswan/fips/fips_signer.c index d4679435c..276e55e5b 100644 --- a/src/libstrongswan/fips/fips_signer.c +++ b/src/libstrongswan/fips/fips_signer.c @@ -26,6 +26,10 @@ int main(int argc, char* argv[]) char *hmac_key = "strongSwan Version " VERSION; char hmac_signature[BUF_LEN]; + /* initialize library */ + library_init(IPSEC_DIR "/strongswan.conf"); + lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, "libstrongswan-"); + if (!fips_compute_hmac_signature(hmac_key, hmac_signature)) { exit(1); @@ -54,5 +58,7 @@ int main(int argc, char* argv[]) fprintf(f, "\n"); fprintf(f, "#endif /* FIPS_SIGNATURE_H_ @} */\n"); fclose(f); + + library_deinit(); exit(0); } |