[git] GnuPG - branch, npth, updated. gnupg-2.1.0beta3-46-g0868997
by Marcus Brinkmann
cvs at cvs.gnupg.org
Wed Jan 4 17:06:51 CET 2012
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, npth has been updated
via 0868997e186cd847663668f9d7a29806a12da2d2 (commit)
via ed432f030e604f7b2fd4a79c2110d92b9cde7501 (commit)
via ff2095ad7b4be7eaf9468b6ef39fd979527ecc4f (commit)
via 0dce26778ef8abd4fc40de689d7ec9b720d26430 (commit)
via 61ccd8d92d9d3b8ba0eca3c2969d7f6f37e16405 (commit)
via 682df45d15661ed3544e2ed34bcb636200cc40f9 (commit)
via d01d9ff11f46cbd61b7b8c0e04431e4f0c4a8580 (commit)
via a2d9e48fcca6cfc2dfadef6dbd3579a30314676b (commit)
via c6aaf024651c7d55ac9fb77a53c084efb3adc1a9 (commit)
via 97d1c884e62bba94e42bb5b2bb13cd3880334c31 (commit)
via 604c130a85d4203b9d84137a42673aeaff1c0bd1 (commit)
via 8e47f1e576f70d4dbe966523057fe3078006ae8b (commit)
via 6f02c143440865781b4e3c1753e24e55a0de40e4 (commit)
via fe2f1826991e8130f727ee15df1a4651f679752f (commit)
via 779611494dbd187d09b05d2eb10faabd31a70156 (commit)
via 366512abe44d9e71bb2c699c29477afa6ac71cdd (commit)
via 07f20f313a0b13e5c93168a8a62ff1cbb94a4514 (commit)
via f4b7f7146349c388a2f3ce224ff2006606c66232 (commit)
via f6251c0d0af92331388f5e9bcd1750cbadcaca8f (commit)
via a98260c39f1c0ccdad004784cbc9440376766082 (commit)
via 27089564b6453deaf7b4ffe7cc5f5f290b6d892b (commit)
via b22d62bd1481dfe13d60a6d16b09b9297944f063 (commit)
via 7737a2c269657189a583cde7f214f20871d264f8 (commit)
via 792e137ec7997a0ff5c54ff970611238d28d4ba8 (commit)
via 0bac31ee9f74a25d76b08c3e0355a338908f083a (commit)
via dcd64131c60efd0189aa05d5dbce6b93547b04e3 (commit)
via 45cf9de341405a228e331bd3893cbcd6b72306be (commit)
via 2d91febbd8d30beb7eb33f7aa80ffd5691d1d3cc (commit)
via 07ea8c56b507b06d4bd70e94fa51914659afac4b (commit)
via 00c760f628f4cf0fc11e79d305c172f98123f815 (commit)
via 24e121ef261731069868ca403b818f1168237f53 (commit)
via 11164662788036c4b15d30555ea33ec0b6f5a670 (commit)
via cd29dc0f1cf7f3bd7938ffa65bf13f9a75d8c156 (commit)
via ea0a21410b8fa460882c0f8de90b9291345fd4fc (commit)
via 8a12a2000d82acfa881e8c18d028290100bf5e43 (commit)
via 14e4fdc9f97d6f12bf563adfff1e3157305d7795 (commit)
via cd3732841de32ce5c7841e6e158df3a5f1102f86 (commit)
via 596b84a4de58def2155d3fe56462f6607f135b69 (commit)
via 5cdad8ff000152b4bd01953646bb87fe8703c70d (commit)
via 3f284e40502d8181b0b3ea66c77cd7c1252ea781 (commit)
via 9274d4d18281b3364fa8abaa821dddf124b105d7 (commit)
via 477360e8cdc458b0a36e9c7fb52a35f27766255d (commit)
via 239659d3a0b8c0c378734ca3d1e9210a02e24da7 (commit)
via 96dc146fa17a7853277dbf3dc771c585a815c247 (commit)
via bf37c32367ba149559385ee90b6435cef8bd6412 (commit)
via 29e96e6b9a8e68e6554dd48bc2ce68ae9525d29f (commit)
via 2336b09779d313c1594acf6df3bd8a8486e90458 (commit)
via 2c5d02191203d54f6bb681a18d12550de6319c55 (commit)
via 31f548a18aed729c05ea367f2d8a8104480430d5 (commit)
via 8cf2356fa8aa1dda644314e6e656b3df1586e297 (commit)
via 6d5bb8e79dcee868e823de2c4e9d0ec9a9308dda (commit)
via d24f41641f5a7c3a9be2a6e585a7e2e5031c01d7 (commit)
via 9dc89de7a840c4a210e64b402094235a72e1c921 (commit)
via 295b9e29c5f8fa49a767f9404aaca0afa1f31683 (commit)
via f95cb909ba505f03ce81816c23dd58718b8cb6e6 (commit)
via 982105f1ce85c92482def1d66f1f44e438ae5ab6 (commit)
via 751d452116607eb5ddcbea970b6f24c7a427620e (commit)
via 5a62b0d6ee7cecc2e41a429ccc586a1a129e1b04 (commit)
via c741c6fc3aaa8b75a434faa143c06dd059970d41 (commit)
via 57d4f7fae13810f4daed266139c33057de38d114 (commit)
via 88fea6abe6b83eb2a69dd62dbbfe19ad5c450d86 (commit)
via 77ee8fd55c9e599f41a3cad0ebaa23c72ca14409 (commit)
via 781e9746dff21fc2721373205e63d1d09722d590 (commit)
via 26b4a012e3eb3a6ce79a1e53f7cdfbbdf8c8e8f5 (commit)
via 0689f0fc32cc9a8e431d33ee3431d23f3fd1f258 (commit)
via 231d27e0fec905be52d679961332947c3331f15f (commit)
via d2a979452e541183cae7e6e04634b5bbdab9c9d7 (commit)
via 725d3589ada10266e4350f56a4f89e4d82b4dc16 (commit)
via ea9df94ec8d6b7b13bd65ea14caca015bd534460 (commit)
via 958f29d2251a96d09439e591ea3523133930e5e9 (commit)
via 32118628a0f20f87791755a0a110491ad85e23ad (commit)
from 90eb494876834548608d9b8d51222c940bd8daef (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 0868997e186cd847663668f9d7a29806a12da2d2
Merge: 90eb494 ed432f0
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date: Tue Jan 3 18:13:19 2012 +0100
Merge branch 'master' into npth
Conflicts:
ChangeLog-2011
Makefile.am
agent/ChangeLog-2011
agent/gpg-agent.c
dirmngr/ChangeLog-2011
dirmngr/dirmngr.c
doc/HACKING
g13/g13.c
po/de.po
scd/ChangeLog-2011
scd/apdu.c
scd/command.c
scd/scdaemon.c
scripts/gitlog-to-changelog
tools/ChangeLog-2011
diff --cc g13/g13.c
index b3603cc,0f73094..34b91c1
--- a/g13/g13.c
+++ b/g13/g13.c
@@@ -353,6 -368,19 +353,8 @@@ main ( int argc, char **argv
i18n_init ();
init_common_subsystems (&argc, &argv);
-
-#ifdef USE_GCRY_THREAD_CBS
- /* Libgcrypt requires us to register the threading model first.
- Note that this will also do the pth_init. */
- gcry_threads_pth.init = fixed_gcry_pth_init;
- err = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth);
- if (err)
- {
- log_fatal ("can't register GNU Pth with Libgcrypt: %s\n",
- gpg_strerror (err));
- }
-#endif
++ npth_init ();
+
/* Check that the Libgcrypt is suitable. */
if (!gcry_check_version (NEED_LIBGCRYPT_VERSION) )
log_fatal (_("%s is too old (need %s, have %s)\n"), "libgcrypt",
diff --cc scd/apdu.c
index e4ebc35,7bb122d..e914f7b
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@@ -2112,8 -2117,13 +2119,15 @@@ pcsc_keypad_verify (int slot, int class
pin_verify, len, result, &resultlen);
xfree (pin_verify);
if (sw || resultlen < 2)
+ return sw? sw : SW_HOST_INCOMPLETE_CARD_RESPONSE;
+ sw = (result[resultlen-2] << 8) | result[resultlen-1];
+ {
+ log_error ("control_pcsc failed: %d\n", sw);
+ return sw? sw: SW_HOST_INCOMPLETE_CARD_RESPONSE;
+ }
+ sw = (result[resultlen-2] << 8) | result[resultlen-1];
+ if (DBG_CARD_IO)
+ log_debug (" response: sw=%04X datalen=%d\n", sw, (unsigned int)resultlen);
return sw;
}
diff --cc scd/command.c
index fe409d5,88f8ec2..5e7feb5
--- a/scd/command.c
+++ b/scd/command.c
@@@ -327,25 -358,21 +360,24 @@@ do_reset (ctrl_t ctrl, int send_reset
/* Reset the card removed flag for the current reader. We need to
take the lock here so that the ticker thread won't concurrently
try to update the file. Calling update_reader_status_file is
- required to get hold of the new status of the card in the slot
+ required to get hold of the new status of the card in the vreader
table. */
- if (!pth_mutex_acquire (&status_file_update_lock, 0, NULL))
+ err = npth_mutex_lock (&status_file_update_lock);
+ if (err)
{
- log_error ("failed to acquire status_fle_update lock: %s\n",
- strerror (err));
- ctrl->reader_slot = -1;
+ log_error ("failed to acquire status_file_update lock\n");
+ ctrl->server_local->vreader_idx = -1;
return;
}
update_reader_status_file (0); /* Update slot status table. */
- update_card_removed (slot, 0); /* Clear card_removed flag. */
+ update_card_removed (vrdr, 0); /* Clear card_removed flag. */
- if (!pth_mutex_release (&status_file_update_lock))
- log_error ("failed to release status_file_update lock\n");
+ err = npth_mutex_unlock (&status_file_update_lock);
+ if (err)
+ log_error ("failed to release status_file_update lock: %s\n",
+ strerror (err));
/* Do this last, so that the update_card_removed above does its job. */
- ctrl->reader_slot = -1;
+ ctrl->server_local->vreader_idx = -1;
}
-----------------------------------------------------------------------
Summary of changes:
ChangeLog-2011 | 15 -
Makefile.am | 1 +
NEWS | 19 ++-
README.maint | 2 +-
agent/ChangeLog-2011 | 11 -
agent/agent.h | 83 ++++--
agent/call-pinentry.c | 3 +-
agent/call-scd.c | 42 ++--
agent/command.c | 107 ++++++--
agent/gpg-agent.c | 26 ++-
common/asshelp.c | 13 +
common/asshelp.h | 1 +
common/dotlock.c | 6 +-
common/estream.c | 140 ++++++++++
common/estream.h | 4 +-
configure.ac | 2 +-
dirmngr/ChangeLog-2011 | 15 -
dirmngr/dirmngr.c | 2 +-
doc/DETAILS | 6 +
doc/HACKING | 13 +-
doc/com-certs.pem | 18 ++
doc/faq.org | 44 +++-
doc/gpgsm.texi | 15 +-
doc/scdaemon.texi | 58 +++--
g10/photoid.c | 5 +-
g13/g13.c | 3 +
keyserver/gpgkeys_hkp.c | 20 +-
po/de.po | 32 ++-
scd/ChangeLog-2011 | 4 -
scd/Makefile.am | 1 +
scd/apdu.c | 252 ++++++++++++-----
scd/apdu.h | 4 +-
scd/app-common.h | 3 +-
scd/app.c | 104 ++++---
scd/atr.c | 252 +++++------------
scd/atr.h | 2 +-
scd/command.c | 290 ++++++++++++--------
scd/scdaemon.c | 9 +-
scd/scdaemon.h | 7 +-
scripts/gitlog-to-changelog | 15 +
sm/call-dirmngr.c | 2 +-
sm/certchain.c | 61 ++++-
sm/certlist.c | 17 +-
sm/certreqgen.c | 242 ++++++++++++++++-
sm/gpgsm.c | 2 +
sm/gpgsm.h | 7 +-
sm/keylist.c | 29 ++-
sm/server.c | 2 +-
sm/verify.c | 2 +
tests/Makefile.am | 2 +
.../68A638998DFABAC510EA645CE34F9686B2EDF7EA.key | 10 +
tests/samplekeys/README | 7 +-
tests/samplekeys/steed-self-signing-nonthority.pem | 54 ++++
tools/ChangeLog-2011 | 4 -
tools/gpg-connect-agent.c | 156 ++++++-----
55 files changed, 1541 insertions(+), 705 deletions(-)
create mode 100644 tests/samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key
create mode 100644 tests/samplekeys/steed-self-signing-nonthority.pem
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list