[git] GnuPG - branch, master, updated. post-nuke-of-trailing-ws-13-gcf8878c
by Werner Koch
cvs at cvs.gnupg.org
Wed Feb 23 16:53:02 CET 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via cf8878cb18f3ad830994b77f6ee05b5d47a1c557 (commit)
via 6902560059df490f91c2f00f0400cfbd00a84be6 (commit)
from 7c03c8cc65e68f1d77a5a5a497025191fe5df5e9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cf8878cb18f3ad830994b77f6ee05b5d47a1c557
Author: Werner Koch <wk at gnupg.org>
Date: Wed Feb 23 16:29:45 2011 +0100
Update gpg-error.m4 and libgcrypt.m4
diff --git a/m4/ChangeLog b/m4/ChangeLog
index b93fa2d..c633468 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-23 Werner Koch <wk at g10code.com>
+
+ * libgcrypt.m4, gpg-error.m4: Update from their GIT masters.
+
2010-06-08 Werner Koch <wk at g10code.com>
* ldap.m4 (gnupg_have_ldap): Set variable.
@@ -86,7 +90,7 @@
2006-07-27 Werner Koch <wk at g10code.com>
- * autobuild.m4: New.
+ * autobuild.m4: New.
2006-06-30 Werner Koch <wk at g10code.com>
@@ -144,4 +148,3 @@
* uintmax_t.m4: New file, from gettext-0.11.5.
* ulonglong.m4: New file, from gettext-0.11.5.
* Makefile.am: New file.
-
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
index 9d96d16..8d82925 100644
--- a/m4/gpg-error.m4
+++ b/m4/gpg-error.m4
@@ -24,7 +24,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
fi
fi
- AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
+ AC_PATH_TOOL(GPG_ERROR_CONFIG, gpg-error-config, no)
min_gpg_error_version=ifelse([$1], ,0.0,$1)
AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
ok=no
@@ -40,7 +40,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
if test "$major" -gt "$req_major"; then
ok=yes
- else
+ else
if test "$major" -eq "$req_major"; then
if test "$minor" -ge "$req_minor"; then
ok=yes
@@ -53,6 +53,21 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs`
AC_MSG_RESULT([yes ($gpg_error_config_version)])
ifelse([$2], , :, [$2])
+ if test x"$host" != x ; then
+ gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none`
+ if test x"$gpg_error_config_host" != xnone ; then
+ if test x"$gpg_error_config_host" != x"$host" ; then
+ AC_MSG_WARN([[
+***
+*** The config script $GPG_ERROR_CONFIG was
+*** built for $gpg_error_config_host and thus may not match the
+*** used host $host.
+*** You may want to use the configure option --with-gpg-error-prefix
+*** to specify a matching config script.
+***]])
+ fi
+ fi
+ fi
else
GPG_ERROR_CFLAGS=""
GPG_ERROR_LIBS=""
@@ -62,4 +77,3 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
AC_SUBST(GPG_ERROR_CFLAGS)
AC_SUBST(GPG_ERROR_LIBS)
])
-
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
index 854eaaa..831dc0c 100644
--- a/m4/libgcrypt.m4
+++ b/m4/libgcrypt.m4
@@ -15,7 +15,7 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
dnl with the API version to also check the API compatibility. Example:
-dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
+dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using
dnl this features allows to prevent build against newer versions of libgcrypt
dnl with a changed API.
@@ -31,7 +31,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
fi
fi
- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
+ AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no)
tmp=ifelse([$1], ,1:1.2.0,$1)
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
@@ -59,7 +59,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
if test "$major" -gt "$req_major"; then
ok=yes
- else
+ else
if test "$major" -eq "$req_major"; then
if test "$minor" -gt "$req_minor"; then
ok=yes
@@ -98,6 +98,21 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
ifelse([$2], , :, [$2])
+ if test x"$host" != x ; then
+ libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
+ if test x"$libgcrypt_config_host" != xnone ; then
+ if test x"$libgcrypt_config_host" != x"$host" ; then
+ AC_MSG_WARN([[
+***
+*** The config script $LIBGCRYPT_CONFIG was
+*** built for $libgcrypt_config_host and thus may not match the
+*** used host $host.
+*** You may want to use the configure option --with-libgcrypt-prefix
+*** to specify a matching config script.
+***]])
+ fi
+ fi
+ fi
else
LIBGCRYPT_CFLAGS=""
LIBGCRYPT_LIBS=""
commit 6902560059df490f91c2f00f0400cfbd00a84be6
Author: Werner Koch <wk at gnupg.org>
Date: Wed Feb 23 10:51:36 2011 +0100
Fix dirmngr crash (bug#1300)
diff --git a/dirmngr/ChangeLog b/dirmngr/ChangeLog
index c1ce3bf..bb40fe1 100644
--- a/dirmngr/ChangeLog
+++ b/dirmngr/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-23 Werner Koch <wk at g10code.com>
+
+ * certcache.c (get_cert_bysubject): Take care of a NULL argument.
+ (find_cert_bysubject): Ditto. Fixes bug#1300.
+
2011-02-09 Werner Koch <wk at g10code.com>
* ks-engine-kdns.c: New but only the framework.
diff --git a/dirmngr/certcache.c b/dirmngr/certcache.c
index 1fb585a..3ada60d 100644
--- a/dirmngr/certcache.c
+++ b/dirmngr/certcache.c
@@ -652,6 +652,9 @@ get_cert_bysubject (const char *subject_dn, unsigned int seq)
cert_item_t ci;
int i;
+ if (!subject_dn)
+ return NULL;
+
acquire_cache_read_lock ();
for (i=0; i < 256; i++)
{
@@ -1101,7 +1104,7 @@ find_cert_bysubject (ctrl_t ctrl, const char *subject_dn, ksba_sexp_t keyid)
uniquely located by the following code we can use them. This is
for example required by Telesec certificates where a keyId is
used but the issuer certificate comes without a subject keyId! */
- if (ctrl->ocsp_certs)
+ if (ctrl->ocsp_certs && subject_dn)
{
cert_item_t ci;
cert_ref_t cr;
-----------------------------------------------------------------------
Summary of changes:
dirmngr/ChangeLog | 5 +++++
dirmngr/certcache.c | 5 ++++-
m4/ChangeLog | 7 +++++--
m4/gpg-error.m4 | 20 +++++++++++++++++---
m4/libgcrypt.m4 | 21 ++++++++++++++++++---
5 files changed, 49 insertions(+), 9 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list