From 59084785278f94354683801488b55a376fe82558 Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Mon, 18 May 2009 19:33:15 +0200
Subject: [PATCH] moved definition of proposal_token from proposal.c to
 proposal_keywords.h

---
 src/charon/config/proposal.c                          | 7 -------
 src/libstrongswan/crypto/proposal/proposal_keywords.h | 9 +++++++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/charon/config/proposal.c b/src/charon/config/proposal.c
index 5ae565ecf..877b0f40a 100644
--- a/src/charon/config/proposal.c
+++ b/src/charon/config/proposal.c
@@ -572,13 +572,6 @@ static void check_proposal(private_proposal_t *this)
 	}
 }
 
-struct proposal_token {
-	char             *name;
-	transform_type_t  type;
-	u_int16_t         algorithm;
-	u_int16_t         keysize;  
-};
-
 /**
  * add a algorithm identified by a string to the proposal.
  */
diff --git a/src/libstrongswan/crypto/proposal/proposal_keywords.h b/src/libstrongswan/crypto/proposal/proposal_keywords.h
index ca15bb508..86cb7ef09 100644
--- a/src/libstrongswan/crypto/proposal/proposal_keywords.h
+++ b/src/libstrongswan/crypto/proposal/proposal_keywords.h
@@ -16,8 +16,17 @@
 #ifndef _PROPOSAL_KEYWORDS_H_
 #define _PROPOSAL_KEYWORDS_H_
 
+#include <crypto/transform.h>
+
 typedef struct proposal_token proposal_token_t;
 
+struct proposal_token {
+    char             *name;
+    transform_type_t  type;
+	u_int16_t         algorithm;
+    u_int16_t         keysize;  
+};
+
 extern const proposal_token_t* proposal_get_token(register const char *str,
 												  register unsigned int len);