mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* cardglue.c (pin_cb): Disable debug output.
* mk-w32-dist: Check for patch files. * w32installer.nsi: Translated a few more strings. Print a warning if permssions are not suitable for the installation. Add Uninstaller entries.
This commit is contained in:
parent
f0e9a1ff4f
commit
a043c14d22
14 changed files with 141 additions and 40 deletions
|
@ -1,3 +1,14 @@
|
|||
2005-03-14 Werner Koch <wk@g10code.com>
|
||||
|
||||
* cardglue.c (pin_cb): Disable debug output.
|
||||
|
||||
2005-03-11 Werner Koch <wk@g10code.com>
|
||||
|
||||
* keygen.c (gen_card_key_with_backup): Write status line with the
|
||||
backup filename.
|
||||
|
||||
* status.h, status.h (STATUS_BACKUP_KEY_CREATED): New.
|
||||
|
||||
2005-03-10 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* keyserver.c (parse_keyserver_options): Accept honor-http-proxy
|
||||
|
|
|
@ -578,7 +578,7 @@ change_url (void)
|
|||
}
|
||||
|
||||
|
||||
/* Fetch the key from the URL given on teh card or try to get it from
|
||||
/* Fetch the key from the URL given on the card or try to get it from
|
||||
the default keyserver. */
|
||||
static int
|
||||
fetch_url(void)
|
||||
|
|
|
@ -659,7 +659,7 @@ pin_cb (void *opaque, const char *info, char **retstr)
|
|||
const char *ends, *s;
|
||||
|
||||
*retstr = NULL;
|
||||
log_debug ("asking for PIN '%s'\n", info);
|
||||
/* log_debug ("asking for PIN '%s'\n", info); */
|
||||
|
||||
/* We use a special prefix to check whether the Admin PIN has been
|
||||
requested. */
|
||||
|
|
16
g10/keygen.c
16
g10/keygen.c
|
@ -3420,9 +3420,25 @@ gen_card_key_with_backup (int algo, int keyno, int is_primary,
|
|||
}
|
||||
else
|
||||
{
|
||||
byte array[MAX_FINGERPRINT_LEN];
|
||||
char *fprbuf, *p;
|
||||
|
||||
iobuf_close (fp);
|
||||
iobuf_ioctl (NULL, 2, 0, (char*)fname);
|
||||
log_info (_("NOTE: backup of card key saved to `%s'\n"), fname);
|
||||
|
||||
fingerprint_from_sk (sk, array, &n);
|
||||
p = fprbuf = xmalloc (MAX_FINGERPRINT_LEN*2 + 1 + 1);
|
||||
for (i=0; i < n ; i++, p += 2)
|
||||
sprintf (p, "%02X", array[i]);
|
||||
*p++ = ' ';
|
||||
*p = 0;
|
||||
|
||||
write_status_text_and_buffer (STATUS_BACKUP_KEY_CREATED,
|
||||
fprbuf,
|
||||
fname, strlen (fname),
|
||||
0);
|
||||
xfree (fprbuf);
|
||||
}
|
||||
free_packet (pkt);
|
||||
m_free (pkt);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* status.c
|
||||
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
|
||||
* 2004 Free Software Foundation, Inc.
|
||||
* 2004, 2005 Free Software Foundation, Inc.
|
||||
*
|
||||
* This file is part of GnuPG.
|
||||
*
|
||||
|
@ -162,6 +162,7 @@ get_status_string ( int no )
|
|||
case STATUS_SIG_SUBPACKET : s = "SIG_SUBPACKET"; break;
|
||||
case STATUS_SC_OP_SUCCESS : s = "SC_OP_SUCCESS"; break;
|
||||
case STATUS_SC_OP_FAILURE : s = "SC_OP_FAILURE"; break;
|
||||
case STATUS_BACKUP_KEY_CREATED:s="BACKUP_KEY_CREATED"; break;
|
||||
default: s = "?"; break;
|
||||
}
|
||||
return s;
|
||||
|
|
|
@ -113,6 +113,8 @@
|
|||
#define STATUS_SC_OP_FAILURE 79
|
||||
#define STATUS_SC_OP_SUCCESS 80
|
||||
|
||||
#define STATUS_BACKUP_KEY_CREATED 81
|
||||
|
||||
|
||||
/*-- status.c --*/
|
||||
void set_status_fd ( int fd );
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue