diff options
Diffstat (limited to 'src/testcurl/https/test_https_get_parallel.c')
-rw-r--r-- | src/testcurl/https/test_https_get_parallel.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/testcurl/https/test_https_get_parallel.c b/src/testcurl/https/test_https_get_parallel.c index 3fe65637..55725e3f 100644 --- a/src/testcurl/https/test_https_get_parallel.c +++ b/src/testcurl/https/test_https_get_parallel.c | |||
@@ -134,7 +134,6 @@ int | |||
134 | main (int argc, char *const *argv) | 134 | main (int argc, char *const *argv) |
135 | { | 135 | { |
136 | unsigned int errorCount = 0; | 136 | unsigned int errorCount = 0; |
137 | const char *aes256_sha = "AES256-SHA"; | ||
138 | uint16_t port; | 137 | uint16_t port; |
139 | unsigned int iseed; | 138 | unsigned int iseed; |
140 | (void) argc; /* Unused. Silent compiler warning. */ | 139 | (void) argc; /* Unused. Silent compiler warning. */ |
@@ -155,8 +154,6 @@ main (int argc, char *const *argv) | |||
155 | fprintf (stderr, "Curl does not support SSL. Cannot run the test.\n"); | 154 | fprintf (stderr, "Curl does not support SSL. Cannot run the test.\n"); |
156 | return 77; | 155 | return 77; |
157 | } | 156 | } |
158 | if (curl_tls_is_nss ()) | ||
159 | aes256_sha = "rsa_aes_256_sha"; | ||
160 | #ifdef EPOLL_SUPPORT | 157 | #ifdef EPOLL_SUPPORT |
161 | errorCount += | 158 | errorCount += |
162 | test_wrap ("single threaded daemon, single client, epoll", | 159 | test_wrap ("single threaded daemon, single client, epoll", |
@@ -164,7 +161,7 @@ main (int argc, char *const *argv) | |||
164 | NULL, port, | 161 | NULL, port, |
165 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | 162 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
166 | | MHD_USE_ERROR_LOG | MHD_USE_EPOLL, | 163 | | MHD_USE_ERROR_LOG | MHD_USE_EPOLL, |
167 | aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, | 164 | NULL, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, |
168 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, | 165 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, |
169 | srv_self_signed_cert_pem, MHD_OPTION_END); | 166 | srv_self_signed_cert_pem, MHD_OPTION_END); |
170 | #endif | 167 | #endif |
@@ -173,7 +170,7 @@ main (int argc, char *const *argv) | |||
173 | NULL, port, | 170 | NULL, port, |
174 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | 171 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
175 | | MHD_USE_ERROR_LOG, | 172 | | MHD_USE_ERROR_LOG, |
176 | aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, | 173 | NULL, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, |
177 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, | 174 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, |
178 | srv_self_signed_cert_pem, MHD_OPTION_END); | 175 | srv_self_signed_cert_pem, MHD_OPTION_END); |
179 | #ifdef EPOLL_SUPPORT | 176 | #ifdef EPOLL_SUPPORT |
@@ -182,7 +179,7 @@ main (int argc, char *const *argv) | |||
182 | &test_parallel_clients, NULL, port, | 179 | &test_parallel_clients, NULL, port, |
183 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | 180 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
184 | | MHD_USE_ERROR_LOG | MHD_USE_EPOLL, | 181 | | MHD_USE_ERROR_LOG | MHD_USE_EPOLL, |
185 | aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, | 182 | NULL, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, |
186 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, | 183 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, |
187 | srv_self_signed_cert_pem, MHD_OPTION_END); | 184 | srv_self_signed_cert_pem, MHD_OPTION_END); |
188 | #endif | 185 | #endif |
@@ -191,7 +188,7 @@ main (int argc, char *const *argv) | |||
191 | &test_parallel_clients, NULL, port, | 188 | &test_parallel_clients, NULL, port, |
192 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | 189 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
193 | | MHD_USE_ERROR_LOG, | 190 | | MHD_USE_ERROR_LOG, |
194 | aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, | 191 | NULL, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, |
195 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, | 192 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, |
196 | srv_self_signed_cert_pem, MHD_OPTION_END); | 193 | srv_self_signed_cert_pem, MHD_OPTION_END); |
197 | 194 | ||