diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2022-10-04 18:57:06 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2022-10-05 18:42:20 +0300 |
commit | f7747015d8dc0d362fa3fb2cc7670d5a690edef8 (patch) | |
tree | 276a419116919add27e675984868c960f4e589b3 /src | |
parent | f069ee365d4cedb9854924ab2f6b96476b64319f (diff) | |
download | libmicrohttpd-f7747015d8dc0d362fa3fb2cc7670d5a690edef8.tar.gz libmicrohttpd-f7747015d8dc0d362fa3fb2cc7670d5a690edef8.zip |
testcurl/https: do not enforce TLSv1
Usage of concrete TLS version is not future-proof. Relay on default
version setting by libcurl/TLS lib.
Diffstat (limited to 'src')
-rw-r--r-- | src/testcurl/https/test_empty_response.c | 2 | ||||
-rw-r--r-- | src/testcurl/https/test_https_get.c | 2 | ||||
-rw-r--r-- | src/testcurl/https/test_https_get_iovec.c | 2 | ||||
-rw-r--r-- | src/testcurl/https/test_https_get_parallel.c | 8 | ||||
-rw-r--r-- | src/testcurl/https/test_https_get_parallel_threads.c | 4 | ||||
-rw-r--r-- | src/testcurl/https/test_https_get_select.c | 2 | ||||
-rw-r--r-- | src/testcurl/https/test_https_multi_daemon.c | 2 | ||||
-rw-r--r-- | src/testcurl/https/test_tls_authentication.c | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/src/testcurl/https/test_empty_response.c b/src/testcurl/https/test_empty_response.c index c1e58245..92dbaec7 100644 --- a/src/testcurl/https/test_empty_response.c +++ b/src/testcurl/https/test_empty_response.c | |||
@@ -111,7 +111,7 @@ testInternalSelectGet (void) | |||
111 | curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); | 111 | curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); |
112 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); | 112 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); |
113 | /* TLS options */ | 113 | /* TLS options */ |
114 | curl_easy_setopt (c, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1); | 114 | curl_easy_setopt (c, CURLOPT_SSLVERSION, CURL_SSLVERSION_DEFAULT); |
115 | curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER, 0L); | 115 | curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER, 0L); |
116 | curl_easy_setopt (c, CURLOPT_SSL_VERIFYHOST, 0L); | 116 | curl_easy_setopt (c, CURLOPT_SSL_VERIFYHOST, 0L); |
117 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L); | 117 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L); |
diff --git a/src/testcurl/https/test_https_get.c b/src/testcurl/https/test_https_get.c index f7569f43..7eebfd4c 100644 --- a/src/testcurl/https/test_https_get.c +++ b/src/testcurl/https/test_https_get.c | |||
@@ -249,7 +249,7 @@ main (int argc, char *const *argv) | |||
249 | return 77; | 249 | return 77; |
250 | } | 250 | } |
251 | errorCount += | 251 | errorCount += |
252 | test_secure_get (NULL, NULL, CURL_SSLVERSION_TLSv1); | 252 | test_secure_get (NULL, NULL, CURL_SSLVERSION_DEFAULT); |
253 | errorCount += testEmptyGet (0); | 253 | errorCount += testEmptyGet (0); |
254 | curl_global_cleanup (); | 254 | curl_global_cleanup (); |
255 | 255 | ||
diff --git a/src/testcurl/https/test_https_get_iovec.c b/src/testcurl/https/test_https_get_iovec.c index 7b99ff68..c5ff7cb4 100644 --- a/src/testcurl/https/test_https_get_iovec.c +++ b/src/testcurl/https/test_https_get_iovec.c | |||
@@ -408,7 +408,7 @@ main (int argc, char *const *argv) | |||
408 | } | 408 | } |
409 | 409 | ||
410 | errorCount += | 410 | errorCount += |
411 | test_secure_get (NULL, NULL, CURL_SSLVERSION_TLSv1); | 411 | test_secure_get (NULL, NULL, CURL_SSLVERSION_DEFAULT); |
412 | errorCount += testEmptyGet (0); | 412 | errorCount += testEmptyGet (0); |
413 | curl_global_cleanup (); | 413 | curl_global_cleanup (); |
414 | 414 | ||
diff --git a/src/testcurl/https/test_https_get_parallel.c b/src/testcurl/https/test_https_get_parallel.c index 55725e3f..4e83bbf2 100644 --- a/src/testcurl/https/test_https_get_parallel.c +++ b/src/testcurl/https/test_https_get_parallel.c | |||
@@ -161,7 +161,7 @@ main (int argc, char *const *argv) | |||
161 | NULL, port, | 161 | NULL, port, |
162 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | 162 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
163 | | MHD_USE_ERROR_LOG | MHD_USE_EPOLL, | 163 | | MHD_USE_ERROR_LOG | MHD_USE_EPOLL, |
164 | NULL, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, | 164 | NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY, |
165 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, | 165 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, |
166 | srv_self_signed_cert_pem, MHD_OPTION_END); | 166 | srv_self_signed_cert_pem, MHD_OPTION_END); |
167 | #endif | 167 | #endif |
@@ -170,7 +170,7 @@ main (int argc, char *const *argv) | |||
170 | NULL, port, | 170 | NULL, port, |
171 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | 171 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
172 | | MHD_USE_ERROR_LOG, | 172 | | MHD_USE_ERROR_LOG, |
173 | NULL, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, | 173 | NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY, |
174 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, | 174 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, |
175 | srv_self_signed_cert_pem, MHD_OPTION_END); | 175 | srv_self_signed_cert_pem, MHD_OPTION_END); |
176 | #ifdef EPOLL_SUPPORT | 176 | #ifdef EPOLL_SUPPORT |
@@ -179,7 +179,7 @@ main (int argc, char *const *argv) | |||
179 | &test_parallel_clients, NULL, port, | 179 | &test_parallel_clients, NULL, port, |
180 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | 180 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
181 | | MHD_USE_ERROR_LOG | MHD_USE_EPOLL, | 181 | | MHD_USE_ERROR_LOG | MHD_USE_EPOLL, |
182 | NULL, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, | 182 | NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY, |
183 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, | 183 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, |
184 | srv_self_signed_cert_pem, MHD_OPTION_END); | 184 | srv_self_signed_cert_pem, MHD_OPTION_END); |
185 | #endif | 185 | #endif |
@@ -188,7 +188,7 @@ main (int argc, char *const *argv) | |||
188 | &test_parallel_clients, NULL, port, | 188 | &test_parallel_clients, NULL, port, |
189 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | 189 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
190 | | MHD_USE_ERROR_LOG, | 190 | | MHD_USE_ERROR_LOG, |
191 | NULL, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, | 191 | NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY, |
192 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, | 192 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, |
193 | srv_self_signed_cert_pem, MHD_OPTION_END); | 193 | srv_self_signed_cert_pem, MHD_OPTION_END); |
194 | 194 | ||
diff --git a/src/testcurl/https/test_https_get_parallel_threads.c b/src/testcurl/https/test_https_get_parallel_threads.c index afbd793d..4ff57044 100644 --- a/src/testcurl/https/test_https_get_parallel_threads.c +++ b/src/testcurl/https/test_https_get_parallel_threads.c | |||
@@ -176,7 +176,7 @@ main (int argc, char *const *argv) | |||
176 | NULL, port, | 176 | NULL, port, |
177 | 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 |
178 | | MHD_USE_INTERNAL_POLLING_THREAD, | 178 | | MHD_USE_INTERNAL_POLLING_THREAD, |
179 | NULL, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, | 179 | NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY, |
180 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, | 180 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, |
181 | srv_self_signed_cert_pem, MHD_OPTION_END); | 181 | srv_self_signed_cert_pem, MHD_OPTION_END); |
182 | 182 | ||
@@ -185,7 +185,7 @@ main (int argc, char *const *argv) | |||
185 | &test_parallel_clients, NULL, port, | 185 | &test_parallel_clients, NULL, port, |
186 | 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 |
187 | | MHD_USE_INTERNAL_POLLING_THREAD, | 187 | | MHD_USE_INTERNAL_POLLING_THREAD, |
188 | NULL, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, | 188 | NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY, |
189 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, | 189 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, |
190 | srv_self_signed_cert_pem, MHD_OPTION_END); | 190 | srv_self_signed_cert_pem, MHD_OPTION_END); |
191 | 191 | ||
diff --git a/src/testcurl/https/test_https_get_select.c b/src/testcurl/https/test_https_get_select.c index 7149caf7..13145390 100644 --- a/src/testcurl/https/test_https_get_select.c +++ b/src/testcurl/https/test_https_get_select.c | |||
@@ -127,7 +127,7 @@ testExternalGet (unsigned int flags) | |||
127 | curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); | 127 | curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); |
128 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); | 128 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); |
129 | /* TLS options */ | 129 | /* TLS options */ |
130 | curl_easy_setopt (c, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1); | 130 | curl_easy_setopt (c, CURLOPT_SSLVERSION, CURL_SSLVERSION_DEFAULT); |
131 | curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER, 0L); | 131 | curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER, 0L); |
132 | curl_easy_setopt (c, CURLOPT_SSL_VERIFYHOST, 0L); | 132 | curl_easy_setopt (c, CURLOPT_SSL_VERIFYHOST, 0L); |
133 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L); | 133 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L); |
diff --git a/src/testcurl/https/test_https_multi_daemon.c b/src/testcurl/https/test_https_multi_daemon.c index be7f65a2..7d99940c 100644 --- a/src/testcurl/https/test_https_multi_daemon.c +++ b/src/testcurl/https/test_https_multi_daemon.c | |||
@@ -149,7 +149,7 @@ main (int argc, char *const *argv) | |||
149 | } | 149 | } |
150 | 150 | ||
151 | errorCount += | 151 | errorCount += |
152 | test_concurent_daemon_pair (NULL, NULL, CURL_SSLVERSION_TLSv1); | 152 | test_concurent_daemon_pair (NULL, NULL, CURL_SSLVERSION_DEFAULT); |
153 | 153 | ||
154 | print_test_result (errorCount, "concurent_daemon_pair"); | 154 | print_test_result (errorCount, "concurent_daemon_pair"); |
155 | 155 | ||
diff --git a/src/testcurl/https/test_tls_authentication.c b/src/testcurl/https/test_tls_authentication.c index 1fa2f795..fb6e5615 100644 --- a/src/testcurl/https/test_tls_authentication.c +++ b/src/testcurl/https/test_tls_authentication.c | |||
@@ -105,7 +105,7 @@ main (int argc, char *const *argv) | |||
105 | } | 105 | } |
106 | 106 | ||
107 | errorCount += | 107 | errorCount += |
108 | test_secure_get (NULL, NULL, CURL_SSLVERSION_TLSv1); | 108 | test_secure_get (NULL, NULL, CURL_SSLVERSION_DEFAULT); |
109 | 109 | ||
110 | print_test_result (errorCount, argv[0]); | 110 | print_test_result (errorCount, argv[0]); |
111 | 111 | ||