diff --git a/reactos/dll/win32/crypt32/cert.c b/reactos/dll/win32/crypt32/cert.c index 8df27f8ec0d..f3ee89f9e39 100644 --- a/reactos/dll/win32/crypt32/cert.c +++ b/reactos/dll/win32/crypt32/cert.c @@ -975,7 +975,7 @@ static BOOL container_matches_cert(PCCERT_CONTEXT pCert, LPCSTR container, { CRYPT_KEY_PROV_INFO copy; WCHAR containerW[MAX_PATH]; - BOOL matches = FALSE; + BOOL matches; MultiByteToWideChar(CP_ACP, 0, container, -1, containerW, sizeof(containerW) / sizeof(containerW[0])); @@ -1133,7 +1133,7 @@ static BOOL cert_prov_info_matches_cert(PCCERT_CONTEXT pCert) BOOL WINAPI CryptFindCertificateKeyProvInfo(PCCERT_CONTEXT pCert, DWORD dwFlags, void *pvReserved) { - BOOL matches = FALSE; + BOOL matches; TRACE("(%p, %08x, %p)\n", pCert, dwFlags, pvReserved); @@ -2878,7 +2878,7 @@ static void CRYPT_SetBitInField(struct BitField *field, DWORD bit) static BOOL CRYPT_IsBitInFieldSet(const struct BitField *field, DWORD bit) { - BOOL set = FALSE; + BOOL set; DWORD indexIndex = bit / BITS_PER_DWORD; assert(field->cIndexes); @@ -3090,7 +3090,6 @@ static void CertContext_SetKeyProvInfo(PCCERT_CONTEXT context, CryptMemFree(szProvider); } } - size = sizeof(info.dwKeySpec); /* in case no CRYPT_KEY_PROV_INFO given, * we always use AT_SIGNATURE key spec */ diff --git a/reactos/dll/win32/crypt32/rootstore.c b/reactos/dll/win32/crypt32/rootstore.c index c9c01750960..e0a85e95a99 100644 --- a/reactos/dll/win32/crypt32/rootstore.c +++ b/reactos/dll/win32/crypt32/rootstore.c @@ -482,6 +482,7 @@ static const char * const CRYPT_knownLocations[] = { "/usr/share/ca-certificates/ca-bundle.crt", "/usr/local/share/certs/", "/etc/sfw/openssl/certs", + "/etc/security/cacerts", /* Android */ }; static const BYTE authenticode[] = { diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 5c23e571c77..82d5578c540 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -65,7 +65,7 @@ reactos/dll/win32/comctl32 # Synced to WineStaging-1.7.37 reactos/dll/win32/comdlg32 # Synced to WineStaging-1.7.37 reactos/dll/win32/compstui # Synced to Wine-1.7.27 reactos/dll/win32/credui # Synced to Wine-1.7.27 -reactos/dll/win32/crypt32 # Synced to Wine-1.7.27 +reactos/dll/win32/crypt32 # Synced to WineStaging-1.7.37 reactos/dll/win32/cryptdlg # Synced to Wine-1.7.27 reactos/dll/win32/cryptdll # Synced to Wine-1.7.27 reactos/dll/win32/cryptnet # Synced to Wine-1.7.27