[SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-148-g621ad0d

[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=621ad0d2e7955d2a78cf6c13e309065a57ed7406

The branch, master has been updated
       via  621ad0d2e7955d2a78cf6c13e309065a57ed7406 (commit)
       via  1b88a2c731f58e5bcf7cd116972458d63153e8e8 (commit)
       via  b9063e5a2f46e682c2e3ddba15d92955460b8b87 (commit)
      from  14c83926d9152dab48a54fffd07435324b878b6e (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 621ad0d2e7955d2a78cf6c13e309065a57ed7406
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Feb 6 20:24:34 2012 +0100

    Corrected check for the callback for 
gnutls_certificate_set_retrieve_function(). Reported by Dan Winship.

commit 1b88a2c731f58e5bcf7cd116972458d63153e8e8
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Feb 6 20:21:27 2012 +0100

    updated documentation for gnutls_certificate_set_retrieve_function2.

commit b9063e5a2f46e682c2e3ddba15d92955460b8b87
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Feb 6 20:11:10 2012 +0100

    include gnutls_certificate_set_retrieve_function2() to documentation. 
Reported by Dan Winship.

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

Summary of changes:
 lib/auth/cert.c                |    2 +-
 lib/gnutls_cert.c              |    9 +++++++--
 lib/includes/gnutls/abstract.h |    4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/auth/cert.c b/lib/auth/cert.c
index db4b9af..b2bfca8 100644
--- a/lib/auth/cert.c
+++ b/lib/auth/cert.c
@@ -2135,7 +2135,7 @@ _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 || cred->server_get_cert_callback
+  if (cred->server_get_cert_callback || cred->get_cert_callback
       || cred->get_cert_callback2)
     {
       ret = call_get_cert_callback (session, NULL, 0, NULL, 0);
diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index 7e66f4f..0b68eb4 100644
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -432,7 +432,8 @@ void gnutls_certificate_set_retrieve_function
  *
  * The callback's function prototype is:
  * int (*callback)(gnutls_session_t, const gnutls_datum_t* req_ca_dn, int 
nreqs,
- * const gnutls_pk_algorithm_t* pk_algos, int pk_algos_length, 
gnutls_pcert_st* st);
+ * const gnutls_pk_algorithm_t* pk_algos, int pk_algos_length, 
gnutls_pcert_st** pcert,
+ * unsigned int *pcert_length, gnutls_privkey_t * pkey);
  *
  * @req_ca_cert is only used in X.509 certificates.
  * Contains a list with the CA names that the server considers trusted.
@@ -443,7 +444,11 @@ void gnutls_certificate_set_retrieve_function
  * @pk_algos contains a list with server's acceptable signature algorithms.
  * The certificate returned should support the server's given algorithms.
  *
- * @st should contain the certificates and private keys.
+ * @pcert should contain a single certificate and public or a list of them.
+ *
+ * @pcert_length is the size of the previous list.
+ *
+ * @pkey is the private key.
  *
  * If the callback function is provided then gnutls will call it, in the
  * handshake, after the certificate request message has been received.
diff --git a/lib/includes/gnutls/abstract.h b/lib/includes/gnutls/abstract.h
index e0fb249..b89da86 100644
--- a/lib/includes/gnutls/abstract.h
+++ b/lib/includes/gnutls/abstract.h
@@ -278,8 +278,8 @@ void gnutls_pcert_deinit (gnutls_pcert_st* pcert);
                                                     gnutls_privkey_t *privkey);
 
 
-void gnutls_certificate_set_retrieve_function2
-  (gnutls_certificate_credentials_t cred,
+void gnutls_certificate_set_retrieve_function2 (
+   gnutls_certificate_credentials_t cred,
    gnutls_certificate_retrieve_function2 * func);
 
 int


hooks/post-receive
-- 
GNU gnutls