[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-146-g374cee6

[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=374cee6a96d73634bea443c60be471d844f6203a

The branch, master has been updated
       via  374cee6a96d73634bea443c60be471d844f6203a (commit)
       via  703b3a04346cb0d847367e8ba2f951cbe4c2b5a0 (commit)
       via  2b73ad7815fe23732e35542dc0416cb10133fd72 (commit)
       via  96370337fd1bf5760886fc6b86f81af75151740f (commit)
      from  f7b09cf50f1edf16e030b7d552fea0bce273a7e1 (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 374cee6a96d73634bea443c60be471d844f6203a
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Feb 10 10:37:20 2011 +0100

    increased the C++ library current version.

commit 703b3a04346cb0d847367e8ba2f951cbe4c2b5a0
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Feb 10 10:36:43 2011 +0100

    The C++ interface returns exception on every error and not only on fatal 
ones. This allows easier handling of errors.

commit 2b73ad7815fe23732e35542dc0416cb10133fd72
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Feb 10 10:21:23 2011 +0100

    removed the old set_priority functions.

commit 96370337fd1bf5760886fc6b86f81af75151740f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Feb 10 10:16:36 2011 +0100

    removed more deprecated stuff.

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

Summary of changes:
 NEWS                           |    7 +++++
 lib/gnutlsxx.cpp               |   53 +++++----------------------------------
 lib/includes/gnutls/gnutlsxx.h |    7 -----
 lib/m4/hooks.m4                |    2 +-
 src/cli.c                      |   20 ---------------
 src/serv.c                     |   20 ---------------
 6 files changed, 15 insertions(+), 94 deletions(-)

diff --git a/NEWS b/NEWS
index 9faf22c..027f775 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,13 @@ See the end for copying conditions.
 
 * Version 2.99.0 (unreleased)
 
+** libgnutlsxx: The C++ interface returns exception on
+every error and not only on fatal ones. This allows easier
+handling of errors.
+
+** libgnutls: Corrected issue in DHE-PSK ciphersuites that ignored    
+the PSK callback.
+
 ** libgnutls: SRP and PSK are no longer set on the default priorities. 
 They have to be explicitly set.
 
diff --git a/lib/gnutlsxx.cpp b/lib/gnutlsxx.cpp
index 400d87b..d0956f8 100644
--- a/lib/gnutlsxx.cpp
+++ b/lib/gnutlsxx.cpp
@@ -7,14 +7,6 @@
 namespace gnutls
 {
 
-  inline static int RETWRAP_NET (int ret)
-  {
-    if (gnutls_error_is_fatal (ret))
-      throw (exception (ret));
-    else
-      return ret;
-  }
-
   inline static int RETWRAP (int ret)
   {
     if (ret < 0)
@@ -34,12 +26,12 @@ namespace gnutls
 
   int session::bye (gnutls_close_request_t how)
   {
-    return RETWRAP_NET (gnutls_bye (s, how));
+    return RETWRAP (gnutls_bye (s, how));
   }
 
   int session::handshake ()
   {
-    return RETWRAP_NET (gnutls_handshake (s));
+    return RETWRAP (gnutls_handshake (s));
   }
 
   server_session::server_session ():session (GNUTLS_SERVER)
@@ -52,7 +44,7 @@ namespace gnutls
 
   int server_session::rehandshake ()
   {
-    return RETWRAP_NET (gnutls_rehandshake (s));
+    return RETWRAP (gnutls_rehandshake (s));
   }
 
   gnutls_alert_description_t session::get_alert () const
@@ -63,12 +55,12 @@ namespace gnutls
   int session::send_alert (gnutls_alert_level_t level,
                           gnutls_alert_description_t desc)
   {
-    return RETWRAP_NET (gnutls_alert_send (s, level, desc));
+    return RETWRAP (gnutls_alert_send (s, level, desc));
   }
 
   int session::send_appropriate_alert (int err)
   {
-    return RETWRAP_NET (gnutls_alert_send_appropriate (s, err));
+    return RETWRAP (gnutls_alert_send_appropriate (s, err));
   }
 
   gnutls_cipher_algorithm_t session::get_cipher () const
@@ -113,12 +105,12 @@ namespace gnutls
 
   ssize_t session::send (const void *data, size_t sizeofdata)
   {
-    return RETWRAP_NET (gnutls_record_send (s, data, sizeofdata));
+    return RETWRAP (gnutls_record_send (s, data, sizeofdata));
   }
 
   ssize_t session::recv (void *data, size_t sizeofdata)
   {
-    return RETWRAP_NET (gnutls_record_recv (s, data, sizeofdata));
+    return RETWRAP (gnutls_record_recv (s, data, sizeofdata));
   }
 
   bool session::get_record_direction () const
@@ -161,37 +153,6 @@ namespace gnutls
   }
 
 
-  void session::set_cipher_priority (const int *list)
-  {
-    RETWRAP (gnutls_cipher_set_priority (s, list));
-  }
-
-  void session::set_mac_priority (const int *list)
-  {
-    RETWRAP (gnutls_mac_set_priority (s, list));
-  }
-
-  void session::set_compression_priority (const int *list)
-  {
-    RETWRAP (gnutls_compression_set_priority (s, list));
-  }
-
-  void session::set_kx_priority (const int *list)
-  {
-    RETWRAP (gnutls_kx_set_priority (s, list));
-  }
-
-  void session::set_protocol_priority (const int *list)
-  {
-    RETWRAP (gnutls_protocol_set_priority (s, list));
-  }
-
-  void session::set_certificate_type_priority (const int *list)
-  {
-    RETWRAP (gnutls_certificate_type_set_priority (s, list));
-  }
-
-
 /* if you just want some defaults, use the following.
  */
   void session::set_priority (const char *prio, const char **err_pos)
diff --git a/lib/includes/gnutls/gnutlsxx.h b/lib/includes/gnutls/gnutlsxx.h
index 70f3264..db51a6b 100644
--- a/lib/includes/gnutls/gnutlsxx.h
+++ b/lib/includes/gnutls/gnutlsxx.h
@@ -133,13 +133,6 @@ namespace gnutls
                   size_t seed_size, const char *seed,
                   size_t outsize, char *out);
 
-    void set_cipher_priority (const int *list);
-    void set_mac_priority (const int *list);
-    void set_compression_priority (const int *list);
-    void set_kx_priority (const int *list);
-    void set_protocol_priority (const int *list);
-    void set_certificate_type_priority (const int *list);
-
     /* if you just want some defaults, use the following.
      */
     void set_priority (const char *prio, const char **err_pos);
diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4
index 26a9bfc..ba7ec9b 100644
--- a/lib/m4/hooks.m4
+++ b/lib/m4/hooks.m4
@@ -30,7 +30,7 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   AC_SUBST(LT_REVISION, 0)
   AC_SUBST(LT_AGE, 0)
 
-  AC_SUBST(CXX_LT_CURRENT, 27)
+  AC_SUBST(CXX_LT_CURRENT, 28)
   AC_SUBST(CXX_LT_REVISION, 0)
   AC_SUBST(CXX_LT_AGE, 0)
 
diff --git a/src/cli.c b/src/cli.c
index 1576b73..3ea3906 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -84,13 +84,6 @@ static gnutls_certificate_credentials_t xcred;
 
 static gaainfo info;
 
-static int protocol_priority[PRI_MAX];
-static int kx_priority[PRI_MAX];
-static int cipher_priority[PRI_MAX];
-static int comp_priority[PRI_MAX];
-static int mac_priority[PRI_MAX];
-static int cert_type_priority[PRI_MAX];
-
 /* end of global stuff */
 
 /* prototypes */
@@ -573,21 +566,8 @@ init_tls_session (const char *hostname)
       gnutls_handshake_set_private_extensions (session, 1);
       gnutls_server_name_set (session, GNUTLS_NAME_DNS, hostname,
                               strlen (hostname));
-      if (cert_type_priority[0])
-        gnutls_certificate_type_set_priority (session, cert_type_priority);
     }
 
-  if (cipher_priority[0])
-    gnutls_cipher_set_priority (session, cipher_priority);
-  if (comp_priority[0])
-    gnutls_compression_set_priority (session, comp_priority);
-  if (kx_priority[0])
-    gnutls_kx_set_priority (session, kx_priority);
-  if (protocol_priority[0])
-    gnutls_protocol_set_priority (session, protocol_priority);
-  if (mac_priority[0])
-    gnutls_mac_set_priority (session, mac_priority);
-
   gnutls_dh_set_prime_bits (session, 512);
 
   gnutls_credentials_set (session, GNUTLS_CRD_ANON, anon_cred);
diff --git a/src/serv.c b/src/serv.c
index 0439ed1..0687624 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -326,13 +326,6 @@ generate_rsa_params (void)
 
 LIST_DECLARE_INIT (listener_list, listener_item, listener_free);
 
-static int protocol_priority[PRI_MAX];
-static int kx_priority[PRI_MAX];
-static int cipher_priority[PRI_MAX];
-static int comp_priority[PRI_MAX];
-static int mac_priority[PRI_MAX];
-static int cert_type_priority[PRI_MAX];
-
 static gnutls_session_t
 initialize_session (void)
 {
@@ -363,19 +356,6 @@ initialize_session (void)
       exit (1);
     }
 
-  if (cipher_priority[0])
-    gnutls_cipher_set_priority (session, cipher_priority);
-  if (comp_priority[0])
-    gnutls_compression_set_priority (session, comp_priority);
-  if (kx_priority[0])
-    gnutls_kx_set_priority (session, kx_priority);
-  if (protocol_priority[0])
-    gnutls_protocol_set_priority (session, protocol_priority);
-  if (mac_priority[0])
-    gnutls_mac_set_priority (session, mac_priority);
-  if (cert_type_priority[0])
-    gnutls_certificate_type_set_priority (session, cert_type_priority);
-
   gnutls_credentials_set (session, GNUTLS_CRD_ANON, dh_cred);
 
   if (srp_cred != NULL)


hooks/post-receive
-- 
GNU gnutls