ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypt32: Fix CertAddCertificateContextToStore when called with CERT_STORE_ADD_USE_EXISTING.

This commit is contained in:
Mounir IDRASSI 2007-05-21 02:25:48 +02:00 committed by Alexandre Julliard
parent b45367347a
commit e5256d9840
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/crypt32/store.c
View File

@ -2160,7 +2160,12 @@ BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore,
break; break;
case CERT_STORE_ADD_USE_EXISTING: case CERT_STORE_ADD_USE_EXISTING:
if (existing) if (existing)
{
CertContext_CopyProperties(existing, pCertContext); CertContext_CopyProperties(existing, pCertContext);
*ppStoreContext = CertDuplicateCertificateContext(existing);
}
else
toAdd = CertDuplicateCertificateContext(pCertContext);
break; break;
default: default:
FIXME("Unimplemented add disposition %d\n", dwAddDisposition); FIXME("Unimplemented add disposition %d\n", dwAddDisposition);

10
dlls/crypt32/tests/cert.c
View File

@ -134,6 +134,7 @@ static void testAddCert(void)
HCERTSTORE store; HCERTSTORE store;
HCERTSTORE collection; HCERTSTORE collection;
PCCERT_CONTEXT context; PCCERT_CONTEXT context;
PCCERT_CONTEXT copyContext;
BOOL ret; BOOL ret;
store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,
@ -274,6 +275,15 @@ static void testAddCert(void)
CERT_STORE_ADD_REPLACE_EXISTING, NULL); CERT_STORE_ADD_REPLACE_EXISTING, NULL);
ok(ret, "CertAddCertificateContextToStore failed: %08x\n", ok(ret, "CertAddCertificateContextToStore failed: %08x\n",
GetLastError()); GetLastError());
/* use the existing certificate and ask for a copy of the context*/
copyContext = NULL;
ret = CertAddCertificateContextToStore(collection, context,
CERT_STORE_ADD_USE_EXISTING, &copyContext);
ok(ret, "CertAddCertificateContextToStore failed: %08x\n",
GetLastError());
ok(copyContext != NULL, "Expected on output a non NULL copyContext\n");
if (copyContext)
CertFreeCertificateContext(copyContext);
/* but adding a new certificate isn't allowed. */ /* but adding a new certificate isn't allowed. */
ret = CertAddCertificateContextToStore(collection, context, ret = CertAddCertificateContextToStore(collection, context,
CERT_STORE_ADD_ALWAYS, NULL); CERT_STORE_ADD_ALWAYS, NULL);