[PATCH] secur32: Support older version of gnutls

[Alistair Leslie-Hughes]

Fixes a regression of 5cc5b102c1b0a66aa63b66f43f2da9a1a9d15ab6

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
---
 dlls/secur32/schannel_gnutls.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c
index 0a49421..57e6635 100644
--- a/dlls/secur32/schannel_gnutls.c
+++ b/dlls/secur32/schannel_gnutls.c
@@ -166,7 +166,11 @@ DWORD schan_imp_enabled_protocols(void)
 BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred)
 {
     gnutls_session_t *s = (gnutls_session_t*)session;
+#if GNUTLS_VERSION_MAJOR < 3
+    char priority[128] = "NORMAL:%LATEST_RECORD_VERSION", *p;
+#else
     char priority[128] = "NORMAL:%LATEST_RECORD_VERSION:-VERS-ALL", *p;
+#endif
     unsigned i;
 
     int err = pgnutls_init(s, cred->credential_use == SECPKG_CRED_INBOUND ? GNUTLS_SERVER : GNUTLS_CLIENT);
-- 
1.9.1

[Jacek Caban]

Hi Alistair,


On 07/12/2018 00:26, Alistair Leslie-Hughes wrote:
> Fixes a regression of 5cc5b102c1b0a66aa63b66f43f2da9a1a9d15ab6
>
> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
> ---
>   dlls/secur32/schannel_gnutls.c | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c
> index 0a49421..57e6635 100644
> --- a/dlls/secur32/schannel_gnutls.c
> +++ b/dlls/secur32/schannel_gnutls.c
> @@ -166,7 +166,11 @@ DWORD schan_imp_enabled_protocols(void)
>   BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred)
>   {
>       gnutls_session_t *s = (gnutls_session_t*)session;
> +#if GNUTLS_VERSION_MAJOR < 3

I think it would be better to check that in runtime.
> +    char priority[128] = "NORMAL:%LATEST_RECORD_VERSION", *p;

In that case we need to restore disabling protocols the old way.

I will send a patch.

Thanks,
Jacek