[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29485 - in libmicrohttpd/src: microhttpd testcurl testcurl
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r29485 - in libmicrohttpd/src: microhttpd testcurl testcurl/https |
|
Date: |
Mon, 23 Sep 2013 14:09:46 +0200 |
Author: grothoff
Date: 2013-09-23 14:09:46 +0200 (Mon, 23 Sep 2013)
New Revision: 29485
Modified:
libmicrohttpd/src/microhttpd/daemon.c
libmicrohttpd/src/testcurl/https/test_empty_response.c
libmicrohttpd/src/testcurl/https/test_https_get.c
libmicrohttpd/src/testcurl/https/test_https_get_parallel.c
libmicrohttpd/src/testcurl/https/test_https_get_parallel_threads.c
libmicrohttpd/src/testcurl/https/test_https_get_select.c
libmicrohttpd/src/testcurl/https/test_https_multi_daemon.c
libmicrohttpd/src/testcurl/https/test_https_session_info.c
libmicrohttpd/src/testcurl/https/test_https_time_out.c
libmicrohttpd/src/testcurl/https/test_tls_authentication.c
libmicrohttpd/src/testcurl/https/test_tls_extensions.c
libmicrohttpd/src/testcurl/https/test_tls_options.c
libmicrohttpd/src/testcurl/test_digestauth.c
libmicrohttpd/src/testcurl/test_digestauth_with_arguments.c
libmicrohttpd/src/testcurl/test_postform.c
Log:
fully initialze modern gcrypt in MHD_init, only use thread initialization with
legacy libgcrypt, update tests accordingly
Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c 2013-09-23 11:52:28 UTC (rev
29484)
+++ libmicrohttpd/src/microhttpd/daemon.c 2013-09-23 12:09:46 UTC (rev
29485)
@@ -3841,8 +3841,10 @@
#endif // __GNUC__
#if HTTPS_SUPPORT
+#if GCRYPT_VERSION_NUMBER < 0x010600
GCRY_THREAD_OPTION_PTHREAD_IMPL;
#endif
+#endif
/**
@@ -3856,9 +3858,12 @@
#ifdef WINDOWS
plibc_init ("GNU", "libmicrohttpd");
-#endif
+#endif#
#if HTTPS_SUPPORT
+#if GCRYPT_VERSION_NUMBER < 0x010600
gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+#endif
+ gcry_check_version (NULL);
gnutls_global_init ();
#endif
}
Modified: libmicrohttpd/src/testcurl/https/test_empty_response.c
===================================================================
--- libmicrohttpd/src/testcurl/https/test_empty_response.c 2013-09-23
11:52:28 UTC (rev 29484)
+++ libmicrohttpd/src/testcurl/https/test_empty_response.c 2013-09-23
12:09:46 UTC (rev 29485)
@@ -183,16 +183,12 @@
return 0;
}
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
int
main (int argc, char *const *argv)
{
unsigned int errorCount = 0;
- gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
- if (!gcry_check_version (GCRYPT_VERSION))
- abort ();
if (0 != curl_global_init (CURL_GLOBAL_ALL))
{
fprintf (stderr, "Error: %s\n", strerror (errno));
Modified: libmicrohttpd/src/testcurl/https/test_https_get.c
===================================================================
--- libmicrohttpd/src/testcurl/https/test_https_get.c 2013-09-23 11:52:28 UTC
(rev 29484)
+++ libmicrohttpd/src/testcurl/https/test_https_get.c 2013-09-23 12:09:46 UTC
(rev 29485)
@@ -95,9 +95,6 @@
}
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
-
-
int
main (int argc, char *const *argv)
{
@@ -106,11 +103,7 @@
const char *aes256_sha_sslv3 = "AES256-SHA";
const char *des_cbc3_sha_tlsv1 = "DES-CBC3-SHA";
-
- if (!gcry_check_version (GCRYPT_VERSION))
- abort ();
gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
- gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
#ifdef GCRYCTL_INITIALIZATION_FINISHED
gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
#endif
Modified: libmicrohttpd/src/testcurl/https/test_https_get_parallel.c
===================================================================
--- libmicrohttpd/src/testcurl/https/test_https_get_parallel.c 2013-09-23
11:52:28 UTC (rev 29484)
+++ libmicrohttpd/src/testcurl/https/test_https_get_parallel.c 2013-09-23
12:09:46 UTC (rev 29485)
@@ -121,7 +121,6 @@
return 0;
}
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
int
main (int argc, char *const *argv)
@@ -132,7 +131,6 @@
/* initialize random seed used by curl clients */
unsigned int iseed = (unsigned int) time (NULL);
srand (iseed);
- gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
if (0 != curl_global_init (CURL_GLOBAL_ALL))
{
fprintf (stderr, "Error: %s\n", strerror (errno));
Modified: libmicrohttpd/src/testcurl/https/test_https_get_parallel_threads.c
===================================================================
--- libmicrohttpd/src/testcurl/https/test_https_get_parallel_threads.c
2013-09-23 11:52:28 UTC (rev 29484)
+++ libmicrohttpd/src/testcurl/https/test_https_get_parallel_threads.c
2013-09-23 12:09:46 UTC (rev 29485)
@@ -123,10 +123,6 @@
}
-
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
-
-
int
main (int argc, char *const *argv)
{
@@ -136,9 +132,6 @@
/* initialize random seed used by curl clients */
unsigned int iseed = (unsigned int) time (NULL);
-
- gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
- gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
#ifdef GCRYCTL_INITIALIZATION_FINISHED
gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
#endif
Modified: libmicrohttpd/src/testcurl/https/test_https_get_select.c
===================================================================
--- libmicrohttpd/src/testcurl/https/test_https_get_select.c 2013-09-23
11:52:28 UTC (rev 29484)
+++ libmicrohttpd/src/testcurl/https/test_https_get_select.c 2013-09-23
12:09:46 UTC (rev 29485)
@@ -206,16 +206,12 @@
return 0;
}
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
int
main (int argc, char *const *argv)
{
unsigned int errorCount = 0;
- gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
- if (!gcry_check_version (GCRYPT_VERSION))
- abort ();
if (0 != curl_global_init (CURL_GLOBAL_ALL))
{
fprintf (stderr, "Error: %s\n", strerror (errno));
Modified: libmicrohttpd/src/testcurl/https/test_https_multi_daemon.c
===================================================================
--- libmicrohttpd/src/testcurl/https/test_https_multi_daemon.c 2013-09-23
11:52:28 UTC (rev 29484)
+++ libmicrohttpd/src/testcurl/https/test_https_multi_daemon.c 2013-09-23
12:09:46 UTC (rev 29485)
@@ -91,9 +91,6 @@
}
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
-
-
int
main (int argc, char *const *argv)
{
@@ -101,7 +98,6 @@
FILE *cert;
gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
- gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
#ifdef GCRYCTL_INITIALIZATION_FINISHED
gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
#endif
Modified: libmicrohttpd/src/testcurl/https/test_https_session_info.c
===================================================================
--- libmicrohttpd/src/testcurl/https/test_https_session_info.c 2013-09-23
11:52:28 UTC (rev 29484)
+++ libmicrohttpd/src/testcurl/https/test_https_session_info.c 2013-09-23
12:09:46 UTC (rev 29485)
@@ -151,16 +151,12 @@
}
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
-
-
int
main (int argc, char *const *argv)
{
unsigned int errorCount = 0;
gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
- gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
#ifdef GCRYCTL_INITIALIZATION_FINISHED
gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
#endif
Modified: libmicrohttpd/src/testcurl/https/test_https_time_out.c
===================================================================
--- libmicrohttpd/src/testcurl/https/test_https_time_out.c 2013-09-23
11:52:28 UTC (rev 29484)
+++ libmicrohttpd/src/testcurl/https/test_https_time_out.c 2013-09-23
12:09:46 UTC (rev 29485)
@@ -90,7 +90,6 @@
return 0;
}
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
int
main (int argc, char *const *argv)
@@ -104,7 +103,6 @@
gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
- gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
#ifdef GCRYCTL_INITIALIZATION_FINISHED
gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
#endif
Modified: libmicrohttpd/src/testcurl/https/test_tls_authentication.c
===================================================================
--- libmicrohttpd/src/testcurl/https/test_tls_authentication.c 2013-09-23
11:52:28 UTC (rev 29484)
+++ libmicrohttpd/src/testcurl/https/test_tls_authentication.c 2013-09-23
12:09:46 UTC (rev 29485)
@@ -69,16 +69,12 @@
}
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
-
-
int
main (int argc, char *const *argv)
{
unsigned int errorCount = 0;
gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
- gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
#ifdef GCRYCTL_INITIALIZATION_FINISHED
gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
#endif
Modified: libmicrohttpd/src/testcurl/https/test_tls_extensions.c
===================================================================
--- libmicrohttpd/src/testcurl/https/test_tls_extensions.c 2013-09-23
11:52:28 UTC (rev 29484)
+++ libmicrohttpd/src/testcurl/https/test_tls_extensions.c 2013-09-23
12:09:46 UTC (rev 29485)
@@ -193,7 +193,6 @@
return ret;
}
-GCRY_THREAD_OPTION_PTHREAD_IMPL
int
main (int argc, char *const *argv)
@@ -206,13 +205,12 @@
gnutls_datum_t cert;
gnutls_certificate_credentials_t xcred;
- int ext_arr[] = { GNUTLS_EXTENSION_SERVER_NAME,
+ const int ext_arr[] = {
+ GNUTLS_EXTENSION_SERVER_NAME,
-1
};
-
gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
- gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
#ifdef GCRYCTL_INITIALIZATION_FINISHED
gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
#endif
Modified: libmicrohttpd/src/testcurl/https/test_tls_options.c
===================================================================
--- libmicrohttpd/src/testcurl/https/test_tls_options.c 2013-09-23 11:52:28 UTC
(rev 29484)
+++ libmicrohttpd/src/testcurl/https/test_tls_options.c 2013-09-23 12:09:46 UTC
(rev 29485)
@@ -75,7 +75,6 @@
return 0;
}
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
/* setup a temporary transfer test file */
int
@@ -83,12 +82,11 @@
{
unsigned int errorCount = 0;
const char *ssl_version;
-
int daemon_flags =
MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL | MHD_USE_DEBUG;
+
gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
- gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
#ifdef GCRYCTL_INITIALIZATION_FINISHED
gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
#endif
Modified: libmicrohttpd/src/testcurl/test_digestauth.c
===================================================================
--- libmicrohttpd/src/testcurl/test_digestauth.c 2013-09-23 11:52:28 UTC
(rev 29484)
+++ libmicrohttpd/src/testcurl/test_digestauth.c 2013-09-23 12:09:46 UTC
(rev 29485)
@@ -222,7 +222,6 @@
return 0;
}
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
int
@@ -231,7 +230,6 @@
unsigned int errorCount = 0;
gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
- gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
#ifdef GCRYCTL_INITIALIZATION_FINISHED
gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
#endif
Modified: libmicrohttpd/src/testcurl/test_digestauth_with_arguments.c
===================================================================
--- libmicrohttpd/src/testcurl/test_digestauth_with_arguments.c 2013-09-23
11:52:28 UTC (rev 29484)
+++ libmicrohttpd/src/testcurl/test_digestauth_with_arguments.c 2013-09-23
12:09:46 UTC (rev 29485)
@@ -222,16 +222,12 @@
}
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
-
-
int
main (int argc, char *const *argv)
{
unsigned int errorCount = 0;
gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
- gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
#ifdef GCRYCTL_INITIALIZATION_FINISHED
gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
#endif
Modified: libmicrohttpd/src/testcurl/test_postform.c
===================================================================
--- libmicrohttpd/src/testcurl/test_postform.c 2013-09-23 11:52:28 UTC (rev
29484)
+++ libmicrohttpd/src/testcurl/test_postform.c 2013-09-23 12:09:46 UTC (rev
29485)
@@ -463,16 +463,12 @@
}
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
-
-
int
main (int argc, char *const *argv)
{
unsigned int errorCount = 0;
gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
- gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
#ifdef GCRYCTL_INITIALIZATION_FINISHED
gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29485 - in libmicrohttpd/src: microhttpd testcurl testcurl/https,
gnunet <=