security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

Changed wording of passphrase checking messages.

Browse Source 
Fixed a segv in gpg-connect-agent.
This commit is contained in:
Werner Koch 2007-10-24 08:06:16 +00:00
parent fca02368da
commit fd5e7d44f3
4 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agent/ChangeLog
View File

@ -1,3 +1,8 @@
2007-10-24 Werner Koch <wk@g10code.com>
* genkey.c (check_passphrase_constraints): Changed the wording of
the warning messages.
2007-10-19 Werner Koch <wk@g10code.com> 2007-10-19 Werner Koch <wk@g10code.com>
* protect-tool.c (get_passphrase): Use new utf8 switch fucntions. * protect-tool.c (get_passphrase): Use new utf8 switch fucntions.

29
agent/genkey.c
View File

@ -188,12 +188,11 @@ check_passphrase_constraints (ctrl_t ctrl, const char *pw, int silent)
return gpg_error (GPG_ERR_INV_PASSPHRASE); return gpg_error (GPG_ERR_INV_PASSPHRASE);
desc = xtryasprintf desc = xtryasprintf
( ngettext ("Warning: You have entered a passphrase that%%0A" ( ngettext ("Warning: You have entered an insecure passphrase.%%0A"
"is obviously not secure. A passphrase should%%0A" "A passphrase should be at least %u character long.",
"be at least %u character long.", "Warning: You have entered an insecure passphrase.%%0A"
"Warning: You have entered a passphrase that%%0A" "A passphrase should be at least %u characters long.",
"is obviously not secure. A passphrase should%%0A" minlen), minlen );
"be at least %u characters long.", minlen), minlen );
if (!desc) if (!desc)
return gpg_error_from_syserror (); return gpg_error_from_syserror ();
err = take_this_one_anyway (ctrl, desc); err = take_this_one_anyway (ctrl, desc);
@ -210,12 +209,12 @@ check_passphrase_constraints (ctrl_t ctrl, const char *pw, int silent)
return gpg_error (GPG_ERR_INV_PASSPHRASE); return gpg_error (GPG_ERR_INV_PASSPHRASE);
desc = xtryasprintf desc = xtryasprintf
( ngettext ("Warning: You have entered a passphrase that%%0A" ( ngettext ("Warning: You have entered an insecure passphrase.%%0A"
"is obviously not secure. A passphrase should%%0A" "A passphrase should contain at least %u digit or%%0A"
"contain at least %u digit or special character.", "special character.",
"Warning: You have entered a passphrase that%%0A" "Warning: You have entered an insecure passphrase.%%0A"
"is obviously not secure. A passphrase should%%0A" "A passphrase should contain at least %u digits or%%0A"
"contain at least %u digits or special characters.", "special characters.",
minnonalpha), minnonalpha ); minnonalpha), minnonalpha );
if (!desc) if (!desc)
return gpg_error_from_syserror (); return gpg_error_from_syserror ();
@ -233,9 +232,9 @@ check_passphrase_constraints (ctrl_t ctrl, const char *pw, int silent)
check_passphrase_pattern (ctrl, pw)) check_passphrase_pattern (ctrl, pw))
{ {
const char *desc = const char *desc =
/* */ _("Warning: You have entered a passphrase that%0A" /* */ _("Warning: You have entered an insecure passphrase.%0A"
"is obviously not secure. A passphrase may not%0A" "A passphrase may not be a known term or match%%0A"
"be a known term or match certain pattern."); "certain pattern.");
if (silent) if (silent)
return gpg_error (GPG_ERR_INV_PASSPHRASE); return gpg_error (GPG_ERR_INV_PASSPHRASE);

5
tools/ChangeLog
View File

@ -1,3 +1,8 @@
2007-10-24 Werner Koch <wk@g10code.com>
* gpg-connect-agent.c (substitute_line): Restore temporary nul
marker.
2007-10-23 Werner Koch <wk@g10code.com> 2007-10-23 Werner Koch <wk@g10code.com>
* gpgconf-comp.c (gc_process_gpgconf_conf): Add arg * gpgconf-comp.c (gc_process_gpgconf_conf): Add arg

6
tools/gpg-connect-agent.c
View File

@ -578,9 +578,11 @@ substitute_line (char *buffer)
} }
if (p[1] == '{' && *pend == '}') if (p[1] == '{' && *pend == '}')
{ {
*pend++ = 0; int save = *pend;
*pend = 0;
freeme = get_var_ext (p+2); freeme = get_var_ext (p+2);
value = freeme; value = freeme;
*pend++ = save;
} }
else if (*pend) else if (*pend)
{ {
@ -615,7 +617,7 @@ substitute_line (char *buffer)
n += valuelen; n += valuelen;
strcpy (dst + n, pend); strcpy (dst + n, pend);
line = dst + n; line = dst + n;
free (result); xfree (result);
result = dst; result = dst;
} }
xfree (freeme); xfree (freeme);