Skip to content

W
wine-cw
Commit 6d3c0dc1 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

crypt32/tests: Statically link to CertAddStoreToCollection().

Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent a0b0fac3
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 42 deletions
dlls/crypt32/tests/cert.c
View file @ 6d3c0dc1
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include "wine/test.h" #include "wine/test.h"
static BOOL (WINAPI *pCertAddStoreToCollection)(HCERTSTORE,HCERTSTORE,DWORD,DWORD);
static PCCERT_CONTEXT (WINAPI *pCertCreateSelfSignCertificate)(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE,PCERT_NAME_BLOB,DWORD,PCRYPT_KEY_PROV_INFO,PCRYPT_ALGORITHM_IDENTIFIER,PSYSTEMTIME,PSYSTEMTIME,PCERT_EXTENSIONS); static PCCERT_CONTEXT (WINAPI *pCertCreateSelfSignCertificate)(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE,PCERT_NAME_BLOB,DWORD,PCRYPT_KEY_PROV_INFO,PCRYPT_ALGORITHM_IDENTIFIER,PSYSTEMTIME,PSYSTEMTIME,PCERT_EXTENSIONS);
static BOOL (WINAPI *pCertGetValidUsages)(DWORD,PCCERT_CONTEXT*,int*,LPSTR*,DWORD*); static BOOL (WINAPI *pCertGetValidUsages)(DWORD,PCCERT_CONTEXT*,int*,LPSTR*,DWORD*);
static BOOL (WINAPI *pCryptAcquireCertificatePrivateKey)(PCCERT_CONTEXT,DWORD,void*,HCRYPTPROV_OR_NCRYPT_KEY_HANDLE*,DWORD*,BOOL*); static BOOL (WINAPI *pCryptAcquireCertificatePrivateKey)(PCCERT_CONTEXT,DWORD,void*,HCRYPTPROV_OR_NCRYPT_KEY_HANDLE*,DWORD*,BOOL*);
...@@ -50,7 +49,6 @@ static void init_function_pointers(void) ...@@ -50,7 +49,6 @@ static void init_function_pointers(void)
if(!p ## func) \ if(!p ## func) \
trace("GetProcAddress(%s) failed\n", #func); trace("GetProcAddress(%s) failed\n", #func);
GET_PROC(hCrypt32, CertAddStoreToCollection)
GET_PROC(hCrypt32, CertCreateSelfSignCertificate) GET_PROC(hCrypt32, CertCreateSelfSignCertificate)
GET_PROC(hCrypt32, CertGetValidUsages) GET_PROC(hCrypt32, CertGetValidUsages)
GET_PROC(hCrypt32, CryptAcquireCertificatePrivateKey) GET_PROC(hCrypt32, CryptAcquireCertificatePrivateKey)
...@@ -279,10 +277,10 @@ static void testAddCert(void) ...@@ -279,10 +277,10 @@ static void testAddCert(void)
collection = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, collection = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0,
CERT_STORE_CREATE_NEW_FLAG, NULL); CERT_STORE_CREATE_NEW_FLAG, NULL);
ok(collection != NULL, "CertOpenStore failed: %08x\n", GetLastError()); ok(collection != NULL, "CertOpenStore failed: %08x\n", GetLastError());
if (collection && pCertAddStoreToCollection) if (collection)
{ {
/* Add store to the collection, but disable updates */ /* Add store to the collection, but disable updates */
pCertAddStoreToCollection(collection, store, 0, 0); CertAddStoreToCollection(collection, store, 0, 0);
context = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert2, context = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert2,
sizeof(bigCert2)); sizeof(bigCert2));
......
dlls/crypt32/tests/store.c
View file @ 6d3c0dc1
...@@ -117,8 +117,6 @@ static const BYTE signedCTLWithCTLInnerContent[] = { ...@@ -117,8 +117,6 @@ static const BYTE signedCTLWithCTLInnerContent[] = {
0x8e,0xe7,0x5f,0x76,0x2b,0xd1,0x6a,0x82,0xb3,0x30,0x25,0x61,0xf6,0x25,0x23, 0x8e,0xe7,0x5f,0x76,0x2b,0xd1,0x6a,0x82,0xb3,0x30,0x25,0x61,0xf6,0x25,0x23,
0x57,0x6c,0x0b,0x47,0xb8 }; 0x57,0x6c,0x0b,0x47,0xb8 };
static BOOL (WINAPI *pCertAddStoreToCollection)(HCERTSTORE,HCERTSTORE,DWORD,DWORD);
static BOOL (WINAPI *pCertControlStore)(HCERTSTORE,DWORD,DWORD,void const*); static BOOL (WINAPI *pCertControlStore)(HCERTSTORE,DWORD,DWORD,void const*);
static PCCRL_CONTEXT (WINAPI *pCertEnumCRLsInStore)(HCERTSTORE,PCCRL_CONTEXT); static PCCRL_CONTEXT (WINAPI *pCertEnumCRLsInStore)(HCERTSTORE,PCCRL_CONTEXT);
static BOOL (WINAPI *pCertEnumSystemStore)(DWORD,void*,void*,PFN_CERT_ENUM_SYSTEM_STORE); static BOOL (WINAPI *pCertEnumSystemStore)(DWORD,void*,void*,PFN_CERT_ENUM_SYSTEM_STORE);
...@@ -503,11 +501,6 @@ static void testStoresInCollection(void) ...@@ -503,11 +501,6 @@ static void testStoresInCollection(void)
WineTestRW2_W[]= { 'W','i','n','e','T','e','s','t','_','R','W','2',0 }; WineTestRW2_W[]= { 'W','i','n','e','T','e','s','t','_','R','W','2',0 };
BOOL ret; BOOL ret;
if (!pCertAddStoreToCollection)
{
win_skip("CertAddStoreToCollection() is not available\n");
return;
}
collection = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, collection = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0,
CERT_STORE_CREATE_NEW_FLAG, NULL); CERT_STORE_CREATE_NEW_FLAG, NULL);
ok(collection != NULL, "Failed to init collection store, last error %x\n", GetLastError()); ok(collection != NULL, "Failed to init collection store, last error %x\n", GetLastError());
...@@ -646,12 +639,6 @@ static void testCollectionStore(void) ...@@ -646,12 +639,6 @@ static void testCollectionStore(void)
WCHAR filename[MAX_PATH]; WCHAR filename[MAX_PATH];
HANDLE file; HANDLE file;
if (!pCertAddStoreToCollection)
{
win_skip("CertAddStoreToCollection() is not available\n");
return;
}
collection = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, collection = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0,
CERT_STORE_CREATE_NEW_FLAG, NULL); CERT_STORE_CREATE_NEW_FLAG, NULL);
...@@ -668,7 +655,7 @@ static void testCollectionStore(void) ...@@ -668,7 +655,7 @@ static void testCollectionStore(void)
bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, NULL); bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, NULL);
ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError());
/* Add the memory store to the collection, without allowing adding */ /* Add the memory store to the collection, without allowing adding */
ret = pCertAddStoreToCollection(collection, store1, 0, 0); ret = CertAddStoreToCollection(collection, store1, 0, 0);
ok(ret, "CertAddStoreToCollection failed: %08x\n", GetLastError()); ok(ret, "CertAddStoreToCollection failed: %08x\n", GetLastError());
/* Verify the cert is in the collection */ /* Verify the cert is in the collection */
context = CertEnumCertificatesInStore(collection, NULL); context = CertEnumCertificatesInStore(collection, NULL);
...@@ -688,7 +675,7 @@ static void testCollectionStore(void) ...@@ -688,7 +675,7 @@ static void testCollectionStore(void)
store2 = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, store2 = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,
CERT_STORE_CREATE_NEW_FLAG, NULL); CERT_STORE_CREATE_NEW_FLAG, NULL);
/* Try adding a store to a non-collection store */ /* Try adding a store to a non-collection store */
ret = pCertAddStoreToCollection(store1, store2, ret = CertAddStoreToCollection(store1, store2,
CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0);
ok(!ret && GetLastError() == E_INVALIDARG, ok(!ret && GetLastError() == E_INVALIDARG,
"Expected E_INVALIDARG, got %08x\n", GetLastError()); "Expected E_INVALIDARG, got %08x\n", GetLastError());
...@@ -698,7 +685,7 @@ static void testCollectionStore(void) ...@@ -698,7 +685,7 @@ static void testCollectionStore(void)
CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0);
*/ */
/* This "succeeds"... */ /* This "succeeds"... */
ret = pCertAddStoreToCollection(collection, 0, ret = CertAddStoreToCollection(collection, 0,
CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0);
ok(ret, "CertAddStoreToCollection failed: %08x\n", GetLastError()); ok(ret, "CertAddStoreToCollection failed: %08x\n", GetLastError());
/* while this crashes. /* while this crashes.
...@@ -707,7 +694,7 @@ static void testCollectionStore(void) ...@@ -707,7 +694,7 @@ static void testCollectionStore(void)
*/ */
/* Add it to the collection, this time allowing adding */ /* Add it to the collection, this time allowing adding */
ret = pCertAddStoreToCollection(collection, store2, ret = CertAddStoreToCollection(collection, store2,
CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0);
ok(ret, "CertAddStoreToCollection failed: %08x\n", GetLastError()); ok(ret, "CertAddStoreToCollection failed: %08x\n", GetLastError());
/* Check that adding to the collection is allowed */ /* Check that adding to the collection is allowed */
...@@ -775,7 +762,7 @@ static void testCollectionStore(void) ...@@ -775,7 +762,7 @@ static void testCollectionStore(void)
/* Adding a collection to a collection is legal */ /* Adding a collection to a collection is legal */
collection2 = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, collection2 = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0,
CERT_STORE_CREATE_NEW_FLAG, NULL); CERT_STORE_CREATE_NEW_FLAG, NULL);
ret = pCertAddStoreToCollection(collection2, collection, ret = CertAddStoreToCollection(collection2, collection,
CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0);
ok(ret, "CertAddStoreToCollection failed: %08x\n", GetLastError()); ok(ret, "CertAddStoreToCollection failed: %08x\n", GetLastError());
/* check the contents of collection2 */ /* check the contents of collection2 */
...@@ -835,11 +822,9 @@ static void testCollectionStore(void) ...@@ -835,11 +822,9 @@ static void testCollectionStore(void)
CERT_STORE_CREATE_NEW_FLAG, NULL); CERT_STORE_CREATE_NEW_FLAG, NULL);
ok(collection != 0, "CertOpenStore failed: %08x\n", GetLastError()); ok(collection != 0, "CertOpenStore failed: %08x\n", GetLastError());
ret = pCertAddStoreToCollection(collection, store1, ret = CertAddStoreToCollection(collection, store1, CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0);
CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0);
ok(ret, "CertAddStoreToCollection failed: %08x\n", GetLastError()); ok(ret, "CertAddStoreToCollection failed: %08x\n", GetLastError());
ret = pCertAddStoreToCollection(collection, store2, ret = CertAddStoreToCollection(collection, store2, CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0);
CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0);
ok(ret, "CertAddStoreToCollection failed: %08x\n", GetLastError()); ok(ret, "CertAddStoreToCollection failed: %08x\n", GetLastError());
/* Check that the collection has two copies of the same cert */ /* Check that the collection has two copies of the same cert */
...@@ -948,8 +933,7 @@ static void testCollectionStore(void) ...@@ -948,8 +933,7 @@ static void testCollectionStore(void)
ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError());
CertDeleteCertificateFromStore(context); CertDeleteCertificateFromStore(context);
pCertAddStoreToCollection(collection, store1, CertAddStoreToCollection(collection, store1, CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0);
CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0);
ret = CertAddEncodedCertificateToStore(collection, X509_ASN_ENCODING, ret = CertAddEncodedCertificateToStore(collection, X509_ASN_ENCODING,
bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, &context); bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, &context);
...@@ -976,7 +960,7 @@ static void testCollectionStore(void) ...@@ -976,7 +960,7 @@ static void testCollectionStore(void)
*/ */
store1 = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, store1 = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,
CERT_STORE_CREATE_NEW_FLAG, NULL); CERT_STORE_CREATE_NEW_FLAG, NULL);
pCertAddStoreToCollection(collection, store1, 0, 0); CertAddStoreToCollection(collection, store1, 0, 0);
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = pCertControlStore(collection, 0, CERT_STORE_CTRL_COMMIT, NULL); ret = pCertControlStore(collection, 0, CERT_STORE_CTRL_COMMIT, NULL);
ok(!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED, ok(!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED,
...@@ -1000,8 +984,7 @@ static void testCollectionStore(void) ...@@ -1000,8 +984,7 @@ static void testCollectionStore(void)
CERT_FILE_STORE_COMMIT_ENABLE_FLAG, file); CERT_FILE_STORE_COMMIT_ENABLE_FLAG, file);
ok(store1 != NULL, "CertOpenStore failed: %08x\n", GetLastError()); ok(store1 != NULL, "CertOpenStore failed: %08x\n", GetLastError());
CloseHandle(file); CloseHandle(file);
pCertAddStoreToCollection(collection, store1, CertAddStoreToCollection(collection, store1, CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0);
CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0);
CertCloseStore(store1, 0); CertCloseStore(store1, 0);
ret = CertAddEncodedCertificateToStore(collection, X509_ASN_ENCODING, ret = CertAddEncodedCertificateToStore(collection, X509_ASN_ENCODING,
...@@ -1364,12 +1347,8 @@ static void testSystemRegStore(void) ...@@ -1364,12 +1347,8 @@ static void testSystemRegStore(void)
CERT_STORE_CREATE_NEW_FLAG, NULL); CERT_STORE_CREATE_NEW_FLAG, NULL);
if (memStore) if (memStore)
{ {
if (pCertAddStoreToCollection) BOOL ret = CertAddStoreToCollection(store, memStore, 0, 0);
{ ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError());
BOOL ret = pCertAddStoreToCollection(store, memStore, 0, 0);
ok(!ret && GetLastError() == E_INVALIDARG,
"Expected E_INVALIDARG, got %08x\n", GetLastError());
}
CertCloseStore(memStore, 0); CertCloseStore(memStore, 0);
} }
CertCloseStore(store, 0); CertCloseStore(store, 0);
...@@ -1458,12 +1437,9 @@ static void testSystemStore(void) ...@@ -1458,12 +1437,9 @@ static void testSystemStore(void)
/* Check that it's a collection store */ /* Check that it's a collection store */
if (memStore) if (memStore)
{ {
if (pCertAddStoreToCollection) BOOL ret = CertAddStoreToCollection(store, memStore, 0, 0);
{
BOOL ret = pCertAddStoreToCollection(store, memStore, 0, 0);
/* FIXME: this'll fail on NT4, but what error will it give? */ /* FIXME: this'll fail on NT4, but what error will it give? */
ok(ret, "CertAddStoreToCollection failed: %08x\n", GetLastError()); ok(ret, "CertAddStoreToCollection failed: %08x\n", GetLastError());
}
CertCloseStore(memStore, 0); CertCloseStore(memStore, 0);
} }
CertCloseStore(store, 0); CertCloseStore(store, 0);
...@@ -3169,7 +3145,6 @@ START_TEST(store) ...@@ -3169,7 +3145,6 @@ START_TEST(store)
HMODULE hdll; HMODULE hdll;
hdll = GetModuleHandleA("Crypt32.dll"); hdll = GetModuleHandleA("Crypt32.dll");
pCertAddStoreToCollection = (void*)GetProcAddress(hdll, "CertAddStoreToCollection");
pCertControlStore = (void*)GetProcAddress(hdll, "CertControlStore"); pCertControlStore = (void*)GetProcAddress(hdll, "CertControlStore");
pCertEnumCRLsInStore = (void*)GetProcAddress(hdll, "CertEnumCRLsInStore"); pCertEnumCRLsInStore = (void*)GetProcAddress(hdll, "CertEnumCRLsInStore");
pCertEnumSystemStore = (void*)GetProcAddress(hdll, "CertEnumSystemStore"); pCertEnumSystemStore = (void*)GetProcAddress(hdll, "CertEnumSystemStore");
......
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