added an include hack to build starter without gmp.h

diff --git a/src/pluto/ca.c b/src/pluto/ca.c
index 701d15b44cb827ca500fea560f9a8709c3ca7c12..ad21dd04cd0b1bb5fe30eb212119ebf10dc31557 100644 (file)
--- a/src/pluto/ca.c
+++ b/src/pluto/ca.c
@@ -33,6 +33,7 @@
 #include "certs.h"
 #include "whack.h"
 #include "fetch.h"
+#include "smartcard.h"
 
 /* chained list of X.509 authority certificates (ca, aa, and ocsp) */
 

diff --git a/src/pluto/smartcard.h b/src/pluto/smartcard.h
index 289eb245b0a4980964e7f7637e614fd9a53164f6..b510fa3a30ab68f3758de9da4f75f9003b158069 100644 (file)
--- a/src/pluto/smartcard.h
+++ b/src/pluto/smartcard.h
@@ -25,14 +25,17 @@
 #define SCX_CERT_CACHE_INTERVAL          60 /* seconds */
 #define SCX_MAX_PIN_TRIALS       3
 
-/* smartcard operations */
+/* smartcard operations, update copy in whack.h */
 
+#ifndef SC_OP_T
+#define SC_OP_T
 typedef enum {
     SC_OP_NONE =    0,
     SC_OP_ENCRYPT = 1,
     SC_OP_DECRYPT = 2,
     SC_OP_SIGN =    3,
 } sc_op_t;
+#endif /* SC_OP_T */
 
 /* smartcard record */
 

diff --git a/src/whack/whack.h b/src/whack/whack.h
index 37eb6e9b486d74fe679d242ac7193c87b0c7bab8..dc89d5b819b8b6f63ab5348e965893c7de7b053a 100644 (file)
--- a/src/whack/whack.h
+++ b/src/whack/whack.h
@@ -19,7 +19,16 @@
 
 #include <freeswan.h>
 
-#include <smartcard.h>
+/* copy of smartcard operations, defined in smartcard.h */
+#ifndef SC_OP_T
+#define SC_OP_T
+typedef enum {
+    SC_OP_NONE =    0,
+    SC_OP_ENCRYPT = 1,
+    SC_OP_DECRYPT = 2,
+    SC_OP_SIGN =    3,
+} sc_op_t;
+#endif /* SC_OP_T */
 
 /* Since the message remains on one host, native representation is used.
  * Think of this as horizontal microcode: all selected operations are