[git] GnuPG - branch, master, updated. gnupg-2.1.11-92-ge997552
by Justus Winter
cvs at cvs.gnupg.org
Fri Mar 4 16:16:25 CET 2016
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 e997552161b2dd8aabf350adee14e208e1545aef (commit)
via 1e4b7823008daea1a22a6f0f9b379fdec37a4cd4 (commit)
via 40f6529ceeea806fc011135a9fa3a3590a9534ac (commit)
via 8daf9a027f5b9ef31f9bf8a39a9a91739246e493 (commit)
from 9f0ba5089e664447c36cee3d9249f95e4ea39957 (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 e997552161b2dd8aabf350adee14e208e1545aef
Author: Justus Winter <justus at g10code.com>
Date: Fri Mar 4 15:03:26 2016 +0100
build: Make libusb a hard requirement if the ccid driver is requested.
* configure.ac: Print an error message and die if the internal ccid
driver is requested but no suitable libusb is found.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/configure.ac b/configure.ac
index 7770894..003e509 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,7 +111,7 @@ use_exec=yes
use_trust_models=yes
use_tofu=yes
card_support=yes
-use_ccid_driver=yes
+use_ccid_driver=auto
dirmngr_auto_start=yes
use_tls_library=no
large_secmem=no
@@ -782,7 +782,7 @@ AM_PATH_KSBA("$NEED_KSBA_API:$NEED_KSBA_VERSION",have_ksba=yes,have_ksba=no)
# libusb allows us to use the integrated CCID smartcard reader driver.
#
# FiXME: Use GNUPG_CHECK_LIBUSB and modify to use separate AC_SUBSTs.
-if test "$use_ccid_driver" = yes ; then
+if test "$use_ccid_driver" = auto || test "$use_ccid_driver" = yes; then
case "${host}" in
*-mingw32*)
LIBUSB_LIBS=
@@ -824,7 +824,9 @@ if test x"$LIBUSB_LIBS" != x ; then
AC_MSG_RESULT([not found])
usb_incdir=""
have_libusb=no
- use_ccid_driver=no
+ if test "$use_ccid_driver" != yes; then
+ use_ccid_driver=no
+ fi
LIBUSB_LIBS=""
fi
@@ -1857,6 +1859,17 @@ if test "$require_iconv" = yes; then
fi
fi
+if test "$use_ccid_driver" = yes; then
+ if test "$have_libusb" != yes; then
+ die=yes
+ AC_MSG_NOTICE([[
+***
+*** You need libusb to build the internal ccid driver. Please
+*** install a libusb suitable for your system.
+***]])
+ fi
+fi
+
if test "$die" = "yes"; then
AC_MSG_ERROR([[
***
commit 1e4b7823008daea1a22a6f0f9b379fdec37a4cd4
Author: Justus Winter <justus at g10code.com>
Date: Fri Mar 4 13:33:04 2016 +0100
g10: Drop superfluous declaration.
* g10/main.h (disable_core_dumps): Drop declaration.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/g10/main.h b/g10/main.h
index 3687977..5b5947e 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -98,7 +98,6 @@ char *make_radix64_string( const byte *data, size_t len );
/*-- misc.c --*/
void trap_unaligned(void);
-int disable_core_dumps(void);
void register_secured_file (const char *fname);
void unregister_secured_file (const char *fname);
int is_secured_file (int fd);
commit 40f6529ceeea806fc011135a9fa3a3590a9534ac
Author: Justus Winter <justus at g10code.com>
Date: Fri Mar 4 13:29:45 2016 +0100
g10: Guard code against errors.
* g10/keygen.c (do_generate_keypair): Check for errors, in which case
'pri_psk' is NULL.
Fixes-commit: bf9d1248
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/g10/keygen.c b/g10/keygen.c
index 8f25fe9..1cf8648 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -4077,14 +4077,15 @@ do_generate_keypair (ctrl_t ctrl, struct para_data_s *para,
{
pri_psk = pub_root->next->pkt->pkt.public_key;
assert (pri_psk);
- }
- /* Make sure a few fields are correctly set up before going further. */
- pri_psk->flags.primary = 1;
- keyid_from_pk (pri_psk, NULL);
- /* We don't use pk_keyid to get keyid, because it also asserts that
- main_keyid is set! */
- keyid_copy (pri_psk->main_keyid, pri_psk->keyid);
+ /* Make sure a few fields are correctly set up before going
+ further. */
+ pri_psk->flags.primary = 1;
+ keyid_from_pk (pri_psk, NULL);
+ /* We don't use pk_keyid to get keyid, because it also asserts
+ that main_keyid is set! */
+ keyid_copy (pri_psk->main_keyid, pri_psk->keyid);
+ }
if (!err && (revkey = get_parameter_revkey (para, pREVOKER)))
err = write_direct_sig (pub_root, pri_psk, revkey, timestamp, cache_nonce);
commit 8daf9a027f5b9ef31f9bf8a39a9a91739246e493
Author: Justus Winter <justus at g10code.com>
Date: Fri Mar 4 13:09:11 2016 +0100
doc: Drop superfluous 'is'.
--
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/doc/gpg.texi b/doc/gpg.texi
index e1835cf..810f39d 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -40,7 +40,7 @@ OpenPGP standard. @command{@gpgname} features complete key management and
all bells and whistles you can expect from a decent OpenPGP
implementation.
-In contrast to the standalone command gpg from GnuPG 1.x, which is
+In contrast to the standalone command gpg from GnuPG 1.x, which
might be better suited for server and embedded platforms, the 2.x
version is commonly installed under the name @command{gpg2} and
targeted to the desktop as it requires several other modules to be
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 19 ++++++++++++++++---
doc/gpg.texi | 2 +-
g10/keygen.c | 15 ++++++++-------
g10/main.h | 1 -
4 files changed, 25 insertions(+), 12 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list