mirror of
git://source.winehq.org/git/wine.git
synced 2024-11-05 18:01:34 +00:00
crypt32: Revert 8ed5a777de.
Ordinarily removing tests seems like a bad idea, but in this case it seems the only rational response to the test failures the tests produce. The tests check the state of three bits with a variety of certificate and CRL combinations. One of these bits is apparently not set by any version of Windows for any of the tests. Testing its absence doesn't seem correct, and I'll explain why in more detail in a second. Every permutation of the remaining two bits appears on at least one Windows version, and no Windows version is obviously more correct than the rest, so testing them doesn't seem worthwhile. The one bit that doesn't appear to be set is the bit saying that a certificate is revoked. I created CRLs that do in fact revoke some of the tested certificates, so it appears to me that the bit should be set. It's possible that Windows doesn't bother checking the revocation status of a certificate whose anchor isn't trusted, but it's impossible to test this in an automated regression test suite, because adding a trusted certificate requires clicking OK (or its equivalent) in a dialog. The dialog is invoked by the system process, so I can't use a dialog hook to suppress it. I can test this hypothesis manually, but it isn't possible to do so in an automated way.
This commit is contained in:
Juan Lang
Alexandre Julliard
parent
f2040b7725
commit
90c160c3d8
1 changed files with 0 additions and 344 deletions
|
|
@ -51,20 +51,6 @@ static const BYTE selfSignedCert[] = {
|
|||
0x22, 0x0d, 0x03, 0x69, 0x32, 0x1a, 0x6d, 0xcb, 0x0c, 0x15, 0xb3, 0x6b, 0xc7,
|
||||
0x0a, 0x8c, 0xb4, 0x5c, 0x34, 0x78, 0xe0, 0x3c, 0x9c, 0xe9, 0xf3, 0x30, 0x9f,
|
||||
0xa8, 0x76, 0x57, 0x92, 0x36 };
|
||||
static const BYTE v1CRLWithIssuerAndEntry[] = { 0x30, 0x44, 0x30, 0x02, 0x06,
|
||||
0x00, 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13,
|
||||
0x0a, 0x4a, 0x75, 0x61, 0x6e, 0x20, 0x4c, 0x61, 0x6e, 0x67, 0x00, 0x18, 0x0f,
|
||||
0x31, 0x36, 0x30, 0x31, 0x30, 0x31, 0x30, 0x31, 0x30, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x5a, 0x30, 0x16, 0x30, 0x14, 0x02, 0x01, 0x01, 0x18, 0x0f, 0x31, 0x36,
|
||||
0x30, 0x31, 0x30, 0x31, 0x30, 0x31, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a };
|
||||
static const BYTE timeValidV1CRLWithIssuerAndEntry[] = {
|
||||
0x30,0x60,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,
|
||||
0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00,0x17,
|
||||
0x0d,0x30,0x36,0x30,0x36,0x32,0x39,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x17,
|
||||
0x0d,0x30,0x37,0x30,0x36,0x32,0x39,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,
|
||||
0x25,0x30,0x23,0x02,0x10,0xeb,0x0d,0x57,0x2a,0x9c,0x09,0xba,0xa4,0x4a,0xb7,
|
||||
0x25,0x49,0xd9,0x3e,0xb5,0x73,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,
|
||||
0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a };
|
||||
|
||||
static BOOL (WINAPI *pCertCreateCertificateChainEngine)(PCERT_CHAIN_ENGINE_CONFIG,HCERTCHAINENGINE*);
|
||||
static BOOL (WINAPI *pCertGetCertificateChain)(HCERTCHAINENGINE,PCCERT_CONTEXT,LPFILETIME,HCERTSTORE,PCERT_CHAIN_PARA,DWORD,LPVOID,PCCERT_CHAIN_CONTEXT*);
|
||||
|
|
@ -346,80 +332,6 @@ static const BYTE verisignCA[] = {
|
|||
0xbb,0x10,0xa4,0x3d,0xf0,0x32,0x03,0x0e,0xf1,0xce,0xf8,0xe8,0xc9,0x51,0x8c,
|
||||
0xe6,0x62,0x9f,0xe6,0x9f,0xc0,0x7d,0xb7,0x72,0x9c,0xc9,0x36,0x3a,0x6b,0x9f,
|
||||
0x4e,0xa8,0xff,0x64,0x0d,0x64 };
|
||||
static const BYTE verisignCommercialSoftPubCA[] = {
|
||||
0x30,0x82,0x02,0x40,0x30,0x82,0x01,0xa9,0x02,0x10,0x03,0xc7,0x8f,0x37,0xdb,0x92,
|
||||
0x28,0xdf,0x3c,0xbb,0x1a,0xad,0x82,0xfa,0x67,0x10,0x30,0x0d,0x06,0x09,0x2a,0x86,
|
||||
0x48,0x86,0xf7,0x0d,0x01,0x01,0x02,0x05,0x00,0x30,0x61,0x31,0x11,0x30,0x0f,0x06,
|
||||
0x03,0x55,0x04,0x07,0x13,0x08,0x49,0x6e,0x74,0x65,0x72,0x6e,0x65,0x74,0x31,0x17,
|
||||
0x30,0x15,0x06,0x03,0x55,0x04,0x0a,0x13,0x0e,0x56,0x65,0x72,0x69,0x53,0x69,0x67,
|
||||
0x6e,0x2c,0x20,0x49,0x6e,0x63,0x2e,0x31,0x33,0x30,0x31,0x06,0x03,0x55,0x04,0x0b,
|
||||
0x13,0x2a,0x56,0x65,0x72,0x69,0x53,0x69,0x67,0x6e,0x20,0x43,0x6f,0x6d,0x6d,0x65,
|
||||
0x72,0x63,0x69,0x61,0x6c,0x20,0x53,0x6f,0x66,0x74,0x77,0x61,0x72,0x65,0x20,0x50,
|
||||
0x75,0x62,0x6c,0x69,0x73,0x68,0x65,0x72,0x73,0x20,0x43,0x41,0x30,0x1e,0x17,0x0d,
|
||||
0x39,0x36,0x30,0x34,0x30,0x39,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x17,0x0d,0x30,
|
||||
0x34,0x30,0x31,0x30,0x37,0x32,0x33,0x35,0x39,0x35,0x39,0x5a,0x30,0x61,0x31,0x11,
|
||||
0x30,0x0f,0x06,0x03,0x55,0x04,0x07,0x13,0x08,0x49,0x6e,0x74,0x65,0x72,0x6e,0x65,
|
||||
0x74,0x31,0x17,0x30,0x15,0x06,0x03,0x55,0x04,0x0a,0x13,0x0e,0x56,0x65,0x72,0x69,
|
||||
0x53,0x69,0x67,0x6e,0x2c,0x20,0x49,0x6e,0x63,0x2e,0x31,0x33,0x30,0x31,0x06,0x03,
|
||||
0x55,0x04,0x0b,0x13,0x2a,0x56,0x65,0x72,0x69,0x53,0x69,0x67,0x6e,0x20,0x43,0x6f,
|
||||
0x6d,0x6d,0x65,0x72,0x63,0x69,0x61,0x6c,0x20,0x53,0x6f,0x66,0x74,0x77,0x61,0x72,
|
||||
0x65,0x20,0x50,0x75,0x62,0x6c,0x69,0x73,0x68,0x65,0x72,0x73,0x20,0x43,0x41,0x30,
|
||||
0x81,0x9f,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01,0x05,
|
||||
0x00,0x03,0x81,0x8d,0x00,0x30,0x81,0x89,0x02,0x81,0x81,0x00,0xc3,0xd3,0x69,0x65,
|
||||
0x52,0x01,0x94,0x54,0xab,0x28,0xc6,0x62,0x18,0xb3,0x54,0x55,0xc5,0x44,0x87,0x45,
|
||||
0x4a,0x3b,0xc2,0x7e,0xd8,0xd3,0xd7,0xc8,0x80,0x86,0x8d,0xd8,0x0c,0xf1,0x16,0x9c,
|
||||
0xcc,0x6b,0xa9,0x29,0xb2,0x8f,0x76,0x73,0x92,0xc8,0xc5,0x62,0xa6,0x3c,0xed,0x1e,
|
||||
0x05,0x75,0xf0,0x13,0x00,0x6c,0x14,0x4d,0xd4,0x98,0x90,0x07,0xbe,0x69,0x73,0x81,
|
||||
0xb8,0x62,0x4e,0x31,0x1e,0xd1,0xfc,0xc9,0x0c,0xeb,0x7d,0x90,0xbf,0xae,0xb4,0x47,
|
||||
0x51,0xec,0x6f,0xce,0x64,0x35,0x02,0xd6,0x7d,0x67,0x05,0x77,0xe2,0x8f,0xd9,0x51,
|
||||
0xd7,0xfb,0x97,0x19,0xbc,0x3e,0xd7,0x77,0x81,0xc6,0x43,0xdd,0xf2,0xdd,0xdf,0xca,
|
||||
0xa3,0x83,0x8b,0xcb,0x41,0xc1,0x3d,0x22,0x48,0x48,0xa6,0x19,0x02,0x03,0x01,0x00,
|
||||
0x01,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x02,0x05,0x00,
|
||||
0x03,0x81,0x81,0x00,0xb5,0xbc,0xb0,0x75,0x6a,0x89,0xa2,0x86,0xbd,0x64,0x78,0xc3,
|
||||
0xa7,0x32,0x75,0x72,0x11,0xaa,0x26,0x02,0x17,0x60,0x30,0x4c,0xe3,0x48,0x34,0x19,
|
||||
0xb9,0x52,0x4a,0x51,0x18,0x80,0xfe,0x53,0x2d,0x7b,0xd5,0x31,0x8c,0xc5,0x65,0x99,
|
||||
0x41,0x41,0x2f,0xf2,0xae,0x63,0x7a,0xe8,0x73,0x99,0x15,0x90,0x1a,0x1f,0x7a,0x8b,
|
||||
0x41,0xd0,0x8e,0x3a,0xd0,0xcd,0x38,0x34,0x44,0xd0,0x75,0xf8,0xea,0x71,0xc4,0x81,
|
||||
0x19,0x38,0x17,0x35,0x4a,0xae,0xc5,0x3e,0x32,0xe6,0x21,0xb8,0x05,0xc0,0x93,0xe1,
|
||||
0xc7,0x38,0x5c,0xd8,0xf7,0x93,0x38,0x64,0x90,0xed,0x54,0xce,0xca,0xd3,0xd3,0xd0,
|
||||
0x5f,0xef,0x04,0x9b,0xde,0x02,0x82,0xdd,0x88,0x29,0xb1,0xc3,0x4f,0xa5,0xcd,0x71,
|
||||
0x64,0x31,0x3c,0x3c
|
||||
};
|
||||
static const BYTE verisignCRL[] = { 0x30, 0x82, 0x01, 0xb1, 0x30, 0x82, 0x01,
|
||||
0x1a, 0x02, 0x01, 0x01, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7,
|
||||
0x0d, 0x01, 0x01, 0x02, 0x05, 0x00, 0x30, 0x61, 0x31, 0x11, 0x30, 0x0f, 0x06,
|
||||
0x03, 0x55, 0x04, 0x07, 0x13, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65,
|
||||
0x74, 0x31, 0x17, 0x30, 0x15, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x13, 0x0e, 0x56,
|
||||
0x65, 0x72, 0x69, 0x53, 0x69, 0x67, 0x6e, 0x2c, 0x20, 0x49, 0x6e, 0x63, 0x2e,
|
||||
0x31, 0x33, 0x30, 0x31, 0x06, 0x03, 0x55, 0x04, 0x0b, 0x13, 0x2a, 0x56, 0x65,
|
||||
0x72, 0x69, 0x53, 0x69, 0x67, 0x6e, 0x20, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x72,
|
||||
0x63, 0x69, 0x61, 0x6c, 0x20, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65,
|
||||
0x20, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x65, 0x72, 0x73, 0x20, 0x43,
|
||||
0x41, 0x17, 0x0d, 0x30, 0x31, 0x30, 0x33, 0x32, 0x34, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x30, 0x5a, 0x17, 0x0d, 0x30, 0x34, 0x30, 0x31, 0x30, 0x37, 0x32, 0x33,
|
||||
0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x69, 0x30, 0x21, 0x02, 0x10, 0x1b, 0x51,
|
||||
0x90, 0xf7, 0x37, 0x24, 0x39, 0x9c, 0x92, 0x54, 0xcd, 0x42, 0x46, 0x37, 0x99,
|
||||
0x6a, 0x17, 0x0d, 0x30, 0x31, 0x30, 0x31, 0x33, 0x30, 0x30, 0x30, 0x30, 0x31,
|
||||
0x32, 0x34, 0x5a, 0x30, 0x21, 0x02, 0x10, 0x75, 0x0e, 0x40, 0xff, 0x97, 0xf0,
|
||||
0x47, 0xed, 0xf5, 0x56, 0xc7, 0x08, 0x4e, 0xb1, 0xab, 0xfd, 0x17, 0x0d, 0x30,
|
||||
0x31, 0x30, 0x31, 0x33, 0x31, 0x30, 0x30, 0x30, 0x30, 0x34, 0x39, 0x5a, 0x30,
|
||||
0x21, 0x02, 0x10, 0x77, 0xe6, 0x5a, 0x43, 0x59, 0x93, 0x5d, 0x5f, 0x7a, 0x75,
|
||||
0x80, 0x1a, 0xcd, 0xad, 0xc2, 0x22, 0x17, 0x0d, 0x30, 0x30, 0x30, 0x38, 0x33,
|
||||
0x31, 0x30, 0x30, 0x30, 0x30, 0x35, 0x36, 0x5a, 0xa0, 0x1a, 0x30, 0x18, 0x30,
|
||||
0x09, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0b, 0x06,
|
||||
0x03, 0x55, 0x1d, 0x0f, 0x04, 0x04, 0x03, 0x02, 0x05, 0xa0, 0x30, 0x0d, 0x06,
|
||||
0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x02, 0x05, 0x00, 0x03,
|
||||
0x81, 0x81, 0x00, 0x18, 0x2c, 0xe8, 0xfc, 0x16, 0x6d, 0x91, 0x4a, 0x3d, 0x88,
|
||||
0x54, 0x48, 0x5d, 0xb8, 0x11, 0xbf, 0x64, 0xbb, 0xf9, 0xda, 0x59, 0x19, 0xdd,
|
||||
0x0e, 0x65, 0xab, 0xc0, 0x0c, 0xfa, 0x67, 0x7e, 0x21, 0x1e, 0x83, 0x0e, 0xcf,
|
||||
0x9b, 0x89, 0x8a, 0xcf, 0x0c, 0x4b, 0xc1, 0x39, 0x9d, 0xe7, 0x6a, 0xac, 0x46,
|
||||
0x74, 0x6a, 0x91, 0x62, 0x22, 0x0d, 0xc4, 0x08, 0xbd, 0xf5, 0x0a, 0x90, 0x7f,
|
||||
0x06, 0x21, 0x3d, 0x7e, 0xa7, 0xaa, 0x5e, 0xcd, 0x22, 0x15, 0xe6, 0x0c, 0x75,
|
||||
0x8e, 0x6e, 0xad, 0xf1, 0x84, 0xe4, 0x22, 0xb4, 0x30, 0x6f, 0xfb, 0x64, 0x8f,
|
||||
0xd7, 0x80, 0x43, 0xf5, 0x19, 0x18, 0x66, 0x1d, 0x72, 0xa3, 0xe3, 0x94, 0x82,
|
||||
0x28, 0x52, 0xa0, 0x06, 0x4e, 0xb1, 0xc8, 0x92, 0x0c, 0x97, 0xbe, 0x15, 0x07,
|
||||
0xab, 0x7a, 0xc9, 0xea, 0x08, 0x67, 0x43, 0x4d, 0x51, 0x63, 0x3b, 0x9c, 0x9c,
|
||||
0xcd };
|
||||
/* www.google.com's cert */
|
||||
static const BYTE google[] = {
|
||||
0x30,0x82,0x03,0x21,0x30,0x82,0x02,0x8a,0xa0,0x03,0x02,0x01,0x02,0x02,0x10,
|
||||
|
|
@ -2544,91 +2456,6 @@ static const BYTE chain28_1[] = {
|
|||
0x44,0x76,0x66,0x26,0xa7,0x05,0x3c,0x68,0x66,0x1c,0x07,0x4d,0xcf,0x54,0xaa,
|
||||
0x5d,0xba,0x7a,0x8f,0x06,0xa7,0x1e,0x86,0xf1,0x5a,0x4b,0x50,0x16,0xad,0x9f,
|
||||
0x89 };
|
||||
/* chain29_0 -> chain29_1: a chain with a CRL issued for chain29_1 */
|
||||
static const BYTE chain29_0[] = {
|
||||
0x30,0x82,0x01,0xdf,0x30,0x82,0x01,0x4c,0xa0,0x03,0x02,0x01,0x02,0x02,0x10,
|
||||
0x5b,0xc7,0x0b,0x27,0x99,0xbb,0x2e,0x99,0x47,0x9d,0x45,0x4e,0x7c,0x1a,0xca,
|
||||
0xe8,0x30,0x09,0x06,0x05,0x2b,0x0e,0x03,0x02,0x1d,0x05,0x00,0x30,0x10,0x31,
|
||||
0x0e,0x30,0x0c,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x43,0x65,0x72,0x74,0x31,
|
||||
0x30,0x1e,0x17,0x0d,0x30,0x37,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30,
|
||||
0x30,0x5a,0x17,0x0d,0x30,0x37,0x31,0x32,0x33,0x31,0x32,0x33,0x35,0x39,0x35,
|
||||
0x39,0x5a,0x30,0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55,0x04,0x03,0x13,0x05,
|
||||
0x43,0x65,0x72,0x74,0x31,0x30,0x81,0x9f,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,
|
||||
0x86,0xf7,0x0d,0x01,0x01,0x01,0x05,0x00,0x03,0x81,0x8d,0x00,0x30,0x81,0x89,
|
||||
0x02,0x81,0x81,0x00,0xad,0x7e,0xca,0xf3,0xe5,0x99,0xc2,0x2a,0xca,0x50,0x82,
|
||||
0x7c,0x2d,0xa4,0x81,0xcd,0x0d,0x0d,0x86,0xd7,0xd8,0xb2,0xde,0xc5,0xc3,0x34,
|
||||
0x9e,0x07,0x78,0x08,0x11,0x12,0x2d,0x21,0x0a,0x09,0x07,0x14,0x03,0x7a,0xe7,
|
||||
0x3b,0x58,0xf1,0xde,0x3e,0x01,0x25,0x93,0xab,0x8f,0xce,0x1f,0xc1,0x33,0x91,
|
||||
0xfe,0x59,0xb9,0x3b,0x9e,0x95,0x12,0x89,0x8e,0xc3,0x4b,0x98,0x1b,0x99,0xc5,
|
||||
0x07,0xe2,0xdf,0x15,0x4c,0x39,0x76,0x06,0xad,0xdb,0x16,0x06,0x49,0xba,0xcd,
|
||||
0x0f,0x07,0xd6,0xea,0x27,0xa6,0xfe,0x3d,0x88,0xe5,0x97,0x45,0x72,0xb6,0x1c,
|
||||
0xc0,0x1c,0xb1,0xa2,0x89,0xe8,0x37,0x9e,0xf6,0x2a,0xcf,0xd5,0x1f,0x2f,0x35,
|
||||
0x5e,0x8f,0x3a,0x9c,0x61,0xb1,0xf1,0x6c,0xff,0x8c,0xb2,0x2f,0x02,0x03,0x01,
|
||||
0x00,0x01,0xa3,0x42,0x30,0x40,0x30,0x0e,0x06,0x03,0x55,0x1d,0x0f,0x01,0x01,
|
||||
0xff,0x04,0x04,0x03,0x02,0x00,0x06,0x30,0x0f,0x06,0x03,0x55,0x1d,0x13,0x01,
|
||||
0x01,0xff,0x04,0x05,0x30,0x03,0x01,0x01,0xff,0x30,0x1d,0x06,0x03,0x55,0x1d,
|
||||
0x0e,0x04,0x16,0x04,0x14,0x14,0x8c,0x16,0xbb,0xbe,0x70,0xa2,0x28,0x89,0xa0,
|
||||
0x58,0xff,0x98,0xbd,0xa8,0x24,0x2b,0x8a,0xe9,0x9a,0x30,0x09,0x06,0x05,0x2b,
|
||||
0x0e,0x03,0x02,0x1d,0x05,0x00,0x03,0x81,0x81,0x00,0x74,0xcb,0x21,0xfd,0x2d,
|
||||
0x25,0xdc,0xa5,0xaa,0xa1,0x26,0xdc,0x8b,0x40,0x11,0x64,0xae,0x5c,0x71,0x3c,
|
||||
0x28,0xbc,0xf9,0xb3,0xcb,0xa5,0x94,0xb2,0x8d,0x4c,0x23,0x2b,0x9b,0xde,0x2c,
|
||||
0x4c,0x30,0x04,0xc6,0x88,0x10,0x2f,0x53,0xfd,0x6c,0x82,0xf1,0x13,0xfb,0xda,
|
||||
0x27,0x75,0x25,0x48,0xe4,0x72,0x09,0x2a,0xee,0xb4,0x1e,0xc9,0x55,0xf5,0xf7,
|
||||
0x82,0x91,0xd8,0x4b,0xe4,0x3a,0xfe,0x97,0x87,0xdf,0xfb,0x15,0x5a,0x12,0x3e,
|
||||
0x12,0xe6,0xad,0x40,0x0b,0xcf,0xee,0x1a,0x44,0xe0,0x83,0xb2,0x67,0x94,0xd4,
|
||||
0x2e,0x7c,0xf2,0x06,0x9d,0xb3,0x3b,0x7e,0x2f,0xda,0x25,0x66,0x7e,0xa7,0x1f,
|
||||
0x45,0xd4,0xf5,0xe3,0xdf,0x2a,0xf1,0x18,0x28,0x20,0xb5,0xf8,0xf5,0x8d,0x7a,
|
||||
0x2e,0x84,0xee };
|
||||
static const BYTE chain29_1[] = {
|
||||
0x30,0x82,0x01,0x93,0x30,0x81,0xfd,0xa0,0x03,0x02,0x01,0x02,0x02,0x01,0x01,
|
||||
0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x05,0x00,
|
||||
0x30,0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x43,0x65,
|
||||
0x72,0x74,0x31,0x30,0x1e,0x17,0x0d,0x30,0x37,0x30,0x35,0x30,0x31,0x30,0x30,
|
||||
0x30,0x30,0x30,0x30,0x5a,0x17,0x0d,0x30,0x37,0x31,0x30,0x30,0x31,0x30,0x30,
|
||||
0x30,0x30,0x30,0x30,0x5a,0x30,0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55,0x04,
|
||||
0x03,0x13,0x05,0x43,0x65,0x72,0x74,0x32,0x30,0x81,0x9f,0x30,0x0d,0x06,0x09,
|
||||
0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01,0x05,0x00,0x03,0x81,0x8d,0x00,
|
||||
0x30,0x81,0x89,0x02,0x81,0x81,0x00,0xb8,0x52,0xda,0xc5,0x4b,0x3f,0xe5,0x33,
|
||||
0x0e,0x67,0x5f,0x48,0x21,0xdc,0x7e,0xef,0x37,0x33,0xba,0xff,0xb4,0xc6,0xdc,
|
||||
0xb6,0x17,0x8e,0x20,0x55,0x07,0x12,0xd2,0x7b,0x3c,0xce,0x30,0xc5,0xa7,0x48,
|
||||
0x9f,0x6e,0xfe,0xb8,0xbe,0xdb,0x9f,0x9b,0x17,0x60,0x16,0xde,0xc6,0x8b,0x47,
|
||||
0xd1,0x57,0x71,0x3c,0x93,0xfc,0xbd,0xec,0x44,0x32,0x3b,0xb9,0xcf,0x6b,0x05,
|
||||
0x72,0xa7,0x87,0x8e,0x7e,0xd4,0x9a,0x87,0x1c,0x2f,0xb7,0x82,0x40,0xfc,0x6a,
|
||||
0x80,0x83,0x68,0x28,0xce,0x84,0xf4,0x0b,0x2e,0x44,0xcb,0x53,0xac,0x85,0x85,
|
||||
0xb5,0x46,0x36,0x98,0x3c,0x10,0x02,0xaa,0x02,0xbc,0x8b,0xa2,0x23,0xb2,0xd3,
|
||||
0x51,0x9a,0x22,0x4a,0xe3,0xaa,0x4e,0x7c,0xda,0x38,0xcf,0x49,0x98,0x72,0xa3,
|
||||
0x02,0x03,0x01,0x00,0x01,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,
|
||||
0x01,0x01,0x05,0x05,0x00,0x03,0x81,0x81,0x00,0x22,0xf1,0x66,0x00,0x79,0xd2,
|
||||
0xe6,0xb2,0xb2,0xf7,0x2f,0x98,0x92,0x7d,0x73,0xc3,0x6c,0x5c,0x77,0x20,0xe3,
|
||||
0xbf,0x3e,0xe0,0xb3,0x5c,0x68,0xb4,0x9b,0x3a,0x41,0xae,0x94,0xa0,0x80,0x3a,
|
||||
0xfe,0x5d,0x7a,0x56,0x87,0x85,0x44,0x45,0xcf,0xa6,0xd3,0x10,0xe7,0x73,0x41,
|
||||
0xf2,0x7f,0x88,0x85,0x91,0x8e,0xe6,0xec,0xe2,0xce,0x08,0xbc,0xa5,0x76,0xe5,
|
||||
0x4d,0x1d,0xb7,0x70,0x31,0xdd,0xc9,0x9a,0x15,0x32,0x11,0x5a,0x4e,0x62,0xc8,
|
||||
0xd1,0xf8,0xec,0x46,0x39,0x5b,0xe7,0x67,0x1f,0x58,0xe8,0xa1,0xa0,0x5b,0xf7,
|
||||
0x8a,0x6d,0x5f,0x91,0x18,0xd4,0x90,0x85,0xff,0x30,0xc7,0xca,0x9c,0xc6,0x92,
|
||||
0xb0,0xca,0x16,0xc4,0xa4,0xc0,0xd6,0xe8,0xff,0x15,0x19,0xd1,0x30,0x61,0xf3,
|
||||
0xef,0x9f };
|
||||
static const BYTE chain29_0_crl[] = {
|
||||
0x30,0x82,0x01,0x1d,0x30,0x81,0x87,0x02,0x01,0x01,0x30,0x0d,0x06,0x09,0x2a,
|
||||
0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x05,0x00,0x30,0x10,0x31,0x0e,0x30,
|
||||
0x0c,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x43,0x65,0x72,0x74,0x31,0x17,0x0d,
|
||||
0x30,0x37,0x30,0x39,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x17,0x0d,
|
||||
0x30,0x37,0x31,0x32,0x33,0x31,0x32,0x33,0x35,0x39,0x35,0x39,0x5a,0x30,0x14,
|
||||
0x30,0x12,0x02,0x01,0x01,0x17,0x0d,0x30,0x37,0x30,0x39,0x30,0x31,0x30,0x30,
|
||||
0x30,0x30,0x30,0x30,0x5a,0xa0,0x2d,0x30,0x2b,0x30,0x0a,0x06,0x03,0x55,0x1d,
|
||||
0x14,0x04,0x03,0x02,0x01,0x01,0x30,0x1d,0x06,0x03,0x55,0x1d,0x23,0x04,0x16,
|
||||
0x04,0x14,0x14,0x8c,0x16,0xbb,0xbe,0x70,0xa2,0x28,0x89,0xa0,0x58,0xff,0x98,
|
||||
0xbd,0xa8,0x24,0x2b,0x8a,0xe9,0x9a,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,
|
||||
0xf7,0x0d,0x01,0x01,0x05,0x05,0x00,0x03,0x81,0x81,0x00,0x9b,0x2b,0x99,0x0d,
|
||||
0x16,0x83,0x93,0x54,0x29,0x3a,0xa6,0x53,0x5d,0xf8,0xa6,0x73,0x9f,0x2a,0x45,
|
||||
0x39,0x91,0xff,0x91,0x1c,0x27,0x06,0xe8,0xdb,0x72,0x3f,0x66,0x89,0x15,0x68,
|
||||
0x55,0xd5,0x49,0x63,0xa6,0x00,0xe9,0x66,0x9c,0x97,0xf9,0xb3,0xb3,0x2b,0x1b,
|
||||
0xc7,0x79,0x46,0xa8,0xd8,0x2b,0x78,0x27,0xa0,0x70,0x02,0x81,0xc6,0x40,0xb3,
|
||||
0x76,0x32,0x65,0x4c,0xf8,0xff,0x1d,0x41,0x6e,0x16,0x09,0xa2,0x8a,0x7b,0x0c,
|
||||
0xd0,0xa6,0x9b,0x61,0xa3,0x7c,0x02,0x91,0x79,0xdf,0x6a,0x5e,0x88,0x95,0x66,
|
||||
0x33,0x17,0xcb,0x5a,0xd2,0xdc,0x89,0x05,0x62,0x97,0x60,0x73,0x7b,0x2c,0x1a,
|
||||
0x90,0x20,0x73,0x24,0x9f,0x45,0x22,0x4b,0xc1,0x33,0xd1,0xda,0xd8,0x7e,0x1b,
|
||||
0x3d,0x74,0xd6,0x3b };
|
||||
|
||||
typedef struct _CONST_DATA_BLOB
|
||||
{
|
||||
|
|
@ -3585,10 +3412,6 @@ static ChainCheck chainCheckEmbeddedNullBroken = {
|
|||
1, simpleStatus27Broken },
|
||||
0 };
|
||||
|
||||
/* Thursday, Jan 1, 2004 */
|
||||
static SYSTEMTIME jan2004 = { 2004, 1, 4, 1, 0, 0, 0, 0 };
|
||||
/* Sunday, Oct 1, 2006 */
|
||||
static SYSTEMTIME oct2006 = { 2006, 10, 0, 1, 0, 0, 0, 0 };
|
||||
/* Wednesday, Oct 1, 2007 */
|
||||
static SYSTEMTIME oct2007 = { 2007, 10, 1, 1, 0, 0, 0, 0 };
|
||||
/* Wednesday, Oct 28, 2009 */
|
||||
|
|
@ -3602,9 +3425,6 @@ static void testGetCertChain(void)
|
|||
PCCERT_CHAIN_CONTEXT chain;
|
||||
FILETIME fileTime;
|
||||
DWORD i;
|
||||
DWORD revocationFlags =
|
||||
CERT_TRUST_IS_REVOKED | CERT_TRUST_REVOCATION_STATUS_UNKNOWN |
|
||||
CERT_TRUST_IS_OFFLINE_REVOCATION;
|
||||
HCERTSTORE store;
|
||||
static char one_two_three[] = "1.2.3";
|
||||
static char oid_server_auth[] = szOID_PKIX_KP_SERVER_AUTH;
|
||||
|
|
@ -3668,170 +3488,6 @@ static void testGetCertChain(void)
|
|||
|
||||
CertFreeCertificateContext(cert);
|
||||
|
||||
/* Check revocation flags */
|
||||
cert = CertCreateCertificateContext(X509_ASN_ENCODING,
|
||||
verisignCommercialSoftPubCA, sizeof(verisignCommercialSoftPubCA));
|
||||
SystemTimeToFileTime(&jan2004, &fileTime);
|
||||
ret = pCertGetCertificateChain(NULL, cert, &fileTime, NULL, ¶, 0, NULL,
|
||||
&chain);
|
||||
ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError());
|
||||
if (ret)
|
||||
{
|
||||
/* When no revocation check is asked for, none is received */
|
||||
ok(!(chain->TrustStatus.dwErrorStatus & revocationFlags),
|
||||
"unexpected revocation status %08x\n",
|
||||
chain->TrustStatus.dwErrorStatus & revocationFlags);
|
||||
CertFreeCertificateChain(chain);
|
||||
}
|
||||
ret = pCertGetCertificateChain(NULL, cert, &fileTime, NULL, ¶,
|
||||
CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain);
|
||||
ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError());
|
||||
if (ret)
|
||||
{
|
||||
/* The cert is rather old, so its revocation list can't be retrieved,
|
||||
* and its revocation status should be both offline and unknown.
|
||||
*/
|
||||
ok((chain->TrustStatus.dwErrorStatus & revocationFlags) ==
|
||||
(CERT_TRUST_REVOCATION_STATUS_UNKNOWN |
|
||||
CERT_TRUST_IS_OFFLINE_REVOCATION),
|
||||
"unexpected revocation status %08x\n",
|
||||
chain->TrustStatus.dwErrorStatus & revocationFlags);
|
||||
CertFreeCertificateChain(chain);
|
||||
}
|
||||
store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,
|
||||
CERT_STORE_CREATE_NEW_FLAG, NULL);
|
||||
CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING,
|
||||
verisignCommercialSoftPubCA, sizeof(verisignCommercialSoftPubCA),
|
||||
CERT_STORE_ADD_ALWAYS, NULL);
|
||||
CertAddEncodedCRLToStore(store, X509_ASN_ENCODING, verisignCRL,
|
||||
sizeof(verisignCRL), CERT_STORE_ADD_ALWAYS, NULL);
|
||||
ret = pCertGetCertificateChain(NULL, cert, &fileTime, store, ¶,
|
||||
CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain);
|
||||
ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError());
|
||||
if (ret)
|
||||
{
|
||||
/* Even with a CRL in the store, the revocation status doesn't change */
|
||||
ok((chain->TrustStatus.dwErrorStatus & revocationFlags) ==
|
||||
(CERT_TRUST_REVOCATION_STATUS_UNKNOWN |
|
||||
CERT_TRUST_IS_OFFLINE_REVOCATION),
|
||||
"unexpected revocation status %08x\n",
|
||||
chain->TrustStatus.dwErrorStatus & revocationFlags);
|
||||
CertFreeCertificateChain(chain);
|
||||
}
|
||||
CertCloseStore(store, 0);
|
||||
CertFreeCertificateContext(cert);
|
||||
/* Again, with some hand-made certs that don't contain CRL distribution
|
||||
* point extensions or the like.
|
||||
*/
|
||||
cert = CertCreateCertificateContext(X509_ASN_ENCODING,
|
||||
selfSignedCert, sizeof(selfSignedCert));
|
||||
SystemTimeToFileTime(&oct2007, &fileTime);
|
||||
ret = pCertGetCertificateChain(NULL, cert, &fileTime, NULL, ¶, 0, NULL,
|
||||
&chain);
|
||||
ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError());
|
||||
if (ret)
|
||||
{
|
||||
/* When no revocation check is asked for, none is received */
|
||||
ok(!(chain->TrustStatus.dwErrorStatus & revocationFlags),
|
||||
"unexpected revocation status %08x\n",
|
||||
chain->TrustStatus.dwErrorStatus & revocationFlags);
|
||||
CertFreeCertificateChain(chain);
|
||||
}
|
||||
ret = pCertGetCertificateChain(NULL, cert, &fileTime, NULL, ¶,
|
||||
CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain);
|
||||
ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError());
|
||||
if (ret)
|
||||
{
|
||||
/* The cert doesn't have a way to retrieve its CRL, so its revocation
|
||||
* status should be both offline and unknown.
|
||||
*/
|
||||
ok((chain->TrustStatus.dwErrorStatus & revocationFlags) ==
|
||||
(CERT_TRUST_REVOCATION_STATUS_UNKNOWN |
|
||||
CERT_TRUST_IS_OFFLINE_REVOCATION),
|
||||
"unexpected revocation status %08x\n",
|
||||
chain->TrustStatus.dwErrorStatus & revocationFlags);
|
||||
CertFreeCertificateChain(chain);
|
||||
}
|
||||
store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,
|
||||
CERT_STORE_CREATE_NEW_FLAG, NULL);
|
||||
CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING,
|
||||
v1CRLWithIssuerAndEntry, sizeof(v1CRLWithIssuerAndEntry),
|
||||
CERT_STORE_ADD_ALWAYS, NULL);
|
||||
CertAddEncodedCRLToStore(store, X509_ASN_ENCODING, verisignCRL,
|
||||
sizeof(verisignCRL), CERT_STORE_ADD_ALWAYS, NULL);
|
||||
ret = pCertGetCertificateChain(NULL, cert, &fileTime, store, ¶,
|
||||
CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain);
|
||||
ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError());
|
||||
if (ret)
|
||||
{
|
||||
/* Even with a CRL in the store, the revocation status doesn't change */
|
||||
ok((chain->TrustStatus.dwErrorStatus & revocationFlags) ==
|
||||
(CERT_TRUST_REVOCATION_STATUS_UNKNOWN |
|
||||
CERT_TRUST_IS_OFFLINE_REVOCATION),
|
||||
"unexpected revocation status %08x\n",
|
||||
chain->TrustStatus.dwErrorStatus & revocationFlags);
|
||||
CertFreeCertificateChain(chain);
|
||||
}
|
||||
CertCloseStore(store, 0);
|
||||
CertFreeCertificateContext(cert);
|
||||
/* Yet again, again with some hand-made certs that don't contain CRL
|
||||
* distribution point extensions or the like, even though a time-valid
|
||||
* CRL is in the store.
|
||||
*/
|
||||
cert = CertCreateCertificateContext(X509_ASN_ENCODING,
|
||||
selfSignedCert, sizeof(selfSignedCert));
|
||||
SystemTimeToFileTime(&oct2006, &fileTime);
|
||||
store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,
|
||||
CERT_STORE_CREATE_NEW_FLAG, NULL);
|
||||
CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, selfSignedCert,
|
||||
sizeof(selfSignedCert), CERT_STORE_ADD_ALWAYS, NULL);
|
||||
CertAddEncodedCRLToStore(store, X509_ASN_ENCODING,
|
||||
timeValidV1CRLWithIssuerAndEntry, sizeof(timeValidV1CRLWithIssuerAndEntry),
|
||||
CERT_STORE_ADD_ALWAYS, NULL);
|
||||
ret = pCertGetCertificateChain(NULL, cert, &fileTime, store, ¶,
|
||||
CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain);
|
||||
ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError());
|
||||
if (ret)
|
||||
{
|
||||
/* Even with a CRL in the store, the revocation status doesn't change */
|
||||
ok((chain->TrustStatus.dwErrorStatus & revocationFlags) ==
|
||||
(CERT_TRUST_REVOCATION_STATUS_UNKNOWN |
|
||||
CERT_TRUST_IS_OFFLINE_REVOCATION),
|
||||
"unexpected revocation status %08x\n",
|
||||
chain->TrustStatus.dwErrorStatus & revocationFlags);
|
||||
CertFreeCertificateChain(chain);
|
||||
}
|
||||
CertCloseStore(store, 0);
|
||||
CertFreeCertificateContext(cert);
|
||||
/* Yet again, again with some hand-made certs that don't contain CRL
|
||||
* distribution point extensions or the like, even though a time-valid
|
||||
* CRL is in the store.
|
||||
*/
|
||||
cert = CertCreateCertificateContext(X509_ASN_ENCODING,
|
||||
chain29_1, sizeof(chain29_1));
|
||||
SystemTimeToFileTime(&oct2007, &fileTime);
|
||||
store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,
|
||||
CERT_STORE_CREATE_NEW_FLAG, NULL);
|
||||
CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, chain29_0,
|
||||
sizeof(chain29_0), CERT_STORE_ADD_ALWAYS, NULL);
|
||||
CertAddEncodedCRLToStore(store, X509_ASN_ENCODING,
|
||||
chain29_0_crl, sizeof(chain29_0_crl), CERT_STORE_ADD_ALWAYS, NULL);
|
||||
ret = pCertGetCertificateChain(NULL, cert, &fileTime, store, ¶,
|
||||
CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain);
|
||||
ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError());
|
||||
if (ret)
|
||||
{
|
||||
/* Even with a CRL in the store, the revocation status doesn't change */
|
||||
ok((chain->TrustStatus.dwErrorStatus & revocationFlags) ==
|
||||
(CERT_TRUST_REVOCATION_STATUS_UNKNOWN |
|
||||
CERT_TRUST_IS_OFFLINE_REVOCATION),
|
||||
"unexpected revocation status %08x\n",
|
||||
chain->TrustStatus.dwErrorStatus & revocationFlags);
|
||||
CertFreeCertificateChain(chain);
|
||||
}
|
||||
CertCloseStore(store, 0);
|
||||
CertFreeCertificateContext(cert);
|
||||
|
||||
/* Test usage match with Google's cert */
|
||||
store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,
|
||||
CERT_STORE_CREATE_NEW_FLAG, NULL);
|
||||
|
|
|
|||
Loading…
Reference in a new issue