1 files changed, 21 insertions, 76 deletions
diff --git a/src/testcurl/https/mhds_get_test.c b/src/testcurl/https/mhds_get_test.c
index ee1ba633..fcbb8706 100644
--- a/src/testcurl/https/mhds_get_test.c
+++ b/src/testcurl/https/mhds_get_test.c
@@ -46,53 +46,7 @@
 #define MHD_E_CERT_FILE_CREAT "Error: failed to setup test certificate\n"
 #define MHD_E_KEY_FILE_CREAT "Error: failed to setup test certificate\n"
-/* Test Certificate */
+#include "tls_test_keys.h"
-const char cert_pem[] =
-  "-----BEGIN CERTIFICATE-----\n"
-  "MIICpjCCAZCgAwIBAgIESEPtjjALBgkqhkiG9w0BAQUwADAeFw0wODA2MDIxMjU0\n"
-  "MzhaFw0wOTA2MDIxMjU0NDZaMAAwggEfMAsGCSqGSIb3DQEBAQOCAQ4AMIIBCQKC\n"
-  "AQC03TyUvK5HmUAirRp067taIEO4bibh5nqolUoUdo/LeblMQV+qnrv/RNAMTx5X\n"
-  "fNLZ45/kbM9geF8qY0vsPyQvP4jumzK0LOJYuIwmHaUm9vbXnYieILiwCuTgjaud\n"
-  "3VkZDoQ9fteIo+6we9UTpVqZpxpbLulBMh/VsvX0cPJ1VFC7rT59o9hAUlFf9jX/\n"
-  "GmKdYI79MtgVx0OPBjmmSD6kicBBfmfgkO7bIGwlRtsIyMznxbHu6VuoX/eVxrTv\n"
-  "rmCwgEXLWRZ6ru8MQl5YfqeGXXRVwMeXU961KefbuvmEPccgCxm8FZ1C1cnDHFXh\n"
-  "siSgAzMBjC/b6KVhNQ4KnUdZAgMBAAGjLzAtMAwGA1UdEwEB/wQCMAAwHQYDVR0O\n"
-  "BBYEFJcUvpjvE5fF/yzUshkWDpdYiQh/MAsGCSqGSIb3DQEBBQOCAQEARP7eKSB2\n"
-  "RNd6XjEjK0SrxtoTnxS3nw9sfcS7/qD1+XHdObtDFqGNSjGYFB3Gpx8fpQhCXdoN\n"
-  "8QUs3/5ZVa5yjZMQewWBgz8kNbnbH40F2y81MHITxxCe1Y+qqHWwVaYLsiOTqj2/\n"
-  "0S3QjEJ9tvklmg7JX09HC4m5QRYfWBeQLD1u8ZjA1Sf1xJriomFVyRLI2VPO2bNe\n"
-  "JDMXWuP+8kMC7gEvUnJ7A92Y2yrhu3QI3bjPk8uSpHea19Q77tul1UVBJ5g+zpH3\n"
-  "OsF5p0MyaVf09GTzcLds5nE/osTdXGUyHJapWReVmPm3Zn6gqYlnzD99z+DPIgIV\n"
-  "RhZvQx74NQnS6g==\n" "-----END CERTIFICATE-----\n";
-const char key_pem[] =
-  "-----BEGIN RSA PRIVATE KEY-----\n"
-  "MIIEowIBAAKCAQEAtN08lLyuR5lAIq0adOu7WiBDuG4m4eZ6qJVKFHaPy3m5TEFf\n"
-  "qp67/0TQDE8eV3zS2eOf5GzPYHhfKmNL7D8kLz+I7psytCziWLiMJh2lJvb2152I\n"
-  "niC4sArk4I2rnd1ZGQ6EPX7XiKPusHvVE6VamacaWy7pQTIf1bL19HDydVRQu60+\n"
-  "faPYQFJRX/Y1/xpinWCO/TLYFcdDjwY5pkg+pInAQX5n4JDu2yBsJUbbCMjM58Wx\n"
-  "7ulbqF/3lca0765gsIBFy1kWeq7vDEJeWH6nhl10VcDHl1PetSnn27r5hD3HIAsZ\n"
-  "vBWdQtXJwxxV4bIkoAMzAYwv2+ilYTUOCp1HWQIDAQABAoIBAArOQv3R7gmqDspj\n"
-  "lDaTFOz0C4e70QfjGMX0sWnakYnDGn6DU19iv3GnX1S072ejtgc9kcJ4e8VUO79R\n"
-  "EmqpdRR7k8dJr3RTUCyjzf/C+qiCzcmhCFYGN3KRHA6MeEnkvRuBogX4i5EG1k5l\n"
-  "/5t+YBTZBnqXKWlzQLKoUAiMLPg0eRWh+6q7H4N7kdWWBmTpako7TEqpIwuEnPGx\n"
-  "u3EPuTR+LN6lF55WBePbCHccUHUQaXuav18NuDkcJmCiMArK9SKb+h0RqLD6oMI/\n"
-  "dKD6n8cZXeMBkK+C8U/K0sN2hFHACsu30b9XfdnljgP9v+BP8GhnB0nCB6tNBCPo\n"
-  "32srOwECgYEAxWh3iBT4lWqL6bZavVbnhmvtif4nHv2t2/hOs/CAq8iLAw0oWGZc\n"
-  "+JEZTUDMvFRlulr0kcaWra+4fN3OmJnjeuFXZq52lfMgXBIKBmoSaZpIh2aDY1Rd\n"
-  "RbEse7nQl9hTEPmYspiXLGtnAXW7HuWqVfFFP3ya8rUS3t4d07Hig8ECgYEA6ou6\n"
-  "OHiBRTbtDqLIv8NghARc/AqwNWgEc9PelCPe5bdCOLBEyFjqKiT2MttnSSUc2Zob\n"
-  "XhYkHC6zN1Mlq30N0e3Q61YK9LxMdU1vsluXxNq2rfK1Scb1oOlOOtlbV3zA3VRF\n"
-  "hV3t1nOA9tFmUrwZi0CUMWJE/zbPAyhwWotKyZkCgYEAh0kFicPdbABdrCglXVae\n"
-  "SnfSjVwYkVuGd5Ze0WADvjYsVkYBHTvhgRNnRJMg+/vWz3Sf4Ps4rgUbqK8Vc20b\n"
-  "AU5G6H6tlCvPRGm0ZxrwTWDHTcuKRVs+pJE8C/qWoklE/AAhjluWVoGwUMbPGuiH\n"
-  "6Gf1bgHF6oj/Sq7rv/VLZ8ECgYBeq7ml05YyLuJutuwa4yzQ/MXfghzv4aVyb0F3\n"
-  "QCdXR6o2IYgR6jnSewrZKlA9aPqFJrwHNR6sNXlnSmt5Fcf/RWO/qgJQGLUv3+rG\n"
-  "7kuLTNDR05azSdiZc7J89ID3Bkb+z2YkV+6JUiPq/Ei1+nDBEXb/m+/HqALU/nyj\n"
-  "P3gXeQKBgBusb8Rbd+KgxSA0hwY6aoRTPRt8LNvXdsB9vRcKKHUFQvxUWiUSS+L9\n"
-  "/Qu1sJbrUquKOHqksV5wCnWnAKyJNJlhHuBToqQTgKXjuNmVdYSe631saiI7PHyC\n"
-  "eRJ6DxULPxABytJrYCRrNqmXi5TCiqR2mtfalEMOPxz8rUU8dYyx\n"
-  "-----END RSA PRIVATE KEY-----\n";
 const char *test_file_name = "https_test_file";
 const char test_file_data[] = "Hello World\n";
@@ -280,8 +234,8 @@ test_secure_get (FILE * test_fd, char *cipher_suite, int proto_version)
  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, key_pem,
+                        MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
-                        MHD_OPTION_HTTPS_MEM_CERT, cert_pem, MHD_OPTION_END);
+                        MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, MHD_OPTION_END);
  if (d == NULL)
    {
@@ -317,8 +271,8 @@ test_file_certificates (FILE * test_fd, char *cipher_suite, int proto_version)
      return -1;
    }
-  fwrite (key_pem, strlen (key_pem), sizeof (char), key_fd);
+  fwrite (srv_key_pem, strlen (srv_key_pem), sizeof (char), key_fd);
-  fwrite (cert_pem, strlen (cert_pem), sizeof (char), cert_fd);
+  fwrite (srv_self_signed_cert_pem, strlen (srv_self_signed_cert_pem), sizeof (char), cert_fd);
  fclose (key_fd);
  fclose (cert_fd);
@@ -353,8 +307,8 @@ test_cipher_option (FILE * test_fd, char *cipher_suite, int proto_version)
  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, key_pem,
+                        MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
-                        MHD_OPTION_HTTPS_MEM_CERT, cert_pem,
+                        MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
                        MHD_OPTION_CIPHER_ALGORITHM, ciper, MHD_OPTION_END);
  if (d == NULL)
