From ae6071dcd2aa7e8eb2d4765e1633aa75eed89e0c Mon Sep 17 00:00:00 2001 From: "Evgeny Grin (Karlson2k)" Date: Sun, 12 Dec 2021 20:56:47 +0300 Subject: GnuTLS: correctly pass sockets on W32 x64 --- src/microhttpd/daemon.c | 2 +- src/microhttpd/test_upgrade.c | 6 +++--- src/microhttpd/test_upgrade_large.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index a75dd0c0..0c9ee2e8 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c @@ -2646,7 +2646,7 @@ new_connection_prepare_ (struct MHD_Daemon *daemon, #else /* GnuTLS before 3.1.9 or Win x64 */ gnutls_transport_set_ptr (connection->tls_session, (gnutls_transport_ptr_t) (intptr_t) (client_socket)); -#endif /* GnuTLS before 3.1.9 */ +#endif /* GnuTLS before 3.1.9 or Win x64 */ #ifdef MHD_TLSLIB_NEED_PUSH_FUNC gnutls_transport_set_push_function (connection->tls_session, MHD_tls_push_func_); diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c index 111c6a79..950a5fb4 100644 --- a/src/microhttpd/test_upgrade.c +++ b/src/microhttpd/test_upgrade.c @@ -235,12 +235,12 @@ wr_create_tls_sckt (void) GNUTLS_CRD_CERTIFICATE, s->tls_crd)) { -#if GNUTLS_VERSION_NUMBER + 0 >= 0x030109 +#if (GNUTLS_VERSION_NUMBER + 0 >= 0x030109) && ! defined(_WIN64) gnutls_transport_set_int (s->tls_s, (int) (s->fd)); -#else /* GnuTLS before 3.1.9 */ +#else /* GnuTLS before 3.1.9 or Win x64 */ gnutls_transport_set_ptr (s->tls_s, (gnutls_transport_ptr_t) (intptr_t) (s->fd)); -#endif /* GnuTLS before 3.1.9 */ +#endif /* GnuTLS before 3.1.9 or Win x64 */ return s; } gnutls_certificate_free_credentials (s->tls_crd); diff --git a/src/microhttpd/test_upgrade_large.c b/src/microhttpd/test_upgrade_large.c index 3393a749..c321080e 100644 --- a/src/microhttpd/test_upgrade_large.c +++ b/src/microhttpd/test_upgrade_large.c @@ -400,12 +400,12 @@ wr_create_tls_sckt (void) GNUTLS_CRD_CERTIFICATE, s->tls_crd)) { -#if GNUTLS_VERSION_NUMBER + 0 >= 0x030109 +#if (GNUTLS_VERSION_NUMBER + 0 >= 0x030109) && ! defined(_WIN64) gnutls_transport_set_int (s->tls_s, (int) (s->fd)); -#else /* GnuTLS before 3.1.9 */ +#else /* GnuTLS before 3.1.9 or Win x64 */ gnutls_transport_set_ptr (s->tls_s, (gnutls_transport_ptr_t) (intptr_t) (s->fd)); -#endif /* GnuTLS before 3.1.9 */ +#endif /* GnuTLS before 3.1.9 or Win x64 */ return s; } gnutls_certificate_free_credentials (s->tls_crd); -- cgit v1.2.3