Dropped dependency on libgcrypt with new GnuTLS (>2.12.20) versions

This commit is contained in:
Evgeny Grin (Karlson2k)
2017-06-20 23:55:34 +03:00
parent 6364c4700d
commit a7b7a32ec6
19 changed files with 198 additions and 44 deletions
@@ -27,7 +27,9 @@
#include "platform.h"
#include "microhttpd.h"
#include <curl/curl.h>
#ifdef MHD_HTTPS_REQUIRE_GRYPT
#include <gcrypt.h>
#endif /* MHD_HTTPS_REQUIRE_GRYPT */
#include "tls_test_common.h"
extern int curl_check_version (const char *req_version, ...);
@@ -173,10 +175,12 @@ main (int argc, char *const *argv)
unsigned int errorCount = 0;
const char *ssl_version;
#ifdef MHD_HTTPS_REQUIRE_GRYPT
gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
#ifdef GCRYCTL_INITIALIZATION_FINISHED
gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
#endif
#endif /* MHD_HTTPS_REQUIRE_GRYPT */
if (0 != curl_global_init (CURL_GLOBAL_ALL))
{
fprintf (stderr, "Error (code: %u)\n", errorCount);