security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

g10: Fix log_debug formatting.

Browse Source 
* g10/cipher-aead.c (do_flush): No cast is correct.
* g10/decrypt-data.c (aead_underflow): No cast needed.
Use "%j" for uint64_t for chunklen.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2018-11-08 12:14:23 +09:00
parent 01b77ebbb7
commit 7fc3decc2e
2 changed files with 4 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

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

6
g10/decrypt-data.c
View File

@ -647,7 +647,7 @@ aead_underflow (decode_filter_ctx_t dfx, iobuf_t a, byte *buf, size_t *ret_len)
* 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=%ju total=%ju size=%zu len=%zu%s\n",
(uintmax_t)dfx->chunklen, (uintmax_t)dfx->total, size, len, dfx->chunklen, dfx->total, size, len,
dfx->eof_seen? " eof":""); dfx->eof_seen? " eof":"");
while (len && dfx->chunklen + len >= dfx->chunksize) while (len && dfx->chunklen + len >= dfx->chunksize)
@ -683,7 +683,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=%zu) bytes left: %zu at off=%zu\n", log_debug ("ndecrypted: %zu (nchunk=%ju) bytes left: %zu at off=%zu\n",
totallen, dfx->chunklen, len, off); totallen, dfx->chunklen, len, off);
/* Check the tag. */ /* Check the tag. */
@ -765,7 +765,7 @@ 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=%zu)\n", totallen, dfx->chunklen); log_debug ("ndecrypted: %zu (nchunk=%ju)\n", totallen, dfx->chunklen);
} }
if (dfx->eof_seen) if (dfx->eof_seen)