moved definition of proposal_token from proposal.c to proposal_keywords.h

diff --git a/src/charon/config/proposal.c b/src/charon/config/proposal.c
index 5ae565e..877b0f4 100644 (file)
--- 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 ca15bb5..86cb7ef 100644 (file)
--- 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);