wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Ken Thomases : crypt32: Read trusted root certificates from system keychain on Mac OS X.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 3921454398d8808fb0e3d4e03f023c4ec70cba17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3921454398d8808fb0e3d4e03… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 20 15:49:11 2009 -0600 crypt32: Read trusted root certificates from system keychain on Mac OS X. --- dlls/crypt32/Makefile.in | 1 + dlls/crypt32/rootstore.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/Makefile.in b/dlls/crypt32/Makefile.in index c2284b7..2daa01a 100644 --- a/dlls/crypt32/Makefile.in +++ b/dlls/crypt32/Makefile.in @@ -6,6 +6,7 @@ VPATH = @srcdir@ MODULE = crypt32.dll IMPORTLIB = crypt32 IMPORTS = user32 advapi32 kernel32 ntdll +EXTRALIBS = @SECURITYLIB@ C_SRCS = \ base64.c \ diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index a55b281..70b5ef8 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -40,6 +40,9 @@ #include "winternl.h" #include "wine/debug.h" #include "crypt32_private.h" +#ifdef __APPLE__ +#include <Security/Security.h> +#endif WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -713,6 +716,35 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) DWORD i; BOOL ret = FALSE; +#ifdef __APPLE__ + OSStatus status; + CFArrayRef rootCerts; + + status = SecTrustCopyAnchorCertificates(&rootCerts); + if (status == noErr) + { + int i; + for (i = 0; i < CFArrayGetCount(rootCerts); i++) + { + SecCertificateRef cert = (SecCertificateRef)CFArrayGetValueAtIndex(rootCerts, i); + CFDataRef certData; + if ((status = SecKeychainItemExport(cert, kSecFormatX509Cert, 0, NULL, &certData)) == noErr) + { + if (CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, + CFDataGetBytePtr(certData), CFDataGetLength(certData), + CERT_STORE_ADD_NEW, NULL)) + ret = TRUE; + else + WARN("adding root cert %d failed: %08x\n", i, GetLastError()); + CFRelease(certData); + } + else + WARN("could not export certificate %d to X509 format: 0x%08x\n", i, (unsigned int)status); + } + CFRelease(rootCerts); + } +#endif + for (i = 0; !ret && i < sizeof(CRYPT_knownLocations) / sizeof(CRYPT_knownLocations[0]); i++)

1 0

