security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

* passphrase.c (agent_get_passphrase): Define NREAD locally as

Browse Source 
size_t or int.

* keylist.c (list_keyblock_print): Make field width an int.
* keyedit.c (show_key_with_all_names): Ditto.
This commit is contained in:
Werner Koch 2004-12-17 18:51:32 +00:00
parent 4ec9365c6d
commit 74330a49ec
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
g10/ChangeLog
View File

@ -1,3 +1,11 @@
2004-12-17 Werner Koch <wk@g10code.com>
* passphrase.c (agent_get_passphrase): Define NREAD locally as
size_t or int.
* keylist.c (list_keyblock_print): Make field width an int.
* keyedit.c (show_key_with_all_names): Ditto.
2004-12-16 David Shaw <dshaw@jabberwocky.com> 2004-12-16 David Shaw <dshaw@jabberwocky.com>
* g10.c (main): Add --require-secmem/--no-require-secmem to cause * g10.c (main): Add --require-secmem/--no-require-secmem to cause

2
g10/keyedit.c
View File

@ -2344,7 +2344,7 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
{ {
if(opt.trust_model!=TM_ALWAYS) if(opt.trust_model!=TM_ALWAYS)
{ {
tty_printf("%*s",keystrlen()+13,""); tty_printf("%*s", (int)keystrlen()+13,"");
/* Ownertrust is only meaningful for the PGP or /* Ownertrust is only meaningful for the PGP or
classic trust models */ classic trust models */
if(opt.trust_model==TM_PGP || opt.trust_model==TM_CLASSIC) if(opt.trust_model==TM_PGP || opt.trust_model==TM_CLASSIC)

2
g10/keylist.c
View File

@ -787,7 +787,7 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
printf("uid%*s%s ",indent,"",validity); printf("uid%*s%s ",indent,"",validity);
} }
else else
printf("uid%*s",keystrlen()+10,""); printf("uid%*s", (int)keystrlen()+10,"");
print_utf8_string( stdout, uid->name, uid->len ); print_utf8_string( stdout, uid->name, uid->len );
putchar('\n'); putchar('\n');

4
g10/passphrase.c
View File

@ -643,7 +643,6 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
char *atext = NULL; char *atext = NULL;
char buf[50]; char buf[50];
int fd = -1; int fd = -1;
int nread;
u32 reply; u32 reply;
char *pw = NULL; char *pw = NULL;
PKT_public_key *pk = m_alloc_clear( sizeof *pk ); PKT_public_key *pk = m_alloc_clear( sizeof *pk );
@ -742,6 +741,8 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
if (!prot) if (!prot)
{ /* old style protocol */ { /* old style protocol */
size_t nread;
n = 4 + 20 + strlen (atext); n = 4 + 20 + strlen (atext);
u32tobuf (buf, n ); u32tobuf (buf, n );
u32tobuf (buf+4, GPGA_PROT_GET_PASSPHRASE ); u32tobuf (buf+4, GPGA_PROT_GET_PASSPHRASE );
@ -814,6 +815,7 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
} }
else else
{ /* The new Assuan protocol */ { /* The new Assuan protocol */
int nread;
char *line, *p; char *line, *p;
const unsigned char *s; const unsigned char *s;
int i; int i;