-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathcrypt32-for-1.7.4-from-1.7.5.patch
4124 lines (3847 loc) · 140 KB
/
crypt32-for-1.7.4-from-1.7.5.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff -Naur a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c
--- a/dlls/crypt32/cert.c 2013-10-11 17:21:06.000000000 +0000
+++ b/dlls/crypt32/cert.c 2013-10-25 17:45:30.000000000 +0000
@@ -38,7 +38,7 @@
* CertGetCertificateContextProperty, and are particular to the store in which
* the property exists (which is separate from the context.)
*/
-static BOOL CertContext_GetProperty(void *context, DWORD dwPropId,
+static BOOL CertContext_GetProperty(cert_t *cert, DWORD dwPropId,
void *pvData, DWORD *pcbData);
/* Internal version of CertSetCertificateContextProperty that sets properties
@@ -46,7 +46,7 @@
* type.) Doesn't handle special cases, since they're handled by
* CertSetCertificateContextProperty anyway.
*/
-static BOOL CertContext_SetProperty(void *context, DWORD dwPropId,
+static BOOL CertContext_SetProperty(cert_t *cert, DWORD dwPropId,
DWORD dwFlags, const void *pvData);
BOOL WINAPI CertAddEncodedCertificateToStore(HCERTSTORE hCertStore,
@@ -109,6 +109,184 @@
return ret;
}
+static const context_vtbl_t cert_vtbl;
+
+static void Cert_free(context_t *context)
+{
+ cert_t *cert = (cert_t*)context;
+
+ CryptMemFree(cert->ctx.pbCertEncoded);
+ LocalFree(cert->ctx.pCertInfo);
+}
+
+static context_t *Cert_clone(context_t *context, WINECRYPT_CERTSTORE *store, BOOL use_link)
+{
+ cert_t *cert;
+
+ if(use_link) {
+ cert = (cert_t*)Context_CreateLinkContext(sizeof(CERT_CONTEXT), context, store);
+ if(!cert)
+ return NULL;
+ }else {
+ const cert_t *cloned = (const cert_t*)context;
+ DWORD size = 0;
+ BOOL res;
+
+ cert = (cert_t*)Context_CreateDataContext(sizeof(CERT_CONTEXT), &cert_vtbl, store);
+ if(!cert)
+ return NULL;
+
+ Context_CopyProperties(&cert->ctx, &cloned->ctx);
+
+ cert->ctx.dwCertEncodingType = cloned->ctx.dwCertEncodingType;
+ cert->ctx.pbCertEncoded = CryptMemAlloc(cloned->ctx.cbCertEncoded);
+ memcpy(cert->ctx.pbCertEncoded, cloned->ctx.pbCertEncoded, cloned->ctx.cbCertEncoded);
+ cert->ctx.cbCertEncoded = cloned->ctx.cbCertEncoded;
+
+ /* FIXME: We don't need to decode the object here, we could just clone cert info. */
+ res = CryptDecodeObjectEx(cert->ctx.dwCertEncodingType, X509_CERT_TO_BE_SIGNED,
+ cert->ctx.pbCertEncoded, cert->ctx.cbCertEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL,
+ &cert->ctx.pCertInfo, &size);
+ if(!res) {
+ CertFreeCertificateContext(&cert->ctx);
+ return NULL;
+ }
+ }
+
+ cert->ctx.hCertStore = store;
+ return &cert->base;
+}
+
+static const context_vtbl_t cert_vtbl = {
+ Cert_free,
+ Cert_clone
+};
+
+static BOOL WINAPI add_cert_to_store(WINECRYPT_CERTSTORE *store, const CERT_CONTEXT *cert,
+ DWORD add_disposition, BOOL use_link, PCCERT_CONTEXT *ret_context)
+{
+ const CERT_CONTEXT *existing = NULL;
+ BOOL ret = TRUE, inherit_props = FALSE;
+ context_t *new_context = NULL;
+
+ switch (add_disposition)
+ {
+ case CERT_STORE_ADD_ALWAYS:
+ break;
+ case CERT_STORE_ADD_NEW:
+ case CERT_STORE_ADD_REPLACE_EXISTING:
+ case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES:
+ case CERT_STORE_ADD_USE_EXISTING:
+ case CERT_STORE_ADD_NEWER:
+ case CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES:
+ {
+ BYTE hashToAdd[20];
+ DWORD size = sizeof(hashToAdd);
+
+ ret = CertGetCertificateContextProperty(cert, CERT_HASH_PROP_ID,
+ hashToAdd, &size);
+ if (ret)
+ {
+ CRYPT_HASH_BLOB blob = { sizeof(hashToAdd), hashToAdd };
+
+ existing = CertFindCertificateInStore(store, cert->dwCertEncodingType, 0,
+ CERT_FIND_SHA1_HASH, &blob, NULL);
+ }
+ break;
+ }
+ default:
+ FIXME("Unimplemented add disposition %d\n", add_disposition);
+ SetLastError(E_INVALIDARG);
+ return FALSE;
+ }
+
+ switch (add_disposition)
+ {
+ case CERT_STORE_ADD_ALWAYS:
+ break;
+ case CERT_STORE_ADD_NEW:
+ if (existing)
+ {
+ TRACE("found matching certificate, not adding\n");
+ SetLastError(CRYPT_E_EXISTS);
+ return FALSE;
+ }
+ break;
+ case CERT_STORE_ADD_REPLACE_EXISTING:
+ break;
+ case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES:
+ if (use_link)
+ FIXME("CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: semi-stub for links\n");
+ if (existing)
+ inherit_props = TRUE;
+ break;
+ case CERT_STORE_ADD_USE_EXISTING:
+ if(use_link)
+ FIXME("CERT_STORE_ADD_USE_EXISTING: semi-stub for links\n");
+ if (existing)
+ {
+ Context_CopyProperties(existing, cert);
+ if (ret_context)
+ *ret_context = CertDuplicateCertificateContext(existing);
+ return TRUE;
+ }
+ break;
+ case CERT_STORE_ADD_NEWER:
+ if (existing && CompareFileTime(&existing->pCertInfo->NotBefore, &cert->pCertInfo->NotBefore) >= 0)
+ {
+ TRACE("existing certificate is newer, not adding\n");
+ SetLastError(CRYPT_E_EXISTS);
+ return FALSE;
+ }
+ break;
+ case CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES:
+ if (existing)
+ {
+ if (CompareFileTime(&existing->pCertInfo->NotBefore, &cert->pCertInfo->NotBefore) >= 0)
+ {
+ TRACE("existing certificate is newer, not adding\n");
+ SetLastError(CRYPT_E_EXISTS);
+ return FALSE;
+ }
+ inherit_props = TRUE;
+ }
+ break;
+ }
+
+ /* FIXME: We have tests that this works, but what should we really do in this case? */
+ if(!store) {
+ if(ret_context)
+ *ret_context = CertDuplicateCertificateContext(cert);
+ return TRUE;
+ }
+
+ ret = store->vtbl->certs.addContext(store, context_from_ptr(cert), existing ? context_from_ptr(existing) : NULL,
+ (ret_context || inherit_props) ? &new_context : NULL, use_link);
+ if(!ret)
+ return FALSE;
+
+ if(inherit_props)
+ Context_CopyProperties(context_ptr(new_context), existing);
+
+ if(ret_context)
+ *ret_context = context_ptr(new_context);
+ else if(new_context)
+ Context_Release(new_context);
+
+ TRACE("returning %d\n", ret);
+ return ret;
+}
+
+BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, PCCERT_CONTEXT pCertContext,
+ DWORD dwAddDisposition, PCCERT_CONTEXT *ppStoreContext)
+{
+ WINECRYPT_CERTSTORE *store = hCertStore;
+
+ TRACE("(%p, %p, %08x, %p)\n", hCertStore, pCertContext, dwAddDisposition, ppStoreContext);
+
+ return add_cert_to_store(store, pCertContext, dwAddDisposition, FALSE, ppStoreContext);
+}
+
BOOL WINAPI CertAddCertificateLinkToStore(HCERTSTORE hCertStore,
PCCERT_CONTEXT pCertContext, DWORD dwAddDisposition,
PCCERT_CONTEXT *ppCertContext)
@@ -126,14 +304,14 @@
SetLastError(E_INVALIDARG);
return FALSE;
}
- return CertAddCertificateContextToStore(hCertStore, pCertContext,
- dwAddDisposition, ppCertContext);
+ return add_cert_to_store(hCertStore, pCertContext, dwAddDisposition, TRUE, ppCertContext);
}
PCCERT_CONTEXT WINAPI CertCreateCertificateContext(DWORD dwCertEncodingType,
const BYTE *pbCertEncoded, DWORD cbCertEncoded)
{
- PCERT_CONTEXT cert = NULL;
+ cert_t *cert = NULL;
+ BYTE *data = NULL;
BOOL ret;
PCERT_INFO certInfo = NULL;
DWORD size = 0;
@@ -150,79 +328,65 @@
ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT_TO_BE_SIGNED,
pbCertEncoded, cbCertEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL,
&certInfo, &size);
- if (ret)
- {
- BYTE *data = NULL;
+ if (!ret)
+ return NULL;
- cert = Context_CreateDataContext(sizeof(CERT_CONTEXT));
- if (!cert)
- goto end;
- data = CryptMemAlloc(cbCertEncoded);
- if (!data)
- {
- CertFreeCertificateContext(cert);
- cert = NULL;
- goto end;
- }
- memcpy(data, pbCertEncoded, cbCertEncoded);
- cert->dwCertEncodingType = dwCertEncodingType;
- cert->pbCertEncoded = data;
- cert->cbCertEncoded = cbCertEncoded;
- cert->pCertInfo = certInfo;
- cert->hCertStore = 0;
+ cert = (cert_t*)Context_CreateDataContext(sizeof(CERT_CONTEXT), &cert_vtbl, &empty_store);
+ if (!cert)
+ return NULL;
+ data = CryptMemAlloc(cbCertEncoded);
+ if (!data)
+ {
+ Context_Release(&cert->base);
+ return NULL;
}
-end:
- return cert;
+ memcpy(data, pbCertEncoded, cbCertEncoded);
+ cert->ctx.dwCertEncodingType = dwCertEncodingType;
+ cert->ctx.pbCertEncoded = data;
+ cert->ctx.cbCertEncoded = cbCertEncoded;
+ cert->ctx.pCertInfo = certInfo;
+ cert->ctx.hCertStore = &empty_store;
+
+ return &cert->ctx;
}
-PCCERT_CONTEXT WINAPI CertDuplicateCertificateContext(
- PCCERT_CONTEXT pCertContext)
+PCCERT_CONTEXT WINAPI CertDuplicateCertificateContext(PCCERT_CONTEXT pCertContext)
{
TRACE("(%p)\n", pCertContext);
if (!pCertContext)
return NULL;
- Context_AddRef((void *)pCertContext);
+ Context_AddRef(&cert_from_ptr(pCertContext)->base);
return pCertContext;
}
-static void CertDataContext_Free(void *context)
-{
- PCERT_CONTEXT certContext = context;
-
- CryptMemFree(certContext->pbCertEncoded);
- LocalFree(certContext->pCertInfo);
-}
-
BOOL WINAPI CertFreeCertificateContext(PCCERT_CONTEXT pCertContext)
{
- BOOL ret = TRUE;
-
TRACE("(%p)\n", pCertContext);
if (pCertContext)
- ret = Context_Release((void *)pCertContext, CertDataContext_Free);
- return ret;
+ Context_Release(&cert_from_ptr(pCertContext)->base);
+ return TRUE;
}
DWORD WINAPI CertEnumCertificateContextProperties(PCCERT_CONTEXT pCertContext,
DWORD dwPropId)
{
- CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(pCertContext);
+ cert_t *cert = cert_from_ptr(pCertContext);
DWORD ret;
TRACE("(%p, %d)\n", pCertContext, dwPropId);
- if (properties)
- ret = ContextPropertyList_EnumPropIDs(properties, dwPropId);
+ if (cert->base.properties)
+ ret = ContextPropertyList_EnumPropIDs(cert->base.properties, dwPropId);
else
ret = 0;
return ret;
}
-static BOOL CertContext_GetHashProp(void *context, DWORD dwPropId,
+static BOOL CertContext_GetHashProp(cert_t *cert, DWORD dwPropId,
ALG_ID algID, const BYTE *toHash, DWORD toHashLen, void *pvData,
DWORD *pcbData)
{
@@ -232,7 +396,7 @@
{
CRYPT_DATA_BLOB blob = { *pcbData, pvData };
- ret = CertContext_SetProperty(context, dwPropId, 0, &blob);
+ ret = CertContext_SetProperty(cert, dwPropId, 0, &blob);
}
return ret;
}
@@ -258,18 +422,16 @@
return ret;
}
-static BOOL CertContext_GetProperty(void *context, DWORD dwPropId,
+static BOOL CertContext_GetProperty(cert_t *cert, DWORD dwPropId,
void *pvData, DWORD *pcbData)
{
- PCCERT_CONTEXT pCertContext = context;
- CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(context);
BOOL ret;
CRYPT_DATA_BLOB blob;
- TRACE("(%p, %d, %p, %p)\n", context, dwPropId, pvData, pcbData);
+ TRACE("(%p, %d, %p, %p)\n", cert, dwPropId, pvData, pcbData);
- if (properties)
- ret = ContextPropertyList_FindProperty(properties, dwPropId, &blob);
+ if (cert->base.properties)
+ ret = ContextPropertyList_FindProperty(cert->base.properties, dwPropId, &blob);
else
ret = FALSE;
if (ret)
@@ -280,49 +442,49 @@
switch (dwPropId)
{
case CERT_SHA1_HASH_PROP_ID:
- ret = CertContext_GetHashProp(context, dwPropId, CALG_SHA1,
- pCertContext->pbCertEncoded, pCertContext->cbCertEncoded, pvData,
+ ret = CertContext_GetHashProp(cert, dwPropId, CALG_SHA1,
+ cert->ctx.pbCertEncoded, cert->ctx.cbCertEncoded, pvData,
pcbData);
break;
case CERT_MD5_HASH_PROP_ID:
- ret = CertContext_GetHashProp(context, dwPropId, CALG_MD5,
- pCertContext->pbCertEncoded, pCertContext->cbCertEncoded, pvData,
+ ret = CertContext_GetHashProp(cert, dwPropId, CALG_MD5,
+ cert->ctx.pbCertEncoded, cert->ctx.cbCertEncoded, pvData,
pcbData);
break;
case CERT_SUBJECT_NAME_MD5_HASH_PROP_ID:
- ret = CertContext_GetHashProp(context, dwPropId, CALG_MD5,
- pCertContext->pCertInfo->Subject.pbData,
- pCertContext->pCertInfo->Subject.cbData,
+ ret = CertContext_GetHashProp(cert, dwPropId, CALG_MD5,
+ cert->ctx.pCertInfo->Subject.pbData,
+ cert->ctx.pCertInfo->Subject.cbData,
pvData, pcbData);
break;
case CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID:
- ret = CertContext_GetHashProp(context, dwPropId, CALG_MD5,
- pCertContext->pCertInfo->SubjectPublicKeyInfo.PublicKey.pbData,
- pCertContext->pCertInfo->SubjectPublicKeyInfo.PublicKey.cbData,
+ ret = CertContext_GetHashProp(cert, dwPropId, CALG_MD5,
+ cert->ctx.pCertInfo->SubjectPublicKeyInfo.PublicKey.pbData,
+ cert->ctx.pCertInfo->SubjectPublicKeyInfo.PublicKey.cbData,
pvData, pcbData);
break;
case CERT_ISSUER_SERIAL_NUMBER_MD5_HASH_PROP_ID:
- ret = CertContext_GetHashProp(context, dwPropId, CALG_MD5,
- pCertContext->pCertInfo->SerialNumber.pbData,
- pCertContext->pCertInfo->SerialNumber.cbData,
+ ret = CertContext_GetHashProp(cert, dwPropId, CALG_MD5,
+ cert->ctx.pCertInfo->SerialNumber.pbData,
+ cert->ctx.pCertInfo->SerialNumber.cbData,
pvData, pcbData);
break;
case CERT_SIGNATURE_HASH_PROP_ID:
- ret = CryptHashToBeSigned(0, pCertContext->dwCertEncodingType,
- pCertContext->pbCertEncoded, pCertContext->cbCertEncoded, pvData,
+ ret = CryptHashToBeSigned(0, cert->ctx.dwCertEncodingType,
+ cert->ctx.pbCertEncoded, cert->ctx.cbCertEncoded, pvData,
pcbData);
if (ret && pvData)
{
CRYPT_DATA_BLOB blob = { *pcbData, pvData };
- ret = CertContext_SetProperty(context, dwPropId, 0, &blob);
+ ret = CertContext_SetProperty(cert, dwPropId, 0, &blob);
}
break;
case CERT_KEY_IDENTIFIER_PROP_ID:
{
PCERT_EXTENSION ext = CertFindExtension(
- szOID_SUBJECT_KEY_IDENTIFIER, pCertContext->pCertInfo->cExtension,
- pCertContext->pCertInfo->rgExtension);
+ szOID_SUBJECT_KEY_IDENTIFIER, cert->ctx.pCertInfo->cExtension,
+ cert->ctx.pCertInfo->rgExtension);
if (ext)
{
@@ -337,7 +499,7 @@
{
ret = CertContext_CopyParam(pvData, pcbData, value.pbData,
value.cbData);
- CertContext_SetProperty(context, dwPropId, 0, &value);
+ CertContext_SetProperty(cert, dwPropId, 0, &value);
}
}
else
@@ -378,6 +540,7 @@
BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext,
DWORD dwPropId, void *pvData, DWORD *pcbData)
{
+ cert_t *cert = cert_from_ptr(pCertContext);
BOOL ret;
TRACE("(%p, %d, %p, %p)\n", pCertContext, dwPropId, pvData, pcbData);
@@ -392,22 +555,14 @@
ret = FALSE;
break;
case CERT_ACCESS_STATE_PROP_ID:
- if (pCertContext->hCertStore)
- ret = CertGetStoreProperty(pCertContext->hCertStore, dwPropId,
- pvData, pcbData);
- else
- {
- DWORD state = 0;
-
- ret = CertContext_CopyParam(pvData, pcbData, &state, sizeof(state));
- }
+ ret = CertGetStoreProperty(cert->ctx.hCertStore, dwPropId, pvData, pcbData);
break;
case CERT_KEY_PROV_HANDLE_PROP_ID:
{
CERT_KEY_CONTEXT keyContext;
DWORD size = sizeof(keyContext);
- ret = CertContext_GetProperty((void *)pCertContext,
+ ret = CertContext_GetProperty(cert,
CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size);
if (ret)
ret = CertContext_CopyParam(pvData, pcbData, &keyContext.hCryptProv,
@@ -415,13 +570,13 @@
break;
}
case CERT_KEY_PROV_INFO_PROP_ID:
- ret = CertContext_GetProperty((void *)pCertContext, dwPropId, pvData,
+ ret = CertContext_GetProperty(cert, dwPropId, pvData,
pcbData);
if (ret && pvData)
CRYPT_FixKeyProvInfoPointers(pvData);
break;
default:
- ret = CertContext_GetProperty((void *)pCertContext, dwPropId, pvData,
+ ret = CertContext_GetProperty(cert, dwPropId, pvData,
pcbData);
}
@@ -509,15 +664,14 @@
return ret;
}
-static BOOL CertContext_SetProperty(void *context, DWORD dwPropId,
+static BOOL CertContext_SetProperty(cert_t *cert, DWORD dwPropId,
DWORD dwFlags, const void *pvData)
{
- CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(context);
BOOL ret;
- TRACE("(%p, %d, %08x, %p)\n", context, dwPropId, dwFlags, pvData);
+ TRACE("(%p, %d, %08x, %p)\n", cert, dwPropId, dwFlags, pvData);
- if (!properties)
+ if (!cert->base.properties)
ret = FALSE;
else
{
@@ -546,23 +700,23 @@
{
const CRYPT_DATA_BLOB *blob = pvData;
- ret = ContextPropertyList_SetProperty(properties, dwPropId,
+ ret = ContextPropertyList_SetProperty(cert->base.properties, dwPropId,
blob->pbData, blob->cbData);
}
else
{
- ContextPropertyList_RemoveProperty(properties, dwPropId);
+ ContextPropertyList_RemoveProperty(cert->base.properties, dwPropId);
ret = TRUE;
}
break;
}
case CERT_DATE_STAMP_PROP_ID:
if (pvData)
- ret = ContextPropertyList_SetProperty(properties, dwPropId,
+ ret = ContextPropertyList_SetProperty(cert->base.properties, dwPropId,
pvData, sizeof(FILETIME));
else
{
- ContextPropertyList_RemoveProperty(properties, dwPropId);
+ ContextPropertyList_RemoveProperty(cert->base.properties, dwPropId);
ret = TRUE;
}
break;
@@ -578,22 +732,22 @@
ret = FALSE;
}
else
- ret = ContextPropertyList_SetProperty(properties, dwPropId,
+ ret = ContextPropertyList_SetProperty(cert->base.properties, dwPropId,
(const BYTE *)keyContext, keyContext->cbSize);
}
else
{
- ContextPropertyList_RemoveProperty(properties, dwPropId);
+ ContextPropertyList_RemoveProperty(cert->base.properties, dwPropId);
ret = TRUE;
}
break;
}
case CERT_KEY_PROV_INFO_PROP_ID:
if (pvData)
- ret = CertContext_SetKeyProvInfoProperty(properties, pvData);
+ ret = CertContext_SetKeyProvInfoProperty(cert->base.properties, pvData);
else
{
- ContextPropertyList_RemoveProperty(properties, dwPropId);
+ ContextPropertyList_RemoveProperty(cert->base.properties, dwPropId);
ret = TRUE;
}
break;
@@ -602,7 +756,7 @@
CERT_KEY_CONTEXT keyContext;
DWORD size = sizeof(keyContext);
- ret = CertContext_GetProperty(context, CERT_KEY_CONTEXT_PROP_ID,
+ ret = CertContext_GetProperty(cert, CERT_KEY_CONTEXT_PROP_ID,
&keyContext, &size);
if (ret)
{
@@ -617,7 +771,7 @@
keyContext.hCryptProv = 0;
keyContext.dwKeySpec = AT_SIGNATURE;
}
- ret = CertContext_SetProperty(context, CERT_KEY_CONTEXT_PROP_ID,
+ ret = CertContext_SetProperty(cert, CERT_KEY_CONTEXT_PROP_ID,
0, &keyContext);
break;
}
@@ -650,7 +804,7 @@
SetLastError(E_INVALIDARG);
return FALSE;
}
- ret = CertContext_SetProperty((void *)pCertContext, dwPropId, dwFlags,
+ ret = CertContext_SetProperty(cert_from_ptr(pCertContext), dwPropId, dwFlags,
pvData);
TRACE("returning %d\n", ret);
return ret;
diff -Naur a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c
--- a/dlls/crypt32/collectionstore.c 2013-10-11 17:21:06.000000000 +0000
+++ b/dlls/crypt32/collectionstore.c 2013-10-25 17:45:30.000000000 +0000
@@ -20,7 +20,6 @@
#include "winbase.h"
#include "wincrypt.h"
#include "wine/debug.h"
-#include "wine/list.h"
#include "crypt32_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
@@ -40,79 +39,93 @@
struct list stores;
} WINE_COLLECTIONSTORE;
-static void Collection_closeStore(WINECRYPT_CERTSTORE *store, DWORD dwFlags)
+static void Collection_addref(WINECRYPT_CERTSTORE *store)
+{
+ LONG ref = InterlockedIncrement(&store->ref);
+ TRACE("ref = %d\n", ref);
+}
+
+static DWORD Collection_release(WINECRYPT_CERTSTORE *store, DWORD flags)
{
WINE_COLLECTIONSTORE *cs = (WINE_COLLECTIONSTORE*)store;
WINE_STORE_LIST_ENTRY *entry, *next;
+ LONG ref;
- TRACE("(%p, %08x)\n", store, dwFlags);
+ if(flags)
+ FIXME("Unimplemented flags %x\n", flags);
- LIST_FOR_EACH_ENTRY_SAFE(entry, next, &cs->stores, WINE_STORE_LIST_ENTRY,
- entry)
+ ref = InterlockedDecrement(&cs->hdr.ref);
+ TRACE("(%p) ref=%d\n", store, ref);
+ if(ref)
+ return ERROR_SUCCESS;
+
+ LIST_FOR_EACH_ENTRY_SAFE(entry, next, &cs->stores, WINE_STORE_LIST_ENTRY, entry)
{
TRACE("closing %p\n", entry);
- CertCloseStore(entry->store, dwFlags);
+ entry->store->vtbl->release(entry->store, flags);
CryptMemFree(entry);
}
cs->cs.DebugInfo->Spare[0] = 0;
DeleteCriticalSection(&cs->cs);
CRYPT_FreeStore(store);
+ return ERROR_SUCCESS;
+}
+
+static void Collection_releaseContext(WINECRYPT_CERTSTORE *store, context_t *context)
+{
+ /* We don't cache context links, so just free them. */
+ Context_Free(context);
}
-static void *CRYPT_CollectionCreateContextFromChild(WINE_COLLECTIONSTORE *store,
- WINE_STORE_LIST_ENTRY *storeEntry, void *child, size_t contextSize,
- BOOL addRef)
-{
- void *ret = Context_CreateLinkContext(contextSize, child,
- sizeof(WINE_STORE_LIST_ENTRY*), addRef);
-
- if (ret)
- *(WINE_STORE_LIST_ENTRY **)Context_GetExtra(ret, contextSize)
- = storeEntry;
+static context_t *CRYPT_CollectionCreateContextFromChild(WINE_COLLECTIONSTORE *store,
+ WINE_STORE_LIST_ENTRY *storeEntry, context_t *child)
+{
+ context_t *ret;
+
+ ret = child->vtbl->clone(child, &store->hdr, TRUE);
+ if (!ret)
+ return NULL;
+ ret->u.ptr = storeEntry;
return ret;
}
static BOOL CRYPT_CollectionAddContext(WINE_COLLECTIONSTORE *store,
- unsigned int contextFuncsOffset, void *context, void *toReplace, unsigned int contextSize,
- void **pChildContext)
+ unsigned int contextFuncsOffset, context_t *context, context_t *toReplace,
+ context_t **pChildContext)
{
BOOL ret;
- void *childContext = NULL;
+ context_t *childContext = NULL;
WINE_STORE_LIST_ENTRY *storeEntry = NULL;
- TRACE("(%p, %d, %p, %p, %d)\n", store, contextFuncsOffset, context,
- toReplace, contextSize);
+ TRACE("(%p, %d, %p, %p)\n", store, contextFuncsOffset, context, toReplace);
ret = FALSE;
if (toReplace)
{
- void *existingLinked = Context_GetLinkedContext(toReplace);
+ context_t *existingLinked = toReplace->linked;
CONTEXT_FUNCS *contextFuncs;
- storeEntry = *(WINE_STORE_LIST_ENTRY **)Context_GetExtra(toReplace,
- contextSize);
- contextFuncs = (CONTEXT_FUNCS*)((LPBYTE)storeEntry->store +
+ storeEntry = toReplace->u.ptr;
+ contextFuncs = (CONTEXT_FUNCS*)((LPBYTE)storeEntry->store->vtbl +
contextFuncsOffset);
ret = contextFuncs->addContext(storeEntry->store, context,
- existingLinked, (const void **)&childContext);
+ existingLinked, &childContext, TRUE);
}
else
{
WINE_STORE_LIST_ENTRY *entry, *next;
EnterCriticalSection(&store->cs);
- LIST_FOR_EACH_ENTRY_SAFE(entry, next, &store->stores,
- WINE_STORE_LIST_ENTRY, entry)
+ LIST_FOR_EACH_ENTRY_SAFE(entry, next, &store->stores, WINE_STORE_LIST_ENTRY, entry)
{
if (entry->dwUpdateFlags & CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG)
{
CONTEXT_FUNCS *contextFuncs = (CONTEXT_FUNCS*)(
- (LPBYTE)entry->store + contextFuncsOffset);
+ (LPBYTE)entry->store->vtbl + contextFuncsOffset);
storeEntry = entry;
- ret = contextFuncs->addContext(entry->store, context, NULL,
- (const void **)&childContext);
+ ret = contextFuncs->addContext(entry->store, context, NULL, &childContext, TRUE);
break;
}
}
@@ -133,31 +146,34 @@
* Returns NULL if the collection contains no more items or on error.
* Assumes the collection store's lock is held.
*/
-static void *CRYPT_CollectionAdvanceEnum(WINE_COLLECTIONSTORE *store,
+static context_t *CRYPT_CollectionAdvanceEnum(WINE_COLLECTIONSTORE *store,
WINE_STORE_LIST_ENTRY *storeEntry, const CONTEXT_FUNCS *contextFuncs,
- const WINE_CONTEXT_INTERFACE *contextInterface, void *pPrev, size_t contextSize)
+ context_t *prev)
{
- void *ret, *child;
+ context_t *child, *ret;
struct list *storeNext = list_next(&store->stores, &storeEntry->entry);
- TRACE("(%p, %p, %p)\n", store, storeEntry, pPrev);
+ TRACE("(%p, %p, %p)\n", store, storeEntry, prev);
- if (pPrev)
+ if (prev)
{
/* Ref-counting funny business: "duplicate" (addref) the child, because
* the free(pPrev) below can cause the ref count to become negative.
*/
- child = Context_GetLinkedContext(pPrev);
- contextInterface->duplicate(child);
+ child = prev->linked;
+ Context_AddRef(child);
child = contextFuncs->enumContext(storeEntry->store, child);
- contextInterface->free(pPrev);
- pPrev = NULL;
+ Context_Release(prev);
+ prev = NULL;
}
else
+ {
child = contextFuncs->enumContext(storeEntry->store, NULL);
- if (child)
- ret = CRYPT_CollectionCreateContextFromChild(store, storeEntry, child,
- contextSize, FALSE);
+ }
+ if (child) {
+ ret = CRYPT_CollectionCreateContextFromChild(store, storeEntry, child);
+ Context_Release(child);
+ }
else
{
if (storeNext)
@@ -165,14 +181,14 @@
/* We always want the same function pointers (from certs, crls)
* in the next store, so use the same offset into the next store.
*/
- size_t offset = (const BYTE *)contextFuncs - (LPBYTE)storeEntry->store;
+ size_t offset = (const BYTE *)contextFuncs - (LPBYTE)storeEntry->store->vtbl;
WINE_STORE_LIST_ENTRY *storeNextEntry =
LIST_ENTRY(storeNext, WINE_STORE_LIST_ENTRY, entry);
CONTEXT_FUNCS *storeNextContexts =
- (CONTEXT_FUNCS*)((LPBYTE)storeNextEntry->store + offset);
+ (CONTEXT_FUNCS*)((LPBYTE)storeNextEntry->store->vtbl + offset);
ret = CRYPT_CollectionAdvanceEnum(store, storeNextEntry,
- storeNextContexts, contextInterface, NULL, contextSize);
+ storeNextContexts, NULL);
}
else
{
@@ -184,48 +200,42 @@
return ret;
}
-static BOOL CRYPT_CollectionAddCert(WINECRYPT_CERTSTORE *store, void *cert,
- void *toReplace, const void **ppStoreContext)
+static BOOL Collection_addCert(WINECRYPT_CERTSTORE *store, context_t *cert,
+ context_t *toReplace, context_t **ppStoreContext, BOOL use_link)
{
BOOL ret;
- void *childContext = NULL;
+ context_t *childContext = NULL;
WINE_COLLECTIONSTORE *cs = (WINE_COLLECTIONSTORE*)store;
- ret = CRYPT_CollectionAddContext(cs, offsetof(WINECRYPT_CERTSTORE, certs),
- cert, toReplace, sizeof(CERT_CONTEXT), &childContext);
+ ret = CRYPT_CollectionAddContext(cs, offsetof(store_vtbl_t, certs),
+ cert, toReplace, &childContext);
if (ppStoreContext && childContext)
{
- WINE_STORE_LIST_ENTRY *storeEntry = *(WINE_STORE_LIST_ENTRY **)
- Context_GetExtra(childContext, sizeof(CERT_CONTEXT));
- PCERT_CONTEXT context =
- CRYPT_CollectionCreateContextFromChild(cs, storeEntry, childContext,
- sizeof(CERT_CONTEXT), TRUE);
-
- if (context)
- context->hCertStore = store;
- *ppStoreContext = context;
+ WINE_STORE_LIST_ENTRY *storeEntry = childContext->u.ptr;
+ cert_t *context = (cert_t*)CRYPT_CollectionCreateContextFromChild(cs, storeEntry,
+ childContext);
+
+ *ppStoreContext = &context->base;
}
- CertFreeCertificateContext(childContext);
+ if (childContext)
+ Context_Release(childContext);
return ret;
}
-static void *CRYPT_CollectionEnumCert(WINECRYPT_CERTSTORE *store, void *pPrev)
+static context_t *Collection_enumCert(WINECRYPT_CERTSTORE *store, context_t *prev)
{
WINE_COLLECTIONSTORE *cs = (WINE_COLLECTIONSTORE*)store;
- void *ret;
+ context_t *ret;
- TRACE("(%p, %p)\n", store, pPrev);
+ TRACE("(%p, %p)\n", store, prev);
EnterCriticalSection(&cs->cs);
- if (pPrev)
+ if (prev)
{
- WINE_STORE_LIST_ENTRY *storeEntry =
- *(WINE_STORE_LIST_ENTRY **)Context_GetExtra(pPrev,
- sizeof(CERT_CONTEXT));
+ WINE_STORE_LIST_ENTRY *storeEntry = prev->u.ptr;
ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry,
- &storeEntry->store->certs, pCertInterface, pPrev,
- sizeof(CERT_CONTEXT));
+ &storeEntry->store->vtbl->certs, prev);
}
else
{
@@ -235,8 +245,7 @@
WINE_STORE_LIST_ENTRY, entry);
ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry,
- &storeEntry->store->certs, pCertInterface, NULL,
- sizeof(CERT_CONTEXT));
+ &storeEntry->store->vtbl->certs, NULL);
}
else
{
@@ -245,73 +254,57 @@
}
}
LeaveCriticalSection(&cs->cs);
- if (ret)
- ((PCERT_CONTEXT)ret)->hCertStore = store;
TRACE("returning %p\n", ret);
return ret;
}
-static BOOL CRYPT_CollectionDeleteCert(WINECRYPT_CERTSTORE *store,
- void *pCertContext)
+static BOOL Collection_deleteCert(WINECRYPT_CERTSTORE *store, context_t *context)
{
- BOOL ret;
- PCCERT_CONTEXT linked;
+ cert_t *cert = (cert_t*)context;
+ cert_t *linked;
- TRACE("(%p, %p)\n", store, pCertContext);
+ TRACE("(%p, %p)\n", store, cert);
- /* Deleting the linked context results in its ref count getting
- * decreased, but the caller of this (CertDeleteCertificateFromStore) also
- * decreases pCertContext's ref count, by calling
- * CertFreeCertificateContext. Increase ref count of linked context to
- * compensate.
- */
- linked = Context_GetLinkedContext(pCertContext);
- CertDuplicateCertificateContext(linked);
- ret = CertDeleteCertificateFromStore(linked);
- return ret;
+ linked = (cert_t*)context->linked;
+ return CertDeleteCertificateFromStore(&linked->ctx);
}
-static BOOL CRYPT_CollectionAddCRL(WINECRYPT_CERTSTORE *store, void *crl,
- void *toReplace, const void **ppStoreContext)
+static BOOL Collection_addCRL(WINECRYPT_CERTSTORE *store, context_t *crl,
+ context_t *toReplace, context_t **ppStoreContext, BOOL use_link)
{
BOOL ret;
- void *childContext = NULL;
+ context_t *childContext = NULL;
WINE_COLLECTIONSTORE *cs = (WINE_COLLECTIONSTORE*)store;
- ret = CRYPT_CollectionAddContext(cs, offsetof(WINECRYPT_CERTSTORE, crls),
- crl, toReplace, sizeof(CRL_CONTEXT), &childContext);
+ ret = CRYPT_CollectionAddContext(cs, offsetof(store_vtbl_t, crls),
+ crl, toReplace, &childContext);
if (ppStoreContext && childContext)
{
- WINE_STORE_LIST_ENTRY *storeEntry = *(WINE_STORE_LIST_ENTRY **)
- Context_GetExtra(childContext, sizeof(CRL_CONTEXT));
- PCRL_CONTEXT context =
- CRYPT_CollectionCreateContextFromChild(cs, storeEntry, childContext,
- sizeof(CRL_CONTEXT), TRUE);
-
- if (context)
- context->hCertStore = store;
- *ppStoreContext = context;
+ WINE_STORE_LIST_ENTRY *storeEntry = childContext->u.ptr;
+ crl_t *context = (crl_t*)CRYPT_CollectionCreateContextFromChild(cs, storeEntry,
+ childContext);
+
+ *ppStoreContext = &context->base;
}
- CertFreeCRLContext(childContext);
+ if (childContext)
+ Context_Release(childContext);
return ret;
}
-static void *CRYPT_CollectionEnumCRL(WINECRYPT_CERTSTORE *store, void *pPrev)
+static context_t *Collection_enumCRL(WINECRYPT_CERTSTORE *store, context_t *prev)
{
WINE_COLLECTIONSTORE *cs = (WINE_COLLECTIONSTORE*)store;
- void *ret;
+ context_t *ret;
- TRACE("(%p, %p)\n", store, pPrev);
+ TRACE("(%p, %p)\n", store, prev);
EnterCriticalSection(&cs->cs);
- if (pPrev)
+ if (prev)
{
- WINE_STORE_LIST_ENTRY *storeEntry =
- *(WINE_STORE_LIST_ENTRY **)Context_GetExtra(pPrev,
- sizeof(CRL_CONTEXT));
+ WINE_STORE_LIST_ENTRY *storeEntry = prev->u.ptr;
ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry,
- &storeEntry->store->crls, pCRLInterface, pPrev, sizeof(CRL_CONTEXT));
+ &storeEntry->store->vtbl->crls, prev);
}
else
{
@@ -321,8 +314,7 @@
WINE_STORE_LIST_ENTRY, entry);
ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry,
- &storeEntry->store->crls, pCRLInterface, NULL,
- sizeof(CRL_CONTEXT));
+ &storeEntry->store->vtbl->crls, NULL);
}
else
{
@@ -331,70 +323,56 @@
}
}
LeaveCriticalSection(&cs->cs);
- if (ret)
- ((PCRL_CONTEXT)ret)->hCertStore = store;
TRACE("returning %p\n", ret);
return ret;
}
-static BOOL CRYPT_CollectionDeleteCRL(WINECRYPT_CERTSTORE *store, void *pCrlContext)
+static BOOL Collection_deleteCRL(WINECRYPT_CERTSTORE *store, context_t *context)
{
- BOOL ret;
- PCCRL_CONTEXT linked;
+ crl_t *crl = (crl_t*)context, *linked;
- TRACE("(%p, %p)\n", store, pCrlContext);
+ TRACE("(%p, %p)\n", store, crl);
- /* Deleting the linked context results in its ref count getting
- * decreased, but the caller of this (CertDeleteCRLFromStore) also
- * decreases pCrlContext's ref count, by calling CertFreeCRLContext.
- * Increase ref count of linked context to compensate.
- */
- linked = Context_GetLinkedContext(pCrlContext);