189389 2018-09-06 17:46:12 -0700 [iOS] Arrow keys do not dispatch DOM events to non-editable elements 2018-10-14 22:02:16 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build iPhone / iPad iOS 11 RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=189388 https://www.icloud.com InRadar, PlatformOnly P2 Normal --- 189381 189432 190571 1 dbates dbates ap jeremyj-wk jonlee megan_gardner simon.fraser thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1457363 0 dbates 2018-09-06 17:46:12 -0700 Pressing the arrow keys on a hardware keyboard in a focused text field does not dispatch DOM keyboard events. I observed this today on icloud.com. Here are the steps I performed: 1. Open an iPad simulator instance. 2. Visit https://www.icloud.com. 3. Tap the share button. Then tap Request Desktop Site from the share sheet. 4. Sign in to iCloud. 5. Tap Pages. 6. Tap the + icon at the top of the page to open the template chooser. 7. Press the right arrow key on the keyboard. Then nothing happens. But the Blank Landscape template should have been selected (visually indicated by having an orange outline wrapped around it). 1457366 1 349101 dbates 2018-09-06 18:06:48 -0700 Created attachment 349101 Patch 1457367 2 dbates 2018-09-06 18:07:36 -0700 We will need to fix bug #189388 in order to be able to write a test. 1457373 3 349101 simon.fraser 2018-09-06 19:03:16 -0700 Comment on attachment 349101 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=349101&action=review > Source/WebCore/ChangeLog:16 > + Unfortunately I ran into <https://bugs.webkit.org/show_bug.cgi?id=189388> and hence could > + not write a test for this change. Should we fix that first so we can land with tests? > Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm:174 > + return "Unidentified"_s; That's a bit weird to have in production code. Maybe return empty string? 1457699 4 dbates 2018-09-07 14:47:12 -0700 There is a related issue with regards to arrow keys and editable elements. See bug #189388. 1457705 5 dbates 2018-09-07 14:49:42 -0700 (In reply to Simon Fraser (smfr) from comment #3) > Comment on attachment 349101 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=349101&action=review > > > Source/WebCore/ChangeLog:16 > > + Unfortunately I ran into <https://bugs.webkit.org/show_bug.cgi?id=189388> and hence could > > + not write a test for this change. > > Should we fix that first so we can land with tests? > Will fix this in bug #189432 and update this patch to include updated expected results for the test included in the patch for bug #189432. > > Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm:174 > > + return "Unidentified"_s; > > That's a bit weird to have in production code. Maybe return empty string? This is the correct behavior by <https://www.w3.org/TR/uievents-key/#key-Unidentified>. 1457714 6 349200 dbates 2018-09-07 15:03:31 -0700 Created attachment 349200 To land after landing bug #189432 1458214 7 dbates 2018-09-10 14:02:58 -0700 Committed r235860: <https://trac.webkit.org/changeset/235860> 1458215 8 webkit-bug-importer 2018-09-10 14:03:39 -0700 <rdar://problem/44316290> 349101 2018-09-06 18:06:48 -0700 2018-09-07 15:03:29 -0700 Patch bug-189389-20180906180647.patch text/plain 13484 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NzY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjI4ZWVmNTRiYTljMzgx MjljMGY3Mzk3OGMyZDg3MDYyMmRiOGFmMi4uOTg4NDg3OGE1YzA0MzNkMjkzZGE1MmU1ZTBkNDk1 OTU2ZjQyODcwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDE4LTA5LTA2ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBBcnJvdyBrZXlz IGRvIG5vdCB3b3JrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xODkzODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBPbiBpT1MgdGhlIGFycm93IGtleXMgYXJlIGlkZW50aWZpZWQgYnkgc3BlY2lhbCBtdWx0 aSBjaGFyYWN0ZXIga2V5IHN0cmluZ3M6IFVJS2V5SW5wdXR7VXAsCisgICAgICAgIERvd24sIExl ZnQsIFJpZ2h0fUFycm93IGFzIG9wcG9zZWQgdG8gc3BlY2lhbCBrZXkgY29kZXMgYXMgb24gTWFj LiBXaGVuIGNvbnZlcnRpbmcgdGhlIGlPUy0KKyAgICAgICAgc3BlY2lmaWMgV2ViRXZlbnQgd2Ug bmVlZCB0byB0YWtlIGNhcmUgdG8gcmVjb2duaXplIHdoZW4gdGhlIGtleSBzdHJpbmcgZm9yIHRo ZSBldmVudCBpcworICAgICAgICBvbmUgb2YgdGhlc2Ugc3BlY2lhbCBrZXkgc3RyaW5ncyB3aGVu IGNvbXB1dGluZyBrZXkgY29kZSwgY2hhcmFjdGVyIGNvZGUsIGFuZCBrZXkgaWRlbnRpZmllcgor ICAgICAgICBwcm9wZXJ0aWVzIGZvciB0aGUgV2ViQ29yZSBwbGF0Zm9ybS1zcGVjaWZpYyBldmVu dC4gVGhlc2UgZGV0YWlscyB3aWxsIGJlIGluY2x1ZGVkIGluCisgICAgICAgIHRoZSBjb3JyZXNw b25kaW5nIERPTSBrZXlib2FyZCBldmVudHMgdGhhdCBhcmUgZGlzcGF0Y2hlZCB3aGVuIHRoZSBh cnJvdyBrZXlzIGFyZSBwcmVzc2VkLgorCisgICAgICAgIFVuZm9ydHVuYXRlbHkgSSByYW4gaW50 byA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTM4OD4gYW5kIGhl bmNlIGNvdWxkCisgICAgICAgIG5vdCB3cml0ZSBhIHRlc3QgZm9yIHRoaXMgY2hhbmdlLgorCisg ICAgICAgICogU291cmNlc0NvY29hLnR4dDoKKyAgICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2o6CisgICAgICAgICogcGxhdGZvcm0vaW9zL1BsYXRmb3JtRXZlbnRGYWN0 b3J5SU9TLmg6CisgICAgICAgICogcGxhdGZvcm0vaW9zL1BsYXRmb3JtRXZlbnRGYWN0b3J5SU9T Lm1tOgorICAgICAgICAoV2ViQ29yZTo6Y29udmVydFNwZWNpYWxLZXlUb0NoYXJDb2RlKTogTWFu dWZhY3R1cmUgdGhlIGFwcHJvcHJpYXRlIGNoYXJhY3RlciBjb2RlIGZvciBhbgorICAgICAgICBl dmVudCB0aGF0IHJlcHJlc2VudHMgYW4gYXJyb3cga2V5LiBPdGhlcndpc2UsIHJldHVybiBzdGQ6 Om51bGxvcHQgdG8gaW5kaWNhdGUgdGhhdCB0aGUKKyAgICAgICAgZXZlbnQgaXMgbm90IGZvciBh biBhcnJvdyBrZXkuCisgICAgICAgIChXZWJDb3JlOjprZXlDb2RlRm9yRXZlbnQpOiBNYW51ZmFj dHVyZSB0aGUgYXBwcm9wcmlhdGUgV2luZG93cyB2aXJ0dWFsIGtleSBjb2RlIGZvciBhbgorICAg ICAgICBldmVudCB0aGF0IHJlcHJlc2VudHMgYW4gYXJyb3cga2V5LiBPdGhlcndpc2UsIGRvIHdo YXQgd2UgZG8gbm93IGFuZCByZXR1cm4gdGhlIGtleSBjb2RlCisgICAgICAgIGFzc29jaWF0ZWQg d2l0aCB0aGUgV2ViRXZlbnQuCisgICAgICAgIChXZWJDb3JlOjprZXlJZGVudGlmaWVyRm9yS2V5 RXZlbnQpOiBNb2RpZmllZCB0byB0ZXN0IGlmIHRoZSBldmVudCBpcyBmb3IgYW4gYXJyb3cga2V5 CisgICAgICAgIGFuZCByZXR1cm4gdGhlIGFwcHJvcHJpYXRlIGtleSBpZGVudGlmaWVyLgorICAg ICAgICAoV2ViQ29yZTo6a2V5Rm9yS2V5RXZlbnQpOiBNb2RpZmllZCB0byB0ZXN0IGlmIHRoZSBl dmVudCBpcyBmb3IgYW4gYXJyb3cga2V5CisgICAgICAgIGFuZCByZXR1cm4gdGhlIGFwcHJvcHJp YXRlIGNoYXJhY3RlciBjb2RlLgorICAgICAgICAoV2ViQ29yZTo6Y29kZUZvcktleUV2ZW50KTog TW9kaWZpZWQgdG8gY2FsbCBrZXlDb2RlRm9yRXZlbnQoKSwgd2hpY2gga25vd3MgaG93IHRvIGFj Y291bnQKKyAgICAgICAgZm9yIGV2ZW50cyB0aGF0IHJlcHJlc2VudCBhcnJvdyBrZXlzLgorICAg ICAgICAoV2ViQ29yZTo6UGxhdGZvcm1LZXlib2FyZEV2ZW50QnVpbGRlcjo6UGxhdGZvcm1LZXli b2FyZEV2ZW50QnVpbGRlcik6CisKIDIwMTgtMDgtMjIgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNA YXBwbGUuY29tPgogCiAgICAgICAgIEhUTUx7SW1hZ2UsIExpbmssIFNjcmlwdH1FbGVtZW50Ojpj cm9zc09yaWdpbigpIHNob3VsZCByZXR1cm4gYW4gQXRvbWljU3RyaW5nCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGYw MWNkOTMzOTVlOGRlYmU4ZmQwNmNmNDIzZjE1N2I0ZWQzYjIzYmYuLjAzMjVkNjZiMGZjNWM4OGU4 YWZiYjhhM2Y2MjgwM2M4ZDQzOTZkNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTgt MDktMDYgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1Nd IEFycm93IGtleXMgZG8gbm90IHdvcmsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE4OTM4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFVzZSBXZWJDb3JlOjprZXlDb2RlRm9yRXZlbnQoKSB0byByZXRyaWV2 ZSB0aGUga2V5IGNvZGUgZm9yIGEgV2ViRXZlbnQgaW5zdGVhZCBvZiBxdWVyeWluZworICAgICAg ICB0aGUga2V5IGNvZGUgZnJvbSB0aGUgV2ViRXZlbnQgZGlyZWN0bHkuIFRoZSBmdW5jdGlvbiBX ZWJDb3JlOjprZXlDb2RlRm9yRXZlbnQoKSBrbm93cyBob3cKKyAgICAgICAgdG8gY29tcHV0ZSB0 aGUga2V5IGNvZGUgZm9yIGFuIGV2ZW50IHRoYXQgcmVwcmVzZW50cyBhbiBhcnJvdyBrZXkuCisK KyAgICAgICAgKiBTaGFyZWQvaW9zL1dlYklPU0V2ZW50RmFjdG9yeS5tbToKKyAgICAgICAgKFdl YklPU0V2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViS2V5Ym9hcmRFdmVudCk6CisKIDIwMTgtMDktMDYg IFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW21hY09T XSBbV0syXSBTdXBwb3J0IGNoYW5naW5nIGF0dHJpYnV0ZXMgZm9yIHNlbGVjdGVkIHRleHQgKHRl eHQgc2hhZG93LCB1bmRlcmxpbmUsIHN0cmlrZS10aHJvdWdoKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvU291cmNlc0NvY29hLnR4dCBiL1NvdXJjZS9XZWJDb3JlL1NvdXJjZXNDb2NvYS50 eHQKaW5kZXggNWRjMzgyM2YyZjMwOWMzYTlkNDc2NmFiMTgyMWRlODcxZjkwYjNmMC4uMzU0ZDUz MmUyZTcyOGNjMjFhMjI2ZjQwZTNhMmIyMWQyOTBiNzA2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvU291cmNlc0NvY29hLnR4dAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Tb3VyY2VzQ29jb2Eu dHh0CkBAIC0zODUsNyArMzg1LDcgQEAgcGxhdGZvcm0vaW9zL0xlZ2FjeVRpbGVMYXllci5tbQog cGxhdGZvcm0vaW9zL0xlZ2FjeVRpbGVMYXllclBvb2wubW0KIHBsYXRmb3JtL2lvcy9Mb3dQb3dl ck1vZGVOb3RpZmllcklPUy5tbQogcGxhdGZvcm0vaW9zL1Bhc3RlYm9hcmRJT1MubW0KLXBsYXRm b3JtL2lvcy9QbGF0Zm9ybUV2ZW50RmFjdG9yeUlPUy5tbQorcGxhdGZvcm0vaW9zL1BsYXRmb3Jt RXZlbnRGYWN0b3J5SU9TLm1tIEBuby11bmlmeQogcGxhdGZvcm0vaW9zL1BsYXRmb3JtUGFzdGVi b2FyZElPUy5tbQogcGxhdGZvcm0vaW9zL1BsYXRmb3JtU2NyZWVuSU9TLm1tCiBwbGF0Zm9ybS9p b3MvUGxhdGZvcm1TcGVlY2hTeW50aGVzaXplcklPUy5tbSBAbm8tdW5pZnkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCA0YThhYzM2 ZGZmZGIwZjNiMmU4Yjg5NGYxM2ZlNDJjMjZlNDcyNTVjLi45ODc4YjMyMjdhOTFjZDkwNDIyNTM0 YjVhZDVhMzMwMWMyNTljNmRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhj b2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29k ZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC00MTI2LDYgKzQxMjYsNyBAQAogCQlDRTdCMkRCMzE1 ODZBQkFEMDA5OEIzRkEgLyogQWx0ZXJuYXRpdmVUZXh0VUlDb250cm9sbGVyLmggaW4gSGVhZGVy cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDRTdCMkRBRjE1ODZBQkFEMDA5 OEIzRkEgLyogQWx0ZXJuYXRpdmVUZXh0VUlDb250cm9sbGVyLmggKi87IHNldHRpbmdzID0ge0FU VFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJQ0U3QjJEQjUxNTg2QUJBRDAwOThCM0ZB IC8qIFRleHRBbHRlcm5hdGl2ZVdpdGhSYW5nZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gQ0U3QjJEQjExNTg2QUJBRDAwOThCM0ZBIC8qIFRleHRBbHRl cm5hdGl2ZVdpdGhSYW5nZS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUs ICk7IH07IH07CiAJCUNFN0UxNzgzMUM4M0E0OTEwMEFEMDZBRiAvKiBDb250ZW50U2VjdXJpdHlQ b2xpY3lIYXNoLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSBDRTdFMTc4MjFDODNBNDkxMDBBRDA2QUYgLyogQ29udGVudFNlY3VyaXR5UG9saWN5SGFzaC5o ICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CisJCUNFQTI4 NDY2MjE0MUU4NDkwMEU0MDdFOCAvKiBQbGF0Zm9ybUV2ZW50RmFjdG9yeUlPUy5tbSBpbiBTb3Vy Y2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDI2NjAxRUJFMTRCM0I5QUQw MDEyQzBGRSAvKiBQbGF0Zm9ybUV2ZW50RmFjdG9yeUlPUy5tbSAqLzsgfTsKIAkJQ0VCQjhDMzMy MDc4NkRDQjAwMDM5NTQ3IC8qIEZldGNoSWRpb21zLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDRUJCOEMzMTIwNzg2RENCMDAwMzk1NDcgLyogRmV0Y2hJ ZGlvbXMuaCAqLzsgfTsKIAkJQ0VDQURGQzcxNTM3NzhGRjAwRTM3MDY4IC8qIERpY3RhdGlvbkFs dGVybmF0aXZlLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSBDRUNBREZDMzE1Mzc3OEZGMDBFMzcwNjggLyogRGljdGF0aW9uQWx0ZXJuYXRpdmUuaCAqLzsg c2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQlDRUNBREZDOTE1 Mzc3OEZGMDBFMzcwNjggLyogRGljdGF0aW9uQ29tbWFuZC5oIGluIEhlYWRlcnMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQ0VDQURGQzUxNTM3NzhGRjAwRTM3MDY4IC8qIERp Y3RhdGlvbkNvbW1hbmQuaCAqLzsgfTsKQEAgLTI4NzgxLDcgKzI4NzgyLDYgQEAKIAkJCQlENjQ4 OUQyNjE2NkZGQ0YxMDA3QzAzMUIgLyogSlNIVE1MVGVtcGxhdGVFbGVtZW50LmggaW4gSGVhZGVy cyAqLywKIAkJCQlBODBFN0U5RDBBMUE4M0UzMDA3RkI4QzUgLyogSlNIVE1MVGV4dEFyZWFFbGVt ZW50LmggaW4gSGVhZGVycyAqLywKIAkJCQk4M0UzNTlBMjFCQjEwMzFEMDAyQ0VCOTggLyogSlNI VE1MVGltZUVsZW1lbnQuaCBpbiBIZWFkZXJzICovLAotCQkJCUU0MjA1MDE3MjE0MTkwMUIwMDY2 RUYzQiAvKiBQcm9jZXNzV2FybWluZy5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQTgwRTdCMEMwQTE5 RDYwNjAwN0ZCOEM1IC8qIEpTSFRNTFRpdGxlRWxlbWVudC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJ MDcwNzU2RDQxNDIzOUE0RjAwNDE0MTYxIC8qIEpTSFRNTFRyYWNrRWxlbWVudC5oIGluIEhlYWRl cnMgKi8sCiAJCQkJMUE4NUIyMTEwQTFCMjU4NzAwRDhDODdDIC8qIEpTSFRNTFVMaXN0RWxlbWVu dC5oIGluIEhlYWRlcnMgKi8sCkBAIC0yOTc4OSw2ICsyOTc4OSw3IEBACiAJCQkJQjcxRkU2REYx MTA5MUNCMzAwREFFRjc3IC8qIFByaW50Q29udGV4dC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJNTFG NjQ1RDUxRkVDREJDRTAwQjU0REVEIC8qIFByb2Nlc3MuaCBpbiBIZWFkZXJzICovLAogCQkJCUE4 RUE3RUJDMEExOTQ1RDAwMEE4RUY1RiAvKiBQcm9jZXNzaW5nSW5zdHJ1Y3Rpb24uaCBpbiBIZWFk ZXJzICovLAorCQkJCUU0MjA1MDE3MjE0MTkwMUIwMDY2RUYzQiAvKiBQcm9jZXNzV2FybWluZy5o IGluIEhlYWRlcnMgKi8sCiAJCQkJRTQ0NjEzRUMwQ0Q2ODFCNTAwRkFEQTc1IC8qIFByb2dyZXNz RXZlbnQuaCBpbiBIZWFkZXJzICovLAogCQkJCUE3MTVFNjUzMTM0QkJCRUMwMEQ4RTcxMyAvKiBQ cm9ncmVzc1NoYWRvd0VsZW1lbnQuaCBpbiBIZWFkZXJzICovLAogCQkJCTFBMkE2ODI0MEI1QkVE RTcwMDAyQTQ4MCAvKiBQcm9ncmVzc1RyYWNrZXIuaCBpbiBIZWFkZXJzICovLApAQCAtMzE1NzAs NiArMzE1NzEsNyBAQAogCQkJCTMxMDc4Q0M3MTg4MEFBQjUwMDgwOTlEQyAvKiBPRVNUZXh0dXJl SGFsZkZsb2F0TGluZWFyLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTc3QTE3QTcxMTJGMjgxODIw MDRFMDJGNiAvKiBPRVNWZXJ0ZXhBcnJheU9iamVjdC5jcHAgaW4gU291cmNlcyAqLywKIAkJCQlE RTVGODYxMDFGQTIzOEQ5MDA2REI2M0EgLyogUGF5bWVudE1lcmNoYW50U2Vzc2lvbkNvY29hLm1t IGluIFNvdXJjZXMgKi8sCisJCQkJQ0VBMjg0NjYyMTQxRTg0OTAwRTQwN0U4IC8qIFBsYXRmb3Jt RXZlbnRGYWN0b3J5SU9TLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJQUExMkRGNDkxNzQzREY4MzAw NERBRkRGIC8qIFBsYXRmb3JtU3BlZWNoU3ludGhlc2l6ZXJJT1MubW0gaW4gU291cmNlcyAqLywK IAkJCQlDREEyOUEzMDFDQkY3NEQ0MDA5MDFDQ0YgLyogUGxheWJhY2tTZXNzaW9uSW50ZXJmYWNl QVZLaXQubW0gaW4gU291cmNlcyAqLywKIAkJCQlDREEyOUExNjFDQkRBNTZDMDA5MDFDQ0YgLyog UGxheWJhY2tTZXNzaW9uSW50ZXJmYWNlTWFjLm1tIGluIFNvdXJjZXMgKi8sCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGxhdGZvcm1FdmVudEZhY3RvcnlJT1MuaCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QbGF0Zm9ybUV2ZW50RmFjdG9yeUlPUy5oCmlu ZGV4IGJjNzQ1OTQ4N2I2MTVkZWUzNjc2YzI0NzkwOGUxOTA0OWYyMTE1ZGEuLjc5YThhNjYyNjE4 ZjExZGI1YzM1Y2UzN2E0NDczZGM2YTk0YWRiOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2lvcy9QbGF0Zm9ybUV2ZW50RmFjdG9yeUlPUy5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2lvcy9QbGF0Zm9ybUV2ZW50RmFjdG9yeUlPUy5oCkBAIC01Myw2ICs1Myw3 IEBAIHB1YmxpYzoKIFdFQkNPUkVfRVhQT1JUIFN0cmluZyBrZXlGb3JLZXlFdmVudChXZWJFdmVu dCAqKTsKIFdFQkNPUkVfRVhQT1JUIFN0cmluZyBjb2RlRm9yS2V5RXZlbnQoV2ViRXZlbnQgKik7 CiBXRUJDT1JFX0VYUE9SVCBTdHJpbmcga2V5SWRlbnRpZmllckZvcktleUV2ZW50KFdlYkV2ZW50 ICopOworV0VCQ09SRV9FWFBPUlQgaW50IGtleUNvZGVGb3JFdmVudChXZWJFdmVudCAqKTsKIAog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9pb3MvUGxhdGZvcm1FdmVudEZhY3RvcnlJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9pb3MvUGxhdGZvcm1FdmVudEZhY3RvcnlJT1MubW0KaW5kZXggOWUxZmI5NzAzYTM4NzE4 OTkxNDU2NWY5ZmQxNGJiY2UwOTMxMDhhNy4uMzgwZDY2ZjY0OGI2NmFjZDZmMzFiZjVhZWVhMzgy YzY0OWIwMWEwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1BsYXRm b3JtRXZlbnRGYWN0b3J5SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9Q bGF0Zm9ybUV2ZW50RmFjdG9yeUlPUy5tbQpAQCAtMzAsMTIgKzMwLDI3IEBACiAKICNpbXBvcnQg IkludFBvaW50LmgiCiAjaW1wb3J0ICJLZXlFdmVudENvY29hLmgiCisjaW1wb3J0ICJLZXlFdmVu dENvZGVzSU9TLmgiCiAjaW1wb3J0ICJMb2dnaW5nLmgiCiAjaW1wb3J0ICJXQUtBcHBLaXRTdHVi cy5oIgogI2ltcG9ydCAiV2ViRXZlbnQuaCIKICNpbXBvcnQgIldpbmRvd3NLZXlib2FyZENvZGVz LmgiCisjaW1wb3J0IDxVSUtpdC9VSUtpdC5oPgorI2ltcG9ydCA8d3RmL09wdGlvbmFsLmg+Cisj aW1wb3J0IDx3dGYvU29mdExpbmtpbmcuaD4KICNpbXBvcnQgPHd0Zi9XYWxsVGltZS5oPgogCitT T0ZUX0xJTktfRlJBTUVXT1JLKFVJS2l0KQorU09GVF9MSU5LX0NPTlNUQU5UKFVJS2l0LCBVSUtl eUlucHV0VXBBcnJvdywgTlNTdHJpbmcgKikKK1NPRlRfTElOS19DT05TVEFOVChVSUtpdCwgVUlL ZXlJbnB1dERvd25BcnJvdywgTlNTdHJpbmcgKikKK1NPRlRfTElOS19DT05TVEFOVChVSUtpdCwg VUlLZXlJbnB1dExlZnRBcnJvdywgTlNTdHJpbmcgKikKK1NPRlRfTElOS19DT05TVEFOVChVSUtp dCwgVUlLZXlJbnB1dFJpZ2h0QXJyb3csIE5TU3RyaW5nICopCisKKyNkZWZpbmUgVUlLZXlJbnB1 dFVwQXJyb3cgZ2V0VUlLZXlJbnB1dFVwQXJyb3coKQorI2RlZmluZSBVSUtleUlucHV0RG93bkFy cm93IGdldFVJS2V5SW5wdXREb3duQXJyb3coKQorI2RlZmluZSBVSUtleUlucHV0TGVmdEFycm93 IGdldFVJS2V5SW5wdXRMZWZ0QXJyb3coKQorI2RlZmluZSBVSUtleUlucHV0UmlnaHRBcnJvdyBn ZXRVSUtleUlucHV0UmlnaHRBcnJvdygpCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogc3RhdGlj IE9wdGlvblNldDxQbGF0Zm9ybUV2ZW50OjpNb2RpZmllcj4gbW9kaWZpZXJzRm9yRXZlbnQoV2Vi RXZlbnQgKmV2ZW50KQpAQCAtODIsNiArOTcsMzIgQEAgc3RhdGljIFBsYXRmb3JtRXZlbnQ6OlR5 cGUgbW91c2VFdmVudFR5cGUoV2ViRXZlbnQgKmV2ZW50KQogICAgIH0KIH0KIAorc3RhdGljIHN0 ZDo6b3B0aW9uYWw8aW50PiBjb252ZXJ0U3BlY2lhbEtleVRvQ2hhckNvZGUoTlNTdHJpbmcgKmtl eVN0cmluZykKK3sKKyAgICBpZiAoW2tleVN0cmluZyBpc0VxdWFsVG9TdHJpbmc6VUlLZXlJbnB1 dFVwQXJyb3ddKQorICAgICAgICByZXR1cm4gTlNVcEFycm93RnVuY3Rpb25LZXk7CisgICAgaWYg KFtrZXlTdHJpbmcgaXNFcXVhbFRvU3RyaW5nOlVJS2V5SW5wdXREb3duQXJyb3ddKQorICAgICAg ICByZXR1cm4gTlNEb3duQXJyb3dGdW5jdGlvbktleTsKKyAgICBpZiAoW2tleVN0cmluZyBpc0Vx dWFsVG9TdHJpbmc6VUlLZXlJbnB1dExlZnRBcnJvd10pCisgICAgICAgIHJldHVybiBOU0xlZnRB cnJvd0Z1bmN0aW9uS2V5OworICAgIGlmIChba2V5U3RyaW5nIGlzRXF1YWxUb1N0cmluZzpVSUtl eUlucHV0UmlnaHRBcnJvd10pCisgICAgICAgIHJldHVybiBOU1JpZ2h0QXJyb3dGdW5jdGlvbktl eTsKKyAgICByZXR1cm4gc3RkOjpudWxsb3B0OworfQorCitpbnQga2V5Q29kZUZvckV2ZW50KFdl YkV2ZW50ICpldmVudCkKK3sKKyAgICBpZiAoW2V2ZW50LmNoYXJhY3RlcnMgaXNFcXVhbFRvU3Ry aW5nOlVJS2V5SW5wdXRVcEFycm93XSkKKyAgICAgICAgcmV0dXJuIFZLX1VQOworICAgIGlmIChb ZXZlbnQuY2hhcmFjdGVycyBpc0VxdWFsVG9TdHJpbmc6VUlLZXlJbnB1dERvd25BcnJvd10pCisg ICAgICAgIHJldHVybiBWS19ET1dOOworICAgIGlmIChbZXZlbnQuY2hhcmFjdGVycyBpc0VxdWFs VG9TdHJpbmc6VUlLZXlJbnB1dExlZnRBcnJvd10pCisgICAgICAgIHJldHVybiBWS19MRUZUOwor ICAgIGlmIChbZXZlbnQuY2hhcmFjdGVycyBpc0VxdWFsVG9TdHJpbmc6VUlLZXlJbnB1dFJpZ2h0 QXJyb3ddKQorICAgICAgICByZXR1cm4gVktfUklHSFQ7CisgICAgcmV0dXJuIGV2ZW50LmtleUNv ZGU7Cit9CisKIGNsYXNzIFBsYXRmb3JtTW91c2VFdmVudEJ1aWxkZXIgOiBwdWJsaWMgUGxhdGZv cm1Nb3VzZUV2ZW50IHsKIHB1YmxpYzoKICAgICBQbGF0Zm9ybU1vdXNlRXZlbnRCdWlsZGVyKFdl YkV2ZW50ICpldmVudCkKQEAgLTEyNSwzNiArMTY2LDM2IEBAIFBsYXRmb3JtV2hlZWxFdmVudCBQ bGF0Zm9ybUV2ZW50RmFjdG9yeTo6Y3JlYXRlUGxhdGZvcm1XaGVlbEV2ZW50KFdlYkV2ZW50ICpl dmVuCiAKIFN0cmluZyBrZXlJZGVudGlmaWVyRm9yS2V5RXZlbnQoV2ViRXZlbnQgKmV2ZW50KQog ewotICAgIE5TU3RyaW5nICpzID0gZXZlbnQuY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzOwot ICAgIGlmIChbcyBsZW5ndGhdICE9IDEpIHsKLSAgICAgICAgTE9HKEV2ZW50cywgInJlY2VpdmVk IGFuIHVuZXhwZWN0ZWQgbnVtYmVyIG9mIGNoYXJhY3RlcnMgaW4ga2V5IGV2ZW50OiAldSIsIFtz IGxlbmd0aF0pOwotICAgICAgICByZXR1cm4gIlVuaWRlbnRpZmllZCI7CisgICAgTlNTdHJpbmcg KmNoYXJhY3RlcnMgPSBldmVudC5jaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnM7CisgICAgaWYg KGF1dG8gc3BlY2lhbEtleUNoYXJDb2RlID0gY29udmVydFNwZWNpYWxLZXlUb0NoYXJDb2RlKGNo YXJhY3RlcnMpKQorICAgICAgICByZXR1cm4ga2V5SWRlbnRpZmllckZvckNoYXJDb2RlKCpzcGVj aWFsS2V5Q2hhckNvZGUpOworICAgIGlmIChbY2hhcmFjdGVycyBsZW5ndGhdICE9IDEpIHsKKyAg ICAgICAgTE9HKEV2ZW50cywgInJlY2VpdmVkIGFuIHVuZXhwZWN0ZWQgbnVtYmVyIG9mIGNoYXJh Y3RlcnMgaW4ga2V5IGV2ZW50OiAldSIsIFtjaGFyYWN0ZXJzIGxlbmd0aF0pOworICAgICAgICBy ZXR1cm4gIlVuaWRlbnRpZmllZCJfczsKICAgICB9Ci0KLSAgICByZXR1cm4ga2V5SWRlbnRpZmll ckZvckNoYXJDb2RlKENGU3RyaW5nR2V0Q2hhcmFjdGVyQXRJbmRleCgoQ0ZTdHJpbmdSZWYpcywg MCkpOworICAgIHJldHVybiBrZXlJZGVudGlmaWVyRm9yQ2hhckNvZGUoW2NoYXJhY3RlcnMgY2hh cmFjdGVyQXRJbmRleDowXSk7CiB9CiAKIFN0cmluZyBrZXlGb3JLZXlFdmVudChXZWJFdmVudCAq ZXZlbnQpCiB7CiAgICAgTlNTdHJpbmcgKmNoYXJhY3RlcnMgPSBldmVudC5jaGFyYWN0ZXJzOwog ICAgIGF1dG8gbGVuZ3RoID0gW2NoYXJhY3RlcnMgbGVuZ3RoXTsKLQogICAgIC8vIGNoYXJhY3Rl cnMgcmV0dXJuIGFuIGVtcHR5IHN0cmluZyBmb3IgZGVhZCBrZXlzLgogICAgIC8vIGh0dHBzOi8v ZGV2ZWxvcGVyLmFwcGxlLmNvbS9yZWZlcmVuY2UvYXBwa2l0L25zZXZlbnQvMTUzNDE4My1jaGFy YWN0ZXJzCiAgICAgLy8gIkRlYWQiIGlzIGRlZmluZWQgaGVyZSBodHRwczovL3czYy5naXRodWIu aW8vdWlldmVudHMta2V5LyNrZXlzLWNvbXBvc2l0aW9uLgogICAgIGlmICghbGVuZ3RoKQogICAg ICAgICByZXR1cm4gIkRlYWQiX3M7Ci0KKyAgICBpZiAoYXV0byBzcGVjaWFsS2V5Q2hhckNvZGUg PSBjb252ZXJ0U3BlY2lhbEtleVRvQ2hhckNvZGUoY2hhcmFjdGVycykpCisgICAgICAgIHJldHVy biBrZXlGb3JDaGFyQ29kZSgqc3BlY2lhbEtleUNoYXJDb2RlKTsKICAgICBpZiAobGVuZ3RoID4g MSkKICAgICAgICAgcmV0dXJuIGNoYXJhY3RlcnM7Ci0KICAgICByZXR1cm4ga2V5Rm9yQ2hhckNv ZGUoW2NoYXJhY3RlcnMgY2hhcmFjdGVyQXRJbmRleDowXSk7CiB9CiAKIC8vIGh0dHBzOi8vdzNj LmdpdGh1Yi5pby91aWV2ZW50cy1jb2RlLwogU3RyaW5nIGNvZGVGb3JLZXlFdmVudChXZWJFdmVu dCAqZXZlbnQpCiB7Ci0gICAgc3dpdGNoIChldmVudC5rZXlDb2RlKSB7CisgICAgc3dpdGNoIChr ZXlDb2RlRm9yRXZlbnQoZXZlbnQpKSB7CiAgICAgLy8gS2V5cyBpbiB0aGUgYWxwaGFudW1lcmlj IHNlY3Rpb24uCiAgICAgY2FzZSBWS19PRU1fMzogcmV0dXJuICJCYWNrcXVvdGUiX3M7CiAgICAg Y2FzZSBWS19PRU1fNTogcmV0dXJuICJCYWNrc2xhc2giX3M7CkBAIC0zNzgsNyArNDE5LDcgQEAg cHVibGljOgogICAgICAgICBtX2tleSA9IGtleUZvcktleUV2ZW50KGV2ZW50KTsKICAgICAgICAg bV9jb2RlID0gY29kZUZvcktleUV2ZW50KGV2ZW50KTsKICAgICAgICAgbV9rZXlJZGVudGlmaWVy ID0ga2V5SWRlbnRpZmllckZvcktleUV2ZW50KGV2ZW50KTsKLSAgICAgICAgbV93aW5kb3dzVmly dHVhbEtleUNvZGUgPSBldmVudC5rZXlDb2RlOworICAgICAgICBtX3dpbmRvd3NWaXJ0dWFsS2V5 Q29kZSA9IGtleUNvZGVGb3JFdmVudChldmVudCk7CiAgICAgICAgIG1fYXV0b1JlcGVhdCA9IGV2 ZW50LmlzS2V5UmVwZWF0aW5nOwogICAgICAgICBtX2lzS2V5cGFkID0gZmFsc2U7IC8vIGlPUyBk b2VzIG5vdCBkaXN0aW5ndWlzaCB0aGUgbnVtcGFkLiBTZWUgPHJkYXI6Ly9wcm9ibGVtLzcxOTA4 MzU+LgogICAgICAgICBtX2lzU3lzdGVtS2V5ID0gZmFsc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9pb3MvV2ViSU9TRXZlbnRGYWN0b3J5Lm1tIGIvU291cmNlL1dlYktpdC9T aGFyZWQvaW9zL1dlYklPU0V2ZW50RmFjdG9yeS5tbQppbmRleCA1MDM2NzhiNmY1ZmRkN2NmYmFm NGYxODEzNWJjZWQ5MDkzODNlZWM2Li44MzJmZDE0M2MyNWEyZjBmZTAwZTczMGE0NmU4MWVkODU4 NDYyMDdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9pb3MvV2ViSU9TRXZlbnRG YWN0b3J5Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2lvcy9XZWJJT1NFdmVudEZhY3Rv cnkubW0KQEAgLTU4LDggKzU4LDggQEAgV2ViS2l0OjpXZWJLZXlib2FyZEV2ZW50IFdlYklPU0V2 ZW50RmFjdG9yeTo6Y3JlYXRlV2ViS2V5Ym9hcmRFdmVudCg6OldlYkV2ZW50ICoKICAgICBTdHJp bmcga2V5ID0gV2ViQ29yZTo6a2V5Rm9yS2V5RXZlbnQoZXZlbnQpOwogICAgIFN0cmluZyBjb2Rl ID0gV2ViQ29yZTo6Y29kZUZvcktleUV2ZW50KGV2ZW50KTsKICAgICBTdHJpbmcga2V5SWRlbnRp ZmllciA9IFdlYkNvcmU6OmtleUlkZW50aWZpZXJGb3JLZXlFdmVudChldmVudCk7Ci0gICAgaW50 IHdpbmRvd3NWaXJ0dWFsS2V5Q29kZSA9IGV2ZW50LmtleUNvZGU7Ci0gICAgaW50IG5hdGl2ZVZp cnR1YWxLZXlDb2RlID0gZXZlbnQua2V5Q29kZTsKKyAgICBpbnQgd2luZG93c1ZpcnR1YWxLZXlD b2RlID0gV2ViQ29yZTo6a2V5Q29kZUZvckV2ZW50KGV2ZW50KTsKKyAgICBpbnQgbmF0aXZlVmly dHVhbEtleUNvZGUgPSBXZWJDb3JlOjprZXlDb2RlRm9yRXZlbnQoZXZlbnQpOwogICAgIGludCBt YWNDaGFyQ29kZSA9IDA7CiAgICAgYm9vbCBhdXRvUmVwZWF0ID0gZXZlbnQuaXNLZXlSZXBlYXRp bmc7CiAgICAgYm9vbCBpc0tleXBhZCA9IGZhbHNlOwo= 349200 2018-09-07 15:03:31 -0700 2018-09-07 15:03:31 -0700 To land after landing bug #189432 bug-189389-20180907150330.patch text/plain 17148 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NzU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTFmNmMwNGRjMTQ5ZTQ0 MWI3OTU5OGFjZmM4NWRhNDFjNGI0YmY1NS4uYTUzYTkwMGUzYTk2OTllMTg3YTFlOTg0YzAxZGUx YTI0ZWY0NWY1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDE4LTA5LTA3ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBBcnJvdyBrZXlz IGRvIG5vdCBkaXNwYXRjaCBET00gZXZlbnRzIHRvIG5vbi1lZGl0YWJsZSBlbGVtZW50cworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg5Mzg5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIE9uIGlPUyB0aGUgYXJy b3cga2V5cyBhcmUgaWRlbnRpZmllZCBieSBzcGVjaWFsIG11bHRpIGNoYXJhY3RlciBrZXkgc3Ry aW5nczogVUlLZXlJbnB1dHtVcCwKKyAgICAgICAgRG93biwgTGVmdCwgUmlnaHR9QXJyb3cgYXMg b3Bwb3NlZCB0byBzcGVjaWFsIGtleSBjb2RlcyBhcyBvbiBNYWMuIFdoZW4gY29udmVydGluZyB0 aGUgaU9TLQorICAgICAgICBzcGVjaWZpYyBXZWJFdmVudCB3ZSBuZWVkIHRvIHRha2UgY2FyZSB0 byByZWNvZ25pemUgd2hlbiB0aGUga2V5IHN0cmluZyBmb3IgdGhlIGV2ZW50IGlzCisgICAgICAg IG9uZSBvZiB0aGVzZSBzcGVjaWFsIGtleSBzdHJpbmdzIHdoZW4gY29tcHV0aW5nIGtleSBjb2Rl LCBjaGFyYWN0ZXIgY29kZSwgYW5kIGtleSBpZGVudGlmaWVyCisgICAgICAgIHByb3BlcnRpZXMg Zm9yIHRoZSBXZWJDb3JlIHBsYXRmb3JtLXNwZWNpZmljIGV2ZW50LiBUaGVzZSBkZXRhaWxzIHdp bGwgYmUgaW5jbHVkZWQgaW4KKyAgICAgICAgdGhlIGNvcnJlc3BvbmRpbmcgRE9NIGtleWJvYXJk IGV2ZW50cyB0aGF0IGFyZSBkaXNwYXRjaGVkIHdoZW4gdGhlIGFycm93IGtleXMgYXJlIHByZXNz ZWQuCisKKyAgICAgICAgKiBTb3VyY2VzQ29jb2EudHh0OgorICAgICAgICAqIFdlYkNvcmUueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgTWFyayBmaWxlIFBsYXRmb3JtRXZlbnRG YWN0b3J5SU9TIGFzIEBuby11bmlmeSBhcyBpdCBpcyBub3QgY29tcGF0aWJsZSB3aXRoIHRoZSB1 bmlmaWVkIHNvdXJjZXMKKyAgICAgICAgYnVpbGQgc3RyYXRlZ3kgZ2l2ZW4gaXRzIHVzZSBvZiB3 dGYvY29jb2EvU29mdExpbmtpbmcuaCBtYWNyb3MuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3Mv UGxhdGZvcm1FdmVudEZhY3RvcnlJT1MuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvUGxhdGZv cm1FdmVudEZhY3RvcnlJT1MubW06CisgICAgICAgIChXZWJDb3JlOjpjb252ZXJ0U3BlY2lhbEtl eVRvQ2hhckNvZGUpOiBNYW51ZmFjdHVyZSB0aGUgYXBwcm9wcmlhdGUgY2hhcmFjdGVyIGNvZGUg Zm9yIGFuCisgICAgICAgIGV2ZW50IHRoYXQgcmVwcmVzZW50cyBhbiBhcnJvdyBrZXkuIE90aGVy d2lzZSwgcmV0dXJuIHN0ZDo6bnVsbG9wdCB0byBpbmRpY2F0ZSB0aGF0IHRoZQorICAgICAgICBl dmVudCBpcyBub3QgZm9yIGFuIGFycm93IGtleS4KKyAgICAgICAgKFdlYkNvcmU6OmtleUNvZGVG b3JFdmVudCk6IE1hbnVmYWN0dXJlIHRoZSBhcHByb3ByaWF0ZSBXaW5kb3dzIHZpcnR1YWwga2V5 IGNvZGUgZm9yIGFuCisgICAgICAgIGV2ZW50IHRoYXQgcmVwcmVzZW50cyBhbiBhcnJvdyBrZXku IE90aGVyd2lzZSwgZG8gd2hhdCB3ZSBkbyBub3cgYW5kIHJldHVybiB0aGUga2V5IGNvZGUKKyAg ICAgICAgYXNzb2NpYXRlZCB3aXRoIHRoZSBXZWJFdmVudC4KKyAgICAgICAgKFdlYkNvcmU6Omtl eUlkZW50aWZpZXJGb3JLZXlFdmVudCk6IE1vZGlmaWVkIHRvIHRlc3QgaWYgdGhlIGV2ZW50IGlz IGZvciBhbiBhcnJvdyBrZXkKKyAgICAgICAgYW5kIHJldHVybiB0aGUgYXBwcm9wcmlhdGUga2V5 IGlkZW50aWZpZXIuCisgICAgICAgIChXZWJDb3JlOjprZXlGb3JLZXlFdmVudCk6IE1vZGlmaWVk IHRvIHRlc3QgaWYgdGhlIGV2ZW50IGlzIGZvciBhbiBhcnJvdyBrZXkKKyAgICAgICAgYW5kIHJl dHVybiB0aGUgYXBwcm9wcmlhdGUgY2hhcmFjdGVyIGNvZGUuCisgICAgICAgIChXZWJDb3JlOjpj b2RlRm9yS2V5RXZlbnQpOiBNb2RpZmllZCB0byBjYWxsIGtleUNvZGVGb3JFdmVudCgpLCB3aGlj aCBrbm93cyBob3cgdG8gYWNjb3VudAorICAgICAgICBmb3IgZXZlbnRzIHRoYXQgcmVwcmVzZW50 IGFycm93IGtleXMuCisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybUtleWJvYXJkRXZlbnRCdWls ZGVyOjpQbGF0Zm9ybUtleWJvYXJkRXZlbnRCdWlsZGVyKToKKwogMjAxOC0wOS0wNiAgRGFuaWVs IEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAgQ2xlYW51cDogUmVtb3ZlIGV4 dHJhbmVvdXMgInVzaW5nIG5hbWVzcGFjZSIgYW5kIHNjb3BlIFdlYkNvcmU6OkxvZ1RocmVhZGlu ZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZwppbmRleCBhMDYyNDk1MTRjNDc5YjBjNGVkZmYzYjdhOWU1MTMxZDhjNzhkOTk5Li5i OTBiZmFmNjljYTY0ZDA3OTc5N2FjZWU5MDRhMWY5NTgyYTk4NGEzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwz ICsxLDI3IEBACisyMDE4LTA5LTA3ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4K KworICAgICAgICBbaU9TXSBBcnJvdyBrZXlzIGRvIG5vdCBkaXNwYXRjaCBET00gZXZlbnRzIHRv IG5vbi1lZGl0YWJsZSBlbGVtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTg5Mzg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2Vy LgorCisgICAgICAgICogU2hhcmVkL2lvcy9XZWJJT1NFdmVudEZhY3RvcnkubW06CisgICAgICAg IChXZWJJT1NFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYktleWJvYXJkRXZlbnQpOgorCisyMDE4LTA5 LTA3ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBB cnJvdyBrZXlzIGRvIG5vdCB3b3JrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xODkzODkKKworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIu CisKKyAgICAgICAgVXNlIFdlYkNvcmU6OmtleUNvZGVGb3JFdmVudCgpIHRvIHJldHJpZXZlIHRo ZSBrZXkgY29kZSBmb3IgYSBXZWJFdmVudCBpbnN0ZWFkIG9mIHF1ZXJ5aW5nCisgICAgICAgIHRo ZSBrZXkgY29kZSBmcm9tIHRoZSBXZWJFdmVudCBkaXJlY3RseS4gVGhlIGZ1bmN0aW9uIFdlYkNv cmU6OmtleUNvZGVGb3JFdmVudCgpIGtub3dzIGhvdworICAgICAgICB0byBjb21wdXRlIHRoZSBr ZXkgY29kZSBmb3IgYW4gZXZlbnQgdGhhdCByZXByZXNlbnRzIGFuIGFycm93IGtleS4KKworICAg ICAgICAqIFNoYXJlZC9pb3MvV2ViSU9TRXZlbnRGYWN0b3J5Lm1tOgorICAgICAgICAoV2ViSU9T RXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJLZXlib2FyZEV2ZW50KToKKwogMjAxOC0wOS0wNiAgRGFu aWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAgW1hjb2RlXSBQcmVmZXIg c3lzdGVtIGZyYW1ld29ya3MgYnVpbHQgaW50byAkKEJVSUxUX1BST0RVQ1RTX0RJUikvU3lzdGVt L0xpYnJhcnkvRnJhbWV3b3JrcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvU291cmNlc0Nv Y29hLnR4dCBiL1NvdXJjZS9XZWJDb3JlL1NvdXJjZXNDb2NvYS50eHQKaW5kZXggNWRjMzgyM2Yy ZjMwOWMzYTlkNDc2NmFiMTgyMWRlODcxZjkwYjNmMC4uMzU0ZDUzMmUyZTcyOGNjMjFhMjI2ZjQw ZTNhMmIyMWQyOTBiNzA2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvU291cmNlc0NvY29h LnR4dAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Tb3VyY2VzQ29jb2EudHh0CkBAIC0zODUsNyArMzg1 LDcgQEAgcGxhdGZvcm0vaW9zL0xlZ2FjeVRpbGVMYXllci5tbQogcGxhdGZvcm0vaW9zL0xlZ2Fj eVRpbGVMYXllclBvb2wubW0KIHBsYXRmb3JtL2lvcy9Mb3dQb3dlck1vZGVOb3RpZmllcklPUy5t bQogcGxhdGZvcm0vaW9zL1Bhc3RlYm9hcmRJT1MubW0KLXBsYXRmb3JtL2lvcy9QbGF0Zm9ybUV2 ZW50RmFjdG9yeUlPUy5tbQorcGxhdGZvcm0vaW9zL1BsYXRmb3JtRXZlbnRGYWN0b3J5SU9TLm1t IEBuby11bmlmeQogcGxhdGZvcm0vaW9zL1BsYXRmb3JtUGFzdGVib2FyZElPUy5tbQogcGxhdGZv cm0vaW9zL1BsYXRmb3JtU2NyZWVuSU9TLm1tCiBwbGF0Zm9ybS9pb3MvUGxhdGZvcm1TcGVlY2hT eW50aGVzaXplcklPUy5tbSBAbm8tdW5pZnkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCA0YThhYzM2ZGZmZGIwZjNiMmU4Yjg5NGYx M2ZlNDJjMjZlNDcyNTVjLi45ODc4YjMyMjdhOTFjZDkwNDIyNTM0YjVhZDVhMzMwMWMyNTljNmRj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBi eHByb2oKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qCkBAIC00MTI2LDYgKzQxMjYsNyBAQAogCQlDRTdCMkRCMzE1ODZBQkFEMDA5OEIzRkEgLyog QWx0ZXJuYXRpdmVUZXh0VUlDb250cm9sbGVyLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSBDRTdCMkRBRjE1ODZBQkFEMDA5OEIzRkEgLyogQWx0ZXJuYXRp dmVUZXh0VUlDb250cm9sbGVyLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0 ZSwgKTsgfTsgfTsKIAkJQ0U3QjJEQjUxNTg2QUJBRDAwOThCM0ZBIC8qIFRleHRBbHRlcm5hdGl2 ZVdpdGhSYW5nZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gQ0U3QjJEQjExNTg2QUJBRDAwOThCM0ZBIC8qIFRleHRBbHRlcm5hdGl2ZVdpdGhSYW5nZS5o ICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCUNFN0Ux NzgzMUM4M0E0OTEwMEFEMDZBRiAvKiBDb250ZW50U2VjdXJpdHlQb2xpY3lIYXNoLmggaW4gSGVh ZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDRTdFMTc4MjFDODNBNDkx MDBBRDA2QUYgLyogQ29udGVudFNlY3VyaXR5UG9saWN5SGFzaC5oICovOyBzZXR0aW5ncyA9IHtB VFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CisJCUNFQTI4NDY2MjE0MUU4NDkwMEU0MDdF OCAvKiBQbGF0Zm9ybUV2ZW50RmFjdG9yeUlPUy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDI2NjAxRUJFMTRCM0I5QUQwMDEyQzBGRSAvKiBQbGF0Zm9y bUV2ZW50RmFjdG9yeUlPUy5tbSAqLzsgfTsKIAkJQ0VCQjhDMzMyMDc4NkRDQjAwMDM5NTQ3IC8q IEZldGNoSWRpb21zLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSBDRUJCOEMzMTIwNzg2RENCMDAwMzk1NDcgLyogRmV0Y2hJZGlvbXMuaCAqLzsgfTsKIAkJ Q0VDQURGQzcxNTM3NzhGRjAwRTM3MDY4IC8qIERpY3RhdGlvbkFsdGVybmF0aXZlLmggaW4gSGVh ZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDRUNBREZDMzE1Mzc3OEZG MDBFMzcwNjggLyogRGljdGF0aW9uQWx0ZXJuYXRpdmUuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklC VVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQlDRUNBREZDOTE1Mzc3OEZGMDBFMzcwNjggLyog RGljdGF0aW9uQ29tbWFuZC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gQ0VDQURGQzUxNTM3NzhGRjAwRTM3MDY4IC8qIERpY3RhdGlvbkNvbW1hbmQuaCAq LzsgfTsKQEAgLTI4NzgxLDcgKzI4NzgyLDYgQEAKIAkJCQlENjQ4OUQyNjE2NkZGQ0YxMDA3QzAz MUIgLyogSlNIVE1MVGVtcGxhdGVFbGVtZW50LmggaW4gSGVhZGVycyAqLywKIAkJCQlBODBFN0U5 RDBBMUE4M0UzMDA3RkI4QzUgLyogSlNIVE1MVGV4dEFyZWFFbGVtZW50LmggaW4gSGVhZGVycyAq LywKIAkJCQk4M0UzNTlBMjFCQjEwMzFEMDAyQ0VCOTggLyogSlNIVE1MVGltZUVsZW1lbnQuaCBp biBIZWFkZXJzICovLAotCQkJCUU0MjA1MDE3MjE0MTkwMUIwMDY2RUYzQiAvKiBQcm9jZXNzV2Fy bWluZy5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQTgwRTdCMEMwQTE5RDYwNjAwN0ZCOEM1IC8qIEpT SFRNTFRpdGxlRWxlbWVudC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMDcwNzU2RDQxNDIzOUE0RjAw NDE0MTYxIC8qIEpTSFRNTFRyYWNrRWxlbWVudC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMUE4NUIy MTEwQTFCMjU4NzAwRDhDODdDIC8qIEpTSFRNTFVMaXN0RWxlbWVudC5oIGluIEhlYWRlcnMgKi8s CkBAIC0yOTc4OSw2ICsyOTc4OSw3IEBACiAJCQkJQjcxRkU2REYxMTA5MUNCMzAwREFFRjc3IC8q IFByaW50Q29udGV4dC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJNTFGNjQ1RDUxRkVDREJDRTAwQjU0 REVEIC8qIFByb2Nlc3MuaCBpbiBIZWFkZXJzICovLAogCQkJCUE4RUE3RUJDMEExOTQ1RDAwMEE4 RUY1RiAvKiBQcm9jZXNzaW5nSW5zdHJ1Y3Rpb24uaCBpbiBIZWFkZXJzICovLAorCQkJCUU0MjA1 MDE3MjE0MTkwMUIwMDY2RUYzQiAvKiBQcm9jZXNzV2FybWluZy5oIGluIEhlYWRlcnMgKi8sCiAJ CQkJRTQ0NjEzRUMwQ0Q2ODFCNTAwRkFEQTc1IC8qIFByb2dyZXNzRXZlbnQuaCBpbiBIZWFkZXJz ICovLAogCQkJCUE3MTVFNjUzMTM0QkJCRUMwMEQ4RTcxMyAvKiBQcm9ncmVzc1NoYWRvd0VsZW1l bnQuaCBpbiBIZWFkZXJzICovLAogCQkJCTFBMkE2ODI0MEI1QkVERTcwMDAyQTQ4MCAvKiBQcm9n cmVzc1RyYWNrZXIuaCBpbiBIZWFkZXJzICovLApAQCAtMzE1NzAsNiArMzE1NzEsNyBAQAogCQkJ CTMxMDc4Q0M3MTg4MEFBQjUwMDgwOTlEQyAvKiBPRVNUZXh0dXJlSGFsZkZsb2F0TGluZWFyLmNw cCBpbiBTb3VyY2VzICovLAogCQkJCTc3QTE3QTcxMTJGMjgxODIwMDRFMDJGNiAvKiBPRVNWZXJ0 ZXhBcnJheU9iamVjdC5jcHAgaW4gU291cmNlcyAqLywKIAkJCQlERTVGODYxMDFGQTIzOEQ5MDA2 REI2M0EgLyogUGF5bWVudE1lcmNoYW50U2Vzc2lvbkNvY29hLm1tIGluIFNvdXJjZXMgKi8sCisJ CQkJQ0VBMjg0NjYyMTQxRTg0OTAwRTQwN0U4IC8qIFBsYXRmb3JtRXZlbnRGYWN0b3J5SU9TLm1t IGluIFNvdXJjZXMgKi8sCiAJCQkJQUExMkRGNDkxNzQzREY4MzAwNERBRkRGIC8qIFBsYXRmb3Jt U3BlZWNoU3ludGhlc2l6ZXJJT1MubW0gaW4gU291cmNlcyAqLywKIAkJCQlDREEyOUEzMDFDQkY3 NEQ0MDA5MDFDQ0YgLyogUGxheWJhY2tTZXNzaW9uSW50ZXJmYWNlQVZLaXQubW0gaW4gU291cmNl cyAqLywKIAkJCQlDREEyOUExNjFDQkRBNTZDMDA5MDFDQ0YgLyogUGxheWJhY2tTZXNzaW9uSW50 ZXJmYWNlTWFjLm1tIGluIFNvdXJjZXMgKi8sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9pb3MvUGxhdGZvcm1FdmVudEZhY3RvcnlJT1MuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2lvcy9QbGF0Zm9ybUV2ZW50RmFjdG9yeUlPUy5oCmluZGV4IGJjNzQ1OTQ4N2I2MTVk ZWUzNjc2YzI0NzkwOGUxOTA0OWYyMTE1ZGEuLjc5YThhNjYyNjE4ZjExZGI1YzM1Y2UzN2E0NDcz ZGM2YTk0YWRiOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QbGF0 Zm9ybUV2ZW50RmFjdG9yeUlPUy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9Q bGF0Zm9ybUV2ZW50RmFjdG9yeUlPUy5oCkBAIC01Myw2ICs1Myw3IEBAIHB1YmxpYzoKIFdFQkNP UkVfRVhQT1JUIFN0cmluZyBrZXlGb3JLZXlFdmVudChXZWJFdmVudCAqKTsKIFdFQkNPUkVfRVhQ T1JUIFN0cmluZyBjb2RlRm9yS2V5RXZlbnQoV2ViRXZlbnQgKik7CiBXRUJDT1JFX0VYUE9SVCBT dHJpbmcga2V5SWRlbnRpZmllckZvcktleUV2ZW50KFdlYkV2ZW50ICopOworV0VCQ09SRV9FWFBP UlQgaW50IGtleUNvZGVGb3JFdmVudChXZWJFdmVudCAqKTsKIAogfSAvLyBuYW1lc3BhY2UgV2Vi Q29yZQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGxhdGZvcm1F dmVudEZhY3RvcnlJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGxhdGZvcm1F dmVudEZhY3RvcnlJT1MubW0KaW5kZXggOWUxZmI5NzAzYTM4NzE4OTkxNDU2NWY5ZmQxNGJiY2Uw OTMxMDhhNy4uMzgwZDY2ZjY0OGI2NmFjZDZmMzFiZjVhZWVhMzgyYzY0OWIwMWEwOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1BsYXRmb3JtRXZlbnRGYWN0b3J5SU9T Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QbGF0Zm9ybUV2ZW50RmFjdG9y eUlPUy5tbQpAQCAtMzAsMTIgKzMwLDI3IEBACiAKICNpbXBvcnQgIkludFBvaW50LmgiCiAjaW1w b3J0ICJLZXlFdmVudENvY29hLmgiCisjaW1wb3J0ICJLZXlFdmVudENvZGVzSU9TLmgiCiAjaW1w b3J0ICJMb2dnaW5nLmgiCiAjaW1wb3J0ICJXQUtBcHBLaXRTdHVicy5oIgogI2ltcG9ydCAiV2Vi RXZlbnQuaCIKICNpbXBvcnQgIldpbmRvd3NLZXlib2FyZENvZGVzLmgiCisjaW1wb3J0IDxVSUtp dC9VSUtpdC5oPgorI2ltcG9ydCA8d3RmL09wdGlvbmFsLmg+CisjaW1wb3J0IDx3dGYvU29mdExp bmtpbmcuaD4KICNpbXBvcnQgPHd0Zi9XYWxsVGltZS5oPgogCitTT0ZUX0xJTktfRlJBTUVXT1JL KFVJS2l0KQorU09GVF9MSU5LX0NPTlNUQU5UKFVJS2l0LCBVSUtleUlucHV0VXBBcnJvdywgTlNT dHJpbmcgKikKK1NPRlRfTElOS19DT05TVEFOVChVSUtpdCwgVUlLZXlJbnB1dERvd25BcnJvdywg TlNTdHJpbmcgKikKK1NPRlRfTElOS19DT05TVEFOVChVSUtpdCwgVUlLZXlJbnB1dExlZnRBcnJv dywgTlNTdHJpbmcgKikKK1NPRlRfTElOS19DT05TVEFOVChVSUtpdCwgVUlLZXlJbnB1dFJpZ2h0 QXJyb3csIE5TU3RyaW5nICopCisKKyNkZWZpbmUgVUlLZXlJbnB1dFVwQXJyb3cgZ2V0VUlLZXlJ bnB1dFVwQXJyb3coKQorI2RlZmluZSBVSUtleUlucHV0RG93bkFycm93IGdldFVJS2V5SW5wdXRE b3duQXJyb3coKQorI2RlZmluZSBVSUtleUlucHV0TGVmdEFycm93IGdldFVJS2V5SW5wdXRMZWZ0 QXJyb3coKQorI2RlZmluZSBVSUtleUlucHV0UmlnaHRBcnJvdyBnZXRVSUtleUlucHV0UmlnaHRB cnJvdygpCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogc3RhdGljIE9wdGlvblNldDxQbGF0Zm9y bUV2ZW50OjpNb2RpZmllcj4gbW9kaWZpZXJzRm9yRXZlbnQoV2ViRXZlbnQgKmV2ZW50KQpAQCAt ODIsNiArOTcsMzIgQEAgc3RhdGljIFBsYXRmb3JtRXZlbnQ6OlR5cGUgbW91c2VFdmVudFR5cGUo V2ViRXZlbnQgKmV2ZW50KQogICAgIH0KIH0KIAorc3RhdGljIHN0ZDo6b3B0aW9uYWw8aW50PiBj b252ZXJ0U3BlY2lhbEtleVRvQ2hhckNvZGUoTlNTdHJpbmcgKmtleVN0cmluZykKK3sKKyAgICBp ZiAoW2tleVN0cmluZyBpc0VxdWFsVG9TdHJpbmc6VUlLZXlJbnB1dFVwQXJyb3ddKQorICAgICAg ICByZXR1cm4gTlNVcEFycm93RnVuY3Rpb25LZXk7CisgICAgaWYgKFtrZXlTdHJpbmcgaXNFcXVh bFRvU3RyaW5nOlVJS2V5SW5wdXREb3duQXJyb3ddKQorICAgICAgICByZXR1cm4gTlNEb3duQXJy b3dGdW5jdGlvbktleTsKKyAgICBpZiAoW2tleVN0cmluZyBpc0VxdWFsVG9TdHJpbmc6VUlLZXlJ bnB1dExlZnRBcnJvd10pCisgICAgICAgIHJldHVybiBOU0xlZnRBcnJvd0Z1bmN0aW9uS2V5Owor ICAgIGlmIChba2V5U3RyaW5nIGlzRXF1YWxUb1N0cmluZzpVSUtleUlucHV0UmlnaHRBcnJvd10p CisgICAgICAgIHJldHVybiBOU1JpZ2h0QXJyb3dGdW5jdGlvbktleTsKKyAgICByZXR1cm4gc3Rk OjpudWxsb3B0OworfQorCitpbnQga2V5Q29kZUZvckV2ZW50KFdlYkV2ZW50ICpldmVudCkKK3sK KyAgICBpZiAoW2V2ZW50LmNoYXJhY3RlcnMgaXNFcXVhbFRvU3RyaW5nOlVJS2V5SW5wdXRVcEFy cm93XSkKKyAgICAgICAgcmV0dXJuIFZLX1VQOworICAgIGlmIChbZXZlbnQuY2hhcmFjdGVycyBp c0VxdWFsVG9TdHJpbmc6VUlLZXlJbnB1dERvd25BcnJvd10pCisgICAgICAgIHJldHVybiBWS19E T1dOOworICAgIGlmIChbZXZlbnQuY2hhcmFjdGVycyBpc0VxdWFsVG9TdHJpbmc6VUlLZXlJbnB1 dExlZnRBcnJvd10pCisgICAgICAgIHJldHVybiBWS19MRUZUOworICAgIGlmIChbZXZlbnQuY2hh cmFjdGVycyBpc0VxdWFsVG9TdHJpbmc6VUlLZXlJbnB1dFJpZ2h0QXJyb3ddKQorICAgICAgICBy ZXR1cm4gVktfUklHSFQ7CisgICAgcmV0dXJuIGV2ZW50LmtleUNvZGU7Cit9CisKIGNsYXNzIFBs YXRmb3JtTW91c2VFdmVudEJ1aWxkZXIgOiBwdWJsaWMgUGxhdGZvcm1Nb3VzZUV2ZW50IHsKIHB1 YmxpYzoKICAgICBQbGF0Zm9ybU1vdXNlRXZlbnRCdWlsZGVyKFdlYkV2ZW50ICpldmVudCkKQEAg LTEyNSwzNiArMTY2LDM2IEBAIFBsYXRmb3JtV2hlZWxFdmVudCBQbGF0Zm9ybUV2ZW50RmFjdG9y eTo6Y3JlYXRlUGxhdGZvcm1XaGVlbEV2ZW50KFdlYkV2ZW50ICpldmVuCiAKIFN0cmluZyBrZXlJ ZGVudGlmaWVyRm9yS2V5RXZlbnQoV2ViRXZlbnQgKmV2ZW50KQogewotICAgIE5TU3RyaW5nICpz ID0gZXZlbnQuY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzOwotICAgIGlmIChbcyBsZW5ndGhd ICE9IDEpIHsKLSAgICAgICAgTE9HKEV2ZW50cywgInJlY2VpdmVkIGFuIHVuZXhwZWN0ZWQgbnVt YmVyIG9mIGNoYXJhY3RlcnMgaW4ga2V5IGV2ZW50OiAldSIsIFtzIGxlbmd0aF0pOwotICAgICAg ICByZXR1cm4gIlVuaWRlbnRpZmllZCI7CisgICAgTlNTdHJpbmcgKmNoYXJhY3RlcnMgPSBldmVu dC5jaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnM7CisgICAgaWYgKGF1dG8gc3BlY2lhbEtleUNo YXJDb2RlID0gY29udmVydFNwZWNpYWxLZXlUb0NoYXJDb2RlKGNoYXJhY3RlcnMpKQorICAgICAg ICByZXR1cm4ga2V5SWRlbnRpZmllckZvckNoYXJDb2RlKCpzcGVjaWFsS2V5Q2hhckNvZGUpOwor ICAgIGlmIChbY2hhcmFjdGVycyBsZW5ndGhdICE9IDEpIHsKKyAgICAgICAgTE9HKEV2ZW50cywg InJlY2VpdmVkIGFuIHVuZXhwZWN0ZWQgbnVtYmVyIG9mIGNoYXJhY3RlcnMgaW4ga2V5IGV2ZW50 OiAldSIsIFtjaGFyYWN0ZXJzIGxlbmd0aF0pOworICAgICAgICByZXR1cm4gIlVuaWRlbnRpZmll ZCJfczsKICAgICB9Ci0KLSAgICByZXR1cm4ga2V5SWRlbnRpZmllckZvckNoYXJDb2RlKENGU3Ry aW5nR2V0Q2hhcmFjdGVyQXRJbmRleCgoQ0ZTdHJpbmdSZWYpcywgMCkpOworICAgIHJldHVybiBr ZXlJZGVudGlmaWVyRm9yQ2hhckNvZGUoW2NoYXJhY3RlcnMgY2hhcmFjdGVyQXRJbmRleDowXSk7 CiB9CiAKIFN0cmluZyBrZXlGb3JLZXlFdmVudChXZWJFdmVudCAqZXZlbnQpCiB7CiAgICAgTlNT dHJpbmcgKmNoYXJhY3RlcnMgPSBldmVudC5jaGFyYWN0ZXJzOwogICAgIGF1dG8gbGVuZ3RoID0g W2NoYXJhY3RlcnMgbGVuZ3RoXTsKLQogICAgIC8vIGNoYXJhY3RlcnMgcmV0dXJuIGFuIGVtcHR5 IHN0cmluZyBmb3IgZGVhZCBrZXlzLgogICAgIC8vIGh0dHBzOi8vZGV2ZWxvcGVyLmFwcGxlLmNv bS9yZWZlcmVuY2UvYXBwa2l0L25zZXZlbnQvMTUzNDE4My1jaGFyYWN0ZXJzCiAgICAgLy8gIkRl YWQiIGlzIGRlZmluZWQgaGVyZSBodHRwczovL3czYy5naXRodWIuaW8vdWlldmVudHMta2V5LyNr ZXlzLWNvbXBvc2l0aW9uLgogICAgIGlmICghbGVuZ3RoKQogICAgICAgICByZXR1cm4gIkRlYWQi X3M7Ci0KKyAgICBpZiAoYXV0byBzcGVjaWFsS2V5Q2hhckNvZGUgPSBjb252ZXJ0U3BlY2lhbEtl eVRvQ2hhckNvZGUoY2hhcmFjdGVycykpCisgICAgICAgIHJldHVybiBrZXlGb3JDaGFyQ29kZSgq c3BlY2lhbEtleUNoYXJDb2RlKTsKICAgICBpZiAobGVuZ3RoID4gMSkKICAgICAgICAgcmV0dXJu IGNoYXJhY3RlcnM7Ci0KICAgICByZXR1cm4ga2V5Rm9yQ2hhckNvZGUoW2NoYXJhY3RlcnMgY2hh cmFjdGVyQXRJbmRleDowXSk7CiB9CiAKIC8vIGh0dHBzOi8vdzNjLmdpdGh1Yi5pby91aWV2ZW50 cy1jb2RlLwogU3RyaW5nIGNvZGVGb3JLZXlFdmVudChXZWJFdmVudCAqZXZlbnQpCiB7Ci0gICAg c3dpdGNoIChldmVudC5rZXlDb2RlKSB7CisgICAgc3dpdGNoIChrZXlDb2RlRm9yRXZlbnQoZXZl bnQpKSB7CiAgICAgLy8gS2V5cyBpbiB0aGUgYWxwaGFudW1lcmljIHNlY3Rpb24uCiAgICAgY2Fz ZSBWS19PRU1fMzogcmV0dXJuICJCYWNrcXVvdGUiX3M7CiAgICAgY2FzZSBWS19PRU1fNTogcmV0 dXJuICJCYWNrc2xhc2giX3M7CkBAIC0zNzgsNyArNDE5LDcgQEAgcHVibGljOgogICAgICAgICBt X2tleSA9IGtleUZvcktleUV2ZW50KGV2ZW50KTsKICAgICAgICAgbV9jb2RlID0gY29kZUZvcktl eUV2ZW50KGV2ZW50KTsKICAgICAgICAgbV9rZXlJZGVudGlmaWVyID0ga2V5SWRlbnRpZmllckZv cktleUV2ZW50KGV2ZW50KTsKLSAgICAgICAgbV93aW5kb3dzVmlydHVhbEtleUNvZGUgPSBldmVu dC5rZXlDb2RlOworICAgICAgICBtX3dpbmRvd3NWaXJ0dWFsS2V5Q29kZSA9IGtleUNvZGVGb3JF dmVudChldmVudCk7CiAgICAgICAgIG1fYXV0b1JlcGVhdCA9IGV2ZW50LmlzS2V5UmVwZWF0aW5n OwogICAgICAgICBtX2lzS2V5cGFkID0gZmFsc2U7IC8vIGlPUyBkb2VzIG5vdCBkaXN0aW5ndWlz aCB0aGUgbnVtcGFkLiBTZWUgPHJkYXI6Ly9wcm9ibGVtLzcxOTA4MzU+LgogICAgICAgICBtX2lz U3lzdGVtS2V5ID0gZmFsc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9pb3Mv V2ViSU9TRXZlbnRGYWN0b3J5Lm1tIGIvU291cmNlL1dlYktpdC9TaGFyZWQvaW9zL1dlYklPU0V2 ZW50RmFjdG9yeS5tbQppbmRleCA1MDM2NzhiNmY1ZmRkN2NmYmFmNGYxODEzNWJjZWQ5MDkzODNl ZWM2Li44MzJmZDE0M2MyNWEyZjBmZTAwZTczMGE0NmU4MWVkODU4NDYyMDdlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9pb3MvV2ViSU9TRXZlbnRGYWN0b3J5Lm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL2lvcy9XZWJJT1NFdmVudEZhY3RvcnkubW0KQEAgLTU4LDggKzU4 LDggQEAgV2ViS2l0OjpXZWJLZXlib2FyZEV2ZW50IFdlYklPU0V2ZW50RmFjdG9yeTo6Y3JlYXRl V2ViS2V5Ym9hcmRFdmVudCg6OldlYkV2ZW50ICoKICAgICBTdHJpbmcga2V5ID0gV2ViQ29yZTo6 a2V5Rm9yS2V5RXZlbnQoZXZlbnQpOwogICAgIFN0cmluZyBjb2RlID0gV2ViQ29yZTo6Y29kZUZv cktleUV2ZW50KGV2ZW50KTsKICAgICBTdHJpbmcga2V5SWRlbnRpZmllciA9IFdlYkNvcmU6Omtl eUlkZW50aWZpZXJGb3JLZXlFdmVudChldmVudCk7Ci0gICAgaW50IHdpbmRvd3NWaXJ0dWFsS2V5 Q29kZSA9IGV2ZW50LmtleUNvZGU7Ci0gICAgaW50IG5hdGl2ZVZpcnR1YWxLZXlDb2RlID0gZXZl bnQua2V5Q29kZTsKKyAgICBpbnQgd2luZG93c1ZpcnR1YWxLZXlDb2RlID0gV2ViQ29yZTo6a2V5 Q29kZUZvckV2ZW50KGV2ZW50KTsKKyAgICBpbnQgbmF0aXZlVmlydHVhbEtleUNvZGUgPSBXZWJD b3JlOjprZXlDb2RlRm9yRXZlbnQoZXZlbnQpOwogICAgIGludCBtYWNDaGFyQ29kZSA9IDA7CiAg ICAgYm9vbCBhdXRvUmVwZWF0ID0gZXZlbnQuaXNLZXlSZXBlYXRpbmc7CiAgICAgYm9vbCBpc0tl eXBhZCA9IGZhbHNlOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGJhOTJmYmJiZDI1ZGQyZGMwZDg2ZTU4NDkxOWFkMGIxNmIz YjZlOTkuLjFhODdlMjBjZTMxYjA3ZmUwMTBjN2YxZjQzY2ViMWVlZWVmZDlkYWIgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNSBAQAorMjAxOC0wOS0wNyAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5j b20+CisKKyAgICAgICAgW2lPU10gQXJyb3cga2V5cyBkbyBub3QgZGlzcGF0Y2ggRE9NIGV2ZW50 cyB0byBub24tZWRpdGFibGUgZWxlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE4OTM4OQorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZy YXNlci4KKworICAgICAgICBVcGRhdGUgZXhwZWN0ZWQgcmVzdWx0IG5vdyB0aGF0IHdlIGNvbXB1 dGUgdGhlIGNvcnJlY3Qga2V5SWRlbnRpZmllciwga2V5Y29kZSwgYW5kIHdoaWNoIHByb3BlcnRp ZXMKKyAgICAgICAgZm9yIERPTSBrZXlib2FyZCBldmVudHMgZGlzcGF0Y2hlZCB3aGVuIHRoZSBh cnJvdyBrZXlzIGFyZSBwcmVzc2VkLgorCisgICAgICAgICogZmFzdC9ldmVudHMvaW9zL2tleWRv d24ta2V5dXAtaW4tbm9uLWVkaXRhYmxlLWNvbnRlbnQtZXhwZWN0ZWQudHh0OgorCiAyMDE4LTA5 LTA3ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBN YWtlIFdLV2ViVmlldyBiZWNvbWUgdGhlIGZpcnN0IHJlc3BvbmRlciB0byBzdXBwb3J0IHRlc3Rp bmcga2V5IHByZXNzZXMgdG8gbm9uLWVkaXRhYmxlIGVsZW1lbnRzCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9mYXN0L2V2ZW50cy9pb3Mva2V5ZG93bi1rZXl1cC1pbi1ub24tZWRpdGFibGUtY29u dGVudC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9pb3Mva2V5ZG93bi1r ZXl1cC1pbi1ub24tZWRpdGFibGUtY29udGVudC1leHBlY3RlZC50eHQKaW5kZXggNzhjNzI2NjI4 NjhhZDczMGNhOWNmNDZhMDg2OTczNjU2OGMzNzc1MC4uMjAzMmYyMDEwOWMyZDI3MWMwOTg4Yzli YmEzNDI3ODZiNjM4MDcyOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvaW9z L2tleWRvd24ta2V5dXAtaW4tbm9uLWVkaXRhYmxlLWNvbnRlbnQtZXhwZWN0ZWQudHh0CisrKyBi L0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2lvcy9rZXlkb3duLWtleXVwLWluLW5vbi1lZGl0YWJs ZS1jb250ZW50LWV4cGVjdGVkLnR4dApAQCAtOTQsMTAgKzk0LDEwIEBAIHR5cGU6IGtleWRvd24s IGtleTogLywgY29kZTogU2xhc2gsIGtleUlkZW50aWZpZXI6IFUrMDAyRiwga2V5Q29kZTogMTkx LCBjaGFyQ29kCiB0eXBlOiBrZXl1cCwga2V5OiBEZWFkLCBjb2RlOiBVbmlkZW50aWZpZWQsIGtl eUlkZW50aWZpZXI6IFVuaWRlbnRpZmllZCwga2V5Q29kZTogMCwgY2hhckNvZGU6IDAsIGtleUNv ZGU6IDAsIHdoaWNoOiAwCiB0eXBlOiBrZXlkb3duLCBrZXk6IEVudGVyLCBjb2RlOiBFbnRlciwg a2V5SWRlbnRpZmllcjogRW50ZXIsIGtleUNvZGU6IDEzLCBjaGFyQ29kZTogMCwga2V5Q29kZTog MTMsIHdoaWNoOiAxMwogdHlwZToga2V5dXAsIGtleTogRGVhZCwgY29kZTogVW5pZGVudGlmaWVk LCBrZXlJZGVudGlmaWVyOiBVbmlkZW50aWZpZWQsIGtleUNvZGU6IDAsIGNoYXJDb2RlOiAwLCBr ZXlDb2RlOiAwLCB3aGljaDogMAotdHlwZToga2V5ZG93biwga2V5OiBVSUtleUlucHV0VXBBcnJv dywgY29kZTogVW5pZGVudGlmaWVkLCBrZXlJZGVudGlmaWVyOiBVbmlkZW50aWZpZWQsIGtleUNv ZGU6IDAsIGNoYXJDb2RlOiAwLCBrZXlDb2RlOiAwLCB3aGljaDogMAotdHlwZToga2V5dXAsIGtl eTogVUlLZXlJbnB1dFVwQXJyb3csIGNvZGU6IFVuaWRlbnRpZmllZCwga2V5SWRlbnRpZmllcjog VW5pZGVudGlmaWVkLCBrZXlDb2RlOiAwLCBjaGFyQ29kZTogMCwga2V5Q29kZTogMCwgd2hpY2g6 IDAKLXR5cGU6IGtleXVwLCBrZXk6IFVJS2V5SW5wdXREb3duQXJyb3csIGNvZGU6IFVuaWRlbnRp ZmllZCwga2V5SWRlbnRpZmllcjogVW5pZGVudGlmaWVkLCBrZXlDb2RlOiAwLCBjaGFyQ29kZTog MCwga2V5Q29kZTogMCwgd2hpY2g6IDAKLXR5cGU6IGtleWRvd24sIGtleTogVUlLZXlJbnB1dExl ZnRBcnJvdywgY29kZTogVW5pZGVudGlmaWVkLCBrZXlJZGVudGlmaWVyOiBVbmlkZW50aWZpZWQs IGtleUNvZGU6IDAsIGNoYXJDb2RlOiAwLCBrZXlDb2RlOiAwLCB3aGljaDogMAotdHlwZToga2V5 dXAsIGtleTogVUlLZXlJbnB1dExlZnRBcnJvdywgY29kZTogVW5pZGVudGlmaWVkLCBrZXlJZGVu dGlmaWVyOiBVbmlkZW50aWZpZWQsIGtleUNvZGU6IDAsIGNoYXJDb2RlOiAwLCBrZXlDb2RlOiAw LCB3aGljaDogMAotdHlwZToga2V5dXAsIGtleTogVUlLZXlJbnB1dFJpZ2h0QXJyb3csIGNvZGU6 IFVuaWRlbnRpZmllZCwga2V5SWRlbnRpZmllcjogVW5pZGVudGlmaWVkLCBrZXlDb2RlOiAwLCBj aGFyQ29kZTogMCwga2V5Q29kZTogMCwgd2hpY2g6IDAKK3R5cGU6IGtleWRvd24sIGtleTogQXJy b3dVcCwgY29kZTogQXJyb3dVcCwga2V5SWRlbnRpZmllcjogVXAsIGtleUNvZGU6IDM4LCBjaGFy Q29kZTogMCwga2V5Q29kZTogMzgsIHdoaWNoOiAzOAordHlwZToga2V5dXAsIGtleTogQXJyb3dV cCwgY29kZTogQXJyb3dVcCwga2V5SWRlbnRpZmllcjogVXAsIGtleUNvZGU6IDM4LCBjaGFyQ29k ZTogMCwga2V5Q29kZTogMzgsIHdoaWNoOiAzOAordHlwZToga2V5dXAsIGtleTogQXJyb3dEb3du LCBjb2RlOiBBcnJvd0Rvd24sIGtleUlkZW50aWZpZXI6IERvd24sIGtleUNvZGU6IDQwLCBjaGFy Q29kZTogMCwga2V5Q29kZTogNDAsIHdoaWNoOiA0MAordHlwZToga2V5ZG93biwga2V5OiBBcnJv d0xlZnQsIGNvZGU6IEFycm93TGVmdCwga2V5SWRlbnRpZmllcjogTGVmdCwga2V5Q29kZTogMzcs IGNoYXJDb2RlOiAwLCBrZXlDb2RlOiAzNywgd2hpY2g6IDM3Cit0eXBlOiBrZXl1cCwga2V5OiBB cnJvd0xlZnQsIGNvZGU6IEFycm93TGVmdCwga2V5SWRlbnRpZmllcjogTGVmdCwga2V5Q29kZTog MzcsIGNoYXJDb2RlOiAwLCBrZXlDb2RlOiAzNywgd2hpY2g6IDM3Cit0eXBlOiBrZXl1cCwga2V5 OiBBcnJvd1JpZ2h0LCBjb2RlOiBBcnJvd1JpZ2h0LCBrZXlJZGVudGlmaWVyOiBSaWdodCwga2V5 Q29kZTogMzksIGNoYXJDb2RlOiAwLCBrZXlDb2RlOiAzOSwgd2hpY2g6IDM5CiAK