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

common: Change argument order of log_printhex. 

* common/logging.c (log_printhex): Chnage order of args.  Make it
printf alike.  Change all callers.
* configure.ac: Add -Wno-format-zero-length
--

This makes it consistent with modern libgpgrt logging and thus eases
back porting from newer GnuPG versions which use libgpgrt logging.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2020-05-12 18:51:47 +02:00
parent aec7d136e4
commit c6324ee07a
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
26 changed files with 84 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent/cvt-openpgp.c
View File

@ -878,11 +878,11 @@ convert_from_openpgp_main (ctrl_t ctrl, gcry_sexp_t s_pgp, int dontcare_exist,
log_debug ("XXX pubkey_algo=%d\n", pubkey_algo); log_debug ("XXX pubkey_algo=%d\n", pubkey_algo);
log_debug ("XXX is_protected=%d\n", is_protected); log_debug ("XXX is_protected=%d\n", is_protected);
log_debug ("XXX protect_algo=%d\n", protect_algo); log_debug ("XXX protect_algo=%d\n", protect_algo);
log_printhex ("XXX iv", iv, ivlen); log_printhex (iv, ivlen, "XXX iv");
log_debug ("XXX ivlen=%d\n", ivlen); log_debug ("XXX ivlen=%d\n", ivlen);
log_debug ("XXX s2k_mode=%d\n", s2k_mode); log_debug ("XXX s2k_mode=%d\n", s2k_mode);
log_debug ("XXX s2k_algo=%d\n", s2k_algo); log_debug ("XXX s2k_algo=%d\n", s2k_algo);
log_printhex ("XXX s2k_salt", s2k_salt, sizeof s2k_salt); log_printhex (s2k_salt, sizeof s2k_salt, "XXX s2k_salt");
log_debug ("XXX s2k_count=%lu\n", (unsigned long)s2k_count); log_debug ("XXX s2k_count=%lu\n", (unsigned long)s2k_count);
log_debug ("XXX curve='%s'\n", curve); log_debug ("XXX curve='%s'\n", curve);
for (idx=0; skey[idx]; idx++) for (idx=0; skey[idx]; idx++)

2
agent/divert-scd.c
View File

@ -169,7 +169,7 @@ encode_md_for_card (const unsigned char *digest, size_t digestlen, int algo,
memcpy (frame, asn, asnlen); memcpy (frame, asn, asnlen);
memcpy (frame+asnlen, digest, digestlen); memcpy (frame+asnlen, digest, digestlen);
if (DBG_CRYPTO) if (DBG_CRYPTO)
log_printhex ("encoded hash:", frame, asnlen+digestlen); log_printhex (frame, asnlen+digestlen, "encoded hash:");
*r_val = frame; *r_val = frame;
*r_len = asnlen+digestlen; *r_len = asnlen+digestlen;

4
agent/gpg-agent.c
View File

@ -2618,7 +2618,7 @@ putty_message_proc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
if (!data) if (!data)
goto leave; goto leave;
/* log_printhex ("request:", data, 20); */ /* log_printhex (data, 20, "request:"); */
ctrl = xtrycalloc (1, sizeof *ctrl); ctrl = xtrycalloc (1, sizeof *ctrl);
if (!ctrl) if (!ctrl)
@ -2639,7 +2639,7 @@ putty_message_proc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
if (!serve_mmapped_ssh_request (ctrl, data, PUTTY_IPC_MAXLEN)) if (!serve_mmapped_ssh_request (ctrl, data, PUTTY_IPC_MAXLEN))
ret = 1; /* Valid ssh message has been constructed. */ ret = 1; /* Valid ssh message has been constructed. */
agent_deinit_default_ctrl (ctrl); agent_deinit_default_ctrl (ctrl);
/* log_printhex (" reply:", data, 20); */ /* log_printhex (data, 20, " reply:"); */
leave: leave:
xfree (ctrl); xfree (ctrl);

4
agent/pkdecrypt.c
View File

@ -64,8 +64,8 @@ agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
if (DBG_CRYPTO) if (DBG_CRYPTO)
{ {
log_printhex ("keygrip:", ctrl->keygrip, 20); log_printhex (ctrl->keygrip, 20, "keygrip:");
log_printhex ("cipher: ", ciphertext, ciphertextlen); log_printhex (ciphertext, ciphertextlen, "cipher: ");
} }
rc = agent_key_from_file (ctrl, NULL, desc_text, rc = agent_key_from_file (ctrl, NULL, desc_text,
ctrl->keygrip, &shadow_info, ctrl->keygrip, &shadow_info,

15
common/logging.c
View File

@ -1011,10 +1011,17 @@ log_flush (void)
dump, with TEXT just an empty string, print a trailing linefeed, dump, with TEXT just an empty string, print a trailing linefeed,
otherwise print an entire debug line. */ otherwise print an entire debug line. */
void void
log_printhex (const char *text, const void *buffer, size_t length) log_printhex (const void *buffer, size_t length, const char *fmt, ...)
{ {
if (text && *text) if (fmt && *fmt)
log_debug ("%s ", text); {
va_list arg_ptr ;
va_start (arg_ptr, fmt);
do_logv (GPGRT_LOG_DEBUG, 0, NULL, NULL, fmt, arg_ptr);
va_end (arg_ptr);
log_printf (" ");
}
if (length) if (length)
{ {
const unsigned char *p = buffer; const unsigned char *p = buffer;
@ -1022,7 +1029,7 @@ log_printhex (const char *text, const void *buffer, size_t length)
for (length--, p++; length--; p++) for (length--, p++; length--; p++)
log_printf (" %02X", *p); log_printf (" %02X", *p);
} }
if (text) if (fmt)
log_printf ("\n"); log_printf ("\n");
} }

11
common/logging.h
View File

@ -103,11 +103,12 @@ void log_debug_with_string (const char *string, const char *fmt,
void log_printf (const char *fmt, ...) GPGRT_ATTR_PRINTF(1,2); void log_printf (const char *fmt, ...) GPGRT_ATTR_PRINTF(1,2);
void log_flush (void); void log_flush (void);
/* Print a hexdump of BUFFER. With TEXT passes as NULL print just the /* Print a hexdump of BUFFER. With FMT passed as NULL print just the
raw dump, with TEXT being an empty string, print a trailing * raw dump, with FMT being an empty string, print a trailing
linefeed, otherwise print an entire debug line with TEXT followed * linefeed, otherwise print an entire debug line with expanded FMT
by the hexdump and a final LF. */ * followed by the hexdump and a final LF. */
void log_printhex (const char *text, const void *buffer, size_t length); void log_printhex (const void *buffer, size_t length,
const char *fmt, ...) GPGRT_ATTR_PRINTF(3,4);
void log_clock (const char *string); void log_clock (const char *string);

2
configure.ac
View File

@ -1640,7 +1640,7 @@ if test "$GCC" = yes; then
AC_MSG_RESULT($_gcc_wopt) AC_MSG_RESULT($_gcc_wopt)
fi fi
if test x"$_gcc_wopt" = xyes ; then if test x"$_gcc_wopt" = xyes ; then
mycflags="$mycflags -W -Wno-sign-compare" mycflags="$mycflags -W -Wno-sign-compare -Wno-format-zero-length"
mycflags="$mycflags -Wno-missing-field-initializers" mycflags="$mycflags -Wno-missing-field-initializers"
fi fi

2
dirmngr/crlcache.c
View File

@ -1351,7 +1351,7 @@ cache_isvalid (ctrl_t ctrl, const char *issuer_hash,
{ {
log_error (_("WARNING: invalid cache record length for S/N ")); log_error (_("WARNING: invalid cache record length for S/N "));
log_printf ("0x"); log_printf ("0x");
log_printhex ("", sn, snlen); log_printhex (sn, snlen, "");
} }
else if (opt.verbose) else if (opt.verbose)
{ {

2
dirmngr/misc.c
View File

@ -284,7 +284,7 @@ dump_string (const char *string)
else else
{ {
log_printf ( "[ "); log_printf ( "[ ");
log_printhex (NULL, string, strlen (string)); log_printhex (string, strlen (string), NULL);
log_printf ( " ]"); log_printf ( " ]");
} }
} }

12
g10/decrypt-data.c
View File

@ -157,7 +157,7 @@ aead_set_nonce_and_ad (decode_filter_ctx_t dfx, int final)
nonce[i++] ^= dfx->chunkindex; nonce[i++] ^= dfx->chunkindex;
if (DBG_CRYPTO) if (DBG_CRYPTO)
log_printhex ("nonce:", nonce, i); log_printhex (nonce, i, "nonce:");
err = gcry_cipher_setiv (dfx->cipher_hd, nonce, i); err = gcry_cipher_setiv (dfx->cipher_hd, nonce, i);
if (err) if (err)
return err; return err;
@ -187,7 +187,7 @@ aead_set_nonce_and_ad (decode_filter_ctx_t dfx, int final)
ad[20] = dfx->total; ad[20] = dfx->total;
} }
if (DBG_CRYPTO) if (DBG_CRYPTO)
log_printhex ("authdata:", ad, final? 21 : 13); log_printhex (ad, final? 21 : 13, "authdata:");
return gcry_cipher_authenticate (dfx->cipher_hd, ad, final? 21 : 13); return gcry_cipher_authenticate (dfx->cipher_hd, ad, final? 21 : 13);
} }
@ -200,7 +200,7 @@ aead_checktag (decode_filter_ctx_t dfx, int final, const void *tagbuf)
gpg_error_t err; gpg_error_t err;
if (DBG_FILTER) if (DBG_FILTER)
log_printhex ("tag:", tagbuf, 16); log_printhex (tagbuf, 16, "tag:");
err = gcry_cipher_checktag (dfx->cipher_hd, tagbuf, 16); err = gcry_cipher_checktag (dfx->cipher_hd, tagbuf, 16);
if (err) if (err)
{ {
@ -350,7 +350,7 @@ decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek)
goto leave; /* Should never happen. */ goto leave; /* Should never happen. */
if (DBG_CRYPTO) if (DBG_CRYPTO)
log_printhex ("thekey:", dek->key, dek->keylen); log_printhex (dek->key, dek->keylen, "thekey:");
rc = gcry_cipher_setkey (dfx->cipher_hd, dek->key, dek->keylen); rc = gcry_cipher_setkey (dfx->cipher_hd, dek->key, dek->keylen);
if (gpg_err_code (rc) == GPG_ERR_WEAK_KEY) if (gpg_err_code (rc) == GPG_ERR_WEAK_KEY)
{ {
@ -533,8 +533,8 @@ decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek)
|| datalen != 20 || datalen != 20
|| memcmp (gcry_md_read (dfx->mdc_hash, 0), dfx->holdback+2, datalen)) || memcmp (gcry_md_read (dfx->mdc_hash, 0), dfx->holdback+2, datalen))
rc = gpg_error (GPG_ERR_BAD_SIGNATURE); rc = gpg_error (GPG_ERR_BAD_SIGNATURE);
/* log_printhex("MDC message:", dfx->holdback, 22); */ /* log_printhex(dfx->holdback, 22, "MDC message:"); */
/* log_printhex("MDC calc:", gcry_md_read (dfx->mdc_hash,0), datalen); */ /* log_printhex(gcry_md_read (dfx->mdc_hash,0), datalen, "MDC calc:"); */
} }
leave: leave:

