testcurl/https: removed enforcement of TLS version and cipher

11 files changed, 50 insertions, 139 deletions

diff --git a/src/testcurl/https/test_empty_response.c b/src/testcurl/https/test_empty_response.c
index de28211e..daa1328a 100644
--- a/src/testcurl/https/test_empty_response.c
+++ b/src/testcurl/https/test_empty_response.c
@@ -78,7 +78,6 @@ testInternalSelectGet ()
   time_t start;
   struct timeval tv;
   int port;
-  char *aes256_sha = "AES256-SHA";
 
   if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT))
     port = 0;
@@ -108,10 +107,6 @@ testInternalSelectGet ()
     }
     port = (int) dinfo->port;
   }
-  if (curl_tls_is_nss ())
-  {
-    aes256_sha = "rsa_aes_256_sha";
-  }
 
   c = curl_easy_init ();
   curl_easy_setopt (c, CURLOPT_URL, "https://127.0.0.1/hello_world");
@@ -119,8 +114,6 @@ testInternalSelectGet ()
   curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, &copyBuffer);
   curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc);
   /* TLS options */
-  curl_easy_setopt (c, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1);
-  curl_easy_setopt (c, CURLOPT_SSL_CIPHER_LIST, aes256_sha);
   curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER, 0L);
   curl_easy_setopt (c, CURLOPT_SSL_VERIFYHOST, 0L);
   curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L);
diff --git a/src/testcurl/https/test_https_get.c b/src/testcurl/https/test_https_get.c
index 0c368908..a8371f10 100644
--- a/src/testcurl/https/test_https_get.c
+++ b/src/testcurl/https/test_https_get.c
@@ -43,9 +43,7 @@ static int global_port;
 
 /* perform a HTTP GET request via SSL/TLS */
 static int
-test_secure_get (FILE *test_fd,
-                 const char *cipher_suite,
-                 int proto_version)
+test_secure_get (FILE *test_fd)
 {
   int ret;
   struct MHD_Daemon *d;
@@ -82,9 +80,7 @@ test_secure_get (FILE *test_fd,
   }
 
   ret = test_https_transfer (test_fd,
-                             port,
-                             cipher_suite,
-                             proto_version);
+                             port);
 
   MHD_stop_daemon (d);
   return ret;
@@ -235,7 +231,6 @@ int
 main (int argc, char *const *argv)
 {
   unsigned int errorCount = 0;
-  const char *aes256_sha_tlsv1   = "AES256-SHA";
   (void) argc; (void) argv;   /* Unused. Silent compiler warning. */
 
 #ifdef MHD_HTTPS_REQUIRE_GCRYPT
@@ -253,12 +248,8 @@ main (int argc, char *const *argv)
     return 77;
   }
 
-  if (curl_tls_is_nss ())
-  {
-    aes256_sha_tlsv1 = "rsa_aes_256_sha";
-  }
   errorCount +=
-    test_secure_get (NULL, aes256_sha_tlsv1, CURL_SSLVERSION_TLSv1);
+    test_secure_get (NULL);
   errorCount += testEmptyGet (0);
   curl_global_cleanup ();
 
