security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

* query.c (agent_askpin): Hack to show the right default prompt. 

(agent_get_passphrase): Ditto.

* Makefile.am: Renamed the binary protect-tool to gpg-protect-tool.
* protect-tool.c: Removed the note about internal use only.

* gpg-agent.c (main): New option --daemon so that the program is
not accidently started in the background.
This commit is contained in:
Werner Koch 2002-08-21 11:11:04 +00:00
parent afc40938ec
commit cda3b913db
6 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agent/ChangeLog
View File

@ -1,5 +1,10 @@
2002-08-21 Werner Koch <wk@gnupg.org> 2002-08-21 Werner Koch <wk@gnupg.org>
* query.c (agent_askpin): Hack to show the right default prompt.
(agent_get_passphrase): Ditto.
* trans.c: Removed and replaced all usages with standard _()
* divert-scd.c (getpin_cb): Pass a more descritive text to the * divert-scd.c (getpin_cb): Pass a more descritive text to the
pinentry. pinentry.

3
agent/agent.h
View File

@ -107,9 +107,6 @@ enum {
/*-- gpg-agent.c --*/ /*-- gpg-agent.c --*/
void agent_exit (int rc); /* also implemented in other tools */ void agent_exit (int rc); /* also implemented in other tools */
/*-- trans.c --*/
const char *trans (const char *text);
/*-- command.c --*/ /*-- command.c --*/
void start_command_handler (int, int); void start_command_handler (int, int);

8
agent/genkey.c
View File

@ -27,7 +27,7 @@
#include <assert.h> #include <assert.h>
#include "agent.h" #include "agent.h"
#include "i18n.h"
static int static int
store_key (GCRY_SEXP private, const char *passphrase) store_key (GCRY_SEXP private, const char *passphrase)
@ -79,7 +79,7 @@ reenter_compare_cb (struct pin_entry_info_s *pi)
if (!strcmp (pin1, pi->pin)) if (!strcmp (pin1, pi->pin))
return 0; /* okay */ return 0; /* okay */
pi->cb_errtext = trans ("does not match - try again"); pi->cb_errtext = _("does not match - try again");
return -1; return -1;
} }
@ -106,9 +106,9 @@ agent_genkey (CTRL ctrl, const char *keyparam, size_t keyparamlen,
/* Get the passphrase now, cause key generation may take a while. */ /* Get the passphrase now, cause key generation may take a while. */
{ {
const char *text1 = trans ("Please enter the passphrase to%0A" const char *text1 = _("Please enter the passphrase to%0A"
"to protect your new key"); "to protect your new key");
const char *text2 = trans ("Please re-enter this passphrase"); const char *text2 = _("Please re-enter this passphrase");
pi = gcry_calloc_secure (2, sizeof (*pi) + 100); pi = gcry_calloc_secure (2, sizeof (*pi) + 100);
pi2 = pi + (sizeof *pi + 100); pi2 = pi + (sizeof *pi + 100);

6
agent/gpg-agent.c
View File

@ -173,9 +173,9 @@ i18n_init (void)
set_gettext_file( PACKAGE ); set_gettext_file( PACKAGE );
#else #else
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
/* gtk_set_locale (); HMMM: We have not yet called gtk_init */ setlocale (LC_ALL, "");
bindtextdomain( PACKAGE, LOCALEDIR ); bindtextdomain (PACKAGE, LOCALEDIR);
textdomain( PACKAGE ); textdomain (PACKAGE);
#endif #endif
#endif #endif
} }

6
agent/protect-tool.c
View File

@ -133,9 +133,9 @@ i18n_init (void)
set_gettext_file( PACKAGE ); set_gettext_file( PACKAGE );
#else #else
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
/* gtk_set_locale (); HMMM: We have not yet called gtk_init */ setlocale (LC_ALL, "");
bindtextdomain( PACKAGE, LOCALEDIR ); bindtextdomain (PACKAGE, LOCALEDIR);
textdomain( PACKAGE ); textdomain (PACKAGE);
#endif #endif
#endif #endif
} }

36
agent/query.c
View File

