diff options
Diffstat (limited to 'src/testcurl/https/test_https_get_parallel_threads.c')
-rw-r--r-- | src/testcurl/https/test_https_get_parallel_threads.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/testcurl/https/test_https_get_parallel_threads.c b/src/testcurl/https/test_https_get_parallel_threads.c index ae63b9fd..afbd793d 100644 --- a/src/testcurl/https/test_https_get_parallel_threads.c +++ b/src/testcurl/https/test_https_get_parallel_threads.c | |||
@@ -139,7 +139,6 @@ main (int argc, char *const *argv) | |||
139 | const char *ssl_version; | 139 | const char *ssl_version; |
140 | uint16_t port; | 140 | uint16_t port; |
141 | unsigned int iseed; | 141 | unsigned int iseed; |
142 | const char *aes256_sha = "AES256-SHA"; | ||
143 | (void) argc; /* Unused. Silent compiler warning. */ | 142 | (void) argc; /* Unused. Silent compiler warning. */ |
144 | 143 | ||
145 | if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) | 144 | if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) |
@@ -172,17 +171,12 @@ main (int argc, char *const *argv) | |||
172 | return 77; | 171 | return 77; |
173 | } | 172 | } |
174 | 173 | ||
175 | if (curl_tls_is_nss ()) | ||
176 | { | ||
177 | aes256_sha = "rsa_aes_256_sha"; | ||
178 | } | ||
179 | |||
180 | errorCount += | 174 | errorCount += |
181 | test_wrap ("multi threaded daemon, single client", &test_single_client, | 175 | test_wrap ("multi threaded daemon, single client", &test_single_client, |
182 | NULL, port, | 176 | NULL, port, |
183 | MHD_USE_TLS | MHD_USE_ERROR_LOG | MHD_USE_THREAD_PER_CONNECTION | 177 | MHD_USE_TLS | MHD_USE_ERROR_LOG | MHD_USE_THREAD_PER_CONNECTION |
184 | | MHD_USE_INTERNAL_POLLING_THREAD, | 178 | | MHD_USE_INTERNAL_POLLING_THREAD, |
185 | aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, | 179 | NULL, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, |
186 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, | 180 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, |
187 | srv_self_signed_cert_pem, MHD_OPTION_END); | 181 | srv_self_signed_cert_pem, MHD_OPTION_END); |
188 | 182 | ||
@@ -191,7 +185,7 @@ main (int argc, char *const *argv) | |||
191 | &test_parallel_clients, NULL, port, | 185 | &test_parallel_clients, NULL, port, |
192 | MHD_USE_TLS | MHD_USE_ERROR_LOG | MHD_USE_THREAD_PER_CONNECTION | 186 | MHD_USE_TLS | MHD_USE_ERROR_LOG | MHD_USE_THREAD_PER_CONNECTION |
193 | | MHD_USE_INTERNAL_POLLING_THREAD, | 187 | | MHD_USE_INTERNAL_POLLING_THREAD, |
194 | aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, | 188 | NULL, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, |
195 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, | 189 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, |
196 | srv_self_signed_cert_pem, MHD_OPTION_END); | 190 | srv_self_signed_cert_pem, MHD_OPTION_END); |
197 | 191 | ||