diff options
Diffstat (limited to 'src/testcurl/https')
-rw-r--r-- | src/testcurl/https/test_empty_response.c | 4 | ||||
-rw-r--r-- | src/testcurl/https/test_https_get.c | 8 | ||||
-rw-r--r-- | src/testcurl/https/test_https_get_iovec.c | 8 | ||||
-rw-r--r-- | src/testcurl/https/test_https_get_parallel.c | 4 | ||||
-rw-r--r-- | src/testcurl/https/test_https_get_parallel_threads.c | 8 | ||||
-rw-r--r-- | src/testcurl/https/test_https_get_select.c | 4 | ||||
-rw-r--r-- | src/testcurl/https/test_https_multi_daemon.c | 8 | ||||
-rw-r--r-- | src/testcurl/https/test_https_session_info.c | 8 | ||||
-rw-r--r-- | src/testcurl/https/test_https_sni.c | 8 | ||||
-rw-r--r-- | src/testcurl/https/test_https_time_out.c | 8 | ||||
-rw-r--r-- | src/testcurl/https/test_tls_authentication.c | 8 | ||||
-rw-r--r-- | src/testcurl/https/test_tls_extensions.c | 8 | ||||
-rw-r--r-- | src/testcurl/https/test_tls_options.c | 8 |
13 files changed, 46 insertions, 46 deletions
diff --git a/src/testcurl/https/test_empty_response.c b/src/testcurl/https/test_empty_response.c index a8de5cd2..3dc5b0bb 100644 --- a/src/testcurl/https/test_empty_response.c +++ b/src/testcurl/https/test_empty_response.c | |||
@@ -28,9 +28,9 @@ | |||
28 | #include <limits.h> | 28 | #include <limits.h> |
29 | #include <sys/stat.h> | 29 | #include <sys/stat.h> |
30 | #include <curl/curl.h> | 30 | #include <curl/curl.h> |
31 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 31 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
32 | #include <gcrypt.h> | 32 | #include <gcrypt.h> |
33 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 33 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
34 | #include "tls_test_common.h" | 34 | #include "tls_test_common.h" |
35 | #include "tls_test_keys.h" | 35 | #include "tls_test_keys.h" |
36 | 36 | ||
diff --git a/src/testcurl/https/test_https_get.c b/src/testcurl/https/test_https_get.c index 62546324..f2016cc2 100644 --- a/src/testcurl/https/test_https_get.c +++ b/src/testcurl/https/test_https_get.c | |||
@@ -29,9 +29,9 @@ | |||
29 | #include <limits.h> | 29 | #include <limits.h> |
30 | #include <sys/stat.h> | 30 | #include <sys/stat.h> |
31 | #include <curl/curl.h> | 31 | #include <curl/curl.h> |
32 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 32 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
33 | #include <gcrypt.h> | 33 | #include <gcrypt.h> |
34 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 34 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
35 | #include "tls_test_common.h" | 35 | #include "tls_test_common.h" |
36 | #include "tls_test_keys.h" | 36 | #include "tls_test_keys.h" |
37 | 37 | ||
@@ -234,12 +234,12 @@ main (int argc, char *const *argv) | |||
234 | const char *aes256_sha_tlsv1 = "AES256-SHA"; | 234 | const char *aes256_sha_tlsv1 = "AES256-SHA"; |
235 | (void) argc; (void) argv; /* Unused. Silent compiler warning. */ | 235 | (void) argc; (void) argv; /* Unused. Silent compiler warning. */ |
236 | 236 | ||
237 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 237 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
238 | gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); | 238 | gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); |
239 | #ifdef GCRYCTL_INITIALIZATION_FINISHED | 239 | #ifdef GCRYCTL_INITIALIZATION_FINISHED |
240 | gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); | 240 | gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); |
241 | #endif | 241 | #endif |
242 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 242 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
243 | if (! testsuite_curl_global_init ()) | 243 | if (! testsuite_curl_global_init ()) |
244 | return 99; | 244 | return 99; |
245 | if (NULL == curl_version_info (CURLVERSION_NOW)->ssl_version) | 245 | if (NULL == curl_version_info (CURLVERSION_NOW)->ssl_version) |
diff --git a/src/testcurl/https/test_https_get_iovec.c b/src/testcurl/https/test_https_get_iovec.c index b2d46c3f..33272952 100644 --- a/src/testcurl/https/test_https_get_iovec.c +++ b/src/testcurl/https/test_https_get_iovec.c | |||
@@ -37,9 +37,9 @@ | |||
37 | #include <limits.h> | 37 | #include <limits.h> |
38 | #include <sys/stat.h> | 38 | #include <sys/stat.h> |
39 | #include <curl/curl.h> | 39 | #include <curl/curl.h> |
40 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 40 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
41 | #include <gcrypt.h> | 41 | #include <gcrypt.h> |
42 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 42 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
43 | #include "tls_test_common.h" | 43 | #include "tls_test_common.h" |
44 | #include "tls_test_keys.h" | 44 | #include "tls_test_keys.h" |
45 | 45 | ||
@@ -391,12 +391,12 @@ main (int argc, char *const *argv) | |||
391 | const char *aes256_sha_tlsv1 = "AES256-SHA"; | 391 | const char *aes256_sha_tlsv1 = "AES256-SHA"; |
392 | (void) argc; (void) argv; /* Unused. Silent compiler warning. */ | 392 | (void) argc; (void) argv; /* Unused. Silent compiler warning. */ |
393 | 393 | ||
394 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 394 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
395 | gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); | 395 | gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); |
396 | #ifdef GCRYCTL_INITIALIZATION_FINISHED | 396 | #ifdef GCRYCTL_INITIALIZATION_FINISHED |
397 | gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); | 397 | gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); |
398 | #endif | 398 | #endif |
399 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 399 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
400 | if (! testsuite_curl_global_init ()) | 400 | if (! testsuite_curl_global_init ()) |
401 | return 99; | 401 | return 99; |
402 | if (NULL == curl_version_info (CURLVERSION_NOW)->ssl_version) | 402 | if (NULL == curl_version_info (CURLVERSION_NOW)->ssl_version) |
diff --git a/src/testcurl/https/test_https_get_parallel.c b/src/testcurl/https/test_https_get_parallel.c index 3de7cfe7..cf318a46 100644 --- a/src/testcurl/https/test_https_get_parallel.c +++ b/src/testcurl/https/test_https_get_parallel.c | |||
@@ -31,9 +31,9 @@ | |||
31 | #include <limits.h> | 31 | #include <limits.h> |
32 | #include <curl/curl.h> | 32 | #include <curl/curl.h> |
33 | #include <pthread.h> | 33 | #include <pthread.h> |
34 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 34 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
35 | #include <gcrypt.h> | 35 | #include <gcrypt.h> |
36 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 36 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
37 | #include "tls_test_common.h" | 37 | #include "tls_test_common.h" |
38 | #include "tls_test_keys.h" | 38 | #include "tls_test_keys.h" |
39 | 39 | ||
diff --git a/src/testcurl/https/test_https_get_parallel_threads.c b/src/testcurl/https/test_https_get_parallel_threads.c index 08ee35e6..e8df1e14 100644 --- a/src/testcurl/https/test_https_get_parallel_threads.c +++ b/src/testcurl/https/test_https_get_parallel_threads.c | |||
@@ -33,9 +33,9 @@ | |||
33 | #include <limits.h> | 33 | #include <limits.h> |
34 | #include <curl/curl.h> | 34 | #include <curl/curl.h> |
35 | #include <pthread.h> | 35 | #include <pthread.h> |
36 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 36 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
37 | #include <gcrypt.h> | 37 | #include <gcrypt.h> |
38 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 38 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
39 | #include "tls_test_common.h" | 39 | #include "tls_test_common.h" |
40 | #include "tls_test_keys.h" | 40 | #include "tls_test_keys.h" |
41 | 41 | ||
@@ -152,11 +152,11 @@ main (int argc, char *const *argv) | |||
152 | /* initialize random seed used by curl clients */ | 152 | /* initialize random seed used by curl clients */ |
153 | iseed = (unsigned int) time (NULL); | 153 | iseed = (unsigned int) time (NULL); |
154 | 154 | ||
155 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 155 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
156 | #ifdef GCRYCTL_INITIALIZATION_FINISHED | 156 | #ifdef GCRYCTL_INITIALIZATION_FINISHED |
157 | gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); | 157 | gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); |
158 | #endif | 158 | #endif |
159 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 159 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
160 | srand (iseed); | 160 | srand (iseed); |
161 | if (! testsuite_curl_global_init ()) | 161 | if (! testsuite_curl_global_init ()) |
162 | return 99; | 162 | return 99; |
diff --git a/src/testcurl/https/test_https_get_select.c b/src/testcurl/https/test_https_get_select.c index 3b45323b..92774771 100644 --- a/src/testcurl/https/test_https_get_select.c +++ b/src/testcurl/https/test_https_get_select.c | |||
@@ -29,9 +29,9 @@ | |||
29 | #include <limits.h> | 29 | #include <limits.h> |
30 | #include <sys/stat.h> | 30 | #include <sys/stat.h> |
31 | #include <curl/curl.h> | 31 | #include <curl/curl.h> |
32 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 32 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
33 | #include <gcrypt.h> | 33 | #include <gcrypt.h> |
34 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 34 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
35 | #include "tls_test_common.h" | 35 | #include "tls_test_common.h" |
36 | #include "tls_test_keys.h" | 36 | #include "tls_test_keys.h" |
37 | 37 | ||
diff --git a/src/testcurl/https/test_https_multi_daemon.c b/src/testcurl/https/test_https_multi_daemon.c index 10e7f6ed..da60c543 100644 --- a/src/testcurl/https/test_https_multi_daemon.c +++ b/src/testcurl/https/test_https_multi_daemon.c | |||
@@ -29,9 +29,9 @@ | |||
29 | #include <curl/curl.h> | 29 | #include <curl/curl.h> |
30 | #include <limits.h> | 30 | #include <limits.h> |
31 | #include <sys/stat.h> | 31 | #include <sys/stat.h> |
32 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 32 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
33 | #include <gcrypt.h> | 33 | #include <gcrypt.h> |
34 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 34 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
35 | #include "tls_test_common.h" | 35 | #include "tls_test_common.h" |
36 | #include "tls_test_keys.h" | 36 | #include "tls_test_keys.h" |
37 | 37 | ||
@@ -132,12 +132,12 @@ main (int argc, char *const *argv) | |||
132 | const char *aes256_sha = "AES256-SHA"; | 132 | const char *aes256_sha = "AES256-SHA"; |
133 | (void) argc; (void) argv; /* Unused. Silent compiler warning. */ | 133 | (void) argc; (void) argv; /* Unused. Silent compiler warning. */ |
134 | 134 | ||
135 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 135 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
136 | gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); | 136 | gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); |
137 | #ifdef GCRYCTL_INITIALIZATION_FINISHED | 137 | #ifdef GCRYCTL_INITIALIZATION_FINISHED |
138 | gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); | 138 | gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); |
139 | #endif | 139 | #endif |
140 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 140 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
141 | if (! testsuite_curl_global_init ()) | 141 | if (! testsuite_curl_global_init ()) |
142 | return 99; | 142 | return 99; |
143 | if (NULL == curl_version_info (CURLVERSION_NOW)->ssl_version) | 143 | if (NULL == curl_version_info (CURLVERSION_NOW)->ssl_version) |
diff --git a/src/testcurl/https/test_https_session_info.c b/src/testcurl/https/test_https_session_info.c index fc6f82f7..12208ba7 100644 --- a/src/testcurl/https/test_https_session_info.c +++ b/src/testcurl/https/test_https_session_info.c | |||
@@ -29,9 +29,9 @@ | |||
29 | #include "platform.h" | 29 | #include "platform.h" |
30 | #include "microhttpd.h" | 30 | #include "microhttpd.h" |
31 | #include <curl/curl.h> | 31 | #include <curl/curl.h> |
32 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 32 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
33 | #include <gcrypt.h> | 33 | #include <gcrypt.h> |
34 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 34 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
35 | #include "tls_test_common.h" | 35 | #include "tls_test_common.h" |
36 | #include "tls_test_keys.h" | 36 | #include "tls_test_keys.h" |
37 | 37 | ||
@@ -200,12 +200,12 @@ main (int argc, char *const *argv) | |||
200 | const char *ssl_version; | 200 | const char *ssl_version; |
201 | (void) argc; /* Unused. Silent compiler warning. */ | 201 | (void) argc; /* Unused. Silent compiler warning. */ |
202 | 202 | ||
203 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 203 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
204 | gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); | 204 | gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); |
205 | #ifdef GCRYCTL_INITIALIZATION_FINISHED | 205 | #ifdef GCRYCTL_INITIALIZATION_FINISHED |
206 | gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); | 206 | gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); |
207 | #endif | 207 | #endif |
208 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 208 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
209 | if (! testsuite_curl_global_init ()) | 209 | if (! testsuite_curl_global_init ()) |
210 | return 99; | 210 | return 99; |
211 | 211 | ||
diff --git a/src/testcurl/https/test_https_sni.c b/src/testcurl/https/test_https_sni.c index 4ffe1d8f..3581aa17 100644 --- a/src/testcurl/https/test_https_sni.c +++ b/src/testcurl/https/test_https_sni.c | |||
@@ -28,9 +28,9 @@ | |||
28 | #include <limits.h> | 28 | #include <limits.h> |
29 | #include <sys/stat.h> | 29 | #include <sys/stat.h> |
30 | #include <curl/curl.h> | 30 | #include <curl/curl.h> |
31 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 31 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
32 | #include <gcrypt.h> | 32 | #include <gcrypt.h> |
33 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 33 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
34 | #include "tls_test_common.h" | 34 | #include "tls_test_common.h" |
35 | #include <gnutls/gnutls.h> | 35 | #include <gnutls/gnutls.h> |
36 | 36 | ||
@@ -264,12 +264,12 @@ main (int argc, char *const *argv) | |||
264 | else | 264 | else |
265 | port = 3060; | 265 | port = 3060; |
266 | 266 | ||
267 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 267 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
268 | gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); | 268 | gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); |
269 | #ifdef GCRYCTL_INITIALIZATION_FINISHED | 269 | #ifdef GCRYCTL_INITIALIZATION_FINISHED |
270 | gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); | 270 | gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); |
271 | #endif | 271 | #endif |
272 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 272 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
273 | if (! testsuite_curl_global_init ()) | 273 | if (! testsuite_curl_global_init ()) |
274 | return 99; | 274 | return 99; |
275 | tls_backend = curl_version_info (CURLVERSION_NOW)->ssl_version; | 275 | tls_backend = curl_version_info (CURLVERSION_NOW)->ssl_version; |
diff --git a/src/testcurl/https/test_https_time_out.c b/src/testcurl/https/test_https_time_out.c index 939101a6..b9e48363 100644 --- a/src/testcurl/https/test_https_time_out.c +++ b/src/testcurl/https/test_https_time_out.c | |||
@@ -30,9 +30,9 @@ | |||
30 | #include "platform.h" | 30 | #include "platform.h" |
31 | #include "microhttpd.h" | 31 | #include "microhttpd.h" |
32 | #include "tls_test_common.h" | 32 | #include "tls_test_common.h" |
33 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 33 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
34 | #include <gcrypt.h> | 34 | #include <gcrypt.h> |
35 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 35 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
36 | #ifdef HAVE_SIGNAL_H | 36 | #ifdef HAVE_SIGNAL_H |
37 | #include <signal.h> | 37 | #include <signal.h> |
38 | #endif /* HAVE_SIGNAL_H */ | 38 | #endif /* HAVE_SIGNAL_H */ |
@@ -208,12 +208,12 @@ main (int argc, char *const *argv) | |||
208 | #endif | 208 | #endif |
209 | #endif /* MHD_SEND_SPIPE_SUPPRESS_NEEDED */ | 209 | #endif /* MHD_SEND_SPIPE_SUPPRESS_NEEDED */ |
210 | 210 | ||
211 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 211 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
212 | gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); | 212 | gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); |
213 | #ifdef GCRYCTL_INITIALIZATION_FINISHED | 213 | #ifdef GCRYCTL_INITIALIZATION_FINISHED |
214 | gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); | 214 | gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); |
215 | #endif | 215 | #endif |
216 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 216 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
217 | if (GNUTLS_E_SUCCESS != gnutls_global_init ()) | 217 | if (GNUTLS_E_SUCCESS != gnutls_global_init ()) |
218 | { | 218 | { |
219 | fprintf (stderr, "Cannot initialize GnuTLS.\n"); | 219 | fprintf (stderr, "Cannot initialize GnuTLS.\n"); |
diff --git a/src/testcurl/https/test_tls_authentication.c b/src/testcurl/https/test_tls_authentication.c index 22d47b26..0bb87f42 100644 --- a/src/testcurl/https/test_tls_authentication.c +++ b/src/testcurl/https/test_tls_authentication.c | |||
@@ -29,9 +29,9 @@ | |||
29 | #include <curl/curl.h> | 29 | #include <curl/curl.h> |
30 | #include <limits.h> | 30 | #include <limits.h> |
31 | #include <sys/stat.h> | 31 | #include <sys/stat.h> |
32 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 32 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
33 | #include <gcrypt.h> | 33 | #include <gcrypt.h> |
34 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 34 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
35 | #include "tls_test_common.h" | 35 | #include "tls_test_common.h" |
36 | #include "tls_test_keys.h" | 36 | #include "tls_test_keys.h" |
37 | 37 | ||
@@ -90,12 +90,12 @@ main (int argc, char *const *argv) | |||
90 | (void) argc; | 90 | (void) argc; |
91 | (void) argv; /* Unused. Silent compiler warning. */ | 91 | (void) argv; /* Unused. Silent compiler warning. */ |
92 | 92 | ||
93 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 93 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
94 | gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); | 94 | gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); |
95 | #ifdef GCRYCTL_INITIALIZATION_FINISHED | 95 | #ifdef GCRYCTL_INITIALIZATION_FINISHED |
96 | gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); | 96 | gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); |
97 | #endif | 97 | #endif |
98 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 98 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
99 | if (! testsuite_curl_global_init ()) | 99 | if (! testsuite_curl_global_init ()) |
100 | return 99; | 100 | return 99; |
101 | if (NULL == curl_version_info (CURLVERSION_NOW)->ssl_version) | 101 | if (NULL == curl_version_info (CURLVERSION_NOW)->ssl_version) |
diff --git a/src/testcurl/https/test_tls_extensions.c b/src/testcurl/https/test_tls_extensions.c index 3fe4ef71..277bd010 100644 --- a/src/testcurl/https/test_tls_extensions.c +++ b/src/testcurl/https/test_tls_extensions.c | |||
@@ -29,9 +29,9 @@ | |||
29 | #include "microhttpd.h" | 29 | #include "microhttpd.h" |
30 | #include "tls_test_common.h" | 30 | #include "tls_test_common.h" |
31 | #include "mhd_sockets.h" /* only macros used */ | 31 | #include "mhd_sockets.h" /* only macros used */ |
32 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 32 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
33 | #include <gcrypt.h> | 33 | #include <gcrypt.h> |
34 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 34 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
35 | #include "tls_test_keys.h" | 35 | #include "tls_test_keys.h" |
36 | 36 | ||
37 | #define MAX_EXT_DATA_LENGTH 256 | 37 | #define MAX_EXT_DATA_LENGTH 256 |
@@ -220,12 +220,12 @@ main (int argc, char *const *argv) | |||
220 | else | 220 | else |
221 | port = 3080; | 221 | port = 3080; |
222 | 222 | ||
223 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 223 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
224 | gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); | 224 | gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); |
225 | #ifdef GCRYCTL_INITIALIZATION_FINISHED | 225 | #ifdef GCRYCTL_INITIALIZATION_FINISHED |
226 | gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); | 226 | gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); |
227 | #endif | 227 | #endif |
228 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 228 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
229 | MHD_gtls_global_set_log_level (11); | 229 | MHD_gtls_global_set_log_level (11); |
230 | 230 | ||
231 | if ((test_fd = setup_test_file ()) == NULL) | 231 | if ((test_fd = setup_test_file ()) == NULL) |
diff --git a/src/testcurl/https/test_tls_options.c b/src/testcurl/https/test_tls_options.c index 8c67a0c6..7e15e3ca 100644 --- a/src/testcurl/https/test_tls_options.c +++ b/src/testcurl/https/test_tls_options.c | |||
@@ -28,9 +28,9 @@ | |||
28 | #include "microhttpd.h" | 28 | #include "microhttpd.h" |
29 | #include <sys/stat.h> | 29 | #include <sys/stat.h> |
30 | #include <limits.h> | 30 | #include <limits.h> |
31 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 31 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
32 | #include <gcrypt.h> | 32 | #include <gcrypt.h> |
33 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 33 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
34 | #include "tls_test_common.h" | 34 | #include "tls_test_common.h" |
35 | #include "tls_test_keys.h" | 35 | #include "tls_test_keys.h" |
36 | 36 | ||
@@ -100,13 +100,13 @@ main (int argc, char *const *argv) | |||
100 | else | 100 | else |
101 | port = 3010; | 101 | port = 3010; |
102 | 102 | ||
103 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 103 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
104 | gcry_control (GCRYCTL_DISABLE_SECMEM, 0); | 104 | gcry_control (GCRYCTL_DISABLE_SECMEM, 0); |
105 | gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); | 105 | gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); |
106 | #ifdef GCRYCTL_INITIALIZATION_FINISHED | 106 | #ifdef GCRYCTL_INITIALIZATION_FINISHED |
107 | gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); | 107 | gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); |
108 | #endif | 108 | #endif |
109 | #endif /* MHD_HTTPS_REQUIRE_GRYPT */ | 109 | #endif /* MHD_HTTPS_REQUIRE_GCRYPT */ |
110 | if (! testsuite_curl_global_init ()) | 110 | if (! testsuite_curl_global_init ()) |
111 | return 99; | 111 | return 99; |
112 | 112 | ||