[SCM] GNU gnutls branch, master, updated. gnutls_2_9_7-41-gf816782

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

The branch, master has been updated
       via  f81678201af14a755ed1b71ce7532bf0fd6ba54c (commit)
      from  3349e19bcf9f7289df22b450c283d7ca21278e16 (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 f81678201af14a755ed1b71ce7532bf0fd6ba54c
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Nov 1 17:58:22 2009 +0200

    do not use gnutls_x509_crt_get_signature_algorithm() on null certificates.

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

Summary of changes:
 src/cli.c |   55 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/cli.c b/src/cli.c
index b0e5d0d..e68a734 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -373,36 +373,39 @@ cert_callback (gnutls_session_t session,
       gnutls_sign_algorithm_t cert_algo, req_algo;
       int i, match = 0;
       
-      ret = gnutls_x509_crt_get_signature_algorithm(x509_crt[0]);
-      if (ret < 0)
+      if (x509_crt[0] != NULL)
         {
-          /* error reading signature algorithm */
-          return -1;
-        }
-      cert_algo = ret;
+          ret = gnutls_x509_crt_get_signature_algorithm(x509_crt[0]);
+          if (ret < 0)
+            {
+              /* error reading signature algorithm */
+              return -1;
+            }
+          cert_algo = ret;
     
-      i=0;
-      do {
-        ret = gnutls_session_sign_algorithm_get_requested(session, i, 
&req_algo);
-        if (ret >= 0 && cert_algo == req_algo)
-          {
-            match = 1;
-            break;
-          }
+          i=0;
+          do {
+            ret = gnutls_session_sign_algorithm_get_requested(session, i, 
&req_algo);
+            if (ret >= 0 && cert_algo == req_algo)
+              {
+                match = 1;
+                break;
+              }
           
-         /* server has not requested anything specific */
-        if (i==0 && ret == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE)
-          {
-            match = 1;
-            break;
-          }
-        i++;
-      } while(ret >= 0);
+              /* server has not requested anything specific */
+             if (i==0 && ret == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE)
+              {
+                match = 1;
+                break;
+              }
+            i++;
+          } while(ret >= 0);
       
-      if (match == 0)
-        {
-          printf("- Could not find a suitable certificate to send to 
server\n");
-          return -1;
+          if (match == 0)
+            {
+              printf("- Could not find a suitable certificate to send to 
server\n");
+              return -1;
+            }
         }
 
       if (x509_crt != NULL && x509_key != NULL)


hooks/post-receive
-- 
GNU gnutls