Juan Lang : cryptnet: Check CRL with verify time in CertDllVerifyRevocation .
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: ff57ba9d7c633c2e263f8a88392448087c1eca13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff57ba9d7c633c2e263f8a883… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 20 12:09:21 2009 -0800 cryptnet: Check CRL with verify time in CertDllVerifyRevocation. --- dlls/cryptnet/cryptnet_main.c | 46 +++++++++++++++++++++++++++++++++-------- 1 files changed, 37 insertions(+), 9 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 3744e68..a37c0d6 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1441,6 +1441,15 @@ BOOL WINAPI CryptRetrieveObjectByUrlW(LPCWSTR pszURL, LPCSTR pszObjectOid, return ret; } +typedef struct _CERT_REVOCATION_PARA_NO_EXTRA_FIELDS { + DWORD cbSize; + PCCERT_CONTEXT pIssuerCert; + DWORD cCertStore; + HCERTSTORE *rgCertStore; + HCERTSTORE hCrlStore; + LPFILETIME pftTimeToUse; +} CERT_REVOCATION_PARA_NO_EXTRA_FIELDS, *PCERT_REVOCATION_PARA_NO_EXTRA_FIELDS; + typedef struct _OLD_CERT_REVOCATION_STATUS { DWORD cbSize; DWORD dwIndex; @@ -1457,6 +1466,8 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType, { DWORD error = 0, i; BOOL ret; + FILETIME now; + LPFILETIME pTime = NULL; TRACE("(%08x, %d, %d, %p, %08x, %p, %p)\n", dwEncodingType, dwRevType, cContext, rgpvContext, dwFlags, pRevPara, pRevStatus); @@ -1472,6 +1483,14 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType, SetLastError(E_INVALIDARG); return FALSE; } + if (pRevPara && pRevPara->cbSize >= + sizeof(CERT_REVOCATION_PARA_NO_EXTRA_FIELDS)) + pTime = pRevPara->pftTimeToUse; + if (!pTime) + { + GetSystemTimeAsFileTime(&now); + pTime = &now; + } memset(&pRevStatus->dwIndex, 0, pRevStatus->cbSize - sizeof(DWORD)); if (dwRevType != CERT_CONTEXT_REVOCATION_TYPE) { @@ -1524,18 +1543,27 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType, (void **)&crl, NULL, NULL, NULL, NULL); if (ret) { - PCRL_ENTRY entry = NULL; - - CertFindCertificateInCRL( - rgpvContext[i], crl, 0, NULL, - &entry); - if (entry) + if (CertVerifyCRLTimeValidity(pTime, crl->pCrlInfo)) { - error = CRYPT_E_REVOKED; - pRevStatus->dwIndex = i; + /* The CRL isn't time valid */ + error = CRYPT_E_NO_REVOCATION_CHECK; ret = FALSE; } - else if (timeout) + else + { + PCRL_ENTRY entry = NULL; + + CertFindCertificateInCRL( + rgpvContext[i], crl, 0, NULL, + &entry); + if (entry) + { + error = CRYPT_E_REVOKED; + pRevStatus->dwIndex = i; + ret = FALSE; + } + } + if (ret && timeout) { DWORD time = GetTickCount();

1 0

Juan Lang : crypt32/tests: Fix tests on Win9x/ME.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: eee179206e3aecd07f63cf76a8e54c3c0cd1bc7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eee179206e3aecd07f63cf76a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 20 12:20:17 2009 -0800 crypt32/tests: Fix tests on Win9x/ME. --- dlls/crypt32/tests/cert.c | 39 +++++++++++++++++++++++++-------------- 1 files changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index c42bb18..89268c0 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3200,21 +3200,28 @@ static void testVerifyRevocation(void) SetLastError(0xdeadbeef); ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, NULL, &status); - todo_wine - ok(!ret && GetLastError() == CRYPT_E_REVOCATION_OFFLINE, - "expected CRYPT_E_REVOCATION_OFFLINE, got %08x\n", GetLastError()); - todo_wine - ok(status.dwError == CRYPT_E_REVOCATION_OFFLINE, - "expected CRYPT_E_REVOCATION_OFFLINE, got %08x\n", status.dwError); + ok(!ret && (GetLastError() == CRYPT_E_NO_REVOCATION_CHECK /* Win9x */ || + GetLastError() == CRYPT_E_REVOCATION_OFFLINE), + "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08x\n", + GetLastError()); + ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK /* Win9x */ || + status.dwError == CRYPT_E_REVOCATION_OFFLINE, + "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08x\n", + status.dwError); ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex); /* Both certs together can't, either (they're not CRLs) */ SetLastError(0xdeadbeef); ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 2, (void **)certs, 0, NULL, &status); - ok(!ret && GetLastError() == CRYPT_E_NO_REVOCATION_CHECK, - "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", GetLastError()); - ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK, - "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", status.dwError); + ok(!ret && (GetLastError() == CRYPT_E_NO_REVOCATION_CHECK || + GetLastError() == CRYPT_E_REVOCATION_OFFLINE /* WinME */), + "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08x\n", + GetLastError()); + ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK || + status.dwError == CRYPT_E_REVOCATION_OFFLINE /* WinME */, + "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08x\n", + status.dwError); + ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex); ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex); /* Now add a CRL to the hCrlStore */ revPara.hCrlStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, @@ -3224,10 +3231,14 @@ static void testVerifyRevocation(void) SetLastError(0xdeadbeef); ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 2, (void **)certs, 0, &revPara, &status); - ok(!ret && GetLastError() == CRYPT_E_NO_REVOCATION_CHECK, - "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", GetLastError()); - ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK, - "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", status.dwError); + ok(!ret && (GetLastError() == CRYPT_E_NO_REVOCATION_CHECK || + GetLastError() == CRYPT_E_REVOCATION_OFFLINE /* WinME */), + "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08x\n", + GetLastError()); + ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK || + status.dwError == CRYPT_E_REVOCATION_OFFLINE /* WinME */, + "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08x\n", + status.dwError); ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex); /* Specifying CERT_VERIFY_REV_CHAIN_FLAG doesn't change things either */ SetLastError(0xdeadbeef);

1 0

