|
 |
738028 |
commit 19b50a501772a06fb7648b531852fb588efb0021
|
|
|
738028 |
Author: Paul Wouters <pwouters@redhat.com>
|
|
|
738028 |
Date: Tue Oct 13 13:41:24 2015 -0400
|
|
|
738028 |
|
|
|
738028 |
pluto: fixup fips.h to only require libexec/ components that are compiled.
|
|
|
738028 |
|
|
|
738028 |
When disabling MAST, the fips.h file list wanted to checksum updown.mast
|
|
|
738028 |
which was not installed, and cause a FIPS selftest failure.
|
|
|
738028 |
|
|
|
738028 |
diff --git a/programs/pluto/fips.h b/programs/pluto/fips.h
|
|
|
738028 |
index 10bfff0..9c550d8 100644
|
|
|
738028 |
--- a/programs/pluto/fips.h
|
|
|
738028 |
+++ b/programs/pluto/fips.h
|
|
|
738028 |
@@ -22,32 +22,40 @@
|
|
|
738028 |
|
|
|
738028 |
const char *fips_package_files[] = { IPSEC_EXECDIR "/pluto",
|
|
|
738028 |
IPSEC_EXECDIR "/setup",
|
|
|
738028 |
+#ifdef USE_ADNS
|
|
|
738028 |
+ IPSEC_EXECDIR "/_pluto_adns",
|
|
|
738028 |
+#endif
|
|
|
738028 |
IPSEC_EXECDIR "/addconn",
|
|
|
738028 |
IPSEC_EXECDIR "/auto",
|
|
|
738028 |
IPSEC_EXECDIR "/barf",
|
|
|
738028 |
- IPSEC_EXECDIR "/eroute",
|
|
|
738028 |
IPSEC_EXECDIR "/ikeping",
|
|
|
738028 |
IPSEC_EXECDIR "/readwriteconf",
|
|
|
738028 |
IPSEC_EXECDIR "/_keycensor",
|
|
|
738028 |
- IPSEC_EXECDIR "/klipsdebug",
|
|
|
738028 |
IPSEC_EXECDIR "/look",
|
|
|
738028 |
IPSEC_EXECDIR "/newhostkey",
|
|
|
738028 |
- IPSEC_EXECDIR "/pf_key",
|
|
|
738028 |
- IPSEC_EXECDIR "/_pluto_adns",
|
|
|
738028 |
IPSEC_EXECDIR "/_plutorun",
|
|
|
738028 |
- IPSEC_EXECDIR "/rsasigkey",
|
|
|
738028 |
IPSEC_EXECDIR "/_secretcensor",
|
|
|
738028 |
+ IPSEC_EXECDIR "/rsasigkey",
|
|
|
738028 |
IPSEC_EXECDIR "/secrets",
|
|
|
738028 |
IPSEC_EXECDIR "/showhostkey",
|
|
|
738028 |
- IPSEC_EXECDIR "/spi",
|
|
|
738028 |
- IPSEC_EXECDIR "/spigrp",
|
|
|
738028 |
IPSEC_EXECDIR "/_stackmanager",
|
|
|
738028 |
- IPSEC_EXECDIR "/tncfg",
|
|
|
738028 |
IPSEC_EXECDIR "/_updown",
|
|
|
738028 |
- IPSEC_EXECDIR "/_updown.klips",
|
|
|
738028 |
- IPSEC_EXECDIR "/_updown.mast",
|
|
|
738028 |
- IPSEC_EXECDIR "/_updown.netkey",
|
|
|
738028 |
IPSEC_EXECDIR "/verify",
|
|
|
738028 |
IPSEC_EXECDIR "/whack",
|
|
|
738028 |
IPSEC_SBINDIR "/ipsec",
|
|
|
738028 |
+#ifdef KLIPS
|
|
|
738028 |
+ IPSEC_EXECDIR "/pf_key",
|
|
|
738028 |
+ IPSEC_EXECDIR "/klipsdebug",
|
|
|
738028 |
+ IPSEC_EXECDIR "/eroute",
|
|
|
738028 |
+ IPSEC_EXECDIR "/spi",
|
|
|
738028 |
+ IPSEC_EXECDIR "/spigrp",
|
|
|
738028 |
+ IPSEC_EXECDIR "/_updown.klips",
|
|
|
738028 |
+ IPSEC_EXECDIR "/tncfg",
|
|
|
738028 |
+#ifdef KLIPS_MAST
|
|
|
738028 |
+ IPSEC_EXECDIR "/_updown.mast",
|
|
|
738028 |
+#endif
|
|
|
738028 |
+#endif
|
|
|
738028 |
+#ifdef NETKEY_SUPPORT
|
|
|
738028 |
+ IPSEC_EXECDIR "/_updown.netkey",
|
|
|
738028 |
+#endif
|
|
|
738028 |
NULL };
|