178615 2017-10-20 21:44:41 -0700 [Mac] Web Automation: key modifiers for synthesized NSEvents are incorrect 2017-10-23 18:17:04 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg bburg commit-queue inspector-bugzilla-changes joepeck oldest_to_newest 1362983 0 bburg 2017-10-20 21:44:41 -0700 Make this code more like iOS and GTK. 1362987 1 324487 bburg 2017-10-20 21:52:26 -0700 Created attachment 324487 Patch 1363479 2 324487 joepeck 2017-10-23 17:14:15 -0700 Comment on attachment 324487 Patch r=me 1363509 3 324487 commit-queue 2017-10-23 18:17:03 -0700 Comment on attachment 324487 Patch Clearing flags on attachment: 324487 Committed r223869: <https://trac.webkit.org/changeset/223869> 1363510 4 commit-queue 2017-10-23 18:17:04 -0700 All reviewed patches have been landed. Closing bug. 324487 2017-10-20 21:52:26 -0700 2017-10-23 18:17:03 -0700 Patch bug-178615-20171020215225.patch text/plain 10062 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzNjExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDAyNWM2MTVmM2FmNzBhMjdi MjNmZmRjZmM4ZDEwYmM1NjVkMTJlOTAuLjVhODAwM2FjZWNhYzc4NzU4ZmY1OGE3NjMyNjg0YWY5 MDAyNmVmNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTctMTAtMjAgIEJyaWFuIEJ1 cmcgIDxiYnVyZ0BhcHBsZS5jb20+CisKKyAgICAgICAgW01hY10gV2ViIEF1dG9tYXRpb246IGtl eSBtb2RpZmllcnMgZm9yIHN5bnRoZXNpemVkIE5TRXZlbnRzIGFyZSBpbmNvcnJlY3QKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3ODYxNQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGJvdGggUExBVEZP Uk0oTUFDKSBwbGF0Zm9ybSBtZXRob2RzIGZvciBzaW11bGF0aW5nIGtleWJvYXJkIGludGVyYWN0 aW9ucywKKyAgICAgICAgd2UgZXJyYW50bHkgcmVsaWVkIG9uICtbTlNFdmVudCBtb2RpZmllckZs YWdzXSB0byBnZXQgdGhlIGN1cnJlbnQgc3RhdGUgb2YKKyAgICAgICAgc3RpY2t5IG1vZGlmaWVy cyB3aGVuIGNyZWF0aW5nIHN5bnRoZXNpemVkIGV2ZW50cy4gVGhpcyBpcyBpbmNvcnJlY3QgZm9y IHR3byByZWFzb25zOgorICAgICAgICBtb2RpZmllckZsYWdzIGlzIG5ldmVyIHVwZGF0ZWQgd2hl biBzaW11bGF0aW5nIGEgc2VxdWVuY2Ugb2YgZXZlbnRzIChiZWNhdXNlCisgICAgICAgIGFsbCB0 aGUgZXZlbnRzIGFyZSBzeW50aGVzaXplZCBiZWZvcmUgYW55IGFyZSBkZWxpdmVyZWQpOyBhbmQg dGhlIE5TRXZlbnQgY2xhc3MKKyAgICAgICAgbWV0aG9kIG9ubHkgcmVmbGVjdHMgdGhlIG1vZGlm aWVyIHN0YXRlIG9mIHRoZSBwcmltYXJ5IHBoeXNpY2FsIGtleWJvYXJkLCB3aGljaAorICAgICAg ICBpcyBub3QgYWZmZWN0ZWQgYnkgc3ludGhlc2l6ZWQgTlNFdmVudHMgdGhhdCBoYXBwZW4gdG8g aGF2ZSBtb2RpZmllciBmbGFncy4KKworICAgICAgICBJbnN0ZWFkLCBqdXN0IGtlZXAgb3VyIG93 biBtX2N1cnJlbnRNb2RpZmllcnMgc3RhdGUgaW4gdGhlIHNlc3Npb24gYW5kIGNvbXB1dGUKKyAg ICAgICAgdGhlIG5lY2Vzc2FyeSBOU0V2ZW50TW9kaWZpZXJGbGFncyB0byBwdXQgb24gZWFjaCBz eW50aGVzaXplZCBldmVudC4gVGhpcyBhbGlnbnMKKyAgICAgICAgdGhlIGltcGxlbWVudGF0aW9u IHdpdGggdGhlIHRyZWF0bWVudCBvZiBzdGlja3kga2V5cyBpbiB0aGUgaU9TIGFuZCBHVEsgcGxh dGZvcm0gbWV0aG9kcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9t YXRpb25TZXNzaW9uLmg6IEV2ZXJ5IHBvcnQgZ2V0cyB0aGlzIHZhcmlhYmxlIG5vdy4KKyAgICAg ICAgKiBVSVByb2Nlc3MvQXV0b21hdGlvbi9tYWMvV2ViQXV0b21hdGlvblNlc3Npb25NYWMubW06 CisgICAgICAgIChXZWJLaXQ6OldlYkF1dG9tYXRpb25TZXNzaW9uOjpwbGF0Zm9ybVNpbXVsYXRl S2V5U3Ryb2tlKToKKyAgICAgICAgKFdlYktpdDo6V2ViQXV0b21hdGlvblNlc3Npb246OnBsYXRm b3JtU2ltdWxhdGVLZXlTZXF1ZW5jZSk6CisgICAgICAgIFVzZSBhbmQgdXBkYXRlIG1fY3VycmVu dE1vZGlmaWVycy4KKwogMjAxNy0xMC0xOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29t PgogCiAgICAgICAgIFVucmV2aWV3ZWQsIGZpeCBidWlsZCBlcnJvciBhZnRlciByMjIzNjA4IHdp dGggc29tZSBTREtzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21h dGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0 b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5oCmluZGV4IDhiOTA5NzFhOTgyZjE5MTJkOWYx NWY5NTdhYzg3OWM2M2IyODBiMjEuLjYwNGNhMGRhMjFkOWU1ZDFmMDY5MGExNGE0ZmE1OWZmZTgw NTRiOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2Vi QXV0b21hdGlvblNlc3Npb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0 aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmgKQEAgLTI1OSwxNiArMjU5LDE1IEBAIHByaXZhdGU6 CiAKICAgICBib29sIG1fcGVybWlzc2lvbkZvckdldFVzZXJNZWRpYSB7IHRydWUgfTsKIAotI2lm IEVOQUJMRShSRU1PVEVfSU5TUEVDVE9SKQotICAgIEluc3BlY3Rvcjo6RnJvbnRlbmRDaGFubmVs KiBtX3JlbW90ZUNoYW5uZWwgeyBudWxscHRyIH07Ci0jZW5kaWYKIAotI2lmIFBMQVRGT1JNKElP UykgfHwgUExBVEZPUk0oR1RLKQogICAgIC8vIEtlZXAgdHJhY2sgb2YgY3VycmVudGx5IGFjdGl2 ZSBtb2RpZmllcnMgYWNyb3NzIG11bHRpcGxlIGtleXN0cm9rZXMuCi0gICAgLy8gV2UgZG9uJ3Qg c3ludGhlc2l6ZSBwbGF0Zm9ybSBrZXlib2FyZCBldmVudHMgb24gaU9TLCBzbyB3ZSBuZWVkIHRv IHRyYWNrIGl0IG91cnNlbHZlcy4KLSAgICAvLyBHVEsrIGRvZXNuJ3Qga2VlcCB0cmFjayBvZiB0 aGUgYWN0aXZlIG1vZGlmaWVycyB3aGVuIHVzaW5nIHN5bnRoZXNpemVkIGV2ZW50cy4KKyAgICAv LyBNb3N0IHBsYXRmb3JtcyBkbyBub3QgdHJhY2sgY3VycmVudCBtb2RpZmllcnMgZnJvbSBzeW50 aGVzaXplZCBldmVudHMuCiAgICAgdW5zaWduZWQgbV9jdXJyZW50TW9kaWZpZXJzIHsgMCB9Owor CisjaWYgRU5BQkxFKFJFTU9URV9JTlNQRUNUT1IpCisgICAgSW5zcGVjdG9yOjpGcm9udGVuZENo YW5uZWwqIG1fcmVtb3RlQ2hhbm5lbCB7IG51bGxwdHIgfTsKICNlbmRpZgorCiB9OwogCiB9IC8v IG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1 dG9tYXRpb24vbWFjL1dlYkF1dG9tYXRpb25TZXNzaW9uTWFjLm1tIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQXV0b21hdGlvbi9tYWMvV2ViQXV0b21hdGlvblNlc3Npb25NYWMubW0KaW5kZXgg MDBiMDIwMzNjNDRjY2Q2NTMzY2FjNmNjN2FiODYwMzMyMDAyYmE3Zi4uZTQ5ODY1MTgyYmM0YTI2 MDk5NDYxOTIxNzZhMWI2NDFmMWZhZWY1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQXV0b21hdGlvbi9tYWMvV2ViQXV0b21hdGlvblNlc3Npb25NYWMubW0KKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9tYWMvV2ViQXV0b21hdGlvblNlc3Npb25N YWMubW0KQEAgLTQ0NSw5ICs0NDUsNiBAQCB2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjpwbGF0 Zm9ybVNpbXVsYXRlS2V5U3Ryb2tlKFdlYlBhZ2VQcm94eSYgcGFnZSwgSW5zcGVjdAogCiAgICAg YXV0byBldmVudHNUb0JlU2VudCA9IGFkb3B0TlMoW1tOU011dGFibGVBcnJheSBhbGxvY10gaW5p dF0pOwogCi0gICAgTlNFdmVudE1vZGlmaWVyRmxhZ3MgZXhpc3RpbmdNb2RpZmllcnMgPSBbTlNF dmVudCBtb2RpZmllckZsYWdzXTsKLSAgICBOU0V2ZW50TW9kaWZpZXJGbGFncyB1cGRhdGVkTW9k aWZpZXJzID0gMDsKLQogICAgIC8vIEZJWE1FOiB0aGlzIHRpbWVzdGFtcCBpcyBub3QgZXZlbiBj bG9zZSB0byBtYXRjaGluZyBuYXRpdmUgZXZlbnRzLiBGaW5kIG91dCBob3cgdG8gZ2V0IGNsb3Nl ci4KICAgICBOU1RpbWVJbnRlcnZhbCB0aW1lc3RhbXAgPSBbTlNEYXRlIHRpbWVJbnRlcnZhbFNp bmNlUmVmZXJlbmNlRGF0ZV07CiAgICAgTlNXaW5kb3cgKndpbmRvdyA9IHBhZ2UucGxhdGZvcm1X aW5kb3coKTsKQEAgLTQ1NywxNCArNDU0LDE0IEBAIHZvaWQgV2ViQXV0b21hdGlvblNlc3Npb246 OnBsYXRmb3JtU2ltdWxhdGVLZXlTdHJva2UoV2ViUGFnZVByb3h5JiBwYWdlLCBJbnNwZWN0CiAg ICAgc3dpdGNoIChpbnRlcmFjdGlvbikgewogICAgIGNhc2UgSW5zcGVjdG9yOjpQcm90b2NvbDo6 QXV0b21hdGlvbjo6S2V5Ym9hcmRJbnRlcmFjdGlvblR5cGU6OktleVByZXNzOiB7CiAgICAgICAg IE5TRXZlbnRUeXBlIGV2ZW50VHlwZSA9IGlzU3RpY2t5TW9kaWZpZXIgPyBOU0V2ZW50VHlwZUZs YWdzQ2hhbmdlZCA6IE5TRXZlbnRUeXBlS2V5RG93bjsKLSAgICAgICAgdXBkYXRlZE1vZGlmaWVy cyA9IGV4aXN0aW5nTW9kaWZpZXJzIHwgY2hhbmdlZE1vZGlmaWVyczsKLSAgICAgICAgW2V2ZW50 c1RvQmVTZW50IGFkZE9iamVjdDpbTlNFdmVudCBrZXlFdmVudFdpdGhUeXBlOmV2ZW50VHlwZSBs b2NhdGlvbjpldmVudFBvc2l0aW9uIG1vZGlmaWVyRmxhZ3M6dXBkYXRlZE1vZGlmaWVycyB0aW1l c3RhbXA6dGltZXN0YW1wIHdpbmRvd051bWJlcjp3aW5kb3dOdW1iZXIgY29udGV4dDpuaWwgY2hh cmFjdGVyczpjaGFyYWN0ZXJzIGNoYXJhY3RlcnNJZ25vcmluZ01vZGlmaWVyczp1bm1vZGlmaWVk Q2hhcmFjdGVycyBpc0FSZXBlYXQ6Tk8ga2V5Q29kZTprZXlDb2RlXV07CisgICAgICAgIG1fY3Vy cmVudE1vZGlmaWVycyB8PSBjaGFuZ2VkTW9kaWZpZXJzOworICAgICAgICBbZXZlbnRzVG9CZVNl bnQgYWRkT2JqZWN0OltOU0V2ZW50IGtleUV2ZW50V2l0aFR5cGU6ZXZlbnRUeXBlIGxvY2F0aW9u OmV2ZW50UG9zaXRpb24gbW9kaWZpZXJGbGFnczptX2N1cnJlbnRNb2RpZmllcnMgdGltZXN0YW1w OnRpbWVzdGFtcCB3aW5kb3dOdW1iZXI6d2luZG93TnVtYmVyIGNvbnRleHQ6bmlsIGNoYXJhY3Rl cnM6Y2hhcmFjdGVycyBjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnM6dW5tb2RpZmllZENoYXJh Y3RlcnMgaXNBUmVwZWF0Ok5PIGtleUNvZGU6a2V5Q29kZV1dOwogICAgICAgICBicmVhazsKICAg ICB9CiAgICAgY2FzZSBJbnNwZWN0b3I6OlByb3RvY29sOjpBdXRvbWF0aW9uOjpLZXlib2FyZElu dGVyYWN0aW9uVHlwZTo6S2V5UmVsZWFzZTogewogICAgICAgICBOU0V2ZW50VHlwZSBldmVudFR5 cGUgPSBpc1N0aWNreU1vZGlmaWVyID8gTlNFdmVudFR5cGVGbGFnc0NoYW5nZWQgOiBOU0V2ZW50 VHlwZUtleVVwOwotICAgICAgICB1cGRhdGVkTW9kaWZpZXJzID0gZXhpc3RpbmdNb2RpZmllcnMg JiB+Y2hhbmdlZE1vZGlmaWVyczsKLSAgICAgICAgW2V2ZW50c1RvQmVTZW50IGFkZE9iamVjdDpb TlNFdmVudCBrZXlFdmVudFdpdGhUeXBlOmV2ZW50VHlwZSBsb2NhdGlvbjpldmVudFBvc2l0aW9u IG1vZGlmaWVyRmxhZ3M6dXBkYXRlZE1vZGlmaWVycyB0aW1lc3RhbXA6dGltZXN0YW1wIHdpbmRv d051bWJlcjp3aW5kb3dOdW1iZXIgY29udGV4dDpuaWwgY2hhcmFjdGVyczpjaGFyYWN0ZXJzIGNo YXJhY3RlcnNJZ25vcmluZ01vZGlmaWVyczp1bm1vZGlmaWVkQ2hhcmFjdGVycyBpc0FSZXBlYXQ6 Tk8ga2V5Q29kZTprZXlDb2RlXV07CisgICAgICAgIG1fY3VycmVudE1vZGlmaWVycyAmPSB+Y2hh bmdlZE1vZGlmaWVyczsKKyAgICAgICAgW2V2ZW50c1RvQmVTZW50IGFkZE9iamVjdDpbTlNFdmVu dCBrZXlFdmVudFdpdGhUeXBlOmV2ZW50VHlwZSBsb2NhdGlvbjpldmVudFBvc2l0aW9uIG1vZGlm aWVyRmxhZ3M6bV9jdXJyZW50TW9kaWZpZXJzIHRpbWVzdGFtcDp0aW1lc3RhbXAgd2luZG93TnVt YmVyOndpbmRvd051bWJlciBjb250ZXh0Om5pbCBjaGFyYWN0ZXJzOmNoYXJhY3RlcnMgY2hhcmFj dGVyc0lnbm9yaW5nTW9kaWZpZXJzOnVubW9kaWZpZWRDaGFyYWN0ZXJzIGlzQVJlcGVhdDpOTyBr ZXlDb2RlOmtleUNvZGVdXTsKICAgICAgICAgYnJlYWs7CiAgICAgfQogICAgIGNhc2UgSW5zcGVj dG9yOjpQcm90b2NvbDo6QXV0b21hdGlvbjo6S2V5Ym9hcmRJbnRlcmFjdGlvblR5cGU6Okluc2Vy dEJ5S2V5OiB7CkBAIC00NzMsOSArNDcwLDkgQEAgdm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6 cGxhdGZvcm1TaW11bGF0ZUtleVN0cm9rZShXZWJQYWdlUHJveHkmIHBhZ2UsIEluc3BlY3QKICAg ICAgICAgaWYgKGlzU3RpY2t5TW9kaWZpZXIpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAg ICAgdXBkYXRlZE1vZGlmaWVycyA9IGV4aXN0aW5nTW9kaWZpZXJzIHwgY2hhbmdlZE1vZGlmaWVy czsKLSAgICAgICAgW2V2ZW50c1RvQmVTZW50IGFkZE9iamVjdDpbTlNFdmVudCBrZXlFdmVudFdp dGhUeXBlOk5TRXZlbnRUeXBlS2V5RG93biBsb2NhdGlvbjpldmVudFBvc2l0aW9uIG1vZGlmaWVy RmxhZ3M6dXBkYXRlZE1vZGlmaWVycyB0aW1lc3RhbXA6dGltZXN0YW1wIHdpbmRvd051bWJlcjp3 aW5kb3dOdW1iZXIgY29udGV4dDpuaWwgY2hhcmFjdGVyczpjaGFyYWN0ZXJzIGNoYXJhY3RlcnNJ Z25vcmluZ01vZGlmaWVyczp1bm1vZGlmaWVkQ2hhcmFjdGVycyBpc0FSZXBlYXQ6Tk8ga2V5Q29k ZTprZXlDb2RlXV07Ci0gICAgICAgIFtldmVudHNUb0JlU2VudCBhZGRPYmplY3Q6W05TRXZlbnQg a2V5RXZlbnRXaXRoVHlwZTpOU0V2ZW50VHlwZUtleVVwIGxvY2F0aW9uOmV2ZW50UG9zaXRpb24g bW9kaWZpZXJGbGFnczp1cGRhdGVkTW9kaWZpZXJzIHRpbWVzdGFtcDp0aW1lc3RhbXAgd2luZG93 TnVtYmVyOndpbmRvd051bWJlciBjb250ZXh0Om5pbCBjaGFyYWN0ZXJzOmNoYXJhY3RlcnMgY2hh cmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzOnVubW9kaWZpZWRDaGFyYWN0ZXJzIGlzQVJlcGVhdDpO TyBrZXlDb2RlOmtleUNvZGVdXTsKKyAgICAgICAgbV9jdXJyZW50TW9kaWZpZXJzIHw9IGNoYW5n ZWRNb2RpZmllcnM7CisgICAgICAgIFtldmVudHNUb0JlU2VudCBhZGRPYmplY3Q6W05TRXZlbnQg a2V5RXZlbnRXaXRoVHlwZTpOU0V2ZW50VHlwZUtleURvd24gbG9jYXRpb246ZXZlbnRQb3NpdGlv biBtb2RpZmllckZsYWdzOm1fY3VycmVudE1vZGlmaWVycyB0aW1lc3RhbXA6dGltZXN0YW1wIHdp bmRvd051bWJlcjp3aW5kb3dOdW1iZXIgY29udGV4dDpuaWwgY2hhcmFjdGVyczpjaGFyYWN0ZXJz IGNoYXJhY3RlcnNJZ25vcmluZ01vZGlmaWVyczp1bm1vZGlmaWVkQ2hhcmFjdGVycyBpc0FSZXBl YXQ6Tk8ga2V5Q29kZTprZXlDb2RlXV07CisgICAgICAgIFtldmVudHNUb0JlU2VudCBhZGRPYmpl Y3Q6W05TRXZlbnQga2V5RXZlbnRXaXRoVHlwZTpOU0V2ZW50VHlwZUtleVVwIGxvY2F0aW9uOmV2 ZW50UG9zaXRpb24gbW9kaWZpZXJGbGFnczptX2N1cnJlbnRNb2RpZmllcnMgdGltZXN0YW1wOnRp bWVzdGFtcCB3aW5kb3dOdW1iZXI6d2luZG93TnVtYmVyIGNvbnRleHQ6bmlsIGNoYXJhY3RlcnM6 Y2hhcmFjdGVycyBjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnM6dW5tb2RpZmllZENoYXJhY3Rl cnMgaXNBUmVwZWF0Ok5PIGtleUNvZGU6a2V5Q29kZV1dOwogICAgICAgICBicmVhazsKICAgICB9 CiAgICAgfQpAQCAtNTM1LDcgKzUzMiw2IEBAIHZvaWQgV2ViQXV0b21hdGlvblNlc3Npb246OnBs YXRmb3JtU2ltdWxhdGVLZXlTZXF1ZW5jZShXZWJQYWdlUHJveHkmIHBhZ2UsIGNvbnN0CiAgICAg Ly8gVGhpcyBBUEkgc2hvdWxkIG1vdmUgbW9yZSB0b3dhcmRzIHRoYXQgZGlyZWN0aW9uIGluIHRo ZSBmdXR1cmUuCiAgICAgTlNTdHJpbmcgKnRleHQgPSBrZXlTZXF1ZW5jZTsKIAotICAgIE5TRXZl bnRNb2RpZmllckZsYWdzIG1vZGlmaWVycyA9IFtOU0V2ZW50IG1vZGlmaWVyRmxhZ3NdOwogICAg IE5TVGltZUludGVydmFsIHRpbWVzdGFtcCA9IFtOU0RhdGUgdGltZUludGVydmFsU2luY2VSZWZl cmVuY2VEYXRlXTsKICAgICBOU1dpbmRvdyAqd2luZG93ID0gcGFnZS5wbGF0Zm9ybVdpbmRvdygp OwogICAgIE5TSW50ZWdlciB3aW5kb3dOdW1iZXIgPSB3aW5kb3cud2luZG93TnVtYmVyOwpAQCAt NTQ2LDkgKzU0Miw5IEBAIHZvaWQgV2ViQXV0b21hdGlvblNlc3Npb246OnBsYXRmb3JtU2ltdWxh dGVLZXlTZXF1ZW5jZShXZWJQYWdlUHJveHkmIHBhZ2UsIGNvbnN0CiAgICAgICAgIC8vIEZvciBB U0NJSSBjaGFyYWN0ZXJzIHRoYXQgYXJlIHByb2R1Y2VkIHVzaW5nIFNoaWZ0IG9uIGEgVVMtMTA4 IGtleSBrZXlib2FyZCBsYXlvdXQsCiAgICAgICAgIC8vIFdlYkRyaXZlciBleHBlY3RzIHRoZXNl IHRvIGJlIGRlbGl2ZXJlZCBhcyBbc2hpZnQtZG93biwga2V5LWRvd24sIGtleS11cCwgc2hpZnQt dXBdCiAgICAgICAgIC8vIGtleXN0cm9rZXMgdW5sZXNzIHRoZSBzaGlmdCBrZXkgaXMgYWxyZWFk eSBwcmVzc2VkIGRvd24gZnJvbSBhbiBlYXJsaWVyIGludGVyYWN0aW9uLgotICAgICAgICBCT09M IHNoaWZ0QWxyZWFkeVByZXNzZWQgPSBtb2RpZmllcnMgJiBOU0V2ZW50TW9kaWZpZXJGbGFnU2hp ZnQ7CisgICAgICAgIEJPT0wgc2hpZnRBbHJlYWR5UHJlc3NlZCA9IG1fY3VycmVudE1vZGlmaWVy cyAmIE5TRXZlbnRNb2RpZmllckZsYWdTaGlmdDsKICAgICAgICAgQk9PTCBzaG91bGRQcmVzc1No aWZ0ID0gIXNoaWZ0QWxyZWFkeVByZXNzZWQgJiYgc3Vic3RyaW5nUmFuZ2UubGVuZ3RoID09IDEg JiYgY2hhcmFjdGVySXNQcm9kdWNlZFVzaW5nU2hpZnQoc3Vic3RyaW5nKTsKLSAgICAgICAgTlNF dmVudE1vZGlmaWVyRmxhZ3MgbW9kaWZpZXJzRm9yS2V5c3Ryb2tlID0gc2hvdWxkUHJlc3NTaGlm dCA/IG1vZGlmaWVycyB8IE5TRXZlbnRNb2RpZmllckZsYWdTaGlmdCA6IG1vZGlmaWVyczsKKyAg ICAgICAgTlNFdmVudE1vZGlmaWVyRmxhZ3MgbW9kaWZpZXJzRm9yS2V5c3Ryb2tlID0gc2hvdWxk UHJlc3NTaGlmdCA/IG1fY3VycmVudE1vZGlmaWVycyB8IE5TRXZlbnRNb2RpZmllckZsYWdTaGlm dCA6IG1fY3VycmVudE1vZGlmaWVyczsKIAogICAgICAgICBpZiAoc2hvdWxkUHJlc3NTaGlmdCkK ICAgICAgICAgICAgIFtldmVudHNUb0JlU2VudCBhZGRPYmplY3Q6W05TRXZlbnQga2V5RXZlbnRX aXRoVHlwZTpOU0V2ZW50VHlwZUZsYWdzQ2hhbmdlZCBsb2NhdGlvbjpldmVudFBvc2l0aW9uIG1v ZGlmaWVyRmxhZ3M6bW9kaWZpZXJzRm9yS2V5c3Ryb2tlIHRpbWVzdGFtcDp0aW1lc3RhbXAgd2lu ZG93TnVtYmVyOndpbmRvd051bWJlciBjb250ZXh0Om5pbCBjaGFyYWN0ZXJzOkAiIiBjaGFyYWN0 ZXJzSWdub3JpbmdNb2RpZmllcnM6QCIiIGlzQVJlcGVhdDpOTyBrZXlDb2RlOmtWS19TaGlmdF1d OwpAQCAtNTU3LDcgKzU1Myw3IEBAIHZvaWQgV2ViQXV0b21hdGlvblNlc3Npb246OnBsYXRmb3Jt U2ltdWxhdGVLZXlTZXF1ZW5jZShXZWJQYWdlUHJveHkmIHBhZ2UsIGNvbnN0CiAgICAgICAgIFtl dmVudHNUb0JlU2VudCBhZGRPYmplY3Q6W05TRXZlbnQga2V5RXZlbnRXaXRoVHlwZTpOU0V2ZW50 VHlwZUtleVVwIGxvY2F0aW9uOmV2ZW50UG9zaXRpb24gbW9kaWZpZXJGbGFnczptb2RpZmllcnNG b3JLZXlzdHJva2UgdGltZXN0YW1wOnRpbWVzdGFtcCB3aW5kb3dOdW1iZXI6d2luZG93TnVtYmVy IGNvbnRleHQ6bmlsIGNoYXJhY3RlcnM6c3Vic3RyaW5nIGNoYXJhY3RlcnNJZ25vcmluZ01vZGlm aWVyczpzdWJzdHJpbmcgaXNBUmVwZWF0Ok5PIGtleUNvZGU6MF1dOwogICAgICAgICAKICAgICAg ICAgaWYgKHNob3VsZFByZXNzU2hpZnQpCi0gICAgICAgICAgICBbZXZlbnRzVG9CZVNlbnQgYWRk T2JqZWN0OltOU0V2ZW50IGtleUV2ZW50V2l0aFR5cGU6TlNFdmVudFR5cGVGbGFnc0NoYW5nZWQg bG9jYXRpb246ZXZlbnRQb3NpdGlvbiBtb2RpZmllckZsYWdzOm1vZGlmaWVycyB0aW1lc3RhbXA6 dGltZXN0YW1wIHdpbmRvd051bWJlcjp3aW5kb3dOdW1iZXIgY29udGV4dDpuaWwgY2hhcmFjdGVy czpAIiIgY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzOkAiIiBpc0FSZXBlYXQ6Tk8ga2V5Q29k ZTprVktfU2hpZnRdXTsKKyAgICAgICAgICAgIFtldmVudHNUb0JlU2VudCBhZGRPYmplY3Q6W05T RXZlbnQga2V5RXZlbnRXaXRoVHlwZTpOU0V2ZW50VHlwZUZsYWdzQ2hhbmdlZCBsb2NhdGlvbjpl dmVudFBvc2l0aW9uIG1vZGlmaWVyRmxhZ3M6bV9jdXJyZW50TW9kaWZpZXJzIHRpbWVzdGFtcDp0 aW1lc3RhbXAgd2luZG93TnVtYmVyOndpbmRvd051bWJlciBjb250ZXh0Om5pbCBjaGFyYWN0ZXJz OkAiIiBjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnM6QCIiIGlzQVJlcGVhdDpOTyBrZXlDb2Rl OmtWS19TaGlmdF1dOwogICAgIH1dOwogCiAgICAgc2VuZFN5bnRoZXNpemVkRXZlbnRzVG9QYWdl KHBhZ2UsIGV2ZW50c1RvQmVTZW50LmdldCgpKTsK