summaryrefslogtreecommitdiffstats
path: root/jnlib
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2006-12-06 11:16:50 +0100
committerWerner Koch <wk@gnupg.org>2006-12-06 11:16:50 +0100
commit0173cd5a9810622e38b76123528e83024fb59a0c (patch)
treeb8c52436a3d30842f2c59cfcf273a7934432321f /jnlib
parent* keyedit.c (menu_clean): Show "already minimized" rather than (diff)
downloadgnupg2-0173cd5a9810622e38b76123528e83024fb59a0c.tar.xz
gnupg2-0173cd5a9810622e38b76123528e83024fb59a0c.zip
Fixes for CVE-2006-6235
Diffstat (limited to 'jnlib')
-rw-r--r--jnlib/ChangeLog5
-rw-r--r--jnlib/utf8conv.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog
index 68340896c..e120319cd 100644
--- a/jnlib/ChangeLog
+++ b/jnlib/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-29 Werner Koch <wk@g10code.com>
+
+ * utf8conv.c (set_native_charset) [HAVE_W32_SYSTEM]: Fixed typo in
+ macro name.
+
2006-11-15 Werner Koch <wk@g10code.com>
* logging.c (my_funopen_hook_ret_t): New.
diff --git a/jnlib/utf8conv.c b/jnlib/utf8conv.c
index ec04a52ad..9a2a98b3b 100644
--- a/jnlib/utf8conv.c
+++ b/jnlib/utf8conv.c
@@ -102,7 +102,7 @@ set_native_charset (const char *newset)
if (!newset)
{
-#ifdef HABE_W32_SYSTEM
+#ifdef HAVE_W32_SYSTEM
static char codepage[30];
unsigned int cpno;
const char *aliases;