18
g10/ecdh.c
View File

@ -76,7 +76,7 @@ pk_ecdh_default_params (unsigned int qbits)
} }
log_assert (i < DIM (kek_params_table)); log_assert (i < DIM (kek_params_table));
if (DBG_CRYPTO) if (DBG_CRYPTO)
log_printhex ("ECDH KEK params are", kek_params, sizeof(kek_params) ); log_printhex (kek_params, sizeof(kek_params), "ECDH KEK params are");
return gcry_mpi_set_opaque (NULL, kek_params, 4 * 8); return gcry_mpi_set_opaque (NULL, kek_params, 4 * 8);
} }
@ -159,7 +159,7 @@ pk_ecdh_encrypt_with_shared_point (int is_encrypt, gcry_mpi_t shared_mpi,
memset (secret_x+secret_x_size, 0, nbytes-secret_x_size); memset (secret_x+secret_x_size, 0, nbytes-secret_x_size);
if (DBG_CRYPTO) if (DBG_CRYPTO)
log_printhex ("ECDH shared secret X is:", secret_x, secret_x_size ); log_printhex (secret_x, secret_x_size, "ECDH shared secret X is:");
} }
/*** We have now the shared secret bytes in secret_x. ***/ /*** We have now the shared secret bytes in secret_x. ***/
@ -179,7 +179,7 @@ pk_ecdh_encrypt_with_shared_point (int is_encrypt, gcry_mpi_t shared_mpi,
kek_params_size = (nbits+7)/8; kek_params_size = (nbits+7)/8;
if (DBG_CRYPTO) if (DBG_CRYPTO)
log_printhex ("ecdh KDF params:", kek_params, kek_params_size); log_printhex (kek_params, kek_params_size, "ecdh KDF params:");
/* Expect 4 bytes 03 01 hash_alg symm_alg. */ /* Expect 4 bytes 03 01 hash_alg symm_alg. */
if (kek_params_size != 4 || kek_params[0] != 3 || kek_params[1] != 1) if (kek_params_size != 4 || kek_params[0] != 3 || kek_params[1] != 1)
@ -236,7 +236,7 @@ pk_ecdh_encrypt_with_shared_point (int is_encrypt, gcry_mpi_t shared_mpi,
} }
if(DBG_CRYPTO) if(DBG_CRYPTO)
log_printhex ("ecdh KDF message params are:", message, message_size); log_printhex (message, message_size, "ecdh KDF message params are:");
} }
/* Derive a KEK (key wrapping key) using MESSAGE and SECRET_X. */ /* Derive a KEK (key wrapping key) using MESSAGE and SECRET_X. */
@ -272,7 +272,7 @@ pk_ecdh_encrypt_with_shared_point (int is_encrypt, gcry_mpi_t shared_mpi,
/* We could have allocated more, so clean the tail before returning. */ /* We could have allocated more, so clean the tail before returning. */
memset (secret_x+secret_x_size, 0, old_size - secret_x_size); memset (secret_x+secret_x_size, 0, old_size - secret_x_size);
if (DBG_CRYPTO) if (DBG_CRYPTO)
log_printhex ("ecdh KEK is:", secret_x, secret_x_size ); log_printhex (secret_x, secret_x_size, "ecdh KEK is:");
} }
/* And, finally, aeswrap with key secret_x. */ /* And, finally, aeswrap with key secret_x. */
@ -338,7 +338,7 @@ pk_ecdh_encrypt_with_shared_point (int is_encrypt, gcry_mpi_t shared_mpi,
} }
if (DBG_CRYPTO) if (DBG_CRYPTO)
log_printhex ("ecdh encrypting :", in, data_buf_size ); log_printhex (in, data_buf_size, "ecdh encrypting :");
err = gcry_cipher_encrypt (hd, data_buf+1, data_buf_size+8, err = gcry_cipher_encrypt (hd, data_buf+1, data_buf_size+8,
in, data_buf_size); in, data_buf_size);
@ -354,7 +354,7 @@ pk_ecdh_encrypt_with_shared_point (int is_encrypt, gcry_mpi_t shared_mpi,
data_buf[0] = data_buf_size+8; data_buf[0] = data_buf_size+8;
if (DBG_CRYPTO) if (DBG_CRYPTO)
log_printhex ("ecdh encrypted to:", data_buf+1, data_buf[0] ); log_printhex (data_buf+1, data_buf[0], "ecdh encrypted to:");
result = gcry_mpi_set_opaque (NULL, data_buf, 8 * (1+data_buf[0])); result = gcry_mpi_set_opaque (NULL, data_buf, 8 * (1+data_buf[0]));
if (!result) if (!result)
@ -391,7 +391,7 @@ pk_ecdh_encrypt_with_shared_point (int is_encrypt, gcry_mpi_t shared_mpi,
data_buf_size = data_buf[0]; data_buf_size = data_buf[0];
if (DBG_CRYPTO) if (DBG_CRYPTO)
log_printhex ("ecdh decrypting :", data_buf+1, data_buf_size); log_printhex (data_buf+1, data_buf_size, "ecdh decrypting :");
err = gcry_cipher_decrypt (hd, in, data_buf_size, data_buf+1, err = gcry_cipher_decrypt (hd, in, data_buf_size, data_buf+1,
data_buf_size); data_buf_size);
@ -407,7 +407,7 @@ pk_ecdh_encrypt_with_shared_point (int is_encrypt, gcry_mpi_t shared_mpi,
data_buf_size -= 8; data_buf_size -= 8;
if (DBG_CRYPTO) if (DBG_CRYPTO)
log_printhex ("ecdh decrypted to :", in, data_buf_size); log_printhex (in, data_buf_size, "ecdh decrypted to :");
/* Padding is removed later. */ /* Padding is removed later. */
/* if (in[data_buf_size-1] > 8 ) */ /* if (in[data_buf_size-1] > 8 ) */

4
g10/encrypt.c
View File

@ -660,7 +660,7 @@ encrypt_crypt (ctrl_t ctrl, int filefd, const char *filename,
make_session_key (cfx.dek); make_session_key (cfx.dek);
if (DBG_CRYPTO) if (DBG_CRYPTO)
log_printhex ("DEK is: ", cfx.dek->key, cfx.dek->keylen ); log_printhex (cfx.dek->key, cfx.dek->keylen, "DEK is: ");
rc = write_pubkey_enc_from_list (ctrl, pk_list, cfx.dek, out); rc = write_pubkey_enc_from_list (ctrl, pk_list, cfx.dek, out);
if (rc) if (rc)
@ -854,7 +854,7 @@ encrypt_filter (void *opaque, int control,
make_session_key ( efx->cfx.dek ); make_session_key ( efx->cfx.dek );
if (DBG_CRYPTO) if (DBG_CRYPTO)
log_printhex ("DEK is: ", efx->cfx.dek->key, efx->cfx.dek->keylen); log_printhex (efx->cfx.dek->key, efx->cfx.dek->keylen, "DEK is: ");
rc = write_pubkey_enc_from_list (efx->ctrl, rc = write_pubkey_enc_from_list (efx->ctrl,
efx->pk_list, efx->cfx.dek, a); efx->pk_list, efx->cfx.dek, a);

8
g10/export.c
View File

@ -1028,11 +1028,11 @@ transfer_format_to_openpgp (gcry_sexp_t s_pgp, PKT_public_key *pk)
/* log_debug ("XXX pubkey_algo=%d\n", pubkey_algo); */ /* log_debug ("XXX pubkey_algo=%d\n", pubkey_algo); */
/* log_debug ("XXX is_protected=%d\n", is_protected); */ /* log_debug ("XXX is_protected=%d\n", is_protected); */
/* log_debug ("XXX protect_algo=%d\n", protect_algo); */ /* log_debug ("XXX protect_algo=%d\n", protect_algo); */
/* log_printhex ("XXX iv", iv, ivlen); */ /* log_printhex (iv, ivlen, "XXX iv"); */
/* log_debug ("XXX ivlen=%d\n", ivlen); */ /* log_debug ("XXX ivlen=%d\n", ivlen); */
/* log_debug ("XXX s2k_mode=%d\n", s2k_mode); */ /* log_debug ("XXX s2k_mode=%d\n", s2k_mode); */
/* log_debug ("XXX s2k_algo=%d\n", s2k_algo); */ /* log_debug ("XXX s2k_algo=%d\n", s2k_algo); */
/* log_printhex ("XXX s2k_salt", s2k_salt, sizeof s2k_salt); */ /* log_printhex (s2k_salt, sizeof s2k_salt, "XXX s2k_salt"); */
/* log_debug ("XXX s2k_count=%lu\n", (unsigned long)s2k_count); */ /* log_debug ("XXX s2k_count=%lu\n", (unsigned long)s2k_count); */
/* for (idx=0; skey[idx]; idx++) */ /* for (idx=0; skey[idx]; idx++) */
/* { */ /* { */
@ -1043,7 +1043,7 @@ transfer_format_to_openpgp (gcry_sexp_t s_pgp, PKT_public_key *pk)
/* void *p; */ /* void *p; */
/* unsigned int nbits; */ /* unsigned int nbits; */
/* p = gcry_mpi_get_opaque (skey[idx], &nbits); */ /* p = gcry_mpi_get_opaque (skey[idx], &nbits); */
/* log_printhex (NULL, p, (nbits+7)/8); */ /* log_printhex ( p, (nbits+7)/8, NULL); */
/* } */ /* } */
/* else */ /* else */
/* gcry_mpi_dump (skey[idx]); */ /* gcry_mpi_dump (skey[idx]); */
@ -1110,7 +1110,7 @@ transfer_format_to_openpgp (gcry_sexp_t s_pgp, PKT_public_key *pk)
/* void *p; */ /* void *p; */
/* unsigned int nbits; */ /* unsigned int nbits; */
/* p = gcry_mpi_get_opaque (skey[idx], &nbits); */ /* p = gcry_mpi_get_opaque (skey[idx], &nbits); */
/* log_printhex (NULL, p, (nbits+7)/8); */ /* log_printhex (p, (nbits+7)/8, NULL); */
/* } */ /* } */
/* else */ /* else */
/* gcry_mpi_dump (skey[idx]); */ /* gcry_mpi_dump (skey[idx]); */

2
g10/keyid.c
View File

@ -953,7 +953,7 @@ keygrip_from_pk (PKT_public_key *pk, unsigned char *array)
else else
{ {
if (DBG_PACKET) if (DBG_PACKET)
log_printhex ("keygrip=", array, 20); log_printhex (array, 20, "keygrip=");
/* FIXME: Save the keygrip in PK. */ /* FIXME: Save the keygrip in PK. */
} }
gcry_sexp_release (s_pkey); gcry_sexp_release (s_pkey);

4
g10/pubkey-enc.c
View File

@ -259,7 +259,7 @@ get_it (ctrl_t ctrl,
* CSUM * CSUM
*/ */
if (DBG_CRYPTO) if (DBG_CRYPTO)
log_printhex ("DEK frame:", frame, nframe); log_printhex (frame, nframe, "DEK frame:");
n = 0; n = 0;
if (sk->pubkey_algo == PUBKEY_ALGO_ECDH) if (sk->pubkey_algo == PUBKEY_ALGO_ECDH)
@ -372,7 +372,7 @@ get_it (ctrl_t ctrl,
if (DBG_CLOCK) if (DBG_CLOCK)
log_clock ("decryption ready"); log_clock ("decryption ready");
if (DBG_CRYPTO) if (DBG_CRYPTO)
log_printhex ("DEK is:", dek->key, dek->keylen); log_printhex (dek->key, dek->keylen, "DEK is:");
/* Check that the algo is in the preferences and whether it has /* Check that the algo is in the preferences and whether it has
* expired. Also print a status line with the key's fingerprint. */ * expired. Also print a status line with the key's fingerprint. */

2
g13/call-syshelp.c
View File

@ -366,7 +366,7 @@ create_inq_cb (void *opaque, const char *line)
void *ciphertext; void *ciphertext;
size_t ciphertextlen; size_t ciphertextlen;
log_printhex ("plain", plaintext, plaintextlen); log_printhex (plaintext, plaintextlen, "plain");
err = g13_encrypt_keyblob (parm->ctrl, err = g13_encrypt_keyblob (parm->ctrl,
plaintext, plaintextlen, plaintext, plaintextlen,
&ciphertext, &ciphertextlen); &ciphertext, &ciphertextlen);

6
g13/g13tuple.c
View File

@ -318,7 +318,7 @@ dump_tupledesc (tupledesc_t tuples)
if (n < 100 && all_printable (value, n)) if (n < 100 && all_printable (value, n))
log_printf ("%.*s\n", (int)n, (const char*)value); log_printf ("%.*s\n", (int)n, (const char*)value);
else else
log_printhex ("", value, n); log_printhex (value, n, "");
break; break;
case KEYBLOB_TAG_CONT_NSEC: case KEYBLOB_TAG_CONT_NSEC:
@ -327,11 +327,11 @@ dump_tupledesc (tupledesc_t tuples)
if (!convert_uint (value, n, &uint)) if (!convert_uint (value, n, &uint))
log_printf ("%llu\n", uint); log_printf ("%llu\n", uint);
else else
log_printhex ("", value, n); log_printhex (value, n, "");
break; break;
default: default:
log_printhex ("", value, n); log_printhex (value, n, "");
break; break;
} }
} }

20
scd/apdu.c
View File

@ -475,7 +475,7 @@ dump_reader_status (int slot)
if (reader_table[slot].atrlen) if (reader_table[slot].atrlen)
{ {
log_info ("slot %d: ATR=", slot); log_info ("slot %d: ATR=", slot);
log_printhex ("", reader_table[slot].atr, reader_table[slot].atrlen); log_printhex (reader_table[slot].atr, reader_table[slot].atrlen, "");
} }
} }
@ -739,7 +739,7 @@ pcsc_send_apdu (int slot, unsigned char *apdu, size_t apdulen,
return err; return err;
if (DBG_CARD_IO) if (DBG_CARD_IO)
log_printhex (" PCSC_data:", apdu, apdulen); log_printhex (apdu, apdulen, " PCSC_data:");
if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_T1)) if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_T1))
send_pci.protocol = PCSC_PROTOCOL_T1; send_pci.protocol = PCSC_PROTOCOL_T1;
@ -1453,7 +1453,7 @@ send_apdu_ccid (int slot, unsigned char *apdu, size_t apdulen,
return err; return err;
if (DBG_CARD_IO) if (DBG_CARD_IO)
log_printhex (" raw apdu:", apdu, apdulen); log_printhex (apdu, apdulen, " raw apdu:");
maxbuflen = *buflen; maxbuflen = *buflen;
if (pininfo) if (pininfo)
@ -1723,7 +1723,7 @@ my_rapdu_send_apdu (int slot, unsigned char *apdu, size_t apdulen,
*buflen = 0; *buflen = 0;
if (DBG_CARD_IO) if (DBG_CARD_IO)
log_printhex (" APDU_data:", apdu, apdulen); log_printhex (apdu, apdulen, " APDU_data:");
if (apdulen < 4) if (apdulen < 4)
{ {
@ -2879,7 +2879,7 @@ send_le (int slot, int class, int ins, int p0, int p1,
log_debug (" response: sw=%04X datalen=%d\n", log_debug (" response: sw=%04X datalen=%d\n",
sw, (unsigned int)resultlen); sw, (unsigned int)resultlen);
if ( !retbuf && (sw == SW_SUCCESS || (sw & 0xff00) == SW_MORE_DATA)) if ( !retbuf && (sw == SW_SUCCESS || (sw & 0xff00) == SW_MORE_DATA))
log_printhex (" dump: ", result, resultlen); log_printhex (result, resultlen, " dump: ");
} }
if (sw == SW_SUCCESS || sw == SW_EOF_REACHED) if (sw == SW_SUCCESS || sw == SW_EOF_REACHED)
@ -2952,7 +2952,7 @@ send_le (int slot, int class, int ins, int p0, int p1,
log_debug (" more: sw=%04X datalen=%d\n", log_debug (" more: sw=%04X datalen=%d\n",
sw, (unsigned int)resultlen); sw, (unsigned int)resultlen);
if (!retbuf && (sw==SW_SUCCESS || (sw&0xff00)==SW_MORE_DATA)) if (!retbuf && (sw==SW_SUCCESS || (sw&0xff00)==SW_MORE_DATA))
log_printhex (" dump: ", result, resultlen); log_printhex (result, resultlen, " dump: ");
} }
if ((sw & 0xff00) == SW_MORE_DATA if ((sw & 0xff00) == SW_MORE_DATA
@ -2998,7 +2998,7 @@ send_le (int slot, int class, int ins, int p0, int p1,
xfree (result_buffer); xfree (result_buffer);
if (DBG_CARD_IO && retbuf && sw == SW_SUCCESS) if (DBG_CARD_IO && retbuf && sw == SW_SUCCESS)
log_printhex (" dump: ", *retbuf, *retbuflen); log_printhex (*retbuf, *retbuflen, " dump: ");
return sw; return sw;
} }
@ -3164,7 +3164,7 @@ apdu_send_direct (int slot, size_t extended_length,
log_debug (" response: sw=%04X datalen=%d\n", log_debug (" response: sw=%04X datalen=%d\n",
sw, (unsigned int)resultlen); sw, (unsigned int)resultlen);
if ( !retbuf && (sw == SW_SUCCESS || (sw & 0xff00) == SW_MORE_DATA)) if ( !retbuf && (sw == SW_SUCCESS || (sw & 0xff00) == SW_MORE_DATA))
log_printhex (" dump: ", result, resultlen); log_printhex (result, resultlen, " dump: ");
} }
if (handle_more && (sw & 0xff00) == SW_MORE_DATA) if (handle_more && (sw & 0xff00) == SW_MORE_DATA)
@ -3220,7 +3220,7 @@ apdu_send_direct (int slot, size_t extended_length,
log_debug (" more: sw=%04X datalen=%d\n", log_debug (" more: sw=%04X datalen=%d\n",
sw, (unsigned int)resultlen); sw, (unsigned int)resultlen);
if (!retbuf && (sw==SW_SUCCESS || (sw&0xff00)==SW_MORE_DATA)) if (!retbuf && (sw==SW_SUCCESS || (sw&0xff00)==SW_MORE_DATA))
log_printhex (" dump: ", result, resultlen); log_printhex (result, resultlen, " dump: ");
} }
if ((sw & 0xff00) == SW_MORE_DATA if ((sw & 0xff00) == SW_MORE_DATA
@ -3292,7 +3292,7 @@ apdu_send_direct (int slot, size_t extended_length,
*r_sw = sw; *r_sw = sw;
if (DBG_CARD_IO && retbuf) if (DBG_CARD_IO && retbuf)
log_printhex (" dump: ", *retbuf, *retbuflen); log_printhex (*retbuf, *retbuflen, " dump: ");
return 0; return 0;

12
scd/app-openpgp.c
View File

@ -608,7 +608,7 @@ dump_all_do (int slot)
if (data_objects[i].binary) if (data_objects[i].binary)
{ {
log_info ("DO '%s': ", data_objects[i].desc); log_info ("DO '%s': ", data_objects[i].desc);
log_printhex ("", buffer, buflen); log_printhex (buffer, buflen, "");
} }
else else
log_info ("DO '%s': '%.*s'\n", log_info ("DO '%s': '%.*s'\n",
@ -638,7 +638,7 @@ dump_all_do (int slot)
if (valuelen > 200) if (valuelen > 200)
log_info ("[%u]\n", (unsigned int)valuelen); log_info ("[%u]\n", (unsigned int)valuelen);
else else
log_printhex ("", value, valuelen); log_printhex (value, valuelen, "");
} }
else else
log_info ("DO '%s': '%.*s'\n", log_info ("DO '%s': '%.*s'\n",
@ -5206,7 +5206,7 @@ parse_algorithm_attribute (app_t app, int keyno)
curve = ecc_curve (buffer + 1, oidlen); curve = ecc_curve (buffer + 1, oidlen);
if (!curve) if (!curve)
log_printhex ("Curve with OID not supported: ", buffer+1, buflen-1); log_printhex (buffer+1, buflen-1, "Curve with OID not supported: ");
else else
{ {
app->app_local->keyattr[keyno].key_type = KEY_TYPE_ECC; app->app_local->keyattr[keyno].key_type = KEY_TYPE_ECC;
@ -5224,7 +5224,7 @@ parse_algorithm_attribute (app_t app, int keyno)
} }
} }
else if (opt.verbose) else if (opt.verbose)
log_printhex ("", buffer, buflen); log_printhex (buffer, buflen, "");
xfree (relptr); xfree (relptr);
} }
@ -5266,7 +5266,7 @@ app_select_openpgp (app_t app)
if (opt.verbose) if (opt.verbose)
{ {
log_info ("AID: "); log_info ("AID: ");
log_printhex ("", buffer, buflen); log_printhex (buffer, buflen, "");
} }
app->card_version = buffer[6] << 8; app->card_version = buffer[6] << 8;
@ -5299,7 +5299,7 @@ app_select_openpgp (app_t app)
if (opt.verbose) if (opt.verbose)
{ {
log_info ("Historical Bytes: "); log_info ("Historical Bytes: ");
log_printhex ("", buffer, buflen); log_printhex (buffer, buflen, "");
} }
parse_historical (app->app_local, buffer, buflen); parse_historical (app->app_local, buffer, buflen);
xfree (relptr); xfree (relptr);

8
scd/app-p15.c
View File

@ -744,7 +744,7 @@ read_ef_odf (app_t app, unsigned short odf_fid)
} }
else else
{ {
log_printhex ("p15: ODF format not supported:", p, buflen); log_printhex (p, buflen, "p15: ODF format not supported:");
xfree (buffer); xfree (buffer);
return gpg_error (GPG_ERR_INV_OBJ); return gpg_error (GPG_ERR_INV_OBJ);
} }
@ -799,7 +799,7 @@ read_ef_odf (app_t app, unsigned short odf_fid)
if (n < buflen) if (n < buflen)
{ {
log_info ("p15: warning: garbage detected at end of ODF: "); log_info ("p15: warning: garbage detected at end of ODF: ");
log_printhex ("", p, buflen); log_printhex (p, buflen, "");
} }
} }
@ -2463,7 +2463,7 @@ read_ef_tokeninfo (app_t app)
{ {
/* (We use a separate log_info to avoid the "DBG:" prefix.) */ /* (We use a separate log_info to avoid the "DBG:" prefix.) */
log_info ("p15: serialNumber .: "); log_info ("p15: serialNumber .: ");
log_printhex ("", p, objlen); log_printhex (p, objlen, "");
} }
p += objlen; p += objlen;
n -= objlen; n -= objlen;
@ -3192,7 +3192,7 @@ micardo_mse (app_t app, unsigned short fid)
if (opt.verbose) if (opt.verbose)
{ {
log_info (buffer, buflen, "p15: keyD record: "); log_info (buffer, buflen, "p15: keyD record: ");
log_printhex ("", buffer, buflen); log_printhex (buffer, buflen, "");
} }
p = find_tlv (buffer, buflen, 0x83, &n); p = find_tlv (buffer, buflen, 0x83, &n);
if (p && n == 4 && ((p[2]<<8)|p[3]) == fid) if (p && n == 4 && ((p[2]<<8)|p[3]) == fid)

