aboutsummaryrefslogtreecommitdiffstats
path: root/src/libstrongswan
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2012-09-13 13:39:33 +0200
committerTobias Brunner <tobias@strongswan.org>2012-09-13 15:44:01 +0200
commit995875210acb70ba2b12c9368ce892325abb64f2 (patch)
treee8bc8ce7dcb96885c98fbe89b2797cf245e2de06 /src/libstrongswan
parent1962e12fd3a0d80c56facf508ec8ee9ea2c92dc8 (diff)
downloadstrongswan-995875210acb70ba2b12c9368ce892325abb64f2.tar.bz2
strongswan-995875210acb70ba2b12c9368ce892325abb64f2.tar.xz
Removed len argument from proposal_get_token()
Also use enumerators instead of lexparser.h to parse proposal strings.
Diffstat (limited to 'src/libstrongswan')
-rw-r--r--src/libstrongswan/crypto/proposal/proposal_keywords.c4
-rw-r--r--src/libstrongswan/crypto/proposal/proposal_keywords.h3
2 files changed, 3 insertions, 4 deletions
diff --git a/src/libstrongswan/crypto/proposal/proposal_keywords.c b/src/libstrongswan/crypto/proposal/proposal_keywords.c
index 9e16dd281..bb6353ded 100644
--- a/src/libstrongswan/crypto/proposal/proposal_keywords.c
+++ b/src/libstrongswan/crypto/proposal/proposal_keywords.c
@@ -26,7 +26,7 @@
/*
* see header file
*/
-const proposal_token_t* proposal_get_token(const char *str, u_int len)
+const proposal_token_t* proposal_get_token(const char *str)
{
- return proposal_get_token_static(str, len);
+ return proposal_get_token_static(str, strlen(str));
}
diff --git a/src/libstrongswan/crypto/proposal/proposal_keywords.h b/src/libstrongswan/crypto/proposal/proposal_keywords.h
index 1abd10f90..ad9e82a36 100644
--- a/src/libstrongswan/crypto/proposal/proposal_keywords.h
+++ b/src/libstrongswan/crypto/proposal/proposal_keywords.h
@@ -62,9 +62,8 @@ struct proposal_token {
* Returns a proposal token for the specified string if a token exists.
*
* @param str the string containing the name of the token
- * @param len the length of the string
* @return proposal_tolen if found otherwise NULL
*/
-const proposal_token_t* proposal_get_token(const char *str, u_int len);
+const proposal_token_t* proposal_get_token(const char *str);
#endif /** PROPOSAL_KEYWORDS_H_ @}*/