From 1e288041bd2895ae80cd6e6c62e3511262510cde Mon Sep 17 00:00:00 2001 From: "Evgeny Grin (Karlson2k)" Date: Fri, 23 Sep 2022 19:09:08 +0300 Subject: Fixed initialisation of old GnuTLS versions --- src/gnutls/init.c | 16 ++++++++-------- src/microhttpd/daemon.c | 14 ++++++++------ src/testcurl/https/test_empty_response.c | 4 ++-- src/testcurl/https/test_https_get.c | 8 ++++---- src/testcurl/https/test_https_get_iovec.c | 8 ++++---- src/testcurl/https/test_https_get_parallel.c | 4 ++-- src/testcurl/https/test_https_get_parallel_threads.c | 8 ++++---- src/testcurl/https/test_https_get_select.c | 4 ++-- src/testcurl/https/test_https_multi_daemon.c | 8 ++++---- src/testcurl/https/test_https_session_info.c | 8 ++++---- src/testcurl/https/test_https_sni.c | 8 ++++---- src/testcurl/https/test_https_time_out.c | 8 ++++---- src/testcurl/https/test_tls_authentication.c | 8 ++++---- src/testcurl/https/test_tls_extensions.c | 8 ++++---- src/testcurl/https/test_tls_options.c | 8 ++++---- src/testcurl/test_basicauth.c | 4 ++-- src/testcurl/test_digestauth.c | 8 ++++---- src/testcurl/test_digestauth_concurrent.c | 8 ++++---- src/testcurl/test_digestauth_sha256.c | 8 ++++---- src/testcurl/test_digestauth_with_arguments.c | 8 ++++---- src/testcurl/test_postform.c | 8 ++++---- 21 files changed, 84 insertions(+), 82 deletions(-) diff --git a/src/gnutls/init.c b/src/gnutls/init.c index 638f629c..4c47d162 100644 --- a/src/gnutls/init.c +++ b/src/gnutls/init.c @@ -26,7 +26,7 @@ #include "init.h" -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #if defined(HTTPS_SUPPORT) && GCRYPT_VERSION_NUMBER < 0x010600 #if defined(MHD_USE_POSIX_THREADS) GCRY_THREAD_OPTION_PTHREAD_IMPL; @@ -40,7 +40,7 @@ gcry_w32_mutex_init (void **ppmtx) if (NULL == *ppmtx) return ENOMEM; - if (! MHD_mutex_init_ ((MHD_mutex_*) *ppmtx)) + if (! MHD_mutex_init_ ((MHD_mutex_ *) *ppmtx)) { free (*ppmtx); *ppmtx = NULL; @@ -53,7 +53,7 @@ gcry_w32_mutex_init (void **ppmtx) static int gcry_w32_mutex_destroy (void **ppmtx) { - int res = (MHD_mutex_destroy_ ((MHD_mutex_*) *ppmtx)) ? 0 : EINVAL; + int res = (MHD_mutex_destroy_ ((MHD_mutex_ *) *ppmtx)) ? 0 : EINVAL; free (*ppmtx); return res; } @@ -62,14 +62,14 @@ gcry_w32_mutex_destroy (void **ppmtx) static int gcry_w32_mutex_lock (void **ppmtx) { - return MHD_mutex_lock_ ((MHD_mutex_*) *ppmtx) ? 0 : EINVAL; + return MHD_mutex_lock_ ((MHD_mutex_ *) *ppmtx) ? 0 : EINVAL; } static int gcry_w32_mutex_unlock (void **ppmtx) { - return MHD_mutex_unlock_ ((MHD_mutex_*) *ppmtx) ? 0 : EINVAL; + return MHD_mutex_unlock_ ((MHD_mutex_ *) *ppmtx) ? 0 : EINVAL; } @@ -82,7 +82,7 @@ static struct gcry_thread_cbs gcry_threads_w32 = { #endif /* defined(MHD_W32_MUTEX_) */ #endif /* HTTPS_SUPPORT && GCRYPT_VERSION_NUMBER < 0x010600 */ -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ #ifndef _AUTOINIT_FUNCS_ARE_SUPPORTED @@ -129,7 +129,7 @@ MHD_TLS_init (void) WSADATA wsd; #endif /* _WIN32 && ! __CYGWIN__ */ -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #if GCRYPT_VERSION_NUMBER < 0x010600 #if defined(MHD_USE_POSIX_THREADS) if (0 != gcry_control (GCRYCTL_SET_THREAD_CBS, @@ -146,7 +146,7 @@ MHD_TLS_init (void) MHD_PANIC (_ ( "libgcrypt is too old. MHD was compiled for libgcrypt 1.6.0 or newer.\n")); #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ gnutls_global_init (); } diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index fc293a1f..bb9daa52 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c @@ -55,9 +55,9 @@ #ifdef HTTPS_SUPPORT #include "connection_https.h" -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #include -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ #endif /* HTTPS_SUPPORT */ #if defined(_WIN32) && ! defined(__CYGWIN__) @@ -8473,7 +8473,7 @@ MHD_is_feature_supported (enum MHD_FEATURE feature) } -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #if defined(HTTPS_SUPPORT) && GCRYPT_VERSION_NUMBER < 0x010600 #if defined(MHD_USE_POSIX_THREADS) GCRY_THREAD_OPTION_PTHREAD_IMPL; @@ -8529,7 +8529,7 @@ static struct gcry_thread_cbs gcry_threads_w32 = { #endif /* defined(MHD_W32_MUTEX_) */ #endif /* HTTPS_SUPPORT && GCRYPT_VERSION_NUMBER < 0x010600 */ -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ /** * Initialize do setup work. @@ -8551,8 +8551,9 @@ MHD_init (void) MHD_PANIC (_ ("Winsock version 2.2 is not available.\n")); #endif /* MHD_WINSOCK_SOCKETS */ #ifdef HTTPS_SUPPORT -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #if GCRYPT_VERSION_NUMBER < 0x010600 +#if GNUTLS_VERSION_NUMBER <= 0x020b00 #if defined(MHD_USE_POSIX_THREADS) if (0 != gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread)) @@ -8562,13 +8563,14 @@ MHD_init (void) &gcry_threads_w32)) MHD_PANIC (_ ("Failed to initialise multithreading in libgcrypt.\n")); #endif /* defined(MHD_W32_MUTEX_) */ +#endif /* GNUTLS_VERSION_NUMBER <= 0x020b00 */ gcry_check_version (NULL); #else if (NULL == gcry_check_version ("1.6.0")) MHD_PANIC (_ ( "libgcrypt is too old. MHD was compiled for libgcrypt 1.6.0 or newer.\n")); #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ gnutls_global_init (); #endif /* HTTPS_SUPPORT */ MHD_monotonic_sec_counter_init (); 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 @@ #include #include #include -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #include -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ #include "tls_test_common.h" #include "tls_test_keys.h" 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 @@ #include #include #include -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #include -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ #include "tls_test_common.h" #include "tls_test_keys.h" @@ -234,12 +234,12 @@ main (int argc, char *const *argv) const char *aes256_sha_tlsv1 = "AES256-SHA"; (void) argc; (void) argv; /* Unused. Silent compiler warning. */ -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); #ifdef GCRYCTL_INITIALIZATION_FINISHED gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ if (! testsuite_curl_global_init ()) return 99; 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 @@ #include #include #include -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #include -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ #include "tls_test_common.h" #include "tls_test_keys.h" @@ -391,12 +391,12 @@ main (int argc, char *const *argv) const char *aes256_sha_tlsv1 = "AES256-SHA"; (void) argc; (void) argv; /* Unused. Silent compiler warning. */ -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); #ifdef GCRYCTL_INITIALIZATION_FINISHED gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ if (! testsuite_curl_global_init ()) return 99; 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 @@ #include #include #include -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #include -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ #include "tls_test_common.h" #include "tls_test_keys.h" 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 @@ #include #include #include -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #include -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ #include "tls_test_common.h" #include "tls_test_keys.h" @@ -152,11 +152,11 @@ main (int argc, char *const *argv) /* initialize random seed used by curl clients */ iseed = (unsigned int) time (NULL); -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #ifdef GCRYCTL_INITIALIZATION_FINISHED gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ srand (iseed); if (! testsuite_curl_global_init ()) 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 @@ #include #include #include -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #include -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ #include "tls_test_common.h" #include "tls_test_keys.h" 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 @@ #include #include #include -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #include -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ #include "tls_test_common.h" #include "tls_test_keys.h" @@ -132,12 +132,12 @@ main (int argc, char *const *argv) const char *aes256_sha = "AES256-SHA"; (void) argc; (void) argv; /* Unused. Silent compiler warning. */ -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); #ifdef GCRYCTL_INITIALIZATION_FINISHED gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ if (! testsuite_curl_global_init ()) return 99; 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 @@ #include "platform.h" #include "microhttpd.h" #include -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #include -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ #include "tls_test_common.h" #include "tls_test_keys.h" @@ -200,12 +200,12 @@ main (int argc, char *const *argv) const char *ssl_version; (void) argc; /* Unused. Silent compiler warning. */ -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); #ifdef GCRYCTL_INITIALIZATION_FINISHED gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ if (! testsuite_curl_global_init ()) return 99; 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 @@ #include #include #include -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #include -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ #include "tls_test_common.h" #include @@ -264,12 +264,12 @@ main (int argc, char *const *argv) else port = 3060; -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); #ifdef GCRYCTL_INITIALIZATION_FINISHED gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ if (! testsuite_curl_global_init ()) return 99; 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 @@ #include "platform.h" #include "microhttpd.h" #include "tls_test_common.h" -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #include -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ #ifdef HAVE_SIGNAL_H #include #endif /* HAVE_SIGNAL_H */ @@ -208,12 +208,12 @@ main (int argc, char *const *argv) #endif #endif /* MHD_SEND_SPIPE_SUPPRESS_NEEDED */ -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); #ifdef GCRYCTL_INITIALIZATION_FINISHED gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ if (GNUTLS_E_SUCCESS != gnutls_global_init ()) { 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 @@ #include #include #include -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #include -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ #include "tls_test_common.h" #include "tls_test_keys.h" @@ -90,12 +90,12 @@ main (int argc, char *const *argv) (void) argc; (void) argv; /* Unused. Silent compiler warning. */ -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); #ifdef GCRYCTL_INITIALIZATION_FINISHED gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ if (! testsuite_curl_global_init ()) return 99; 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 @@ #include "microhttpd.h" #include "tls_test_common.h" #include "mhd_sockets.h" /* only macros used */ -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #include -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ #include "tls_test_keys.h" #define MAX_EXT_DATA_LENGTH 256 @@ -220,12 +220,12 @@ main (int argc, char *const *argv) else port = 3080; -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); #ifdef GCRYCTL_INITIALIZATION_FINISHED gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ MHD_gtls_global_set_log_level (11); 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 @@ #include "microhttpd.h" #include #include -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #include -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ #include "tls_test_common.h" #include "tls_test_keys.h" @@ -100,13 +100,13 @@ main (int argc, char *const *argv) else port = 3010; -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT gcry_control (GCRYCTL_DISABLE_SECMEM, 0); gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); #ifdef GCRYCTL_INITIALIZATION_FINISHED gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ if (! testsuite_curl_global_init ()) return 99; diff --git a/src/testcurl/test_basicauth.c b/src/testcurl/test_basicauth.c index ed0406db..f9ce2455 100644 --- a/src/testcurl/test_basicauth.c +++ b/src/testcurl/test_basicauth.c @@ -721,14 +721,14 @@ main (int argc, char *const *argv) } #endif /* libcurl version before 7.21.3 */ -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #ifdef HAVE_GCRYPT_H gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); #ifdef GCRYCTL_INITIALIZATION_FINISHED gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); #endif #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ oldapi = has_in_name (argv[0], "_oldapi"); if (0 != curl_global_init (CURL_GLOBAL_WIN32)) return 2; diff --git a/src/testcurl/test_digestauth.c b/src/testcurl/test_digestauth.c index 61b5b647..387d8abf 100644 --- a/src/testcurl/test_digestauth.c +++ b/src/testcurl/test_digestauth.c @@ -33,11 +33,11 @@ #include #include #include -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #ifdef HAVE_GCRYPT_H #include #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ #ifndef WINDOWS #include @@ -491,14 +491,14 @@ main (int argc, char *const *argv) unsigned int errorCount = 0; (void) argc; (void) argv; /* Unused. Silent compiler warning. */ -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #ifdef HAVE_GCRYPT_H gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); #ifdef GCRYCTL_INITIALIZATION_FINISHED gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); #endif #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ if (0 != curl_global_init (CURL_GLOBAL_WIN32)) return 2; errorCount += testDigestAuth (); diff --git a/src/testcurl/test_digestauth_concurrent.c b/src/testcurl/test_digestauth_concurrent.c index efda16b6..d2bcfd47 100644 --- a/src/testcurl/test_digestauth_concurrent.c +++ b/src/testcurl/test_digestauth_concurrent.c @@ -33,11 +33,11 @@ #include #include #include -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #ifdef HAVE_GCRYPT_H #include #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ #ifndef WINDOWS #include @@ -669,14 +669,14 @@ main (int argc, char *const *argv) has_param (argc, argv, "-s") || has_param (argc, argv, "--silent")); - #ifdef MHD_HTTPS_REQUIRE_GRYPT + #ifdef MHD_HTTPS_REQUIRE_GCRYPT #ifdef HAVE_GCRYPT_H gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); #ifdef GCRYCTL_INITIALIZATION_FINISHED gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); #endif #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ if (0 != curl_global_init (CURL_GLOBAL_WIN32)) return 2; errorCount += testDigestAuth (); diff --git a/src/testcurl/test_digestauth_sha256.c b/src/testcurl/test_digestauth_sha256.c index 093fe263..0781c44c 100644 --- a/src/testcurl/test_digestauth_sha256.c +++ b/src/testcurl/test_digestauth_sha256.c @@ -34,11 +34,11 @@ #include #include #include -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #ifdef HAVE_GCRYPT_H #include #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ #ifndef WINDOWS #include @@ -320,14 +320,14 @@ main (int argc, char *const *argv) /* curl added SHA256 support in 7.57 = 7.0x39 */ if (d->version_num < 0x073900) return 77; /* skip test, curl is too old */ -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #ifdef HAVE_GCRYPT_H gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); #ifdef GCRYCTL_INITIALIZATION_FINISHED gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); #endif #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ if (0 != curl_global_init (CURL_GLOBAL_WIN32)) return 2; errorCount += testDigestAuth (); diff --git a/src/testcurl/test_digestauth_with_arguments.c b/src/testcurl/test_digestauth_with_arguments.c index aabf1b7e..09d70674 100644 --- a/src/testcurl/test_digestauth_with_arguments.c +++ b/src/testcurl/test_digestauth_with_arguments.c @@ -32,11 +32,11 @@ #include #include #include -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #ifdef HAVE_GCRYPT_H #include #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ #ifndef WINDOWS #include @@ -289,14 +289,14 @@ main (int argc, char *const *argv) } #endif /* libcurl version 7.62.x */ -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #ifdef HAVE_GCRYPT_H gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); #ifdef GCRYCTL_INITIALIZATION_FINISHED gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); #endif #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ if (0 != curl_global_init (CURL_GLOBAL_WIN32)) return 2; errorCount += testDigestAuth (); diff --git a/src/testcurl/test_postform.c b/src/testcurl/test_postform.c index a2dfd41d..1ada80e2 100644 --- a/src/testcurl/test_postform.c +++ b/src/testcurl/test_postform.c @@ -33,11 +33,11 @@ #include #include #include -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #ifdef HAVE_GCRYPT_H #include #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ #ifndef WINDOWS #include @@ -624,14 +624,14 @@ main (int argc, char *const *argv) unsigned int errorCount = 0; (void) argc; /* Unused. Silent compiler warning. */ -#ifdef MHD_HTTPS_REQUIRE_GRYPT +#ifdef MHD_HTTPS_REQUIRE_GCRYPT #ifdef HAVE_GCRYPT_H gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); #ifdef GCRYCTL_INITIALIZATION_FINISHED gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); #endif #endif -#endif /* MHD_HTTPS_REQUIRE_GRYPT */ +#endif /* MHD_HTTPS_REQUIRE_GCRYPT */ if ((NULL == argv) || (0 == argv[0])) return 99; oneone = has_in_name (argv[0], "11"); -- cgit v1.2.3