@ -32,6 +32,7 @@
#endif #endif
#include "agent.h" #include "agent.h"
#include "i18n.h"
#include "../assuan/assuan.h" #include "../assuan/assuan.h"
#ifdef _POSIX_OPEN_MAX #ifdef _POSIX_OPEN_MAX
@ -235,6 +236,7 @@ agent_askpin (const char *desc_text, struct pin_entry_info_s *pininfo)
char line[ASSUAN_LINELENGTH]; char line[ASSUAN_LINELENGTH];
struct entry_parm_s parm; struct entry_parm_s parm;
const char *errtext = NULL; const char *errtext = NULL;
int is_pin;
if (opt.batch) if (opt.batch)
return 0; /* fixme: we should return BAD PIN */ return 0; /* fixme: we should return BAD PIN */
@ -242,9 +244,11 @@ agent_askpin (const char *desc_text, struct pin_entry_info_s *pininfo)
if (!pininfo || pininfo->max_length < 1) if (!pininfo || pininfo->max_length < 1)
return seterr (Invalid_Value); return seterr (Invalid_Value);
if (!desc_text) if (!desc_text)
desc_text = trans ("Please enter you PIN, so that the secret key " desc_text = _("Please enter you PIN, so that the secret key "
"can be unlocked for this session"); "can be unlocked for this session");
is_pin = desc_text && strstr (desc_text, "PIN");
rc = start_pinentry (); rc = start_pinentry ();
if (rc) if (rc)
return rc; return rc;
@ -256,8 +260,8 @@ agent_askpin (const char *desc_text, struct pin_entry_info_s *pininfo)
return unlock_pinentry (map_assuan_err (rc)); return unlock_pinentry (map_assuan_err (rc));
rc = assuan_transact (entry_ctx, rc = assuan_transact (entry_ctx,
pininfo->min_digits? "SETPROMPT PIN:" is_pin? "SETPROMPT PIN:"
: "SETPROMPT Passphrase:", : "SETPROMPT Passphrase:",
NULL, NULL, NULL, NULL, NULL, NULL); NULL, NULL, NULL, NULL, NULL, NULL);
if (rc) if (rc)
return unlock_pinentry (map_assuan_err (rc)); return unlock_pinentry (map_assuan_err (rc));
@ -283,21 +287,21 @@ agent_askpin (const char *desc_text, struct pin_entry_info_s *pininfo)
rc = assuan_transact (entry_ctx, "GETPIN", getpin_cb, &parm, rc = assuan_transact (entry_ctx, "GETPIN", getpin_cb, &parm,
NULL, NULL, NULL, NULL); NULL, NULL, NULL, NULL);
if (rc == ASSUAN_Too_Much_Data) if (rc == ASSUAN_Too_Much_Data)
errtext = pininfo->min_digits? trans ("PIN too long") errtext = is_pin? _("PIN too long")
: trans ("Passphrase too long"); : _("Passphrase too long");
else if (rc) else if (rc)
return unlock_pinentry (map_assuan_err (rc)); return unlock_pinentry (map_assuan_err (rc));
if (!errtext && pininfo->min_digits) if (!errtext && is_pin)
{ {
/* do some basic checks on the entered PIN. */ /* do some basic checks on the entered PIN. */
if (!all_digitsp (pininfo->pin)) if (!all_digitsp (pininfo->pin))
errtext = trans ("Invalid characters in PIN"); errtext = _("Invalid characters in PIN");
else if (pininfo->max_digits else if (pininfo->max_digits
&& strlen (pininfo->pin) > pininfo->max_digits) && strlen (pininfo->pin) > pininfo->max_digits)
errtext = trans ("PIN too long"); errtext = _("PIN too long");
else if (strlen (pininfo->pin) < pininfo->min_digits) else if (strlen (pininfo->pin) < pininfo->min_digits)
errtext = trans ("PIN too short"); errtext = _("PIN too short");
} }
if (!errtext && pininfo->check_cb) if (!errtext && pininfo->check_cb)
@ -308,8 +312,8 @@ agent_askpin (const char *desc_text, struct pin_entry_info_s *pininfo)
if (rc == -1 && pininfo->cb_errtext) if (rc == -1 && pininfo->cb_errtext)
errtext = pininfo->cb_errtext; errtext = pininfo->cb_errtext;
else if (rc == GNUPG_Bad_Passphrase || rc == GNUPG_Bad_PIN) else if (rc == GNUPG_Bad_Passphrase || rc == GNUPG_Bad_PIN)
errtext = (pininfo->min_digits? trans ("Bad PIN") errtext = (is_pin? _("Bad PIN")
: trans ("Bad Passphrase")); : _("Bad Passphrase"));
else if (rc) else if (rc)
return unlock_pinentry (map_assuan_err (rc)); return unlock_pinentry (map_assuan_err (rc));
} }
@ -346,6 +350,10 @@ agent_get_passphrase (char **retpass, const char *desc, const char *prompt,
if (rc) if (rc)
return rc; return rc;
if (!prompt)
prompt = desc && strstr (desc, "PIN")? "PIN": _("Passphrase");
if (desc) if (desc)
snprintf (line, DIM(line)-1, "SETDESC %s", desc); snprintf (line, DIM(line)-1, "SETDESC %s", desc);
else else
@ -355,7 +363,7 @@ agent_get_passphrase (char **retpass, const char *desc, const char *prompt,
if (rc) if (rc)
return unlock_pinentry (map_assuan_err (rc)); return unlock_pinentry (map_assuan_err (rc));
snprintf (line, DIM(line)-1, "SETPROMPT %s", prompt? prompt : "Passphrase"); snprintf (line, DIM(line)-1, "SETPROMPT %s", prompt);
line[DIM(line)-1] = 0; line[DIM(line)-1] = 0;
rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL); rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
if (rc) if (rc)