[PATCH 0/2] MR7190: kerberos: Update sizes to match modern implementations.

[PATCH 1/2] kerberos: Update sizes to match modern implementations.

[Dmitry Timoshkov]

From: Dmitry Timoshkov

Signed-off-by: Dmitry Timoshkov 
---
 dlls/kerberos/unixlib.c      | 6 +++---
 dlls/kerberos/unixlib.h      | 2 +-
 dlls/secur32/tests/secur32.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c
index a7cb8b1da7a..e5287140e3a 100644
--- a/dlls/kerberos/unixlib.c
+++ b/dlls/kerberos/unixlib.c
@@ -803,8 +803,8 @@ static NTSTATUS make_signature( void *args )
     return status_gss_to_sspi( ret );
 }

-#define KERBEROS_MAX_SIGNATURE        37
-#define KERBEROS_SECURITY_TRAILER     49
+#define KERBEROS_MAX_SIGNATURE        64
+#define KERBEROS_SECURITY_TRAILER     64
 #define KERBEROS_MAX_SIGNATURE_DCE    28
 #define KERBEROS_SECURITY_TRAILER_DCE 76

@@ -869,7 +869,7 @@ static NTSTATUS query_context_attributes( void *args )
         }
         sizes->cbMaxToken        = KERBEROS_MAX_BUF;
         sizes->cbMaxSignature    = size_max_signature;
-        sizes->cbBlockSize       = 1;
+        sizes->cbBlockSize       = 8;
         sizes->cbSecurityTrailer = size_security_trailer;
         return SEC_E_OK;
     }
diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h
index fcc0da308c5..87516859991 100644
--- a/dlls/kerberos/unixlib.h
+++ b/dlls/kerberos/unixlib.h
@@ -21,7 +21,7 @@

#include "wine/unixlib.h"

-#define KERBEROS_MAX_BUF 12000
+#define KERBEROS_MAX_BUF 48000

struct accept_context_params
 {
diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c
index dd6eea095bf..72a5ddef50b 100644
--- a/dlls/secur32/tests/secur32.c
+++ b/dlls/secur32/tests/secur32.c
@@ -453,7 +453,7 @@ static void test_kerberos(void)
     ok( (info->fCapabilities & ~optional_mask) == expected_flags, "got %08lx, expected %08lx\n", info->fCapabilities, expected_flags );
     ok( info->wVersion == 1, "got %u\n", info->wVersion );
     ok( info->wRPCID == RPC_C_AUTHN_GSS_KERBEROS, "got %u\n", info->wRPCID );
-    ok( info->cbMaxToken >= 12000, "got %lu\n", info->cbMaxToken );
+    ok( info->cbMaxToken == 48000 || broken(info->cbMaxToken == 12000) /* Win7 */, "got %lu\n", info->cbMaxToken );
     ok( !lstrcmpA( info->Name, "Kerberos" ), "got %s\n", info->Name );
     ok( !lstrcmpA( info->Comment, "Microsoft Kerberos V1.0" ), "got %s\n", info->Comment );
     FreeContextBuffer( info );

[PATCH 2/2] secur32: Update max token size for Negotiate.

[Dmitry Timoshkov]

From: Dmitry Timoshkov

Signed-off-by: Dmitry Timoshkov 
---
 dlls/secur32/negotiate.c       | 2 +-
 dlls/secur32/tests/negotiate.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/secur32/negotiate.c b/dlls/secur32/negotiate.c
index 0f7d047dd60..11826af8043 100644
--- a/dlls/secur32/negotiate.c
+++ b/dlls/secur32/negotiate.c
@@ -47,7 +47,7 @@ struct sec_handle
 };

#define WINE_NO_CACHED_CREDENTIALS 0x10000000
-#define NEGO_MAX_TOKEN 12000
+#define NEGO_MAX_TOKEN 48256

static WCHAR nego_name_W[] = {'N','e','g','o','t','i','a','t','e',0};
 static char nego_name_A[] = "Negotiate";
diff --git a/dlls/secur32/tests/negotiate.c b/dlls/secur32/tests/negotiate.c
index dc470a332c7..f2d9324ff97 100644
--- a/dlls/secur32/tests/negotiate.c
+++ b/dlls/secur32/tests/negotiate.c
@@ -441,6 +441,7 @@ START_TEST(negotiate)
     ok( info->wVersion == 1, "got %u\n", info->wVersion );
     ok( info->wRPCID == RPC_C_AUTHN_GSS_NEGOTIATE, "got %u\n", info->wRPCID );
     ok( !lstrcmpA( info->Name, "Negotiate" ), "got %s\n", info->Name );
+    ok( info->cbMaxToken == 48256 || broken(info->cbMaxToken == 12256) /* Win7 */, "got %lu\n", info->cbMaxToken );
     FreeContextBuffer( info );

test_authentication();

[PATCH 0/2] MR7190: kerberos: Update sizes to match modern implementations. - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.