Juan Lang : crypt32: Support checking the requested usage for a chain.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 1a392e1a3045ba827e24b4940bf64334daefc690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a392e1a3045ba827e24b4940… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 20 12:08:38 2009 -0800 crypt32: Support checking the requested usage for a chain. --- dlls/crypt32/chain.c | 106 ++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/chain.c | 2 - 2 files changed, 106 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index a53b030..de482ae 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2454,6 +2454,111 @@ static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, } } +static void CRYPT_CheckUsages(PCERT_CHAIN_CONTEXT chain, + const CERT_CHAIN_PARA *pChainPara) +{ + if (pChainPara->cbSize >= sizeof(CERT_CHAIN_PARA_NO_EXTRA_FIELDS) && + pChainPara->RequestedUsage.Usage.cUsageIdentifier) + { + PCCERT_CONTEXT endCert; + PCERT_EXTENSION ext; + BOOL validForUsage; + + /* A chain, if created, always includes the end certificate */ + endCert = chain->rgpChain[0]->rgpElement[0]->pCertContext; + /* The extended key usage extension specifies how a certificate's + * public key may be used. From RFC 5280, section 4.2.1.12: + * "This extension indicates one or more purposes for which the + * certified public key may be used, in addition to or in place of the + * basic purposes indicated in the key usage extension." + * If the extension is present, it only satisfies the requested usage + * if that usage is included in the extension: + * "If the extension is present, then the certificate MUST only be used + * for one of the purposes indicated." + * There is also the special anyExtendedKeyUsage OID, but it doesn't + * have to be respected: + * "Applications that require the presence of a particular purpose + * MAY reject certificates that include the anyExtendedKeyUsage OID + * but not the particular OID expected for the application." + * For now, I'm being more conservative and ignoring the presence of + * the anyExtendedKeyUsage OID. + */ + if ((ext = CertFindExtension(szOID_ENHANCED_KEY_USAGE, + endCert->pCertInfo->cExtension, endCert->pCertInfo->rgExtension))) + { + const CERT_ENHKEY_USAGE *requestedUsage = + &pChainPara->RequestedUsage.Usage; + CERT_ENHKEY_USAGE *usage; + DWORD size; + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, + X509_ENHANCED_KEY_USAGE, ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, &usage, &size)) + { + if (pChainPara->RequestedUsage.dwType == USAGE_MATCH_TYPE_AND) + { + DWORD i, j; + + /* For AND matches, all usages must be present */ + validForUsage = TRUE; + for (i = 0; validForUsage && + i < requestedUsage->cUsageIdentifier; i++) + { + BOOL match = FALSE; + + for (j = 0; !match && j < usage->cUsageIdentifier; j++) + match = !strcmp(usage->rgpszUsageIdentifier[j], + requestedUsage->rgpszUsageIdentifier[i]); + if (!match) + validForUsage = FALSE; + } + } + else + { + DWORD i, j; + + /* For OR matches, any matching usage suffices */ + validForUsage = FALSE; + for (i = 0; !validForUsage && + i < requestedUsage->cUsageIdentifier; i++) + { + for (j = 0; !validForUsage && + j < usage->cUsageIdentifier; j++) + validForUsage = + !strcmp(usage->rgpszUsageIdentifier[j], + requestedUsage->rgpszUsageIdentifier[i]); + } + } + LocalFree(usage); + } + else + validForUsage = FALSE; + } + else + { + /* If the extension isn't present, any interpretation is valid: + * "Certificate using applications MAY require that the extended + * key usage extension be present and that a particular purpose + * be indicated in order for the certificate to be acceptable to + * that application." + * For now I'm being more conservative and disallowing it. + */ + WARN_(chain)("requested usage from a certificate with no usages\n"); + validForUsage = FALSE; + } + if (!validForUsage) + { + chain->TrustStatus.dwErrorStatus |= + CERT_TRUST_IS_NOT_VALID_FOR_USAGE; + chain->rgpChain[0]->rgpElement[0]->TrustStatus.dwErrorStatus |= + CERT_TRUST_IS_NOT_VALID_FOR_USAGE; + } + } + if (pChainPara->cbSize >= sizeof(CERT_CHAIN_PARA) && + pChainPara->RequestedIssuancePolicy.Usage.cUsageIdentifier) + FIXME("unimplemented for RequestedIssuancePolicy\n"); +} + static void dump_usage_match(LPCSTR name, const CERT_USAGE_MATCH *usageMatch) { if (usageMatch->Usage.cUsageIdentifier) @@ -2534,6 +2639,7 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, CRYPT_FreeLowerQualityChains(chain); pChain = (PCERT_CHAIN_CONTEXT)chain; CRYPT_VerifyChainRevocation(pChain, pTime, pChainPara, dwFlags); + CRYPT_CheckUsages(pChain, pChainPara); if (ppChainContext) *ppChainContext = pChain; else diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index b21fba6..d41a8ca 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3853,7 +3853,6 @@ static void testGetCertChain(void) ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError()); if (ret) { - todo_wine ok(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE, "expected CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); CertFreeCertificateChain(chain); @@ -3877,7 +3876,6 @@ static void testGetCertChain(void) ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError()); if (ret) { - todo_wine ok(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE, "expected CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); CertFreeCertificateChain(chain);

1 0

Juan Lang : crypt32: Only trace a usage match if it's not empty.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 30de1034858825a9467438407d0d905053a2ab70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30de1034858825a9467438407… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 20 12:07:10 2009 -0800 crypt32: Only trace a usage match if it's not empty. --- dlls/crypt32/chain.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 0f2b5dd..a53b030 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2456,12 +2456,15 @@ static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, static void dump_usage_match(LPCSTR name, const CERT_USAGE_MATCH *usageMatch) { - DWORD i; + if (usageMatch->Usage.cUsageIdentifier) + { + DWORD i; - TRACE_(chain)("%s: %s\n", name, - usageMatch->dwType == USAGE_MATCH_TYPE_AND ? "AND" : "OR"); - for (i = 0; i < usageMatch->Usage.cUsageIdentifier; i++) - TRACE_(chain)("%s\n", usageMatch->Usage.rgpszUsageIdentifier[i]); + TRACE_(chain)("%s: %s\n", name, + usageMatch->dwType == USAGE_MATCH_TYPE_AND ? "AND" : "OR"); + for (i = 0; i < usageMatch->Usage.cUsageIdentifier; i++) + TRACE_(chain)("%s\n", usageMatch->Usage.rgpszUsageIdentifier[i]); + } } static void dump_chain_para(const CERT_CHAIN_PARA *pChainPara)

1 0

Juan Lang : crypt32: Test verifying the enhanced key usage of a chain.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: e611a839624e97708aa3c768aeacf39aca9ad6fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e611a839624e97708aa3c768a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 20 12:06:47 2009 -0800 crypt32: Test verifying the enhanced key usage of a chain. --- dlls/crypt32/tests/chain.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 2b8d967..b21fba6 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3606,6 +3606,9 @@ static void testGetCertChain(void) 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; + LPSTR oids[2]; /* Basic parameter checks */ if (0) @@ -3829,6 +3832,70 @@ static void testGetCertChain(void) 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); + CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, + verisignCA, sizeof(verisignCA), CERT_STORE_ADD_ALWAYS, NULL); + CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, + thawte_sgc_ca, sizeof(thawte_sgc_ca), CERT_STORE_ADD_ALWAYS, NULL); + cert = CertCreateCertificateContext(X509_ASN_ENCODING, + google, sizeof(google)); + SystemTimeToFileTime(&oct2009, &fileTime); + memset(&para, 0, sizeof(para)); + para.cbSize = sizeof(para); + oids[0] = one_two_three; + para.RequestedUsage.dwType = USAGE_MATCH_TYPE_AND; + para.RequestedUsage.Usage.rgpszUsageIdentifier = oids; + para.RequestedUsage.Usage.cUsageIdentifier = 1; + ret = pCertGetCertificateChain(NULL, cert, &fileTime, store, &para, + 0, NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError()); + if (ret) + { + todo_wine + ok(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE, + "expected CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); + CertFreeCertificateChain(chain); + } + oids[0] = oid_server_auth; + ret = pCertGetCertificateChain(NULL, cert, &fileTime, store, &para, + 0, NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError()); + if (ret) + { + ok(!(chain->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_NOT_VALID_FOR_USAGE), + "didn't expect CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); + CertFreeCertificateChain(chain); + } + oids[1] = one_two_three; + para.RequestedUsage.Usage.cUsageIdentifier = 2; + para.RequestedUsage.dwType = USAGE_MATCH_TYPE_AND; + ret = pCertGetCertificateChain(NULL, cert, &fileTime, store, &para, + 0, NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError()); + if (ret) + { + todo_wine + ok(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE, + "expected CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); + CertFreeCertificateChain(chain); + } + para.RequestedUsage.dwType = USAGE_MATCH_TYPE_OR; + ret = pCertGetCertificateChain(NULL, cert, &fileTime, store, &para, + 0, NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError()); + if (ret) + { + ok(!(chain->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_NOT_VALID_FOR_USAGE), + "didn't expect CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); + CertFreeCertificateChain(chain); + } + CertCloseStore(store, 0); + CertFreeCertificateContext(cert); + for (i = 0; i < sizeof(chainCheck) / sizeof(chainCheck[0]); i++) { chain = getChain(&chainCheck[i].certs, 0, TRUE, &oct2007,

1 0

Alexander Nicolaysen Sørnes : contact. php: Fix some warnings
by Alexander Nicolaysen Sørnes 22 Nov '09

22 Nov '09

Module: appdb Branch: master Commit: 4134a08fde157a936f34cb87da09ec40df738113 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4134a08fde157a936f34cb87… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 22 05:12:03 2009 +0100 contact.php: Fix some warnings --- contact.php | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/contact.php b/contact.php index 06757c6..9bbb4fd 100644 --- a/contact.php +++ b/contact.php @@ -9,6 +9,7 @@ require_once(BASE."/include/incl.php"); */ $oUser = new User($_SESSION['current']->iUserId); +$shError = ''; /* Restrict error to logged-in users */ if(!$oUser->isLoggedIn()) @@ -55,7 +56,7 @@ if($sRecipientGroup) /* Check for errors */ if((!$aClean['sMessage'] || !$aClean['sSubject']) && $aClean['sSubmit']) { - $error = "<font color=\"red\">Please enter both a subject and a ". + $shError = "<font color=\"red\">Please enter both a subject and a ". "message.</font>"; $aClean['sSubmit'] = ""; } @@ -67,7 +68,7 @@ if(!$aClean['sSubmit']) echo '&nbsp'; echo html_frame_start("Composer",400,"",0); - echo $error; + echo $shError; echo "<form action=\"".$_SERVER['PHP_SELF']."\" method=\"post\">"; /* User manager */ @@ -96,7 +97,7 @@ if(!$aClean['sSubmit']) $oTableRow->SetClass("color4"); $oTableRow->AddTextCell("Subject"); $oTableCell = new TableCell("<input type=\"text\" name=\"sSubject\" size=\"71\"". - " value=\"".$aClean['sSubject']."\">"); + " value=\"".getInput('sSubject', $aClean)."\">"); $oTableRow->AddCell($oTableCell); $oTable->AddRow($oTableRow); @@ -106,7 +107,7 @@ if(!$aClean['sSubmit']) $oTableCell->SetValign("top"); $oTableRow->AddCell($oTableCell); $oTableCell = new TableCell("<textarea name=\"sMessage\" rows=\"15\" cols=\"60\">" - .$aClean['sMessage']."</textarea>"); + .getInput('sMessage', $aClean)."</textarea>"); $oTableRow->AddCell($oTableCell); $oTable->AddRow($oTableRow);

