security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

gpg: Fix for -Wformat when using uint64_t. 

* g10/cipher-aead.c (do_flush): Use PRIu64.
* g10/decrypt-data.c (aead_underflow): Likewise.

--

Even among LP64 data model machines, uint64_t type may differ;
unsigned long or unsigned long long.
Only portable way is use of PRIu64.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2022-02-02 11:09:48 +09:00
parent 57d546674d
commit b2cedc108d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
g10/cipher-aead.c
View File

@ -276,7 +276,7 @@ do_flush (cipher_filter_context_t *cfx, iobuf_t a, byte *buf, size_t size)
size_t n1 = cfx->chunksize - (cfx->chunklen + cfx->buflen); size_t n1 = cfx->chunksize - (cfx->chunklen + cfx->buflen);
finalize = 1; finalize = 1;
if (DBG_FILTER) if (DBG_FILTER)
log_debug ("chunksize %ju reached;" log_debug ("chunksize %"PRIu64" reached;"
" cur buflen=%zu using %zu of %zu\n", " cur buflen=%zu using %zu of %zu\n",
cfx->chunksize, cfx->buflen, cfx->chunksize, cfx->buflen,
n1, n); n1, n);

7
g10/decrypt-data.c
View File

@ -662,7 +662,7 @@ aead_underflow (decode_filter_ctx_t dfx, iobuf_t a, byte *buf, size_t *ret_len)
/* Decrypt the buffer. This first requires a loop to handle the /* Decrypt the buffer. This first requires a loop to handle the
* case when a chunk ends within the buffer. */ * case when a chunk ends within the buffer. */
if (DBG_FILTER) if (DBG_FILTER)
log_debug ("decrypt: chunklen=%ju total=%ju size=%zu len=%zu%s\n", log_debug ("decrypt: chunklen=%"PRIu64" total=%"PRIu64" size=%zu len=%zu%s\n",
dfx->chunklen, dfx->total, size, len, dfx->chunklen, dfx->total, size, len,
dfx->eof_seen? " eof":""); dfx->eof_seen? " eof":"");
@ -699,7 +699,7 @@ aead_underflow (decode_filter_ctx_t dfx, iobuf_t a, byte *buf, size_t *ret_len)
len -= n; len -= n;
if (DBG_FILTER) if (DBG_FILTER)
log_debug ("ndecrypted: %zu (nchunk=%ju) bytes left: %zu at off=%zu\n", log_debug ("ndecrypted: %zu (nchunk=%"PRIu64") bytes left: %zu at off=%zu\n",
totallen, dfx->chunklen, len, off); totallen, dfx->chunklen, len, off);
/* Check the tag. */ /* Check the tag. */
@ -781,7 +781,8 @@ aead_underflow (decode_filter_ctx_t dfx, iobuf_t a, byte *buf, size_t *ret_len)
dfx->chunklen += len; dfx->chunklen += len;
dfx->total += len; dfx->total += len;
if (DBG_FILTER) if (DBG_FILTER)
log_debug ("ndecrypted: %zu (nchunk=%ju)\n", totallen, dfx->chunklen); log_debug ("ndecrypted: %zu (nchunk=%"PRIu64")\n",
totallen, dfx->chunklen);
} }
if (dfx->eof_seen) if (dfx->eof_seen)