diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/cipher-aead.c | 4 | ||||
| -rw-r--r-- | g10/decrypt-data.c | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/g10/cipher-aead.c b/g10/cipher-aead.c index 8eea70372..640d8432f 100644 --- a/g10/cipher-aead.c +++ b/g10/cipher-aead.c @@ -295,9 +295,9 @@ do_flush (cipher_filter_context_t *cfx, iobuf_t a, byte *buf, size_t size) size_t n1 = cfx->chunksize - (cfx->chunklen + cfx->buflen); finalize = 1; if (DBG_FILTER) - log_debug ("chunksize %"PRIu64" reached;" + log_debug ("chunksize %llu reached;" " cur buflen=%zu using %zu of %zu\n", - cfx->chunksize, cfx->buflen, + (unsigned long long)cfx->chunksize, cfx->buflen, n1, n); n = n1; } diff --git a/g10/decrypt-data.c b/g10/decrypt-data.c index bdc3e2214..86e208d01 100644 --- a/g10/decrypt-data.c +++ b/g10/decrypt-data.c @@ -675,8 +675,10 @@ 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 * case when a chunk ends within the buffer. */ if (DBG_FILTER) - log_debug ("decrypt: chunklen=%"PRIu64" total=%"PRIu64" size=%zu len=%zu%s\n", - dfx->chunklen, dfx->total, size, len, + log_debug ("decrypt: chunklen=%llu total=%llu size=%zu len=%zu%s\n", + (unsigned long long)dfx->chunklen, + (unsigned long long)dfx->total, + size, len, dfx->eof_seen? " eof":""); while (len && dfx->chunklen + len >= dfx->chunksize) @@ -712,8 +714,8 @@ aead_underflow (decode_filter_ctx_t dfx, iobuf_t a, byte *buf, size_t *ret_len) len -= n; if (DBG_FILTER) - log_debug ("ndecrypted: %zu (nchunk=%"PRIu64") bytes left: %zu at off=%zu\n", - totallen, dfx->chunklen, len, off); + log_debug ("ndecrypted: %zu (nchunk=%llu) bytes left: %zu at off=%zu\n", + totallen, (unsigned long long)dfx->chunklen, len, off); /* Check the tag. */ if (len < 16) @@ -794,8 +796,8 @@ aead_underflow (decode_filter_ctx_t dfx, iobuf_t a, byte *buf, size_t *ret_len) dfx->chunklen += len; dfx->total += len; if (DBG_FILTER) - log_debug ("ndecrypted: %zu (nchunk=%"PRIu64")\n", - totallen, dfx->chunklen); + log_debug ("ndecrypted: %zu (nchunk=%llu)\n", + totallen, (unsigned long long)dfx->chunklen); } if (dfx->eof_seen) |