diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2006-10-31 23:17:21 +0000 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2006-10-31 23:17:21 +0000 |
| commit | 923ee10eefc894725e74aefa4ba3ff72f865ccdd (patch) | |
| tree | 30647f413d9ab91e12bc121b86961f1e9465d3fe /src | |
| parent | 231f7045480eb3c80c30e70ea54650fe530c4798 (diff) | |
| download | strongswan-923ee10eefc894725e74aefa4ba3ff72f865ccdd.tar.bz2 strongswan-923ee10eefc894725e74aefa4ba3ff72f865ccdd.tar.xz | |
solved 64 bit issue in push/pop stroke interface
Diffstat (limited to 'src')
| -rwxr-xr-x | src/charon/threads/stroke_interface.c | 6 | ||||
| -rw-r--r-- | src/starter/starterstroke.c | 2 | ||||
| -rw-r--r-- | src/stroke/stroke.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/charon/threads/stroke_interface.c b/src/charon/threads/stroke_interface.c index 1561c09f3..5f0f56789 100755 --- a/src/charon/threads/stroke_interface.c +++ b/src/charon/threads/stroke_interface.c @@ -93,14 +93,14 @@ static void pop_string(stroke_msg_t *msg, char **string) /* check for sanity of string pointer and string */ if (string < (char**)msg || string > (char**)msg + sizeof(stroke_msg_t) - || (u_int)*string < (u_int)((char*)msg->buffer - (char*)msg) - || (u_int)*string > msg->length) + || (unsigned long)*string < (unsigned long)((char*)msg->buffer - (char*)msg) + || (unsigned long)*string > msg->length) { *string = "(invalid pointer in stroke msg)"; } else { - *string = (char*)msg + (u_int)*string; + *string = (char*)msg + (unsigned long)*string; } } diff --git a/src/starter/starterstroke.c b/src/starter/starterstroke.c index aae8d5b59..cde9567e8 100644 --- a/src/starter/starterstroke.c +++ b/src/starter/starterstroke.c @@ -64,7 +64,7 @@ enum auth_method_t { static char* push_string(stroke_msg_t *msg, char *string) { - u_int string_start = msg->length; + unsigned long string_start = msg->length; if (string == NULL || msg->length + strlen(string) >= sizeof(stroke_msg_t)) { diff --git a/src/stroke/stroke.c b/src/stroke/stroke.c index b7ee4319e..90fd16f0e 100644 --- a/src/stroke/stroke.c +++ b/src/stroke/stroke.c @@ -34,7 +34,7 @@ struct stroke_token { static char* push_string(stroke_msg_t *msg, char *string) { - u_int string_start = msg->length; + unsigned long string_start = msg->length; if (string == NULL || msg->length + strlen(string) >= sizeof(stroke_msg_t)) { |