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

scd: Fix int/short mismatch in format string of app-p15.c

Browse Source 
* scd/app-p15.c (parse_certid): Use snprintf and cast value.
(send_certinfo): Ditto.
(send_keypairinfo): Ditto.
(do_getattr): Ditto.
This commit is contained in:
Werner Koch 2014-09-18 15:39:50 +02:00
parent f82a6e0f08
commit b17e8bbf20
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scd/app-p15.c
View File

@ -494,7 +494,8 @@ parse_certid (app_t app, const char *certid,
*r_objidlen = 0; *r_objidlen = 0;
if (app->app_local->home_df) if (app->app_local->home_df)
sprintf (tmpbuf, "P15-%04hX.", (app->app_local->home_df & 0xffff)); snprintf (tmpbuf, sizeof tmpbuf,
"P15-%04X.", (unsigned int)(app->app_local->home_df & 0xffff));
else else
strcpy (tmpbuf, "P15."); strcpy (tmpbuf, "P15.");
if (strncmp (certid, tmpbuf, strlen (tmpbuf)) ) if (strncmp (certid, tmpbuf, strlen (tmpbuf)) )
@ -2370,7 +2371,8 @@ send_certinfo (app_t app, ctrl_t ctrl, const char *certtype,
p = stpcpy (buf, "P15"); p = stpcpy (buf, "P15");
if (app->app_local->home_df) if (app->app_local->home_df)
{ {
sprintf (p, "-%04hX", (app->app_local->home_df & 0xffff)); snprintf (p, 6, "-%04X",
(unsigned int)(app->app_local->home_df & 0xffff));
p += 5; p += 5;
} }
p = stpcpy (p, "."); p = stpcpy (p, ".");
@ -2461,7 +2463,8 @@ send_keypairinfo (app_t app, ctrl_t ctrl, prkdf_object_t keyinfo)
p = stpcpy (buf, "P15"); p = stpcpy (buf, "P15");
if (app->app_local->home_df) if (app->app_local->home_df)
{ {
sprintf (p, "-%04hX", (app->app_local->home_df & 0xffff)); snprintf (p, 6, "-%04hX",
(unsigned int)(app->app_local->home_df & 0xffff));
p += 5; p += 5;
} }
p = stpcpy (p, "."); p = stpcpy (p, ".");
@ -2686,7 +2689,8 @@ do_getattr (app_t app, ctrl_t ctrl, const char *name)
p = stpcpy (buf, "P15"); p = stpcpy (buf, "P15");
if (app->app_local->home_df) if (app->app_local->home_df)
{ {
sprintf (p, "-%04hX", (app->app_local->home_df & 0xffff)); snprintf (p, 6, "-%04hX",
(unsigned int)(app->app_local->home_df & 0xffff));
p += 5; p += 5;
} }
p = stpcpy (p, "."); p = stpcpy (p, ".");