migrated code to connection_https

fixed gcrypt lib initialization to support mt
removed some gnutls psk code
added CIPHER_ALGORITHM & KX_PRIORITY options
added certificate loading test
added TLS GET test

1 files changed, 3 insertions, 45 deletions

diff --git a/src/daemon/https/tls/auth_dh_common.c b/src/daemon/https/tls/auth_dh_common.c
index f1b82bf9..f6354cb6 100644
--- a/src/daemon/https/tls/auth_dh_common.c
+++ b/src/daemon/https/tls/auth_dh_common.c
@@ -23,7 +23,7 @@
  */
 
 /* This file contains common stuff in Ephemeral Diffie Hellman (DHE) and
- * Anonymous DH key exchange(DHA). These are used in the handshake procedure 
+ * Anonymous DH key exchange(DHA). These are used in the handshake procedure
  * of the certificate and anoymous authentication.
  */
 
@@ -86,29 +86,7 @@ _gnutls_proc_dh_common_client_kx (gnutls_session_t session,
   _gnutls_mpi_release (&session->key->client_Y);
   _gnutls_mpi_release (&session->key->dh_secret);
 
-
-  if (_gnutls_cipher_suite_get_kx_algo
-      (&session->security_parameters.current_cipher_suite)
-      != GNUTLS_KX_DHE_PSK)
-    {
-      ret = _gnutls_mpi_dprint (&session->key->key, session->key->KEY);
-    }
-  /* In DHE_PSK the key is set differently 
-  else                          
-    {
-      gnutls_datum_t tmp_dh_key;
-      ret = _gnutls_mpi_dprint (&tmp_dh_key, session->key->KEY);
-      if (ret < 0)
-        {
-          gnutls_assert ();
-          return ret;
-        }
-
-      ret = _gnutls_set_psk_session_key (session, &tmp_dh_key);
-      _gnutls_free_datum (&tmp_dh_key);
-
-    }
-    */
+  ret = _gnutls_mpi_dprint (&session->key->key, session->key->KEY);
 
   _gnutls_mpi_release (&session->key->KEY);
 
@@ -170,27 +148,7 @@ _gnutls_gen_dh_common_client_kx (gnutls_session_t session, opaque ** data)
   _gnutls_mpi_release (&session->key->client_p);
   _gnutls_mpi_release (&session->key->client_g);
 
-  if (_gnutls_cipher_suite_get_kx_algo
-      (&session->security_parameters.current_cipher_suite)
-      != GNUTLS_KX_DHE_PSK)
-    {
-      ret = _gnutls_mpi_dprint (&session->key->key, session->key->KEY);
-    }
-  /* In DHE_PSK the key is set differently 
-  else                         
-    {
-      gnutls_datum_t tmp_dh_key;
-      ret = _gnutls_mpi_dprint (&tmp_dh_key, session->key->KEY);
-      if (ret < 0)
-        {
-          gnutls_assert ();
-          goto error;
-        }
-
-      ret = _gnutls_set_psk_session_key (session, &tmp_dh_key);
-      _gnutls_free_datum (&tmp_dh_key);
-
-    }*/
+  ret = _gnutls_mpi_dprint (&session->key->key, session->key->KEY);
 
   _gnutls_mpi_release (&session->key->KEY);