2007-05-19  Marcus Brinkmann  <marcus@g10code.de>

	* protect-tool.c (get_passphrase): Free ORIG_CODESET on error.

g10/
2007-05-19  Marcus Brinkmann  <marcus@g10code.de>

	* passphrase.c (passphrase_get): Free ORIG_CODESET on error.

sm/
2007-05-18  Marcus Brinkmann  <marcus@g10code.de>

	* qualified.c (gpgsm_qualified_consent,
	gpgsm_not_qualified_warning): Free ORIG_CODESET on error.
	* certdump.c (gpgsm_format_keydesc): Likewise.

tools/
2007-05-19  Marcus Brinkmann  <marcus@g10code.de>

	* symcryptrun.c (confucius_get_pass): Free ORIG_CODESET on error.
This commit is contained in:
Marcus Brinkmann 2007-05-18 22:58:59 +00:00
parent dae4b2a83a
commit b9042f1cec
9 changed files with 54 additions and 14 deletions

View File

@ -1,3 +1,7 @@
2007-05-19 Marcus Brinkmann <marcus@g10code.de>
* protect-tool.c (get_passphrase): Free ORIG_CODESET on error.
2007-05-14 Werner Koch <wk@g10code.com> 2007-05-14 Werner Koch <wk@g10code.com>
* protect.c (make_shadow_info): Replace sprintf by smklen. * protect.c (make_shadow_info): Replace sprintf by smklen.

View File

@ -1183,7 +1183,10 @@ get_passphrase (int promptno, int opt_check)
/* We only switch when we are able to restore the codeset later. */ /* We only switch when we are able to restore the codeset later. */
orig_codeset = xstrdup (orig_codeset); orig_codeset = xstrdup (orig_codeset);
if (!bind_textdomain_codeset (PACKAGE_GT, "utf-8")) if (!bind_textdomain_codeset (PACKAGE_GT, "utf-8"))
orig_codeset = NULL; {
xfree (orig_codeset);
orig_codeset = NULL;
}
} }
#endif #endif

View File

@ -1,3 +1,7 @@
2007-05-19 Marcus Brinkmann <marcus@g10code.de>
* passphrase.c (passphrase_get): Free ORIG_CODESET on error.
2007-05-16 Werner Koch <wk@g10code.com> 2007-05-16 Werner Koch <wk@g10code.com>
* sig-check.c (check_backsig): Check the digest algorithm before * sig-check.c (check_backsig): Check the digest algorithm before

View File

@ -1,6 +1,6 @@
/* passphrase.c - Get a passphrase /* passphrase.c - Get a passphrase
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
* 2005, 2006 Free Software Foundation, Inc. * 2005, 2006, 2007 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -289,8 +289,11 @@ passphrase_get ( u32 *keyid, int mode, const char *cacheid,
if (orig_codeset) if (orig_codeset)
{ /* We only switch when we are able to restore the codeset later. */ { /* We only switch when we are able to restore the codeset later. */
orig_codeset = xstrdup (orig_codeset); orig_codeset = xstrdup (orig_codeset);
if (!bind_textdomain_codeset (PACKAGE, "utf-8")) if (!bind_textdomain_codeset (PACKAGE_GT, "utf-8"))
orig_codeset = NULL; {
xfree (orig_codeset);
orig_codeset = NULL;
}
} }
#endif #endif

View File

@ -1,3 +1,9 @@
2007-05-18 Marcus Brinkmann <marcus@g10code.de>
* qualified.c (gpgsm_qualified_consent,
gpgsm_not_qualified_warning): Free ORIG_CODESET on error.
* certdump.c (gpgsm_format_keydesc): Likewise.
2007-05-07 Werner Koch <wk@g10code.com> 2007-05-07 Werner Koch <wk@g10code.com>
* certcheck.c (MY_GCRY_PK_ECDSA): New. * certcheck.c (MY_GCRY_PK_ECDSA): New.

View File