1 0

Alexander Nicolaysen Sørnes : Admin Maintainers: Re-add link to email all maintainers
by Alexander Nicolaysen Sørnes 22 Nov '09

22 Nov '09

Module: appdb Branch: master Commit: ed3d1d04757400c542dc53d8232c44c5a98adb00 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=ed3d1d04757400c542dc53d8… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 22 05:07:33 2009 +0100 Admin Maintainers: Re-add link to email all maintainers --- include/maintainerView.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/maintainerView.php b/include/maintainerView.php index 3fade1e..bf90582 100644 --- a/include/maintainerView.php +++ b/include/maintainerView.php @@ -80,6 +80,8 @@ class maintainerView public function objectDrawCustomTable($hResult, $sQueued, $oM) { + echo '<div align="center"><a href="'.BASE.'contact.php?sRecipientGroup=maintainers">E-mail all maintainers</a></div>'; + $oTable = new Table(); $oNewOM = new objectManager('maintainer');

1 0

Alexander Nicolaysen Sørnes : Make updateMaintainerStates.php into a Control Center
by Alexander Nicolaysen Sørnes 22 Nov '09

22 Nov '09

Module: appdb Branch: master Commit: 68f0ac116cdc6feb19161b0fde9d93cb1487a53e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=68f0ac116cdc6feb19161b0f… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 22 04:45:27 2009 +0100 Make updateMaintainerStates.php into a Control Center --- updateMaintainerStates.php => admin.php | 7 +++++-- include/sidebar_admin.php | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/updateMaintainerStates.php b/admin.php similarity index 80% rename from updateMaintainerStates.php rename to admin.php index f8644aa..2a4f757 100644 --- a/updateMaintainerStates.php +++ b/admin.php @@ -7,6 +7,8 @@ require_once('include/maintainer.php'); if(!$_SESSION['current']->hasPriv('admin')) util_show_error_page_and_exit("Only admins are allowed in here"); +apidb_header('AppDB Control Center'); + function updateAppMaintainerStates() { $hResult = application::objectGetEntries('accepted'); @@ -39,8 +41,8 @@ function updateVersionMaintainerStates() function showChoices() { - echo '<a href="updateMaintainerStates.php?sAction=updateAppMaintainerStates">Update application maintainer states</a><br />'; - echo '<a href="updateMaintainerStates.php?sAction=updateVersionMaintainerStates">Update version maintainer states</a>'; + echo '<a href="admin.php?sAction=updateAppMaintainerStates">Update application maintainer states</a><br />'; + echo '<a href="admin.php?sAction=updateVersionMaintainerStates">Update version maintainer states</a>'; } switch(getInput('sAction', $aClean)) @@ -58,5 +60,6 @@ switch(getInput('sAction', $aClean)) break; } +apidb_footer(); ?> diff --git a/include/sidebar_admin.php b/include/sidebar_admin.php index b059e3a..ef22c77 100644 --- a/include/sidebar_admin.php +++ b/include/sidebar_admin.php @@ -59,6 +59,7 @@ function global_admin_menu() { $g->add("Add Category", BASE."objectManager.php?sClass=category&sAction=add&sTitle=Add+Category"); $g->add("Add Vendor", BASE."objectManager.php?sClass=vendor&bQueue=". "false&sAction=add&sTitle=Add%20Vendor"); + $g->add('Control Center', BASE.'admin.php'); $g->done(); }

1 0

Alexander Nicolaysen Sørnes : Add and use maintainer::getMaintainerCountForUserId
by Alexander Nicolaysen Sørnes 22 Nov '09

22 Nov '09

Module: appdb Branch: master Commit: b4f0ac8507229e75934d7c6f6af946dcf3e90e85 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b4f0ac8507229e75934d7c6f… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 22 04:29:46 2009 +0100 Add and use maintainer::getMaintainerCountForUserId --- include/maintainer.php | 10 ++++++++-- include/maintainerView.php | 5 +++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index 5ca2751..881b315 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -529,17 +529,23 @@ class maintainer } // returns the number of applications/versions a particular user maintains - function getMaintainerCountForUser($oUser, $bSuperMaintainer) + function getMaintainerCountForUserId($iUserId, $bSuperMaintainer) { $sQuery = "SELECT count(*) as cnt from appMaintainers WHERE userid = '?' AND superMaintainer = '?'". " AND state ='?'"; - $hResult = query_parameters($sQuery, $oUser->iUserId, $bSuperMaintainer ? "1" : "0", 'accepted'); + $hResult = query_parameters($sQuery, $iUserId, $bSuperMaintainer ? "1" : "0", 'accepted'); if(!$hResult) return 0; $oRow = query_fetch_object($hResult); return $oRow->cnt; } + // returns the number of applications/versions a particular user maintains + function getMaintainerCountForUser($oUser, $bSuperMaintainer) + { + return getMaintainerCountForUserId($oUser->iUserId, $bSuperMaintainer); + } + /** * get the applications and versions that this user maintains */ diff --git a/include/maintainerView.php b/include/maintainerView.php index 36cee0a..3fade1e 100644 --- a/include/maintainerView.php +++ b/include/maintainerView.php @@ -96,6 +96,7 @@ class maintainerView { $oTableRow = new TableRow(); $oMaintainerView = new maintainerView(null, $oRow); + $iUserId = $oMaintainerView->iUserId; $oUser = new user($oMaintainerView->iUserId); $sStyle = 'border-top: thin solid; border-bottom: thin solid;'; @@ -107,13 +108,13 @@ class maintainerView $oCell->SetStyle($sStyle); $oTableRow->AddCell($oCell); - $iMaintainedApps = maintainer::GetMaintainerCountForUser($oUser, true); + $iMaintainedApps = maintainer::GetMaintainerCountForUserId($iUserId, true); $sPlural = ($iMaintainedApps == 1) ? '' : 's'; $oCell = new TableCell($iMaintainedApps ? "$iMaintainedApps application$sPlural" : ' '); $oCell->SetStyle($sStyle); $oTableRow->AddCell($oCell); - $iMaintainedVersions = maintainer::GetMaintainerCountForUser($oUser, false); + $iMaintainedVersions = maintainer::GetMaintainerCountForUserId($iUserId, false); $sPlural = ($iMaintainedVersions == 1) ? '' : 's'; $oCell = new TableCell($iMaintainedVersions ? "$iMaintainedVersions version$sPlural" : ' '); $oCell->SetStyle($sStyle);

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2009