aboutsummaryrefslogtreecommitdiff
path: root/src/testcurl/https/test_https_multi_daemon.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testcurl/https/test_https_multi_daemon.c')
-rw-r--r--src/testcurl/https/test_https_multi_daemon.c19
1 files changed, 5 insertions, 14 deletions
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[];
42 * doesn't affect the other 42 * doesn't affect the other
43 */ 43 */
44static int 44static int
45test_concurent_daemon_pair (void *cls, 45test_concurent_daemon_pair (void *cls)
46 const char *cipher_suite,
47 int proto_version)
48{ 46{
49 int ret; 47 int ret;
50 struct MHD_Daemon *d1; 48 struct MHD_Daemon *d1;
@@ -113,14 +111,13 @@ test_concurent_daemon_pair (void *cls,
113 } 111 }
114 112
115 ret = 113 ret =
116 test_daemon_get (NULL, cipher_suite, proto_version, port1, 0); 114 test_daemon_get (NULL, port1, 0);
117 ret += 115 ret +=
118 test_daemon_get (NULL, cipher_suite, proto_version, 116 test_daemon_get (NULL, port2, 0);
119 port2, 0);
120 117
121 MHD_stop_daemon (d2); 118 MHD_stop_daemon (d2);
122 ret += 119 ret +=
123 test_daemon_get (NULL, cipher_suite, proto_version, port1, 0); 120 test_daemon_get (NULL, port1, 0);
124 MHD_stop_daemon (d1); 121 MHD_stop_daemon (d1);
125 return ret; 122 return ret;
126} 123}
@@ -131,7 +128,6 @@ main (int argc, char *const *argv)
131{ 128{
132 unsigned int errorCount = 0; 129 unsigned int errorCount = 0;
133 FILE *cert; 130 FILE *cert;
134 const char *aes256_sha = "AES256-SHA";
135 (void) argc; (void) argv; /* Unused. Silent compiler warning. */ 131 (void) argc; (void) argv; /* Unused. Silent compiler warning. */
136 132
137#ifdef MHD_HTTPS_REQUIRE_GCRYPT 133#ifdef MHD_HTTPS_REQUIRE_GCRYPT
@@ -155,13 +151,8 @@ main (int argc, char *const *argv)
155 return 99; 151 return 99;
156 } 152 }
157 153
158 if (curl_tls_is_nss ())
159 {
160 aes256_sha = "rsa_aes_256_sha";
161 }
162
163 errorCount += 154 errorCount +=
164 test_concurent_daemon_pair (NULL, aes256_sha, CURL_SSLVERSION_TLSv1); 155 test_concurent_daemon_pair (NULL);
165 156
166 print_test_result (errorCount, "concurent_daemon_pair"); 157 print_test_result (errorCount, "concurent_daemon_pair");
167 158