@ -921,7 +921,10 @@ gpgsm_format_keydesc (ksba_cert_t cert)
bother printing a diagnostic here. */ bother printing a diagnostic here. */
orig_codeset = xstrdup (orig_codeset); orig_codeset = xstrdup (orig_codeset);
if (!bind_textdomain_codeset (PACKAGE_GT, "utf-8")) if (!bind_textdomain_codeset (PACKAGE_GT, "utf-8"))
orig_codeset = NULL; {
xfree (orig_codeset);
orig_codeset = NULL;
}
} }
#endif #endif
@ -938,9 +941,11 @@ gpgsm_format_keydesc (ksba_cert_t cert)
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
if (orig_codeset) if (orig_codeset)
bind_textdomain_codeset (PACKAGE_GT, orig_codeset); {
bind_textdomain_codeset (PACKAGE_GT, orig_codeset);
xfree (orig_codeset);
}
#endif #endif
xfree (orig_codeset);
if (rc < 0) if (rc < 0)
{ {

View File

@ -1,5 +1,5 @@
/* qualified.c - Routines related to qualified signatures /* qualified.c - Routines related to qualified signatures
* Copyright (C) 2005 Free Software Foundation, Inc. * Copyright (C) 2005, 2007 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -216,7 +216,10 @@ gpgsm_qualified_consent (ctrl_t ctrl, ksba_cert_t cert)
bother printing a diagnostic here. */ bother printing a diagnostic here. */
orig_codeset = xstrdup (orig_codeset); orig_codeset = xstrdup (orig_codeset);
if (!bind_textdomain_codeset (PACKAGE_GT, "utf-8")) if (!bind_textdomain_codeset (PACKAGE_GT, "utf-8"))
orig_codeset = NULL; {
xfree (orig_codeset);
orig_codeset = NULL;
}
} }
#endif #endif
@ -313,7 +316,10 @@ gpgsm_not_qualified_warning (ctrl_t ctrl, ksba_cert_t cert)
bother printing a diagnostic here. */ bother printing a diagnostic here. */
orig_codeset = xstrdup (orig_codeset); orig_codeset = xstrdup (orig_codeset);
if (!bind_textdomain_codeset (PACKAGE_GT, "utf-8")) if (!bind_textdomain_codeset (PACKAGE_GT, "utf-8"))
orig_codeset = NULL; {
xfree (orig_codeset);
orig_codeset = NULL;
}
} }
#endif #endif
@ -330,9 +336,11 @@ gpgsm_not_qualified_warning (ctrl_t ctrl, ksba_cert_t cert)
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
if (orig_codeset) if (orig_codeset)
bind_textdomain_codeset (PACKAGE_GT, orig_codeset); {
bind_textdomain_codeset (PACKAGE_GT, orig_codeset);
xfree (orig_codeset);
}
#endif #endif
xfree (orig_codeset);
xfree (subject); xfree (subject);
if (err) if (err)

View File

@ -1,3 +1,7 @@
2007-05-19 Marcus Brinkmann <marcus@g10code.de>
* symcryptrun.c (confucius_get_pass): Free ORIG_CODESET on error.
2007-05-08 Werner Koch <wk@g10code.com> 2007-05-08 Werner Koch <wk@g10code.com>
* sockprox.c: New. It needs to be build manually. By Moritz * sockprox.c: New. It needs to be build manually. By Moritz

View File

@ -1,5 +1,5 @@
/* symcryptrun.c - Tool to call simple symmetric encryption tools. /* symcryptrun.c - Tool to call simple symmetric encryption tools.
* Copyright (C) 2005 Free Software Foundation, Inc. * Copyright (C) 2005, 2007 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -460,7 +460,10 @@ confucius_get_pass (const char *cacheid, int again, int *canceled)
/* We only switch when we are able to restore the codeset later. */ /* We only switch when we are able to restore the codeset later. */
orig_codeset = xstrdup (orig_codeset); orig_codeset = xstrdup (orig_codeset);
if (!bind_textdomain_codeset (PACKAGE_GT, "utf-8")) if (!bind_textdomain_codeset (PACKAGE_GT, "utf-8"))
orig_codeset = NULL; {
xfree (orig_codeset);
orig_codeset = NULL;
}
} }
#endif #endif