[PATCH 0/1] MR1811: bcrypt: Fix compatibility defines for AES CFB8.

[Olivier F. R. Dierick (＠olivierfrdierick)]

Commit c2328d0fde59b0070e6f877453f30b3c1f62ae27 tried to add compatibility with older gnutls but was incomplete.
This patch completes it by checking patch level (3.6.0 vs 3.6.5).

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53625

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1811

[PATCH 1/1] bcrypt: Fix compatibility defines for AES CFB8.

[Olivier F. R. Dierick]

From: "Olivier F. R. Dierick" <o.dierick(a)piezo-forte.be>

Commit c2328d0fde59b0070e6f877453f30b3c1f62ae27 tried to add compatibility with older gnutls but was incomplete.
This patch completes it by checking patch level (3.6.0 vs 3.6.5).

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53625
---
 dlls/bcrypt/gnutls.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
index 9425cccd066..63d3093960a 100644
--- a/dlls/bcrypt/gnutls.c
+++ b/dlls/bcrypt/gnutls.c
@@ -69,7 +69,8 @@ typedef enum
 } gnutls_ecc_curve_t;
 #endif
 
-#if GNUTLS_VERSION_MAJOR < 3 || (GNUTLS_VERSION_MAJOR == 3 && GNUTLS_VERSION_MINOR < 6)
+#if GNUTLS_VERSION_MAJOR < 3 || (GNUTLS_VERSION_MAJOR == 3 && (GNUTLS_VERSION_MINOR < 6 ||\
+    GNUTLS_VERSION_MINOR == 6 && GNUTLS_VERSION_PATCH < 5))
 #define GNUTLS_CIPHER_AES_128_CFB8 29
 #define GNUTLS_CIPHER_AES_192_CFB8 30
 #define GNUTLS_CIPHER_AES_256_CFB8 31
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1811

[Hans Leidekker (＠hans)]

I was hoping that we could avoid adding another check. It doesn't seem unreasonable to expect distributions to update to the latest patch level.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1811#note_19621

[PATCH 0/1] MR1811: bcrypt: Fix compatibility defines for AES CFB8. - closed

[Olivier F. R. Dierick (＠olivierfrdierick)]

This merge request was closed by Olivier F. R. Dierick.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1811

[Olivier F. R. Dierick (＠olivierfrdierick)]

I agree and will close this MR.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1811#note_19644