Rebase against e2a5bf7540a3b1f5b3889f6339795e5edf7f590f.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "b07e06e297dd8bca67fc1ee523fc235cecebbf1e"
+	echo "e2a5bf7540a3b1f5b3889f6339795e5edf7f590f"
 }
 
 # Show version information

patches/secur32-InitializeSecurityContextW/0001-secur32-Input-Parameter-should-be-NULL-on-first-call.patch

@@ -1,4 +1,4 @@
-From b039e9a489b99619027dfd1a8233c08bfdb362ce Mon Sep 17 00:00:00 2001
+From dff5b9a65fdc1f188150d20dc5af8b5772368d13 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 21 Apr 2021 21:06:55 +1000
 Subject: [PATCH] secur32: Input Parameter should be NULL on first call to
@@ -8,15 +8,15 @@ This fixes a crash in "Sea of Thieves".
 
 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 ---
- dlls/secur32/schannel.c       | 2 +-
- dlls/secur32/tests/schannel.c | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ dlls/secur32/schannel.c       |  2 +-
+ dlls/secur32/tests/schannel.c | 21 ++++++++++++++++++++-
+ 2 files changed, 21 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c
-index c7d62c47758..0ac9e522ce3 100644
+index 4699f79ac1f..8a69d01e1f5 100644
 --- a/dlls/secur32/schannel.c
 +++ b/dlls/secur32/schannel.c
-@@ -734,7 +734,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
+@@ -815,7 +815,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
              return SEC_E_INSUFFICIENT_MEMORY;
      }
  
@@ -26,10 +26,10 @@ index c7d62c47758..0ac9e522ce3 100644
          ULONG_PTR handle;
          struct create_session_params create_params;
 diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c
-index 1cf751a3198..d0aaf2a13d5 100644
+index 25ae197bca6..232f7619f48 100644
 --- a/dlls/secur32/tests/schannel.c
 +++ b/dlls/secur32/tests/schannel.c
-@@ -1397,7 +1397,7 @@ static void test_communication(void)
+@@ -1464,7 +1464,7 @@ static void test_communication(void)
      status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost",
          ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM,
          0, 0, NULL, 0, &context, &buffers[0], &attrs, NULL);
@@ -38,24 +38,32 @@ index 1cf751a3198..d0aaf2a13d5 100644
      if (status != SEC_I_CONTINUE_NEEDED)
      {
          skip("skipping remaining renegotiate test\n");
-@@ -1439,7 +1439,7 @@ static void test_communication(void)
-             ISC_REQ_USE_SUPPLIED_CREDS, 0, 0, &buffers[1], 0, &context2, &buffers[0], &attrs, NULL);
-         buffers[1].pBuffers[0].cbBuffer = buf_size;
+@@ -1508,6 +1508,25 @@ static void test_communication(void)
      }
--    ok (status == SEC_E_OK, "got %08lx\n", status);
-+    todo_wine ok (status == SEC_E_OK, "got %08lx\n", status);
+     ok (status == SEC_E_CERT_EXPIRED, "got %08lx\n", status);
  
-     buf = &buffers[0].pBuffers[0];
-     buf->cbBuffer = buf_size;
-@@ -1449,7 +1449,7 @@ static void test_communication(void)
-     buffers[0].pBuffers[0].BufferType = SECBUFFER_DATA;
-     buffers[0].pBuffers[1].BufferType = SECBUFFER_EMPTY;
-     status = DecryptMessage(&context, &buffers[0], 0, NULL);
--    ok(status == SEC_E_OK, "DecryptMessage failed: %08lx\n", status);
++    buf = &buffers[0].pBuffers[0];
++    buf->cbBuffer = buf_size;
++    data_size = receive_data(sock, buf);
++
++    buffers[0].pBuffers[0].cbBuffer = data_size;
++    buffers[0].pBuffers[0].BufferType = SECBUFFER_DATA;
++    buffers[0].pBuffers[1].BufferType = SECBUFFER_EMPTY;
++    status = DecryptMessage(&context, &buffers[0], 0, NULL);
 +    todo_wine ok(status == SEC_E_OK, "DecryptMessage failed: %08lx\n", status);
-     if (status == SEC_E_OK)
-     {
-         ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_STREAM_HEADER, "Expected first buffer to be SECBUFFER_STREAM_HEADER\n");
++    if (status == SEC_E_OK)
++    {
++        ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_STREAM_HEADER, "Expected first buffer to be SECBUFFER_STREAM_HEADER\n");
++        ok(buffers[0].pBuffers[1].BufferType == SECBUFFER_DATA, "Expected second buffer to be SECBUFFER_DATA\n");
++        ok(buffers[0].pBuffers[2].BufferType == SECBUFFER_STREAM_TRAILER, "Expected third buffer to be SECBUFFER_STREAM_TRAILER\n");
++
++        data = buffers[0].pBuffers[1].pvBuffer;
++        data[buffers[0].pBuffers[1].cbBuffer] = 0;
++    }
++
+ done:
+     DeleteSecurityContext(&context);
+     FreeCredentialsHandle(&cred_handle);
 -- 
-2.34.1
+2.35.1
 

staging/upstream-commit

@@ -1 +1 @@
-b07e06e297dd8bca67fc1ee523fc235cecebbf1e
+e2a5bf7540a3b1f5b3889f6339795e5edf7f590f