[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_2-25-gf52e1be

[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=f52e1be8325170a4752986197037e0ad9735572d

The branch, gnutls_2_12_x has been updated
       via  f52e1be8325170a4752986197037e0ad9735572d (commit)
       via  b0a7f83560a4667982ed832e64d4638b5c4b9452 (commit)
       via  6dfeed634e984150a41af5cd53890e6740fcfa8d (commit)
      from  b2f2a137003e8f0915fd7e04d333b208866e19e2 (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 f52e1be8325170a4752986197037e0ad9735572d
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Apr 21 00:24:07 2011 +0200

    corrected

commit b0a7f83560a4667982ed832e64d4638b5c4b9452
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Apr 20 20:59:04 2011 +0200

    removed keyid_t types.

commit 6dfeed634e984150a41af5cd53890e6740fcfa8d
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Apr 20 20:03:08 2011 +0200

    Use get_cert_callback() in server side.

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

Summary of changes:
 NEWS            |    4 ++--
 lib/auth_cert.c |    3 ++-
 src/certtool.c  |    2 +-
 src/cli.c       |    2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 8c8076a..73e95fb 100644
--- a/NEWS
+++ b/NEWS
@@ -20,11 +20,11 @@ Reported by Herbert J. Skuhra.
 
 * tests: More fixes and updates for win32. Patches by LRN.
 
+* libgnutls: Several files unnecessarily included <gcrypt.h>; this has been 
fixed.
+
 ** API and ABI modifications:
 gnutls_transport_set_global_errno: DEPRECATED
 
-** Several files unnecessarily included <gcrypt.h>; this has been fixed.
-
 
 * Version 2.12.2 (released 2011-04-08)
 
diff --git a/lib/auth_cert.c b/lib/auth_cert.c
index 40de22f..9786211 100644
--- a/lib/auth_cert.c
+++ b/lib/auth_cert.c
@@ -2068,7 +2068,8 @@ _gnutls_server_select_cert (gnutls_session_t session,
   /* If the callback which retrieves certificate has been set,
    * use it and leave.
    */
-  if (cred->server_get_cert_callback != NULL)
+  if (cred->server_get_cert_callback != NULL ||
+    cred->get_cert_callback != NULL)
     return call_get_cert_callback (session, NULL, 0, NULL, 0);
 
   /* Otherwise... */
diff --git a/src/certtool.c b/src/certtool.c
index e5de9a3..afd0403 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -1313,7 +1313,7 @@ void
 pgp_privkey_info (void)
 {
   gnutls_openpgp_privkey_t key;
-  gnutls_openpgp_keyid_t keyid;
+  uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE];
   size_t size;
   int ret, i, subkeys;
   gnutls_datum_t pem;
diff --git a/src/cli.c b/src/cli.c
index d886a86..b97a758 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -336,7 +336,7 @@ load_keys (void)
 
       if (info.pgp_subkey != NULL)
         {
-          gnutls_openpgp_keyid_t keyid;
+          uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE];
 
           if (strcasecmp (info.pgp_subkey, "auto") == 0)
             {


hooks/post-receive
-- 
GNU gnutls