security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-06-28 22:08:25 +02:00
Code Activity

Ignore gpg2 introduced keywords for --auto-key-locate.

Browse Source 
Minor W32 installer fix.
This commit is contained in:
Werner Koch 2008-04-30 11:46:35 +00:00
parent 18f6e7e5d8
commit e850b7fc22
6 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2008-04-01 Werner Koch <wk@g10code.com>
* configure.ac (AC_INIT): Fix quoting.
2008-03-31 David Shaw <dshaw@jabberwocky.com> 2008-03-31 David Shaw <dshaw@jabberwocky.com>
* configure.ac: Require curl 7.10 (Oct 1 2002) or later as we use * configure.ac: Require curl 7.10 (Oct 1 2002) or later as we use

2
NEWS
View File

@ -10,7 +10,7 @@ Noteworthy changes in version 1.4.9 (2008-03-26)
Decryption is also a bit faster. Decryption is also a bit faster.
* Fixed possible memory corruption bug in 1.4.8 while importing * 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) Noteworthy changes in version 1.4.8 (2007-12-20)

3
configure.ac
View File

@ -31,7 +31,8 @@ m4_define([my_issvn], [yes])
m4_define([svn_revision], m4_esyscmd([echo $((svn info 2>/dev/null \ m4_define([svn_revision], m4_esyscmd([echo $((svn info 2>/dev/null \
|| echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)| \ || echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)| \
tr -d '\n'])) 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@gnu.org]) [bug-gnupg@gnu.org])
# Set development_version to yes if the minor number is odd or you # Set development_version to yes if the minor number is odd or you
# feel that the default check for a development version is not # feel that the default check for a development version is not

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2008-04-30 Werner Koch <wk@g10code.com>
* getkey.c (parse_auto_key_locate): Ignore nodefault and local
methods.
2008-04-17 David Shaw <dshaw@jabberwocky.com> 2008-04-17 David Shaw <dshaw@jabberwocky.com>
* parse-packet.c (parse_key): Add constant for Camellia-192. * parse-packet.c (parse_key): Add constant for Camellia-192.

6
g10/getkey.c
View File

@ -3008,6 +3008,12 @@ parse_auto_key_locate(char *options)
if(tok[0]=='\0') if(tok[0]=='\0')
continue; 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)); akl=xmalloc_clear(sizeof(*akl));
if(ascii_strcasecmp(tok,"ldap")==0) if(ascii_strcasecmp(tok,"ldap")==0)

2
scripts/w32installer.nsi
View File

@ -570,7 +570,7 @@ LangString T_About ${LANG_ENGLISH} \
"GnuPG is GNU's tool for secure communication and data storage. \ "GnuPG is GNU's tool for secure communication and data storage. \
It can be used to encrypt data and to create digital signatures. \ It can be used to encrypt data and to create digital signatures. \
It includes an advanced key management facility and is compliant \ 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$_CLICK \
\r\n\r\n\r\n\r\n\r\nThis is GnuPG version ${VERSION}\r\n\ \r\n\r\n\r\n\r\n\r\nThis is GnuPG version ${VERSION}\r\n\
built on $%BUILDINFO%\r\n\ built on $%BUILDINFO%\r\n\