diff --git a/src/testcurl/https/test_https_get_iovec.c b/src/testcurl/https/test_https_get_iovec.c
index 3682bab8..bd861b5f 100644
--- a/src/testcurl/https/test_https_get_iovec.c
+++ b/src/testcurl/https/test_https_get_iovec.c
@@ -143,9 +143,7 @@ iovec_ahc (void *cls,
 
 static int
 test_iovec_transfer (void *cls,
-                     int port,
-                     const char *cipher_suite,
-                     int proto_version)
+                     int port)
 {
   int len;
   int ret = 0;
@@ -171,7 +169,7 @@ test_iovec_transfer (void *cls,
   }
 
   if (CURLE_OK !=
-      send_curl_req (url, &cbc, cipher_suite, proto_version))
+      send_curl_req (url, &cbc))
   {
     ret = -1;
     goto cleanup;
@@ -192,9 +190,7 @@ cleanup:
 
 /* perform a HTTP GET request via SSL/TLS */
 static int
-test_secure_get (FILE *test_fd,
-                 const char *cipher_suite,
-                 int proto_version)
+test_secure_get (FILE *test_fd)
 {
   int ret;
   struct MHD_Daemon *d;
@@ -231,9 +227,7 @@ test_secure_get (FILE *test_fd,
   }
 
   ret = test_iovec_transfer (test_fd,
-                             port,
-                             cipher_suite,
-                             proto_version);
+                             port);
 
   MHD_stop_daemon (d);
   return ret;
@@ -390,7 +384,6 @@ int
 main (int argc, char *const *argv)
 {
   unsigned int errorCount = 0;
-  const char *aes256_sha_tlsv1   = "AES256-SHA";
   (void) argc; (void) argv;   /* Unused. Silent compiler warning. */
 
 #ifdef MHD_HTTPS_REQUIRE_GCRYPT
@@ -408,12 +401,8 @@ main (int argc, char *const *argv)
     return 77;
   }
 
-  if (curl_tls_is_nss ())
-  {
-    aes256_sha_tlsv1 = "rsa_aes_256_sha";
-  }
   errorCount +=
-    test_secure_get (NULL, aes256_sha_tlsv1, CURL_SSLVERSION_TLSv1);
+    test_secure_get (NULL);
   errorCount += testEmptyGet (0);
   curl_global_cleanup ();
 
diff --git a/src/testcurl/https/test_https_get_parallel.c b/src/testcurl/https/test_https_get_parallel.c
index f44dcf33..95a06319 100644
--- a/src/testcurl/https/test_https_get_parallel.c
+++ b/src/testcurl/https/test_https_get_parallel.c
@@ -62,8 +62,7 @@ https_transfer_thread_adapter (void *args)
 
   /* time spread incoming requests */
   usleep ((useconds_t) 10.0 * ((double) rand ()) / ((double) RAND_MAX));
-  ret = test_https_transfer (NULL, cargs->port,
-                             cargs->cipher_suite, cargs->proto_version);
+  ret = test_https_transfer (NULL, cargs->port);
   if (ret == 0)
     return NULL;
   return &nonnull;
@@ -78,12 +77,11 @@ https_transfer_thread_adapter (void *args)
  * TODO : make client_count a parameter - number of curl client threads to spawn
  */
 static int
-test_single_client (void *cls, int port, const char *cipher_suite,
-                    int curl_proto_version)
+test_single_client (void *cls, int port)
 {
   void *client_thread_ret;
   struct https_test_data client_args =
-  { NULL, port, cipher_suite, curl_proto_version };
+  { NULL, port };
   (void) cls;    /* Unused. Silent compiler warning. */
 
   client_thread_ret = https_transfer_thread_adapter (&client_args);
@@ -101,15 +99,14 @@ test_single_client (void *cls, int port, const char *cipher_suite,
  * TODO : make client_count a parameter - number of curl client threads to spawn
  */
 static int
-test_parallel_clients (void *cls, int port, const char *cipher_suite,
-                       int curl_proto_version)
+test_parallel_clients (void *cls, int port)
 {
   int i;
   int client_count = (MHD_CPU_COUNT - 1);
   void *client_thread_ret;
   pthread_t client_arr[client_count];
   struct https_test_data client_args =
-  { NULL, port, cipher_suite, curl_proto_version };
+  { NULL, port };
   (void) cls;    /* Unused. Silent compiler warning. */
 
   for (i = 0; i < client_count; ++i)
@@ -138,7 +135,6 @@ int
 main (int argc, char *const *argv)
 {
   unsigned int errorCount = 0;
-  const char *aes256_sha = "AES256-SHA";
   int port;
   unsigned int iseed;
   (void) argc;   /* Unused. Silent compiler warning. */
@@ -159,8 +155,6 @@ main (int argc, char *const *argv)
     fprintf (stderr, "Curl does not support SSL.  Cannot run the test.\n");
     return 77;
   }
-  if (curl_tls_is_nss ())
-    aes256_sha = "rsa_aes_256_sha";
 #ifdef EPOLL_SUPPORT
   errorCount +=
     test_wrap ("single threaded daemon, single client, epoll",
@@ -168,7 +162,7 @@ main (int argc, char *const *argv)
                NULL, port,
                MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS
                | MHD_USE_ERROR_LOG | MHD_USE_EPOLL,
-               aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
+               MHD_OPTION_HTTPS_MEM_KEY,
                srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
                srv_self_signed_cert_pem, MHD_OPTION_END);
 #endif
@@ -177,7 +171,7 @@ main (int argc, char *const *argv)
                NULL, port,
                MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS
                | MHD_USE_ERROR_LOG,
-               aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
+               MHD_OPTION_HTTPS_MEM_KEY,
                srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
                srv_self_signed_cert_pem, MHD_OPTION_END);
 #ifdef EPOLL_SUPPORT
@@ -186,7 +180,7 @@ main (int argc, char *const *argv)
                &test_parallel_clients, NULL, port,
                MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS
                | MHD_USE_ERROR_LOG | MHD_USE_EPOLL,
-               aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
+               MHD_OPTION_HTTPS_MEM_KEY,
                srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
                srv_self_signed_cert_pem, MHD_OPTION_END);
 #endif
@@ -195,7 +189,7 @@ main (int argc, char *const *argv)
                &test_parallel_clients, NULL, port,
                MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS
                | MHD_USE_ERROR_LOG,
-               aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
+               MHD_OPTION_HTTPS_MEM_KEY,
                srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
                srv_self_signed_cert_pem, MHD_OPTION_END);
 
diff --git a/src/testcurl/https/test_https_get_parallel_threads.c b/src/testcurl/https/test_https_get_parallel_threads.c
index f963fc8b..cc1add12 100644
--- a/src/testcurl/https/test_https_get_parallel_threads.c
+++ b/src/testcurl/https/test_https_get_parallel_threads.c
@@ -63,8 +63,7 @@ https_transfer_thread_adapter (void *args)
 
   /* time spread incoming requests */
   usleep ((useconds_t) 10.0 * ((double) rand ()) / ((double) RAND_MAX));
-  ret = test_https_transfer (cargs->cls, cargs->port,
-                             cargs->cipher_suite, cargs->proto_version);
+  ret = test_https_transfer (cargs->cls, cargs->port);
   if (ret == 0)
     return NULL;
   return &nonnull;
@@ -79,12 +78,11 @@ https_transfer_thread_adapter (void *args)
  * TODO : make client_count a parameter - number of curl client threads to spawn
  */
 static int
-test_single_client (void *cls, int port, const char *cipher_suite,
-                    int curl_proto_version)
+test_single_client (void *cls, int port)
 {
   void *client_thread_ret;
   struct https_test_data client_args =
-  { NULL, port, cipher_suite, curl_proto_version };
+  { NULL, port};
   (void) cls;    /* Unused. Silent compiler warning. */
 
   client_thread_ret = https_transfer_thread_adapter (&client_args);
@@ -102,15 +100,14 @@ test_single_client (void *cls, int port, const char *cipher_suite,
  * TODO : make client_count a parameter - number of curl client threads to spawn
  */
 static int
-test_parallel_clients (void *cls, int port, const char *cipher_suite,
-                       int curl_proto_version)
+test_parallel_clients (void *cls, int port)
 {
   int i;
   int client_count = (MHD_CPU_COUNT - 1);
   void *client_thread_ret;
   pthread_t client_arr[client_count];
   struct https_test_data client_args =
-  { NULL, port, cipher_suite, curl_proto_version };
+  { NULL, port };
   (void) cls;    /* Unused. Silent compiler warning. */
 
   for (i = 0; i < client_count; ++i)
@@ -143,7 +140,6 @@ main (int argc, char *const *argv)
   const char *ssl_version;
   int port;
   unsigned int iseed;
-  char *aes256_sha = "AES256-SHA";
   (void) argc;   /* Unused. Silent compiler warning. */
 
   if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT))
@@ -176,17 +172,12 @@ main (int argc, char *const *argv)
     return 77;
   }
 
-  if (curl_tls_is_nss ())
-  {
-    aes256_sha = "rsa_aes_256_sha";
-  }
-
   errorCount +=
     test_wrap ("multi threaded daemon, single client", &test_single_client,
                NULL, port,
                MHD_USE_TLS | MHD_USE_ERROR_LOG | MHD_USE_THREAD_PER_CONNECTION
                | MHD_USE_INTERNAL_POLLING_THREAD,
-               aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
+               MHD_OPTION_HTTPS_MEM_KEY,
                srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
                srv_self_signed_cert_pem, MHD_OPTION_END);
 
@@ -195,7 +186,7 @@ main (int argc, char *const *argv)
                &test_parallel_clients, NULL, port,
                MHD_USE_TLS | MHD_USE_ERROR_LOG | MHD_USE_THREAD_PER_CONNECTION
                | MHD_USE_INTERNAL_POLLING_THREAD,
-               aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
+               MHD_OPTION_HTTPS_MEM_KEY,
                srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
                srv_self_signed_cert_pem, MHD_OPTION_END);
 
