184433 2018-04-09 16:38:43 -0700 Refactor Ignore HSTS code 2018-04-09 20:43:53 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=184335 InRadar P2 Normal --- 1 wilander wilander bfulgham commit-queue darin webkit-bug-importer oldest_to_newest 1413072 0 wilander 2018-04-09 16:38:43 -0700 Darin Adler pointed out in https://bugs.webkit.org/show_bug.cgi?id=184335 that we might have subtle bugs in the ignore HSTS code due to type conversion. He also suggested moving non-SPI code out of the CFNetwork SPI header. This bug tracks that work. 1413073 1 webkit-bug-importer 2018-04-09 16:39:23 -0700 <rdar://problem/39298238> 1413103 2 337565 wilander 2018-04-09 17:55:30 -0700 Created attachment 337565 Patch 1413131 3 337565 darin 2018-04-09 18:40:49 -0700 Comment on attachment 337565 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=337565&action=review > Source/WebCore/platform/network/mac/WebCoreURLResponse.mm:337 > + return [request respondsToSelector:@selector(_schemeWasUpgradedDueToDynamicHSTS)] > + && [request _schemeWasUpgradedDueToDynamicHSTS]; Should fix indentation of the second line, indent by 4 spaces. > Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:189 > + return [request respondsToSelector:@selector(_schemeWasUpgradedDueToDynamicHSTS)] > + && [request _schemeWasUpgradedDueToDynamicHSTS]; Should fix indentation of the second line, indent by 4 spaces. > Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:197 > + if ([request respondsToSelector:@selector(_setIgnoreHSTS:)]) { > + BOOL ignoreHSTSParameter = ignoreHSTS; > + [request _setIgnoreHSTS:ignoreHSTSParameter]; > + } This local BOOL is not needed here. It *was* needed for wtfObjcMsgSend, but here you can just pass the bool ignoreHSTS and it will be converted to a BOOL. Thus no braces needed either. > Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:203 > + return [request respondsToSelector:@selector(_ignoreHSTS)] > + && [request _ignoreHSTS]; Should fix indentation of the second line, indent by 4 spaces. 1413151 4 337579 wilander 2018-04-09 20:06:35 -0700 Created attachment 337579 Patch for landing 1413152 5 wilander 2018-04-09 20:07:09 -0700 Thanks for the review and change suggestions, Darin! 1413158 6 337579 commit-queue 2018-04-09 20:43:51 -0700 Comment on attachment 337579 Patch for landing Clearing flags on attachment: 337579 Committed r230467: <https://trac.webkit.org/changeset/230467> 1413159 7 commit-queue 2018-04-09 20:43:53 -0700 All reviewed patches have been landed. Closing bug. 337565 2018-04-09 17:55:30 -0700 2018-04-09 20:06:33 -0700 Patch bug-184433-20180409175530.patch text/plain 6340 wilander SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMDQ1OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE4LTA0LTA5ICBKb2huIFdp bGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlZmFjdG9yIElnbm9yZSBI U1RTIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE4NDQzMworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzkyOTgyMzg+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCByZWZhY3RvcnMg b3VyIGlnbm9yZSBIU1RTIGNvZGUuIFRoZSBjb252ZW5pZW5jZSBmdW5jdGlvbnMgYXJlIG1vdmVk CisgICAgICAgIG91dCBvZiBDRk5ldHdvcmsgU1BJIGluIFBBTCwgYW5kIGludG8gd2hlcmUgdGhl eSBhcmUgdXNlZC4gSXQgYWxzbyBzd2l0Y2hlcworICAgICAgICBmcm9tIHBlcmZvcm1TZWxlY3Rv cjogY2FsbHMgdG8gc3RyYWlnaHQgZnVuY3Rpb24gY2FsbHMsIGFmdGVyIGNoZWNraW5nIHRoYXQK KyAgICAgICAgdGhlcmUgaXMgYSByZXNwb25kZXIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3 b3JrL21hYy9XZWJDb3JlVVJMUmVzcG9uc2UubW06CisgICAgICAgIChXZWJDb3JlOjpzY2hlbWVX YXNVcGdyYWRlZER1ZVRvRHluYW1pY0hTVFMpOgorICAgICAgICAgICAgQWRkIGNvbnZlbmllbmNl IGZ1bmN0aW9uIGhlcmUgc2luY2UgaXQgd2FzIG1vdmVkIG91dCBvZgorICAgICAgICAgICAgQ0ZO ZXR3b3JrU1BJLmguCisKIDIwMTgtMDQtMDkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUu Y29tPgogCiAgICAgICAgIEV4cGFuZCBXZWJDb3JlIHBvbGljeSBjb25jZXB0IG9mICJzaG91bGRD b250aW51ZSIgdG8gYWxsb3cgZm9yIG1vcmUgdGhhbiB0cnVlL2ZhbHNlCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9QQUwvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL1BBTC9D aGFuZ2VMb2cJKHJldmlzaW9uIDIzMDQ0MSkKKysrIFNvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMSBAQAorMjAxOC0wNC0wOSAgSm9obiBXaWxh bmRlciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KKworICAgICAgICBSZWZhY3RvciBJZ25vcmUgSFNU UyBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x ODQ0MzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM5Mjk4MjM4PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggcmVmYWN0b3JzIG91 ciBpZ25vcmUgSFNUUyBjb2RlLiBUaGUgY29udmVuaWVuY2UgZnVuY3Rpb25zIGFyZSBtb3ZlZAor ICAgICAgICBvdXQgb2YgQ0ZOZXR3b3JrIFNQSSBpbiBQQUwsIGFuZCBpbnRvIHdoZXJlIHRoZXkg YXJlIHVzZWQuIEl0IGFsc28gc3dpdGNoZXMKKyAgICAgICAgZnJvbSBwZXJmb3JtU2VsZWN0b3I6 IGNhbGxzIHRvIHN0cmFpZ2h0IGZ1bmN0aW9uIGNhbGxzLCBhZnRlciBjaGVja2luZyB0aGF0Cisg ICAgICAgIHRoZXJlIGlzIGEgcmVzcG9uZGVyLgorCisgICAgICAgICogcGFsL3NwaS9jZi9DRk5l dHdvcmtTUEkuaDoKKyAgICAgICAgKHNjaGVtZVdhc1VwZ3JhZGVkRHVlVG9EeW5hbWljSFNUUyk6 IERlbGV0ZWQuCisgICAgICAgIChzZXRJZ25vcmVIU1RTKTogRGVsZXRlZC4KKyAgICAgICAgKGln bm9yZUhTVFMpOiBEZWxldGVkLgorCiAyMDE4LTA0LTA3ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1v dGh5QGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgdGhlIHN5c3RlbSdzIGxpbmsgY29sb3Igd2hl biBzeXN0ZW0gYXBwZWFyYW5jZSBpcyBkZXNpcmVkIGZvciBhIFdlYlZpZXcuCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaAkocmV2aXNpb24gMjMw NDQxKQorKysgU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY2YvQ0ZOZXR3b3JrU1BJLmgJKHdv cmtpbmcgY29weSkKQEAgLTMzNywyNCArMzM3LDQgQEAgV1RGX0VYVEVSTl9DX0VORAogLSAodm9p ZClfc2V0TUlNRVR5cGU6KE5TU3RyaW5nICopdHlwZTsKIEBlbmQKIAotc3RhdGljIGJvb2wgc2No ZW1lV2FzVXBncmFkZWREdWVUb0R5bmFtaWNIU1RTKE5TVVJMUmVxdWVzdCAqcmVxdWVzdCkKLXsK LSAgICBpZiAoW3JlcXVlc3QgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfc2NoZW1lV2Fz VXBncmFkZWREdWVUb0R5bmFtaWNIU1RTKV0pCi0gICAgICAgIHJldHVybiBbcmVxdWVzdCBwZXJm b3JtU2VsZWN0b3I6QHNlbGVjdG9yKF9zY2hlbWVXYXNVcGdyYWRlZER1ZVRvRHluYW1pY0hTVFMp XTsKLSAgICByZXR1cm4gZmFsc2U7Ci19Ci0KLXN0YXRpYyB2b2lkIHNldElnbm9yZUhTVFMoTlNN dXRhYmxlVVJMUmVxdWVzdCAqcmVxdWVzdCwgYm9vbCBpZ25vcmVIU1RTKQotewotICAgIGlmIChb cmVxdWVzdCByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9zZXRJZ25vcmVIU1RTOildKQot ICAgICAgICBbcmVxdWVzdCBwZXJmb3JtU2VsZWN0b3I6QHNlbGVjdG9yKF9zZXRJZ25vcmVIU1RT Oikgd2l0aE9iamVjdDpbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6aWdub3JlSFNUU11dOwotfQot Ci1zdGF0aWMgYm9vbCBpZ25vcmVIU1RTKE5TVVJMUmVxdWVzdCAqcmVxdWVzdCkKLXsKLSAgICBp ZiAoW3JlcXVlc3QgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihfaWdub3JlSFNUUyldKQot ICAgICAgICByZXR1cm4gW3JlcXVlc3QgcGVyZm9ybVNlbGVjdG9yOkBzZWxlY3RvcihfaWdub3Jl SFNUUyldOwotICAgIHJldHVybiBmYWxzZTsKLX0KLQogI2VuZGlmIC8vIGRlZmluZWQoX19PQkpD X18pCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9XZWJDb3JlVVJM UmVzcG9uc2UubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9tYWMvV2ViQ29yZVVSTFJlc3BvbnNlLm1tCShyZXZpc2lvbiAyMzA0NDEpCisrKyBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9XZWJDb3JlVVJMUmVzcG9uc2UubW0JKHdvcmtp bmcgY29weSkKQEAgLTMyNyw2ICszMjcsMTcgQEAgdm9pZCBhZGp1c3RNSU1FVHlwZUlmTmVjZXNz YXJ5KENGVVJMUmVzcAogfQogI2VuZGlmCiAKK3N0YXRpYyBib29sIHNjaGVtZVdhc1VwZ3JhZGVk RHVlVG9EeW5hbWljSFNUUyhOU1VSTFJlcXVlc3QgKnJlcXVlc3QpCit7CisjaWYgIVVTRShDRk5F VFdPUktfSUdOT1JFX0hTVFMpCisgICAgVU5VU0VEX1BBUkFNKHJlcXVlc3QpOworICAgIHJldHVy biBmYWxzZTsKKyNlbHNlCisgICAgcmV0dXJuIFtyZXF1ZXN0IHJlc3BvbmRzVG9TZWxlY3RvcjpA c2VsZWN0b3IoX3NjaGVtZVdhc1VwZ3JhZGVkRHVlVG9EeW5hbWljSFNUUyldCisgICAgJiYgW3Jl cXVlc3QgX3NjaGVtZVdhc1VwZ3JhZGVkRHVlVG9EeW5hbWljSFNUU107CisjZW5kaWYKK30KKwog TlNVUkxSZXNwb25zZSAqc3ludGhlc2l6ZVJlZGlyZWN0UmVzcG9uc2VJZk5lY2Vzc2FyeShOU1VS TFJlcXVlc3QgKmN1cnJlbnRSZXF1ZXN0LCBOU1VSTFJlcXVlc3QgKm5ld1JlcXVlc3QsIE5TVVJM UmVzcG9uc2UgKnJlZGlyZWN0UmVzcG9uc2UpCiB7CiAgICAgaWYgKHJlZGlyZWN0UmVzcG9uc2Up CkluZGV4OiBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMjMwNDU4KQorKysgU291cmNlL1dlYktpdC9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMyBAQAorMjAxOC0wNC0wOSAgSm9obiBXaWxh bmRlciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KKworICAgICAgICBSZWZhY3RvciBJZ25vcmUgSFNU UyBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x ODQ0MzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM5Mjk4MjM4PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggcmVmYWN0b3JzIG91 ciBpZ25vcmUgSFNUUyBjb2RlLiBUaGUgY29udmVuaWVuY2UgZnVuY3Rpb25zIGFyZSBtb3ZlZAor ICAgICAgICBvdXQgb2YgQ0ZOZXR3b3JrIFNQSSBpbiBQQUwsIGFuZCBpbnRvIHdoZXJlIHRoZXkg YXJlIHVzZWQuIEl0IGFsc28gc3dpdGNoZXMKKyAgICAgICAgZnJvbSBwZXJmb3JtU2VsZWN0b3I6 IGNhbGxzIHRvIHN0cmFpZ2h0IGZ1bmN0aW9uIGNhbGxzLCBhZnRlciBjaGVja2luZyB0aGF0Cisg ICAgICAgIHRoZXJlIGlzIGEgcmVzcG9uZGVyLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mv Y29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbToKKyAgICAgICAgKHNjaGVtZVdhc1VwZ3JhZGVk RHVlVG9EeW5hbWljSFNUUyk6CisgICAgICAgIChzZXRJZ25vcmVIU1RTKToKKyAgICAgICAgKGln bm9yZUhTVFMpOgorICAgICAgICAgICAgQWRkIGNvbnZlbmllbmNlIGZ1bmN0aW9ucyBoZXJlIHNp bmNlIHRoZXkgd2VyZSBtb3ZlZCBvdXQgb2YKKyAgICAgICAgICAgIENGTmV0d29ya1NQSS5oLgor CiAyMDE4LTA0LTA5ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAg ICAgIFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6dGFyZ2V0UG9zaXRpb25JbldpbmRvd0ZvclNlbGVj dGlvbkF1dG9zY3JvbGwgaXMgZGlyZWN0bHkgYWNjZXNzaW5nIE5TU2NyZWVuCkluZGV4OiBTb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vz c2lvbkNvY29hLm1tCShyZXZpc2lvbiAyMzA0NDEpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTE4 Miw2ICsxODIsMjYgQEAgc3RhdGljIE5TVVJMUmVxdWVzdCogZG93bmdyYWRlUmVxdWVzdChOUwog ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIHJldHVybiByZXF1ZXN0OwogfQorCitzdGF0 aWMgYm9vbCBzY2hlbWVXYXNVcGdyYWRlZER1ZVRvRHluYW1pY0hTVFMoTlNVUkxSZXF1ZXN0ICpy ZXF1ZXN0KQoreworICAgIHJldHVybiBbcmVxdWVzdCByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVj dG9yKF9zY2hlbWVXYXNVcGdyYWRlZER1ZVRvRHluYW1pY0hTVFMpXQorICAgICYmIFtyZXF1ZXN0 IF9zY2hlbWVXYXNVcGdyYWRlZER1ZVRvRHluYW1pY0hTVFNdOworfQorCitzdGF0aWMgdm9pZCBz ZXRJZ25vcmVIU1RTKE5TTXV0YWJsZVVSTFJlcXVlc3QgKnJlcXVlc3QsIGJvb2wgaWdub3JlSFNU UykKK3sKKyAgICBpZiAoW3JlcXVlc3QgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfc2V0 SWdub3JlSFNUUzopXSkgeworICAgICAgICBCT09MIGlnbm9yZUhTVFNQYXJhbWV0ZXIgPSBpZ25v cmVIU1RTOworICAgICAgICBbcmVxdWVzdCBfc2V0SWdub3JlSFNUUzppZ25vcmVIU1RTUGFyYW1l dGVyXTsKKyAgICB9Cit9CisKK3N0YXRpYyBib29sIGlnbm9yZUhTVFMoTlNVUkxSZXF1ZXN0ICpy ZXF1ZXN0KQoreworICAgIHJldHVybiBbcmVxdWVzdCByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVj dG9yKF9pZ25vcmVIU1RTKV0KKyAgICAmJiBbcmVxdWVzdCBfaWdub3JlSFNUU107Cit9CiAjZW5k aWYKIAogc3RhdGljIE5TVVJMUmVxdWVzdCogdXBkYXRlSWdub3JlU3RyaWN0VHJhbnNwb3J0U2Vj dXJpdHlTZXR0aW5nSWZOZWNlc3NhcnkoTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0LCBib29sIHNob3Vs ZElnbm9yZUhTVFMpCg== 337579 2018-04-09 20:06:35 -0700 2018-04-09 20:43:51 -0700 Patch for landing bug-184433-20180409200635.patch text/plain 6210 wilander SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMDQ2NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE4LTA0LTA5ICBKb2huIFdp bGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlZmFjdG9yIElnbm9yZSBI U1RTIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE4NDQzMworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzkyOTgyMzg+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgVGhpcyBwYXRjaCByZWZhY3RvcnMgb3Vy IGlnbm9yZSBIU1RTIGNvZGUuIFRoZSBjb252ZW5pZW5jZSBmdW5jdGlvbnMgYXJlIG1vdmVkCisg ICAgICAgIG91dCBvZiBDRk5ldHdvcmsgU1BJIGluIFBBTCwgYW5kIGludG8gd2hlcmUgdGhleSBh cmUgdXNlZC4gSXQgYWxzbyBzd2l0Y2hlcworICAgICAgICBmcm9tIHBlcmZvcm1TZWxlY3Rvcjog Y2FsbHMgdG8gc3RyYWlnaHQgZnVuY3Rpb24gY2FsbHMsIGFmdGVyIGNoZWNraW5nIHRoYXQKKyAg ICAgICAgdGhlcmUgaXMgYSByZXNwb25kZXIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3Jr L21hYy9XZWJDb3JlVVJMUmVzcG9uc2UubW06CisgICAgICAgIChXZWJDb3JlOjpzY2hlbWVXYXNV cGdyYWRlZER1ZVRvRHluYW1pY0hTVFMpOgorICAgICAgICAgICAgQWRkIGNvbnZlbmllbmNlIGZ1 bmN0aW9uIGhlcmUgc2luY2UgaXQgd2FzIG1vdmVkIG91dCBvZgorICAgICAgICAgICAgQ0ZOZXR3 b3JrU1BJLmguCisKIDIwMTgtMDQtMDkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29t PgogCiAgICAgICAgIEV4cGFuZCBXZWJDb3JlIHBvbGljeSBjb25jZXB0IG9mICJzaG91bGRDb250 aW51ZSIgdG8gYWxsb3cgZm9yIG1vcmUgdGhhbiB0cnVlL2ZhbHNlCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9QQUwvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL1BBTC9DaGFu Z2VMb2cJKHJldmlzaW9uIDIzMDQ2NCkKKysrIFNvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMSBAQAorMjAxOC0wNC0wOSAgSm9obiBXaWxhbmRl ciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KKworICAgICAgICBSZWZhY3RvciBJZ25vcmUgSFNUUyBj b2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODQ0 MzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM5Mjk4MjM4PgorCisgICAgICAgIFJldmlld2Vk IGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIFRoaXMgcGF0Y2ggcmVmYWN0b3JzIG91ciBpZ25v cmUgSFNUUyBjb2RlLiBUaGUgY29udmVuaWVuY2UgZnVuY3Rpb25zIGFyZSBtb3ZlZAorICAgICAg ICBvdXQgb2YgQ0ZOZXR3b3JrIFNQSSBpbiBQQUwsIGFuZCBpbnRvIHdoZXJlIHRoZXkgYXJlIHVz ZWQuIEl0IGFsc28gc3dpdGNoZXMKKyAgICAgICAgZnJvbSBwZXJmb3JtU2VsZWN0b3I6IGNhbGxz IHRvIHN0cmFpZ2h0IGZ1bmN0aW9uIGNhbGxzLCBhZnRlciBjaGVja2luZyB0aGF0CisgICAgICAg IHRoZXJlIGlzIGEgcmVzcG9uZGVyLgorCisgICAgICAgICogcGFsL3NwaS9jZi9DRk5ldHdvcmtT UEkuaDoKKyAgICAgICAgKHNjaGVtZVdhc1VwZ3JhZGVkRHVlVG9EeW5hbWljSFNUUyk6IERlbGV0 ZWQuCisgICAgICAgIChzZXRJZ25vcmVIU1RTKTogRGVsZXRlZC4KKyAgICAgICAgKGlnbm9yZUhT VFMpOiBEZWxldGVkLgorCiAyMDE4LTA0LTA3ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFw cGxlLmNvbT4KIAogICAgICAgICBVc2UgdGhlIHN5c3RlbSdzIGxpbmsgY29sb3Igd2hlbiBzeXN0 ZW0gYXBwZWFyYW5jZSBpcyBkZXNpcmVkIGZvciBhIFdlYlZpZXcuCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9QQUwvcGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9QQUwvcGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaAkocmV2aXNpb24gMjMwNDY0KQor KysgU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY2YvQ0ZOZXR3b3JrU1BJLmgJKHdvcmtpbmcg Y29weSkKQEAgLTMzNywyNCArMzM3LDQgQEAgV1RGX0VYVEVSTl9DX0VORAogLSAodm9pZClfc2V0 TUlNRVR5cGU6KE5TU3RyaW5nICopdHlwZTsKIEBlbmQKIAotc3RhdGljIGJvb2wgc2NoZW1lV2Fz VXBncmFkZWREdWVUb0R5bmFtaWNIU1RTKE5TVVJMUmVxdWVzdCAqcmVxdWVzdCkKLXsKLSAgICBp ZiAoW3JlcXVlc3QgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfc2NoZW1lV2FzVXBncmFk ZWREdWVUb0R5bmFtaWNIU1RTKV0pCi0gICAgICAgIHJldHVybiBbcmVxdWVzdCBwZXJmb3JtU2Vs ZWN0b3I6QHNlbGVjdG9yKF9zY2hlbWVXYXNVcGdyYWRlZER1ZVRvRHluYW1pY0hTVFMpXTsKLSAg ICByZXR1cm4gZmFsc2U7Ci19Ci0KLXN0YXRpYyB2b2lkIHNldElnbm9yZUhTVFMoTlNNdXRhYmxl VVJMUmVxdWVzdCAqcmVxdWVzdCwgYm9vbCBpZ25vcmVIU1RTKQotewotICAgIGlmIChbcmVxdWVz dCByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9zZXRJZ25vcmVIU1RTOildKQotICAgICAg ICBbcmVxdWVzdCBwZXJmb3JtU2VsZWN0b3I6QHNlbGVjdG9yKF9zZXRJZ25vcmVIU1RTOikgd2l0 aE9iamVjdDpbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6aWdub3JlSFNUU11dOwotfQotCi1zdGF0 aWMgYm9vbCBpZ25vcmVIU1RTKE5TVVJMUmVxdWVzdCAqcmVxdWVzdCkKLXsKLSAgICBpZiAoW3Jl cXVlc3QgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihfaWdub3JlSFNUUyldKQotICAgICAg ICByZXR1cm4gW3JlcXVlc3QgcGVyZm9ybVNlbGVjdG9yOkBzZWxlY3RvcihfaWdub3JlSFNUUyld OwotICAgIHJldHVybiBmYWxzZTsKLX0KLQogI2VuZGlmIC8vIGRlZmluZWQoX19PQkpDX18pCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9XZWJDb3JlVVJMUmVzcG9u c2UubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMv V2ViQ29yZVVSTFJlc3BvbnNlLm1tCShyZXZpc2lvbiAyMzA0NjQpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9XZWJDb3JlVVJMUmVzcG9uc2UubW0JKHdvcmtpbmcgY29w eSkKQEAgLTMyNyw2ICszMjcsMTcgQEAgdm9pZCBhZGp1c3RNSU1FVHlwZUlmTmVjZXNzYXJ5KENG VVJMUmVzcAogfQogI2VuZGlmCiAKK3N0YXRpYyBib29sIHNjaGVtZVdhc1VwZ3JhZGVkRHVlVG9E eW5hbWljSFNUUyhOU1VSTFJlcXVlc3QgKnJlcXVlc3QpCit7CisjaWYgIVVTRShDRk5FVFdPUktf SUdOT1JFX0hTVFMpCisgICAgVU5VU0VEX1BBUkFNKHJlcXVlc3QpOworICAgIHJldHVybiBmYWxz ZTsKKyNlbHNlCisgICAgcmV0dXJuIFtyZXF1ZXN0IHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0 b3IoX3NjaGVtZVdhc1VwZ3JhZGVkRHVlVG9EeW5hbWljSFNUUyldCisgICAgICAgICYmIFtyZXF1 ZXN0IF9zY2hlbWVXYXNVcGdyYWRlZER1ZVRvRHluYW1pY0hTVFNdOworI2VuZGlmCit9CisKIE5T VVJMUmVzcG9uc2UgKnN5bnRoZXNpemVSZWRpcmVjdFJlc3BvbnNlSWZOZWNlc3NhcnkoTlNVUkxS ZXF1ZXN0ICpjdXJyZW50UmVxdWVzdCwgTlNVUkxSZXF1ZXN0ICpuZXdSZXF1ZXN0LCBOU1VSTFJl c3BvbnNlICpyZWRpcmVjdFJlc3BvbnNlKQogewogICAgIGlmIChyZWRpcmVjdFJlc3BvbnNlKQpJ bmRleDogU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMDQ2NCkKKysrIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTgtMDQtMDkgIEpvaG4gV2lsYW5k ZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVmYWN0b3IgSWdub3JlIEhTVFMg Y29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0 NDMzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zOTI5ODIzOD4KKworICAgICAgICBSZXZpZXdl ZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBUaGlzIHBhdGNoIHJlZmFjdG9ycyBvdXIgaWdu b3JlIEhTVFMgY29kZS4gVGhlIGNvbnZlbmllbmNlIGZ1bmN0aW9ucyBhcmUgbW92ZWQKKyAgICAg ICAgb3V0IG9mIENGTmV0d29yayBTUEkgaW4gUEFMLCBhbmQgaW50byB3aGVyZSB0aGV5IGFyZSB1 c2VkLiBJdCBhbHNvIHN3aXRjaGVzCisgICAgICAgIGZyb20gcGVyZm9ybVNlbGVjdG9yOiBjYWxs cyB0byBzdHJhaWdodCBmdW5jdGlvbiBjYWxscywgYWZ0ZXIgY2hlY2tpbmcgdGhhdAorICAgICAg ICB0aGVyZSBpcyBhIHJlc3BvbmRlci4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NvY29h L05ldHdvcmtTZXNzaW9uQ29jb2EubW06CisgICAgICAgIChzY2hlbWVXYXNVcGdyYWRlZER1ZVRv RHluYW1pY0hTVFMpOgorICAgICAgICAoc2V0SWdub3JlSFNUUyk6CisgICAgICAgIChpZ25vcmVI U1RTKToKKyAgICAgICAgICAgIEFkZCBjb252ZW5pZW5jZSBmdW5jdGlvbnMgaGVyZSBzaW5jZSB0 aGV5IHdlcmUgbW92ZWQgb3V0IG9mCisgICAgICAgICAgICBDRk5ldHdvcmtTUEkuaC4KKwogMjAx OC0wNC0wOSAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5jb20+CiAKICAg ICAgICAgUmVuYW1lIFVOVVNFRCB0byBCVU5VU0VECkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCShy ZXZpc2lvbiAyMzA0NjQpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05l dHdvcmtTZXNzaW9uQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTE4Miw2ICsxODIsMjQgQEAg c3RhdGljIE5TVVJMUmVxdWVzdCogZG93bmdyYWRlUmVxdWVzdChOUwogICAgIEFTU0VSVF9OT1Rf UkVBQ0hFRCgpOwogICAgIHJldHVybiByZXF1ZXN0OwogfQorCitzdGF0aWMgYm9vbCBzY2hlbWVX YXNVcGdyYWRlZER1ZVRvRHluYW1pY0hTVFMoTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0KQoreworICAg IHJldHVybiBbcmVxdWVzdCByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9zY2hlbWVXYXNV cGdyYWRlZER1ZVRvRHluYW1pY0hTVFMpXQorICAgICAgICAmJiBbcmVxdWVzdCBfc2NoZW1lV2Fz VXBncmFkZWREdWVUb0R5bmFtaWNIU1RTXTsKK30KKworc3RhdGljIHZvaWQgc2V0SWdub3JlSFNU UyhOU011dGFibGVVUkxSZXF1ZXN0ICpyZXF1ZXN0LCBib29sIGlnbm9yZUhTVFMpCit7CisgICAg aWYgKFtyZXF1ZXN0IHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3NldElnbm9yZUhTVFM6 KV0pCisgICAgICAgIFtyZXF1ZXN0IF9zZXRJZ25vcmVIU1RTOmlnbm9yZUhTVFNdOworfQorCitz dGF0aWMgYm9vbCBpZ25vcmVIU1RTKE5TVVJMUmVxdWVzdCAqcmVxdWVzdCkKK3sKKyAgICByZXR1 cm4gW3JlcXVlc3QgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihfaWdub3JlSFNUUyldCisg ICAgICAgICYmIFtyZXF1ZXN0IF9pZ25vcmVIU1RTXTsKK30KICNlbmRpZgogCiBzdGF0aWMgTlNV UkxSZXF1ZXN0KiB1cGRhdGVJZ25vcmVTdHJpY3RUcmFuc3BvcnRTZWN1cml0eVNldHRpbmdJZk5l Y2Vzc2FyeShOU1VSTFJlcXVlc3QgKnJlcXVlc3QsIGJvb2wgc2hvdWxkSWdub3JlSFNUUykK