aboutsummaryrefslogtreecommitdiffstats
path: root/agent
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2011-06-01 19:43:30 +0000
committerMarcus Brinkmann <[email protected]>2011-06-01 19:43:30 +0000
commit1c684df5b89bee6a67e07e0733c5a65198a3afe5 (patch)
treeb4ab80ccb36ced3f029b415b39f9d1383b59207f /agent
parentpo (diff)
downloadgnupg-1c684df5b89bee6a67e07e0733c5a65198a3afe5.tar.gz
gnupg-1c684df5b89bee6a67e07e0733c5a65198a3afe5.zip
Fix size_t vs int issues.
Diffstat (limited to 'agent')
-rw-r--r--agent/ChangeLog5
-rw-r--r--agent/cvt-openpgp.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog
index 78ddf8d22..156fbdb77 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-01 Marcus Brinkmann <[email protected]>
+
+ * cvt-openpgp.c (convert_to_openpgp): Change type of N to unsigned
+ int.
+
2011-04-26 Werner Koch <[email protected]>
* cvt-openpgp.c (convert_to_openpgp): Use rfc4880 encoded S2K count.
diff --git a/agent/cvt-openpgp.c b/agent/cvt-openpgp.c
index 0f3172894..ec0fd0a89 100644
--- a/agent/cvt-openpgp.c
+++ b/agent/cvt-openpgp.c
@@ -1062,7 +1062,7 @@ convert_to_openpgp (ctrl_t ctrl, gcry_sexp_t s_key, const char *passphrase,
void *format_args_buf_ptr[1];
int format_args_buf_int[1];
void *format_args[10+2];
- size_t n;
+ unsigned int n;
gcry_sexp_t tmpkey, tmpsexp = NULL;
snprintf (countbuf, sizeof countbuf, "%lu", s2k_count);