57152 2011-03-26 09:20:18 -0700 Add PlatformCertificateInfo::PlatformCertificateInfo(PCCERT_CONTEXT) constructor on Windows 2011-03-26 15:55:41 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 1 jeffm jeffm oldest_to_newest 373903 0 jeffm 2011-03-26 09:20:18 -0700 We're going to need to create a PlatformCertificateInfo with a single certificate on Windows to support client certificates. Also, stop relying on the fact that the Win32 API CertDuplicateCertificateContext() currently returns the same PCCERT_CONTEXT that you pass to it, since that may change in the future. 373904 1 87026 jeffm 2011-03-26 09:23:30 -0700 Created attachment 87026 Patch 373935 2 87026 sfalken 2011-03-26 12:05:17 -0700 Comment on attachment 87026 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=87026&action=review > Source/WebKit2/Shared/win/PlatformCertificateInfo.cpp:78 > +#if PLATFORM(CG) PLATFORM(CG) seems weird here, but I see it elsewhere already. Did you consider USE(CFNETWORK) instead? 374002 3 jeffm 2011-03-26 15:09:13 -0700 (In reply to comment #2) > (From update of attachment 87026 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=87026&action=review > > > Source/WebKit2/Shared/win/PlatformCertificateInfo.cpp:78 > > +#if PLATFORM(CG) > > PLATFORM(CG) seems weird here, but I see it elsewhere already. Did you consider USE(CFNETWORK) instead? Thanks for pointing that out. It looks like we use PLATFORM(CG) in the other constructor because it relies on WebKitSystemInterface. Since the constructor I added just uses CertDuplicateCertificateContext(), a Win32 API, it should work fine on all Windows platforms. I'll remove the test altogether. 374007 4 jeffm 2011-03-26 15:55:18 -0700 Committed r82049: <http://trac.webkit.org/changeset/82049> 87026 2011-03-26 09:23:30 -0700 2011-03-26 12:05:17 -0700 Patch bug-57152-20110326092324.patch text/plain 4373 jeffm SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyMDMwKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDMtMjYgIEplZmYgTWls bGVyICA8amVmZm1AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBQbGF0Zm9ybUNlcnRpZmljYXRlSW5mbzo6UGxhdGZvcm1DZXJ0 aWZpY2F0ZUluZm8oUENDRVJUX0NPTlRFWFQpIGNvbnN0cnVjdG9yIG9uIFdpbmRvd3MKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3MTUyCisgICAgICAg IAorICAgICAgICBXZSdyZSBnb2luZyB0byBuZWVkIHRvIGNyZWF0ZSBhIFBsYXRmb3JtQ2VydGlm aWNhdGVJbmZvIHdpdGggYSBzaW5nbGUgY2VydGlmaWNhdGUgb24gV2luZG93cyB0byBzdXBwb3J0 IGNsaWVudCBjZXJ0aWZpY2F0ZXMuCisgICAgICAgIEFsc28sIHN0b3AgcmVseWluZyBvbiB0aGUg ZmFjdCB0aGF0IHRoZSBXaW4zMiBBUEkgQ2VydER1cGxpY2F0ZUNlcnRpZmljYXRlQ29udGV4dCgp IGN1cnJlbnRseSByZXR1cm5zIHRoZSBzYW1lIFBDQ0VSVF9DT05URVhUIHRoYXQgeW91IHBhc3Mg dG8gaXQsIHNpbmNlIHRoYXQgbWF5IGNoYW5nZSBpbiB0aGUgZnV0dXJlLgorCisgICAgICAgICog U2hhcmVkL3dpbi9QbGF0Zm9ybUNlcnRpZmljYXRlSW5mby5jcHA6CisgICAgICAgIChXZWJLaXQ6 OlBsYXRmb3JtQ2VydGlmaWNhdGVJbmZvOjpQbGF0Zm9ybUNlcnRpZmljYXRlSW5mbyk6IEFkZGVk IFBsYXRmb3JtQ2VydGlmaWNhdGVJbmZvKFBDQ0VSVF9DT05URVhUKSBjb25zdHJ1dG9yLiBVc2Ug cmV0dXJuIHZhbHVlIGZyb20gQ2VydER1cGxpY2F0ZUNlcnRpZmljYXRlQ29udGV4dCgpLgorICAg ICAgICAoV2ViS2l0OjpQbGF0Zm9ybUNlcnRpZmljYXRlSW5mbzo6b3BlcmF0b3I9KTogVXNlIHJl dHVybiB2YWx1ZSBmcm9tIENlcnREdXBsaWNhdGVDZXJ0aWZpY2F0ZUNvbnRleHQoKS4KKyAgICAg ICAgKiBTaGFyZWQvd2luL1BsYXRmb3JtQ2VydGlmaWNhdGVJbmZvLmg6IEFkZGVkIFBsYXRmb3Jt Q2VydGlmaWNhdGVJbmZvKFBDQ0VSVF9DT05URVhUKSBjb25zdHJ1dG9yLgorCiAyMDExLTAzLTI1 ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRl bGUgUGV0ZXJzb24uCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvd2luL1BsYXRmb3JtQ2Vy dGlmaWNhdGVJbmZvLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvd2lu L1BsYXRmb3JtQ2VydGlmaWNhdGVJbmZvLmNwcAkocmV2aXNpb24gODIwMjEpCisrKyBTb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvd2luL1BsYXRmb3JtQ2VydGlmaWNhdGVJbmZvLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNjUsMTQgKzY1LDI4IEBAIFBsYXRmb3JtQ2VydGlmaWNhdGVJbmZvOjpQbGF0Zm9y bUNlcnRpZmkKICAgICBQQ0VSVF9TSU1QTEVfQ0hBSU4gZmlyc3RTaW1wbGVDaGFpbiA9IGNoYWlu Q29udGV4dC0+cmdwQ2hhaW5bMF07CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGZpcnN0 U2ltcGxlQ2hhaW4tPmNFbGVtZW50OyArK2kpIHsKICAgICAgICAgUENDRVJUX0NPTlRFWFQgY2Vy dGlmaWNhdGVDb250ZXh0ID0gZmlyc3RTaW1wbGVDaGFpbi0+cmdwRWxlbWVudFtpXS0+cENlcnRD b250ZXh0OwotICAgICAgICA6OkNlcnREdXBsaWNhdGVDZXJ0aWZpY2F0ZUNvbnRleHQoY2VydGlm aWNhdGVDb250ZXh0KTsKLSAgICAgICAgbV9jZXJ0aWZpY2F0ZUNoYWluLmFwcGVuZChjZXJ0aWZp Y2F0ZUNvbnRleHQpOworICAgICAgICBQQ0NFUlRfQ09OVEVYVCBjZXJ0aWZpY2F0ZUNvbnRleHRD b3B5ID0gOjpDZXJ0RHVwbGljYXRlQ2VydGlmaWNhdGVDb250ZXh0KGNlcnRpZmljYXRlQ29udGV4 dCk7CisgICAgICAgIG1fY2VydGlmaWNhdGVDaGFpbi5hcHBlbmQoY2VydGlmaWNhdGVDb250ZXh0 Q29weSk7CiAgICAgfQogI2Vsc2UKICAgICAvLyBGSVhNRTogV2luQ2Fpcm8gaW1wbGVtZW50YXRp b24KICNlbmRpZgogfQogCitQbGF0Zm9ybUNlcnRpZmljYXRlSW5mbzo6UGxhdGZvcm1DZXJ0aWZp Y2F0ZUluZm8oUENDRVJUX0NPTlRFWFQgY2VydGlmaWNhdGVDb250ZXh0KQoreworI2lmIFBMQVRG T1JNKENHKQorICAgIEFTU0VSVChjZXJ0aWZpY2F0ZUNvbnRleHQpOworICAgIGlmICghY2VydGlm aWNhdGVDb250ZXh0KQorICAgICAgICByZXR1cm47CisgICAgCisgICAgUENDRVJUX0NPTlRFWFQg Y2VydGlmaWNhdGVDb250ZXh0Q29weSA9IDo6Q2VydER1cGxpY2F0ZUNlcnRpZmljYXRlQ29udGV4 dChjZXJ0aWZpY2F0ZUNvbnRleHQpOworICAgIG1fY2VydGlmaWNhdGVDaGFpbi5hcHBlbmQoY2Vy dGlmaWNhdGVDb250ZXh0Q29weSk7ICAgIAorI2Vsc2UKKyAgICAvLyBGSVhNRTogV2luQ2Fpcm8g aW1wbGVtZW50YXRpb24KKyNlbmRpZgorfQorCiBQbGF0Zm9ybUNlcnRpZmljYXRlSW5mbzo6flBs YXRmb3JtQ2VydGlmaWNhdGVJbmZvKCkKIHsKICAgICBjbGVhckNlcnRpZmljYXRlQ2hhaW4oKTsK QEAgLTgxLDggKzk1LDggQEAgUGxhdGZvcm1DZXJ0aWZpY2F0ZUluZm86On5QbGF0Zm9ybUNlcnRp ZgogUGxhdGZvcm1DZXJ0aWZpY2F0ZUluZm86OlBsYXRmb3JtQ2VydGlmaWNhdGVJbmZvKGNvbnN0 IFBsYXRmb3JtQ2VydGlmaWNhdGVJbmZvJiBvdGhlcikKIHsKICAgICBmb3IgKHNpemVfdCBpID0g MDsgaSA8IG90aGVyLm1fY2VydGlmaWNhdGVDaGFpbi5zaXplKCk7ICsraSkgewotICAgICAgICA6 OkNlcnREdXBsaWNhdGVDZXJ0aWZpY2F0ZUNvbnRleHQob3RoZXIubV9jZXJ0aWZpY2F0ZUNoYWlu W2ldKTsKLSAgICAgICAgbV9jZXJ0aWZpY2F0ZUNoYWluLmFwcGVuZChvdGhlci5tX2NlcnRpZmlj YXRlQ2hhaW5baV0pOworICAgICAgICBQQ0NFUlRfQ09OVEVYVCBjZXJ0aWZpY2F0ZUNvbnRleHRD b3B5ID0gOjpDZXJ0RHVwbGljYXRlQ2VydGlmaWNhdGVDb250ZXh0KG90aGVyLm1fY2VydGlmaWNh dGVDaGFpbltpXSk7CisgICAgICAgIG1fY2VydGlmaWNhdGVDaGFpbi5hcHBlbmQoY2VydGlmaWNh dGVDb250ZXh0Q29weSk7CiAgICAgfQogfQogCkBAIC05MCw4ICsxMDQsOCBAQCBQbGF0Zm9ybUNl cnRpZmljYXRlSW5mbyYgUGxhdGZvcm1DZXJ0aWZpCiB7CiAgICAgY2xlYXJDZXJ0aWZpY2F0ZUNo YWluKCk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBvdGhlci5tX2NlcnRpZmljYXRlQ2hh aW4uc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgOjpDZXJ0RHVwbGljYXRlQ2VydGlmaWNhdGVDb250 ZXh0KG90aGVyLm1fY2VydGlmaWNhdGVDaGFpbltpXSk7Ci0gICAgICAgIG1fY2VydGlmaWNhdGVD aGFpbi5hcHBlbmQob3RoZXIubV9jZXJ0aWZpY2F0ZUNoYWluW2ldKTsKKyAgICAgICAgUENDRVJU X0NPTlRFWFQgY2VydGlmaWNhdGVDb250ZXh0Q29weSA9IDo6Q2VydER1cGxpY2F0ZUNlcnRpZmlj YXRlQ29udGV4dChvdGhlci5tX2NlcnRpZmljYXRlQ2hhaW5baV0pOworICAgICAgICBtX2NlcnRp ZmljYXRlQ2hhaW4uYXBwZW5kKGNlcnRpZmljYXRlQ29udGV4dENvcHkpOwogICAgIH0KICAgICBy ZXR1cm4gKnRoaXM7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvd2luL1BsYXRmb3Jt Q2VydGlmaWNhdGVJbmZvLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL3dp bi9QbGF0Zm9ybUNlcnRpZmljYXRlSW5mby5oCShyZXZpc2lvbiA4MjAyMSkKKysrIFNvdXJjZS9X ZWJLaXQyL1NoYXJlZC93aW4vUGxhdGZvcm1DZXJ0aWZpY2F0ZUluZm8uaAkod29ya2luZyBjb3B5 KQpAQCAtNDMsNiArNDMsNyBAQCBjbGFzcyBQbGF0Zm9ybUNlcnRpZmljYXRlSW5mbyB7CiBwdWJs aWM6CiAgICAgUGxhdGZvcm1DZXJ0aWZpY2F0ZUluZm8oKTsKICAgICBleHBsaWNpdCBQbGF0Zm9y bUNlcnRpZmljYXRlSW5mbyhjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJik7ICAgIAor ICAgIGV4cGxpY2l0IFBsYXRmb3JtQ2VydGlmaWNhdGVJbmZvKFBDQ0VSVF9DT05URVhUKTsgICAg CiAgICAgflBsYXRmb3JtQ2VydGlmaWNhdGVJbmZvKCk7CiAKICAgICBQbGF0Zm9ybUNlcnRpZmlj YXRlSW5mbyhjb25zdCBQbGF0Zm9ybUNlcnRpZmljYXRlSW5mbyYpOwo=