mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Minor fixes.
This commit is contained in:
parent
78ff45c49e
commit
382d2f8efb
23 changed files with 106 additions and 54 deletions
|
@ -1,3 +1,12 @@
|
|||
2008-12-09 Werner Koch <wk@g10code.com>
|
||||
|
||||
* gpg-agent.c (main): Call i18n_init before init_common_subsystems.
|
||||
* preset-passphrase.c (main): Ditto.
|
||||
* protect-tool.c (main): Ditto.
|
||||
|
||||
* command.c (cmd_preset_passphrase): Allow an arbitrary string for
|
||||
the cache id.
|
||||
|
||||
2008-12-08 Werner Koch <wk@g10code.com>
|
||||
|
||||
* gpg-agent.c (handle_connections): Sync the ticker to the next
|
||||
|
|
|
@ -1093,7 +1093,7 @@ cmd_passwd (assuan_context_t ctx, char *line)
|
|||
return rc;
|
||||
}
|
||||
|
||||
/* PRESET_PASSPHRASE <hexstring_with_keygrip> <timeout> <hexstring>
|
||||
/* PRESET_PASSPHRASE <string_or_keygrip> <timeout> <hexstring>
|
||||
|
||||
Set the cached passphrase/PIN for the key identified by the keygrip
|
||||
to passwd for the given time, where -1 means infinite and 0 means
|
||||
|
@ -1104,7 +1104,6 @@ static int
|
|||
cmd_preset_passphrase (assuan_context_t ctx, char *line)
|
||||
{
|
||||
int rc;
|
||||
unsigned char grip[20];
|
||||
char *grip_clear = NULL;
|
||||
char *passphrase = NULL;
|
||||
int ttl;
|
||||
|
@ -1113,11 +1112,6 @@ cmd_preset_passphrase (assuan_context_t ctx, char *line)
|
|||
if (!opt.allow_preset_passphrase)
|
||||
return set_error (GPG_ERR_NOT_SUPPORTED, "no --allow-preset-passphrase");
|
||||
|
||||
rc = parse_keygrip (ctx, line, grip);
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
/* FIXME: parse_keygrip should return a tail pointer. */
|
||||
grip_clear = line;
|
||||
while (*line && (*line != ' ' && *line != '\t'))
|
||||
line++;
|
||||
|
|
|
@ -535,9 +535,9 @@ main (int argc, char **argv )
|
|||
log_set_prefix ("gpg-agent", JNLIB_LOG_WITH_PREFIX|JNLIB_LOG_WITH_PID);
|
||||
|
||||
/* Make sure that our subsystems are ready. */
|
||||
i18n_init ();
|
||||
init_common_subsystems ();
|
||||
|
||||
i18n_init ();
|
||||
|
||||
/* Libgcrypt requires us to register the threading model first.
|
||||
Note that this will also do the pth_init. */
|
||||
|
|
|
@ -209,9 +209,8 @@ main (int argc, char **argv)
|
|||
log_set_prefix ("gpg-preset-passphrase", 1);
|
||||
|
||||
/* Make sure that our subsystems are ready. */
|
||||
init_common_subsystems ();
|
||||
|
||||
i18n_init ();
|
||||
init_common_subsystems ();
|
||||
|
||||
opt_homedir = default_homedir ();
|
||||
|
||||
|
|
|
@ -1059,9 +1059,8 @@ main (int argc, char **argv )
|
|||
log_set_prefix ("gpg-protect-tool", 1);
|
||||
|
||||
/* Make sure that our subsystems are ready. */
|
||||
init_common_subsystems ();
|
||||
|
||||
i18n_init ();
|
||||
init_common_subsystems ();
|
||||
|
||||
if (!gcry_check_version (NEED_LIBGCRYPT_VERSION) )
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue