Preparing 2.0.1

ChangeLog

@@ -1,3 +1,7 @@
+2006-11-28  Werner Koch  <wk@g10code.com>
+
+	Released 2.0.1.
+
 2006-11-23  Werner Koch  <wk@g10code.com>
 
 	Released 2.0.1rc1.

NEWS

@@ -1,16 +1,18 @@
-Noteworthy changes in version 2.0.1 (not released)
+Noteworthy changes in version 2.0.1 (2006-11-28)
--------------------------------------------------
+------------------------------------------------
 
  * Experimental support for the PIN pads of the SPR 532 and the Kaan
    Advanced card readers.  Add "disable-keypad" scdaemon.conf if you
    don't want it.  Does currently only work for the OpenPGP card and
-   the authentication and decrypt keys.
+   its authentication and decrypt keys.
 
  * Fixed build problems on some some platforms and crashes on amd64.
 
+ * Fixed a buffer overflow in gpg2. [bug#728]
+
 
 Noteworthy changes in version 2.0.0 (2006-11-11)
--------------------------------------------------
+------------------------------------------------
 
  * First stable version of a GnuPG integrating OpenPGP and S/MIME.
 

THANKS

@@ -219,6 +219,7 @@ Steffen Ullrich 	   ccrlphr at xensei.com
 Steffen Zahn		   zahn at berlin.snafu.de
 Steven Bakker		   steven at icoe.att.com
 Steven Murdoch             sjmurdoch at bigfoot.com
+Stoyan Angelov             s_angelov at filibeto.org
 Susanne Schultz 	   schultz at hsp.de
 Tavis Ormandy              taviso at gentoo.org
 Ted Cabeen		   secabeen at pobox.com

common/ChangeLog

@@ -1,3 +1,7 @@
+2006-11-23  Werner Koch  <wk@g10code.com>
+
+	* http.c: Include i18n.h
+
 2006-11-21  Werner Koch  <wk@g10code.com>
 
 	* estream.c: Remove explicit Pth soft mapping diabling becuase it

common/http.c

@@ -70,6 +70,7 @@ typedef gnutls_transport_ptr gnutls_transport_ptr_t;
 #endif
 
 #include "util.h"
+#include "i18n.h"
 #include "http.h"
 #ifdef USE_DNS_SRV
 #include "srv.h"

common/util.h

@@ -34,7 +34,7 @@
 /* Hash function used with libksba. */
 #define HASH_FNC ((void (*)(void *, const void*,size_t))gcry_md_write)
 
-/* get all the stuff from jnlib */
+/* Get all the stuff from jnlib. */
 #include "../jnlib/logging.h"
 #include "../jnlib/argparse.h"
 #include "../jnlib/stringhelp.h"
@@ -43,6 +43,7 @@
 #include "../jnlib/dotlock.h"
 #include "../jnlib/utf8conv.h"
 
+
 #if __GNUC__ >= 4 
 # define GNUPG_GCC_A_SENTINEL(a) __attribute__ ((sentinel(a)))
 #else

configure.ac

@@ -26,7 +26,7 @@ min_automake_version="1.9.3"
 # Remember to change the version number immediately *after* a release.
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [2.0.1rc1])
+m4_define([my_version], [2.0.1])
 m4_define([my_issvn], [no])
 
 

scd/ChangeLog

@@ -1,3 +1,10 @@
+2006-11-28  Werner Koch  <wk@g10code.com>
+
+	* apdu.c (send_le, apdu_send_direct): Increase RESULTLEN to 258 to
+	allow for full 256 byte and the status word.  This might break
+	some old PC/SC drivers or cards, but we will see.  Suggested by
+	Kenneth Wang.
+
 2006-11-23  Werner Koch  <wk@g10code.com>
 
 	* command.c (scd_command_handler): Fixed use of CTRL.

scd/apdu.c

@@ -2603,7 +2603,7 @@ send_le (int slot, int class, int ins, int p0, int p1,
          unsigned char **retbuf, size_t *retbuflen,
          struct pininfo_s *pininfo)
 {
-#define RESULTLEN 256
+#define RESULTLEN 258
   unsigned char result[RESULTLEN+10]; /* 10 extra in case of bugs in
                                          the driver. */
   size_t resultlen;
@@ -2866,7 +2866,7 @@ apdu_send_direct (int slot, const unsigned char *apdudata, size_t apdudatalen,
                   int handle_more,
                   unsigned char **retbuf, size_t *retbuflen)
 {
-#define RESULTLEN 256
+#define RESULTLEN 258
   unsigned char apdu[5+256+1];
   size_t apdulen;
   unsigned char result[RESULTLEN+10]; /* 10 extra in case of bugs in

sm/ChangeLog

@@ -1,3 +1,8 @@
+2006-11-24  Werner Koch  <wk@g10code.com>
+
+	* certdump.c (parse_dn_part): Take '#' as a special character only
+	at the beginning of a string.
+
 2006-11-21  Werner Koch  <wk@g10code.com>
 
 	* certdump.c (my_funopen_hook_ret_t): New.

sm/certdump.c

@@ -376,7 +376,7 @@ parse_dn_part (struct dn_array_s *array, const unsigned char *string)
           else if (*s == '\"')
             return NULL; /* invalid encoding */
           else if (*s == ',' || *s == '=' || *s == '+'
-                   || *s == '<' || *s == '>' || *s == '#' || *s == ';' )
+                   || *s == '<' || *s == '>' || *s == ';' )
             break; 
           else
             n++;

tools/ChangeLog

@@ -1,3 +1,7 @@
+2006-11-23  Werner Koch  <wk@g10code.com>
+
+	* Makefile.am (gpg_connect_agent_LDADD): Add NETLIBS.
+
 2006-11-21  Werner Koch  <wk@g10code.com>
 
 	* gpgconf-comp.c (list_one_option): Cast print size_t arg.

tools/Makefile.am

@@ -73,8 +73,8 @@ watchgnupg_SOURCES = watchgnupg.c
 watchgnupg_LDADD = $(NETLIBS)
 
 gpg_connect_agent_SOURCES = gpg-connect-agent.c no-libgcrypt.c
-gpg_connect_agent_LDADD = $(common_libs) \
+gpg_connect_agent_LDADD = $(common_libs) $(LIBASSUAN_LIBS) \
-                          $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
+	                  $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
 
 gpgkey2ssh_SOURCES = gpgkey2ssh.c
 gpgkey2ssh_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)