[SCM] GNU gnutls branch, master, updated. gnutls_2_9_7-53-gc7d1fd6

[Simon Josefsson]

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=c7d1fd6a1b3414aee4c2105274a7dbee8f3357cc

The branch, master has been updated
       via  c7d1fd6a1b3414aee4c2105274a7dbee8f3357cc (commit)
      from  520cf54a3e6b1ef0474a93262b880714f4b3e6df (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 c7d1fd6a1b3414aee4c2105274a7dbee8f3357cc
Author: Simon Josefsson <address@hidden>
Date:   Thu Nov 5 08:50:01 2009 +0100

    Indent code.

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

Summary of changes:
 lib/ext_signature.c |  211 +++++++++++++++++++++++++++-----------------------
 1 files changed, 114 insertions(+), 97 deletions(-)

diff --git a/lib/ext_signature.c b/lib/ext_signature.c
index ffece50..77b6089 100644
--- a/lib/ext_signature.c
+++ b/lib/ext_signature.c
@@ -37,40 +37,44 @@
 /* generates a SignatureAndHashAlgorithm structure with length as prefix
  * by using the setup priorities.
  */
-int _gnutls_sign_algorithm_write_params(gnutls_session_t session, opaque 
*data, size_t max_data_size)
+int
+_gnutls_sign_algorithm_write_params (gnutls_session_t session, opaque * data,
+                                    size_t max_data_size)
 {
-opaque* p = data;
-int len, i ,j;
-sign_algorithm_st aid;
-
-          len = session->internals.priorities.sign_algo.algorithms * 2;
-          if (max_data_size < len + 2)
-            {
-              gnutls_assert ();
-              return GNUTLS_E_SHORT_MEMORY_BUFFER;
-            }
-
-          _gnutls_write_uint16 (len, p);
-          p += 2;
-
-          for (i = j = 0; i < len; i += 2, j++)
-            {
-              aid = 
_gnutls_sign_to_tls_aid(session->internals.priorities.sign_algo.priority[j]);
-              *p = aid.hash_algorithm;
-              p++;
-              *p = aid.sign_algorithm;
-              p++;
-
-            }
-          return len + 2;
+  opaque *p = data;
+  int len, i, j;
+  sign_algorithm_st aid;
+
+  len = session->internals.priorities.sign_algo.algorithms * 2;
+  if (max_data_size < len + 2)
+    {
+      gnutls_assert ();
+      return GNUTLS_E_SHORT_MEMORY_BUFFER;
+    }
+
+  _gnutls_write_uint16 (len, p);
+  p += 2;
+
+  for (i = j = 0; i < len; i += 2, j++)
+    {
+      aid =
+       _gnutls_sign_to_tls_aid (session->internals.priorities.sign_algo.
+                                priority[j]);
+      *p = aid.hash_algorithm;
+      p++;
+      *p = aid.sign_algorithm;
+      p++;
+
+    }
+  return len + 2;
 }
 
 /* Parses the Signature Algorithm structure and stores data into
- * session->security_parameters.extensions. 
+ * session->security_parameters.extensions.
  */
 int
-_gnutls_sign_algorithm_parse_data (gnutls_session_t session, const opaque * 
data,
-                              size_t data_size)
+_gnutls_sign_algorithm_parse_data (gnutls_session_t session,
+                                  const opaque * data, size_t data_size)
 {
   int sig, i;
 
@@ -81,36 +85,37 @@ _gnutls_sign_algorithm_parse_data (gnutls_session_t 
session, const opaque * data
       sign_algorithm_st aid;
 
       aid.hash_algorithm = data[i];
-      aid.sign_algorithm = data[i+1];
+      aid.sign_algorithm = data[i + 1];
 
-      sig = _gnutls_tls_aid_to_sign(&aid);
+      sig = _gnutls_tls_aid_to_sign (&aid);
       if (sig != GNUTLS_SIGN_UNKNOWN)
-        {
-          session->security_parameters.extensions.sign_algorithms[session->
-                                                                  
security_parameters.extensions.
-                                                                  
sign_algorithms_size++]
-            = sig;
-          if (session->security_parameters.extensions.sign_algorithms_size ==
-              MAX_SIGNATURE_ALGORITHMS)
-            break;
-        }
+       {
+         session->security_parameters.
+           extensions.sign_algorithms[session->security_parameters.
+                                      extensions.
+                                      sign_algorithms_size++] = sig;
+         if (session->security_parameters.extensions.sign_algorithms_size ==
+             MAX_SIGNATURE_ALGORITHMS)
+           break;
+       }
     }
 
   return 0;
 }
 
-/* 
- * In case of a server: if a SIGNATURE_ALGORITHMS extension type is received 
then it stores
- * into the session security parameters the new value. 
- *
- * In case of a client: If a signature_algorithms have been specified then it 
is an error;
+/*
+ * In case of a server: if a SIGNATURE_ALGORITHMS extension type is
+ * received then it stores into the session security parameters the
+ * new value.
  *
+ * In case of a client: If a signature_algorithms have been specified
+ * then it is an error;
  */
 
 int
 _gnutls_signature_algorithm_recv_params (gnutls_session_t session,
-                                         const opaque * data,
-                                         size_t _data_size)
+                                        const opaque * data,
+                                        size_t _data_size)
 {
   ssize_t data_size = _data_size;
   int ret;
@@ -127,24 +132,24 @@ _gnutls_signature_algorithm_recv_params (gnutls_session_t 
session,
     }
   else
     {
-      /* SERVER SIDE - we must check if the sent cert type is the right one 
+      /* SERVER SIDE - we must check if the sent cert type is the right one
        */
       if (data_size > 2)
-        {
-          uint16_t len;
+       {
+         uint16_t len;
 
 
-          DECR_LEN (data_size, 2);
-          len = _gnutls_read_uint16 (data);
-          DECR_LEN (data_size, len);
+         DECR_LEN (data_size, 2);
+         len = _gnutls_read_uint16 (data);
+         DECR_LEN (data_size, len);
 
-          ret = _gnutls_sign_algorithm_parse_data (session, data + 2, len);
-          if (ret < 0)
-            {
-              gnutls_assert();
-              return ret;
-            }
-        }
+         ret = _gnutls_sign_algorithm_parse_data (session, data + 2, len);
+         if (ret < 0)
+           {
+             gnutls_assert ();
+             return ret;
+           }
+       }
     }
 
   return 0;
@@ -154,7 +159,7 @@ _gnutls_signature_algorithm_recv_params (gnutls_session_t 
session,
  */
 int
 _gnutls_signature_algorithm_send_params (gnutls_session_t session,
-                                         opaque * data, size_t data_size)
+                                        opaque * data, size_t data_size)
 {
   int ret;
   gnutls_protocol_t ver = gnutls_protocol_get_version (session);
@@ -164,15 +169,16 @@ _gnutls_signature_algorithm_send_params (gnutls_session_t 
session,
       && _gnutls_version_has_selectable_sighash (ver))
     {
       if (session->internals.priorities.sign_algo.algorithms > 0)
-        {
-          ret = _gnutls_sign_algorithm_write_params(session, data, data_size);
-          if (ret < 0)
-            {
-              gnutls_assert();
-              return ret;
-            }
-          return ret;
-        }
+       {
+         ret =
+           _gnutls_sign_algorithm_write_params (session, data, data_size);
+         if (ret < 0)
+           {
+             gnutls_assert ();
+             return ret;
+           }
+         return ret;
+       }
     }
 
   /* if we are here it means we don't send the extension */
@@ -185,14 +191,16 @@ _gnutls_signature_algorithm_send_params (gnutls_session_t 
session,
  */
 gnutls_sign_algorithm_t
 _gnutls_session_get_sign_algo (gnutls_session_t session,
-                               gnutls_pk_algorithm_t pk,
-                               gnutls_digest_algorithm_t * hash)
+                              gnutls_pk_algorithm_t pk,
+                              gnutls_digest_algorithm_t * hash)
 {
   unsigned i;
   gnutls_protocol_t ver = gnutls_protocol_get_version (session);
 
 
-  if (!_gnutls_version_has_selectable_sighash (ver) || 
session->security_parameters.extensions.sign_algorithms_size == 0)       /* 
none set, allow all */
+  if (!_gnutls_version_has_selectable_sighash (ver)
+      || session->security_parameters.extensions.sign_algorithms_size == 0)
+    /* none set, allow all */
     {
       *hash = GNUTLS_DIG_SHA1;
       return _gnutls_x509_pk_to_sign (pk, *hash);
@@ -202,13 +210,14 @@ _gnutls_session_get_sign_algo (gnutls_session_t session,
        i < session->security_parameters.extensions.sign_algorithms_size; i++)
     {
       if (_gnutls_sign_get_pk_algorithm
-          (session->security_parameters.extensions.sign_algorithms[i]) == pk)
-        {
-          *hash =
-            _gnutls_sign_get_hash_algorithm (session->security_parameters.
-                                             extensions.sign_algorithms[i]);
-          return session->security_parameters.extensions.sign_algorithms[i];
-        }
+         (session->security_parameters.extensions.sign_algorithms[i]) == pk)
+       {
+         *hash =
+           _gnutls_sign_get_hash_algorithm (session->
+                                            security_parameters.extensions.
+                                            sign_algorithms[i]);
+         return session->security_parameters.extensions.sign_algorithms[i];
+       }
     }
 
   return GNUTLS_SIGN_UNKNOWN;
@@ -221,12 +230,14 @@ _gnutls_session_get_sign_algo (gnutls_session_t session,
  */
 int
 _gnutls_session_sign_algo_requested (gnutls_session_t session,
-                                     gnutls_sign_algorithm_t sig)
+                                    gnutls_sign_algorithm_t sig)
 {
   unsigned i;
   gnutls_protocol_t ver = gnutls_protocol_get_version (session);
 
-  if (!_gnutls_version_has_selectable_sighash (ver) || 
session->security_parameters.extensions.sign_algorithms_size == 0)       /* 
none set, allow all */
+  if (!_gnutls_version_has_selectable_sighash (ver)
+      || session->security_parameters.extensions.sign_algorithms_size == 0)
+    /* none set, allow all */
     {
       return 0;
     }
@@ -235,9 +246,9 @@ _gnutls_session_sign_algo_requested (gnutls_session_t 
session,
        i < session->security_parameters.extensions.sign_algorithms_size; i++)
     {
       if (session->security_parameters.extensions.sign_algorithms[i] == sig)
-        {
-          return 0;             /* ok */
-        }
+       {
+         return 0;             /* ok */
+       }
     }
 
   return GNUTLS_E_UNSUPPORTED_SIGNATURE_ALGORITHM;
@@ -249,12 +260,14 @@ _gnutls_session_sign_algo_requested (gnutls_session_t 
session,
  */
 int
 _gnutls_session_sign_algo_enabled (gnutls_session_t session,
-                                    gnutls_sign_algorithm_t sig)
+                                  gnutls_sign_algorithm_t sig)
 {
   unsigned i;
   gnutls_protocol_t ver = gnutls_protocol_get_version (session);
 
-  if (!_gnutls_version_has_selectable_sighash (ver) || 
session->security_parameters.extensions.sign_algorithms_size == 0)       /* 
none set, allow all */
+  if (!_gnutls_version_has_selectable_sighash (ver)
+      || session->security_parameters.extensions.sign_algorithms_size == 0)
+    /* none set, allow all */
     {
       return 0;
     }
@@ -271,17 +284,18 @@ _gnutls_session_sign_algo_enabled (gnutls_session_t 
session,
 }
 
 /**
-  * gnutls_session_sign_algorithm_get - Returns the signature algorithms 
requested by peer
+  * gnutls_session_sign_algorithm_get - get signature algorithms requested by 
peer
   * @session: is a #gnutls_session_t structure.
   * @indx: is an index of the signature algorithm to return
   * @algo: the returned certificate type will be stored there
   *
-  * Returns the signature algorithm specified by index that was requested
-  * by the peer. If the specified index has no data available 
-  * this function returns %GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE.
-  * If the negotiated TLS version does not support signature algorithms
-  * then %GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE will be returned even
-  * for the first index.
+  * Returns the signature algorithm specified by index that was
+  * requested by the peer. If the specified index has no data
+  * available this function returns
+  * %GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE.  If the negotiated TLS
+  * version does not support signature algorithms then
+  * %GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE will be returned even for
+  * the first index.
   *
   * This function is usefull in the certificate callback functions
   * to assist in selecting the correct certificate.
@@ -289,12 +303,15 @@ _gnutls_session_sign_algo_enabled (gnutls_session_t 
session,
   * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise
   *   an error code is returned.
   **/
-int gnutls_session_sign_algorithm_get_requested (gnutls_session_t session,
-                    int indx, gnutls_sign_algorithm_t *algo)
+int
+gnutls_session_sign_algorithm_get_requested (gnutls_session_t session,
+                                            int indx,
+                                            gnutls_sign_algorithm_t * algo)
 {
   gnutls_protocol_t ver = gnutls_protocol_get_version (session);
 
-  if (!_gnutls_version_has_selectable_sighash (ver) || 
session->security_parameters.extensions.sign_algorithms_size == 0)
+  if (!_gnutls_version_has_selectable_sighash (ver)
+      || session->security_parameters.extensions.sign_algorithms_size == 0)
     {
       return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
     }
@@ -305,5 +322,5 @@ int gnutls_session_sign_algorithm_get_requested 
(gnutls_session_t session,
       return 0;
     }
   else
-      return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
+    return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
 }


hooks/post-receive
-- 
GNU gnutls