gnutls-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_11_6-87-g749ab


From: Nikos Mavrogiannopoulos
Subject: [SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_11_6-87-g749ab1a
Date: Wed, 09 Feb 2011 22:30:30 +0000

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=749ab1ace417becaac0be0f3e923fdfb24fb1abb

The branch, gnutls_2_12_x has been updated
       via  749ab1ace417becaac0be0f3e923fdfb24fb1abb (commit)
       via  ba6aaff19cc6f3ebbe7fedcb7ccf3f4f192eba94 (commit)
       via  2f2736d2030c44042d4df2d0cdad5f74f611c6e9 (commit)
      from  8c1ee78125d7addf48bf1053cc00b39e0f94e055 (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 749ab1ace417becaac0be0f3e923fdfb24fb1abb
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Feb 9 23:21:51 2011 +0100

    In TLS 1.2 under DSS use the hash algorithm required by DSS.

commit ba6aaff19cc6f3ebbe7fedcb7ccf3f4f192eba94
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Feb 9 23:09:39 2011 +0100

    Modernized the test applications that now use the 
gnutls_priority_set_direct().

commit 2f2736d2030c44042d4df2d0cdad5f74f611c6e9
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Feb 9 21:44:58 2011 +0100

    corrected bug in reading signature algorithms for including in the 
signature algo extension.

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

Summary of changes:
 lib/ext_signature.c  |    9 ++-----
 lib/ext_signature.h  |    4 +--
 lib/gnutls_pk.c      |    4 +-
 lib/gnutls_sig.c     |   55 +++++++++++++++++++++++++++++++++++++++++--------
 tests/anonself.c     |    8 +-----
 tests/dhepskself.c   |    8 +++---
 tests/mini-eagain.c  |    7 +----
 tests/mini.c         |    7 +----
 tests/openpgp-auth.c |   40 ++++-------------------------------
 tests/pskself.c      |    8 +-----
 tests/resume.c       |    8 +-----
 11 files changed, 71 insertions(+), 87 deletions(-)

diff --git a/lib/ext_signature.c b/lib/ext_signature.c
index af6328b..4b5f4e2 100644
--- a/lib/ext_signature.c
+++ b/lib/ext_signature.c
@@ -87,7 +87,7 @@ _gnutls_sign_algorithm_write_params (gnutls_session_t 
session, opaque * data,
 
   p += 2;
 
-  for (i = j = 0; i < session->internals.priorities.sign_algo.algorithms; i += 
2, j++)
+  for (i = j = 0; j < session->internals.priorities.sign_algo.algorithms; i += 
2, j++)
     {
       aid =
         _gnutls_sign_to_tls_aid (session->internals.priorities.
@@ -243,8 +243,7 @@ _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)
 {
   unsigned i;
   int ret;
@@ -262,15 +261,13 @@ _gnutls_session_get_sign_algo (gnutls_session_t session,
       || priv->sign_algorithms_size == 0)
     /* none set, allow all */
     {
-      *hash = GNUTLS_DIG_SHA1;
-      return _gnutls_x509_pk_to_sign (pk, *hash);
+      return _gnutls_x509_pk_to_sign (pk, GNUTLS_DIG_SHA1);
     }
 
   for (i = 0; i < priv->sign_algorithms_size; i++)
     {
       if (_gnutls_sign_get_pk_algorithm (priv->sign_algorithms[i]) == pk)
         {
-          *hash = _gnutls_sign_get_hash_algorithm (priv->sign_algorithms[i]);
           return priv->sign_algorithms[i];
         }
     }
diff --git a/lib/ext_signature.h b/lib/ext_signature.h
index 9d507ed..b56c772 100644
--- a/lib/ext_signature.h
+++ b/lib/ext_signature.h
@@ -37,9 +37,7 @@ int _gnutls_session_sign_algo_requested (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);
+                                                       pk);
 int _gnutls_sign_algorithm_parse_data (gnutls_session_t session,
                                        const opaque * data, size_t data_size);
 int _gnutls_sign_algorithm_write_params (gnutls_session_t session,
diff --git a/lib/gnutls_pk.c b/lib/gnutls_pk.c
index 90e9daf..337204b 100644
--- a/lib/gnutls_pk.c
+++ b/lib/gnutls_pk.c
@@ -501,8 +501,8 @@ _gnutls_dsa_verify (const gnutls_datum_t * vdata,
     pk_params.params[i] = params[i];
   pk_params.params_nr = params_len;
 
-  if (vdata->size > 20)
-    {                           /* SHA1 or better only */
+  if (vdata->size < 20)
+    { /* SHA1 or better only */
       gnutls_assert ();
       return GNUTLS_E_PK_SIG_VERIFY_FAILED;
     }
diff --git a/lib/gnutls_sig.c b/lib/gnutls_sig.c
index a23bd7f..5a379a6 100644
--- a/lib/gnutls_sig.c
+++ b/lib/gnutls_sig.c
@@ -121,7 +121,40 @@ _gnutls_rsa_encode_sig (gnutls_mac_algorithm_t algo,
   return 0;
 }
 
+static int 
+get_hash_algo(gnutls_session_t session, gnutls_cert* cert, 
+  gnutls_sign_algorithm_t sign_algo,
+  gnutls_digest_algorithm_t *hash_algo)
+{
+int ret;
+gnutls_protocol_t ver = gnutls_protocol_get_version (session);
 
+  if (cert->subject_pk_algorithm == GNUTLS_PK_DSA)
+    { /* override */
+      *hash_algo = _gnutls_dsa_q_to_hash (cert->params[1]);
+
+      if (!_gnutls_version_has_selectable_sighash (ver) && *hash_algo != 
GNUTLS_DIG_SHA1)
+        {
+          /* In TLS < 1.2 one cannot use anything but SHA1
+           */
+          gnutls_assert();
+          return GNUTLS_E_INVALID_REQUEST;
+        }
+      
+      ret = _gnutls_session_sign_algo_requested(session, 
_gnutls_x509_pk_to_sign (GNUTLS_PK_DSA, *hash_algo));
+      if (ret < 0)
+        return gnutls_assert_val(ret);
+    }
+  else
+    {
+      if (sign_algo == GNUTLS_SIGN_UNKNOWN)
+        *hash_algo = GNUTLS_DIG_SHA1;
+      else
+        *hash_algo = _gnutls_sign_get_hash_algorithm (sign_algo);
+    }
+
+  return 0;
+}
 
 /* Generates a signature of all the random data and the parameters.
  * Used in DHE_* ciphersuites.
@@ -140,14 +173,17 @@ _gnutls_handshake_sign_data (gnutls_session_t session, 
gnutls_cert * cert,
   gnutls_digest_algorithm_t hash_algo;
 
   *sign_algo =
-    _gnutls_session_get_sign_algo (session, cert->subject_pk_algorithm,
-                                   &hash_algo);
+    _gnutls_session_get_sign_algo (session, cert->subject_pk_algorithm);
   if (*sign_algo == GNUTLS_SIGN_UNKNOWN)
     {
       gnutls_assert ();
       return GNUTLS_E_UNKNOWN_PK_ALGORITHM;
     }
 
+  ret = get_hash_algo(session, cert, *sign_algo, &hash_algo);
+  if (ret < 0)
+    return gnutls_assert_val(ret);
+
   ret = _gnutls_hash_init (&td_sha, hash_algo);
   if (ret < 0)
     {
@@ -164,7 +200,7 @@ _gnutls_handshake_sign_data (gnutls_session_t session, 
gnutls_cert * cert,
   switch (cert->subject_pk_algorithm)
     {
     case GNUTLS_PK_RSA:
-      if (!_gnutls_version_has_selectable_prf (ver))
+      if (!_gnutls_version_has_selectable_sighash (ver))
         {
           digest_hd_st td_md5;
 
@@ -392,7 +428,7 @@ _gnutls_handshake_verify_data (gnutls_session_t session, 
gnutls_cert * cert,
   digest_hd_st td_sha;
   opaque concat[MAX_SIG_SIZE];
   gnutls_protocol_t ver = gnutls_protocol_get_version (session);
-  gnutls_digest_algorithm_t hash_algo = GNUTLS_DIG_SHA1;
+  gnutls_digest_algorithm_t hash_algo;
 
   ret = _gnutls_session_sign_algo_enabled (session, algo);
   if (ret < 0)
@@ -401,7 +437,7 @@ _gnutls_handshake_verify_data (gnutls_session_t session, 
gnutls_cert * cert,
       return ret;
     }
 
-  if (!_gnutls_version_has_selectable_prf (ver))
+  if (!_gnutls_version_has_selectable_sighash (ver))
     {
       ret = _gnutls_hash_init (&td_md5, GNUTLS_MAC_MD5);
       if (ret < 0)
@@ -417,14 +453,15 @@ _gnutls_handshake_verify_data (gnutls_session_t session, 
gnutls_cert * cert,
       _gnutls_hash (&td_md5, params->data, params->size);
     }
 
-  if (algo != GNUTLS_SIGN_UNKNOWN)
-    hash_algo = _gnutls_sign_get_hash_algorithm (algo);
+  ret = get_hash_algo(session, cert, algo, &hash_algo);
+  if (ret < 0)
+    return gnutls_assert_val(ret);
 
   ret = _gnutls_hash_init (&td_sha, hash_algo);
   if (ret < 0)
     {
       gnutls_assert ();
-      if (!_gnutls_version_has_selectable_prf (ver))
+      if (!_gnutls_version_has_selectable_sighash (ver))
         _gnutls_hash_deinit (&td_md5, NULL);
       return ret;
     }
@@ -435,7 +472,7 @@ _gnutls_handshake_verify_data (gnutls_session_t session, 
gnutls_cert * cert,
                 GNUTLS_RANDOM_SIZE);
   _gnutls_hash (&td_sha, params->data, params->size);
 
-  if (!_gnutls_version_has_selectable_prf (ver))
+  if (!_gnutls_version_has_selectable_sighash (ver))
     {
       _gnutls_hash_deinit (&td_md5, concat);
       _gnutls_hash_deinit (&td_sha, &concat[16]);
diff --git a/tests/anonself.c b/tests/anonself.c
index f110e18..134b88b 100644
--- a/tests/anonself.c
+++ b/tests/anonself.c
@@ -62,7 +62,6 @@ client (void)
   char buffer[MAX_BUF + 1];
   gnutls_anon_client_credentials_t anoncred;
   /* Need to enable anonymous KX specifically. */
-  const int kx_prio[] = { GNUTLS_KX_ANON_DH, 0 };
 
   gnutls_global_init ();
 
@@ -77,8 +76,7 @@ client (void)
   gnutls_init (&session, GNUTLS_CLIENT);
 
   /* Use default priorities */
-  gnutls_set_default_priority (session);
-  gnutls_kx_set_priority (session, kx_prio);
+  gnutls_priority_set_direct (session, 
"NONE:+VERS-TLS-ALL:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-DH", NULL);
 
   /* put the anonymous credentials to the current session
    */
@@ -164,15 +162,13 @@ static gnutls_session_t
 initialize_tls_session (void)
 {
   gnutls_session_t session;
-  const int kx_prio[] = { GNUTLS_KX_ANON_DH, 0 };
 
   gnutls_init (&session, GNUTLS_SERVER);
 
   /* avoid calling all the priority functions, since the defaults
    * are adequate.
    */
-  gnutls_set_default_priority (session);
-  gnutls_kx_set_priority (session, kx_prio);
+  gnutls_priority_set_direct (session, 
"NONE:+VERS-TLS-ALL:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-DH", NULL);
 
   gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
 
diff --git a/tests/dhepskself.c b/tests/dhepskself.c
index 00bf679..9319624 100644
--- a/tests/dhepskself.c
+++ b/tests/dhepskself.c
@@ -66,8 +66,8 @@ client (void)
   gnutls_global_init ();
 
   gnutls_global_set_log_function (tls_log_func);
-//  if (debug)
-//    gnutls_global_set_log_level (99);
+  if (debug)
+    gnutls_global_set_log_level (5);
 
   gnutls_psk_allocate_client_credentials (&pskcred);
   gnutls_psk_set_client_credentials (pskcred, "test", &key,
@@ -78,7 +78,7 @@ client (void)
   gnutls_init (&session, GNUTLS_CLIENT);
 
   /* Use default priorities */
-  gnutls_set_default_priority (session);
+  gnutls_priority_set_direct (session, "NORMAL:+DHE-PSK", NULL);
 
   /* put the anonymous credentials to the current session
    */
@@ -162,7 +162,7 @@ initialize_tls_session (void)
   /* avoid calling all the priority functions, since the defaults
    * are adequate.
    */
-  gnutls_set_default_priority (session);
+  gnutls_priority_set_direct(session, "NORMAL:+DHE-PSK", NULL);
 
   gnutls_credentials_set (session, GNUTLS_CRD_PSK, server_pskcred);
 
diff --git a/tests/mini-eagain.c b/tests/mini-eagain.c
index 92c912a..9bb7e2c 100644
--- a/tests/mini-eagain.c
+++ b/tests/mini-eagain.c
@@ -161,7 +161,6 @@ doit (void)
   gnutls_session_t client;
   int cret = GNUTLS_E_AGAIN;
   /* Need to enable anonymous KX specifically. */
-  const int kx_prio[] = { GNUTLS_KX_ANON_DH, 0 };
   char buffer[MAX_BUF + 1];
   ssize_t ns;
   int ret, transferred = 0, msglen;
@@ -178,8 +177,7 @@ doit (void)
   gnutls_dh_params_import_pkcs3 (dh_params, &p3, GNUTLS_X509_FMT_PEM);
   gnutls_anon_set_server_dh_params (s_anoncred, dh_params);
   gnutls_init (&server, GNUTLS_SERVER);
-  gnutls_set_default_priority (server);
-  gnutls_kx_set_priority (server, kx_prio);
+  gnutls_priority_set_direct (server, 
"NONE:+VERS-TLS-ALL:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-DH", NULL);
   gnutls_credentials_set (server, GNUTLS_CRD_ANON, s_anoncred);
   gnutls_dh_set_prime_bits (server, 1024);
   gnutls_transport_set_push_function (server, server_push);
@@ -188,8 +186,7 @@ doit (void)
   /* Init client */
   gnutls_anon_allocate_client_credentials (&c_anoncred);
   gnutls_init (&client, GNUTLS_CLIENT);
-  gnutls_set_default_priority (client);
-  gnutls_kx_set_priority (client, kx_prio);
+  gnutls_priority_set_direct (client, 
"NONE:+VERS-TLS-ALL:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-DH", NULL);
   gnutls_credentials_set (client, GNUTLS_CRD_ANON, c_anoncred);
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
diff --git a/tests/mini.c b/tests/mini.c
index 30678ec..21f7687 100644
--- a/tests/mini.c
+++ b/tests/mini.c
@@ -153,7 +153,6 @@ doit (void)
   gnutls_session_t client;
   int n, cret = GNUTLS_E_AGAIN;
   /* Need to enable anonymous KX specifically. */
-  const int kx_prio[] = { GNUTLS_KX_ANON_DH, 0 };
   char buffer[MAX_BUF + 1];
   ssize_t ns;
   int ret;
@@ -170,8 +169,7 @@ doit (void)
   gnutls_dh_params_import_pkcs3 (dh_params, &p3, GNUTLS_X509_FMT_PEM);
   gnutls_anon_set_server_dh_params (s_anoncred, dh_params);
   gnutls_init (&server, GNUTLS_SERVER);
-  gnutls_set_default_priority (server);
-  gnutls_kx_set_priority (server, kx_prio);
+  gnutls_priority_set_direct (server, 
"NONE:+VERS-TLS-ALL:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-DH", NULL);
   gnutls_credentials_set (server, GNUTLS_CRD_ANON, s_anoncred);
   gnutls_dh_set_prime_bits (server, 1024);
   gnutls_transport_set_push_function (server, server_push);
@@ -180,8 +178,7 @@ doit (void)
   /* Init client */
   gnutls_anon_allocate_client_credentials (&c_anoncred);
   gnutls_init (&client, GNUTLS_CLIENT);
-  gnutls_set_default_priority (client);
-  gnutls_kx_set_priority (client, kx_prio);
+  gnutls_priority_set_direct (client, 
"NONE:+VERS-TLS-ALL:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-DH", NULL);
   gnutls_credentials_set (client, GNUTLS_CRD_ANON, c_anoncred);
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
diff --git a/tests/openpgp-auth.c b/tests/openpgp-auth.c
index 77a1bfd..2622f77 100644
--- a/tests/openpgp-auth.c
+++ b/tests/openpgp-auth.c
@@ -50,26 +50,6 @@ static const char *key_id = NULL
 
 static const char rsa_params_file[] = "../guile/tests/rsa-parameters.pem";
 
-static const int protocols[] = { GNUTLS_TLS1_0, 0 };
-static const int cert_types[] = { GNUTLS_CRT_OPENPGP, 0 };
-
-static const int ciphers[] = {
-  GNUTLS_CIPHER_NULL, GNUTLS_CIPHER_ARCFOUR,
-  GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_AES_256_CBC,
-  0
-};
-
-static const int kx[] = {
-  GNUTLS_KX_RSA, GNUTLS_KX_RSA_EXPORT,
-  GNUTLS_KX_DHE_RSA, GNUTLS_KX_DHE_DSS,
-  0
-};
-
-static const int macs[] = {
-  GNUTLS_MAC_SHA1, GNUTLS_MAC_RMD160, GNUTLS_MAC_MD5,
-  0
-};
-
 static void
 log_message (int level, const char *message)
 {
@@ -133,7 +113,7 @@ doit ()
       if (err != 0)
         fail ("client session %d\n", err);
 
-      gnutls_set_default_priority (session);
+      gnutls_priority_set_direct (session, 
"NORMAL:+CTYPE-OPENPGP:-CTYPE-X.509", NULL);
       gnutls_transport_set_ptr (session,
                                 (gnutls_transport_ptr_t) (intptr_t)
                                 sockets[0]);
@@ -154,16 +134,11 @@ doit ()
       if (err != 0)
         fail ("client credential_set %d\n", err);
 
-      gnutls_protocol_set_priority (session, protocols);
-      gnutls_certificate_type_set_priority (session, cert_types);
-      gnutls_cipher_set_priority (session, ciphers);
-      gnutls_kx_set_priority (session, kx);
-      gnutls_mac_set_priority (session, macs);
       gnutls_dh_set_prime_bits (session, 1024);
 
       err = gnutls_handshake (session);
       if (err != 0)
-        fail ("client handshake %d\n", err);
+        fail ("client handshake %s (%d) \n", gnutls_strerror(err), err);
       else if (debug)
         printf ("client handshake successful\n");
 
@@ -201,7 +176,7 @@ doit ()
       if (err != 0)
         fail ("server session %d\n", err);
 
-      gnutls_set_default_priority (session);
+      gnutls_priority_set_direct (session, 
"NORMAL:+CTYPE-OPENPGP:-CTYPE-X.509", NULL);
       gnutls_transport_set_ptr (session,
                                 (gnutls_transport_ptr_t) (intptr_t)
                                 sockets[1]);
@@ -250,16 +225,11 @@ doit ()
       if (err != 0)
         fail ("server credential_set %d\n", err);
 
-      gnutls_protocol_set_priority (session, protocols);
-      gnutls_certificate_type_set_priority (session, cert_types);
-      gnutls_cipher_set_priority (session, ciphers);
-      gnutls_kx_set_priority (session, kx);
-      gnutls_mac_set_priority (session, macs);
       gnutls_certificate_server_set_request (session, GNUTLS_CERT_REQUIRE);
 
       err = gnutls_handshake (session);
       if (err != 0)
-        fail ("server handshake %d\n", err);
+        fail ("server handshake %s (%d) \n", gnutls_strerror(err), err);
 
       received = gnutls_record_recv (session, greetings, sizeof (greetings));
       if (received != sizeof (message)
@@ -269,7 +239,7 @@ doit ()
 
       err = gnutls_bye (session, GNUTLS_SHUT_RDWR);
       if (err != 0)
-        fail ("server bye %d\n", err);
+        fail ("server bye %s (%d) \n", gnutls_strerror(err), err);
 
       if (debug)
         printf ("server done\n");
diff --git a/tests/pskself.c b/tests/pskself.c
index 36377c2..09001ff 100644
--- a/tests/pskself.c
+++ b/tests/pskself.c
@@ -55,7 +55,6 @@ client (void)
   char buffer[MAX_BUF + 1];
   gnutls_psk_client_credentials_t pskcred;
   /* Need to enable anonymous KX specifically. */
-  const int kx_prio[] = { GNUTLS_KX_PSK, 0 };
   const gnutls_datum_t key = { (char *) "DEADBEEF", 8 };
 
   gnutls_global_init ();
@@ -69,8 +68,7 @@ client (void)
   gnutls_init (&session, GNUTLS_CLIENT);
 
   /* Use default priorities */
-  gnutls_set_default_priority (session);
-  gnutls_kx_set_priority (session, kx_prio);
+  gnutls_priority_set_direct (session, "NORMAL:+PSK", NULL);
 
   /* put the anonymous credentials to the current session
    */
@@ -150,15 +148,13 @@ static gnutls_session_t
 initialize_tls_session (void)
 {
   gnutls_session_t session;
-  const int kx_prio[] = { GNUTLS_KX_PSK, 0 };
 
   gnutls_init (&session, GNUTLS_SERVER);
 
   /* avoid calling all the priority functions, since the defaults
    * are adequate.
    */
-  gnutls_set_default_priority (session);
-  gnutls_kx_set_priority (session, kx_prio);
+  gnutls_priority_set_direct (session, "NORMAL:+PSK", NULL);
 
   gnutls_credentials_set (session, GNUTLS_CRD_PSK, server_pskcred);
 
diff --git a/tests/resume.c b/tests/resume.c
index 835d432..f016c9a 100644
--- a/tests/resume.c
+++ b/tests/resume.c
@@ -91,7 +91,6 @@ client (struct params_res *params)
   char buffer[MAX_BUF + 1];
   gnutls_anon_client_credentials_t anoncred;
   /* Need to enable anonymous KX specifically. */
-  const int kx_prio[] = { GNUTLS_KX_ANON_DH, 0 };
 
   /* variables used in session resuming
    */
@@ -118,8 +117,7 @@ client (struct params_res *params)
       gnutls_init (&session, GNUTLS_CLIENT);
 
       /* Use default priorities */
-      gnutls_set_default_priority (session);
-      gnutls_kx_set_priority (session, kx_prio);
+  gnutls_priority_set_direct (session, 
"NONE:+VERS-TLS-ALL:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-DH", NULL);
 
       /* put the anonymous credentials to the current session
        */
@@ -243,15 +241,13 @@ static gnutls_session_t
 initialize_tls_session (struct params_res *params)
 {
   gnutls_session_t session;
-  const int kx_prio[] = { GNUTLS_KX_ANON_DH, 0 };
 
   gnutls_init (&session, GNUTLS_SERVER);
 
   /* avoid calling all the priority functions, since the defaults
    * are adequate.
    */
-  gnutls_set_default_priority (session);
-  gnutls_kx_set_priority (session, kx_prio);
+  gnutls_priority_set_direct (session, 
"NONE:+VERS-TLS-ALL:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-DH", NULL);
 
   gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
 


hooks/post-receive
-- 
GNU gnutls



reply via email to

[Prev in Thread] Current Thread [Next in Thread]