2
sm/certcheck.c
View File

@ -568,7 +568,7 @@ gpgsm_check_cms_signature (ksba_cert_t cert, ksba_const_sexp_t sigval,
return gpg_error (GPG_ERR_BUG); return gpg_error (GPG_ERR_BUG);
} }
if (DBG_CRYPTO) if (DBG_CRYPTO)
log_printhex ("public key: ", p, n); log_printhex (p, n, "public key: ");
rc = gcry_sexp_sscan ( &s_pkey, NULL, (char*)p, n); rc = gcry_sexp_sscan ( &s_pkey, NULL, (char*)p, n);
ksba_free (p); ksba_free (p);

2
sm/certdump.c
View File

@ -167,7 +167,7 @@ gpgsm_dump_string (const char *string)
else else
{ {
log_printf ( "[ "); log_printf ( "[ ");
log_printhex (NULL, string, strlen (string)); log_printhex (string, strlen (string), NULL);
log_printf ( " ]"); log_printf ( " ]");
} }
} }

4
sm/decrypt.c
View File

@ -72,7 +72,7 @@ prepare_decryption (ctrl_t ctrl, const char *hexkeygrip, const char *desc,
} }
if (DBG_CRYPTO) if (DBG_CRYPTO)
log_printhex ("pkcs1 encoded session key:", seskey, seskeylen); log_printhex (seskey, seskeylen, "pkcs1 encoded session key:");
n=0; n=0;
if (seskeylen == 32 || seskeylen == 24 || seskeylen == 16) if (seskeylen == 32 || seskeylen == 24 || seskeylen == 16)
@ -115,7 +115,7 @@ prepare_decryption (ctrl_t ctrl, const char *hexkeygrip, const char *desc,
} }
if (DBG_CRYPTO) if (DBG_CRYPTO)
log_printhex ("session key:", seskey+n, seskeylen-n); log_printhex (seskey+n, seskeylen-n, "session key:");
rc = gcry_cipher_open (&parm->hd, parm->algo, parm->mode, 0); rc = gcry_cipher_open (&parm->hd, parm->algo, parm->mode, 0);
if (rc) if (rc)

