[PATCH v2 0/3] MR5690: secur32: Allow overriding GnuTLS debug level.

[Daniel Lehman (＠dlehman25)]

--
  v2: crypt32: Allow overriding GnuTLS debug level.
      bcrypt: Allow overriding GnuTLS debug level.
      secur32: Allow overriding GnuTLS debug level.

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

[PATCH v2 1/3] secur32: Allow overriding GnuTLS debug level.

[Daniel Lehman]

From: Daniel Lehman

---
 dlls/secur32/schannel_gnutls.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c
index fc16ded7a64..1af0682b269 100644
--- a/dlls/secur32/schannel_gnutls.c
+++ b/dlls/secur32/schannel_gnutls.c
@@ -1576,7 +1576,9 @@ static NTSTATUS process_attach( void *args )

if (TRACE_ON(secur32))
     {
-        pgnutls_global_set_log_level(4);
+        char *env = getenv("GNUTLS_DEBUG_LEVEL");
+        int level = env ? atoi(env) : 4;
+        pgnutls_global_set_log_level(level);
         pgnutls_global_set_log_function(gnutls_log);
     }

[PATCH v2 2/3] bcrypt: Allow overriding GnuTLS debug level.

[Daniel Lehman]

From: Daniel Lehman

---
 dlls/bcrypt/gnutls.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
index 18ef70a7722..582b868a36e 100644
--- a/dlls/bcrypt/gnutls.c
+++ b/dlls/bcrypt/gnutls.c
@@ -466,7 +466,9 @@ static NTSTATUS gnutls_process_attach( void *args )

if (TRACE_ON( bcrypt ))
     {
-        pgnutls_global_set_log_level( 4 );
+        char *env = getenv("GNUTLS_DEBUG_LEVEL");
+        int level = env ? atoi(env) : 4;
+        pgnutls_global_set_log_level(level);
         pgnutls_global_set_log_function( gnutls_log );
     }

[PATCH v2 3/3] crypt32: Allow overriding GnuTLS debug level.

[Daniel Lehman]

From: Daniel Lehman

---
 dlls/crypt32/unixlib.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c
index 72770caab5f..5a255442fdf 100644
--- a/dlls/crypt32/unixlib.c
+++ b/dlls/crypt32/unixlib.c
@@ -130,7 +130,9 @@ static NTSTATUS process_attach( void *args )

if (TRACE_ON( crypt ))
     {
-        pgnutls_global_set_log_level( 4 );
+        char *env = getenv("GNUTLS_DEBUG_LEVEL");
+        int level = env ? atoi(env) : 4;
+        pgnutls_global_set_log_level(level);
         pgnutls_global_set_log_function( gnutls_log );
     }

[PATCH v2 3/3] crypt32: Allow overriding GnuTLS debug level.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=145727

Your paranoid android.

=== debian11b (64 bit WoW report) ===

user32:
input.c:3986: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 00000000009300E8, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032

[PATCH v2 0/3] MR5690: secur32: Allow overriding GnuTLS debug level. - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.