diff --git a/src/testcurl/https/test_https_get_select.c b/src/testcurl/https/test_https_get_select.c
index 0ec7763f..47094d8e 100644
--- a/src/testcurl/https/test_https_get_select.c
+++ b/src/testcurl/https/test_https_get_select.c
@@ -95,7 +95,6 @@ testExternalGet (int flags)
   struct CURLMsg *msg;
   time_t start;
   struct timeval tv;
-  const char *aes256_sha = "AES256-SHA";
   int port;
 
   if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT))
@@ -109,8 +108,8 @@ testExternalGet (int flags)
   cbc.pos = 0;
   d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_TLS | flags,
                         port, NULL, NULL, &ahc_echo, "GET",
-                        MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
-                        MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
+                        MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem,
+                        MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem,
                         MHD_OPTION_END);
   if (d == NULL)
     return 256;
@@ -125,17 +124,12 @@ testExternalGet (int flags)
     port = (int) dinfo->port;
   }
 
-  if (curl_tls_is_nss ())
-    aes256_sha = "rsa_aes_256_sha";
-
   c = curl_easy_init ();
   curl_easy_setopt (c, CURLOPT_URL, "https://127.0.0.1/hello_world");
   curl_easy_setopt (c, CURLOPT_PORT, (long) port);
   curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, &copyBuffer);
   curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc);
   /* TLS options */
-  curl_easy_setopt (c, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1);
-  curl_easy_setopt (c, CURLOPT_SSL_CIPHER_LIST, aes256_sha);
   curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER, 0L);
   curl_easy_setopt (c, CURLOPT_SSL_VERIFYHOST, 0L);
   curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L);
diff --git a/src/testcurl/https/test_https_multi_daemon.c b/src/testcurl/https/test_https_multi_daemon.c
index 26a09c2d..5172c1c9 100644
--- a/src/testcurl/https/test_https_multi_daemon.c
+++ b/src/testcurl/https/test_https_multi_daemon.c
@@ -42,9 +42,7 @@ extern const char srv_self_signed_cert_pem[];
  * doesn't affect the other
  */
 static int
-test_concurent_daemon_pair (void *cls,
-                            const char *cipher_suite,
-                            int proto_version)
+test_concurent_daemon_pair (void *cls)
 {
   int ret;
   struct MHD_Daemon *d1;
@@ -113,14 +111,13 @@ test_concurent_daemon_pair (void *cls,
   }
 
   ret =
-    test_daemon_get (NULL, cipher_suite, proto_version, port1, 0);
+    test_daemon_get (NULL, port1, 0);
   ret +=
-    test_daemon_get (NULL, cipher_suite, proto_version,
-                     port2, 0);
+    test_daemon_get (NULL, port2, 0);
 
   MHD_stop_daemon (d2);
   ret +=
-    test_daemon_get (NULL, cipher_suite, proto_version, port1, 0);
+    test_daemon_get (NULL, port1, 0);
   MHD_stop_daemon (d1);
   return ret;
 }
@@ -131,7 +128,6 @@ main (int argc, char *const *argv)
 {
   unsigned int errorCount = 0;
   FILE *cert;
-  const char *aes256_sha = "AES256-SHA";
   (void) argc; (void) argv;       /* Unused. Silent compiler warning. */
 
 #ifdef MHD_HTTPS_REQUIRE_GCRYPT
@@ -155,13 +151,8 @@ main (int argc, char *const *argv)
     return 99;
   }
 
-  if (curl_tls_is_nss ())
-  {
-    aes256_sha = "rsa_aes_256_sha";
-  }
-
   errorCount +=
-    test_concurent_daemon_pair (NULL, aes256_sha, CURL_SSLVERSION_TLSv1);
+    test_concurent_daemon_pair (NULL);
 
   print_test_result (errorCount, "concurent_daemon_pair");
 