2
sm/fingerprint.c
View File

@ -196,7 +196,7 @@ gpgsm_get_keygrip (ksba_cert_t cert, unsigned char *array)
return NULL; return NULL;
} }
if (DBG_X509) if (DBG_X509)
log_printhex ("keygrip=", array, 20); log_printhex (array, 20, "keygrip=");
return array; return array;
} }

2
sm/import.c
View File

@ -836,7 +836,7 @@ parse_p12 (ctrl_t ctrl, ksba_reader_t reader, struct stats_s *stats)
log_error ("can't calculate keygrip\n"); log_error ("can't calculate keygrip\n");
goto leave; goto leave;
} }
log_printhex ("keygrip=", grip, 20); log_printhex (grip, 20, "keygrip=");
/* Convert to canonical encoding using a function which pads it to a /* Convert to canonical encoding using a function which pads it to a
multiple of 64 bits. We need this padding for AESWRAP. */ multiple of 64 bits. We need this padding for AESWRAP. */

6
sm/verify.c
View File

@ -512,10 +512,10 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, estream_t out_fp)
if (DBG_X509) if (DBG_X509)
{ {
if (msgdigest) if (msgdigest)
log_printhex ("message: ", msgdigest, msgdigestlen); log_printhex (msgdigest, msgdigestlen, "message: ");
if (s) if (s)
log_printhex ("computed: ", log_printhex (s, gcry_md_get_algo_dlen (algo),
s, gcry_md_get_algo_dlen (algo)); "computed: ");
} }
fpr = gpgsm_fpr_and_name_for_status (cert); fpr = gpgsm_fpr_and_name_for_status (cert);
gpgsm_status (ctrl, STATUS_BADSIG, fpr); gpgsm_status (ctrl, STATUS_BADSIG, fpr);