1 files changed, 32 insertions, 37 deletions

diff --git a/src/testcurl/https/bug-test.c b/src/testcurl/https/bug-test.c
index 34680b5f..8c28bea7 100644
--- a/src/testcurl/https/bug-test.c
+++ b/src/testcurl/https/bug-test.c
@@ -238,7 +238,7 @@ test_daemon_get (FILE * test_fd, char *cipher_suite, int proto_version)
   return 0;
 }
 
-int
+static int
 test_cipher_option (FILE * test_fd, char *cipher_suite, int proto_version)
 {
 
@@ -264,35 +264,8 @@ test_cipher_option (FILE * test_fd, char *cipher_suite, int proto_version)
   return ret;
 }
 
-int
-test_mac_option (FILE * test_fd, char *cipher_suite, int proto_version)
-{
-
-  int ret;
-  int mac[] = { MHD_GNUTLS_MAC_SHA1, 0 };
-  struct MHD_Daemon *d;
-
-  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL |
-                        MHD_USE_DEBUG, 42433,
-                        NULL, NULL, &http_ahc, NULL,
-                        MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
-                        MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
-                        MHD_OPTION_MAC_ALGO, mac, MHD_OPTION_END);
-
-  if (d == NULL)
-    {
-      fprintf (stderr, MHD_E_SERVER_INIT);
-      return -1;
-    }
-
-  ret = test_daemon_get (test_fd, cipher_suite, proto_version);
-
-  MHD_stop_daemon (d);
-  return ret;
-}
-
 /* setup a temporary transfer test file */
-FILE *
+static FILE *
 setupTestFile ()
 {
   FILE *test_fd;
@@ -320,6 +293,32 @@ setupTestFile ()
   return test_fd;
 }
 
+/* perform a HTTP GET request via SSL/TLS */
+int
+test_secure_get (FILE * test_fd, char *cipher_suite, int proto_version)
+{
+  int ret;
+  struct MHD_Daemon *d;
+
+  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL |
+                        MHD_USE_DEBUG, 42433,
+                        NULL, NULL, &http_ahc, NULL,
+                        MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem,
+                        MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem,
+                        MHD_OPTION_END);
+
+  if (d == NULL)
+    {
+      fprintf (stderr, MHD_E_SERVER_INIT);
+      return -1;
+    }
+
+  ret = test_daemon_get (test_fd, cipher_suite, proto_version);
+
+  MHD_stop_daemon (d);
+  return ret;
+}
+
 int
 main (int argc, char *const *argv)
 {
@@ -345,17 +344,13 @@ main (int argc, char *const *argv)
       return -1;
     }
 
-//  errorCount +=
-//    test_secure_get (test_fd, "AES256-SHA", CURL_SSLVERSION_TLSv1);
-//  errorCount +=
-//    test_secure_get (test_fd, "AES256-SHA", CURL_SSLVERSION_SSLv3);
-//  errorCount +=
-//    test_file_certificates (test_fd, "AES256-SHA", CURL_SSLVERSION_SSLv3);
+  errorCount +=
+    test_secure_get (test_fd, "AES256-SHA", CURL_SSLVERSION_TLSv1);
+  errorCount +=
+    test_secure_get (test_fd, "AES256-SHA", CURL_SSLVERSION_SSLv3);
   /* TODO resolve cipher setting issue when compiling against GNU TLS */
   errorCount +=
     test_cipher_option (test_fd, "DES-CBC3-SHA", CURL_SSLVERSION_TLSv1);
-/*  errorCount +=
-    test_kx_option (test_fd, "EDH-RSA-DES-CBC3-SHA", CURL_SSLVERSION_SSLv3); */
 
 
   curl_global_cleanup ();