Skip to content

W
wine-winehq
Commit ba3433fa authored by Juan Lang's avatar Juan Lang Committed by Alexandre Julliard
Browse files
Options

crypt32: Fix more test failures on older crypt32 versions.

parent 4d2c9c3e
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 7 deletions
dlls/crypt32/tests/chain.c
View file @ ba3433fa
......@@ -2731,9 +2731,14 @@ static ChainCheck chainCheck[] = {
{ CERT_TRUST_IS_UNTRUSTED_ROOT, 0 },
1, simpleStatus19 },
0 },
/* Older versions of crypt32 do not set
* CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, though they should. So
* ignore it (on Windows) but require it (on Wine.)
*/
{ { sizeof(chain20) / sizeof(chain20[0]), chain20 },
{ { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE |
CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT,
CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT |
CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT,
CERT_TRUST_HAS_PREFERRED_ISSUER },
{ CERT_TRUST_IS_UNTRUSTED_ROOT |
CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 },
......@@ -2749,7 +2754,8 @@ static ChainCheck chainCheck[] = {
0 },
{ { sizeof(chain22) / sizeof(chain22[0]), chain22 },
{ { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE |
CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT,
CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT |
CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT,
CERT_TRUST_HAS_PREFERRED_ISSUER },
{ CERT_TRUST_IS_UNTRUSTED_ROOT |
CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 },
......@@ -2757,7 +2763,8 @@ static ChainCheck chainCheck[] = {
0 },
{ { sizeof(chain23) / sizeof(chain23[0]), chain23 },
{ { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE |
CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT,
CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT |
CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT,
CERT_TRUST_HAS_PREFERRED_ISSUER },
{ CERT_TRUST_IS_UNTRUSTED_ROOT |
CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 },
......@@ -2765,7 +2772,8 @@ static ChainCheck chainCheck[] = {
0 },
{ { sizeof(chain24) / sizeof(chain24[0]), chain24 },
{ { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE |
CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT,
CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT |
CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT,
CERT_TRUST_HAS_PREFERRED_ISSUER },
{ CERT_TRUST_IS_UNTRUSTED_ROOT |
CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 },
......@@ -2773,7 +2781,8 @@ static ChainCheck chainCheck[] = {
0 },
{ { sizeof(chain25) / sizeof(chain25[0]), chain25 },
{ { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE |
CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT,
CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT |
CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT,
CERT_TRUST_HAS_PREFERRED_ISSUER },
{ CERT_TRUST_IS_UNTRUSTED_ROOT |
CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 },
......@@ -2781,7 +2790,8 @@ static ChainCheck chainCheck[] = {
0 },
{ { sizeof(chain26) / sizeof(chain26[0]), chain26 },
{ { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE |
CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT,
CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT |
CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT,
CERT_TRUST_HAS_PREFERRED_ISSUER },
{ CERT_TRUST_IS_UNTRUSTED_ROOT |
CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 },
......@@ -2796,7 +2806,8 @@ static ChainCheck chainCheck[] = {
0 },
{ { sizeof(chain28) / sizeof(chain28[0]), chain28 },
{ { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE |
CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT,
CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT |
CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT,
CERT_TRUST_HAS_PREFERRED_ISSUER },
{ CERT_TRUST_IS_UNTRUSTED_ROOT |
CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment