160788 2016-08-11 17:22:42 -0700 Add WK2 ExperimentalFeature support to MiniBrowser 2016-08-12 08:57:22 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 beidson beidson achristensen lforschler rniwa ryanhaddad sam oldest_to_newest 1219459 0 beidson 2016-08-11 17:22:42 -0700 Add WK2 ExperimentalFeature support to MiniBrowser 1219464 1 285873 beidson 2016-08-11 17:28:27 -0700 Created attachment 285873 Patch 1219465 2 beidson 2016-08-11 17:28:58 -0700 Forgot to mention, also makes Gamepads be an experimental feature. 1219469 3 285873 achristensen 2016-08-11 17:33:35 -0700 Comment on attachment 285873 Patch r+, these should be separate patches. 1219476 4 beidson 2016-08-11 17:37:18 -0700 https://trac.webkit.org/changeset/204396 and https://trac.webkit.org/changeset/204397 1219542 5 rniwa 2016-08-11 22:29:35 -0700 It looks like this patch broke 32-bit Mac builds in which _WKExperimentalFeature is not defined. Maybe WK_API_ENABLED is false there? 1219585 6 beidson 2016-08-12 08:42:02 -0700 (In reply to comment #5) > It looks like this patch broke 32-bit Mac builds in which > _WKExperimentalFeature is not defined. Maybe WK_API_ENABLED is false there? That's accurate. Fixing. 1219591 7 beidson 2016-08-12 08:57:22 -0700 Attempted fix in https://trac.webkit.org/changeset/204411 285873 2016-08-11 17:28:27 -0700 2016-08-11 17:33:35 -0700 Patch bug-160788-20160811172649.patch text/plain 8506 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjA0MzkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOTkwZjMwYTEwMWI2MGY4 YzdkYTRjM2NiN2E3ZjY5Y2I2Mzg5NzQyOS4uYzM1MWJhYzViZjEzN2E2YzY2OTk4ZDEyYjM5ZWI5 NmZlMWVjNzI2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDE2LTA4LTExICBCcmFk eSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgV0syIEV4cGVyaW1l bnRhbEZlYXR1cmUgc3VwcG9ydCB0byBNaW5pQnJvd3Nlci4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MDc4OAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL1dlYlByZWZlcmVuY2VzRGVmaW5p dGlvbnMuaDoKKwogMjAxNi0wOC0xMCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3 ZWJraXQub3JnPgogCiAgICAgICAgIEZpeCBjcmFzaCB3aGVuIGNoYW5naW5nIGNvb2tpZSBhY2Nl cHQgcG9saWN5IGFmdGVyIHIyMDQzMjcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9XZWJQcmVmZXJlbmNlc0RlZmluaXRpb25zLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2Vi UHJlZmVyZW5jZXNEZWZpbml0aW9ucy5oCmluZGV4IGE1MmY2NmMxYmE2NmMxYjQ4NWZiOTdmYjFh OGNiYWY4NTczMmVkNTQuLmI3MjkwMDFmZTYwZDBiNGZjODllMTk4NjI5YWFkMTdhN2M3YmUxMDYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc0RlZmluaXRp b25zLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzRGVmaW5pdGlv bnMuaApAQCAtMjIwLDcgKzIyMCw2IEBACiAgICAgbWFjcm8oSW1hZ2VDb250cm9sc0VuYWJsZWQs IGltYWdlQ29udHJvbHNFbmFibGVkLCBCb29sLCBib29sLCBmYWxzZSwgIiIsICIiKSBcCiAgICAg bWFjcm8oRW5hYmxlSW5oZXJpdFVSSVF1ZXJ5Q29tcG9uZW50LCBlbmFibGVJbmhlcml0VVJJUXVl cnlDb21wb25lbnQsIEJvb2wsIGJvb2wsIGZhbHNlLCAiIiwgIiIpIFwKICAgICBtYWNybyhTZXJ2 aWNlQ29udHJvbHNFbmFibGVkLCBzZXJ2aWNlQ29udHJvbHNFbmFibGVkLCBCb29sLCBib29sLCBm YWxzZSwgIiIsICIiKSBcCi0gICAgbWFjcm8oR2FtZXBhZHNFbmFibGVkLCBnYW1lcGFkc0VuYWJs ZWQsIEJvb2wsIGJvb2wsIGZhbHNlLCAiIiwgIiIpIFwKICAgICBtYWNybyhOZXdCbG9ja0luc2lk ZUlubGluZU1vZGVsRW5hYmxlZCwgbmV3QmxvY2tJbnNpZGVJbmxpbmVNb2RlbEVuYWJsZWQsIEJv b2wsIGJvb2wsIGZhbHNlLCAiIiwgIiIpIFwKICAgICBtYWNybyhIVFRQRXF1aXZFbmFibGVkLCBo dHRwRXF1aXZFbmFibGVkLCBCb29sLCBib29sLCB0cnVlLCAiIiwgIiIpIFwKICAgICBtYWNybyhN b2NrQ2FwdHVyZURldmljZXNFbmFibGVkLCBtb2NrQ2FwdHVyZURldmljZXNFbmFibGVkLCBCb29s LCBib29sLCBmYWxzZSwgIiIsICIiKSBcCkBAIC0yODgsOCArMjg3LDkgQEAKICNkZWZpbmUgRk9S X0VBQ0hfV0VCS0lUX0VYUEVSSU1FTlRBTF9GRUFUVVJFX1BSRUZFUkVOQ0UobWFjcm8pIFwKICAg ICBtYWNybyhDU1NHcmlkTGF5b3V0RW5hYmxlZCwgY3NzR3JpZExheW91dEVuYWJsZWQsIEJvb2ws IGJvb2wsIHRydWUsICJDU1MgR3JpZCIsICJDU1MgR3JpZCBMYXlvdXQgTW9kdWxlIHN1cHBvcnQi KSBcCiAgICAgbWFjcm8oQ3VzdG9tRWxlbWVudHNFbmFibGVkLCBjdXN0b21FbGVtZW50c0VuYWJs ZWQsIEJvb2wsIGJvb2wsIGZhbHNlLCAiQ3VzdG9tIEVsZW1lbnRzIiwgIkhUTUwgQ3VzdG9tIEVs ZW1lbnRzIHByb3RvdHlwZSIpIFwKLSAgICBtYWNybyhXZWJHTDJFbmFibGVkLCB3ZWJHTDJFbmFi bGVkLCBCb29sLCBib29sLCB0cnVlLCAiV2ViR0wgMi4wIiwgIldlYkdMIDIgcHJvdG90eXBlIikg XAorICAgIG1hY3JvKEdhbWVwYWRzRW5hYmxlZCwgZ2FtZXBhZHNFbmFibGVkLCBCb29sLCBib29s LCBmYWxzZSwgIkdhbWVwYWRzIiwgIldlYiBHYW1lcGFkIEFQSSBzdXBwb3J0IikgXAogICAgIG1h Y3JvKFNwcmluZ1RpbWluZ0Z1bmN0aW9uRW5hYmxlZCwgc3ByaW5nVGltaW5nRnVuY3Rpb25FbmFi bGVkLCBCb29sLCBib29sLCB0cnVlLCAiQ1NTIFNwcmluZyBBbmltYXRpb25zIiwgIkNTUyBTcHJp bmcgQW5pbWF0aW9uIHByb3RvdHlwZSIpIFwKKyAgICBtYWNybyhXZWJHTDJFbmFibGVkLCB3ZWJH TDJFbmFibGVkLCBCb29sLCBib29sLCB0cnVlLCAiV2ViR0wgMi4wIiwgIldlYkdMIDIgcHJvdG90 eXBlIikgXAogICAgIFwKIAogI2lmIFBMQVRGT1JNKENPQ09BKQpkaWZmIC0tZ2l0IGEvVG9vbHMv Q2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDc5NDVlNjQ5NmUzODg0NjNhNjU5NjVh ZmM0MDQwNmRjMjZiYzE3NmQuLjVlYTMzZDA2NGRkMGZjMjQwNTllZjcwMzY4NTkzMDQwYWVmYzEz ZjUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyMCBAQAorMjAxNi0wOC0xMSAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5j b20+CisKKyAgICAgICAgQWRkIFdLMiBFeHBlcmltZW50YWxGZWF0dXJlIHN1cHBvcnQgdG8gTWlu aUJyb3dzZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNjA3ODgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIE1pbmlCcm93c2VyL21hYy9BcHBEZWxlZ2F0ZS5oOgorICAgICAgICAqIE1pbmlCcm93c2Vy L21hYy9BcHBEZWxlZ2F0ZS5tOgorICAgICAgICAoZGVmYXVsdENvbmZpZ3VyYXRpb24pOgorICAg ICAgICAoZGVmYXVsdFByZWZlcmVuY2VzKToKKyAgICAgICAgCisgICAgICAgICogTWluaUJyb3dz ZXIvbWFjL1NldHRpbmdzQ29udHJvbGxlci5tOgorICAgICAgICAoLVtTZXR0aW5nc0NvbnRyb2xs ZXIgX3BvcHVsYXRlTWVudV0pOgorICAgICAgICAoLVtTZXR0aW5nc0NvbnRyb2xsZXIgdmFsaWRh dGVNZW51SXRlbTpdKToKKyAgICAgICAgKC1bU2V0dGluZ3NDb250cm9sbGVyIHRvZ2dsZUV4cGVy aW1lbnRhbEZlYXR1cmU6XSk6CisKIDIwMTYtMDgtMTEgIEFha2FzaCBKYWluICA8YWFrYXNoX2ph aW5AYXBwbGUuY29tPgogCiAgICAgICAgIEtlZXAgRVdTIGxvZ3MgZm9yIGxvbmdlcgpkaWZmIC0t Z2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLmggYi9Ub29scy9NaW5pQnJv d3Nlci9tYWMvQXBwRGVsZWdhdGUuaAppbmRleCAwYmI5M2JlNTZmZDM1Yzg3MGRiZGFiNTc0ZjU5 MDhlZDRmMDNjNGM4Li5lNzM5ZGVkYWNlYjcxYWIyMDMwZWY4MzM3OTZhZjFiNTY4MDg2OGE4IDEw MDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQXBwRGVsZWdhdGUuaAorKysgYi9Ub29s cy9NaW5pQnJvd3Nlci9tYWMvQXBwRGVsZWdhdGUuaApAQCAtNDQsMyArNDQsNyBAQCBAcHJvcGVy dHkgKHJlYWRvbmx5KSBXS1VzZXJDb250ZW50Q29udHJvbGxlciAqdXNlckNvbnRlbnRDb250b2xs ZXI7CiAjZW5kaWYKIAogQGVuZAorCisjaWYgV0tfQVBJX0VOQUJMRUQKK1dLUHJlZmVyZW5jZXMg KmRlZmF1bHRQcmVmZXJlbmNlcygpOworI2VuZGlmCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJv d3Nlci9tYWMvQXBwRGVsZWdhdGUubSBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9BcHBEZWxlZ2F0 ZS5tCmluZGV4IDA2NzhhY2FiOGVkYTRjMzA5M2RhZjc2NmZkYjIyODk2YjYwMjViMWIuLjNiZjc1 ZWMyNDA3NGNiNjBiY2M2NTRhZDNiNTYwMTY2ZWIzZTMzY2EgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01p bmlCcm93c2VyL21hYy9BcHBEZWxlZ2F0ZS5tCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9B cHBEZWxlZ2F0ZS5tCkBAIC0zNSw2ICszNSw3IEBACiAjaW1wb3J0IDxXZWJLaXQvV0tXZWJWaWV3 Q29uZmlndXJhdGlvblByaXZhdGUuaD4KICNpbXBvcnQgPFdlYktpdC9XS1dlYnNpdGVEYXRhU3Rv cmVQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV2ViS2l0Lmg+CisjaW1wb3J0IDxXZWJLaXQv X1dLRXhwZXJpbWVudGFsRmVhdHVyZS5oPgogI2ltcG9ydCA8V2ViS2l0L19XS1Byb2Nlc3NQb29s Q29uZmlndXJhdGlvbi5oPgogI2ltcG9ydCA8V2ViS2l0L19XS1VzZXJDb250ZW50RXh0ZW5zaW9u U3RvcmUuaD4KIApAQCAtODEsMTIgKzgyLDI0IEBAIC0gKHZvaWQpYXdha2VGcm9tTmliCiAgICAg ICAgICAgICBjb25maWd1cmF0aW9uLnByb2Nlc3NQb29sID0gW1tbV0tQcm9jZXNzUG9vbCBhbGxv Y10gX2luaXRXaXRoQ29uZmlndXJhdGlvbjpzaW5nbGVQcm9jZXNzQ29uZmlndXJhdGlvbl0gYXV0 b3JlbGVhc2VdOwogICAgICAgICAgICAgW3NpbmdsZVByb2Nlc3NDb25maWd1cmF0aW9uIHJlbGVh c2VdOwogICAgICAgICB9CisKKyAgICAgICAgTlNBcnJheTxfV0tFeHBlcmltZW50YWxGZWF0dXJl ICo+ICpmZWF0dXJlcyA9IFtXS1ByZWZlcmVuY2VzIF9leHBlcmltZW50YWxGZWF0dXJlc107Cisg ICAgICAgIGZvciAoX1dLRXhwZXJpbWVudGFsRmVhdHVyZSAqZmVhdHVyZSBpbiBmZWF0dXJlcykg eworICAgICAgICAgICAgQk9PTCBlbmFibGVkID0gW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVz ZXJEZWZhdWx0c10gYm9vbEZvcktleTpmZWF0dXJlLmtleV07CisgICAgICAgICAgICBbY29uZmln dXJhdGlvbi5wcmVmZXJlbmNlcyBfc2V0RW5hYmxlZDplbmFibGVkIGZvckZlYXR1cmU6ZmVhdHVy ZV07CisgICAgICAgIH0KICAgICB9CiAKICAgICBjb25maWd1cmF0aW9uLnN1cHByZXNzZXNJbmNy ZW1lbnRhbFJlbmRlcmluZyA9IFtTZXR0aW5nc0NvbnRyb2xsZXIgc2hhcmVkXS5pbmNyZW1lbnRh bFJlbmRlcmluZ1N1cHByZXNzZWQ7CiAgICAgY29uZmlndXJhdGlvbi53ZWJzaXRlRGF0YVN0b3Jl Ll9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCA9IFtTZXR0aW5nc0NvbnRyb2xsZXIgc2hh cmVkXS5yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZDsKICAgICByZXR1cm4gY29uZmlndXJh dGlvbjsKIH0KKworV0tQcmVmZXJlbmNlcyAqZGVmYXVsdFByZWZlcmVuY2VzKCkKK3sKKyAgICBy ZXR1cm4gZGVmYXVsdENvbmZpZ3VyYXRpb24oKS5wcmVmZXJlbmNlczsKK30KKwogI2VuZGlmCiAK IApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1NldHRpbmdzQ29udHJvbGxlci5t IGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1NldHRpbmdzQ29udHJvbGxlci5tCmluZGV4IGY1ZTE1 MDEzYjliYTFjYWI2NzQyNDM5YjJkMzgyMmRlNTlkYTA1ODQuLjVkMzhhZWEyNjlmMDlkMDZhYTg1 M2Q5OTJmYTJmYjY2NDBiMGQzN2IgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9T ZXR0aW5nc0NvbnRyb2xsZXIubQorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvU2V0dGluZ3ND b250cm9sbGVyLm0KQEAgLTI3LDYgKzI3LDggQEAKIAogI2ltcG9ydCAiQXBwRGVsZWdhdGUuaCIK ICNpbXBvcnQgIkJyb3dzZXJXaW5kb3dDb250cm9sbGVyLmgiCisjaW1wb3J0IDxXZWJLaXQvV0tQ cmVmZXJlbmNlc1ByaXZhdGUuaD4KKyNpbXBvcnQgPFdlYktpdC9fV0tFeHBlcmltZW50YWxGZWF0 dXJlLmg+CiAKIHN0YXRpYyBOU1N0cmluZyAqIGNvbnN0IGRlZmF1bHRVUkwgPSBAImh0dHA6Ly93 d3cud2Via2l0Lm9yZy8iOwogc3RhdGljIE5TU3RyaW5nICogY29uc3QgRGVmYXVsdFVSTFByZWZl cmVuY2VLZXkgPSBAIkRlZmF1bHRVUkwiOwpAQCAtNTUsNyArNTcsOCBAQAogCiB0eXBlZGVmIE5T X0VOVU0oTlNJbnRlZ2VyLCBEZWJ1Z092ZXJ5bGF5TWVudUl0ZW1UYWcpIHsKICAgICBOb25GYXN0 U2Nyb2xsYWJsZVJlZ2lvbk92ZXJsYXlUYWcgPSAxMDAsCi0gICAgV2hlZWxFdmVudEhhbmRsZXJS ZWdpb25PdmVybGF5VGFnCisgICAgV2hlZWxFdmVudEhhbmRsZXJSZWdpb25PdmVybGF5VGFnLAor ICAgIEV4cGVyaW1lbnRhbEZlYXR1cmVUYWcsCiB9OwogCiBAaW1wbGVtZW50YXRpb24gU2V0dGlu Z3NDb250cm9sbGVyCkBAIC0xNDAsNiArMTQzLDI0IEBAIC0gKHZvaWQpX3BvcHVsYXRlTWVudQog ICAgIFtfbWVudSBhZGRJdGVtOmRlYnVnT3ZlcmxheXNTdWJtZW51SXRlbV07CiAgICAgW2RlYnVn T3ZlcmxheXNTdWJtZW51SXRlbSByZWxlYXNlXTsKIAorICAgIE5TTWVudUl0ZW0gKmV4cGVyaW1l bnRhbEZlYXR1cmVzU3VibWVudUl0ZW0gPSBbW05TTWVudUl0ZW0gYWxsb2NdIGluaXRXaXRoVGl0 bGU6QCJFeHBlcmltZW50YWwgRmVhdHVyZXMiIGFjdGlvbjpuaWwga2V5RXF1aXZhbGVudDpAIiJd OworICAgIE5TTWVudSAqZXhwZXJpbWVudGFsRmVhdHVyZXNNZW51ID0gW1tOU01lbnUgYWxsb2Nd IGluaXRXaXRoVGl0bGU6QCJFeHBlcmltZW50YWwgRmVhdHVyZXMiXTsKKyAgICBbZXhwZXJpbWVu dGFsRmVhdHVyZXNTdWJtZW51SXRlbSBzZXRTdWJtZW51OmV4cGVyaW1lbnRhbEZlYXR1cmVzTWVu dV07CisKKyAgICBOU0FycmF5PF9XS0V4cGVyaW1lbnRhbEZlYXR1cmUgKj4gKmZlYXR1cmVzID0g W1dLUHJlZmVyZW5jZXMgX2V4cGVyaW1lbnRhbEZlYXR1cmVzXTsKKworICAgIGZvciAoX1dLRXhw ZXJpbWVudGFsRmVhdHVyZSAqZmVhdHVyZSBpbiBmZWF0dXJlcykgeworICAgICAgICBOU01lbnVJ dGVtICppdGVtID0gW1tOU01lbnVJdGVtIGFsbG9jXSBpbml0V2l0aFRpdGxlOmZlYXR1cmUubmFt ZSBhY3Rpb246QHNlbGVjdG9yKHRvZ2dsZUV4cGVyaW1lbnRhbEZlYXR1cmU6KSBrZXlFcXVpdmFs ZW50OkAiIl07CisgICAgICAgIGl0ZW0ucmVwcmVzZW50ZWRPYmplY3QgPSBmZWF0dXJlOworCisg ICAgICAgIFtpdGVtIHNldFRhZzpFeHBlcmltZW50YWxGZWF0dXJlVGFnXTsKKyAgICAgICAgW2l0 ZW0gc2V0VGFyZ2V0OnNlbGZdOworICAgICAgICBbZXhwZXJpbWVudGFsRmVhdHVyZXNNZW51IGFk ZEl0ZW06W2l0ZW0gYXV0b3JlbGVhc2VdXTsKKyAgICB9CisKKyAgICBbX21lbnUgYWRkSXRlbTpl eHBlcmltZW50YWxGZWF0dXJlc1N1Ym1lbnVJdGVtXTsKKyAgICBbZXhwZXJpbWVudGFsRmVhdHVy ZXNTdWJtZW51SXRlbSByZWxlYXNlXTsKKwogICAgIFtzZWxmIF9hZGRIZWFkZXJXaXRoVGl0bGU6 QCJXZWJLaXQxLW9ubHkgU2V0dGluZ3MiXTsKICAgICBbc2VsZiBfYWRkSXRlbVdpdGhUaXRsZTpA IkVuYWJsZSBTdWJwaXhlbCBDU1NPTSBNZXRyaWNzIiBhY3Rpb246QHNlbGVjdG9yKHRvZ2dsZUVu YWJsZVN1YlBpeGVsQ1NTT01NZXRyaWNzOikgaW5kZW50ZWQ6WUVTXTsKIH0KQEAgLTE3OSw2ICsy MDAsMTEgQEAgLSAoQk9PTCl2YWxpZGF0ZU1lbnVJdGVtOihOU01lbnVJdGVtICopbWVudUl0ZW0K ICAgICBlbHNlIGlmIChhY3Rpb24gPT0gQHNlbGVjdG9yKHRvZ2dsZURlYnVnT3ZlcmxheTopKQog ICAgICAgICBbbWVudUl0ZW0gc2V0U3RhdGU6W3NlbGYgZGVidWdPdmVybGF5VmlzaWJsZTptZW51 SXRlbV0gPyBOU09uU3RhdGUgOiBOU09mZlN0YXRlXTsKIAorICAgIGlmIChtZW51SXRlbS50YWcg PT0gRXhwZXJpbWVudGFsRmVhdHVyZVRhZykgeworICAgICAgICBfV0tFeHBlcmltZW50YWxGZWF0 dXJlICpmZWF0dXJlID0gbWVudUl0ZW0ucmVwcmVzZW50ZWRPYmplY3Q7CisgICAgICAgIFttZW51 SXRlbSBzZXRTdGF0ZTpbZGVmYXVsdFByZWZlcmVuY2VzKCkgX2lzRW5hYmxlZEZvckZlYXR1cmU6 ZmVhdHVyZV0gPyBOU09uU3RhdGUgOiBOU09mZlN0YXRlXTsKKyAgICB9CisKICAgICByZXR1cm4g WUVTOwogfQogCkBAIC0zNjksNiArMzk1LDE3IEBAIC0gKHZvaWQpdG9nZ2xlRGVidWdPdmVybGF5 OihpZClzZW5kZXIKICAgICAgICAgW3NlbGYgX3RvZ2dsZUJvb2xlYW5EZWZhdWx0OnByZWZlcmVu Y2VLZXldOwogfQogCistICh2b2lkKXRvZ2dsZUV4cGVyaW1lbnRhbEZlYXR1cmU6KGlkKXNlbmRl cgoreworICAgIF9XS0V4cGVyaW1lbnRhbEZlYXR1cmUgKmZlYXR1cmUgPSAoKE5TTWVudUl0ZW0g KilzZW5kZXIpLnJlcHJlc2VudGVkT2JqZWN0OworICAgIFdLUHJlZmVyZW5jZXMgKnByZWZlcmVu Y2VzID0gZGVmYXVsdFByZWZlcmVuY2VzKCk7CisKKyAgICBCT09MIGN1cnJlbnRseUVuYWJsZWQg PSBbcHJlZmVyZW5jZXMgX2lzRW5hYmxlZEZvckZlYXR1cmU6ZmVhdHVyZV07CisgICAgW3ByZWZl cmVuY2VzIF9zZXRFbmFibGVkOiFjdXJyZW50bHlFbmFibGVkIGZvckZlYXR1cmU6ZmVhdHVyZV07 CisKKyAgICBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBzZXRCb29sOiFj dXJyZW50bHlFbmFibGVkIGZvcktleTpmZWF0dXJlLmtleV07Cit9CisKIC0gKEJPT0wpZGVidWdP dmVybGF5VmlzaWJsZTooTlNNZW51SXRlbSAqKW1lbnVJdGVtCiB7CiAgICAgTlNTdHJpbmcgKnBy ZWZlcmVuY2VLZXkgPSBbc2VsZiBwcmVmZXJlbmNlS2V5Rm9yUmVnaW9uT3ZlcmxheVRhZzpbbWVu dUl0ZW0gdGFnXV07Cg==