fixed some memory leaks

removed includes dir

1 files changed, 31 insertions, 23 deletions

diff --git a/src/testcurl/https/mhds_session_info_test.c b/src/testcurl/https/mhds_session_info_test.c
index 43315c0f..3b869913 100644
--- a/src/testcurl/https/mhds_session_info_test.c
+++ b/src/testcurl/https/mhds_session_info_test.c
@@ -75,54 +75,61 @@ query_session_ahc (void *cls, struct MHD_Connection *connection,
   int ret;
 
   /* assert actual connection cipher is the one negotiated */
-  if (MHD_get_session_info (connection,MHS_INFO_CIPHER_ALGO).cipher_algorithm != GNUTLS_CIPHER_AES_256_CBC)
+  if (MHD_get_tls_session_info (connection, MHS_INFO_CIPHER_ALGO).
+      cipher_algorithm != GNUTLS_CIPHER_AES_256_CBC)
     {
       fprintf (stderr, "Error: requested cipher mismatch. %s\n",
                strerror (errno));
       return -1;
     }
 
-  if (MHD_get_session_info (connection,MHD_INFO_KX_ALGO).kx_algorithm != GNUTLS_KX_RSA)
-      {
-        fprintf (stderr, "Error: requested key exchange mismatch. %s\n",
-                 strerror (errno));
-        return -1;
-      }
+  if (MHD_get_tls_session_info (connection, MHD_INFO_KX_ALGO).kx_algorithm !=
+      GNUTLS_KX_RSA)
+    {
+      fprintf (stderr, "Error: requested key exchange mismatch. %s\n",
+               strerror (errno));
+      return -1;
+    }
 
-  if (MHD_get_session_info (connection,MHD_INFO_MAC_ALGO).mac_algorithm != GNUTLS_MAC_SHA1)
+  if (MHD_get_tls_session_info (connection, MHD_INFO_MAC_ALGO).
+      mac_algorithm != GNUTLS_MAC_SHA1)
     {
       fprintf (stderr, "Error: requested mac algorithm mismatch. %s\n",
                strerror (errno));
       return -1;
     }
 
-  if (MHD_get_session_info (connection,MHD_INFO_COMPRESSION_METHOD).compression_method != GNUTLS_COMP_NULL)
+  if (MHD_get_tls_session_info (connection, MHD_INFO_COMPRESSION_METHOD).
+      compression_method != GNUTLS_COMP_NULL)
     {
       fprintf (stderr, "Error: requested compression mismatch. %s\n",
                strerror (errno));
       return -1;
     }
 
-  if (MHD_get_session_info (connection,MHD_INFO_PROTOCOL).protocol != GNUTLS_SSL3)
-      {
-        fprintf (stderr, "Error: requested compression mismatch. %s\n",
-                 strerror (errno));
-        return -1;
-      }
+  if (MHD_get_tls_session_info (connection, MHD_INFO_PROTOCOL).protocol !=
+      GNUTLS_SSL3)
+    {
+      fprintf (stderr, "Error: requested compression mismatch. %s\n",
+               strerror (errno));
+      return -1;
+    }
 
-  if (MHD_get_session_info (connection,MHD_INFO_CERT_TYPE).certificate_type != GNUTLS_CRT_X509)
+  if (MHD_get_tls_session_info (connection, MHD_INFO_CERT_TYPE).
+      certificate_type != GNUTLS_CRT_X509)
     {
       fprintf (stderr, "Error: requested certificate mismatch. %s\n",
                strerror (errno));
       return -1;
     }
 
-  if (MHD_get_session_info (connection,MHD_INFO_CREDENTIALS_TYPE).credentials_type != GNUTLS_CRD_CERTIFICATE)
-      {
-        fprintf (stderr, "Error: requested certificate mismatch. %s\n",
-                 strerror (errno));
-        return -1;
-      }
+  if (MHD_get_tls_session_info (connection, MHD_INFO_CREDENTIALS_TYPE).
+      credentials_type != GNUTLS_CRD_CERTIFICATE)
+    {
+      fprintf (stderr, "Error: requested certificate mismatch. %s\n",
+               strerror (errno));
+      return -1;
+    }
 
   response = MHD_create_response_from_data (strlen (EMPTY_PAGE),
                                             (void *) EMPTY_PAGE,
@@ -154,7 +161,8 @@ test_query_session ()
                         MHD_USE_DEBUG, 42433,
                         NULL, NULL, &query_session_ahc, NULL,
                         MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
-                        MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, MHD_OPTION_END);
+                        MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
+                        MHD_OPTION_END);
 
   if (d == NULL)
     return 2;