178616 2017-10-20 21:54:24 -0700 [Cocoa] Web Automation: add SPI to tell whether the automation session is currently simulating user interactions 2017-11-15 12:58:20 -0800 1 1 1 Unclassified WebKit WebKit API WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg bburg cgarcia commit-queue joepeck webkit-bug-importer oldest_to_newest 1362988 0 bburg 2017-10-20 21:54:24 -0700 We currently cannot distinguish actions that come from the user (i.e., clicking menu items) versus actions that come from AppKit default event handlers (i.e., Ctrl-a turns into selectAll:). This will allow clients to tell those cases apart. 1362995 1 324488 bburg 2017-10-20 22:22:12 -0700 Created attachment 324488 Patch 1363453 2 324488 joepeck 2017-10-23 16:26:24 -0700 Comment on attachment 324488 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=324488&action=review > Source/WebKit/UIProcess/API/Cocoa/_WKAutomationSession.h:46 > +@property (nonatomic, readonly, getter=isSimulatingUserInteraction) BOOL simulatingUserInteraction; I think this needs: ... WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA)); > Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp:668 > + m_simulatingUserInteraction = false; It sounds like we should only be clearing the m_simulatingUserInteraction flag when the m_pendingKeyboardEventsFlushedCallbacksPerPage list is empty. Right now it sounds like we could be simulating events in multiple pages at the same time and the first to finish will clear the global shared state. > Source/WebKit/UIProcess/Automation/WebAutomationSession.h:264 > + // True if a synthesized key or mouse event is still being processed. > + bool m_simulatingUserInteraction { false }; This says "or mouse event" but I don't see code below that sets this for mouse events. The comment seems inaccurate. 1363528 3 bburg 2017-10-23 19:43:05 -0700 (In reply to Joseph Pecoraro from comment #2) > Comment on attachment 324488 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=324488&action=review > > > Source/WebKit/UIProcess/API/Cocoa/_WKAutomationSession.h:46 > > +@property (nonatomic, readonly, getter=isSimulatingUserInteraction) BOOL simulatingUserInteraction; > > I think this needs: > > ... WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA)); > > > Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp:668 > > + m_simulatingUserInteraction = false; > > It sounds like we should only be clearing the m_simulatingUserInteraction > flag when the m_pendingKeyboardEventsFlushedCallbacksPerPage list is empty. > > Right now it sounds like we could be simulating events in multiple pages at > the same time and the first to finish will clear the global shared state. > > > Source/WebKit/UIProcess/Automation/WebAutomationSession.h:264 > > + // True if a synthesized key or mouse event is still being processed. > > + bool m_simulatingUserInteraction { false }; > > This says "or mouse event" but I don't see code below that sets this for > mouse events. The comment seems inaccurate. I will probably fix this for mouse events in a later patch. I've seen some reports of unexpected glass pane popups underneath Element Click command. We should at least log an error and not show the dialog in this case. 1363529 4 324629 bburg 2017-10-23 19:45:24 -0700 Created attachment 324629 For EWS 1363545 5 bburg 2017-10-23 20:33:45 -0700 EWS test failures on Mac-wk2 do not reproduce locally. 1363553 6 324633 bburg 2017-10-23 21:00:11 -0700 Created attachment 324633 For EWS 1363572 7 324633 commit-queue 2017-10-23 22:14:00 -0700 Comment on attachment 324633 For EWS Clearing flags on attachment: 324633 Committed r223880: <https://trac.webkit.org/changeset/223880> 1363573 8 commit-queue 2017-10-23 22:14:02 -0700 All reviewed patches have been landed. Closing bug. 1372288 9 webkit-bug-importer 2017-11-15 12:58:20 -0800 <rdar://problem/35568511> 324488 2017-10-20 22:22:12 -0700 2017-10-23 19:45:23 -0700 Patch bug-178616-20171020222212.patch text/plain 8937 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzNjExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDVhODAwM2FjZWNhYzc4NzU4 ZmY1OGE3NjMyNjg0YWY5MDAyNmVmNTUuLjg5YTkyNjY5NGExZGEyYzQ2MGI3ODEwYmYwNmFhYjNl Njk2ZGJhZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzcgQEAKIDIwMTctMTAtMjAgIEJyaWFuIEJ1 cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAKKyAgICAgICAgW0NvY29hXSBXZWIgQXV0b21hdGlvbjog YWRkIFNQSSB0byB0ZWxsIHdoZXRoZXIgdGhlIGF1dG9tYXRpb24gc2Vzc2lvbiBpcyBjdXJyZW50 bHkgc2ltdWxhdGluZyB1c2VyIGludGVyYWN0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc4NjE2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBuZWVkZWQgdG8gZGlzYW1iaWd1YXRlIHdo ZXRoZXIgYW4gYWN0aW9uIChzdWNoIGFzIHNlbGVjdEFsbDopIGNhbWUgZnJvbQorICAgICAgICBh IHVzZXIgY2xpY2tpbmcgb24gIkVkaXQgPiBTZWxlY3QgQWxsIiBpbiBhIG1lbnUgb3Igd2hldGhl ciBpdCB3YXMgcHJvZHVjZWQgYnkKKyAgICAgICAgc2ltdWxhdGluZyB0aGUga2V5c3Ryb2tlcyB0 byBwcm9kdWNlIHRoZSBjaG9yZCBmb3IgIkNvbW1hbmQgKyBhIi4gU29tZSBjbGllbnRzLAorICAg ICAgICBzdWNoIGFzIFNhZmFyaSwgd291bGQgYWxsb3cgdGhlIGxhdHRlciBidXQgbm90IHRoZSBm b3JtZXIgZHVyaW5nIGF1dG9tYXRpb24uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29h L19XS0F1dG9tYXRpb25TZXNzaW9uLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9f V0tBdXRvbWF0aW9uU2Vzc2lvbi5tbToKKyAgICAgICAgKC1bX1dLQXV0b21hdGlvblNlc3Npb24g aXNTaW11bGF0aW5nVXNlckludGVyYWN0aW9uXSk6CisgICAgICAgIEFkZCBuZXcgU1BJIHByb3Bl cnR5IHRoYXQncyBiYWNrZWQgYnkgdGhlIHNhbWUgV2ViQXV0b21hdGlvblNlc3Npb24gbWV0aG9k LgorCisgICAgICAgICogVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24u aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYkF1dG9tYXRpb25TZXNzaW9uOjprZXlib2FyZEV2ZW50 c0ZsdXNoZWRGb3JQYWdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViQXV0b21hdGlvblNlc3Npb246 OnBlcmZvcm1Nb3VzZUludGVyYWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViQXV0b21hdGlv blNlc3Npb246OnBlcmZvcm1LZXlib2FyZEludGVyYWN0aW9ucyk6CisgICAgICAgIFNldCBtX3Np bXVsYXRpbmdVc2VySW50ZXJhY3Rpb24gcHJpb3IgdG8gc2VuZGluZyB0aGUgc3ludGhlc2l6ZWQg ZXZlbnRzLiBJdCB3aWxsCisgICAgICAgIGJlIGNsZWFyZWQgd2hlbiBrZXlib2FyZEV2ZW50c0Zs dXNoZWRGb3JQYWdlKCkgaXMgY2FsbGVkIGJ5IFdlYlBhZ2VQcm94eS4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OmRpZFJlY2VpdmVFdmVudCk6CisgICAgICAgIE5vdGlmeSB0aGUgYXV0b21hdGlvbiBzZXNzaW9u IHRoYXQgdGhlIGtleSBldmVudCBxdWV1ZSB3YXMgZmx1c2hlZCAqYWZ0ZXIqIGdpdmluZworICAg ICAgICBkZWxlZ2F0ZXMgYSBjaGFuY2UgdG8gZG8gc29tZXRoaW5nIHdpdGggdGhlIGtleSBldmVu dC4gVGhpcyBpcyBuZWNlc3Nhcnkgc28gdGhhdAorICAgICAgICBhbnkgYWN0aW9ucyB0aGF0IGFy ZSBjcmVhdGVkIGZyb20gdGhlIE5TRXZlbnQgYnkgdGhlIGRlbGVnYXRlcyBhcmUgaGFuZGxlZCBw cmlvcgorICAgICAgICB0byB0aGUgYXV0b21hdGlvbiBzZXNzaW9uIGZpbmlzaGluZyBpdHMga2V5 Ym9hcmQgaW50ZXJhY3Rpb24gY29tbWFuZC4KKworMjAxNy0xMC0yMCAgQnJpYW4gQnVyZyAgPGJi dXJnQGFwcGxlLmNvbT4KKwogICAgICAgICBbTWFjXSBXZWIgQXV0b21hdGlvbjoga2V5IG1vZGlm aWVycyBmb3Igc3ludGhlc2l6ZWQgTlNFdmVudHMgYXJlIGluY29ycmVjdAogICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc4NjE1CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uU2Vzc2lvbi5o IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0F1dG9tYXRpb25TZXNzaW9u LmgKaW5kZXggOTlmN2RhZDMxOWRiYWY2NGMxNmNjYjk3MzI3MGM0NDNhODlhYWU1NS4uNDA1ZTE3 ODY3OTc0NTcwMjZhNjQ1ZDlmNzA1NWU5MWNmMzgzYzE1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0F1dG9tYXRpb25TZXNzaW9uLmgKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0F1dG9tYXRpb25TZXNzaW9uLmgKQEAg LTQzLDYgKzQzLDggQEAgV0tfQ0xBU1NfQVZBSUxBQkxFKG1hY29zeCgxMC4xMiksIGlvcygxMC4w KSkKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCB3ZWFrKSBpZCA8X1dLQXV0b21hdGlvblNlc3Npb25E ZWxlZ2F0ZT4gZGVsZWdhdGU7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHksIGdldHRl cj1pc1BhaXJlZCkgQk9PTCBwYWlyZWQ7CiAKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25s eSwgZ2V0dGVyPWlzU2ltdWxhdGluZ1VzZXJJbnRlcmFjdGlvbikgQk9PTCBzaW11bGF0aW5nVXNl ckludGVyYWN0aW9uOworCiAtIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhDb25maWd1cmF0aW9uOihf V0tBdXRvbWF0aW9uU2Vzc2lvbkNvbmZpZ3VyYXRpb24gKiljb25maWd1cmF0aW9uIE5TX0RFU0lH TkFURURfSU5JVElBTElaRVI7CiAKICNpZiAhVEFSR0VUX09TX0lQSE9ORQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0F1dG9tYXRpb25TZXNzaW9uLm1t IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0F1dG9tYXRpb25TZXNzaW9u Lm1tCmluZGV4IGI0MDBmYWU4Y2YwYTA0Y2UwYmRiOGNmYzBjNDEzNzNmYjA2NTBhYzAuLjQ1YzBk MDI1N2I3ODgxM2UxMGNkZjk3MzU1NTA5ZDgxN2ZhYWQ5NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uU2Vzc2lvbi5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLQXV0b21hdGlvblNlc3Npb24ubW0K QEAgLTk3LDYgKzk3LDExIEBAIC0gKEJPT0wpaXNQYWlyZWQKICAgICByZXR1cm4gX3Nlc3Npb24t PmlzUGFpcmVkKCk7CiB9CiAKKy0gKEJPT0wpaXNTaW11bGF0aW5nVXNlckludGVyYWN0aW9uCit7 CisgICAgcmV0dXJuIF9zZXNzaW9uLT5pc1NpbXVsYXRpbmdVc2VySW50ZXJhY3Rpb24oKTsKK30K KwogI2lmIFBMQVRGT1JNKE1BQykKIC0gKEJPT0wpd2FzRXZlbnRTeW50aGVzaXplZEZvckF1dG9t YXRpb246KE5TRXZlbnQgKilldmVudAogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcAppbmRleCA4NDk0 ZDg4NGYwOTc2MzY3NGYzYmU2MzRhYjVmMDYzYjRmODY3YjQ5Li4xMjIwOTA5ZmQ1NTQ3NGZmNTll M2YyYjZiY2RmODRkNDdjMDRlOTIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcApAQCAtNjYzLDgg KzY2MywxMCBAQCB2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjppbnNwZWN0b3JGcm9udGVuZExv YWRlZChjb25zdCBXZWJQYWdlUHJveHkmIHBhZ2UpCiAKIHZvaWQgV2ViQXV0b21hdGlvblNlc3Np b246OmtleWJvYXJkRXZlbnRzRmx1c2hlZEZvclBhZ2UoY29uc3QgV2ViUGFnZVByb3h5JiBwYWdl KQogewotICAgIGlmIChhdXRvIGNhbGxiYWNrID0gbV9wZW5kaW5nS2V5Ym9hcmRFdmVudHNGbHVz aGVkQ2FsbGJhY2tzUGVyUGFnZS50YWtlKHBhZ2UucGFnZUlEKCkpKQorICAgIGlmIChhdXRvIGNh bGxiYWNrID0gbV9wZW5kaW5nS2V5Ym9hcmRFdmVudHNGbHVzaGVkQ2FsbGJhY2tzUGVyUGFnZS50 YWtlKHBhZ2UucGFnZUlEKCkpKSB7CiAgICAgICAgIGNhbGxiYWNrLT5zZW5kU3VjY2VzcyhJbnNw ZWN0b3JPYmplY3Q6OmNyZWF0ZSgpKTsKKyAgICAgICAgbV9zaW11bGF0aW5nVXNlckludGVyYWN0 aW9uID0gZmFsc2U7CisgICAgfQogfQogCiB2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjp3aWxs Q2xvc2VQYWdlKGNvbnN0IFdlYlBhZ2VQcm94eSYgcGFnZSkKQEAgLTEyODQsNyArMTI4Niw3IEBA IHN0YXRpYyBXZWJFdmVudDo6TW9kaWZpZXJzIHByb3RvY29sTW9kaWZpZXJUb1dlYkV2ZW50TW9k aWZpZXIoSW5zcGVjdG9yOjpQcm90b2NvCiAKICAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hF RCgpOwogfQotI2VuZGlmIC8vIFVTRShBUFBLSVQpCisjZW5kaWYgLy8gVVNFKEFQUEtJVCkgfHwg UExBVEZPUk0oR1RLKQogCiB2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjpwZXJmb3JtTW91c2VJ bnRlcmFjdGlvbihJbnNwZWN0b3I6OkVycm9yU3RyaW5nJiBlcnJvclN0cmluZywgY29uc3QgU3Ry aW5nJiBoYW5kbGUsIGNvbnN0IEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0JiByZXF1ZXN0ZWRQ b3NpdGlvbk9iamVjdCwgY29uc3QgU3RyaW5nJiBtb3VzZUJ1dHRvblN0cmluZywgY29uc3QgU3Ry aW5nJiBtb3VzZUludGVyYWN0aW9uU3RyaW5nLCBjb25zdCBJbnNwZWN0b3I6Okluc3BlY3RvckFy cmF5JiBrZXlNb2RpZmllclN0cmluZ3MsIFJlZjxQZXJmb3JtTW91c2VJbnRlcmFjdGlvbkNhbGxi YWNrPiYmIGNhbGxiYWNrKQogewpAQCAtMTMzOCw3ICsxMzQwLDcgQEAgdm9pZCBXZWJBdXRvbWF0 aW9uU2Vzc2lvbjo6cGVyZm9ybU1vdXNlSW50ZXJhY3Rpb24oSW5zcGVjdG9yOjpFcnJvclN0cmlu ZyYgZXJyb3IKICAgICAgICAgICAgIC5zZXRZKHkgLSBwYWdlLT50b3BDb250ZW50SW5zZXQoKSkK ICAgICAgICAgICAgIC5yZWxlYXNlKCkpOwogICAgIH0pOwotI2VuZGlmIC8vIFVTRShBUFBLSVQp CisjZW5kaWYgLy8gVVNFKEFQUEtJVCkgfHwgUExBVEZPUk0oR1RLKQogfQogCiB2b2lkIFdlYkF1 dG9tYXRpb25TZXNzaW9uOjpwZXJmb3JtS2V5Ym9hcmRJbnRlcmFjdGlvbnMoRXJyb3JTdHJpbmcm IGVycm9yU3RyaW5nLCBjb25zdCBTdHJpbmcmIGhhbmRsZSwgY29uc3QgSW5zcGVjdG9yOjpJbnNw ZWN0b3JBcnJheSYgaW50ZXJhY3Rpb25zLCBSZWY8UGVyZm9ybUtleWJvYXJkSW50ZXJhY3Rpb25z Q2FsbGJhY2s+JiYgY2FsbGJhY2spCkBAIC0xNDExLDkgKzE0MTMsMTIgQEAgdm9pZCBXZWJBdXRv bWF0aW9uU2Vzc2lvbjo6cGVyZm9ybUtleWJvYXJkSW50ZXJhY3Rpb25zKEVycm9yU3RyaW5nJiBl cnJvclN0cmluZywKICAgICAgICAgY2FsbGJhY2tJbk1hcC0+c2VuZEZhaWx1cmUoU1RSSU5HX0ZP Ul9QUkVERUZJTkVEX0VSUk9SX05BTUUoVGltZW91dCkpOwogICAgIGNhbGxiYWNrSW5NYXAgPSBX VEZNb3ZlKGNhbGxiYWNrKTsKIAorICAgIC8vIFRoaXMgaXMgY2xlYXJlZCB3aGVuIGFsbCBrZXli b2FyZCBldmVudHMgYXJlIGZsdXNoZWQuCisgICAgbV9zaW11bGF0aW5nVXNlckludGVyYWN0aW9u ID0gdHJ1ZTsKKwogICAgIGZvciAoYXV0byYgYWN0aW9uIDogYWN0aW9uc1RvUGVyZm9ybSkKICAg ICAgICAgYWN0aW9uKCk7Ci0jZW5kaWYgLy8gUExBVEZPUk0oQ09DT0EpCisjZW5kaWYgLy8gUExB VEZPUk0oQ09DT0EpIHx8IFBMQVRGT1JNKEdUSykKIH0KIAogdm9pZCBXZWJBdXRvbWF0aW9uU2Vz c2lvbjo6dGFrZVNjcmVlbnNob3QoRXJyb3JTdHJpbmcmIGVycm9yU3RyaW5nLCBjb25zdCBTdHJp bmcmIGhhbmRsZSwgY29uc3QgU3RyaW5nKiBvcHRpb25hbEZyYW1lSGFuZGxlLCBjb25zdCBTdHJp bmcqIG9wdGlvbmFsTm9kZUhhbmRsZSwgY29uc3QgYm9vbCogb3B0aW9uYWxTY3JvbGxJbnRvVmll d0lmTmVlZGVkLCBSZWY8VGFrZVNjcmVlbnNob3RDYWxsYmFjaz4mJiBjYWxsYmFjaykKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNl c3Npb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlv blNlc3Npb24uaAppbmRleCA2MDRjYTBkYTIxZDllNWQxZjA2OTBhMTRhNGZhNTlmZmU4MDU0Yjlj Li4wN2E1NzcxOWQzNTZlNjIzZDk3ZTRhNDZiYTNmZTljMDcxMjRjZmJjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmgK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vz c2lvbi5oCkBAIC0xNTYsNiArMTU2LDcgQEAgcHVibGljOgogI2VuZGlmCiAKICAgICAvLyBFdmVu dCBTaW11bGF0aW9uIFN1cHBvcnQuCisgICAgYm9vbCBpc1NpbXVsYXRpbmdVc2VySW50ZXJhY3Rp b24oKSBjb25zdCB7IHJldHVybiBtX3NpbXVsYXRpbmdVc2VySW50ZXJhY3Rpb247IH0KICNpZiBQ TEFURk9STShNQUMpCiAgICAgYm9vbCB3YXNFdmVudFN5bnRoZXNpemVkRm9yQXV0b21hdGlvbihO U0V2ZW50ICopOwogICAgIHZvaWQgbWFya0V2ZW50QXNTeW50aGVzaXplZEZvckF1dG9tYXRpb24o TlNFdmVudCAqKTsKQEAgLTI1OSw2ICsyNjAsOCBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBtX3Bl cm1pc3Npb25Gb3JHZXRVc2VyTWVkaWEgeyB0cnVlIH07CiAKKyAgICAvLyBUcnVlIGlmIGEgc3lu dGhlc2l6ZWQga2V5IG9yIG1vdXNlIGV2ZW50IGlzIHN0aWxsIGJlaW5nIHByb2Nlc3NlZC4KKyAg ICBib29sIG1fc2ltdWxhdGluZ1VzZXJJbnRlcmFjdGlvbiB7IGZhbHNlIH07CiAKICAgICAvLyBL ZWVwIHRyYWNrIG9mIGN1cnJlbnRseSBhY3RpdmUgbW9kaWZpZXJzIGFjcm9zcyBtdWx0aXBsZSBr ZXlzdHJva2VzLgogICAgIC8vIE1vc3QgcGxhdGZvcm1zIGRvIG5vdCB0cmFjayBjdXJyZW50IG1v ZGlmaWVycyBmcm9tIHN5bnRoZXNpemVkIGV2ZW50cy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwCmluZGV4IDU3YWNmNjQ4NWVhZjlhMGMwYjhlNDVmMDQzNzNjZmIyMTZm NTQzOTQuLmJhMTJiZmE4YmVkZDM1NjVlZmI3MzI5YjdhYjJmNzFmNDJhM2ZiYzMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtNTA4NSw5ICs1MDg1LDYgQEAg dm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVFdmVudCh1aW50MzJfdCBvcGFxdWVUeXBlLCBi b29sIGhhbmRsZWQpCiAgICAgICAgIGlmICghbV9rZXlFdmVudFF1ZXVlLmlzRW1wdHkoKSkgewog ICAgICAgICAgICAgTE9HKEtleUhhbmRsaW5nLCAiIFVJIHByb2Nlc3M6IHNlbnQga2V5RXZlbnQg ZnJvbSBkaWRSZWNlaXZlRXZlbnQiKTsKICAgICAgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNz YWdlczo6V2ViUGFnZTo6S2V5RXZlbnQobV9rZXlFdmVudFF1ZXVlLmZpcnN0KCkpLCBtX3BhZ2VJ RCk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBpZiAoYXV0byogYXV0b21hdGlvblNl c3Npb24gPSBwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKS5hdXRvbWF0aW9uU2Vzc2lvbigpKQotICAg ICAgICAgICAgICAgIGF1dG9tYXRpb25TZXNzaW9uLT5rZXlib2FyZEV2ZW50c0ZsdXNoZWRGb3JQ YWdlKCp0aGlzKTsKICAgICAgICAgfQogCiAgICAgICAgIC8vIFRoZSBjYWxsIHRvIGRvbmVXaXRo S2V5RXZlbnQgbWF5IGNsb3NlIHRoaXMgV2ViUGFnZS4KQEAgLTUwOTUsMTAgKzUwOTIsMTQgQEAg dm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVFdmVudCh1aW50MzJfdCBvcGFxdWVUeXBlLCBi b29sIGhhbmRsZWQpCiAgICAgICAgIFJlZjxXZWJQYWdlUHJveHk+IHByb3RlY3QoKnRoaXMpOwog CiAgICAgICAgIG1fcGFnZUNsaWVudC5kb25lV2l0aEtleUV2ZW50KGV2ZW50LCBoYW5kbGVkKTsK LSAgICAgICAgaWYgKGhhbmRsZWQpCi0gICAgICAgICAgICBicmVhazsKKyAgICAgICAgaWYgKCFo YW5kbGVkKQorICAgICAgICAgICAgbV91aUNsaWVudC0+ZGlkTm90SGFuZGxlS2V5RXZlbnQodGhp cywgZXZlbnQpOwogCi0gICAgICAgIG1fdWlDbGllbnQtPmRpZE5vdEhhbmRsZUtleUV2ZW50KHRo aXMsIGV2ZW50KTsKKyAgICAgICAgLy8gTm90aWZ5IHRoZSBzZXNzaW9uIGFmdGVyIC1bTlNBcHAg c2VuZEV2ZW50Ol0gaGFzIGEgY3JhY2sgYXQgdHVybmluZyB0aGUgZXZlbnQgaW50byBhbiBhY3Rp b24uCisgICAgICAgIGlmIChtX2tleUV2ZW50UXVldWUuaXNFbXB0eSgpKSB7CisgICAgICAgICAg ICBpZiAoYXV0byogYXV0b21hdGlvblNlc3Npb24gPSBwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKS5h dXRvbWF0aW9uU2Vzc2lvbigpKQorICAgICAgICAgICAgICAgIGF1dG9tYXRpb25TZXNzaW9uLT5r ZXlib2FyZEV2ZW50c0ZsdXNoZWRGb3JQYWdlKCp0aGlzKTsKKyAgICAgICAgfQogICAgICAgICBi cmVhazsKICAgICB9CiAjaWYgRU5BQkxFKE1BQ19HRVNUVVJFX0VWRU5UUykK 324629 2017-10-23 19:45:24 -0700 2017-10-23 21:00:09 -0700 For EWS bug-178616-20171023194523.patch text/plain 9060 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzODc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY1NGE5OTQxMGE2YzQ0MDcw NGRjNzY1ZDlhMjg2MjE0NWEzMmMzMmQuLjcxZjQ0NGQ2MThkYjM0NTZlNmM3NDU3NmQ0Y2EzMDUx OWI4ZTcyMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzcgQEAKIDIwMTctMTAtMjMgIEJyaWFuIEJ1 cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAKKyAgICAgICAgW0NvY29hXSBXZWIgQXV0b21hdGlvbjog YWRkIFNQSSB0byB0ZWxsIHdoZXRoZXIgdGhlIGF1dG9tYXRpb24gc2Vzc2lvbiBpcyBjdXJyZW50 bHkgc2ltdWxhdGluZyB1c2VyIGludGVyYWN0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc4NjE2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSm9z ZXBoIFBlY29yYXJvLgorCisgICAgICAgIFRoaXMgaXMgbmVlZGVkIHRvIGRpc2FtYmlndWF0ZSB3 aGV0aGVyIGFuIGFjdGlvbiAoc3VjaCBhcyBzZWxlY3RBbGw6KSBjYW1lIGZyb20KKyAgICAgICAg YSB1c2VyIGNsaWNraW5nIG9uICJFZGl0ID4gU2VsZWN0IEFsbCIgaW4gYSBtZW51IG9yIHdoZXRo ZXIgaXQgd2FzIHByb2R1Y2VkIGJ5CisgICAgICAgIHNpbXVsYXRpbmcgdGhlIGtleXN0cm9rZXMg dG8gcHJvZHVjZSB0aGUgY2hvcmQgZm9yICJDb21tYW5kICsgYSIuIFNvbWUgY2xpZW50cywKKyAg ICAgICAgc3VjaCBhcyBTYWZhcmksIHdvdWxkIGFsbG93IHRoZSBsYXR0ZXIgYnV0IG5vdCB0aGUg Zm9ybWVyIGR1cmluZyBhdXRvbWF0aW9uLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2Nv YS9fV0tBdXRvbWF0aW9uU2Vzc2lvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2Ev X1dLQXV0b21hdGlvblNlc3Npb24ubW06CisgICAgICAgICgtW19XS0F1dG9tYXRpb25TZXNzaW9u IGlzU2ltdWxhdGluZ1VzZXJJbnRlcmFjdGlvbl0pOgorICAgICAgICBBZGQgbmV3IFNQSSBwcm9w ZXJ0eSB0aGF0J3MgYmFja2VkIGJ5IHRoZSBzYW1lIFdlYkF1dG9tYXRpb25TZXNzaW9uIG1ldGhv ZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9u Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24u Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6a2V5Ym9hcmRFdmVu dHNGbHVzaGVkRm9yUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkF1dG9tYXRpb25TZXNzaW9u OjpwZXJmb3JtTW91c2VJbnRlcmFjdGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYkF1dG9tYXRp b25TZXNzaW9uOjpwZXJmb3JtS2V5Ym9hcmRJbnRlcmFjdGlvbnMpOgorICAgICAgICBTZXQgbV9z aW11bGF0aW5nVXNlckludGVyYWN0aW9uIHByaW9yIHRvIHNlbmRpbmcgdGhlIHN5bnRoZXNpemVk IGV2ZW50cy4gSXQgd2lsbAorICAgICAgICBiZSBjbGVhcmVkIHdoZW4ga2V5Ym9hcmRFdmVudHNG bHVzaGVkRm9yUGFnZSgpIGlzIGNhbGxlZCBieSBXZWJQYWdlUHJveHkuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 OjpkaWRSZWNlaXZlRXZlbnQpOgorICAgICAgICBOb3RpZnkgdGhlIGF1dG9tYXRpb24gc2Vzc2lv biB0aGF0IHRoZSBrZXkgZXZlbnQgcXVldWUgd2FzIGZsdXNoZWQgKmFmdGVyKiBnaXZpbmcKKyAg ICAgICAgZGVsZWdhdGVzIGEgY2hhbmNlIHRvIGRvIHNvbWV0aGluZyB3aXRoIHRoZSBrZXkgZXZl bnQuIFRoaXMgaXMgbmVjZXNzYXJ5IHNvIHRoYXQKKyAgICAgICAgYW55IGFjdGlvbnMgdGhhdCBh cmUgY3JlYXRlZCBmcm9tIHRoZSBOU0V2ZW50IGJ5IHRoZSBkZWxlZ2F0ZXMgYXJlIGhhbmRsZWQg cHJpb3IKKyAgICAgICAgdG8gdGhlIGF1dG9tYXRpb24gc2Vzc2lvbiBmaW5pc2hpbmcgaXRzIGtl eWJvYXJkIGludGVyYWN0aW9uIGNvbW1hbmQuCisKKzIwMTctMTAtMjMgIEJyaWFuIEJ1cmcgIDxi YnVyZ0BhcHBsZS5jb20+CisKICAgICAgICAgW01hY10gV2ViIEF1dG9tYXRpb246IGtleSBtb2Rp ZmllcnMgZm9yIHN5bnRoZXNpemVkIE5TRXZlbnRzIGFyZSBpbmNvcnJlY3QKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3ODYxNQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLQXV0b21hdGlvblNlc3Npb24u aCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uU2Vzc2lv bi5oCmluZGV4IDk5ZjdkYWQzMTlkYmFmNjRjMTZjY2I5NzMyNzBjNDQzYTg5YWFlNTUuLmJlMjkw ZTY2YzQ0ZWFiMTE1NThmY2U3ODc3OWRiYzBlYjhmMWExMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uU2Vzc2lvbi5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uU2Vzc2lvbi5oCkBA IC00Myw2ICs0Myw4IEBAIFdLX0NMQVNTX0FWQUlMQUJMRShtYWNvc3goMTAuMTIpLCBpb3MoMTAu MCkpCiBAcHJvcGVydHkgKG5vbmF0b21pYywgd2VhaykgaWQgPF9XS0F1dG9tYXRpb25TZXNzaW9u RGVsZWdhdGU+IGRlbGVnYXRlOwogQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5LCBnZXR0 ZXI9aXNQYWlyZWQpIEJPT0wgcGFpcmVkOwogCitAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9u bHksIGdldHRlcj1pc1NpbXVsYXRpbmdVc2VySW50ZXJhY3Rpb24pIEJPT0wgc2ltdWxhdGluZ1Vz ZXJJbnRlcmFjdGlvbiBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSwgaW9zKFdL X0lPU19UQkEpKTsKKwogLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoQ29uZmlndXJhdGlvbjooX1dL QXV0b21hdGlvblNlc3Npb25Db25maWd1cmF0aW9uICopY29uZmlndXJhdGlvbiBOU19ERVNJR05B VEVEX0lOSVRJQUxJWkVSOwogCiAjaWYgIVRBUkdFVF9PU19JUEhPTkUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uU2Vzc2lvbi5tbSBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uU2Vzc2lvbi5t bQppbmRleCBiNDAwZmFlOGNmMGEwNGNlMGJkYjhjZmMwYzQxMzczZmIwNjUwYWMwLi40NWMwZDAy NTdiNzg4MTNlMTBjZGY5NzM1NTUwOWQ4MTdmYWFkOTQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLQXV0b21hdGlvblNlc3Npb24ubW0KKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0F1dG9tYXRpb25TZXNzaW9uLm1tCkBA IC05Nyw2ICs5NywxMSBAQCAtIChCT09MKWlzUGFpcmVkCiAgICAgcmV0dXJuIF9zZXNzaW9uLT5p c1BhaXJlZCgpOwogfQogCistIChCT09MKWlzU2ltdWxhdGluZ1VzZXJJbnRlcmFjdGlvbgorewor ICAgIHJldHVybiBfc2Vzc2lvbi0+aXNTaW11bGF0aW5nVXNlckludGVyYWN0aW9uKCk7Cit9CisK ICNpZiBQTEFURk9STShNQUMpCiAtIChCT09MKXdhc0V2ZW50U3ludGhlc2l6ZWRGb3JBdXRvbWF0 aW9uOihOU0V2ZW50ICopZXZlbnQKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uY3BwIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHAKaW5kZXggODQ5NGQ4 ODRmMDk3NjM2NzRmM2JlNjM0YWI1ZjA2M2I0Zjg2N2I0OS4uYmYxOWIwYWFjM2ViNjFhZDc5MzVj NjE1M2VlNmIyNDg5ZDg4ZmUwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHAKQEAgLTY2Myw4ICs2 NjMsMTIgQEAgdm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6aW5zcGVjdG9yRnJvbnRlbmRMb2Fk ZWQoY29uc3QgV2ViUGFnZVByb3h5JiBwYWdlKQogCiB2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9u OjprZXlib2FyZEV2ZW50c0ZsdXNoZWRGb3JQYWdlKGNvbnN0IFdlYlBhZ2VQcm94eSYgcGFnZSkK IHsKLSAgICBpZiAoYXV0byBjYWxsYmFjayA9IG1fcGVuZGluZ0tleWJvYXJkRXZlbnRzRmx1c2hl ZENhbGxiYWNrc1BlclBhZ2UudGFrZShwYWdlLnBhZ2VJRCgpKSkKKyAgICBpZiAoYXV0byBjYWxs YmFjayA9IG1fcGVuZGluZ0tleWJvYXJkRXZlbnRzRmx1c2hlZENhbGxiYWNrc1BlclBhZ2UudGFr ZShwYWdlLnBhZ2VJRCgpKSkgewogICAgICAgICBjYWxsYmFjay0+c2VuZFN1Y2Nlc3MoSW5zcGVj dG9yT2JqZWN0OjpjcmVhdGUoKSk7CisKKyAgICAgICAgaWYgKG1fcGVuZGluZ0tleWJvYXJkRXZl bnRzRmx1c2hlZENhbGxiYWNrc1BlclBhZ2UuaXNFbXB0eSgpKQorICAgICAgICAgICAgbV9zaW11 bGF0aW5nVXNlckludGVyYWN0aW9uID0gZmFsc2U7CisgICAgfQogfQogCiB2b2lkIFdlYkF1dG9t YXRpb25TZXNzaW9uOjp3aWxsQ2xvc2VQYWdlKGNvbnN0IFdlYlBhZ2VQcm94eSYgcGFnZSkKQEAg LTEyODQsNyArMTI4OCw3IEBAIHN0YXRpYyBXZWJFdmVudDo6TW9kaWZpZXJzIHByb3RvY29sTW9k aWZpZXJUb1dlYkV2ZW50TW9kaWZpZXIoSW5zcGVjdG9yOjpQcm90b2NvCiAKICAgICBSRUxFQVNF X0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQotI2VuZGlmIC8vIFVTRShBUFBLSVQpCisjZW5kaWYg Ly8gVVNFKEFQUEtJVCkgfHwgUExBVEZPUk0oR1RLKQogCiB2b2lkIFdlYkF1dG9tYXRpb25TZXNz aW9uOjpwZXJmb3JtTW91c2VJbnRlcmFjdGlvbihJbnNwZWN0b3I6OkVycm9yU3RyaW5nJiBlcnJv clN0cmluZywgY29uc3QgU3RyaW5nJiBoYW5kbGUsIGNvbnN0IEluc3BlY3Rvcjo6SW5zcGVjdG9y T2JqZWN0JiByZXF1ZXN0ZWRQb3NpdGlvbk9iamVjdCwgY29uc3QgU3RyaW5nJiBtb3VzZUJ1dHRv blN0cmluZywgY29uc3QgU3RyaW5nJiBtb3VzZUludGVyYWN0aW9uU3RyaW5nLCBjb25zdCBJbnNw ZWN0b3I6Okluc3BlY3RvckFycmF5JiBrZXlNb2RpZmllclN0cmluZ3MsIFJlZjxQZXJmb3JtTW91 c2VJbnRlcmFjdGlvbkNhbGxiYWNrPiYmIGNhbGxiYWNrKQogewpAQCAtMTMzOCw3ICsxMzQyLDcg QEAgdm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6cGVyZm9ybU1vdXNlSW50ZXJhY3Rpb24oSW5z cGVjdG9yOjpFcnJvclN0cmluZyYgZXJyb3IKICAgICAgICAgICAgIC5zZXRZKHkgLSBwYWdlLT50 b3BDb250ZW50SW5zZXQoKSkKICAgICAgICAgICAgIC5yZWxlYXNlKCkpOwogICAgIH0pOwotI2Vu ZGlmIC8vIFVTRShBUFBLSVQpCisjZW5kaWYgLy8gVVNFKEFQUEtJVCkgfHwgUExBVEZPUk0oR1RL KQogfQogCiB2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjpwZXJmb3JtS2V5Ym9hcmRJbnRlcmFj dGlvbnMoRXJyb3JTdHJpbmcmIGVycm9yU3RyaW5nLCBjb25zdCBTdHJpbmcmIGhhbmRsZSwgY29u c3QgSW5zcGVjdG9yOjpJbnNwZWN0b3JBcnJheSYgaW50ZXJhY3Rpb25zLCBSZWY8UGVyZm9ybUtl eWJvYXJkSW50ZXJhY3Rpb25zQ2FsbGJhY2s+JiYgY2FsbGJhY2spCkBAIC0xNDExLDkgKzE0MTUs MTIgQEAgdm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6cGVyZm9ybUtleWJvYXJkSW50ZXJhY3Rp b25zKEVycm9yU3RyaW5nJiBlcnJvclN0cmluZywKICAgICAgICAgY2FsbGJhY2tJbk1hcC0+c2Vu ZEZhaWx1cmUoU1RSSU5HX0ZPUl9QUkVERUZJTkVEX0VSUk9SX05BTUUoVGltZW91dCkpOwogICAg IGNhbGxiYWNrSW5NYXAgPSBXVEZNb3ZlKGNhbGxiYWNrKTsKIAorICAgIC8vIFRoaXMgaXMgY2xl YXJlZCB3aGVuIGFsbCBrZXlib2FyZCBldmVudHMgYXJlIGZsdXNoZWQuCisgICAgbV9zaW11bGF0 aW5nVXNlckludGVyYWN0aW9uID0gdHJ1ZTsKKwogICAgIGZvciAoYXV0byYgYWN0aW9uIDogYWN0 aW9uc1RvUGVyZm9ybSkKICAgICAgICAgYWN0aW9uKCk7Ci0jZW5kaWYgLy8gUExBVEZPUk0oQ09D T0EpCisjZW5kaWYgLy8gUExBVEZPUk0oQ09DT0EpIHx8IFBMQVRGT1JNKEdUSykKIH0KIAogdm9p ZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6dGFrZVNjcmVlbnNob3QoRXJyb3JTdHJpbmcmIGVycm9y U3RyaW5nLCBjb25zdCBTdHJpbmcmIGhhbmRsZSwgY29uc3QgU3RyaW5nKiBvcHRpb25hbEZyYW1l SGFuZGxlLCBjb25zdCBTdHJpbmcqIG9wdGlvbmFsTm9kZUhhbmRsZSwgY29uc3QgYm9vbCogb3B0 aW9uYWxTY3JvbGxJbnRvVmlld0lmTmVlZGVkLCBSZWY8VGFrZVNjcmVlbnNob3RDYWxsYmFjaz4m JiBjYWxsYmFjaykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRp b24vV2ViQXV0b21hdGlvblNlc3Npb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9t YXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uaAppbmRleCA2MDRjYTBkYTIxZDllNWQxZjA2OTBh MTRhNGZhNTlmZmU4MDU0YjljLi4zYjYwMTJjMzc1OGU2ODIyYzhhYmNhNzU3YWVjODk0ZWI2ODY5 MzQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1 dG9tYXRpb25TZXNzaW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlv bi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5oCkBAIC0xNTYsNiArMTU2LDcgQEAgcHVibGljOgogI2Vu ZGlmCiAKICAgICAvLyBFdmVudCBTaW11bGF0aW9uIFN1cHBvcnQuCisgICAgYm9vbCBpc1NpbXVs YXRpbmdVc2VySW50ZXJhY3Rpb24oKSBjb25zdCB7IHJldHVybiBtX3NpbXVsYXRpbmdVc2VySW50 ZXJhY3Rpb247IH0KICNpZiBQTEFURk9STShNQUMpCiAgICAgYm9vbCB3YXNFdmVudFN5bnRoZXNp emVkRm9yQXV0b21hdGlvbihOU0V2ZW50ICopOwogICAgIHZvaWQgbWFya0V2ZW50QXNTeW50aGVz aXplZEZvckF1dG9tYXRpb24oTlNFdmVudCAqKTsKQEAgLTI1OSw2ICsyNjAsOCBAQCBwcml2YXRl OgogCiAgICAgYm9vbCBtX3Blcm1pc3Npb25Gb3JHZXRVc2VyTWVkaWEgeyB0cnVlIH07CiAKKyAg ICAvLyBUcnVlIGlmIGEgc3ludGhlc2l6ZWQga2V5IGV2ZW50IGlzIHN0aWxsIGJlaW5nIHByb2Nl c3NlZC4KKyAgICBib29sIG1fc2ltdWxhdGluZ1VzZXJJbnRlcmFjdGlvbiB7IGZhbHNlIH07CiAK ICAgICAvLyBLZWVwIHRyYWNrIG9mIGN1cnJlbnRseSBhY3RpdmUgbW9kaWZpZXJzIGFjcm9zcyBt dWx0aXBsZSBrZXlzdHJva2VzLgogICAgIC8vIE1vc3QgcGxhdGZvcm1zIGRvIG5vdCB0cmFjayBj dXJyZW50IG1vZGlmaWVycyBmcm9tIHN5bnRoZXNpemVkIGV2ZW50cy4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGNjMWZiMTcxM2Q1ZTJiMDczNTlkYjZhZGI1 YzhjNzMzOGZjNDM0NTAuLmY4YWMxODY5NGUyOGQzNTljMGJmNDRmNGNiYjRjOGZkYWY3NmI3YzIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtNTA4NSw5ICs1 MDg1LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVFdmVudCh1aW50MzJfdCBvcGFx dWVUeXBlLCBib29sIGhhbmRsZWQpCiAgICAgICAgIGlmICghbV9rZXlFdmVudFF1ZXVlLmlzRW1w dHkoKSkgewogICAgICAgICAgICAgTE9HKEtleUhhbmRsaW5nLCAiIFVJIHByb2Nlc3M6IHNlbnQg a2V5RXZlbnQgZnJvbSBkaWRSZWNlaXZlRXZlbnQiKTsKICAgICAgICAgICAgIG1fcHJvY2Vzcy0+ c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6S2V5RXZlbnQobV9rZXlFdmVudFF1ZXVlLmZpcnN0KCkp LCBtX3BhZ2VJRCk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBpZiAoYXV0byogYXV0 b21hdGlvblNlc3Npb24gPSBwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKS5hdXRvbWF0aW9uU2Vzc2lv bigpKQotICAgICAgICAgICAgICAgIGF1dG9tYXRpb25TZXNzaW9uLT5rZXlib2FyZEV2ZW50c0Zs dXNoZWRGb3JQYWdlKCp0aGlzKTsKICAgICAgICAgfQogCiAgICAgICAgIC8vIFRoZSBjYWxsIHRv IGRvbmVXaXRoS2V5RXZlbnQgbWF5IGNsb3NlIHRoaXMgV2ViUGFnZS4KQEAgLTUwOTUsMTAgKzUw OTIsMTQgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVFdmVudCh1aW50MzJfdCBvcGFx dWVUeXBlLCBib29sIGhhbmRsZWQpCiAgICAgICAgIFJlZjxXZWJQYWdlUHJveHk+IHByb3RlY3Qo KnRoaXMpOwogCiAgICAgICAgIG1fcGFnZUNsaWVudC5kb25lV2l0aEtleUV2ZW50KGV2ZW50LCBo YW5kbGVkKTsKLSAgICAgICAgaWYgKGhhbmRsZWQpCi0gICAgICAgICAgICBicmVhazsKKyAgICAg ICAgaWYgKCFoYW5kbGVkKQorICAgICAgICAgICAgbV91aUNsaWVudC0+ZGlkTm90SGFuZGxlS2V5 RXZlbnQodGhpcywgZXZlbnQpOwogCi0gICAgICAgIG1fdWlDbGllbnQtPmRpZE5vdEhhbmRsZUtl eUV2ZW50KHRoaXMsIGV2ZW50KTsKKyAgICAgICAgLy8gTm90aWZ5IHRoZSBzZXNzaW9uIGFmdGVy IC1bTlNBcHAgc2VuZEV2ZW50Ol0gaGFzIGEgY3JhY2sgYXQgdHVybmluZyB0aGUgZXZlbnQgaW50 byBhbiBhY3Rpb24uCisgICAgICAgIGlmIChtX2tleUV2ZW50UXVldWUuaXNFbXB0eSgpKSB7Cisg ICAgICAgICAgICBpZiAoYXV0byogYXV0b21hdGlvblNlc3Npb24gPSBwcm9jZXNzKCkucHJvY2Vz c1Bvb2woKS5hdXRvbWF0aW9uU2Vzc2lvbigpKQorICAgICAgICAgICAgICAgIGF1dG9tYXRpb25T ZXNzaW9uLT5rZXlib2FyZEV2ZW50c0ZsdXNoZWRGb3JQYWdlKCp0aGlzKTsKKyAgICAgICAgfQog ICAgICAgICBicmVhazsKICAgICB9CiAjaWYgRU5BQkxFKE1BQ19HRVNUVVJFX0VWRU5UUykK 324633 2017-10-23 21:00:11 -0700 2017-10-23 22:14:00 -0700 For EWS bug-178616-20171023210010.patch text/plain 9060 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzODc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY1NGE5OTQxMGE2YzQ0MDcw NGRjNzY1ZDlhMjg2MjE0NWEzMmMzMmQuLjcxZjQ0NGQ2MThkYjM0NTZlNmM3NDU3NmQ0Y2EzMDUx OWI4ZTcyMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzcgQEAKIDIwMTctMTAtMjMgIEJyaWFuIEJ1 cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAKKyAgICAgICAgW0NvY29hXSBXZWIgQXV0b21hdGlvbjog YWRkIFNQSSB0byB0ZWxsIHdoZXRoZXIgdGhlIGF1dG9tYXRpb24gc2Vzc2lvbiBpcyBjdXJyZW50 bHkgc2ltdWxhdGluZyB1c2VyIGludGVyYWN0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc4NjE2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSm9z ZXBoIFBlY29yYXJvLgorCisgICAgICAgIFRoaXMgaXMgbmVlZGVkIHRvIGRpc2FtYmlndWF0ZSB3 aGV0aGVyIGFuIGFjdGlvbiAoc3VjaCBhcyBzZWxlY3RBbGw6KSBjYW1lIGZyb20KKyAgICAgICAg YSB1c2VyIGNsaWNraW5nIG9uICJFZGl0ID4gU2VsZWN0IEFsbCIgaW4gYSBtZW51IG9yIHdoZXRo ZXIgaXQgd2FzIHByb2R1Y2VkIGJ5CisgICAgICAgIHNpbXVsYXRpbmcgdGhlIGtleXN0cm9rZXMg dG8gcHJvZHVjZSB0aGUgY2hvcmQgZm9yICJDb21tYW5kICsgYSIuIFNvbWUgY2xpZW50cywKKyAg ICAgICAgc3VjaCBhcyBTYWZhcmksIHdvdWxkIGFsbG93IHRoZSBsYXR0ZXIgYnV0IG5vdCB0aGUg Zm9ybWVyIGR1cmluZyBhdXRvbWF0aW9uLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2Nv YS9fV0tBdXRvbWF0aW9uU2Vzc2lvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2Ev X1dLQXV0b21hdGlvblNlc3Npb24ubW06CisgICAgICAgICgtW19XS0F1dG9tYXRpb25TZXNzaW9u IGlzU2ltdWxhdGluZ1VzZXJJbnRlcmFjdGlvbl0pOgorICAgICAgICBBZGQgbmV3IFNQSSBwcm9w ZXJ0eSB0aGF0J3MgYmFja2VkIGJ5IHRoZSBzYW1lIFdlYkF1dG9tYXRpb25TZXNzaW9uIG1ldGhv ZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9u Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24u Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6a2V5Ym9hcmRFdmVu dHNGbHVzaGVkRm9yUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkF1dG9tYXRpb25TZXNzaW9u OjpwZXJmb3JtTW91c2VJbnRlcmFjdGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYkF1dG9tYXRp b25TZXNzaW9uOjpwZXJmb3JtS2V5Ym9hcmRJbnRlcmFjdGlvbnMpOgorICAgICAgICBTZXQgbV9z aW11bGF0aW5nVXNlckludGVyYWN0aW9uIHByaW9yIHRvIHNlbmRpbmcgdGhlIHN5bnRoZXNpemVk IGV2ZW50cy4gSXQgd2lsbAorICAgICAgICBiZSBjbGVhcmVkIHdoZW4ga2V5Ym9hcmRFdmVudHNG bHVzaGVkRm9yUGFnZSgpIGlzIGNhbGxlZCBieSBXZWJQYWdlUHJveHkuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 OjpkaWRSZWNlaXZlRXZlbnQpOgorICAgICAgICBOb3RpZnkgdGhlIGF1dG9tYXRpb24gc2Vzc2lv biB0aGF0IHRoZSBrZXkgZXZlbnQgcXVldWUgd2FzIGZsdXNoZWQgKmFmdGVyKiBnaXZpbmcKKyAg ICAgICAgZGVsZWdhdGVzIGEgY2hhbmNlIHRvIGRvIHNvbWV0aGluZyB3aXRoIHRoZSBrZXkgZXZl bnQuIFRoaXMgaXMgbmVjZXNzYXJ5IHNvIHRoYXQKKyAgICAgICAgYW55IGFjdGlvbnMgdGhhdCBh cmUgY3JlYXRlZCBmcm9tIHRoZSBOU0V2ZW50IGJ5IHRoZSBkZWxlZ2F0ZXMgYXJlIGhhbmRsZWQg cHJpb3IKKyAgICAgICAgdG8gdGhlIGF1dG9tYXRpb24gc2Vzc2lvbiBmaW5pc2hpbmcgaXRzIGtl eWJvYXJkIGludGVyYWN0aW9uIGNvbW1hbmQuCisKKzIwMTctMTAtMjMgIEJyaWFuIEJ1cmcgIDxi YnVyZ0BhcHBsZS5jb20+CisKICAgICAgICAgW01hY10gV2ViIEF1dG9tYXRpb246IGtleSBtb2Rp ZmllcnMgZm9yIHN5bnRoZXNpemVkIE5TRXZlbnRzIGFyZSBpbmNvcnJlY3QKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3ODYxNQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLQXV0b21hdGlvblNlc3Npb24u aCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uU2Vzc2lv bi5oCmluZGV4IDk5ZjdkYWQzMTlkYmFmNjRjMTZjY2I5NzMyNzBjNDQzYTg5YWFlNTUuLmJlMjkw ZTY2YzQ0ZWFiMTE1NThmY2U3ODc3OWRiYzBlYjhmMWExMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uU2Vzc2lvbi5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uU2Vzc2lvbi5oCkBA IC00Myw2ICs0Myw4IEBAIFdLX0NMQVNTX0FWQUlMQUJMRShtYWNvc3goMTAuMTIpLCBpb3MoMTAu MCkpCiBAcHJvcGVydHkgKG5vbmF0b21pYywgd2VhaykgaWQgPF9XS0F1dG9tYXRpb25TZXNzaW9u RGVsZWdhdGU+IGRlbGVnYXRlOwogQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5LCBnZXR0 ZXI9aXNQYWlyZWQpIEJPT0wgcGFpcmVkOwogCitAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9u bHksIGdldHRlcj1pc1NpbXVsYXRpbmdVc2VySW50ZXJhY3Rpb24pIEJPT0wgc2ltdWxhdGluZ1Vz ZXJJbnRlcmFjdGlvbiBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSwgaW9zKFdL X0lPU19UQkEpKTsKKwogLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoQ29uZmlndXJhdGlvbjooX1dL QXV0b21hdGlvblNlc3Npb25Db25maWd1cmF0aW9uICopY29uZmlndXJhdGlvbiBOU19ERVNJR05B VEVEX0lOSVRJQUxJWkVSOwogCiAjaWYgIVRBUkdFVF9PU19JUEhPTkUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uU2Vzc2lvbi5tbSBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uU2Vzc2lvbi5t bQppbmRleCBiNDAwZmFlOGNmMGEwNGNlMGJkYjhjZmMwYzQxMzczZmIwNjUwYWMwLi40NWMwZDAy NTdiNzg4MTNlMTBjZGY5NzM1NTUwOWQ4MTdmYWFkOTQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLQXV0b21hdGlvblNlc3Npb24ubW0KKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0F1dG9tYXRpb25TZXNzaW9uLm1tCkBA IC05Nyw2ICs5NywxMSBAQCAtIChCT09MKWlzUGFpcmVkCiAgICAgcmV0dXJuIF9zZXNzaW9uLT5p c1BhaXJlZCgpOwogfQogCistIChCT09MKWlzU2ltdWxhdGluZ1VzZXJJbnRlcmFjdGlvbgorewor ICAgIHJldHVybiBfc2Vzc2lvbi0+aXNTaW11bGF0aW5nVXNlckludGVyYWN0aW9uKCk7Cit9CisK ICNpZiBQTEFURk9STShNQUMpCiAtIChCT09MKXdhc0V2ZW50U3ludGhlc2l6ZWRGb3JBdXRvbWF0 aW9uOihOU0V2ZW50ICopZXZlbnQKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uY3BwIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHAKaW5kZXggODQ5NGQ4 ODRmMDk3NjM2NzRmM2JlNjM0YWI1ZjA2M2I0Zjg2N2I0OS4uYmYxOWIwYWFjM2ViNjFhZDc5MzVj NjE1M2VlNmIyNDg5ZDg4ZmUwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHAKQEAgLTY2Myw4ICs2 NjMsMTIgQEAgdm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6aW5zcGVjdG9yRnJvbnRlbmRMb2Fk ZWQoY29uc3QgV2ViUGFnZVByb3h5JiBwYWdlKQogCiB2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9u OjprZXlib2FyZEV2ZW50c0ZsdXNoZWRGb3JQYWdlKGNvbnN0IFdlYlBhZ2VQcm94eSYgcGFnZSkK IHsKLSAgICBpZiAoYXV0byBjYWxsYmFjayA9IG1fcGVuZGluZ0tleWJvYXJkRXZlbnRzRmx1c2hl ZENhbGxiYWNrc1BlclBhZ2UudGFrZShwYWdlLnBhZ2VJRCgpKSkKKyAgICBpZiAoYXV0byBjYWxs YmFjayA9IG1fcGVuZGluZ0tleWJvYXJkRXZlbnRzRmx1c2hlZENhbGxiYWNrc1BlclBhZ2UudGFr ZShwYWdlLnBhZ2VJRCgpKSkgewogICAgICAgICBjYWxsYmFjay0+c2VuZFN1Y2Nlc3MoSW5zcGVj dG9yT2JqZWN0OjpjcmVhdGUoKSk7CisKKyAgICAgICAgaWYgKG1fcGVuZGluZ0tleWJvYXJkRXZl bnRzRmx1c2hlZENhbGxiYWNrc1BlclBhZ2UuaXNFbXB0eSgpKQorICAgICAgICAgICAgbV9zaW11 bGF0aW5nVXNlckludGVyYWN0aW9uID0gZmFsc2U7CisgICAgfQogfQogCiB2b2lkIFdlYkF1dG9t YXRpb25TZXNzaW9uOjp3aWxsQ2xvc2VQYWdlKGNvbnN0IFdlYlBhZ2VQcm94eSYgcGFnZSkKQEAg LTEyODQsNyArMTI4OCw3IEBAIHN0YXRpYyBXZWJFdmVudDo6TW9kaWZpZXJzIHByb3RvY29sTW9k aWZpZXJUb1dlYkV2ZW50TW9kaWZpZXIoSW5zcGVjdG9yOjpQcm90b2NvCiAKICAgICBSRUxFQVNF X0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQotI2VuZGlmIC8vIFVTRShBUFBLSVQpCisjZW5kaWYg Ly8gVVNFKEFQUEtJVCkgfHwgUExBVEZPUk0oR1RLKQogCiB2b2lkIFdlYkF1dG9tYXRpb25TZXNz aW9uOjpwZXJmb3JtTW91c2VJbnRlcmFjdGlvbihJbnNwZWN0b3I6OkVycm9yU3RyaW5nJiBlcnJv clN0cmluZywgY29uc3QgU3RyaW5nJiBoYW5kbGUsIGNvbnN0IEluc3BlY3Rvcjo6SW5zcGVjdG9y T2JqZWN0JiByZXF1ZXN0ZWRQb3NpdGlvbk9iamVjdCwgY29uc3QgU3RyaW5nJiBtb3VzZUJ1dHRv blN0cmluZywgY29uc3QgU3RyaW5nJiBtb3VzZUludGVyYWN0aW9uU3RyaW5nLCBjb25zdCBJbnNw ZWN0b3I6Okluc3BlY3RvckFycmF5JiBrZXlNb2RpZmllclN0cmluZ3MsIFJlZjxQZXJmb3JtTW91 c2VJbnRlcmFjdGlvbkNhbGxiYWNrPiYmIGNhbGxiYWNrKQogewpAQCAtMTMzOCw3ICsxMzQyLDcg QEAgdm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6cGVyZm9ybU1vdXNlSW50ZXJhY3Rpb24oSW5z cGVjdG9yOjpFcnJvclN0cmluZyYgZXJyb3IKICAgICAgICAgICAgIC5zZXRZKHkgLSBwYWdlLT50 b3BDb250ZW50SW5zZXQoKSkKICAgICAgICAgICAgIC5yZWxlYXNlKCkpOwogICAgIH0pOwotI2Vu ZGlmIC8vIFVTRShBUFBLSVQpCisjZW5kaWYgLy8gVVNFKEFQUEtJVCkgfHwgUExBVEZPUk0oR1RL KQogfQogCiB2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjpwZXJmb3JtS2V5Ym9hcmRJbnRlcmFj dGlvbnMoRXJyb3JTdHJpbmcmIGVycm9yU3RyaW5nLCBjb25zdCBTdHJpbmcmIGhhbmRsZSwgY29u c3QgSW5zcGVjdG9yOjpJbnNwZWN0b3JBcnJheSYgaW50ZXJhY3Rpb25zLCBSZWY8UGVyZm9ybUtl eWJvYXJkSW50ZXJhY3Rpb25zQ2FsbGJhY2s+JiYgY2FsbGJhY2spCkBAIC0xNDExLDkgKzE0MTUs MTIgQEAgdm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6cGVyZm9ybUtleWJvYXJkSW50ZXJhY3Rp b25zKEVycm9yU3RyaW5nJiBlcnJvclN0cmluZywKICAgICAgICAgY2FsbGJhY2tJbk1hcC0+c2Vu ZEZhaWx1cmUoU1RSSU5HX0ZPUl9QUkVERUZJTkVEX0VSUk9SX05BTUUoVGltZW91dCkpOwogICAg IGNhbGxiYWNrSW5NYXAgPSBXVEZNb3ZlKGNhbGxiYWNrKTsKIAorICAgIC8vIFRoaXMgaXMgY2xl YXJlZCB3aGVuIGFsbCBrZXlib2FyZCBldmVudHMgYXJlIGZsdXNoZWQuCisgICAgbV9zaW11bGF0 aW5nVXNlckludGVyYWN0aW9uID0gdHJ1ZTsKKwogICAgIGZvciAoYXV0byYgYWN0aW9uIDogYWN0 aW9uc1RvUGVyZm9ybSkKICAgICAgICAgYWN0aW9uKCk7Ci0jZW5kaWYgLy8gUExBVEZPUk0oQ09D T0EpCisjZW5kaWYgLy8gUExBVEZPUk0oQ09DT0EpIHx8IFBMQVRGT1JNKEdUSykKIH0KIAogdm9p ZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6dGFrZVNjcmVlbnNob3QoRXJyb3JTdHJpbmcmIGVycm9y U3RyaW5nLCBjb25zdCBTdHJpbmcmIGhhbmRsZSwgY29uc3QgU3RyaW5nKiBvcHRpb25hbEZyYW1l SGFuZGxlLCBjb25zdCBTdHJpbmcqIG9wdGlvbmFsTm9kZUhhbmRsZSwgY29uc3QgYm9vbCogb3B0 aW9uYWxTY3JvbGxJbnRvVmlld0lmTmVlZGVkLCBSZWY8VGFrZVNjcmVlbnNob3RDYWxsYmFjaz4m JiBjYWxsYmFjaykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRp b24vV2ViQXV0b21hdGlvblNlc3Npb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9t YXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uaAppbmRleCA2MDRjYTBkYTIxZDllNWQxZjA2OTBh MTRhNGZhNTlmZmU4MDU0YjljLi4zYjYwMTJjMzc1OGU2ODIyYzhhYmNhNzU3YWVjODk0ZWI2ODY5 MzQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1 dG9tYXRpb25TZXNzaW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlv bi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5oCkBAIC0xNTYsNiArMTU2LDcgQEAgcHVibGljOgogI2Vu ZGlmCiAKICAgICAvLyBFdmVudCBTaW11bGF0aW9uIFN1cHBvcnQuCisgICAgYm9vbCBpc1NpbXVs YXRpbmdVc2VySW50ZXJhY3Rpb24oKSBjb25zdCB7IHJldHVybiBtX3NpbXVsYXRpbmdVc2VySW50 ZXJhY3Rpb247IH0KICNpZiBQTEFURk9STShNQUMpCiAgICAgYm9vbCB3YXNFdmVudFN5bnRoZXNp emVkRm9yQXV0b21hdGlvbihOU0V2ZW50ICopOwogICAgIHZvaWQgbWFya0V2ZW50QXNTeW50aGVz aXplZEZvckF1dG9tYXRpb24oTlNFdmVudCAqKTsKQEAgLTI1OSw2ICsyNjAsOCBAQCBwcml2YXRl OgogCiAgICAgYm9vbCBtX3Blcm1pc3Npb25Gb3JHZXRVc2VyTWVkaWEgeyB0cnVlIH07CiAKKyAg ICAvLyBUcnVlIGlmIGEgc3ludGhlc2l6ZWQga2V5IGV2ZW50IGlzIHN0aWxsIGJlaW5nIHByb2Nl c3NlZC4KKyAgICBib29sIG1fc2ltdWxhdGluZ1VzZXJJbnRlcmFjdGlvbiB7IGZhbHNlIH07CiAK ICAgICAvLyBLZWVwIHRyYWNrIG9mIGN1cnJlbnRseSBhY3RpdmUgbW9kaWZpZXJzIGFjcm9zcyBt dWx0aXBsZSBrZXlzdHJva2VzLgogICAgIC8vIE1vc3QgcGxhdGZvcm1zIGRvIG5vdCB0cmFjayBj dXJyZW50IG1vZGlmaWVycyBmcm9tIHN5bnRoZXNpemVkIGV2ZW50cy4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGNjMWZiMTcxM2Q1ZTJiMDczNTlkYjZhZGI1 YzhjNzMzOGZjNDM0NTAuLmY4YWMxODY5NGUyOGQzNTljMGJmNDRmNGNiYjRjOGZkYWY3NmI3YzIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtNTA4NSw5ICs1 MDg1LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVFdmVudCh1aW50MzJfdCBvcGFx dWVUeXBlLCBib29sIGhhbmRsZWQpCiAgICAgICAgIGlmICghbV9rZXlFdmVudFF1ZXVlLmlzRW1w dHkoKSkgewogICAgICAgICAgICAgTE9HKEtleUhhbmRsaW5nLCAiIFVJIHByb2Nlc3M6IHNlbnQg a2V5RXZlbnQgZnJvbSBkaWRSZWNlaXZlRXZlbnQiKTsKICAgICAgICAgICAgIG1fcHJvY2Vzcy0+ c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6S2V5RXZlbnQobV9rZXlFdmVudFF1ZXVlLmZpcnN0KCkp LCBtX3BhZ2VJRCk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBpZiAoYXV0byogYXV0 b21hdGlvblNlc3Npb24gPSBwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKS5hdXRvbWF0aW9uU2Vzc2lv bigpKQotICAgICAgICAgICAgICAgIGF1dG9tYXRpb25TZXNzaW9uLT5rZXlib2FyZEV2ZW50c0Zs dXNoZWRGb3JQYWdlKCp0aGlzKTsKICAgICAgICAgfQogCiAgICAgICAgIC8vIFRoZSBjYWxsIHRv IGRvbmVXaXRoS2V5RXZlbnQgbWF5IGNsb3NlIHRoaXMgV2ViUGFnZS4KQEAgLTUwOTUsMTAgKzUw OTIsMTQgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVFdmVudCh1aW50MzJfdCBvcGFx dWVUeXBlLCBib29sIGhhbmRsZWQpCiAgICAgICAgIFJlZjxXZWJQYWdlUHJveHk+IHByb3RlY3Qo KnRoaXMpOwogCiAgICAgICAgIG1fcGFnZUNsaWVudC5kb25lV2l0aEtleUV2ZW50KGV2ZW50LCBo YW5kbGVkKTsKLSAgICAgICAgaWYgKGhhbmRsZWQpCi0gICAgICAgICAgICBicmVhazsKKyAgICAg ICAgaWYgKCFoYW5kbGVkKQorICAgICAgICAgICAgbV91aUNsaWVudC0+ZGlkTm90SGFuZGxlS2V5 RXZlbnQodGhpcywgZXZlbnQpOwogCi0gICAgICAgIG1fdWlDbGllbnQtPmRpZE5vdEhhbmRsZUtl eUV2ZW50KHRoaXMsIGV2ZW50KTsKKyAgICAgICAgLy8gTm90aWZ5IHRoZSBzZXNzaW9uIGFmdGVy IC1bTlNBcHAgc2VuZEV2ZW50Ol0gaGFzIGEgY3JhY2sgYXQgdHVybmluZyB0aGUgZXZlbnQgaW50 byBhbiBhY3Rpb24uCisgICAgICAgIGlmIChtX2tleUV2ZW50UXVldWUuaXNFbXB0eSgpKSB7Cisg ICAgICAgICAgICBpZiAoYXV0byogYXV0b21hdGlvblNlc3Npb24gPSBwcm9jZXNzKCkucHJvY2Vz c1Bvb2woKS5hdXRvbWF0aW9uU2Vzc2lvbigpKQorICAgICAgICAgICAgICAgIGF1dG9tYXRpb25T ZXNzaW9uLT5rZXlib2FyZEV2ZW50c0ZsdXNoZWRGb3JQYWdlKCp0aGlzKTsKKyAgICAgICAgfQog ICAgICAgICBicmVhazsKICAgICB9CiAjaWYgRU5BQkxFKE1BQ19HRVNUVVJFX0VWRU5UUykK