[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_7_a-27-g589c804

[Nikos Mavrogiannopoulos]

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 "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=589c804845b196047c8bdee48903efac5160c6b9

The branch, gnutls_2_12_x has been updated
       via  589c804845b196047c8bdee48903efac5160c6b9 (commit)
       via  d529004eecac0439bfa756038e7285fcfd3c01de (commit)
      from  1b7ea889e87388008001efb8b0b38180da276a94 (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 589c804845b196047c8bdee48903efac5160c6b9
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Aug 5 15:34:26 2011 +0200

    better placement of ifdefs.

commit d529004eecac0439bfa756038e7285fcfd3c01de
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Aug 4 18:28:46 2011 +0200

    updated news

-----------------------------------------------------------------------

Summary of changes:
 NEWS            |    7 ++++---
 lib/auth_cert.c |    6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 83f4257..3667639 100644
--- a/NEWS
+++ b/NEWS
@@ -5,12 +5,13 @@ See the end for copying conditions.
 
 * Version 2.12.8 (unreleased)
 
-** libgnutls: PKCS #11 back-end rewritten to use p11-kit
-http://p11-glue.freedesktop.org/p11-kit.html. Rewrite by
-Stef Walter.
+** libgnutls: PKCS #11 back-end was replaced by p11-kit
+http://p11-glue.freedesktop.org/p11-kit.html. This backports
+the 3.0.0 PKCS #11 back-end. Rewrite by Stef Walter.
 
 ** libgnutls: gcrypt: replaced occurences of gcry_sexp_nth_mpi (..., 0)
 with gcry_sexp_nth_mpi (..., GCRYMPI_FMT_USG) to fix errors with 1.5.0.
+Patch by Andreas Metzler.
 
 ** libgnutls: Verify that a certificate liste specified
 using gnutls_certificate_set_x509_key*(), is sorted
diff --git a/lib/auth_cert.c b/lib/auth_cert.c
index 9dbb677..66aaf0b 100644
--- a/lib/auth_cert.c
+++ b/lib/auth_cert.c
@@ -568,10 +568,10 @@ call_get_cert_callback (gnutls_session_t session,
               goto cleanup;
             }
         }
-      break;
 #endif
-#ifdef ENABLE_PKCS11
+      break;
     case GNUTLS_PRIVKEY_PKCS11:
+#ifdef ENABLE_PKCS11
       if (st2.key.pkcs11 != NULL)
         {
           local_key =
@@ -583,8 +583,8 @@ call_get_cert_callback (gnutls_session_t session,
               goto cleanup;
             }
         }
-      break;
 #endif
+      break;
     case GNUTLS_PRIVKEY_X509:
       if (st2.key.x509 != NULL)
         {


hooks/post-receive
-- 
GNU gnutls