denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

makeshift fix of --enable-integrity-test option

Browse Source
This commit is contained in:
Andreas Steffen
2008-03-26 20:16:42 +00:00
parent dc04b7c743
commit 1aad8bdfad
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/Makefile.am
+2 -1
View File
@@ -61,7 +61,8 @@ endif
libstrongswan_la_LIBADD = -lpthread -ldl libstrongswan_la_LIBADD = -lpthread -ldl
INCLUDES = -I$(top_srcdir)/src/libstrongswan INCLUDES = -I$(top_srcdir)/src/libstrongswan
AM_CFLAGS = AM_CFLAGS = -DIPSEC_DIR=\"${ipsecdir}\" \
-DIPSEC_PLUGINDIR=\"${plugindir}\"
if USE_LEAK_DETECTIVE if USE_LEAK_DETECTIVE
AM_CFLAGS += -DLEAK_DETECTIVE AM_CFLAGS += -DLEAK_DETECTIVE
src/libstrongswan/fips/fips.c
+2 -2
View File
@@ -18,7 +18,7 @@
#include <stdio.h> #include <stdio.h>
#include <debug.h> #include <debug.h>
#include <crypto/signers/hmac_signer.h> #include <crypto/signers/signer.h>
#include "fips.h" #include "fips.h"
extern const u_char FIPS_rodata_start[]; 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", DBG1(" RODATA: %p + %6d = %p",
FIPS_rodata_start, (int)rodata_len, FIPS_rodata_end); 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) if (signer == NULL)
{ {
DBG1(" SHA-1 HMAC signer could not be created"); DBG1(" SHA-1 HMAC signer could not be created");
src/libstrongswan/fips/fips_signer.c
+6
View File
@@ -26,6 +26,10 @@ int main(int argc, char* argv[])
char *hmac_key = "strongSwan Version " VERSION; char *hmac_key = "strongSwan Version " VERSION;
char hmac_signature[BUF_LEN]; 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)) if (!fips_compute_hmac_signature(hmac_key, hmac_signature))
{ {
exit(1); exit(1);
@@ -54,5 +58,7 @@ int main(int argc, char* argv[])
fprintf(f, "\n"); fprintf(f, "\n");
fprintf(f, "#endif /* FIPS_SIGNATURE_H_ @} */\n"); fprintf(f, "#endif /* FIPS_SIGNATURE_H_ @} */\n");
fclose(f); fclose(f);
library_deinit();
exit(0); exit(0);
} }