168124 2017-02-10 10:20:02 -0800 Replace all WebKit Library Version checks in WK2 with SDK version checks 2020-02-06 15:57:41 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=168056 https://bugs.webkit.org/show_bug.cgi?id=207366 P2 Normal --- 1 beidson beidson ap commit-queue ggaren thorton oldest_to_newest 1275364 0 beidson 2017-02-10 10:20:02 -0800 Replace all WebKit Library Version checks in WK2 with SDK version checks This is a followup to https://bugs.webkit.org/show_bug.cgi?id=168056 We can completely rely on SDK version checks - even for unreleased SDKs - By giving all of our tools a secret way to always pass linkedOnOrAfter checks. 1275379 1 301170 beidson 2017-02-10 10:31:11 -0800 Created attachment 301170 Patch 1275384 2 commit-queue 2017-02-10 10:33:58 -0800 Attachment 301170 did not pass style-queue: ERROR: Tools/TestWebKitAPI/mac/mainMac.mm:43: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Tools/TestWebKitAPI/mac/mainMac.mm:44: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebKit2/UIProcess/Cocoa/VersionChecks.mm:39: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebKit2/UIProcess/Cocoa/VersionChecks.mm:40: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebKit2/UIProcess/Cocoa/VersionChecks.mm:41: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Tools/TestWebKitAPI/ios/mainIOS.mm:41: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Tools/TestWebKitAPI/ios/mainIOS.mm:42: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 7 in 13 files If any of these errors are false positives, please file a bug against check-webkit-style. 1275386 3 301170 ggaren 2017-02-10 10:34:30 -0800 Comment on attachment 301170 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=301170&action=review r=me What could possibly go wrong? :P > Source/WebKit2/ChangeLog:10 > + To allow our tools to still be able to adopt new behaviors even when built against older SDKs, s/adopt/test/ > Source/WebKit2/UIProcess/Cocoa/VersionChecks.mm:42 > + // Always make new behaviors work in Safari. The code is pretty clear at explaining how it achieves this behavior, but I'm not sure why we want it. Would be nice for this comment to explain why we want this behavior. 1275495 4 beidson 2017-02-10 12:40:26 -0800 https://trac.webkit.org/changeset/212134 1275511 5 301170 ap 2017-02-10 13:03:39 -0800 Comment on attachment 301170 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=301170&action=review > Source/WebKit2/UIProcess/Cocoa/VersionChecks.h:-65 > - static const uint32_t SDKVersion { DYLD_MACOSX_VERSION_10_12_4 }; This existing code looks wrong to me, we shouldn't change behavior for native clients other than in major updates. How did this get in? We should probably get this corrected soon. 1275517 6 beidson 2017-02-10 13:12:05 -0800 (In reply to comment #5) > Comment on attachment 301170 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=301170&action=review > > > Source/WebKit2/UIProcess/Cocoa/VersionChecks.h:-65 > > - static const uint32_t SDKVersion { DYLD_MACOSX_VERSION_10_12_4 }; > > This existing code looks wrong to me, we shouldn't change behavior for > native clients other than in major updates. Why not? > How did this get in? Because I put it in because multiple people think it's right. > We should probably get this corrected soon. The first thing that would have to happen is to establish that something is incorrect, which I'm not sure we have done. 1275518 7 beidson 2017-02-10 13:12:48 -0800 (In reply to comment #6) > (In reply to comment #5) > > > How did this get in? > > Because I put it in because multiple people think it's right. And also, it had already be in - in practice - with the WebKit Library Version check. 1275521 8 beidson 2017-02-10 13:18:39 -0800 (In reply to comment #7) > (In reply to comment #6) > > (In reply to comment #5) > > > > > How did this get in? > > > > Because I put it in because multiple people think it's right. > > And also, it had already be in - in practice - with the WebKit Library > Version check. To link to that: https://trac.webkit.org/changeset/210031 1276402 9 beidson 2017-02-13 15:28:51 -0800 Followed up: https://trac.webkit.org/changeset/212256 301170 2017-02-10 10:31:11 -0800 2017-02-10 10:34:30 -0800 Patch bug-168124-20170210102844.patch text/plain 14390 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyMDAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNjU2OGNlMzIxNWMzODQz YTZhMGM4YTU2ZmFmYThjYjZlZjJkMDBmNy4uMjlhNWMwMDE3NTdkZDViNmI2OGVkOTk1MGZlNTIy MzgyOGM2YmJjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE3LTAyLTEwICBCcmFk eSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKworICAgICAgICBSZXBsYWNlIGFsbCBXZWJL aXQgTGlicmFyeSBWZXJzaW9uIGNoZWNrcyBpbiBXSzIgd2l0aCBTREsgdmVyc2lvbiBjaGVja3Mu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjgxMjQK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGNo YW5nZSBnZXRzIHJpZCBvZiBXZWJLaXQgTGlicmFyeSBWZXJzaW9uIGNoZWNrcyBhbmQgcmVwbGFj ZXMgdGhlbSB3aXRoIFNESyB2ZXJzaW9uIGNoZWNrcy4KKyAgICAgICAgCisgICAgICAgIFRvIGFs bG93IG91ciB0b29scyB0byBzdGlsbCBiZSBhYmxlIHRvIGFkb3B0IG5ldyBiZWhhdmlvcnMgZXZl biB3aGVuIGJ1aWx0IGFnYWluc3Qgb2xkZXIgU0RLcywKKyAgICAgICAgaXQgYWxzbyBvcHRzIHRo ZW0gaW50byBhbiBTUEkgZGVmYXVsdCB0byBoYXZlICJsaW5rZWRPbk9yQWZ0ZXIoKSIgYWx3YXlz IHJldHVybiB0cnVlLgorICAgICAgICAKKyAgICAgICAgKiBTaGFyZWQvQ29jb2EvQ29tcGxldGlv bkhhbmRsZXJDYWxsQ2hlY2tlci5tbToKKyAgICAgICAgKFdlYktpdDo6c2hvdWxkVGhyb3dFeGNl cHRpb25Gb3JEdXBsaWNhdGVDb21wbGV0aW9uSGFuZGxlckNhbGwpOgorICAgICAgICAKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0NvbmZpZ3VyYXRpb24ubW06CisgICAg ICAgICgtW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gaW5pdF0pOgorICAgICAgICAKKyAgICAgICAg KiBVSVByb2Nlc3MvQ29jb2EvVmVyc2lvbkNoZWNrcy5oOgorICAgICAgICAoV2ViS2l0OjpsaW5r ZWRPbk9yQWZ0ZXIpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9WZXJzaW9u Q2hlY2tzLm1tOgorICAgICAgICAoV2ViS2l0OjpsaW5rZWRPbk9yQWZ0ZXIpOgorICAgICAgICAK KyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbToKKyAgICAg ICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmlzTmV0d29ya0NhY2hlRW5hYmxlZCk6CisKIDIw MTctMDItMDkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFRy YW5zaXRpb24gIldlYktpdCBMaWJyYXJ5IFZlcnNpb24iIGNoZWNrcyB0byBTREsgdmVyc2lvbiBj aGVja3MuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29jb2EvQ29tcGxldGlv bkhhbmRsZXJDYWxsQ2hlY2tlci5tbSBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db2NvYS9Db21w bGV0aW9uSGFuZGxlckNhbGxDaGVja2VyLm1tCmluZGV4IDcxYzE1NjE3ZGUxNjMxZGY4NmI0MTll Nzg1ZDEzMjQxOWM2ZGE1MmQuLjQyMDgzZTY4YmU5MTg2MzU5YmQwODQwY2JmYzM5YzU1NjVkNzYy MTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db2NvYS9Db21wbGV0aW9uSGFu ZGxlckNhbGxDaGVja2VyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db2NvYS9Db21w bGV0aW9uSGFuZGxlckNhbGxDaGVja2VyLm1tCkBAIC02Nyw3ICs2Nyw3IEBAIHN0YXRpYyBib29s IHNob3VsZFRocm93RXhjZXB0aW9uRm9yRHVwbGljYXRlQ29tcGxldGlvbkhhbmRsZXJDYWxsKCkK ICAgICBzdGF0aWMgYm9vbCBzaG91bGRUaHJvd0V4Y2VwdGlvbjsKICAgICBzdGF0aWMgc3RkOjpv bmNlX2ZsYWcgb25jZTsKICAgICBzdGQ6OmNhbGxfb25jZShvbmNlLCBbXSB7Ci0gICAgICAgIHNo b3VsZFRocm93RXhjZXB0aW9uID0gbGlua2VkT25PckFmdGVyPEZpcnN0V2ViS2l0V2l0aEV4Y2Vw dGlvbnNGb3JEdXBsaWNhdGVDb21wbGV0aW9uSGFuZGxlckNhbGxzPigpOworICAgICAgICBzaG91 bGRUaHJvd0V4Y2VwdGlvbiA9IGxpbmtlZE9uT3JBZnRlcihTREtWZXJzaW9uOjpGaXJzdFdpdGhF eGNlcHRpb25zRm9yRHVwbGljYXRlQ29tcGxldGlvbkhhbmRsZXJDYWxscyk7CiAgICAgfSk7CiAg ICAgcmV0dXJuIHNob3VsZFRocm93RXhjZXB0aW9uOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdDb25maWd1cmF0aW9uLm1tIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdDb25maWd1cmF0aW9uLm1t CmluZGV4IDgwMTg1ZjQwYTNlZWY1ZGVjNmY0M2I5MmM4NTYwNDRmMWI0OGRhZmYuLmFhMjc4NWMy NGMxNjk3MjAwODJiYTIzMGI1ZmRkMzZiMGFiZjI2OWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5tbQorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0NvbmZpZ3VyYXRpb24u bW0KQEAgLTE0NSw3ICsxNDUsNyBAQCAtIChpbnN0YW5jZXR5cGUpaW5pdAogICAgIF9pbmxpbmVN ZWRpYVBsYXliYWNrUmVxdWlyZXNQbGF5c0lubGluZUF0dHJpYnV0ZSA9ICFfYWxsb3dzSW5saW5l TWVkaWFQbGF5YmFjazsKICAgICBfYWxsb3dzSW5saW5lTWVkaWFQbGF5YmFja0FmdGVyRnVsbHNj cmVlbiA9ICFfYWxsb3dzSW5saW5lTWVkaWFQbGF5YmFjazsKICAgICBfbWVkaWFEYXRhTG9hZHNB dXRvbWF0aWNhbGx5ID0gTk87Ci0gICAgaWYgKFdlYktpdDo6bGlua2VkT25PckFmdGVyPFdlYktp dDo6Rmlyc3RXZWJLaXRXaXRoTWVkaWFUeXBlc1JlcXVpcmluZ1VzZXJBY3Rpb25Gb3JQbGF5YmFj az4oKSkKKyAgICBpZiAoV2ViS2l0OjpsaW5rZWRPbk9yQWZ0ZXIoV2ViS2l0OjpTREtWZXJzaW9u OjpGaXJzdFdpdGhNZWRpYVR5cGVzUmVxdWlyaW5nVXNlckFjdGlvbkZvclBsYXliYWNrKSkKICAg ICAgICAgX21lZGlhVHlwZXNSZXF1aXJpbmdVc2VyQWN0aW9uRm9yUGxheWJhY2sgPSBXS0F1ZGlv dmlzdWFsTWVkaWFUeXBlQXVkaW87CiAgICAgZWxzZQogICAgICAgICBfbWVkaWFUeXBlc1JlcXVp cmluZ1VzZXJBY3Rpb25Gb3JQbGF5YmFjayA9IFdLQXVkaW92aXN1YWxNZWRpYVR5cGVBbGw7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvVmVyc2lvbkNoZWNrcy5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1ZlcnNpb25DaGVja3MuaAppbmRleCBm YzUxYzcyODNjNjA1MjM0ZTE2Y2ExOWY4ZDRmMmRhYzE5NGViZmFkLi44MmMxMTYyNzBjZWUyMTNi ZTA4M2U4ZDMwYTBlNjgwM2FiMTE5N2E4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQ29jb2EvVmVyc2lvbkNoZWNrcy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9Db2NvYS9WZXJzaW9uQ2hlY2tzLmgKQEAgLTI5LDQ3ICsyOSwxNyBAQAogCiBuYW1lc3BhY2Ug V2ViS2l0IHsKIAotLyoKLSAgICBWZXJzaW9uIG51bWJlcnMgYXJlIGJhc2VkIG9uIHRoZSAnY3Vy cmVudCBsaWJyYXJ5IHZlcnNpb24nIHNwZWNpZmllZCBpbiB0aGUgV2ViS2l0IGJ1aWxkIHJ1bGVz LgotICAgIEFsbCBvZiB0aGVzZSBtZXRob2RzIHJldHVybiBvciB0YWtlIHZlcnNpb24gbnVtYmVy cyB3aXRoIGVhY2ggcGFydCBzaGlmdGVkIHRvIHRoZSBsZWZ0IDIgYnl0ZXMuCi0gICAgRm9yIGV4 YW1wbGUgdGhlIHZlcnNpb24gMS4yLjMgaXMgcmV0dXJuZWQgYXMgMHgwMDAxMDIwMyBhbmQgdmVy c2lvbiAyMDAuMy41IGlzIHJldHVybmVkIGFzIDB4MDBDODAzMDUKLSAgICBBIHZlcnNpb24gb2Yg LTEgaXMgcmV0dXJuZWQgaWYgdGhlIG1haW4gZXhlY3V0YWJsZSBkaWQgbm90IGxpbmsgYWdhaW5z dCBXZWJLaXQuCi0KLSAgICBVc2UgdGhlIGN1cnJlbnQgV2ViS2l0IHZlcnNpb24gbnVtYmVyLCBh dmFpbGFibGUgaW4gV2ViS2l0Mi9Db25maWd1cmF0aW9ucy9WZXJzaW9uLnhjY29uZmlnLAotICAg IHdoZW4gYWRkaW5nIGEgbmV3IHZlcnNpb24gY29uc3RhbnQuCi0qLwotCi1zdHJ1Y3QgRmlyc3RX ZWJLaXRXaXRoTmV0d29ya0NhY2hlIHsKLSAgICBzdGF0aWMgY29uc3QgaW50IExpYnJhcnlWZXJz aW9uIHsgMHgwMjU5MDExNiB9OyAvLyA2MDEuMS4yMgotI2lmIFBMQVRGT1JNKElPUykKLSAgICBz dGF0aWMgY29uc3QgdWludDMyX3QgU0RLVmVyc2lvbiB7IERZTERfSU9TX1ZFUlNJT05fOV8wIH07 Ci0jZWxpZiBQTEFURk9STShNQUMpCi0gICAgc3RhdGljIGNvbnN0IHVpbnQzMl90IFNES1ZlcnNp b24geyBEWUxEX01BQ09TWF9WRVJTSU9OXzEwXzExIH07Ci0jZW5kaWYKLX07Ci0KLXN0cnVjdCBG aXJzdFdlYktpdFdpdGhNZWRpYVR5cGVzUmVxdWlyaW5nVXNlckFjdGlvbkZvclBsYXliYWNrIHsK LSAgICBzdGF0aWMgY29uc3QgaW50IExpYnJhcnlWZXJzaW9uIHsgMHgwMjVBMDEyMSB9OyAvLyA2 MDIuMS4zMworZW51bSBjbGFzcyBTREtWZXJzaW9uIDogdWludDMyX3QgewogI2lmIFBMQVRGT1JN KElPUykKLSAgICBzdGF0aWMgY29uc3QgdWludDMyX3QgU0RLVmVyc2lvbiB7IERZTERfSU9TX1ZF UlNJT05fMTBfMCB9OworICAgIEZpcnN0V2l0aE5ldHdvcmtDYWNoZSA9IERZTERfSU9TX1ZFUlNJ T05fOV8wLAorICAgIEZpcnN0V2l0aE1lZGlhVHlwZXNSZXF1aXJpbmdVc2VyQWN0aW9uRm9yUGxh eWJhY2sgPSBEWUxEX0lPU19WRVJTSU9OXzEwXzAsCisgICAgRmlyc3RXaXRoRXhjZXB0aW9uc0Zv ckR1cGxpY2F0ZUNvbXBsZXRpb25IYW5kbGVyQ2FsbHMgPSBEWUxEX0lPU19WRVJTSU9OXzEwXzMs CiAjZWxpZiBQTEFURk9STShNQUMpCi0gICAgc3RhdGljIGNvbnN0IHVpbnQzMl90IFNES1ZlcnNp b24geyBEWUxEX01BQ09TWF9WRVJTSU9OXzEwXzEyIH07CisgICAgRmlyc3RXaXRoTmV0d29ya0Nh Y2hlID0gRFlMRF9NQUNPU1hfVkVSU0lPTl8xMF8xMSwKKyAgICBGaXJzdFdpdGhFeGNlcHRpb25z Rm9yRHVwbGljYXRlQ29tcGxldGlvbkhhbmRsZXJDYWxscyA9IERZTERfTUFDT1NYX1ZFUlNJT05f MTBfMTJfNCwKICNlbmRpZgogfTsKIAotc3RydWN0IEZpcnN0V2ViS2l0V2l0aEV4Y2VwdGlvbnNG b3JEdXBsaWNhdGVDb21wbGV0aW9uSGFuZGxlckNhbGxzIHsKLSAgICBzdGF0aWMgY29uc3QgaW50 IExpYnJhcnlWZXJzaW9uIHsgMHgwMjVCMDExMSB9OyAvLyA2MDMuMS4xNwotI2lmIFBMQVRGT1JN KElPUykKLSAgICBzdGF0aWMgY29uc3QgdWludDMyX3QgU0RLVmVyc2lvbiB7IERZTERfSU9TX1ZF UlNJT05fMTBfMyB9OwotI2VsaWYgUExBVEZPUk0oTUFDKQotICAgIHN0YXRpYyBjb25zdCB1aW50 MzJfdCBTREtWZXJzaW9uIHsgRFlMRF9NQUNPU1hfVkVSU0lPTl8xMF8xMl80IH07Ci0jZW5kaWYK LX07Ci0KLWJvb2wgbGlua2VkT25PckFmdGVyKGludCBsaWJyYXJ5VmVyc2lvbiwgdWludDMyX3Qg c2RrVmVyc2lvbik7Ci10ZW1wbGF0ZSA8dHlwZW5hbWUgVmVyc2lvbkluZm8+IGJvb2wgbGlua2Vk T25PckFmdGVyKCkKLXsKLSAgICByZXR1cm4gbGlua2VkT25PckFmdGVyKFZlcnNpb25JbmZvOjpM aWJyYXJ5VmVyc2lvbiwgVmVyc2lvbkluZm86OlNES1ZlcnNpb24pOwotfQorYm9vbCBsaW5rZWRP bk9yQWZ0ZXIoU0RLVmVyc2lvbik7CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9Db2NvYS9WZXJzaW9uQ2hlY2tzLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0NvY29hL1ZlcnNpb25DaGVja3MubW0KaW5kZXggMjE5ZjZkOTQzOWRhZjVmZGZmNGE1NDM5MzNl YjhhNWNiOTgyMDdkMi4uOWIzNzczNDM1OGQ3YTYzNmY4ODQ4YThlM2RlY2VmNTUyNzg0YjFkZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1ZlcnNpb25DaGVja3Mu bW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1ZlcnNpb25DaGVja3MubW0K QEAgLTI2LDMxICsyNiwzNCBAQAogI2ltcG9ydCAiY29uZmlnLmgiCiAjaW1wb3J0ICJWZXJzaW9u Q2hlY2tzLmgiCiAKLSNpbXBvcnQgPG1hY2gtby9keWxkLmg+Ci0KLSNpZiBQTEFURk9STShJT1Mp CiAjaW1wb3J0IDxXZWJDb3JlL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNrcy5oPgotI2VuZGlmCisj aW1wb3J0IDxtYWNoLW8vZHlsZC5oPgorI2ltcG9ydCA8bXV0ZXg+CiAKIG5hbWVzcGFjZSBXZWJL aXQgewogCi1ib29sIGxpbmtlZE9uT3JBZnRlcihpbnQgbGlicmFyeVZlcnNpb24sIHVpbnQzMl90 IHNka1ZlcnNpb24pCitzdGF0aWMgTlNTdHJpbmcgKiBjb25zdCBXZWJLaXRMaW5rZWRPbk9yQWZ0 ZXJFdmVyeXRoaW5nS2V5ID0gQCJXZWJLaXRMaW5rZWRPbk9yQWZ0ZXJFdmVyeXRoaW5nIjsKKwor Ym9vbCBsaW5rZWRPbk9yQWZ0ZXIoU0RLVmVyc2lvbiBzZGtWZXJzaW9uKQogeworICAgICBzdGF0 aWMgYm9vbCBsaW5rZWRPbk9yQWZ0ZXJFdmVyeXRoaW5nOworICAgICBzdGF0aWMgc3RkOjpvbmNl X2ZsYWcgb25jZTsKKyAgICAgc3RkOjpjYWxsX29uY2Uob25jZSwgW10geworICAgICAgICAvLyBB bHdheXMgbWFrZSBuZXcgYmVoYXZpb3JzIHdvcmsgaW4gU2FmYXJpLgorICAgICAgICBib29sIGlz U2FmYXJpID0gZmFsc2U7CiAjaWYgUExBVEZPUk0oSU9TKQotICAgIC8vIEFsd2F5cyBtYWtlIG5l dyBmZWF0dXJlcyBhdmFpbGFibGUgZm9yIFNhZmFyaS4KLSAgICBpZiAoV2ViQ29yZTo6SU9TQXBw bGljYXRpb246OmlzTW9iaWxlU2FmYXJpKCkpCi0gICAgICAgIHJldHVybiB0cnVlOworICAgICAg ICBpZiAoV2ViQ29yZTo6SU9TQXBwbGljYXRpb246OmlzTW9iaWxlU2FmYXJpKCkpCisgICAgICAg ICAgICBpc1NhZmFyaSA9IHRydWU7CisjZWxpZiBQTEFURk9STShNQUMpCisgICAgICAgIGlmIChX ZWJDb3JlOjpNYWNBcHBsaWNhdGlvbjo6aXNTYWZhcmkoKSkKKyAgICAgICAgICAgIGlzU2FmYXJp ID0gdHJ1ZTsKICNlbmRpZgogCi0gICAgLy8gSWYgdGhlIGFwcCB3YXMgYnVpbGQgYWdhaW5zdCBh IG5ldyBlbm91Z2ggU0RLLCBpdCBkZWZpbml0ZWx5IHBhc3NlcyB0aGUgbGlua2VkLW9uLW9yLWFm dGVyIGNoZWNrLgotICAgIGlmIChkeWxkX2dldF9wcm9ncmFtX3Nka192ZXJzaW9uKCkgPj0gc2Rr VmVyc2lvbikKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0KLSAgICAvLyBJZiB0aGUgYXBwIHdhcyBi dWlsdCBhZ2FpbnN0IGFuIG9sZGVyIFNESywgd2UgbWlnaHQgc3RpbGwgY29uc2lkZXIgaXQgbGlu a2VkLW9uLW9yLWFmdGVyCi0gICAgLy8gYnkgY2hlY2tpbmcgdGhlIGxpbmtlZCBXZWJLaXQgbGli cmFyeSB2ZXJzaW9uIG51bWJlciwgaWYgb25lIGV4aXN0cy4KKyAgICAgICAgaWYgKGlzU2FmYXJp IHx8IFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIGJvb2xGb3JLZXk6V2Vi S2l0TGlua2VkT25PckFmdGVyRXZlcnl0aGluZ0tleV0pCisgICAgICAgICAgICBsaW5rZWRPbk9y QWZ0ZXJFdmVyeXRoaW5nID0gdHJ1ZTsKKyAgICB9KTsKIAotICAgIGludCBsaW5rZWRWZXJzaW9u ID0gTlNWZXJzaW9uT2ZMaW5rVGltZUxpYnJhcnkoIldlYktpdCIpOwotICAgIHJldHVybiBsaW5r ZWRWZXJzaW9uID09IC0xID8gZmFsc2UgOiBsaW5rZWRWZXJzaW9uID49IGxpYnJhcnlWZXJzaW9u OworICAgIHJldHVybiBsaW5rZWRPbk9yQWZ0ZXJFdmVyeXRoaW5nID8gdHJ1ZSA6IGR5bGRfZ2V0 X3Byb2dyYW1fc2RrX3ZlcnNpb24oKSA+PSBzdGF0aWNfY2FzdDx1aW50MzJfdD4oc2RrVmVyc2lv bik7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9X ZWJQcm9jZXNzUG9vbENvY29hLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1dl YlByb2Nlc3NQb29sQ29jb2EubW0KaW5kZXggZWNkNDY5YzI3OTAwY2M2NzVkODA4ZTA0ZDAxMTIz NDJjODhkNjE0OC4uMjc2N2RmOTc2MjdiMDNkN2VjNGY0NzNmYzBiYWE3MWNlMTI5ZTQzMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29j b2EubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29s Q29jb2EubW0KQEAgLTQ2Miw3ICs0NjIsNyBAQCBib29sIFdlYlByb2Nlc3NQb29sOjppc05ldHdv cmtDYWNoZUVuYWJsZWQoKQogCiAgICAgYm9vbCBuZXR3b3JrQ2FjaGVFbmFibGVkQnlEZWZhdWx0 cyA9IFtkZWZhdWx0cyBib29sRm9yS2V5OldlYktpdE5ldHdvcmtDYWNoZUVuYWJsZWREZWZhdWx0 c0tleV07CiAKLSAgICByZXR1cm4gbmV0d29ya0NhY2hlRW5hYmxlZEJ5RGVmYXVsdHMgJiYgbGlu a2VkT25PckFmdGVyPEZpcnN0V2ViS2l0V2l0aE5ldHdvcmtDYWNoZT4oKTsKKyAgICByZXR1cm4g bmV0d29ya0NhY2hlRW5hYmxlZEJ5RGVmYXVsdHMgJiYgbGlua2VkT25PckFmdGVyKFNES1ZlcnNp b246OkZpcnN0V2l0aE5ldHdvcmtDYWNoZSk7CiAjZWxzZQogICAgIHJldHVybiBmYWxzZTsKICNl bmRpZgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4 IGQ2YmIxYmNlMmNhYmU2ZDQ1ODQyNGJlN2FiMjkxY2RkZTNkMjRlNDIuLjNhYjljY2Q3ZWUyYTZh NTMzNTY1NTdhNzI0NzRhZGY1MjliNTcyZTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZwor KysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxNy0wMi0xMCAgQnJhZHkg RWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVwbGFjZSBhbGwgV2ViS2l0 IExpYnJhcnkgVmVyc2lvbiBjaGVja3MgaW4gV0syIHdpdGggU0RLIHZlcnNpb24gY2hlY2tzLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY4MTI0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRm9yIGVhY2gg b2Ygb3VyIHRvb2xzIHRoYXQgdXNlIFdlYktpdDIsIG9wdCB0aGVtIGluIHRvIHRoZSBuZXcgbGlu a2VkT25PckFmdGVyKEV2ZXJ5dGhpbmcpIHNldHRpbmcuCisgICAgICAgIAorICAgICAgICAqIE1p bmlCcm93c2VyL21hYy9tYWluLm06CisgICAgICAgIChtYWluKToKKyAgICAgICAgKiBNb2JpbGVN aW5pQnJvd3Nlci9Nb2JpbGVNaW5pQnJvd3Nlci9tYWluLm06CisgICAgICAgIChtYWluKToKKyAg ICAgICAgKiBUZXN0V2ViS2l0QVBJL2lvcy9tYWluSU9TLm1tOgorICAgICAgICAobWFpbik6Cisg ICAgICAgICogVGVzdFdlYktpdEFQSS9tYWMvbWFpbk1hYy5tbToKKyAgICAgICAgKG1haW4pOgor ICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvaW9zL21haW5JT1MubW06CisgICAgICAgIChtYWlu KToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL21hYy9tYWluLm1tOgorICAgICAgICAoc2V0 RGVmYXVsdHNUb0NvbnNpc3RlbnRWYWx1ZXNGb3JUZXN0aW5nKToKKwogMjAxNy0wMi0wOSAgQWxl eCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlbmFt ZSBpc0FwcGxlTWFjV2ViS2l0IHRvIGlzQXBwbGVDb2NvYVdlYktpdApkaWZmIC0tZ2l0IGEvVG9v bHMvTWluaUJyb3dzZXIvbWFjL21haW4ubSBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9tYWluLm0K aW5kZXggN2Y1NjczNzQ5OWM2MTc2Mjg5YzRiYzkzNDUwYmIwYTY2NjcwMGQ5Yy4uYmEyY2ExMjQ4 MmMwYWI4MDk5OTgxMzFmNjkzYzg3NjAxOWM1OTVmMSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJy b3dzZXIvbWFjL21haW4ubQorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvbWFpbi5tCkBAIC0y Nyw1ICsyNyw3IEBACiAKIGludCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCiB7CisgICAg W1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gc2V0Qm9vbDpZRVMgZm9yS2V5 OkAiV2ViS2l0TGlua2VkT25PckFmdGVyRXZlcnl0aGluZyJdOworCiAgICAgcmV0dXJuIE5TQXBw bGljYXRpb25NYWluKGFyZ2MsICAoY29uc3QgY2hhciAqKikgYXJndik7CiB9CmRpZmYgLS1naXQg YS9Ub29scy9Nb2JpbGVNaW5pQnJvd3Nlci9Nb2JpbGVNaW5pQnJvd3Nlci9tYWluLm0gYi9Ub29s cy9Nb2JpbGVNaW5pQnJvd3Nlci9Nb2JpbGVNaW5pQnJvd3Nlci9tYWluLm0KaW5kZXggZWMyOTVh Y2U5MzhkYWFkYTcyMjg4YmFiMzFkZTk5MDlkNDk1N2RmYS4uNTVlZmQxNTcyZmE3YWQ0OWI4MmNl NmM1OGEwMDIyMmUwN2E3NjFhYyAxMDA2NDQKLS0tIGEvVG9vbHMvTW9iaWxlTWluaUJyb3dzZXIv TW9iaWxlTWluaUJyb3dzZXIvbWFpbi5tCisrKyBiL1Rvb2xzL01vYmlsZU1pbmlCcm93c2VyL01v YmlsZU1pbmlCcm93c2VyL21haW4ubQpAQCAtMjcsNiArMjcsOCBAQAogCiBpbnQgbWFpbihpbnQg YXJnYywgY2hhciAqIGFyZ3ZbXSkKIHsKKyAgICBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNl ckRlZmF1bHRzXSBzZXRCb29sOllFUyBmb3JLZXk6QCJXZWJLaXRMaW5rZWRPbk9yQWZ0ZXJFdmVy eXRoaW5nIl07CisKICAgICBAYXV0b3JlbGVhc2Vwb29sIHsKICAgICAgICAgcmV0dXJuIFVJQXBw bGljYXRpb25NYWluKGFyZ2MsIGFyZ3YsIG5pbCwgTlNTdHJpbmdGcm9tQ2xhc3MoW0FwcERlbGVn YXRlIGNsYXNzXSkpOwogICAgIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvaW9z L21haW5JT1MubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL2lvcy9tYWluSU9TLm1tCmluZGV4IGZh MmJlMmVhYzI1Y2E0NWJiMTQxZjI2MDk4YzVmNjJmOWRhMjY0ODAuLmNiOGMwYzU1ZTc2YWJhYjky N2RkYjM1MWIzMmQwMWUzM2VhOWJjOWQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv aW9zL21haW5JT1MubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9pb3MvbWFpbklPUy5tbQpA QCAtMzEsNiArMzEsMTkgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQogICAgIE5T QXV0b3JlbGVhc2VQb29sICpwb29sID0gW1tOU0F1dG9yZWxlYXNlUG9vbCBhbGxvY10gaW5pdF07 CiAKICAgICBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSByZW1vdmVQZXJz aXN0ZW50RG9tYWluRm9yTmFtZTpAIlRlc3RXZWJLaXRBUEkiXTsKKworICAgIC8vIFNldCB1cCB1 c2VyIGRlZmF1bHRzLgorICAgIE5TTXV0YWJsZURpY3Rpb25hcnkgKmFyZ3VtZW50RG9tYWluID0g W1tbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIHZvbGF0aWxlRG9tYWluRm9y TmFtZTpOU0FyZ3VtZW50RG9tYWluXSBtdXRhYmxlQ29weV07CisgICAgaWYgKCFhcmd1bWVudERv bWFpbikKKyAgICAgICAgYXJndW1lbnREb21haW4gPSBbW05TTXV0YWJsZURpY3Rpb25hcnkgYWxs b2NdIGluaXRdOworICAgIAorICAgIE5TRGljdGlvbmFyeSAqZGljdCA9IFtOU0RpY3Rpb25hcnkg ZGljdGlvbmFyeVdpdGhPYmplY3RzQW5kS2V5czoKKyAgICAgICAgICAgICAgICAgICAgICAgICAg W05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10sICAgIEAiV2ViS2l0TGlua2VkT25PckFmdGVy RXZlcnl0aGluZyIsCisgICAgICAgICAgICAgICAgICAgICAgICAgIG5pbF07CisKKyAgICBbYXJn dW1lbnREb21haW4gYWRkRW50cmllc0Zyb21EaWN0aW9uYXJ5OmRpY3RdOworICAgIFtbTlNVc2Vy RGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIHNldFZvbGF0aWxlRG9tYWluOmFyZ3VtZW50 RG9tYWluIGZvck5hbWU6TlNBcmd1bWVudERvbWFpbl07CisKICAgICBib29sIHBhc3NlZCA9IFRl c3RXZWJLaXRBUEk6OlRlc3RzQ29udHJvbGxlcjo6c2luZ2xldG9uKCkucnVuKGFyZ2MsIGFyZ3Yp OwogCiAgICAgW3Bvb2wgZHJhaW5dOwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9t YWMvbWFpbk1hYy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvbWFjL21haW5NYWMubW0KaW5kZXgg OWE4MzBlMjI4YjkzNTQ3ZGJkZTAxYmI1NGQ4MDVkNzg5NzFiZDhhNy4uZDMxMmM2N2U1NzZiMTcw NjRiYjBiYWIwZjU5YjFiYjVhYzRmOWY3NyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQ SS9tYWMvbWFpbk1hYy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL21hYy9tYWluTWFjLm1t CkBAIC0zNCw2ICszNCwxOCBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhcioqIGFyZ3YpCiAKICAg ICBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSByZW1vdmVQZXJzaXN0ZW50 RG9tYWluRm9yTmFtZTpAIlRlc3RXZWJLaXRBUEkiXTsKIAorICAgIC8vIFNldCBhIHVzZXIgZGVm YXVsdCBmb3IgVGVzdFdlYktpdEFQSSB0byBieXBhc3MgYWxsIGxpbmtlZC1vbi1vci1hZnRlciBj aGVja3MgaW4gV2ViS2l0CisgICAgTlNNdXRhYmxlRGljdGlvbmFyeSAqYXJndW1lbnREb21haW4g PSBbW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gdm9sYXRpbGVEb21haW5G b3JOYW1lOk5TQXJndW1lbnREb21haW5dIG11dGFibGVDb3B5XTsKKyAgICBpZiAoIWFyZ3VtZW50 RG9tYWluKQorICAgICAgICBhcmd1bWVudERvbWFpbiA9IFtbTlNNdXRhYmxlRGljdGlvbmFyeSBh bGxvY10gaW5pdF07CisgICAgCisgICAgTlNEaWN0aW9uYXJ5ICpkaWN0ID0gW05TRGljdGlvbmFy eSBkaWN0aW9uYXJ5V2l0aE9iamVjdHNBbmRLZXlzOgorICAgICAgICAgICAgICAgICAgICAgICAg ICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6WUVTXSwgICAgQCJXZWJLaXRMaW5rZWRPbk9yQWZ0 ZXJFdmVyeXRoaW5nIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgbmlsXTsKKworICAgIFth cmd1bWVudERvbWFpbiBhZGRFbnRyaWVzRnJvbURpY3Rpb25hcnk6ZGljdF07CisgICAgW1tOU1Vz ZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gc2V0Vm9sYXRpbGVEb21haW46YXJndW1l bnREb21haW4gZm9yTmFtZTpOU0FyZ3VtZW50RG9tYWluXTsKKwogICAgIFtOU0FwcGxpY2F0aW9u IHNoYXJlZEFwcGxpY2F0aW9uXTsKICAgICBfQmVnaW5FdmVudFJlY2VpcHRPblRocmVhZCgpOyAv LyBNYWtlcyB3aW5kb3cgdmlzaWJpbGl0eSBub3RpZmljYXRpb25zIHdvcmsgKGFuZCBwb3NzaWJs eSBtb3JlKS4KIApkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9pb3MvbWFpbklP Uy5tbSBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvaW9zL21haW5JT1MubW0KaW5kZXggM2QwMTU0 YzdkODE2MGNjMzkwNzI5ZGQxNzAyNTJiMTA1MWNkZTY1NC4uMGRhYmJjMWFjNTQ4ZjgyZTA0Nzlk NDk1ZTYxOGFlNzI0MDBkNDBlMCAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9p b3MvbWFpbklPUy5tbQorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2lvcy9tYWluSU9TLm1t CkBAIC02Nyw2ICs2Nyw4IEBAIGludCBtYWluKGludCBhcmdjLCBjb25zdCBjaGFyKiBhcmd2W10p CiAgICAgX2FyZ2MgPSBhcmdjOwogICAgIF9hcmd2ID0gYXJndjsKIAorICAgIFtbTlNVc2VyRGVm YXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIHNldEJvb2w6WUVTIGZvcktleTpAIldlYktpdExp bmtlZE9uT3JBZnRlckV2ZXJ5dGhpbmciXTsKKwogICAgIFVJQXBwbGljYXRpb25NYWluKGFyZ2Ms IChjaGFyKiopYXJndiwgQCJXZWJLaXRUZXN0UnVubmVyQXBwIiwgQCJXZWJLaXRUZXN0UnVubmVy QXBwIik7CiAgICAgcmV0dXJuIDA7CiB9CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVu bmVyL21hYy9tYWluLm1tIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9tYWMvbWFpbi5tbQppbmRl eCAwMzM2MDU2MmEwMzc1ZmNmNmQ0YjNhZGYwYWQwNDE3MDNlODZlY2NkLi42NjM3ZGIyZDc4NzE2 NTY1M2RkMWE0YTk4ZGZkNDk4YjI5NmU3MjU5IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL21hYy9tYWluLm1tCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvbWFjL21haW4u bW0KQEAgLTQxLDYgKzQxLDcgQEAgc3RhdGljIHZvaWQgc2V0RGVmYXVsdHNUb0NvbnNpc3RlbnRW YWx1ZXNGb3JUZXN0aW5nKCkKICAgICAgICAgQCJBcHBsZUVuYWJsZVN3aXBlTmF2aWdhdGVXaXRo U2Nyb2xscyI6IEBZRVMsCiAgICAgICAgIEAiY29tLmFwcGxlLnN3aXBlc2Nyb2xsZGlyZWN0aW9u IjogQDEsCiAgICAgICAgIEAiY29tLmFwcGxlLnRyYWNrcGFkLmZvcmNlQ2xpY2siOiBAMSwKKyAg ICAgICAgQCJXZWJLaXRMaW5rZWRPbk9yQWZ0ZXJFdmVyeXRoaW5nIjogQFlFUywKICAgICB9Owog CiAgICAgW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gc2V0VmFsdWVzRm9y S2V5c1dpdGhEaWN0aW9uYXJ5OmRpY3RdOwo=