security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-08 23:37:47 +02:00
Code Activity

replace some sprintf by bin2hex.

Browse Source
This commit is contained in:
Werner Koch 2010-10-18 13:54:42 +00:00
parent e9996e855e
commit ff59089979
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
g10/ChangeLog
View File

@ -1,5 +1,8 @@
2010-10-18 Werner Koch <wk@g10code.com> 2010-10-18 Werner Koch <wk@g10code.com>
* call-agent.c (agent_scd_pksign): Replace sprintf by bin2hex.
(agent_scd_pkdecrypt, agent_pksign): Ditto.
* sign.c (do_sign): Remove warning and commented old code. * sign.c (do_sign): Remove warning and commented old code.
2010-10-14 Werner Koch <wk@g10code.com> 2010-10-14 Werner Koch <wk@g10code.com>

29
g10/call-agent.c
View File

@ -935,8 +935,8 @@ agent_scd_pksign (const char *serialno, int hashalgo,
const unsigned char *indata, size_t indatalen, const unsigned char *indata, size_t indatalen,
unsigned char **r_buf, size_t *r_buflen) unsigned char **r_buf, size_t *r_buflen)
{ {
int rc, i; int rc;
char *p, line[ASSUAN_LINELENGTH]; char line[ASSUAN_LINELENGTH];
membuf_t data; membuf_t data;
size_t len; size_t len;
@ -959,10 +959,9 @@ agent_scd_pksign (const char *serialno, int hashalgo,
if (rc) if (rc)
return rc; return rc;
sprintf (line, "SCD SETDATA "); strcpy (line, "SCD SETDATA ");
p = line + strlen (line); bin2hex (indata, indatalen, line + strlen (line));
for (i=0; i < indatalen ; i++, p += 2 )
sprintf (p, "%02X", indata[i]);
rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL); rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
if (rc) if (rc)
return rc; return rc;
@ -999,8 +998,8 @@ agent_scd_pkdecrypt (const char *serialno,
const unsigned char *indata, size_t indatalen, const unsigned char *indata, size_t indatalen,
unsigned char **r_buf, size_t *r_buflen) unsigned char **r_buf, size_t *r_buflen)
{ {
int rc, i; int rc;
char *p, line[ASSUAN_LINELENGTH]; char line[ASSUAN_LINELENGTH];
membuf_t data; membuf_t data;
size_t len; size_t len;
@ -1020,10 +1019,9 @@ agent_scd_pkdecrypt (const char *serialno,
if (rc) if (rc)
return rc; return rc;
sprintf (line, "SCD SETDATA "); strcpy (line, "SCD SETDATA ");
p = line + strlen (line); bin2hex (indata, indatalen, line + strlen (line));
for (i=0; i < indatalen ; i++, p += 2 )
sprintf (p, "%02X", indata[i]);
rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL); rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
if (rc) if (rc)
return rc; return rc;
@ -1635,8 +1633,7 @@ agent_pksign (ctrl_t ctrl, const char *cache_nonce,
gcry_sexp_t *r_sigval) gcry_sexp_t *r_sigval)
{ {
gpg_error_t err; gpg_error_t err;
int i; char line[ASSUAN_LINELENGTH];
char *p, line[ASSUAN_LINELENGTH];
membuf_t data; membuf_t data;
*r_sigval = NULL; *r_sigval = NULL;
@ -1669,9 +1666,7 @@ agent_pksign (ctrl_t ctrl, const char *cache_nonce,
} }
snprintf (line, sizeof line, "SETHASH %d ", digestalgo); snprintf (line, sizeof line, "SETHASH %d ", digestalgo);
p = line + strlen (line); bin2hex (digest, digestlen, line + strlen (line));
for (i=0; i < digestlen ; i++, p += 2 )
sprintf (p, "%02X", digest[i]);
err = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL); err = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
if (err) if (err)
return err; return err;