diff --git a/src/testcurl/https/test_tls_authentication.c b/src/testcurl/https/test_tls_authentication.c
index e1aa0d22..aeefe44f 100644
--- a/src/testcurl/https/test_tls_authentication.c
+++ b/src/testcurl/https/test_tls_authentication.c
@@ -40,7 +40,7 @@ extern const char srv_signed_key_pem[];
 
 /* perform a HTTP GET request via SSL/TLS */
 static int
-test_secure_get (void *cls, char *cipher_suite, int proto_version)
+test_secure_get (void *cls)
 {
   int ret;
   struct MHD_Daemon *d;
@@ -76,7 +76,7 @@ test_secure_get (void *cls, char *cipher_suite, int proto_version)
     port = (int) dinfo->port;
   }
 
-  ret = test_daemon_get (NULL, cipher_suite, proto_version, port, 0);
+  ret = test_daemon_get (NULL, port, 0);
 
   MHD_stop_daemon (d);
   return ret;
@@ -87,7 +87,6 @@ int
 main (int argc, char *const *argv)
 {
   unsigned int errorCount = 0;
-  char *aes256_sha = "AES256-SHA";
   FILE *crt;
   (void) argc;
   (void) argv;       /* Unused. Silent compiler warning. */
@@ -114,13 +113,9 @@ main (int argc, char *const *argv)
     return 99;
   }
   fclose (crt);
-  if (curl_tls_is_nss ())
-  {
-    aes256_sha = "rsa_aes_256_sha";
-  }
 
   errorCount +=
-    test_secure_get (NULL, aes256_sha, CURL_SSLVERSION_TLSv1);
+    test_secure_get (NULL);
 
   print_test_result (errorCount, argv[0]);
 
