[svn-upgrade] Integrating new upstream version, strongswan (4.3.2)

1 files changed, 41 insertions, 43 deletions

diff --git a/src/pluto/spdb.h b/src/pluto/spdb.h
index b098e247a..221cc00bb 100644
--- a/src/pluto/spdb.h
+++ b/src/pluto/spdb.h
@@ -10,8 +10,6 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
- *
- * RCSID $Id: spdb.h 3252 2007-10-06 21:24:50Z andreas $
  */
 
 #ifndef _SPDB_H
@@ -25,39 +23,39 @@
  * Note: only "basic" values are represented so far.
  */
 struct db_attr {
-    u_int16_t type;	/* ISAKMP_ATTR_AF_TV is implied; 0 for end */
-    u_int16_t val;
+	u_int16_t type;     /* ISAKMP_ATTR_AF_TV is implied; 0 for end */
+	u_int16_t val;
 };
 
 /* transform */
 struct db_trans {
-    u_int8_t transid;	/* Transform-Id */
-    struct db_attr *attrs;	/* array */
-    int attr_cnt;	/* number of elements */
+	u_int8_t transid;   /* Transform-Id */
+	struct db_attr *attrs;      /* array */
+	int attr_cnt;       /* number of elements */
 };
 
 /* proposal */
 struct db_prop {
-    u_int8_t protoid;	/* Protocol-Id */
-    struct db_trans *trans;	/* array (disjunction) */
-    int trans_cnt;	/* number of elements */
-    /* SPI size and value isn't part of DB */
+	u_int8_t protoid;   /* Protocol-Id */
+	struct db_trans *trans;     /* array (disjunction) */
+	int trans_cnt;      /* number of elements */
+	/* SPI size and value isn't part of DB */
 };
 
 /* conjunction of proposals */
 struct db_prop_conj {
-    struct db_prop *props;	/* array */
-    int prop_cnt;	/* number of elements */
+	struct db_prop *props;      /* array */
+	int prop_cnt;       /* number of elements */
 };
 
 /* security association */
 struct db_sa {
-    struct db_prop_conj *prop_conjs;	/* array */
-    int prop_conj_cnt;	/* number of elements */
-    /* Hardwired for now;
-     * DOI: ISAKMP_DOI_IPSEC
-     * Situation: SIT_IDENTITY_ONLY
-     */
+	struct db_prop_conj *prop_conjs;    /* array */
+	int prop_conj_cnt;  /* number of elements */
+	/* Hardwired for now;
+	 * DOI: ISAKMP_DOI_IPSEC
+	 * Situation: SIT_IDENTITY_ONLY
+	 */
 };
 
 /* The oakley sadb */
@@ -72,38 +70,38 @@ extern struct db_sa ipsec_sadb[1 << 3];
 struct state;
 
 extern bool out_sa(
-    pb_stream *outs,
-    struct db_sa *sadb,
-    struct state *st,
-    bool oakley_mode,
-    u_int8_t np);
+	pb_stream *outs,
+	struct db_sa *sadb,
+	struct state *st,
+	bool oakley_mode,
+	u_int8_t np);
 
 extern notification_t preparse_isakmp_sa_body(
-    const struct isakmp_sa *sa,	/* header of input SA Payload */
-    pb_stream *sa_pbs,		/* body of input SA Payload */
-    u_int32_t *ipsecdoisit,	/* IPsec DOI SIT bitset */
-    pb_stream *proposal_pbs,	/* body of proposal Payload */
-    struct isakmp_proposal *proposal);
+	const struct isakmp_sa *sa, /* header of input SA Payload */
+	pb_stream *sa_pbs,          /* body of input SA Payload */
+	u_int32_t *ipsecdoisit,     /* IPsec DOI SIT bitset */
+	pb_stream *proposal_pbs,    /* body of proposal Payload */
+	struct isakmp_proposal *proposal);
 
 extern notification_t parse_isakmp_policy(
-    pb_stream *proposal_pbs,	/* body of proposal Payload */
-    u_int notrans,		/* number of transforms */
-    lset_t *policy);		/* RSA, PSK or XAUTH policy */
+	pb_stream *proposal_pbs,    /* body of proposal Payload */
+	u_int notrans,              /* number of transforms */
+	lset_t *policy);            /* RSA, PSK or XAUTH policy */
 
 extern notification_t parse_isakmp_sa_body(
-    u_int32_t ipsecdoisit,	/* IPsec DOI SIT bitset */
-    pb_stream *proposal_pbs,	/* body of proposal Payload */
-    struct isakmp_proposal *proposal,
-    pb_stream *r_sa_pbs,	/* if non-NULL, where to emit winning SA */
-    struct state *st,		/* current state object */
-    bool initiator);		/* is caller initiator? */
+	u_int32_t ipsecdoisit,      /* IPsec DOI SIT bitset */
+	pb_stream *proposal_pbs,    /* body of proposal Payload */
+	struct isakmp_proposal *proposal,
+	pb_stream *r_sa_pbs,        /* if non-NULL, where to emit winning SA */
+	struct state *st,           /* current state object */
+	bool initiator);            /* is caller initiator? */
 
 extern notification_t parse_ipsec_sa_body(
-    pb_stream *sa_pbs,		/* body of input SA Payload */
-    const struct isakmp_sa *sa,	/* header of input SA Payload */
-    pb_stream *r_sa_pbs,	/* if non-NULL, where to emit winning SA */
-    bool selection,		/* if this SA is a selection, only one tranform can appear */
-    struct state *st);		/* current state object */
+	pb_stream *sa_pbs,          /* body of input SA Payload */
+	const struct isakmp_sa *sa, /* header of input SA Payload */
+	pb_stream *r_sa_pbs,        /* if non-NULL, where to emit winning SA */
+	bool selection,             /* if this SA is a selection, only one tranform can appear */
+	struct state *st);          /* current state object */
 
 extern void backup_pbs(pb_stream *pbs);
 extern void restore_pbs(pb_stream *pbs);