[SCM] GNU gnutls branch, master, updated. gnutls_2_9_8-12-g2a63b83

[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=2a63b8301b4a4e1f7424036f5fcbb480dd910b0b

The branch, master has been updated
       via  2a63b8301b4a4e1f7424036f5fcbb480dd910b0b (commit)
      from  674bf68ba6229598048f6a3a5e9eb48a4d058b7f (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 2a63b8301b4a4e1f7424036f5fcbb480dd910b0b
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Nov 6 20:18:53 2009 +0200

    More dead code removed. Based on suggestions by Steve Grubb and Tomaz Mraz

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

Summary of changes:
 lib/gnutls_algorithms.c |   28 ++++++----------------------
 1 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/lib/gnutls_algorithms.c b/lib/gnutls_algorithms.c
index bb1a5f1..f5d7807 100644
--- a/lib/gnutls_algorithms.c
+++ b/lib/gnutls_algorithms.c
@@ -1057,12 +1057,6 @@ _gnutls_version_priority (gnutls_session_t session, 
gnutls_protocol_t version)
 {                              /* actually returns the priority */
   unsigned int i;
 
-  if (session->internals.priorities.protocol.priority == NULL)
-    {
-      gnutls_assert ();
-      return -1;
-    }
-
   for (i = 0; i < session->internals.priorities.protocol.algorithms; i++)
     {
       if (session->internals.priorities.protocol.priority[i] == version)
@@ -1076,16 +1070,11 @@ _gnutls_version_lowest (gnutls_session_t session)
 {                              /* returns the lowest version supported */
   unsigned int i, min = 0xff;
 
-  if (session->internals.priorities.protocol.priority == NULL)
+  for (i = 0; i < session->internals.priorities.protocol.algorithms; i++)
     {
-      return GNUTLS_VERSION_UNKNOWN;
+      if (session->internals.priorities.protocol.priority[i] < min)
+        min = session->internals.priorities.protocol.priority[i];
     }
-  else
-    for (i = 0; i < session->internals.priorities.protocol.algorithms; i++)
-      {
-       if (session->internals.priorities.protocol.priority[i] < min)
-         min = session->internals.priorities.protocol.priority[i];
-      }
 
   if (min == 0xff)
     return GNUTLS_VERSION_UNKNOWN;     /* unknown version */
@@ -1098,16 +1087,11 @@ _gnutls_version_max (gnutls_session_t session)
 {                              /* returns the maximum version supported */
   unsigned int i, max = 0x00;
 
-  if (session->internals.priorities.protocol.priority == NULL)
+  for (i = 0; i < session->internals.priorities.protocol.algorithms; i++)
     {
-      return GNUTLS_VERSION_UNKNOWN;
+      if (session->internals.priorities.protocol.priority[i] > max)
+        max = session->internals.priorities.protocol.priority[i];
     }
-  else
-    for (i = 0; i < session->internals.priorities.protocol.algorithms; i++)
-      {
-       if (session->internals.priorities.protocol.priority[i] > max)
-         max = session->internals.priorities.protocol.priority[i];
-      }
 
   if (max == 0x00)
     return GNUTLS_VERSION_UNKNOWN;     /* unknown version */


hooks/post-receive
-- 
GNU gnutls