Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
63b392b1
Commit
63b392b1
authored
Dec 22, 2015
by
André Hentschel
Committed by
Alexandre Julliard
Dec 25, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
secur32: Ignore pfQOP in VerifySignature (Clang).
Signed-off-by:
André Hentschel
<
nerv@dawncrow.de
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
65942760
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
ntlm.c
dlls/secur32/ntlm.c
+0
-2
ntlm.c
dlls/secur32/tests/ntlm.c
+6
-2
No files found.
dlls/secur32/ntlm.c
View file @
63b392b1
...
@@ -1630,7 +1630,6 @@ SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle phContext,
...
@@ -1630,7 +1630,6 @@ SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle phContext,
PSecBufferDesc
pMessage
,
ULONG
MessageSeqNo
,
PULONG
pfQOP
)
PSecBufferDesc
pMessage
,
ULONG
MessageSeqNo
,
PULONG
pfQOP
)
{
{
PNegoHelper
helper
;
PNegoHelper
helper
;
ULONG
fQOP
=
0
;
UINT
i
;
UINT
i
;
int
token_idx
;
int
token_idx
;
SECURITY_STATUS
ret
;
SECURITY_STATUS
ret
;
...
@@ -1689,7 +1688,6 @@ SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle phContext,
...
@@ -1689,7 +1688,6 @@ SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle phContext,
ret
=
SEC_E_OK
;
ret
=
SEC_E_OK
;
HeapFree
(
GetProcessHeap
(),
0
,
local_buff
);
HeapFree
(
GetProcessHeap
(),
0
,
local_buff
);
pfQOP
=
&
fQOP
;
return
ret
;
return
ret
;
...
...
dlls/secur32/tests/ntlm.c
View file @
63b392b1
...
@@ -928,7 +928,7 @@ static void testSignSeal(void)
...
@@ -928,7 +928,7 @@ static void testSignSeal(void)
static
char
sec_pkg_name
[]
=
"NTLM"
;
static
char
sec_pkg_name
[]
=
"NTLM"
;
SecBufferDesc
crypt
;
SecBufferDesc
crypt
;
SecBuffer
data
[
2
],
fake_data
[
2
],
complex_data
[
4
];
SecBuffer
data
[
2
],
fake_data
[
2
],
complex_data
[
4
];
ULONG
qop
=
0
;
ULONG
qop
=
0
xdeadbeef
;
SecPkgContext_Sizes
ctxt_sizes
;
SecPkgContext_Sizes
ctxt_sizes
;
static
char
test_user
[]
=
"testuser"
,
static
char
test_user
[]
=
"testuser"
,
workgroup
[]
=
"WORKGROUP"
,
workgroup
[]
=
"WORKGROUP"
,
...
@@ -1041,12 +1041,13 @@ static void testSignSeal(void)
...
@@ -1041,12 +1041,13 @@ static void testSignSeal(void)
ok
(
sec_status
==
SEC_E_MESSAGE_ALTERED
,
ok
(
sec_status
==
SEC_E_MESSAGE_ALTERED
,
"VerifySignature returned %s, not SEC_E_MESSAGE_ALTERED.
\n
"
,
"VerifySignature returned %s, not SEC_E_MESSAGE_ALTERED.
\n
"
,
getSecError
(
sec_status
));
getSecError
(
sec_status
));
ok
(
qop
==
0xdeadbeef
,
"qop changed to %u
\n
"
,
qop
);
memcpy
(
data
[
0
].
pvBuffer
,
message_signature
,
data
[
0
].
cbBuffer
);
memcpy
(
data
[
0
].
pvBuffer
,
message_signature
,
data
[
0
].
cbBuffer
);
sec_status
=
pVerifySignature
(
&
client
.
ctxt
,
&
crypt
,
0
,
&
qop
);
sec_status
=
pVerifySignature
(
&
client
.
ctxt
,
&
crypt
,
0
,
&
qop
);
ok
(
sec_status
==
SEC_E_OK
,
"VerifySignature returned %s, not SEC_E_OK.
\n
"
,
ok
(
sec_status
==
SEC_E_OK
,
"VerifySignature returned %s, not SEC_E_OK.
\n
"
,
getSecError
(
sec_status
));
getSecError
(
sec_status
));
ok
(
qop
==
0xdeadbeef
,
"qop changed to %u
\n
"
,
qop
);
sec_status
=
pEncryptMessage
(
&
client
.
ctxt
,
0
,
&
crypt
,
0
);
sec_status
=
pEncryptMessage
(
&
client
.
ctxt
,
0
,
&
crypt
,
0
);
if
(
sec_status
==
SEC_E_UNSUPPORTED_FUNCTION
)
if
(
sec_status
==
SEC_E_UNSUPPORTED_FUNCTION
)
...
@@ -1093,6 +1094,7 @@ static void testSignSeal(void)
...
@@ -1093,6 +1094,7 @@ static void testSignSeal(void)
ok
(
!
memcmp
(
crypt
.
pBuffers
[
1
].
pvBuffer
,
message_binary
,
ok
(
!
memcmp
(
crypt
.
pBuffers
[
1
].
pvBuffer
,
message_binary
,
crypt
.
pBuffers
[
1
].
cbBuffer
),
crypt
.
pBuffers
[
1
].
cbBuffer
),
"Failed to decrypt message correctly.
\n
"
);
"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
"
);
else
trace
(
"A different session key is being used
\n
"
);
...
@@ -1130,6 +1132,7 @@ static void testSignSeal(void)
...
@@ -1130,6 +1132,7 @@ static void testSignSeal(void)
sec_status
=
pVerifySignature
(
&
client
.
ctxt
,
&
crypt
,
0
,
&
qop
);
sec_status
=
pVerifySignature
(
&
client
.
ctxt
,
&
crypt
,
0
,
&
qop
);
ok
(
sec_status
==
SEC_E_OK
,
"VerifySignature returned %s, not SEC_E_OK
\n
"
,
ok
(
sec_status
==
SEC_E_OK
,
"VerifySignature returned %s, not SEC_E_OK
\n
"
,
getSecError
(
sec_status
));
getSecError
(
sec_status
));
ok
(
qop
==
0xdeadbeef
,
"qop changed to %u
\n
"
,
qop
);
sec_status
=
pEncryptMessage
(
&
client
.
ctxt
,
0
,
&
crypt
,
0
);
sec_status
=
pEncryptMessage
(
&
client
.
ctxt
,
0
,
&
crypt
,
0
);
ok
(
sec_status
==
SEC_E_OK
,
"EncryptMessage returned %s, not SEC_E_OK.
\n
"
,
ok
(
sec_status
==
SEC_E_OK
,
"EncryptMessage returned %s, not SEC_E_OK.
\n
"
,
...
@@ -1161,6 +1164,7 @@ static void testSignSeal(void)
...
@@ -1161,6 +1164,7 @@ static void testSignSeal(void)
sec_status
=
pDecryptMessage
(
&
client
.
ctxt
,
&
crypt
,
0
,
&
qop
);
sec_status
=
pDecryptMessage
(
&
client
.
ctxt
,
&
crypt
,
0
,
&
qop
);
ok
(
sec_status
==
SEC_E_OK
,
"DecryptMessage returned %s, not SEC_E_OK.
\n
"
,
ok
(
sec_status
==
SEC_E_OK
,
"DecryptMessage returned %s, not SEC_E_OK.
\n
"
,
getSecError
(
sec_status
));
getSecError
(
sec_status
));
ok
(
qop
==
0xdeadbeef
,
"qop changed to %u
\n
"
,
qop
);
end:
end:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment