[svn] GnuPG - r4753 - in branches/STABLE-BRANCH-1-4: . g10 scripts

[svn author wk]

Author: wk
Date: 2008-04-30 13:46:35 +0200 (Wed, 30 Apr 2008)
New Revision: 4753

Modified:
   branches/STABLE-BRANCH-1-4/ChangeLog
   branches/STABLE-BRANCH-1-4/NEWS
   branches/STABLE-BRANCH-1-4/configure.ac
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/getkey.c
   branches/STABLE-BRANCH-1-4/scripts/w32installer.nsi
Log:
Ignore gpg2 introduced keywords for --auto-key-locate.
Minor W32 installer fix.


Modified: branches/STABLE-BRANCH-1-4/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/ChangeLog	2008-04-23 17:23:04 UTC (rev 4752)
+++ branches/STABLE-BRANCH-1-4/ChangeLog	2008-04-30 11:46:35 UTC (rev 4753)
@@ -1,3 +1,7 @@
+2008-04-01  Werner Koch  <wk at g10code.com>
+
+	* configure.ac (AC_INIT): Fix quoting.
+
 2008-03-31  David Shaw  <dshaw at jabberwocky.com>
 
 	* configure.ac: Require curl 7.10 (Oct 1 2002) or later as we use

Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2008-04-23 17:23:04 UTC (rev 4752)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2008-04-30 11:46:35 UTC (rev 4753)
@@ -1,3 +1,8 @@
+2008-04-30  Werner Koch  <wk at g10code.com>
+
+	* getkey.c (parse_auto_key_locate): Ignore nodefault and local
+	methods.
+
 2008-04-17  David Shaw  <dshaw at jabberwocky.com>
 
 	* parse-packet.c (parse_key): Add constant for Camellia-192.

Modified: branches/STABLE-BRANCH-1-4/NEWS
===================================================================
--- branches/STABLE-BRANCH-1-4/NEWS	2008-04-23 17:23:04 UTC (rev 4752)
+++ branches/STABLE-BRANCH-1-4/NEWS	2008-04-30 11:46:35 UTC (rev 4753)
@@ -10,7 +10,7 @@
       Decryption is also a bit faster.
 
     * Fixed possible memory corruption bug in 1.4.8 while importing
-      OpenPGP keys.
+      OpenPGP keys. [CVE-2008-1530]
 
 
 Noteworthy changes in version 1.4.8 (2007-12-20)

Modified: branches/STABLE-BRANCH-1-4/configure.ac
===================================================================
--- branches/STABLE-BRANCH-1-4/configure.ac	2008-04-23 17:23:04 UTC (rev 4752)
+++ branches/STABLE-BRANCH-1-4/configure.ac	2008-04-30 11:46:35 UTC (rev 4753)
@@ -31,7 +31,8 @@
 m4_define([svn_revision], m4_esyscmd([echo $((svn info 2>/dev/null \
           || echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)| \
           tr -d '\n']))
-AC_INIT([gnupg], my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision]),
+AC_INIT([gnupg], 
+        [my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision])],
         [bug-gnupg at gnu.org])
 # Set development_version to yes if the minor number is odd or you
 # feel that the default check for a development version is not

Modified: branches/STABLE-BRANCH-1-4/g10/getkey.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/getkey.c	2008-04-23 17:23:04 UTC (rev 4752)
+++ branches/STABLE-BRANCH-1-4/g10/getkey.c	2008-04-30 11:46:35 UTC (rev 4753)
@@ -3008,6 +3008,12 @@
       if(tok[0]=='\0')
 	continue;
 
+      /* For now we silently ignore the new methods introduced with
+         2.0.10. */ 
+      if (!ascii_strcasecmp (tok,"nodefault")
+          || !ascii_strcasecmp (tok,"local"))
+        continue;
+
       akl=xmalloc_clear(sizeof(*akl));
 
       if(ascii_strcasecmp(tok,"ldap")==0)

Modified: branches/STABLE-BRANCH-1-4/scripts/w32installer.nsi
===================================================================
--- branches/STABLE-BRANCH-1-4/scripts/w32installer.nsi	2008-04-23 17:23:04 UTC (rev 4752)
+++ branches/STABLE-BRANCH-1-4/scripts/w32installer.nsi	2008-04-30 11:46:35 UTC (rev 4753)
@@ -570,7 +570,7 @@
   "GnuPG is GNU's tool for secure communication and data storage. \
   It can be used to encrypt data and to create digital signatures. \
   It includes an advanced key management facility and is compliant \
-  with the proposed OpenPGP Internet standard as described in RFC2440. \
+  with the proposed OpenPGP Internet standard as described in RFC4880. \
   \r\n\r\n$_CLICK \
   \r\n\r\n\r\n\r\n\r\nThis is GnuPG version ${VERSION}\r\n\
   built on $%BUILDINFO%\r\n\