Rebase against 5f93c683ab0163cb34482fe18549cf249b8b074b.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "80a30625a70343cf6f38d80d02f640d684e27e6d"
+	echo "5f93c683ab0163cb34482fe18549cf249b8b074b"
 }
 
 # Show version information

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

@@ -1,4 +1,4 @@
-From 06b162060280cca8e06cb3b55849f19a9cd110a9 Mon Sep 17 00:00:00 2001
+From e229a4497bcfd9649ddfdb2d77f06b03f6e7b97f 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
@@ -13,12 +13,12 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c
-index 1dd3a029401..f7926ac1e33 100644
+index 895364a3fc7..58d40cfb3eb 100644
 --- a/dlls/secur32/schannel.c
 +++ b/dlls/secur32/schannel.c
-@@ -819,7 +819,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
-     dump_buffer_desc(pInput);
-     dump_buffer_desc(pOutput);
+@@ -915,7 +915,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
+         ptsExpiry->HighPart = 0;
+     }
  
 -    if (!phContext)
 +    if (!phContext || (phNewContext && !pInput))
@@ -26,10 +26,10 @@ index 1dd3a029401..f7926ac1e33 100644
          ULONG_PTR handle;
  
 diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c
-index aeb38096f0c..c0bda7ebed8 100644
+index 7cb3871193c..27381d60b38 100644
 --- a/dlls/secur32/tests/schannel.c
 +++ b/dlls/secur32/tests/schannel.c
-@@ -1317,7 +1317,7 @@ todo_wine
+@@ -1319,7 +1319,7 @@ todo_wine
      status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost",
          ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM,
          0, 0, NULL, 0, &context, &buffers[0], &attrs, NULL);
@@ -38,7 +38,7 @@ index aeb38096f0c..c0bda7ebed8 100644
      if (status != SEC_I_CONTINUE_NEEDED)
      {
          skip("skipping remaining renegotiate test\n");
-@@ -1355,7 +1355,7 @@ todo_wine
+@@ -1357,7 +1357,7 @@ todo_wine
              ISC_REQ_USE_SUPPLIED_CREDS, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL);
          buffers[1].pBuffers[0].cbBuffer = buf_size;
      }
@@ -47,7 +47,7 @@ index aeb38096f0c..c0bda7ebed8 100644
  
      buf = &buffers[0].pBuffers[0];
      buf->cbBuffer = buf_size;
-@@ -1365,7 +1365,7 @@ todo_wine
+@@ -1367,7 +1367,7 @@ todo_wine
      buffers[0].pBuffers[0].BufferType = SECBUFFER_DATA;
      buffers[0].pBuffers[1].BufferType = SECBUFFER_EMPTY;
      status = DecryptMessage(&context, &buffers[0], 0, NULL);
@@ -57,5 +57,5 @@ index aeb38096f0c..c0bda7ebed8 100644
      {
          ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_STREAM_HEADER, "Expected first buffer to be SECBUFFER_STREAM_HEADER\n");
 -- 
-2.30.2
+2.33.0
 

staging/upstream-commit

@@ -1 +1 @@
-80a30625a70343cf6f38d80d02f640d684e27e6d
+5f93c683ab0163cb34482fe18549cf249b8b074b