diff options
| author | Marcus Brinkmann <[email protected]> | 2011-09-29 01:14:37 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2011-12-02 21:05:55 +0000 |
| commit | 9ec978ed467252b3099d964144581650493996ae (patch) | |
| tree | 32be97ad81b428c9aec7aabcf82bfb7a5e900e30 | |
| parent | Support the Cherry ST-2000 card reader. (diff) | |
| download | gnupg-9ec978ed467252b3099d964144581650493996ae.tar.gz gnupg-9ec978ed467252b3099d964144581650493996ae.zip | |
Initial port to Npth.
| -rw-r--r-- | ChangeLog-2011 | 10 | ||||
| -rw-r--r-- | agent/cache.c | 4 | ||||
| -rw-r--r-- | agent/gpg-agent.c | 3 |
3 files changed, 15 insertions, 2 deletions
diff --git a/ChangeLog-2011 b/ChangeLog-2011 index cfba8f473..54681c09d 100644 --- a/ChangeLog-2011 +++ b/ChangeLog-2011 @@ -14,6 +14,16 @@ accept --with-libgpg-error-prefix as well as --with-gpg-error-prefix * m4/gpg-error.m4: Update from git master. +2011-09-26 Marcus Brinkmann <[email protected]> + + * configure.ac: Don't check for PTH but for NPTH. + (AH_BOTTOM): Remove PTH_SYSCALL_SOFT. + (have_pth): Rename to ... + (have_npth): ... this. + (USE_GNU_NPTH): Rename to ... + (USE_GNU_PTH): ... this. + * m4/gnupg-npth.m4: New file. + 2011-09-23 Werner Koch <[email protected]> * configure.ac: Remove check for gcry_kdf_derive. diff --git a/agent/cache.c b/agent/cache.c index 1c8a42bf9..9b90d93f4 100644 --- a/agent/cache.c +++ b/agent/cache.c @@ -185,7 +185,9 @@ new_data (const char *string, struct secret_data_s **r_data) d_enc->totallen = total; res = npth_mutex_lock (&encryption_lock); if (res) - log_fatal ("failed to acquire cache encryption mutex: %s\n", strerror (res)); + log_fatal ("failed to acquire cache encryption mutex: %s\n", + strerror (res)); + err = gcry_cipher_encrypt (encryption_handle, d_enc->data, total, d->data, total - 8); xfree (d); diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 30ec1d360..53d25402a 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -1778,7 +1778,8 @@ start_connection_thread (void *arg) if (check_nonce (ctrl, &socket_nonce)) { - log_error ("handler 0x%lx nonce check FAILED\n", (unsigned long) npth_self()); + log_error ("handler 0x%lx nonce check FAILED\n", + (unsigned long) npth_self()); return NULL; } |