[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_11_6-84-g8c1ee78

[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=8c1ee78125d7addf48bf1053cc00b39e0f94e055

The branch, gnutls_2_12_x has been updated
       via  8c1ee78125d7addf48bf1053cc00b39e0f94e055 (commit)
      from  952ff869e55a91ed7a96e27afd760f6d7a027ebd (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 8c1ee78125d7addf48bf1053cc00b39e0f94e055
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Feb 9 20:59:37 2011 +0100

    SRP and PSK are no longer set on the default priorities. They have to be 
explicitly set.

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

Summary of changes:
 lib/gnutls_priority.c |   15 ---------------
 1 files changed, 0 insertions(+), 15 deletions(-)

diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index 8312664..6aab02c 100644
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -219,11 +219,6 @@ static const int kx_priority_performance[] = {
   GNUTLS_KX_RSA,
   GNUTLS_KX_DHE_RSA,
   GNUTLS_KX_DHE_DSS,
-  GNUTLS_KX_PSK,
-  GNUTLS_KX_DHE_PSK,
-  GNUTLS_KX_SRP_RSA,
-  GNUTLS_KX_SRP_DSS,
-  GNUTLS_KX_SRP,
   /* GNUTLS_KX_ANON_DH: Man-in-the-middle prone, don't add!
    * GNUTLS_KX_RSA_EXPORT: Deprecated, don't add!
    */
@@ -234,11 +229,6 @@ static const int kx_priority_export[] = {
   GNUTLS_KX_RSA,
   GNUTLS_KX_DHE_RSA,
   GNUTLS_KX_DHE_DSS,
-  GNUTLS_KX_PSK,
-  GNUTLS_KX_DHE_PSK,
-  GNUTLS_KX_SRP_RSA,
-  GNUTLS_KX_SRP_DSS,
-  GNUTLS_KX_SRP,
   GNUTLS_KX_RSA_EXPORT,
   0
 };
@@ -249,12 +239,7 @@ static const int kx_priority_secure[] = {
    */
   GNUTLS_KX_DHE_RSA,
   GNUTLS_KX_DHE_DSS,
-  GNUTLS_KX_DHE_PSK,
-  GNUTLS_KX_SRP_RSA,
-  GNUTLS_KX_SRP_DSS,
   GNUTLS_KX_RSA,
-  GNUTLS_KX_PSK,
-  GNUTLS_KX_SRP,
   /* GNUTLS_KX_ANON_DH: Man-in-the-middle prone, don't add!
    * GNUTLS_KX_RSA_EXPORT: Deprecated, don't add!
    */


hooks/post-receive
-- 
GNU gnutls