André Hentschel : secur32: Ignore pfQOP in VerifySignature (Clang).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 63b392b144f27da6ab8740239f2c17969d66ab11
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=63b392b144f27da6ab8740239f...

Author: André Hentschel 
Date:   Tue Dec 22 22:00:38 2015 +0100

secur32: Ignore pfQOP in VerifySignature (Clang).

Signed-off-by: André Hentschel 
Signed-off-by: Alexandre Julliard

---

dlls/secur32/ntlm.c       | 2 --
 dlls/secur32/tests/ntlm.c | 8 ++++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c
index 0fe64ed..a38d81a 100644
--- a/dlls/secur32/ntlm.c
+++ b/dlls/secur32/ntlm.c
@@ -1630,7 +1630,6 @@ SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle phContext,
     PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP)
 {
     PNegoHelper helper;
-    ULONG fQOP = 0;
     UINT i;
     int token_idx;
     SECURITY_STATUS ret;
@@ -1689,7 +1688,6 @@ SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle phContext,
         ret = SEC_E_OK;

HeapFree(GetProcessHeap(), 0, local_buff);
-    pfQOP = &fQOP;

return ret;

diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c
index 8adbbb4..154d86b 100644
--- a/dlls/secur32/tests/ntlm.c
+++ b/dlls/secur32/tests/ntlm.c
@@ -928,7 +928,7 @@ static void testSignSeal(void)
     static char             sec_pkg_name[] = "NTLM";
     SecBufferDesc           crypt;
     SecBuffer               data[2], fake_data[2], complex_data[4];
-    ULONG                   qop = 0;
+    ULONG                   qop = 0xdeadbeef;
     SecPkgContext_Sizes     ctxt_sizes;
     static char             test_user[] = "testuser",
                             workgroup[] = "WORKGROUP",
@@ -1041,12 +1041,13 @@ static void testSignSeal(void)
     ok(sec_status == SEC_E_MESSAGE_ALTERED,
             "VerifySignature returned %s, not SEC_E_MESSAGE_ALTERED.\n",
             getSecError(sec_status));
+    ok(qop == 0xdeadbeef, "qop changed to %u\n", qop);

memcpy(data[0].pvBuffer, message_signature, data[0].cbBuffer);
-
     sec_status = pVerifySignature(&client.ctxt, &crypt, 0, &qop);
     ok(sec_status == SEC_E_OK, "VerifySignature returned %s, not SEC_E_OK.\n",
             getSecError(sec_status));
+    ok(qop == 0xdeadbeef, "qop changed to %u\n", qop);

sec_status = pEncryptMessage(&client.ctxt, 0, &crypt, 0);
     if (sec_status == SEC_E_UNSUPPORTED_FUNCTION)
@@ -1093,6 +1094,7 @@ static void testSignSeal(void)
         ok(!memcmp(crypt.pBuffers[1].pvBuffer, message_binary,
                    crypt.pBuffers[1].cbBuffer),
            "Failed to decrypt message correctly.\n");
+        ok(qop == 0xdeadbeef, "qop changed to %u\n", qop);
     }
     else trace( "A different session key is being used\n" );

@@ -1130,6 +1132,7 @@ static void testSignSeal(void)
     sec_status = pVerifySignature(&client.ctxt, &crypt, 0, &qop);
     ok(sec_status == SEC_E_OK, "VerifySignature returned %s, not SEC_E_OK\n",
             getSecError(sec_status));
+    ok(qop == 0xdeadbeef, "qop changed to %u\n", qop);

sec_status = pEncryptMessage(&client.ctxt, 0, &crypt, 0);
     ok(sec_status == SEC_E_OK, "EncryptMessage returned %s, not SEC_E_OK.\n",
@@ -1161,6 +1164,7 @@ static void testSignSeal(void)
     sec_status = pDecryptMessage(&client.ctxt, &crypt, 0, &qop);
     ok(sec_status == SEC_E_OK, "DecryptMessage returned %s, not SEC_E_OK.\n",
             getSecError(sec_status));
+    ok(qop == 0xdeadbeef, "qop changed to %u\n", qop);

end: