Hans Leidekker : secur32: Use blocking mode for DTLS sessions.
Alexandre Julliard
julliard at winehq.org
Tue Jun 29 15:58:27 CDT 2021
Module: wine
Branch: master
Commit: b8aaf86b2dbb8ecb3f7094cc40a0df89bb2add27
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8aaf86b2dbb8ecb3f7094cc40a0df89bb2add27
Author: Hans Leidekker <hans at codeweavers.com>
Date: Tue Jun 29 13:56:41 2021 +0200
secur32: Use blocking mode for DTLS sessions.
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/secur32/schannel.c | 7 +------
dlls/secur32/schannel_gnutls.c | 6 +-----
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c
index 9c7e98b32a4..515f01d08a3 100644
--- a/dlls/secur32/schannel.c
+++ b/dlls/secur32/schannel.c
@@ -879,11 +879,6 @@ static inline SIZE_T read_record_size(const BYTE *buf, SIZE_T header_size)
return (buf[header_size - 2] << 8) | buf[header_size - 1];
}
-static inline BOOL is_dtls_context(const struct schan_context *ctx)
-{
- return (ctx->header_size == HEADER_SIZE_DTLS);
-}
-
/***********************************************************************
* InitializeSecurityContextW
*/
@@ -1011,7 +1006,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
return SEC_E_INCOMPLETE_MESSAGE;
}
}
- else if (!is_dtls_context(ctx)) return SEC_E_INCOMPLETE_MESSAGE;
+ else return SEC_E_INCOMPLETE_MESSAGE;
TRACE("Using expected_size %lu.\n", expected_size);
}
diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c
index 03124924644..bcf38e3f23f 100644
--- a/dlls/secur32/schannel_gnutls.c
+++ b/dlls/secur32/schannel_gnutls.c
@@ -292,10 +292,6 @@ static DWORD CDECL schan_get_enabled_protocols(void)
static int pull_timeout(gnutls_transport_ptr_t transport, unsigned int timeout)
{
- struct schan_transport *t = (struct schan_transport *)transport;
- SIZE_T count = 0;
-
- if (callbacks->get_buffer(t, &t->in, &count)) return 1;
return 0;
}
@@ -309,7 +305,7 @@ static BOOL CDECL schan_create_session(schan_session *session, schan_credentials
if (cred->enabled_protocols & (SP_PROT_DTLS1_0_CLIENT | SP_PROT_DTLS1_2_CLIENT))
{
- flags |= GNUTLS_DATAGRAM | GNUTLS_NONBLOCK;
+ flags |= GNUTLS_DATAGRAM;
}
err = pgnutls_init(s, flags);
More information about the wine-cvs
mailing list