diff options
| -rw-r--r-- | agent/ChangeLog | 5 | ||||
| -rw-r--r-- | agent/genkey.c | 29 | ||||
| -rw-r--r-- | tools/ChangeLog | 5 | ||||
| -rw-r--r-- | tools/gpg-connect-agent.c | 6 |
4 files changed, 28 insertions, 17 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index ab825e35b..e4a7f6863 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,8 @@ +2007-10-24 Werner Koch <[email protected]> + + * genkey.c (check_passphrase_constraints): Changed the wording of + the warning messages. + 2007-10-19 Werner Koch <[email protected]> * protect-tool.c (get_passphrase): Use new utf8 switch fucntions. diff --git a/agent/genkey.c b/agent/genkey.c index 9901e9e1e..8df555d51 100644 --- a/agent/genkey.c +++ b/agent/genkey.c @@ -188,12 +188,11 @@ check_passphrase_constraints (ctrl_t ctrl, const char *pw, int silent) return gpg_error (GPG_ERR_INV_PASSPHRASE); desc = xtryasprintf - ( ngettext ("Warning: You have entered a passphrase that%%0A" - "is obviously not secure. A passphrase should%%0A" - "be at least %u character long.", - "Warning: You have entered a passphrase that%%0A" - "is obviously not secure. A passphrase should%%0A" - "be at least %u characters long.", minlen), minlen ); + ( ngettext ("Warning: You have entered an insecure passphrase.%%0A" + "A passphrase should be at least %u character long.", + "Warning: You have entered an insecure passphrase.%%0A" + "A passphrase should be at least %u characters long.", + minlen), minlen ); if (!desc) return gpg_error_from_syserror (); 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); desc = xtryasprintf - ( ngettext ("Warning: You have entered a passphrase that%%0A" - "is obviously not secure. A passphrase should%%0A" - "contain at least %u digit or special character.", - "Warning: You have entered a passphrase that%%0A" - "is obviously not secure. A passphrase should%%0A" - "contain at least %u digits or special characters.", + ( ngettext ("Warning: You have entered an insecure passphrase.%%0A" + "A passphrase should contain at least %u digit or%%0A" + "special character.", + "Warning: You have entered an insecure passphrase.%%0A" + "A passphrase should contain at least %u digits or%%0A" + "special characters.", minnonalpha), minnonalpha ); if (!desc) 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)) { const char *desc = - /* */ _("Warning: You have entered a passphrase that%0A" - "is obviously not secure. A passphrase may not%0A" - "be a known term or match certain pattern."); + /* */ _("Warning: You have entered an insecure passphrase.%0A" + "A passphrase may not be a known term or match%%0A" + "certain pattern."); if (silent) return gpg_error (GPG_ERR_INV_PASSPHRASE); diff --git a/tools/ChangeLog b/tools/ChangeLog index 69a24302b..a032c06af 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,8 @@ +2007-10-24 Werner Koch <[email protected]> + + * gpg-connect-agent.c (substitute_line): Restore temporary nul + marker. + 2007-10-23 Werner Koch <[email protected]> * gpgconf-comp.c (gc_process_gpgconf_conf): Add arg diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c index 197172ee2..ae931e791 100644 --- a/tools/gpg-connect-agent.c +++ b/tools/gpg-connect-agent.c @@ -578,9 +578,11 @@ substitute_line (char *buffer) } if (p[1] == '{' && *pend == '}') { - *pend++ = 0; + int save = *pend; + *pend = 0; freeme = get_var_ext (p+2); value = freeme; + *pend++ = save; } else if (*pend) { @@ -615,7 +617,7 @@ substitute_line (char *buffer) n += valuelen; strcpy (dst + n, pend); line = dst + n; - free (result); + xfree (result); result = dst; } xfree (freeme); |