security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

Use the gpgrt log functions if possible.

Browse source 
* common/logging.c: Do not build any code if we can use the gpgrt_log
functions.
(log_logv_with_prefix): Rename to log_logv_prefix and change order of
args so that this function matches its printf like counterpart
gpgrt_logv_prefix.  Change all callers.
(log_debug_with_string): Rename to log_debug_string. Change all
callers.
(log_printhex): Move first arg to end so that this function matches
its printf like counterpart gpgrt_log_printhex.  Change all callers.
* common/logging.h: Divert to gpgrt/libgpg-error if we can use the
gpgrt_log functions.
(bug_at): Add inline versions if we can use the gpgrt_log functions.
* configure.ac (GPGRT_ENABLE_LOG_MACROS): Add to AH_BOTTOM.
(mycflags): Add -Wno-format-zero-length.
--

This patch enables the use of the log function from libgpgrt (aka
libgpg-error).  Instead of checking a version number, we enable them
depending on macros set by recent gpg-error versions.  Eventually the
whole divert stuff can be removed.

The -Wno-format-zero-length is required because log_printhex can be
called with an empty format string.  Note that this is fully specified
standard C behaviour.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2017-11-27 15:00:25 +01:00
parent fe96ca8d86
commit b56dfdfc18
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
25 changed files with 107 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scd/app-openpgp.c
View file

@ -558,7 +558,7 @@ dump_all_do (int slot)
if (data_objects[i].binary)
{
log_info ("DO '%s': ", data_objects[i].desc);
log_printhex ("", buffer, buflen);
log_printhex (buffer, buflen, "");
}
else
log_info ("DO '%s': '%.*s'\n",
@ -588,7 +588,7 @@ dump_all_do (int slot)
if (valuelen > 200)
log_info ("[%u]\n", (unsigned int)valuelen);
else
log_printhex ("", value, valuelen);
log_printhex (value, valuelen, "");
}
else
log_info ("DO '%s': '%.*s'\n",
@ -4973,7 +4973,7 @@ parse_algorithm_attribute (app_t app, int keyno)
curve = ecc_curve (buffer + 1, oidlen);
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
{
app->app_local->keyattr[keyno].key_type = KEY_TYPE_ECC;
@ -4991,7 +4991,7 @@ parse_algorithm_attribute (app_t app, int keyno)
}
}
else if (opt.verbose)
log_printhex ("", buffer, buflen);
log_printhex (buffer, buflen, "");
xfree (relptr);
}
@ -5033,7 +5033,7 @@ app_select_openpgp (app_t app)
if (opt.verbose)
{
log_info ("AID: ");
log_printhex ("", buffer, buflen);
log_printhex (buffer, buflen, "");
}
app->card_version = buffer[6] << 8;
@ -5066,7 +5066,7 @@ app_select_openpgp (app_t app)
if (opt.verbose)
{
log_info ("Historical Bytes: ");
log_printhex ("", buffer, buflen);
log_printhex (buffer, buflen, "");
}
parse_historical (app->app_local, buffer, buflen);
xfree (relptr);