@@ -380,8 +334,8 @@ test_kx_option (FILE * test_fd, char *cipher_suite, int proto_version)
  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, key_pem,
+                        MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
-                        MHD_OPTION_HTTPS_MEM_CERT, cert_pem,
+                        MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
                        MHD_OPTION_KX_PRIORITY, kx, MHD_OPTION_END);
  if (d == NULL)
@@ -407,8 +361,8 @@ test_mac_option (FILE * test_fd, char *cipher_suite, int proto_version)
  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, key_pem,
+                        MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
-                        MHD_OPTION_HTTPS_MEM_CERT, cert_pem,
+                        MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
                        MHD_OPTION_MAC_ALGO, mac, MHD_OPTION_END);
  if (d == NULL)
@@ -470,28 +424,19 @@ main (int argc, char *const *argv)
      return -1;
    }
-  //gnutls_global_set_log_level(11);
-//  errorCount +=
-//    test_secure_get (test_fd, "AES256-SHA", CURL_SSLVERSION_TLSv1);
-//
-//  errorCount +=
-//    test_secure_get (test_fd, "AES256-SHA", CURL_SSLVERSION_TLSv1);
-//
-//  sleep(1);
  errorCount +=
    test_secure_get (test_fd, "AES256-SHA", CURL_SSLVERSION_TLSv1);
-//  errorCount +=
+  errorCount +=
-//    test_secure_get (test_fd, "AES256-SHA", CURL_SSLVERSION_SSLv3);
+    test_secure_get (test_fd, "AES256-SHA", CURL_SSLVERSION_SSLv3);
-//  errorCount +=
+  errorCount +=
-//    test_file_certificates (test_fd, "AES256-SHA", CURL_SSLVERSION_TLSv1);
+    test_file_certificates (test_fd, "AES256-SHA", CURL_SSLVERSION_TLSv1);
-//
-//  /* TODO resolve cipher setting issue when compiling against GNU TLS */
+  /* TODO resolve cipher setting issue when compiling against GNU TLS */
-//  errorCount +=
+  errorCount +=
-//    test_cipher_option (test_fd, "DES-CBC3-SHA", CURL_SSLVERSION_SSLv3);
+    test_cipher_option (test_fd, "DES-CBC3-SHA", CURL_SSLVERSION_SSLv3);
-//  errorCount +=
+  errorCount +=
-//    test_kx_option (test_fd, "EDH-RSA-DES-CBC3-SHA", CURL_SSLVERSION_SSLv3);
+    test_kx_option (test_fd, "EDH-RSA-DES-CBC3-SHA", CURL_SSLVERSION_SSLv3);
  if (errorCount != 0)

