mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
* 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.
This commit is contained in:
parent
4ec9365c6d
commit
74330a49ec
@ -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>
|
||||
|
||||
* g10.c (main): Add --require-secmem/--no-require-secmem to cause
|
||||
|
@ -2344,7 +2344,7 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
|
||||
{
|
||||
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
|
||||
classic trust models */
|
||||
if(opt.trust_model==TM_PGP || opt.trust_model==TM_CLASSIC)
|
||||
|
@ -787,7 +787,7 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
|
||||
printf("uid%*s%s ",indent,"",validity);
|
||||
}
|
||||
else
|
||||
printf("uid%*s",keystrlen()+10,"");
|
||||
printf("uid%*s", (int)keystrlen()+10,"");
|
||||
|
||||
print_utf8_string( stdout, uid->name, uid->len );
|
||||
putchar('\n');
|
||||
|
@ -643,7 +643,6 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
|
||||
char *atext = NULL;
|
||||
char buf[50];
|
||||
int fd = -1;
|
||||
int nread;
|
||||
u32 reply;
|
||||
char *pw = NULL;
|
||||
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)
|
||||
{ /* old style protocol */
|
||||
size_t nread;
|
||||
|
||||
n = 4 + 20 + strlen (atext);
|
||||
u32tobuf (buf, n );
|
||||
u32tobuf (buf+4, GPGA_PROT_GET_PASSPHRASE );
|
||||
@ -814,6 +815,7 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
|
||||
}
|
||||
else
|
||||
{ /* The new Assuan protocol */
|
||||
int nread;
|
||||
char *line, *p;
|
||||
const unsigned char *s;
|
||||
int i;
|
||||
|
Loading…
x
Reference in New Issue
Block a user