157689 2016-05-13 15:37:18 -0700 Remove unused initializer for WebEvent on iOS 2016-06-02 15:50:44 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified iOS 9.3 RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=158323 P2 Normal --- 157695 1 enrica webkit-unassigned commit-queue ryanhaddad oldest_to_newest 1192924 0 enrica 2016-05-13 15:37:18 -0700 Cleanup task. 1192928 1 278882 enrica 2016-05-13 15:40:48 -0700 Created attachment 278882 Patch 1192944 2 278889 enrica 2016-05-13 16:19:54 -0700 Created attachment 278889 Patch2 New patch that removes also characterSet. 1192951 3 278889 andersca 2016-05-13 16:33:19 -0700 Comment on attachment 278889 Patch2 View in context: https://bugs.webkit.org/attachment.cgi?id=278889&action=review > Source/WebKit/mac/ChangeLog:22 > +2016-05-13 Enrica Casucci <enrica@apple.com> > + > + Need a short description (OOPS!). > + Need the bug URL (OOPS!). > + > + Reviewed by NOBODY (OOPS!). > + > + * WebView/WebHTMLView.mm: > + (-[WebHTMLView _handleEditingKeyEvent:]): > + Duplicate change log. 1192953 4 enrica 2016-05-13 16:38:25 -0700 Committed revision 200894. 1192972 5 commit-queue 2016-05-13 17:01:12 -0700 Re-opened since this is blocked by bug 157695 1192976 6 ryanhaddad 2016-05-13 17:05:08 -0700 (In reply to comment #5) > Re-opened since this is blocked by bug 157695 Link to iOS build failure with this change: <https://build.webkit.org/builders/Apple%20iOS%209%20Simulator%20Release%20(Build)/builds/6286> This also appears to have failed to build in EWS :( <https://webkit-queues.webkit.org/results/1317202> 1193536 7 enrica 2016-05-16 14:38:49 -0700 Committed again with build fix. Committed revision 200968. 1193537 8 enrica 2016-05-16 14:41:47 -0700 Forgot a piece of the change. Now landed in Committed revision 200969. 1193551 9 ryanhaddad 2016-05-16 15:18:11 -0700 The iOS build is still broken as of r200969: <https://build.webkit.org/builders/Apple%20iOS%209%20Simulator%20Release%20(Build)/builds/6343> 1193557 10 ryanhaddad 2016-05-16 15:25:52 -0700 Reopening. 1193874 11 enrica 2016-05-17 10:51:26 -0700 Build fix landed in 200979. 278882 2016-05-13 15:40:48 -0700 2016-05-13 16:19:54 -0700 Patch cleanup-webevent.txt text/plain 5649 enrica SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMDg4NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE2LTA1LTEzICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHVudXNlZCBpbml0 aWFsaXplciBmb3IgV2ViRXZlbnQgb24gaU9TLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU3Njg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBubyBsb25nZXIgdXNlZCBhbmQgY2FuIGJlIHJl bW92ZWQuCisgICAgICAgIFRoZSBsb2dpYyB0aWVkIHRvIGlzUG9wdXBWYXJpYW50IGhhcyBiZWVu IGluY29ycG9yYXRlZAorICAgICAgICBpbiBrZXlib2FyZCBmbGFncy4KKworICAgICAgICAqIHBs YXRmb3JtL2lvcy9XZWJFdmVudC5oOgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9XZWJFdmVudC5t bToKKyAgICAgICAgKC1bV2ViRXZlbnQgaW5pdFdpdGhLZXlFdmVudFR5cGU6dGltZVN0YW1wOmNo YXJhY3RlcnM6Y2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzOm1vZGlmaWVyczppc1JlcGVhdGlu Zzppc1BvcHVwVmFyaWFudDprZXlDb2RlOmlzVGFiS2V5OmNoYXJhY3RlclNldDpdKTogRGVsZXRl ZC4KKyAgICAgICAgKC1bV2ViRXZlbnQgaXNQb3B1cFZhcmlhbnRdKTogRGVsZXRlZC4KKwogMjAx Ni0wNS0xMyAgRG91ZyBSdXNzZWxsICA8ZF9ydXNzZWxsQGFwcGxlLmNvbT4KIAogICAgICAgICBB WDogUmVncmVzc2lvbnMgaW4gdW5kby9yZWRvIGFjY2Vzc2liaWxpdHkgZnJvbSBCdWcgMTUzMzYx CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViRXZlbnQuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViRXZlbnQuaAkocmV2aXNpb24gMjAw Nzc3KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYkV2ZW50LmgJKHdvcmtpbmcg Y29weSkKQEAgLTg2LDcgKzg2LDYgQEAgV0VCQ09SRV9FWFBPUlQgQGludGVyZmFjZSBXZWJFdmVu dCA6IE5TTwogICAgIE5TU3RyaW5nICpfY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzOwogICAg IFdlYkV2ZW50RmxhZ3MgX21vZGlmaWVyRmxhZ3M7CiAgICAgQk9PTCBfa2V5UmVwZWF0aW5nOwot ICAgIEJPT0wgX3BvcHVwVmFyaWFudDsgLy8gRklYTUU6IHRvIGJlIHJlbW92ZWQKICAgICBOU1VJ bnRlZ2VyIF9rZXlib2FyZEZsYWdzOwogICAgIHVpbnQxNl90IF9rZXlDb2RlOwogICAgIEJPT0wg X3RhYktleTsKQEAgLTEyNywxOCArMTI2LDYgQEAgV0VCQ09SRV9FWFBPUlQgQGludGVyZmFjZSBX ZWJFdmVudCA6IE5TTwogICAgICAgICAgICAgICAgICAgICAgICAgZ2VzdHVyZVNjYWxlOihmbG9h dClnZXN0dXJlU2NhbGUKICAgICAgICAgICAgICAgICAgICAgIGdlc3R1cmVSb3RhdGlvbjooZmxv YXQpZ2VzdHVyZVJvdGF0aW9uOwogCi0vLyBGSVhNRTogdGhpcyBpcyBkZXByZWNhdGVkLiBJdCB3 aWxsIGJlIHJlbW92ZWQgd2hlbiBVSUtpdCBhZG9wdHMgdGhlIG5ldyBvbmUgYmVsb3cuCi0tIChX ZWJFdmVudCAqKWluaXRXaXRoS2V5RXZlbnRUeXBlOihXZWJFdmVudFR5cGUpdHlwZQotICAgICAg ICAgICAgICAgICAgICAgICAgIHRpbWVTdGFtcDooQ0ZUaW1lSW50ZXJ2YWwpdGltZVN0YW1wCi0g ICAgICAgICAgICAgICAgICAgICAgICBjaGFyYWN0ZXJzOihOU1N0cmluZyAqKWNoYXJhY3RlcnMK LSAgICAgICBjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnM6KE5TU3RyaW5nICopY2hhcmFjdGVy c0lnbm9yaW5nTW9kaWZpZXJzCi0gICAgICAgICAgICAgICAgICAgICAgICAgbW9kaWZpZXJzOihX ZWJFdmVudEZsYWdzKW1vZGlmaWVycwotICAgICAgICAgICAgICAgICAgICAgICBpc1JlcGVhdGlu ZzooQk9PTClyZXBlYXRpbmcKLSAgICAgICAgICAgICAgICAgICAgaXNQb3B1cFZhcmlhbnQ6KEJP T0wpcG9wdXBWYXJpYW50Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICBrZXlDb2RlOih1aW50 MTZfdClrZXlDb2RlCi0gICAgICAgICAgICAgICAgICAgICAgICAgIGlzVGFiS2V5OihCT09MKXRh YktleQotICAgICAgICAgICAgICAgICAgICAgIGNoYXJhY3RlclNldDooV2ViRXZlbnRDaGFyYWN0 ZXJTZXQpY2hhcmFjdGVyU2V0OwotCiAtIChXZWJFdmVudCAqKWluaXRXaXRoS2V5RXZlbnRUeXBl OihXZWJFdmVudFR5cGUpdHlwZQogICAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVTdGFtcDoo Q0ZUaW1lSW50ZXJ2YWwpdGltZVN0YW1wCiAgICAgICAgICAgICAgICAgICAgICAgICBjaGFyYWN0 ZXJzOihOU1N0cmluZyAqKWNoYXJhY3RlcnMKQEAgLTE2Miw4ICsxNDksNiBAQCBXRUJDT1JFX0VY UE9SVCBAaW50ZXJmYWNlIFdlYkV2ZW50IDogTlNPCiBAcHJvcGVydHkobm9uYXRvbWljLCByZWFk b25seSkgV2ViRXZlbnRGbGFncyBtb2RpZmllckZsYWdzOwogQHByb3BlcnR5KG5vbmF0b21pYywg cmVhZG9ubHksIGdldHRlciA9IGlzS2V5UmVwZWF0aW5nKSBCT09MIGtleVJlcGVhdGluZzsKIAot Ly8gRklYTUU6IHRoaXMgaXMgZGVwcmVjYXRlZC4gSXQgd2lsbCBiZSByZW1vdmVkIHdoZW4gVUlL aXQgYWRvcHRzIHRoZSBuZXcgaW5pdFdpdGhLZXlFdmVudFR5cGUuCi1AcHJvcGVydHkobm9uYXRv bWljLCByZWFkb25seSwgZ2V0dGVyID0gaXNQb3B1cFZhcmlhbnQpIEJPT0wgcG9wdXBWYXJpYW50 OwogQHByb3BlcnR5KG5vbmF0b21pYywgcmVhZG9ubHkpIE5TVUludGVnZXIga2V5Ym9hcmRGbGFn czsKIEBwcm9wZXJ0eShub25hdG9taWMsIHJlYWRvbmx5KSB1aW50MTZfdCBrZXlDb2RlOwogQHBy b3BlcnR5KG5vbmF0b21pYywgcmVhZG9ubHksIGdldHRlciA9IGlzVGFiS2V5KSBCT09MIHRhYktl eTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJFdmVudC5tbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViRXZlbnQubW0JKHJldmlzaW9u IDIwMDc3NykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJFdmVudC5tbQkod29y a2luZyBjb3B5KQpAQCAtMTI3LDQ5ICsxMjcsNiBAQCAtIChXZWJFdmVudCAqKWluaXRXaXRoS2V5 RXZlbnRUeXBlOihXZWJFCiAgICAgICAgY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzOihOU1N0 cmluZyAqKWNoYXJhY3RlcnNJZ25vcmluZ01vZGlmaWVycwogICAgICAgICAgICAgICAgICAgICAg ICAgIG1vZGlmaWVyczooV2ViRXZlbnRGbGFncyltb2RpZmllcnMKICAgICAgICAgICAgICAgICAg ICAgICAgaXNSZXBlYXRpbmc6KEJPT0wpcmVwZWF0aW5nCi0gICAgICAgICAgICAgICAgICAgIGlz UG9wdXBWYXJpYW50OihCT09MKXBvcHVwVmFyaWFudAotICAgICAgICAgICAgICAgICAgICAgICAg ICAga2V5Q29kZToodWludDE2X3Qpa2V5Q29kZQotICAgICAgICAgICAgICAgICAgICAgICAgICBp c1RhYktleTooQk9PTCl0YWJLZXkKLSAgICAgICAgICAgICAgICAgICAgICBjaGFyYWN0ZXJTZXQ6 KFdlYkV2ZW50Q2hhcmFjdGVyU2V0KWNoYXJhY3RlclNldAotewotICAgIHNlbGYgPSBbc3VwZXIg aW5pdF07Ci0gICAgaWYgKCFzZWxmKQotICAgICAgICByZXR1cm4gbmlsOwotICAgIAotICAgIF90 eXBlID0gdHlwZTsKLSAgICBfdGltZXN0YW1wID0gdGltZVN0YW1wOwotCi0gICAgX2NoYXJhY3Rl cnMgPSBbY2hhcmFjdGVycyByZXRhaW5dOwotICAgIF9jaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmll cnMgPSBbY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzIHJldGFpbl07Ci0gICAgX21vZGlmaWVy RmxhZ3MgPSBtb2RpZmllcnM7Ci0gICAgX2tleVJlcGVhdGluZyA9IHJlcGVhdGluZzsKLSAgICBf cG9wdXBWYXJpYW50ID0gcG9wdXBWYXJpYW50OwotICAgIF90YWJLZXkgPSB0YWJLZXk7Ci0gICAg X2NoYXJhY3RlclNldCA9IGNoYXJhY3RlclNldDsKLQotICAgIGlmIChrZXlDb2RlKQotICAgICAg ICBfa2V5Q29kZSA9IHdpbmRvd3NLZXlDb2RlRm9yS2V5Q29kZShrZXlDb2RlKTsKLQotICAgIC8v IE5PVEU6IHRoaXMgcHJlc2VydmVzIHRoZSBvcmlnaW5hbCBzZW1hbnRpY3Mgd2hpY2ggdXNlZCB0 aGUKLSAgICAvLyBjaGFyYWN0ZXJzIHN0cmluZyBmb3IgdGhlIGtleUNvZGUuIFRoaXMgc2hvdWxk IGJlIGNoYW5nZWQgaW4gaU9TIDQuMCB0bwotICAgIC8vIGFsbG93IHRoZSBjbGllbnQgdG8gZXhw bGljaXRseSBzcGVjaWZ5IGEga2V5Q29kZSwgb3RoZXJ3aXNlIGRlZmF1bHQgdG8KLSAgICAvLyBt YXBwaW5nIHRoZSBjaGFyYWN0ZXJzIHN0cmluZyB0byBhIGtleUNvZGUuCi0gICAgLy8gZS5nLiBh ZGQgYW4gJ2Vsc2UnIGJlZm9yZSB0aGlzICdpZicuCi0gICAgaWYgKFtjaGFyYWN0ZXJzSWdub3Jp bmdNb2RpZmllcnMgbGVuZ3RoXSA9PSAxKSB7Ci0gICAgICAgIHVuaWNoYXIgY2ggPSBbY2hhcmFj dGVyc0lnbm9yaW5nTW9kaWZpZXJzIGNoYXJhY3RlckF0SW5kZXg6MF07Ci0gICAgICAgIF9rZXlD b2RlID0gd2luZG93c0tleUNvZGVGb3JDaGFyQ29kZUlPUyhjaCk7Ci0gICAgfQotCi0gICAgcmV0 dXJuIHNlbGY7Ci19Ci0KLQotLSAoV2ViRXZlbnQgKilpbml0V2l0aEtleUV2ZW50VHlwZTooV2Vi RXZlbnRUeXBlKXR5cGUKLSAgICAgICAgICAgICAgICAgICAgICAgICB0aW1lU3RhbXA6KENGVGlt ZUludGVydmFsKXRpbWVTdGFtcAotICAgICAgICAgICAgICAgICAgICAgICAgY2hhcmFjdGVyczoo TlNTdHJpbmcgKiljaGFyYWN0ZXJzCi0gICAgICAgY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJz OihOU1N0cmluZyAqKWNoYXJhY3RlcnNJZ25vcmluZ01vZGlmaWVycwotICAgICAgICAgICAgICAg ICAgICAgICAgIG1vZGlmaWVyczooV2ViRXZlbnRGbGFncyltb2RpZmllcnMKLSAgICAgICAgICAg ICAgICAgICAgICAgaXNSZXBlYXRpbmc6KEJPT0wpcmVwZWF0aW5nCiAgICAgICAgICAgICAgICAg ICAgICAgICAgd2l0aEZsYWdzOihOU1VJbnRlZ2VyKWZsYWdzCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICBrZXlDb2RlOih1aW50MTZfdClrZXlDb2RlCiAgICAgICAgICAgICAgICAgICAgICAg ICAgIGlzVGFiS2V5OihCT09MKXRhYktleQpAQCAtNDA4LDEzICszNjUsNiBAQCAtIChCT09MKWlz S2V5UmVwZWF0aW5nCiAgICAgcmV0dXJuIF9rZXlSZXBlYXRpbmc7CiB9CiAKLS8vIEZJWE1FOiB0 byBiZSByZW1vdmVkCi0tIChCT09MKWlzUG9wdXBWYXJpYW50Ci17Ci0gICAgQVNTRVJUKF90eXBl ID09IFdlYkV2ZW50S2V5RG93biB8fCBfdHlwZSA9PSBXZWJFdmVudEtleVVwKTsKLSAgICByZXR1 cm4gX3BvcHVwVmFyaWFudDsKLX0KLQogLSAoTlNVSW50ZWdlcilrZXlib2FyZEZsYWdzCiB7CiAg ICAgQVNTRVJUKF90eXBlID09IFdlYkV2ZW50S2V5RG93biB8fCBfdHlwZSA9PSBXZWJFdmVudEtl eVVwKTsK 278889 2016-05-13 16:19:54 -0700 2016-05-13 16:33:19 -0700 Patch2 cleanup-webevent.txt text/plain 15096 enrica SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMDg4OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE2LTA1LTEzICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHVudXNlZCBpbml0 aWFsaXplciBmb3IgV2ViRXZlbnQgb24gaU9TLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU3Njg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBubyBsb25nZXIgdXNlZCBhbmQgY2FuIGJlIHJl bW92ZWQuCisgICAgICAgIFRoZSBsb2dpYyB0aWVkIHRvIGlzUG9wdXBWYXJpYW50IGhhcyBiZWVu IGluY29ycG9yYXRlZAorICAgICAgICBpbiBrZXlib2FyZCBmbGFncy4gVGhlIGNoYXJhY3RlclNl dCBwcm9wZXJ0eSBpcyBubyBsb25nZXIgbmVlZGVkIHRvby4KKworICAgICAgICAqIHBsYXRmb3Jt L2lvcy9XZWJFdmVudC5oOgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9XZWJFdmVudC5tbToKKyAg ICAgICAgKC1bV2ViRXZlbnQgaW5pdFdpdGhLZXlFdmVudFR5cGU6dGltZVN0YW1wOmNoYXJhY3Rl cnM6Y2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzOm1vZGlmaWVyczppc1JlcGVhdGluZzp3aXRo RmxhZ3M6a2V5Q29kZTppc1RhYktleTpjaGFyYWN0ZXJTZXQ6XSk6CisgICAgICAgICgtW1dlYkV2 ZW50IGluaXRXaXRoS2V5RXZlbnRUeXBlOnRpbWVTdGFtcDpjaGFyYWN0ZXJzOmNoYXJhY3RlcnNJ Z25vcmluZ01vZGlmaWVyczptb2RpZmllcnM6aXNSZXBlYXRpbmc6aXNQb3B1cFZhcmlhbnQ6a2V5 Q29kZTppc1RhYktleTpjaGFyYWN0ZXJTZXQ6XSk6IERlbGV0ZWQuCisgICAgICAgICgtW1dlYkV2 ZW50IF9jaGFyYWN0ZXJTZXREZXNjcmlwdGlvbl0pOiBEZWxldGVkLgorICAgICAgICAoLVtXZWJF dmVudCBpc1BvcHVwVmFyaWFudF0pOiBEZWxldGVkLgorICAgICAgICAoLVtXZWJFdmVudCBjaGFy YWN0ZXJTZXRdKTogRGVsZXRlZC4KKwogMjAxNi0wNS0xMyAgU2ltb24gRnJhc2VyICA8c2ltb24u ZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBjcm9zcy1mYWRlKCkgcmVuZGVyaW5nIGRvZXNu J3QgbWF0Y2ggZXhwZWN0YXRpb24KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9X ZWJFdmVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJF dmVudC5oCShyZXZpc2lvbiAyMDA3NzcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mv V2ViRXZlbnQuaAkod29ya2luZyBjb3B5KQpAQCAtODYsMTEgKzg2LDkgQEAgV0VCQ09SRV9FWFBP UlQgQGludGVyZmFjZSBXZWJFdmVudCA6IE5TTwogICAgIE5TU3RyaW5nICpfY2hhcmFjdGVyc0ln bm9yaW5nTW9kaWZpZXJzOwogICAgIFdlYkV2ZW50RmxhZ3MgX21vZGlmaWVyRmxhZ3M7CiAgICAg Qk9PTCBfa2V5UmVwZWF0aW5nOwotICAgIEJPT0wgX3BvcHVwVmFyaWFudDsgLy8gRklYTUU6IHRv IGJlIHJlbW92ZWQKICAgICBOU1VJbnRlZ2VyIF9rZXlib2FyZEZsYWdzOwogICAgIHVpbnQxNl90 IF9rZXlDb2RlOwogICAgIEJPT0wgX3RhYktleTsKLSAgICBXZWJFdmVudENoYXJhY3RlclNldCBf Y2hhcmFjdGVyU2V0OwogICAgIAogICAgIGZsb2F0IF9kZWx0YVg7CiAgICAgZmxvYXQgX2RlbHRh WTsKQEAgLTEyNywxOCArMTI1LDYgQEAgV0VCQ09SRV9FWFBPUlQgQGludGVyZmFjZSBXZWJFdmVu dCA6IE5TTwogICAgICAgICAgICAgICAgICAgICAgICAgZ2VzdHVyZVNjYWxlOihmbG9hdClnZXN0 dXJlU2NhbGUKICAgICAgICAgICAgICAgICAgICAgIGdlc3R1cmVSb3RhdGlvbjooZmxvYXQpZ2Vz dHVyZVJvdGF0aW9uOwogCi0vLyBGSVhNRTogdGhpcyBpcyBkZXByZWNhdGVkLiBJdCB3aWxsIGJl IHJlbW92ZWQgd2hlbiBVSUtpdCBhZG9wdHMgdGhlIG5ldyBvbmUgYmVsb3cuCi0tIChXZWJFdmVu dCAqKWluaXRXaXRoS2V5RXZlbnRUeXBlOihXZWJFdmVudFR5cGUpdHlwZQotICAgICAgICAgICAg ICAgICAgICAgICAgIHRpbWVTdGFtcDooQ0ZUaW1lSW50ZXJ2YWwpdGltZVN0YW1wCi0gICAgICAg ICAgICAgICAgICAgICAgICBjaGFyYWN0ZXJzOihOU1N0cmluZyAqKWNoYXJhY3RlcnMKLSAgICAg ICBjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnM6KE5TU3RyaW5nICopY2hhcmFjdGVyc0lnbm9y aW5nTW9kaWZpZXJzCi0gICAgICAgICAgICAgICAgICAgICAgICAgbW9kaWZpZXJzOihXZWJFdmVu dEZsYWdzKW1vZGlmaWVycwotICAgICAgICAgICAgICAgICAgICAgICBpc1JlcGVhdGluZzooQk9P TClyZXBlYXRpbmcKLSAgICAgICAgICAgICAgICAgICAgaXNQb3B1cFZhcmlhbnQ6KEJPT0wpcG9w dXBWYXJpYW50Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICBrZXlDb2RlOih1aW50MTZfdClr ZXlDb2RlCi0gICAgICAgICAgICAgICAgICAgICAgICAgIGlzVGFiS2V5OihCT09MKXRhYktleQot ICAgICAgICAgICAgICAgICAgICAgIGNoYXJhY3RlclNldDooV2ViRXZlbnRDaGFyYWN0ZXJTZXQp Y2hhcmFjdGVyU2V0OwotCiAtIChXZWJFdmVudCAqKWluaXRXaXRoS2V5RXZlbnRUeXBlOihXZWJF dmVudFR5cGUpdHlwZQogICAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVTdGFtcDooQ0ZUaW1l SW50ZXJ2YWwpdGltZVN0YW1wCiAgICAgICAgICAgICAgICAgICAgICAgICBjaGFyYWN0ZXJzOihO U1N0cmluZyAqKWNoYXJhY3RlcnMKQEAgLTE2MiwxMiArMTQ4LDkgQEAgV0VCQ09SRV9FWFBPUlQg QGludGVyZmFjZSBXZWJFdmVudCA6IE5TTwogQHByb3BlcnR5KG5vbmF0b21pYywgcmVhZG9ubHkp IFdlYkV2ZW50RmxhZ3MgbW9kaWZpZXJGbGFnczsKIEBwcm9wZXJ0eShub25hdG9taWMsIHJlYWRv bmx5LCBnZXR0ZXIgPSBpc0tleVJlcGVhdGluZykgQk9PTCBrZXlSZXBlYXRpbmc7CiAKLS8vIEZJ WE1FOiB0aGlzIGlzIGRlcHJlY2F0ZWQuIEl0IHdpbGwgYmUgcmVtb3ZlZCB3aGVuIFVJS2l0IGFk b3B0cyB0aGUgbmV3IGluaXRXaXRoS2V5RXZlbnRUeXBlLgotQHByb3BlcnR5KG5vbmF0b21pYywg cmVhZG9ubHksIGdldHRlciA9IGlzUG9wdXBWYXJpYW50KSBCT09MIHBvcHVwVmFyaWFudDsKIEBw cm9wZXJ0eShub25hdG9taWMsIHJlYWRvbmx5KSBOU1VJbnRlZ2VyIGtleWJvYXJkRmxhZ3M7CiBA cHJvcGVydHkobm9uYXRvbWljLCByZWFkb25seSkgdWludDE2X3Qga2V5Q29kZTsKIEBwcm9wZXJ0 eShub25hdG9taWMsIHJlYWRvbmx5LCBnZXR0ZXIgPSBpc1RhYktleSkgQk9PTCB0YWJLZXk7Ci1A cHJvcGVydHkobm9uYXRvbWljLCByZWFkb25seSkgV2ViRXZlbnRDaGFyYWN0ZXJTZXQgY2hhcmFj dGVyU2V0OwogCiAvLyBTY3JvbGwgV2hlZWwKIEBwcm9wZXJ0eShub25hdG9taWMsIHJlYWRvbmx5 KSBmbG9hdCBkZWx0YVg7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViRXZl bnQubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYkV2ZW50 Lm1tCShyZXZpc2lvbiAyMDA3NzcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2Vi RXZlbnQubW0JKHdvcmtpbmcgY29weSkKQEAgLTEyNyw1NCArMTI3LDEyIEBAIC0gKFdlYkV2ZW50 ICopaW5pdFdpdGhLZXlFdmVudFR5cGU6KFdlYkUKICAgICAgICBjaGFyYWN0ZXJzSWdub3JpbmdN b2RpZmllcnM6KE5TU3RyaW5nICopY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzCiAgICAgICAg ICAgICAgICAgICAgICAgICAgbW9kaWZpZXJzOihXZWJFdmVudEZsYWdzKW1vZGlmaWVycwogICAg ICAgICAgICAgICAgICAgICAgICBpc1JlcGVhdGluZzooQk9PTClyZXBlYXRpbmcKLSAgICAgICAg ICAgICAgICAgICAgaXNQb3B1cFZhcmlhbnQ6KEJPT0wpcG9wdXBWYXJpYW50Ci0gICAgICAgICAg ICAgICAgICAgICAgICAgICBrZXlDb2RlOih1aW50MTZfdClrZXlDb2RlCi0gICAgICAgICAgICAg ICAgICAgICAgICAgIGlzVGFiS2V5OihCT09MKXRhYktleQotICAgICAgICAgICAgICAgICAgICAg IGNoYXJhY3RlclNldDooV2ViRXZlbnRDaGFyYWN0ZXJTZXQpY2hhcmFjdGVyU2V0Ci17Ci0gICAg c2VsZiA9IFtzdXBlciBpbml0XTsKLSAgICBpZiAoIXNlbGYpCi0gICAgICAgIHJldHVybiBuaWw7 Ci0gICAgCi0gICAgX3R5cGUgPSB0eXBlOwotICAgIF90aW1lc3RhbXAgPSB0aW1lU3RhbXA7Ci0K LSAgICBfY2hhcmFjdGVycyA9IFtjaGFyYWN0ZXJzIHJldGFpbl07Ci0gICAgX2NoYXJhY3RlcnNJ Z25vcmluZ01vZGlmaWVycyA9IFtjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnMgcmV0YWluXTsK LSAgICBfbW9kaWZpZXJGbGFncyA9IG1vZGlmaWVyczsKLSAgICBfa2V5UmVwZWF0aW5nID0gcmVw ZWF0aW5nOwotICAgIF9wb3B1cFZhcmlhbnQgPSBwb3B1cFZhcmlhbnQ7Ci0gICAgX3RhYktleSA9 IHRhYktleTsKLSAgICBfY2hhcmFjdGVyU2V0ID0gY2hhcmFjdGVyU2V0OwotCi0gICAgaWYgKGtl eUNvZGUpCi0gICAgICAgIF9rZXlDb2RlID0gd2luZG93c0tleUNvZGVGb3JLZXlDb2RlKGtleUNv ZGUpOwotCi0gICAgLy8gTk9URTogdGhpcyBwcmVzZXJ2ZXMgdGhlIG9yaWdpbmFsIHNlbWFudGlj cyB3aGljaCB1c2VkIHRoZQotICAgIC8vIGNoYXJhY3RlcnMgc3RyaW5nIGZvciB0aGUga2V5Q29k ZS4gVGhpcyBzaG91bGQgYmUgY2hhbmdlZCBpbiBpT1MgNC4wIHRvCi0gICAgLy8gYWxsb3cgdGhl IGNsaWVudCB0byBleHBsaWNpdGx5IHNwZWNpZnkgYSBrZXlDb2RlLCBvdGhlcndpc2UgZGVmYXVs dCB0bwotICAgIC8vIG1hcHBpbmcgdGhlIGNoYXJhY3RlcnMgc3RyaW5nIHRvIGEga2V5Q29kZS4K LSAgICAvLyBlLmcuIGFkZCBhbiAnZWxzZScgYmVmb3JlIHRoaXMgJ2lmJy4KLSAgICBpZiAoW2No YXJhY3RlcnNJZ25vcmluZ01vZGlmaWVycyBsZW5ndGhdID09IDEpIHsKLSAgICAgICAgdW5pY2hh ciBjaCA9IFtjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnMgY2hhcmFjdGVyQXRJbmRleDowXTsK LSAgICAgICAgX2tleUNvZGUgPSB3aW5kb3dzS2V5Q29kZUZvckNoYXJDb2RlSU9TKGNoKTsKLSAg ICB9Ci0KLSAgICByZXR1cm4gc2VsZjsKLX0KLQotCi0tIChXZWJFdmVudCAqKWluaXRXaXRoS2V5 RXZlbnRUeXBlOihXZWJFdmVudFR5cGUpdHlwZQotICAgICAgICAgICAgICAgICAgICAgICAgIHRp bWVTdGFtcDooQ0ZUaW1lSW50ZXJ2YWwpdGltZVN0YW1wCi0gICAgICAgICAgICAgICAgICAgICAg ICBjaGFyYWN0ZXJzOihOU1N0cmluZyAqKWNoYXJhY3RlcnMKLSAgICAgICBjaGFyYWN0ZXJzSWdu b3JpbmdNb2RpZmllcnM6KE5TU3RyaW5nICopY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzCi0g ICAgICAgICAgICAgICAgICAgICAgICAgbW9kaWZpZXJzOihXZWJFdmVudEZsYWdzKW1vZGlmaWVy cwotICAgICAgICAgICAgICAgICAgICAgICBpc1JlcGVhdGluZzooQk9PTClyZXBlYXRpbmcKICAg ICAgICAgICAgICAgICAgICAgICAgICB3aXRoRmxhZ3M6KE5TVUludGVnZXIpZmxhZ3MKICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGtleUNvZGU6KHVpbnQxNl90KWtleUNvZGUKICAgICAgICAg ICAgICAgICAgICAgICAgICAgaXNUYWJLZXk6KEJPT0wpdGFiS2V5CiAgICAgICAgICAgICAgICAg ICAgICAgY2hhcmFjdGVyU2V0OihXZWJFdmVudENoYXJhY3RlclNldCljaGFyYWN0ZXJTZXQKIHsK KyAgICBVTlVTRURfUEFSQU0oY2hhcmFjdGVyU2V0KTsKICAgICBzZWxmID0gW3N1cGVyIGluaXRd OwogICAgIGlmICghc2VsZikKICAgICAgICAgcmV0dXJuIG5pbDsKQEAgLTE4OCw3ICsxNDYsNiBA QCAtIChXZWJFdmVudCAqKWluaXRXaXRoS2V5RXZlbnRUeXBlOihXZWJFCiAgICAgX2tleVJlcGVh dGluZyA9IHJlcGVhdGluZzsKICAgICBfa2V5Ym9hcmRGbGFncyA9IGZsYWdzOwogICAgIF90YWJL ZXkgPSB0YWJLZXk7Ci0gICAgX2NoYXJhY3RlclNldCA9IGNoYXJhY3RlclNldDsKICAgICAKICAg ICBpZiAoa2V5Q29kZSkKICAgICAgICAgX2tleUNvZGUgPSB3aW5kb3dzS2V5Q29kZUZvcktleUNv ZGUoa2V5Q29kZSk7CkBAIC0yNzYsMjUgKzIzMyw2IEBAIC0gKE5TU3RyaW5nICopX21vZGlmZXJG bGFnc0Rlc2NyaXB0aW9uCiAgICAgcmV0dXJuIEAiVW5rbm93biI7CiB9CiAKLS0gKE5TU3RyaW5n ICopX2NoYXJhY3RlclNldERlc2NyaXB0aW9uCi17Ci0gICAgc3dpdGNoIChfY2hhcmFjdGVyU2V0 KSB7Ci0gICAgICAgIGNhc2UgV2ViRXZlbnRDaGFyYWN0ZXJTZXRBU0NJSToKLSAgICAgICAgICAg IHJldHVybiBAIldlYkV2ZW50Q2hhcmFjdGVyU2V0QVNDSUkiOwotICAgICAgICBjYXNlIFdlYkV2 ZW50Q2hhcmFjdGVyU2V0U3ltYm9sOgotICAgICAgICAgICAgcmV0dXJuIEAiV2ViRXZlbnRDaGFy YWN0ZXJTZXRTeW1ib2wiOwotICAgICAgICBjYXNlIFdlYkV2ZW50Q2hhcmFjdGVyU2V0RGluZ2Jh dHM6Ci0gICAgICAgICAgICByZXR1cm4gQCJXZWJFdmVudENoYXJhY3RlclNldERpbmdiYXRzIjsK LSAgICAgICAgY2FzZSBXZWJFdmVudENoYXJhY3RlclNldFVuaWNvZGU6Ci0gICAgICAgICAgICBy ZXR1cm4gQCJXZWJFdmVudENoYXJhY3RlclNldFVuaWNvZGUiOwotICAgICAgICBjYXNlIFdlYkV2 ZW50Q2hhcmFjdGVyU2V0RnVuY3Rpb25LZXlzOgotICAgICAgICAgICAgcmV0dXJuIEAiV2ViRXZl bnRDaGFyYWN0ZXJTZXRGdW5jdGlvbktleXMiOwotICAgICAgICBkZWZhdWx0OgotICAgICAgICAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgfQotICAgIHJldHVybiBAIlVua25vd24iOwot fQotCiAtIChOU1N0cmluZyAqKV90b3VjaExvY2F0aW9uc0Rlc2NyaXB0aW9uOihOU0FycmF5ICop bG9jYXRpb25zCiB7CiAgICAgQk9PTCBzaG91bGRBZGRDb21tYSA9IE5POwpAQCAtMzU5LDcgKzI5 Nyw3IEBAIC0gKE5TU3RyaW5nICopX2V2ZW50RGVzY3JpcHRpb24KICAgICAgICAgICAgIHJldHVy biBbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAImxvY2F0aW9uOiAoJWYsICVmKSBkZWx0YVg6 ICVmIGRlbHRhWTogJWYiLCBfbG9jYXRpb25JbldpbmRvdy54LCBfbG9jYXRpb25JbldpbmRvdy55 LCBfZGVsdGFYLCBfZGVsdGFZXTsKICAgICAgICAgY2FzZSBXZWJFdmVudEtleURvd246CiAgICAg ICAgIGNhc2UgV2ViRXZlbnRLZXlVcDoKLSAgICAgICAgICAgIHJldHVybiBbTlNTdHJpbmcgc3Ry aW5nV2l0aEZvcm1hdDpAImNoYXJzOiAlQCBjaGFyc05vTW9kaWZpZXJzOiAlQCBmbGFnczogJWQg cmVwZWF0aW5nOiAlZCBrZXlib2FyZEZsYWdzOiAlbHUga2V5Q29kZSAlZCwgaXNUYWI6ICVkIGNo YXJTZXQ6ICVAIiwgX2NoYXJhY3RlcnMsIF9jaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnMsIF9t b2RpZmllckZsYWdzLCBfa2V5UmVwZWF0aW5nLCBzdGF0aWNfY2FzdDx1bnNpZ25lZCBsb25nPihf a2V5Ym9hcmRGbGFncyksIF9rZXlDb2RlLCBfdGFiS2V5LCBbc2VsZiBfY2hhcmFjdGVyU2V0RGVz Y3JpcHRpb25dXTsKKyAgICAgICAgICAgIHJldHVybiBbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1h dDpAImNoYXJzOiAlQCBjaGFyc05vTW9kaWZpZXJzOiAlQCBmbGFnczogJWQgcmVwZWF0aW5nOiAl ZCBrZXlib2FyZEZsYWdzOiAlbHUga2V5Q29kZSAlZCwgaXNUYWI6ICVkIiwgX2NoYXJhY3RlcnMs IF9jaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnMsIF9tb2RpZmllckZsYWdzLCBfa2V5UmVwZWF0 aW5nLCBzdGF0aWNfY2FzdDx1bnNpZ25lZCBsb25nPihfa2V5Ym9hcmRGbGFncyksIF9rZXlDb2Rl LCBfdGFiS2V5XTsKICAgICAgICAgY2FzZSBXZWJFdmVudFRvdWNoQmVnaW46CiAgICAgICAgIGNh c2UgV2ViRXZlbnRUb3VjaENoYW5nZToKICAgICAgICAgY2FzZSBXZWJFdmVudFRvdWNoRW5kOgpA QCAtNDA4LDEzICszNDYsNiBAQCAtIChCT09MKWlzS2V5UmVwZWF0aW5nCiAgICAgcmV0dXJuIF9r ZXlSZXBlYXRpbmc7CiB9CiAKLS8vIEZJWE1FOiB0byBiZSByZW1vdmVkCi0tIChCT09MKWlzUG9w dXBWYXJpYW50Ci17Ci0gICAgQVNTRVJUKF90eXBlID09IFdlYkV2ZW50S2V5RG93biB8fCBfdHlw ZSA9PSBXZWJFdmVudEtleVVwKTsKLSAgICByZXR1cm4gX3BvcHVwVmFyaWFudDsKLX0KLQogLSAo TlNVSW50ZWdlcilrZXlib2FyZEZsYWdzCiB7CiAgICAgQVNTRVJUKF90eXBlID09IFdlYkV2ZW50 S2V5RG93biB8fCBfdHlwZSA9PSBXZWJFdmVudEtleVVwKTsKQEAgLTQzMywxMiArMzY0LDYgQEAg LSAoQk9PTClpc1RhYktleQogICAgIHJldHVybiBfdGFiS2V5OwogfQogCi0tIChXZWJFdmVudENo YXJhY3RlclNldCljaGFyYWN0ZXJTZXQKLXsKLSAgICBBU1NFUlQoX3R5cGUgPT0gV2ViRXZlbnRL ZXlEb3duIHx8IF90eXBlID09IFdlYkV2ZW50S2V5VXApOwotICAgIHJldHVybiBfY2hhcmFjdGVy U2V0OwotfQotCiAtIChmbG9hdClkZWx0YVgKIHsKICAgICBBU1NFUlQoX3R5cGUgPT0gV2ViRXZl bnRTY3JvbGxXaGVlbCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMDA4OTApCisr KyBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwy NSBAQAorMjAxNi0wNS0xMyAgRW5yaWNhIENhc3VjY2kgIDxlbnJpY2FAYXBwbGUuY29tPgorCisg ICAgICAgIFJlbW92ZSB1bnVzZWQgaW5pdGlhbGl6ZXIgZm9yIFdlYkV2ZW50IG9uIGlPUy4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzY4OQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92aW5nIHVz ZSBvZiBjaGFyYWN0ZXJTZXQgcHJvcGVydHkuCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYkhUTUxW aWV3Lm1tOgorICAgICAgICAoLVtXZWJIVE1MVmlldyBfaGFuZGxlRWRpdGluZ0tleUV2ZW50Ol0p OgorCisyMDE2LTA1LTEzICBFbnJpY2EgQ2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAg ICAgICAgTmVlZCBhIHNob3J0IGRlc2NyaXB0aW9uIChPT1BTISkuCisgICAgICAgIE5lZWQgdGhl IGJ1ZyBVUkwgKE9PUFMhKS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFdlYlZpZXcvV2ViSFRNTFZpZXcubW06CisgICAgICAgICgtW1dlYkhUTUxW aWV3IF9oYW5kbGVFZGl0aW5nS2V5RXZlbnQ6XSk6CisKIDIwMTYtMDUtMTMgIEJldGggRGFraW4g IDxiZGFraW5AYXBwbGUuY29tPgogCiAgICAgICAgIEJ1aWxkIGZpeC4KSW5kZXg6IFNvdXJjZS9X ZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQkocmV2aXNpb24gMjAwNzc3KQorKysgU291 cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAt NjUxMSwxMCArNjUxMSw2IEBAIC0gKEJPT0wpX2ludGVycHJldEtleUV2ZW50OihLZXlib2FyZEV2 ZW4KICNkZWZpbmUga1dlYkJhY2tzcGFjZUtleSAgICAgMHgwMDA4CiAjZGVmaW5lIGtXZWJSZXR1 cm5LZXkgICAgICAgIDB4MDAwZAogI2RlZmluZSBrV2ViRGVsZXRlS2V5ICAgICAgICAweDAwN0YK LSNkZWZpbmUga1dlYkxlZnRBcnJvd0tleSAgICAgMHgwMEFDCi0jZGVmaW5lIGtXZWJVcEFycm93 S2V5ICAgICAgIDB4MDBBRAotI2RlZmluZSBrV2ViUmlnaHRBcnJvd0tleSAgICAweDAwQUUKLSNk ZWZpbmUga1dlYkRvd25BcnJvd0tleSAgICAgMHgwMEFGCiAjZGVmaW5lIGtXZWJEZWxldGVGb3J3 YXJkS2V5IDB4RjcyOAogICAgIAogLSAoQk9PTClfaGFuZGxlRWRpdGluZ0tleUV2ZW50OihLZXli b2FyZEV2ZW50ICopd2NFdmVudApAQCAtNjUyNiw3OSArNjUyMiwzNiBAQCAtIChCT09MKV9oYW5k bGVFZGl0aW5nS2V5RXZlbnQ6KEtleWJvYXJkCiAgICAgLy8gZW1iZWRkZWQgYXMgdGhlIHdob2xl IHZpZXcsIGFzIGluIE1haWwsIGFuZCB0YWJzIHNob3VsZCBpbnB1dCB0YWJzIGFzIGV4cGVjdGVk CiAgICAgLy8gaW4gYSB0ZXh0IGVkaXRvci4KICAgICAKLSAgICAvLyBGSVhNRSAtIHRoaXMgY29k ZSB3aWxsIGJyZWFrIHdoZW4gY29udGVudCBlZGl0YWJsZSBpcyBzdXBwb3J0ZWQuCiAgICAgaWYg KGNvbnN0IFBsYXRmb3JtS2V5Ym9hcmRFdmVudCogcGxhdGZvcm1FdmVudCA9IHdjRXZlbnQtPmtl eUV2ZW50KCkpIHsKICAgICAgICAgV2ViRXZlbnQgKmV2ZW50ID0gcGxhdGZvcm1FdmVudC0+ZXZl bnQoKTsKICAgICAgICAgaWYgKCFbW3NlbGYgX3dlYlZpZXddIGlzRWRpdGFibGVdICYmIGV2ZW50 LmlzVGFiS2V5KSAKICAgICAgICAgICAgIHJldHVybiBOTzsKICAgICAgICAgCi0gICAgICAgIC8v IE5vdyBwcm9jZXNzIHRoZSBrZXkgbm9ybWFsbHkKLSAgICAgICAgQk9PTCBzaGlmdCA9IHBsYXRm b3JtRXZlbnQtPnNoaWZ0S2V5KCk7Ci0gICAgICAgIAotICAgICAgICBzd2l0Y2ggKGV2ZW50LmNo YXJhY3RlclNldCkgewotICAgICAgICAgICAgY2FzZSBXZWJFdmVudENoYXJhY3RlclNldFN5bWJv bDogewotICAgICAgICAgICAgICAgIFNFTCBzZWwgPSAwOwotICAgICAgICAgICAgICAgIE5TU3Ry aW5nICpzID0gW2V2ZW50IGNoYXJhY3RlcnNJZ25vcmluZ01vZGlmaWVyc107Ci0gICAgICAgICAg ICAgICAgaWYgKFtzIGxlbmd0aF0gPT0gMCkKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0g ICAgICAgICAgICAgICAgc3dpdGNoIChbcyBjaGFyYWN0ZXJBdEluZGV4OjBdKSB7Ci0gICAgICAg ICAgICAgICAgICAgIGNhc2Uga1dlYkxlZnRBcnJvd0tleToKLSAgICAgICAgICAgICAgICAgICAg ICAgIHNlbCA9IHNoaWZ0ID8gQHNlbGVjdG9yKG1vdmVMZWZ0QW5kTW9kaWZ5U2VsZWN0aW9uOikg OiBAc2VsZWN0b3IobW92ZUxlZnQ6KTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwot ICAgICAgICAgICAgICAgICAgICBjYXNlIGtXZWJVcEFycm93S2V5OgotICAgICAgICAgICAgICAg ICAgICAgICAgc2VsID0gc2hpZnQgPyBAc2VsZWN0b3IobW92ZVVwQW5kTW9kaWZ5U2VsZWN0aW9u OikgOiBAc2VsZWN0b3IobW92ZVVwOik7Ci0gICAgICAgICAgICAgICAgICAgICAgICBicmVhazsK LSAgICAgICAgICAgICAgICAgICAgY2FzZSBrV2ViUmlnaHRBcnJvd0tleToKLSAgICAgICAgICAg ICAgICAgICAgICAgIHNlbCA9IHNoaWZ0ID8gQHNlbGVjdG9yKG1vdmVSaWdodEFuZE1vZGlmeVNl bGVjdGlvbjopIDogQHNlbGVjdG9yKG1vdmVSaWdodDopOwotICAgICAgICAgICAgICAgICAgICAg ICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgICAgIGNhc2Uga1dlYkRvd25BcnJvd0tleToKLSAg ICAgICAgICAgICAgICAgICAgICAgIHNlbCA9IHNoaWZ0ID8gQHNlbGVjdG9yKG1vdmVEb3duQW5k TW9kaWZ5U2VsZWN0aW9uOikgOiBAc2VsZWN0b3IobW92ZURvd246KTsKLSAgICAgICAgICAgICAg ICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICBpZiAo c2VsKSB7Ci0gICAgICAgICAgICAgICAgICAgIFtzZWxmIHBlcmZvcm1TZWxlY3RvcjpzZWwgd2l0 aE9iamVjdDpzZWxmXTsKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFlFUzsKLSAgICAgICAg ICAgICAgICB9Ci0gICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIE5TU3RyaW5nICpzID0g W2V2ZW50IGNoYXJhY3RlcnNdOworICAgICAgICBpZiAoIXMubGVuZ3RoKQorICAgICAgICAgICAg cmV0dXJuIE5POworICAgICAgICBXZWJWaWV3KiB3ZWJWaWV3ID0gW3NlbGYgX3dlYlZpZXddOwor ICAgICAgICBzd2l0Y2ggKFtzIGNoYXJhY3RlckF0SW5kZXg6MF0pIHsKKyAgICAgICAgY2FzZSBr V2ViQmFja3NwYWNlS2V5OgorICAgICAgICBjYXNlIGtXZWJEZWxldGVLZXk6CisgICAgICAgICAg ICBbW3dlYlZpZXcgX1VJS2l0RGVsZWdhdGVGb3J3YXJkZXJdIGRlbGV0ZUZyb21JbnB1dFdpdGhG bGFnczpldmVudC5rZXlib2FyZEZsYWdzXTsKKyAgICAgICAgICAgIHJldHVybiBZRVM7CisgICAg ICAgIGNhc2Uga1dlYkVudGVyS2V5OgorICAgICAgICBjYXNlIGtXZWJSZXR1cm5LZXk6CisgICAg ICAgICAgICBpZiAocGxhdGZvcm1FdmVudC0+dHlwZSgpID09IFBsYXRmb3JtS2V5Ym9hcmRFdmVu dDo6Q2hhcikgeworICAgICAgICAgICAgICAgIC8vIE1hcCBcciBmcm9tIEhXIGtleWJvYXJkIHRv IFxuIHRvIG1hdGNoIHRoZSBiZWhhdmlvciBvZiB0aGUgc29mdCBrZXlib2FyZC4KKyAgICAgICAg ICAgICAgICBbW3dlYlZpZXcgX1VJS2l0RGVsZWdhdGVGb3J3YXJkZXJdIGFkZElucHV0U3RyaW5n OkAiXG4iIHdpdGhGbGFnczowXTsKKyAgICAgICAgICAgICAgICByZXR1cm4gWUVTOwogICAgICAg ICAgICAgfQotICAgICAgICAgICAgY2FzZSBXZWJFdmVudENoYXJhY3RlclNldEFTQ0lJOgotICAg ICAgICAgICAgY2FzZSBXZWJFdmVudENoYXJhY3RlclNldFVuaWNvZGU6IHsKLSAgICAgICAgICAg ICAgICBOU1N0cmluZyAqcyA9IFtldmVudCBjaGFyYWN0ZXJzXTsKLSAgICAgICAgICAgICAgICBp ZiAoW3MgbGVuZ3RoXSA9PSAwKQotICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAg ICAgICAgICBXZWJWaWV3KiB3ZWJWaWV3ID0gW3NlbGYgX3dlYlZpZXddOwotICAgICAgICAgICAg ICAgIHN3aXRjaCAoW3MgY2hhcmFjdGVyQXRJbmRleDowXSkgewotICAgICAgICAgICAgICAgICAg ICBjYXNlIGtXZWJCYWNrc3BhY2VLZXk6Ci0gICAgICAgICAgICAgICAgICAgIGNhc2Uga1dlYkRl bGV0ZUtleToKLSAgICAgICAgICAgICAgICAgICAgICAgIC8vIEZJWE1FOiByZW1vdmUgdGhlIGNh bGwgdG8gZGVsZXRlRnJvbUlucHV0IHdoZW4gVUlLaXQgaW1wbGVtZW50cyBkZWxldGVGcm9tSW5w dXRXaXRoRmxhZ3MuCi0gICAgICAgICAgICAgICAgICAgICAgICBpZiAoW3dlYlZpZXcgcmVzcG9u ZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihkZWxldGVGcm9tSW5wdXRXaXRoRmxhZ3M6KV0pCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgW1t3ZWJWaWV3IF9VSUtpdERlbGVnYXRlRm9yd2FyZGVy XSBkZWxldGVGcm9tSW5wdXRXaXRoRmxhZ3M6ZXZlbnQua2V5Ym9hcmRGbGFnc107Ci0gICAgICAg ICAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgW1t3ZWJW aWV3IF9VSUtpdERlbGVnYXRlRm9yd2FyZGVyXSBkZWxldGVGcm9tSW5wdXRdOwotICAgICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIFlFUzsKLSAgICAgICAgICAgICAgICAgICAgY2FzZSBrV2Vi RW50ZXJLZXk6Ci0gICAgICAgICAgICAgICAgICAgIGNhc2Uga1dlYlJldHVybktleToKLSAgICAg ICAgICAgICAgICAgICAgICAgIGlmIChwbGF0Zm9ybUV2ZW50LT50eXBlKCkgPT0gUGxhdGZvcm1L ZXlib2FyZEV2ZW50OjpDaGFyKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gTWFw IFxyIGZyb20gSFcga2V5Ym9hcmQgdG8gXG4gdG8gbWF0Y2ggdGhlIGJlaGF2aW9yIG9mIHRoZSBz b2Z0IGtleWJvYXJkLgotICAgICAgICAgICAgICAgICAgICAgICAgICAgIFtbd2ViVmlldyBfVUlL aXREZWxlZ2F0ZUZvcndhcmRlcl0gYWRkSW5wdXRTdHJpbmc6QCJcbiIgd2l0aEZsYWdzOjBdOwot ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBZRVM7Ci0gICAgICAgICAgICAgICAg ICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gTk87Ci0gICAgICAgICAg ICAgICAgICAgIGNhc2Uga1dlYkRlbGV0ZUZvcndhcmRLZXk6Ci0gICAgICAgICAgICAgICAgICAg ICAgICBbc2VsZiBkZWxldGVGb3J3YXJkOnNlbGZdOwotICAgICAgICAgICAgICAgICAgICAgICAg cmV0dXJuIFlFUzsKLSAgICAgICAgICAgICAgICAgICAgZGVmYXVsdDogeyAgICAgICAgICAgICAg ICAgICAgCi0gICAgICAgICAgICAgICAgICAgICAgICBpZiAocGxhdGZvcm1FdmVudC0+dHlwZSgp ID09IFBsYXRmb3JtS2V5Ym9hcmRFdmVudDo6Q2hhcikgewotICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFtbd2ViVmlldyBfVUlLaXREZWxlZ2F0ZUZvcndhcmRlcl0gYWRkSW5wdXRTdHJpbmc6 ZXZlbnQuY2hhcmFjdGVycyB3aXRoRmxhZ3M6ZXZlbnQua2V5Ym9hcmRGbGFnc107Ci0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFlFUzsKLSAgICAgICAgICAgICAgICAgICAgICAg IH0KLSAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBOTzsKLSAgICAgICAgICAgICAgICAg ICAgfQotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAg ICAgIGJyZWFrOworICAgICAgICBjYXNlIGtXZWJEZWxldGVGb3J3YXJkS2V5OgorICAgICAgICAg ICAgW3NlbGYgZGVsZXRlRm9yd2FyZDpzZWxmXTsKKyAgICAgICAgICAgIHJldHVybiBZRVM7Cisg ICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBpZiAocGxhdGZvcm1FdmVudC0+dHlwZSgpID09 IFBsYXRmb3JtS2V5Ym9hcmRFdmVudDo6Q2hhcikgeworICAgICAgICAgICAgICAgIFtbd2ViVmll dyBfVUlLaXREZWxlZ2F0ZUZvcndhcmRlcl0gYWRkSW5wdXRTdHJpbmc6ZXZlbnQuY2hhcmFjdGVy cyB3aXRoRmxhZ3M6ZXZlbnQua2V5Ym9hcmRGbGFnc107CisgICAgICAgICAgICAgICAgcmV0dXJu IFlFUzsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICAg ICAgcmV0dXJuIE5POwogICAgICAgICB9CiAgICAgfQogICAgIHJldHVybiBOTzsK