diff --git a/src/testcurl/https/mhds_get_test.c b/src/testcurl/https/mhds_get_test.c index ee1ba633..fcbb8706 100644 --- a/src/testcurl/https/mhds_get_test.c +++ b/src/testcurl/https/mhds_get_test.c
@@ -46,53 +46,7 @@
46	#define MHD_E_CERT_FILE_CREAT "Error: failed to setup test certificate\n"	46	#define MHD_E_CERT_FILE_CREAT "Error: failed to setup test certificate\n"
47	#define MHD_E_KEY_FILE_CREAT "Error: failed to setup test certificate\n"	47	#define MHD_E_KEY_FILE_CREAT "Error: failed to setup test certificate\n"
48		48
49	/* Test Certificate */	49	#include "tls_test_keys.h"
50	const char cert_pem[] =
51	"-----BEGIN CERTIFICATE-----\n"
52	"MIICpjCCAZCgAwIBAgIESEPtjjALBgkqhkiG9w0BAQUwADAeFw0wODA2MDIxMjU0\n"
53	"MzhaFw0wOTA2MDIxMjU0NDZaMAAwggEfMAsGCSqGSIb3DQEBAQOCAQ4AMIIBCQKC\n"
54	"AQC03TyUvK5HmUAirRp067taIEO4bibh5nqolUoUdo/LeblMQV+qnrv/RNAMTx5X\n"
55	"fNLZ45/kbM9geF8qY0vsPyQvP4jumzK0LOJYuIwmHaUm9vbXnYieILiwCuTgjaud\n"
56	"3VkZDoQ9fteIo+6we9UTpVqZpxpbLulBMh/VsvX0cPJ1VFC7rT59o9hAUlFf9jX/\n"
57	"GmKdYI79MtgVx0OPBjmmSD6kicBBfmfgkO7bIGwlRtsIyMznxbHu6VuoX/eVxrTv\n"
58	"rmCwgEXLWRZ6ru8MQl5YfqeGXXRVwMeXU961KefbuvmEPccgCxm8FZ1C1cnDHFXh\n"
59	"siSgAzMBjC/b6KVhNQ4KnUdZAgMBAAGjLzAtMAwGA1UdEwEB/wQCMAAwHQYDVR0O\n"
60	"BBYEFJcUvpjvE5fF/yzUshkWDpdYiQh/MAsGCSqGSIb3DQEBBQOCAQEARP7eKSB2\n"
61	"RNd6XjEjK0SrxtoTnxS3nw9sfcS7/qD1+XHdObtDFqGNSjGYFB3Gpx8fpQhCXdoN\n"
62	"8QUs3/5ZVa5yjZMQewWBgz8kNbnbH40F2y81MHITxxCe1Y+qqHWwVaYLsiOTqj2/\n"
63	"0S3QjEJ9tvklmg7JX09HC4m5QRYfWBeQLD1u8ZjA1Sf1xJriomFVyRLI2VPO2bNe\n"
64	"JDMXWuP+8kMC7gEvUnJ7A92Y2yrhu3QI3bjPk8uSpHea19Q77tul1UVBJ5g+zpH3\n"
65	"OsF5p0MyaVf09GTzcLds5nE/osTdXGUyHJapWReVmPm3Zn6gqYlnzD99z+DPIgIV\n"
66	"RhZvQx74NQnS6g==\n" "-----END CERTIFICATE-----\n";
67
68	const char key_pem[] =
69	"-----BEGIN RSA PRIVATE KEY-----\n"
70	"MIIEowIBAAKCAQEAtN08lLyuR5lAIq0adOu7WiBDuG4m4eZ6qJVKFHaPy3m5TEFf\n"
71	"qp67/0TQDE8eV3zS2eOf5GzPYHhfKmNL7D8kLz+I7psytCziWLiMJh2lJvb2152I\n"
72	"niC4sArk4I2rnd1ZGQ6EPX7XiKPusHvVE6VamacaWy7pQTIf1bL19HDydVRQu60+\n"
73	"faPYQFJRX/Y1/xpinWCO/TLYFcdDjwY5pkg+pInAQX5n4JDu2yBsJUbbCMjM58Wx\n"
74	"7ulbqF/3lca0765gsIBFy1kWeq7vDEJeWH6nhl10VcDHl1PetSnn27r5hD3HIAsZ\n"
75	"vBWdQtXJwxxV4bIkoAMzAYwv2+ilYTUOCp1HWQIDAQABAoIBAArOQv3R7gmqDspj\n"
76	"lDaTFOz0C4e70QfjGMX0sWnakYnDGn6DU19iv3GnX1S072ejtgc9kcJ4e8VUO79R\n"
77	"EmqpdRR7k8dJr3RTUCyjzf/C+qiCzcmhCFYGN3KRHA6MeEnkvRuBogX4i5EG1k5l\n"
78	"/5t+YBTZBnqXKWlzQLKoUAiMLPg0eRWh+6q7H4N7kdWWBmTpako7TEqpIwuEnPGx\n"
79	"u3EPuTR+LN6lF55WBePbCHccUHUQaXuav18NuDkcJmCiMArK9SKb+h0RqLD6oMI/\n"
80	"dKD6n8cZXeMBkK+C8U/K0sN2hFHACsu30b9XfdnljgP9v+BP8GhnB0nCB6tNBCPo\n"
81	"32srOwECgYEAxWh3iBT4lWqL6bZavVbnhmvtif4nHv2t2/hOs/CAq8iLAw0oWGZc\n"
82	"+JEZTUDMvFRlulr0kcaWra+4fN3OmJnjeuFXZq52lfMgXBIKBmoSaZpIh2aDY1Rd\n"
83	"RbEse7nQl9hTEPmYspiXLGtnAXW7HuWqVfFFP3ya8rUS3t4d07Hig8ECgYEA6ou6\n"
84	"OHiBRTbtDqLIv8NghARc/AqwNWgEc9PelCPe5bdCOLBEyFjqKiT2MttnSSUc2Zob\n"
85	"XhYkHC6zN1Mlq30N0e3Q61YK9LxMdU1vsluXxNq2rfK1Scb1oOlOOtlbV3zA3VRF\n"
86	"hV3t1nOA9tFmUrwZi0CUMWJE/zbPAyhwWotKyZkCgYEAh0kFicPdbABdrCglXVae\n"
87	"SnfSjVwYkVuGd5Ze0WADvjYsVkYBHTvhgRNnRJMg+/vWz3Sf4Ps4rgUbqK8Vc20b\n"
88	"AU5G6H6tlCvPRGm0ZxrwTWDHTcuKRVs+pJE8C/qWoklE/AAhjluWVoGwUMbPGuiH\n"
89	"6Gf1bgHF6oj/Sq7rv/VLZ8ECgYBeq7ml05YyLuJutuwa4yzQ/MXfghzv4aVyb0F3\n"
90	"QCdXR6o2IYgR6jnSewrZKlA9aPqFJrwHNR6sNXlnSmt5Fcf/RWO/qgJQGLUv3+rG\n"
91	"7kuLTNDR05azSdiZc7J89ID3Bkb+z2YkV+6JUiPq/Ei1+nDBEXb/m+/HqALU/nyj\n"
92	"P3gXeQKBgBusb8Rbd+KgxSA0hwY6aoRTPRt8LNvXdsB9vRcKKHUFQvxUWiUSS+L9\n"
93	"/Qu1sJbrUquKOHqksV5wCnWnAKyJNJlhHuBToqQTgKXjuNmVdYSe631saiI7PHyC\n"
94	"eRJ6DxULPxABytJrYCRrNqmXi5TCiqR2mtfalEMOPxz8rUU8dYyx\n"
95	"-----END RSA PRIVATE KEY-----\n";
96		50
97	const char *test_file_name = "https_test_file";	51	const char *test_file_name = "https_test_file";
98	const char test_file_data[] = "Hello World\n";	52	const char test_file_data[] = "Hello World\n";
@@ -280,8 +234,8 @@ test_secure_get (FILE * test_fd, char *cipher_suite, int proto_version)
280	d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION \| MHD_USE_SSL \|	234	d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION \| MHD_USE_SSL \|
281	MHD_USE_DEBUG, 42433,	235	MHD_USE_DEBUG, 42433,
282	NULL, NULL, &http_ahc, NULL,	236	NULL, NULL, &http_ahc, NULL,
283	MHD_OPTION_HTTPS_MEM_KEY, key_pem,	237	MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
284	MHD_OPTION_HTTPS_MEM_CERT, cert_pem, MHD_OPTION_END);	238	MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, MHD_OPTION_END);
285		239
286	if (d == NULL)	240	if (d == NULL)
287	{	241	{
@@ -317,8 +271,8 @@ test_file_certificates (FILE * test_fd, char *cipher_suite, int proto_version)
317	return -1;	271	return -1;
318	}	272	}
319		273
320	fwrite (key_pem, strlen (key_pem), sizeof (char), key_fd);	274	fwrite (srv_key_pem, strlen (srv_key_pem), sizeof (char), key_fd);
321	fwrite (cert_pem, strlen (cert_pem), sizeof (char), cert_fd);	275	fwrite (srv_self_signed_cert_pem, strlen (srv_self_signed_cert_pem), sizeof (char), cert_fd);
322	fclose (key_fd);	276	fclose (key_fd);
323	fclose (cert_fd);	277	fclose (cert_fd);
324		278
@@ -353,8 +307,8 @@ test_cipher_option (FILE * test_fd, char *cipher_suite, int proto_version)
353	d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION \| MHD_USE_SSL \|	307	d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION \| MHD_USE_SSL \|
354	MHD_USE_DEBUG, 42433,	308	MHD_USE_DEBUG, 42433,
355	NULL, NULL, &http_ahc, NULL,	309	NULL, NULL, &http_ahc, NULL,
356	MHD_OPTION_HTTPS_MEM_KEY, key_pem,	310	MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
357	MHD_OPTION_HTTPS_MEM_CERT, cert_pem,	311	MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
358	MHD_OPTION_CIPHER_ALGORITHM, ciper, MHD_OPTION_END);	312	MHD_OPTION_CIPHER_ALGORITHM, ciper, MHD_OPTION_END);
359		313
360	if (d == NULL)	314	if (d == NULL)
@@ -380,8 +334,8 @@ test_kx_option (FILE * test_fd, char *cipher_suite, int proto_version)
380	d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION \| MHD_USE_SSL \|	334	d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION \| MHD_USE_SSL \|
381	MHD_USE_DEBUG, 42433,	335	MHD_USE_DEBUG, 42433,
382	NULL, NULL, &http_ahc, NULL,	336	NULL, NULL, &http_ahc, NULL,
383	MHD_OPTION_HTTPS_MEM_KEY, key_pem,	337	MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
384	MHD_OPTION_HTTPS_MEM_CERT, cert_pem,	338	MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
385	MHD_OPTION_KX_PRIORITY, kx, MHD_OPTION_END);	339	MHD_OPTION_KX_PRIORITY, kx, MHD_OPTION_END);
386		340
387	if (d == NULL)	341	if (d == NULL)
@@ -407,8 +361,8 @@ test_mac_option (FILE * test_fd, char *cipher_suite, int proto_version)
407	d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION \| MHD_USE_SSL \|	361	d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION \| MHD_USE_SSL \|
408	MHD_USE_DEBUG, 42433,	362	MHD_USE_DEBUG, 42433,
409	NULL, NULL, &http_ahc, NULL,	363	NULL, NULL, &http_ahc, NULL,
410	MHD_OPTION_HTTPS_MEM_KEY, key_pem,	364	MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
411	MHD_OPTION_HTTPS_MEM_CERT, cert_pem,	365	MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
412	MHD_OPTION_MAC_ALGO, mac, MHD_OPTION_END);	366	MHD_OPTION_MAC_ALGO, mac, MHD_OPTION_END);
413		367
414	if (d == NULL)	368	if (d == NULL)
@@ -470,28 +424,19 @@ main (int argc, char const argv)
470	return -1;	424	return -1;
471	}	425	}
472		426
473	//gnutls_global_set_log_level(11);
474	// errorCount +=
475	// test_secure_get (test_fd, "AES256-SHA", CURL_SSLVERSION_TLSv1);
476	//
477	// errorCount +=
478	// test_secure_get (test_fd, "AES256-SHA", CURL_SSLVERSION_TLSv1);
479	//
480	// sleep(1);
481
482	errorCount +=	427	errorCount +=
483	test_secure_get (test_fd, "AES256-SHA", CURL_SSLVERSION_TLSv1);	428	test_secure_get (test_fd, "AES256-SHA", CURL_SSLVERSION_TLSv1);
484		429
485	// errorCount +=	430	errorCount +=
486	// test_secure_get (test_fd, "AES256-SHA", CURL_SSLVERSION_SSLv3);	431	test_secure_get (test_fd, "AES256-SHA", CURL_SSLVERSION_SSLv3);
487	// errorCount +=	432	errorCount +=
488	// test_file_certificates (test_fd, "AES256-SHA", CURL_SSLVERSION_TLSv1);	433	test_file_certificates (test_fd, "AES256-SHA", CURL_SSLVERSION_TLSv1);
489	//	434
490	// /* TODO resolve cipher setting issue when compiling against GNU TLS */	435	/* TODO resolve cipher setting issue when compiling against GNU TLS */
491	// errorCount +=	436	errorCount +=
492	// test_cipher_option (test_fd, "DES-CBC3-SHA", CURL_SSLVERSION_SSLv3);	437	test_cipher_option (test_fd, "DES-CBC3-SHA", CURL_SSLVERSION_SSLv3);
493	// errorCount +=	438	errorCount +=
494	// test_kx_option (test_fd, "EDH-RSA-DES-CBC3-SHA", CURL_SSLVERSION_SSLv3);	439	test_kx_option (test_fd, "EDH-RSA-DES-CBC3-SHA", CURL_SSLVERSION_SSLv3);
495		440
496		441
497	if (errorCount != 0)	442	if (errorCount != 0)