diff --git a/src/testcurl/https/test_tls_extensions.c b/src/testcurl/https/test_tls_extensions.c
index 0ab75f1f..9f57783f 100644
--- a/src/testcurl/https/test_tls_extensions.c
+++ b/src/testcurl/https/test_tls_extensions.c
@@ -188,8 +188,7 @@ test_hello_extension (gnutls_session_t session, int port, extensions_t exten_t,
   gnutls_free (data);
 
   /* make sure daemon is still functioning */
-  if (CURLE_OK != send_curl_req (url, &cbc, "AES128-SHA",
-                                 MHD_GNUTLS_PROTOCOL_TLS1_2))
+  if (CURLE_OK != send_curl_req (url, &cbc))
   {
     ret = -1;
     goto cleanup;
diff --git a/src/testcurl/https/tls_test_common.c b/src/testcurl/https/tls_test_common.c
index 9cce3d94..7409596e 100644
--- a/src/testcurl/https/tls_test_common.c
+++ b/src/testcurl/https/tls_test_common.c
@@ -62,8 +62,6 @@ setup_ca_cert ()
  */
 int
 test_daemon_get (void *cls,
-                 const char *cipher_suite,
-                 int proto_version,
                  int port,
                  int ver_peer)
 {
@@ -112,14 +110,7 @@ test_daemon_get (void *cls,
   }
 
   /* TLS options */
-  if ((CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_SSLVERSION,
-                                          proto_version))) ||
-      (CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_SSL_CIPHER_LIST,
-                                          cipher_suite))) ||
-
-      /* perform peer authentication */
-      /* TODO merge into send_curl_req */
-      (CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER,
+  if ((CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER,
                                           ver_peer))) ||
       (CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_SSL_VERIFYHOST, 0L))))
   {
@@ -260,16 +251,12 @@ http_dummy_ahc (void *cls,
  * send a test http request to the daemon
  * @param url
  * @param cbc - may be null
- * @param cipher_suite
- * @param proto_version
  * @return
  */
 /* TODO have test wrap consider a NULL cbc */
 int
 send_curl_req (char *url,
-               struct CBC *cbc,
-               const char *cipher_suite,
-               int proto_version)
+               struct CBC *cbc)
 {
   CURL *c;
   CURLcode errornum;
@@ -307,13 +294,9 @@ send_curl_req (char *url,
   }
 
   /* TLS options */
-  if ((CURLE_OK  != (e = curl_easy_setopt (c, CURLOPT_SSLVERSION,
-                                           proto_version))) ||
-      (CURLE_OK  != (e = curl_easy_setopt (c, CURLOPT_SSL_CIPHER_LIST,
-                                           cipher_suite))) ||
-      /* currently skip any peer authentication */
-      (CURLE_OK  != (e = curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER, 0L))) ||
-      (CURLE_OK  != (e = curl_easy_setopt (c, CURLOPT_SSL_VERIFYHOST, 0L))))
+  if (/* currently skip any peer authentication */
+    (CURLE_OK  != (e = curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER, 0L))) ||
+    (CURLE_OK  != (e = curl_easy_setopt (c, CURLOPT_SSL_VERIFYHOST, 0L))))
   {
     fprintf (stderr, "HTTPS curl_easy_setopt failed: `%s'\n",
              curl_easy_strerror (e));
@@ -409,9 +392,7 @@ gen_test_file_url (char *url,
  */
 int
 test_https_transfer (void *cls,
-                     int port,
-                     const char *cipher_suite,
-                     int proto_version)
+                     int port)
 {
   int len;
   int ret = 0;
@@ -437,7 +418,7 @@ test_https_transfer (void *cls,
   }
 
   if (CURLE_OK !=
-      send_curl_req (url, &cbc, cipher_suite, proto_version))
+      send_curl_req (url, &cbc))
   {
     ret = -1;
     goto cleanup;
@@ -540,17 +521,16 @@ teardown_session (gnutls_session_t session,
 /* TODO test_wrap: change sig to (setup_func, test, va_list test_arg) */
 int
 test_wrap (const char *test_name, int
-           (*test_function)(void *cls, int port, const char *cipher_suite,
-                            int proto_version), void *cls,
+           (*test_function)(void *cls, int port), void *cls,
            int port,
-           int daemon_flags, const char *cipher_suite, int proto_version, ...)
+           int daemon_flags, ...)
 {
   int ret;
   va_list arg_list;
   struct MHD_Daemon *d;
   (void) cls;    /* Unused. Silent compiler warning. */
 
-  va_start (arg_list, proto_version);
+  va_start (arg_list, daemon_flags);
   port = setup_testcase (&d, port, daemon_flags, arg_list);
   if (0 == port)
   {
@@ -561,7 +541,7 @@ test_wrap (const char *test_name, int
 #if 0
   fprintf (stdout, "running test: %s ", test_name);
 #endif
-  ret = test_function (NULL, port, cipher_suite, proto_version);
+  ret = test_function (NULL, port);
 #if 0
   if (ret == 0)
   {
diff --git a/src/testcurl/https/tls_test_common.h b/src/testcurl/https/tls_test_common.h
index e3f552a8..80512f51 100644
--- a/src/testcurl/https/tls_test_common.h
+++ b/src/testcurl/https/tls_test_common.h
@@ -53,8 +53,6 @@ struct https_test_data
 {
   void *cls;
   int port;
-  const char *cipher_suite;
-  int proto_version;
 };
 
 struct CBC
@@ -94,7 +92,6 @@ setup_ca_cert (void);
  */
 int
 test_daemon_get (void *cls,
-                 const char *cipher_suite, int proto_version,
                  int port, int ver_peer);
 
 void
@@ -129,12 +126,10 @@ gen_test_file_url (char *url,
                    int port);
 
 int
-send_curl_req (char *url, struct CBC *cbc, const char *cipher_suite,
-               int proto_version);
+send_curl_req (char *url, struct CBC *cbc);
 
 int
-test_https_transfer (void *cls, int port, const char *cipher_suite, int
-                     proto_version);
+test_https_transfer (void *cls, int port);
 
 int
 setup_testcase (struct MHD_Daemon **d, int port, int daemon_flags, va_list
@@ -154,10 +149,9 @@ teardown_session (gnutls_session_t session,
 
 int
 test_wrap (const char *test_name, int
-           (*test_function)(void *cls, int port, const char *cipher_suite,
-                            int proto_version), void *cls,
+           (*test_function)(void *cls, int port), void *cls,
            int port,
-           int daemon_flags, const char *cipher_suite, int proto_version, ...);
+           int daemon_flags, ...);
 
 int testsuite_curl_global_init (void);