diff options
| author | Martin Willi <martin@strongswan.org> | 2008-11-27 10:20:25 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2008-11-27 10:20:25 +0000 |
| commit | ac812491aad398608b8924dcc04178c7589aff14 (patch) | |
| tree | 6779651da83fe8ddae7353c31ef06e537ac61da6 /src | |
| parent | 140d0081bf7d099afb6744574d27ca97dc6559bb (diff) | |
| download | strongswan-ac812491aad398608b8924dcc04178c7589aff14.tar.bz2 strongswan-ac812491aad398608b8924dcc04178c7589aff14.tar.xz | |
added an include hack to build starter without gmp.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/pluto/ca.c | 1 | ||||
| -rw-r--r-- | src/pluto/smartcard.h | 5 | ||||
| -rw-r--r-- | src/whack/whack.h | 11 |
3 files changed, 15 insertions, 2 deletions
diff --git a/src/pluto/ca.c b/src/pluto/ca.c index 701d15b44..ad21dd04c 100644 --- 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 289eb245b..b510fa3a3 100644 --- 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 37eb6e9b4..dc89d5b81 100644 --- 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 |