[svn] GnuPG - r4955 - in trunk: agent g10
svn author wk
cvs at cvs.gnupg.org
Tue Mar 17 13:13:33 CET 2009
Author: wk
Date: 2009-03-17 13:13:32 +0100 (Tue, 17 Mar 2009)
New Revision: 4955
Modified:
trunk/agent/ChangeLog
trunk/agent/command.c
trunk/g10/ChangeLog
trunk/g10/call-agent.c
trunk/g10/call-agent.h
trunk/g10/gpg.c
trunk/g10/gpgv.c
trunk/g10/passphrase.c
Log:
Move password repetition from gpg to gpg-agent.
Modified: trunk/agent/ChangeLog
===================================================================
--- trunk/agent/ChangeLog 2009-03-16 18:45:46 UTC (rev 4954)
+++ trunk/agent/ChangeLog 2009-03-17 12:13:32 UTC (rev 4955)
@@ -1,3 +1,13 @@
+2009-03-17 Werner Koch <wk at g10code.com>
+
+ * command.c (cmd_get_passphrase): Break repeat loop on error.
+
+2009-03-17 Daiki Ueno <ueno at unixuser.org>
+
+ * command.c (option_value): New function.
+ (cmd_get_passphrase): Accept new option --repeat, which makes
+ gpg-agent to ask passphrase several times.
+
2009-03-06 Werner Koch <wk at g10code.com>
* command.c (cmd_keyinfo): New command.
Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog 2009-03-16 18:45:46 UTC (rev 4954)
+++ trunk/g10/ChangeLog 2009-03-17 12:13:32 UTC (rev 4955)
@@ -1,3 +1,19 @@
+2009-03-17 Daiki Ueno <ueno at unixuser.org>
+
+ * passphrase.c (passphrase_get): Add extra arg REPEAT and adjust
+ callers; remove special treatment for MODE==2.
+ (passphrase_to_dek): Move --passphrase-repeat handling to
+ gpg-agent.
+
+ * call-agent.c (agent_get_passphrase): Add extra arg REPEAT.
+ * call-agent.h: Ditto.
+
+2009-03-16 Werner Koch <wk at g10code.com>
+
+ * gpg.c (my_strusage): Revert last change. Systems w/o a gpg1 may,
+ and actually do, install gpg2 as gpg.
+ * gpgv.c (my_strusage): Ditto.
+
2009-03-14 David Shaw <dshaw at jabberwocky.com>
* gpg.c (my_strusage): gpg2 and gpgv2 (not gpg and gpgv).
Modified: trunk/agent/command.c
===================================================================
--- trunk/agent/command.c 2009-03-16 18:45:46 UTC (rev 4954)
+++ trunk/agent/command.c 2009-03-17 12:13:32 UTC (rev 4955)
@@ -36,6 +36,7 @@
#include <assuan.h>
+#include "i18n.h"
#include "agent.h"
/* maximum allowed size of the inquired ciphertext */
@@ -181,7 +182,27 @@
&& (!s[n] || spacep (s+n) || s[n] == '='));
}
+/* Return a pointer to the argument of the option with NAME. If such
+ an option is not given, it returns NULL. */
+static char *
+option_value (const char *line, const char *name)
+{
+ char *s;
+ int n = strlen (name);
+ s = strstr (line, name);
+ if (s && (s == line || spacep (s-1))
+ && s[n] && (spacep (s+n) || s[n] == '='))
+ {
+ s += n + 1;
+ s += strspn (s, " ");
+ if (*s && !spacep(s))
+ return s;
+ }
+ return NULL;
+}
+
+
/* Skip over options. It is assumed that leading spaces have been
removed (this is the case for lines passed to a handler from
assuan). Blanks after the options are also removed. */
@@ -990,7 +1011,7 @@
}
-/* GET_PASSPHRASE [--data] [--check] [--no-ask] <cache_id>
+/* GET_PASSPHRASE [--data] [--check] [--no-ask] [--repeat[=N]] <cache_id>
[<error_message> <prompt> <description>]
This function is usually used to ask for a passphrase to be used
@@ -1021,13 +1042,22 @@
const char *pw;
char *response;
char *cacheid = NULL, *desc = NULL, *prompt = NULL, *errtext = NULL;
+ const char *desc2 = _("Please re-enter this passphrase");
char *p;
void *cache_marker;
- int opt_data, opt_check, opt_no_ask;
+ int opt_data, opt_check, opt_no_ask, opt_repeat = 0;
opt_data = has_option (line, "--data");
opt_check = has_option (line, "--check");
opt_no_ask = has_option (line, "--no-ask");
+ if (has_option_name (line, "--repeat"))
+ {
+ p = option_value (line, "--repeat");
+ if (p)
+ opt_repeat = atoi (p);
+ else
+ opt_repeat = 1;
+ }
line = skip_options (line);
cacheid = line;
@@ -1094,21 +1124,39 @@
if (desc)
plus_to_blank (desc);
- response = NULL;
- do
+ next_try:
+ rc = agent_get_passphrase (ctrl, &response, desc, prompt, errtext);
+ if (!rc)
{
- xfree (response);
- rc = agent_get_passphrase (ctrl, &response, desc, prompt, errtext);
- }
- while (!rc
- && opt_check
- && check_passphrase_constraints (ctrl, response, 0));
+ int i;
- if (!rc)
- {
- if (cacheid)
- agent_put_cache (cacheid, CACHE_MODE_USER, response, 0);
- rc = send_back_passphrase (ctx, opt_data, response);
+ if (opt_check && check_passphrase_constraints (ctrl, response, 0))
+ {
+ xfree (response);
+ goto next_try;
+ }
+ for (i = 0; i < opt_repeat; i++)
+ {
+ char *response2;
+
+ rc = agent_get_passphrase (ctrl, &response2, desc2, prompt,
+ errtext);
+ if (rc)
+ break;
+ if (strcmp (response2, response))
+ {
+ xfree (response2);
+ xfree (response);
+ goto next_try;
+ }
+ xfree (response2);
+ }
+ if (!rc)
+ {
+ if (cacheid)
+ agent_put_cache (cacheid, CACHE_MODE_USER, response, 0);
+ rc = send_back_passphrase (ctx, opt_data, response);
+ }
xfree (response);
}
}
Modified: trunk/g10/call-agent.c
===================================================================
--- trunk/g10/call-agent.c 2009-03-16 18:45:46 UTC (rev 4954)
+++ trunk/g10/call-agent.c 2009-03-17 12:13:32 UTC (rev 4955)
@@ -874,11 +874,12 @@
const char *err_msg,
const char *prompt,
const char *desc_msg,
+ int repeat,
char **r_passphrase)
{
int rc;
char *line, *p;
- char cmd[] = "GET_PASSPHRASE --data -- ";
+ char cmd[] = "GET_PASSPHRASE --data --repeat=%d -- ";
membuf_t data;
*r_passphrase = NULL;
@@ -889,7 +890,7 @@
/* We allocate 3 times the needed space for the texts so that
there is enough space for escaping. */
- line = xtrymalloc ( strlen (cmd) + 1
+ line = xtrymalloc ( strlen (cmd) + sizeof(repeat) + 1
+ (cache_id? 3*strlen (cache_id): 1) + 1
+ (err_msg? 3*strlen (err_msg): 1) + 1
+ (prompt? 3*strlen (prompt): 1) + 1
@@ -898,7 +899,7 @@
if (!line)
return gpg_error_from_syserror ();
- p = stpcpy (line, cmd);
+ p = line + sprintf (line, cmd, repeat);
if (cache_id && *cache_id)
p = my_percent_plus_escape (p, cache_id);
else
Modified: trunk/g10/call-agent.h
===================================================================
--- trunk/g10/call-agent.h 2009-03-16 18:45:46 UTC (rev 4954)
+++ trunk/g10/call-agent.h 2009-03-17 12:13:32 UTC (rev 4955)
@@ -115,6 +115,7 @@
const char *err_msg,
const char *prompt,
const char *desc_msg,
+ int repeat,
char **r_passphrase);
/* Send the CLEAR_PASSPHRASE command to the agent. */
Modified: trunk/g10/gpg.c
===================================================================
--- trunk/g10/gpg.c 2009-03-16 18:45:46 UTC (rev 4954)
+++ trunk/g10/gpg.c 2009-03-17 12:13:32 UTC (rev 4955)
@@ -800,7 +800,7 @@
const char *p;
switch( level ) {
- case 11: p = "gpg2 (GnuPG)";
+ case 11: p = "gpg (GnuPG)";
break;
case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break;
@@ -828,10 +828,10 @@
case 1:
case 40: p =
- _("Usage: gpg2 [options] [files] (-h for help)");
+ _("Usage: gpg [options] [files] (-h for help)");
break;
case 41: p =
- _("Syntax: gpg2 [options] [files]\n"
+ _("Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
"default operation depends on the input data\n");
break;
Modified: trunk/g10/gpgv.c
===================================================================
--- trunk/g10/gpgv.c 2009-03-16 18:45:46 UTC (rev 4954)
+++ trunk/g10/gpgv.c 2009-03-17 12:13:32 UTC (rev 4955)
@@ -107,16 +107,16 @@
switch (level)
{
- case 11: p = "gpgv2 (GnuPG)";
+ case 11: p = "gpgv (GnuPG)";
break;
case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break;
case 19: p = _("Please report bugs to <gnupg-bugs at gnu.org>.\n");
break;
case 1:
- case 40: p = _("Usage: gpgv2 [options] [files] (-h for help)");
+ case 40: p = _("Usage: gpgv [options] [files] (-h for help)");
break;
- case 41: p = _("Syntax: gpgv2 [options] [files]\n"
+ case 41: p = _("Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n");
break;
Modified: trunk/g10/passphrase.c
===================================================================
--- trunk/g10/passphrase.c 2009-03-16 18:45:46 UTC (rev 4954)
+++ trunk/g10/passphrase.c 2009-03-17 12:13:32 UTC (rev 4955)
@@ -237,7 +237,6 @@
* Ask the GPG Agent for the passphrase.
* Mode 0: Allow cached passphrase
* 1: No cached passphrase FIXME: Not really implemented
- * 2: Ditto, but change the text to "repeat entry"
*
* Note that TRYAGAIN_TEXT must not be translated. If CANCELED is not
* NULL, the function does set it to 1 if the user canceled the
@@ -246,7 +245,7 @@
* computed, this will be used as the cacheid.
*/
static char *
-passphrase_get ( u32 *keyid, int mode, const char *cacheid,
+passphrase_get ( u32 *keyid, int mode, const char *cacheid, int repeat,
const char *tryagain_text,
const char *custom_description,
const char *custom_prompt, int *canceled)
@@ -331,8 +330,6 @@
}
}
- else if (mode == 2 )
- atext = xstrdup ( _("Repeat passphrase\n") );
else
atext = xstrdup ( _("Enter passphrase\n") );
@@ -349,7 +346,8 @@
my_prompt = custom_prompt ? native_to_utf8 (custom_prompt): NULL;
- rc = agent_get_passphrase (my_cacheid, tryagain_text, my_prompt, atext, &pw);
+ rc = agent_get_passphrase (my_cacheid, tryagain_text, my_prompt, atext,
+ repeat, &pw);
xfree (my_prompt);
xfree (atext); atext = NULL;
@@ -470,7 +468,7 @@
strcpy (pw, fd_passwd);
}
else
- pw = passphrase_get (NULL, 0, cacheid,
+ pw = passphrase_get (NULL, 0, cacheid, 0,
tryagain_text, description, prompt,
canceled );
@@ -611,7 +609,8 @@
else
{
/* Divert to the gpg-agent. */
- pw = passphrase_get ( keyid, mode == 2? 1: 0, NULL,
+ pw = passphrase_get ( keyid, mode == 2, NULL,
+ mode == 2? opt.passwd_repeat: 0,
tryagain_text, NULL, NULL, canceled );
if (*canceled)
{
@@ -619,33 +618,6 @@
write_status( STATUS_MISSING_PASSPHRASE );
return NULL;
}
- if (!pw)
- pw = xstrdup ("");
- if ( *pw && mode == 2 )
- {
- int i;
- for(i=0;i<opt.passwd_repeat;i++)
- {
- char *pw2 = passphrase_get ( keyid, 2, NULL, NULL, NULL,
- NULL, canceled );
- if (*canceled)
- {
- xfree (pw);
- xfree (pw2);
- write_status( STATUS_MISSING_PASSPHRASE );
- return NULL;
- }
- if (!pw2)
- pw2 = xstrdup ("");
- if ( strcmp(pw, pw2) )
- {
- xfree(pw2);
- xfree(pw);
- return NULL;
- }
- xfree(pw2);
- }
- }
}
if ( !pw || !*pw )
More information about the Gnupg-commits
mailing list