diff options
author | NIIBE Yutaka <[email protected]> | 2015-03-09 02:00:03 +0000 |
---|---|---|
committer | NIIBE Yutaka <[email protected]> | 2015-03-09 02:00:03 +0000 |
commit | bb5a1b7c738d74d5b46340ec7b50000a2d343ca9 (patch) | |
tree | 455e6f44272a67193ed106e381d65326dbf253eb | |
parent | doc: Some typo fixes. (diff) | |
download | gnupg-bb5a1b7c738d74d5b46340ec7b50000a2d343ca9.tar.gz gnupg-bb5a1b7c738d74d5b46340ec7b50000a2d343ca9.zip |
scd: fix for 64-bit arch.
* agent/pksign.c (agent_pksign_do): Use int.
* scd/app-openpgp.c (get_public_key): Likewise.
--
On 64-bit architecture, int and size_t might be different.
For the first argument for '%b', int is expected.
-rw-r--r-- | agent/pksign.c | 5 | ||||
-rw-r--r-- | scd/app-openpgp.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/agent/pksign.c b/agent/pksign.c index d737bad33..1d3d3d845 100644 --- a/agent/pksign.c +++ b/agent/pksign.c @@ -363,12 +363,13 @@ agent_pksign_do (ctrl_t ctrl, const char *cache_nonce, *buf = 0; } - rc = gcry_sexp_build (&s_sig, NULL, "(sig-val(rsa(s%b)))", len, buf); + rc = gcry_sexp_build (&s_sig, NULL, "(sig-val(rsa(s%b)))", + (int)len, buf); } else if (is_EdDSA) { rc = gcry_sexp_build (&s_sig, NULL, "(sig-val(eddsa(r%b)(s%b)))", - len/2, buf, len/2, buf + len/2); + (int)len/2, buf, (int)len/2, buf + len/2); } else if (is_ECDSA) { diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c index 6583fb278..10bd64e6a 100644 --- a/scd/app-openpgp.c +++ b/scd/app-openpgp.c @@ -1496,7 +1496,7 @@ get_public_key (app_t app, int keyno) if (app->app_local->keyattr[keyno].key_type == KEY_TYPE_RSA) { err = gcry_sexp_build (&s_pkey, NULL, "(public-key(rsa(n%b)(e%b)))", - mlen, mbuf, elen, ebuf); + (int)mlen, mbuf, (int)elen, ebuf); if (err) goto leave; @@ -1518,7 +1518,7 @@ get_public_key (app_t app, int keyno) err = gcry_sexp_build (&s_pkey, NULL, "(public-key(ecc(curve%s)(q%b)))", - curve_name, mlen, mbuf); + curve_name, (int)mlen, mbuf); if (err) goto leave; @@ -1541,7 +1541,7 @@ get_public_key (app_t app, int keyno) err = gcry_sexp_build (&s_pkey, NULL, "(public-key(ecc(curve%s)(flags eddsa)(q%b)))", - curve_name, mlen, mbuf); + curve_name, (int)mlen, mbuf); if (err) goto leave; |