238147 2022-03-21 10:42:15 -0700 [WebAuthn] Pass along timeout to ASA and ignore timeout for conditional mediation requests 2022-03-22 10:13:30 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pascoe pascoe bfulgham webkit-bug-importer oldest_to_newest 1853244 0 pascoe 2022-03-21 10:42:15 -0700 ^ 1853245 1 pascoe 2022-03-21 10:42:21 -0700 rdar://90509464 1853255 2 455256 pascoe 2022-03-21 11:00:36 -0700 Created attachment 455256 Patch 1853352 3 455277 pascoe 2022-03-21 14:57:07 -0700 Created attachment 455277 Patch 1853394 4 455277 bfulgham 2022-03-21 16:10:34 -0700 Comment on attachment 455277 Patch lgtm. r=me 1853724 5 ews-feeder 2022-03-22 10:13:28 -0700 Committed r291625 (248718@main): <https://commits.webkit.org/248718@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 455277. 455256 2022-03-21 11:00:36 -0700 2022-03-21 14:57:06 -0700 Patch bug-238147-20220321110035.patch text/plain 19499 pascoe U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxNDkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDlmNDRhNzY4MjZhYWI5NzBl ZTFmZDIwMWE5NDQwNGE5NzA4NjAxYTEuLjA5Yjc4M2I0YzVkYWZhNDA3ZGI1MzI4MmJjNWQ4Y2Y5 NGZiMjZiYzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMjItMDMtMjEgIEogUGFzY29l ICA8al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJBdXRobl0gUGFzcyBhbG9uZyB0 aW1lb3V0IHRvIEFTQSBhbmQgaWdub3JlIHRpbWVvdXQgZm9yIGNvbmRpdGlvbmFsIG1lZGlhdGlv biByZXF1ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjM4MTQ3CisgICAgICAgIHJkYXI6Ly85MDUwOTQ2NAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnRseSB3ZSBkb24ndCBwYXNzIHRoZSB0 aW1lb3V0IGZyb20gdGhlIHJwIGludG8gQVNBLCBzbyB0aGUgZGVmYXVsdCB0aW1lb3V0IGlzIGFs d2F5cyB1c2VkLgorICAgICAgICBUaGlzIHBhdGNoIHN0YXJ0cyBwYXNzaW5nIGFsb25nIHRoZSB0 aW1lb3V0IHRvIEFTQSwgYW5kIGNyZWF0ZXMgYSBwbGFjZSBmb3IgQVNBIHRvIHNwZWNpZnkgdGhl CisgICAgICAgIG1lZGlhdGlvbiBvZiB0aGUgcmVxdWVzdCwgc28gd2UgY2FuIGlnbm9yZSB0aGUg dGltZW91dCBmb3IgcmVxdWVzdHMgdXNpbmcgY29uZGl0aW9uYWwgbWVkaWF0aW9uLgorCisgICAg ICAgIE1vZGlmaWVkIEFQSSB0ZXN0LgorCisgICAgICAgICogUGxhdGZvcm0vc3BpL0NvY29hL0F1 dGhlbnRpY2F0aW9uU2VydmljZXNDb3JlU1BJLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9D b2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9Db2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLm1tOgorICAgICAgICAodG9XZWJDb3Jl KToKKyAgICAgICAgKC1bX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbCBtYWtlQ3JlZGVudGlhbFdp dGhNZWRpYXRpb25SZXF1aXJlbWVudDpjbGllbnREYXRhSGFzaDpvcHRpb25zOmNvbXBsZXRpb25I YW5kbGVyOl0pOgorICAgICAgICAoLVtfV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsIG1ha2VDcmVk ZW50aWFsV2l0aENsaWVudERhdGFIYXNoOm9wdGlvbnM6Y29tcGxldGlvbkhhbmRsZXI6XSk6Cisg ICAgICAgICgtW19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwgZ2V0QXNzZXJ0aW9uV2l0aE1lZGlh dGlvblJlcXVpcmVtZW50OmNsaWVudERhdGFIYXNoOm9wdGlvbnM6Y29tcGxldGlvbkhhbmRsZXI6 XSk6CisgICAgICAgICgtW19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwgZ2V0QXNzZXJ0aW9uV2l0 aENsaWVudERhdGFIYXNoOm9wdGlvbnM6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAgICog VUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0F1dGhlbnRpY2F0b3JNYW5hZ2VyLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6QXV0aGVudGljYXRvck1hbmFnZXI6OnJlc3BvbmRSZWNlaXZlZCk6Cisg ICAgICAgIChXZWJLaXQ6OkF1dGhlbnRpY2F0b3JNYW5hZ2VyOjppbml0VGltZU91dFRpbWVyKToK KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvV2ViQXV0aGVudGlj YXRvckNvb3JkaW5hdG9yUHJveHkubW06CisgICAgICAgIChXZWJLaXQ6OmNvbmZpZ3VyZVJlZ2lz dHJhdGlvblJlcXVlc3RDb250ZXh0KToKKyAgICAgICAgKFdlYktpdDo6Y29uZmlndXJlQXNzZXJ0 aW9uT3B0aW9ucyk6CisKIDIwMjItMDMtMTggIEtpbW1vIEtpbm51bmVuICA8a2tpbm51bmVuQGFw cGxlLmNvbT4KIAogICAgICAgICBSZWN5Y2xpbmcgYSB3ZWJnbCBjb250ZXh0IHdoZW4gaXQgaGFz IGJlZW4gbG9zdCBhbmQgcmVzdG9yZWQgY2F1c2VzIGEgY3Jhc2gKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvUGxhdGZvcm0vc3BpL0NvY29hL0F1dGhlbnRpY2F0aW9uU2VydmljZXNDb3JlU1BJ LmggYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9Db2NvYS9BdXRoZW50aWNhdGlvblNlcnZp Y2VzQ29yZVNQSS5oCmluZGV4IDg1N2JkOWE2NTMxMGM1YzFhNTk0NzNjZDkzN2MwYjFlNjE5NzNm MjQuLjQ1NmRkNmNkZDdjOTVjNDg5ZWY2NTkxYTZmY2M5YWM0YmY2M2Q4YzcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL0NvY29hL0F1dGhlbnRpY2F0aW9uU2VydmljZXND b3JlU1BJLmgKKysrIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvQ29jb2EvQXV0aGVudGlj YXRpb25TZXJ2aWNlc0NvcmVTUEkuaApAQCAtMTY0LDYgKzE2NCw3IEBAIHR5cGVkZWYgTlNfRU5V TShOU1VJbnRlZ2VyLCBBU0NQdWJsaWNLZXlDcmVkZW50aWFsS2luZCkgewogQHByb3BlcnR5IChu b25hdG9taWMsIG51bGxhYmxlLCBjb3B5KSBOU0RhdGEgKmNsaWVudERhdGFIYXNoOwogQHByb3Bl cnR5IChub25hdG9taWMsIG51bGxhYmxlLCByZWFkb25seSwgY29weSkgTlNTdHJpbmcgKnVzZXJW ZXJpZmljYXRpb25QcmVmZXJlbmNlOwogQHByb3BlcnR5IChub25hdG9taWMsIG51bGxhYmxlLCBj b3B5KSBBU0NXZWJBdXRoZW50aWNhdGlvbkV4dGVuc2lvbnNDbGllbnRJbnB1dHMgKmV4dGVuc2lv bnM7CitAcHJvcGVydHkgKG5vbmF0b21pYywgbnVsbGFibGUsIGNvcHkpIE5TTnVtYmVyICp0aW1l b3V0OwogCiBAcHJvcGVydHkgKG5vbmF0b21pYywgbnVsbGFibGUsIHJlYWRvbmx5LCBjb3B5KSBO U0FycmF5PEFTQ1B1YmxpY0tleUNyZWRlbnRpYWxEZXNjcmlwdG9yICo+ICphbGxvd2VkQ3JlZGVu dGlhbHM7CiAKQEAgLTE5NCw2ICsxOTUsNyBAQCB0eXBlZGVmIE5TX09QVElPTlMoTlNVSW50ZWdl ciwgQVNDQ3JlZGVudGlhbFJlcXVlc3RUeXBlcykgewogQHByb3BlcnR5IChub25hdG9taWMsIG51 bGxhYmxlLCBjb3B5KSBOU1N0cmluZyAqdXNlclZlcmlmaWNhdGlvblByZWZlcmVuY2U7CiBAcHJv cGVydHkgKG5vbmF0b21pYywgbnVsbGFibGUsIGNvcHkpIE5TU3RyaW5nICphdHRlc3RhdGlvblBy ZWZlcmVuY2U7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgbnVsbGFibGUsIGNvcHkpIEFTQ1dlYkF1 dGhlbnRpY2F0aW9uRXh0ZW5zaW9uc0NsaWVudElucHV0cyAqZXh0ZW5zaW9uczsKK0Bwcm9wZXJ0 eSAobm9uYXRvbWljLCBudWxsYWJsZSwgY29weSkgTlNOdW1iZXIgKnRpbWVvdXQ7CiAKIEBwcm9w ZXJ0eSAobm9uYXRvbWljKSBCT09MIHNob3VsZFJlcXVpcmVSZXNpZGVudEtleTsKIEBwcm9wZXJ0 eSAobm9uYXRvbWljLCBjb3B5KSBOU0FycmF5PEFTQ1B1YmxpY0tleUNyZWRlbnRpYWxEZXNjcmlw dG9yICo+ICpleGNsdWRlZENyZWRlbnRpYWxzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwuaCBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLmgKaW5k ZXggOWY1NDdmYjk1MGM2N2ZmMTY2YWJkYmU4YTc4MjA1Mjc2MTMwZWQ4MS4uYzhjMDkwZDhjN2Yw OTMzMzQxZmJiODUzNGE2MjQ4OWU0YzRmZjdjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5o CkBAIC04Niw2ICs4NiwxMyBAQCB0eXBlZGVmIE5TX0VOVU0oTlNJbnRlZ2VyLCBfV0tXZWJBdXRo ZW50aWNhdGlvblVzZXJWZXJpZmljYXRpb25BdmFpbGFiaWxpdHkpIHsKICAgICBfV0tXZWJBdXRo ZW50aWNhdGlvblVzZXJWZXJpZmljYXRpb25BdmFpbGFiaWxpdHlOb3RTdXBwb3J0ZWQsCiB9IFdL X0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CiAKK3R5 cGVkZWYgTlNfRU5VTShOU0ludGVnZXIsIF9XS1dlYkF1dGhlbnRpY2F0aW9uTWVkaWF0aW9uUmVx dWlyZW1lbnQpIHsKKyAgICBfV0tXZWJBdXRoZW50aWNhdGlvbk1lZGlhdGlvblJlcXVpcmVtZW50 U2lsZW50LAorICAgIF9XS1dlYkF1dGhlbnRpY2F0aW9uTWVkaWF0aW9uUmVxdWlyZW1lbnRPcHRp b25hbCwKKyAgICBfV0tXZWJBdXRoZW50aWNhdGlvbk1lZGlhdGlvblJlcXVpcmVtZW50UmVxdWly ZWQsCisgICAgX1dLV2ViQXV0aGVudGljYXRpb25NZWRpYXRpb25SZXF1aXJlbWVudENvbmRpdGlv bmFsLAorfSBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RC QSkpOworCiBXS19FWFBPUlQgZXh0ZXJuIE5TU3RyaW5nICogY29uc3QgX1dLTG9jYWxBdXRoZW50 aWNhdG9yQ3JlZGVudGlhbE5hbWVLZXk7CiBXS19FWFBPUlQgZXh0ZXJuIE5TU3RyaW5nICogY29u c3QgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbERpc3BsYXlOYW1lS2V5OwogV0tfRVhQ T1JUIGV4dGVybiBOU1N0cmluZyAqIGNvbnN0IF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRp YWxJREtleTsKQEAgLTE0MSw4ICsxNDgsMTAgQEAgV0tfQ0xBU1NfQVZBSUxBQkxFKG1hY29zKDEw LjE1LjQpLCBpb3MoMTMuNCkpCiAvLyBGSVhNRTogPHJkYXI6Ly9wcm9ibGVtLzcxNTA5NDg1PiBB ZGRzIGRldGFpbGVkIE5TRXJyb3IuCiAtICh2b2lkKW1ha2VDcmVkZW50aWFsV2l0aENoYWxsZW5n ZTooTlNEYXRhICopY2hhbGxlbmdlIG9yaWdpbjooTlNTdHJpbmcgKilvcmlnaW4gb3B0aW9uczoo X1dLUHVibGljS2V5Q3JlZGVudGlhbENyZWF0aW9uT3B0aW9ucyAqKW9wdGlvbnMgY29tcGxldGlv bkhhbmRsZXI6KHZvaWQgKF4pKF9XS0F1dGhlbnRpY2F0b3JBdHRlc3RhdGlvblJlc3BvbnNlICos IE5TRXJyb3IgKikpaGFuZGxlciBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEyLjApLCBpb3MoMTUu MCkpOwogLSAodm9pZCltYWtlQ3JlZGVudGlhbFdpdGhDbGllbnREYXRhSGFzaDooTlNEYXRhICop Y2xpZW50RGF0YUhhc2ggb3B0aW9uczooX1dLUHVibGljS2V5Q3JlZGVudGlhbENyZWF0aW9uT3B0 aW9ucyAqKW9wdGlvbnMgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKF9XS0F1dGhlbnRpY2F0 b3JBdHRlc3RhdGlvblJlc3BvbnNlICosIE5TRXJyb3IgKikpaGFuZGxlciBXS19BUElfQVZBSUxB QkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOworLSAodm9pZCltYWtlQ3Jl ZGVudGlhbFdpdGhNZWRpYXRpb25SZXF1aXJlbWVudDooX1dLV2ViQXV0aGVudGljYXRpb25NZWRp YXRpb25SZXF1aXJlbWVudCltZWRpYXRpb24gY2xpZW50RGF0YUhhc2g6KE5TRGF0YSAqKWNsaWVu dERhdGFIYXNoIG9wdGlvbnM6KF9XS1B1YmxpY0tleUNyZWRlbnRpYWxDcmVhdGlvbk9wdGlvbnMg KilvcHRpb25zIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShfV0tBdXRoZW50aWNhdG9yQXR0 ZXN0YXRpb25SZXNwb25zZSAqLCBOU0Vycm9yICopKWhhbmRsZXIgV0tfQVBJX0FWQUlMQUJMRSht YWNvcyhXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKIC0gKHZvaWQpZ2V0QXNzZXJ0aW9u V2l0aENoYWxsZW5nZTooTlNEYXRhICopY2hhbGxlbmdlIG9yaWdpbjooTlNTdHJpbmcgKilvcmln aW4gb3B0aW9uczooX1dLUHVibGljS2V5Q3JlZGVudGlhbFJlcXVlc3RPcHRpb25zICopb3B0aW9u cyBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoX1dLQXV0aGVudGljYXRvckFzc2VydGlvblJl c3BvbnNlICosIE5TRXJyb3IgKikpaGFuZGxlciBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEyLjAp LCBpb3MoMTUuMCkpOwogLSAodm9pZClnZXRBc3NlcnRpb25XaXRoQ2xpZW50RGF0YUhhc2g6KE5T RGF0YSAqKWNsaWVudERhdGFIYXNoIG9wdGlvbnM6KF9XS1B1YmxpY0tleUNyZWRlbnRpYWxSZXF1 ZXN0T3B0aW9ucyAqKW9wdGlvbnMgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKF9XS0F1dGhl bnRpY2F0b3JBc3NlcnRpb25SZXNwb25zZSAqLCBOU0Vycm9yICopKWhhbmRsZXIgV0tfQVBJX0FW QUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKKy0gKHZvaWQpZ2V0 QXNzZXJ0aW9uV2l0aE1lZGlhdGlvblJlcXVpcmVtZW50OihfV0tXZWJBdXRoZW50aWNhdGlvbk1l ZGlhdGlvblJlcXVpcmVtZW50KW1lZGlhdGlvbiBjbGllbnREYXRhSGFzaDooTlNEYXRhICopY2xp ZW50RGF0YUhhc2ggb3B0aW9uczooX1dLUHVibGljS2V5Q3JlZGVudGlhbFJlcXVlc3RPcHRpb25z ICopb3B0aW9ucyBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoX1dLQXV0aGVudGljYXRvckFz c2VydGlvblJlc3BvbnNlICosIE5TRXJyb3IgKikpaGFuZGxlciBXS19BUElfQVZBSUxBQkxFKG1h Y29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwogLSAodm9pZCljYW5jZWw7CiAKIC8v IEZJWE1FOiA8cmRhcjovL3Byb2JsZW0vNzE1MDk4NDg+IERlcHJlY2F0ZSB0aGUgZm9sbG93aW5n IHByb3BlcnRpZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLm1tCmluZGV4IDYwY2YxMWUzODNm OTFlOWM0OTA1ZWIyMjFiNDYwZTlmMjhiODhlNzMuLmY1OWE4NTk3ZWRlNTI3NTM0MjZlYzk4OTA0 ZDJkZWEzNzA3NWFjYmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D b2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLm1tCkBAIC00OCw2ICs0 OCw3IEBACiAjaW1wb3J0IDxXZWJDb3JlL0J1ZmZlclNvdXJjZS5oPgogI2ltcG9ydCA8V2ViQ29y ZS9DQk9SUmVhZGVyLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0NCT1JXcml0ZXIuaD4KKyNpbXBvcnQg PFdlYkNvcmUvQ3JlZGVudGlhbFJlcXVlc3RPcHRpb25zLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0Rl dmljZVJlcXVlc3RDb252ZXJ0ZXIuaD4KICNpbXBvcnQgPFdlYkNvcmUvRmlkb0NvbnN0YW50cy5o PgogI2ltcG9ydCA8V2ViQ29yZS9Nb2NrV2ViQXV0aGVudGljYXRpb25Db25maWd1cmF0aW9uLmg+ CkBAIC03ODYsNiArNzg3LDIzIEBAIHN0YXRpYyBXZWJDb3JlOjpBdXRoZW50aWNhdGlvbkV4dGVu c2lvbnNDbGllbnRJbnB1dHMgYXV0aGVudGljYXRpb25FeHRlbnNpb25zQ2xpCiAKICAgICByZXR1 cm4gcmVzdWx0OwogfQorCitzdGF0aWMgV2ViQ29yZTo6Q3JlZGVudGlhbFJlcXVlc3RPcHRpb25z OjpNZWRpYXRpb25SZXF1aXJlbWVudCB0b1dlYkNvcmUoX1dLV2ViQXV0aGVudGljYXRpb25NZWRp YXRpb25SZXF1aXJlbWVudCBtZWRpYXRpb24pCit7CisgICAgc3dpdGNoIChtZWRpYXRpb24pIHsK KyAgICBjYXNlIF9XS1dlYkF1dGhlbnRpY2F0aW9uTWVkaWF0aW9uUmVxdWlyZW1lbnRTaWxlbnQ6 CisgICAgICAgIHJldHVybiBXZWJDb3JlOjpDcmVkZW50aWFsUmVxdWVzdE9wdGlvbnM6Ok1lZGlh dGlvblJlcXVpcmVtZW50OjpTaWxlbnQ7CisgICAgY2FzZSBfV0tXZWJBdXRoZW50aWNhdGlvbk1l ZGlhdGlvblJlcXVpcmVtZW50T3B0aW9uYWw6CisgICAgICAgIHJldHVybiBXZWJDb3JlOjpDcmVk ZW50aWFsUmVxdWVzdE9wdGlvbnM6Ok1lZGlhdGlvblJlcXVpcmVtZW50OjpPcHRpb25hbDsKKyAg ICBjYXNlIF9XS1dlYkF1dGhlbnRpY2F0aW9uTWVkaWF0aW9uUmVxdWlyZW1lbnRSZXF1aXJlZDoK KyAgICAgICAgcmV0dXJuIFdlYkNvcmU6OkNyZWRlbnRpYWxSZXF1ZXN0T3B0aW9uczo6TWVkaWF0 aW9uUmVxdWlyZW1lbnQ6OlJlcXVpcmVkOworICAgIGNhc2UgX1dLV2ViQXV0aGVudGljYXRpb25N ZWRpYXRpb25SZXF1aXJlbWVudENvbmRpdGlvbmFsOgorICAgICAgICByZXR1cm4gV2ViQ29yZTo6 Q3JlZGVudGlhbFJlcXVlc3RPcHRpb25zOjpNZWRpYXRpb25SZXF1aXJlbWVudDo6Q29uZGl0aW9u YWw7CisgICAgZGVmYXVsdDoKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAg IHJldHVybiBXZWJDb3JlOjpDcmVkZW50aWFsUmVxdWVzdE9wdGlvbnM6Ok1lZGlhdGlvblJlcXVp cmVtZW50OjpPcHRpb25hbDsKKyAgICB9Cit9CiAjZW5kaWYKIAogKyAoV2ViQ29yZTo6UHVibGlj S2V5Q3JlZGVudGlhbENyZWF0aW9uT3B0aW9ucyljb252ZXJ0VG9Db3JlQ3JlYXRpb25PcHRpb25z V2l0aE9wdGlvbnM6KF9XS1B1YmxpY0tleUNyZWRlbnRpYWxDcmVhdGlvbk9wdGlvbnMgKilvcHRp b25zCkBAIC04NDQsNyArODYyLDcgQEAgc3RhdGljIFJldGFpblB0cjxfV0tBdXRoZW50aWNhdG9y QXR0ZXN0YXRpb25SZXNwb25zZT4gd2tBdXRoZW50aWNhdG9yQXR0ZXN0YXRpb24KICNlbmRpZgog fQogCi0tICh2b2lkKW1ha2VDcmVkZW50aWFsV2l0aENsaWVudERhdGFIYXNoOihOU0RhdGEgKilj bGllbnREYXRhSGFzaCBvcHRpb25zOihfV0tQdWJsaWNLZXlDcmVkZW50aWFsQ3JlYXRpb25PcHRp b25zICopb3B0aW9ucyBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoX1dLQXV0aGVudGljYXRv ckF0dGVzdGF0aW9uUmVzcG9uc2UgKiwgTlNFcnJvciAqKSloYW5kbGVyCistICh2b2lkKW1ha2VD cmVkZW50aWFsV2l0aE1lZGlhdGlvblJlcXVpcmVtZW50OihfV0tXZWJBdXRoZW50aWNhdGlvbk1l ZGlhdGlvblJlcXVpcmVtZW50KW1lZGlhdGlvbiBjbGllbnREYXRhSGFzaDooTlNEYXRhICopY2xp ZW50RGF0YUhhc2ggb3B0aW9uczooX1dLUHVibGljS2V5Q3JlZGVudGlhbENyZWF0aW9uT3B0aW9u cyAqKW9wdGlvbnMgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKF9XS0F1dGhlbnRpY2F0b3JB dHRlc3RhdGlvblJlc3BvbnNlICosIE5TRXJyb3IgKikpaGFuZGxlcgogewogI2lmIEVOQUJMRShX RUJfQVVUSE4pCiAgICAgYXV0byBjYWxsYmFjayA9IFtoYW5kbGVyID0gbWFrZUJsb2NrUHRyKGhh bmRsZXIpXSAoc3RkOjp2YXJpYW50PFJlZjxXZWJDb3JlOjpBdXRoZW50aWNhdG9yUmVzcG9uc2U+ LCBXZWJDb3JlOjpFeGNlcHRpb25EYXRhPiYmIHJlc3VsdCkgbXV0YWJsZSB7CkBAIC04NTQsMTAg Kzg3MiwxNSBAQCBzdGF0aWMgUmV0YWluUHRyPF9XS0F1dGhlbnRpY2F0b3JBdHRlc3RhdGlvblJl c3BvbnNlPiB3a0F1dGhlbnRpY2F0b3JBdHRlc3RhdGlvbgogICAgICAgICAgICAgaGFuZGxlcihu aWwsIFtOU0Vycm9yIGVycm9yV2l0aERvbWFpbjpXS0Vycm9yRG9tYWluIGNvZGU6ZXhjZXB0aW9u LmNvZGUgdXNlckluZm86QHsgTlNMb2NhbGl6ZWREZXNjcmlwdGlvbktleTogZXhjZXB0aW9uLm1l c3NhZ2UgfV0pOwogICAgICAgICB9KTsKICAgICB9OwotICAgIF9wYW5lbC0+aGFuZGxlUmVxdWVz dCh7IHZlY3RvckZyb21OU0RhdGEoY2xpZW50RGF0YUhhc2gpLCBbX1dLV2ViQXV0aGVudGljYXRp b25QYW5lbCBjb252ZXJ0VG9Db3JlQ3JlYXRpb25PcHRpb25zV2l0aE9wdGlvbnM6b3B0aW9uc10s IG51bGxwdHIsIFdlYktpdDo6V2ViQXV0aGVudGljYXRpb25QYW5lbFJlc3VsdDo6VW5hdmFpbGFi bGUsIG51bGxwdHIsIHN0ZDo6bnVsbG9wdCwgeyB9LCB0cnVlLCBTdHJpbmcoKSwgbnVsbHB0ciwg c3RkOjpudWxsb3B0LCBzdGQ6Om51bGxvcHQgfSwgV1RGTW92ZShjYWxsYmFjaykpOworICAgIF9w YW5lbC0+aGFuZGxlUmVxdWVzdCh7IHZlY3RvckZyb21OU0RhdGEoY2xpZW50RGF0YUhhc2gpLCBb X1dLV2ViQXV0aGVudGljYXRpb25QYW5lbCBjb252ZXJ0VG9Db3JlQ3JlYXRpb25PcHRpb25zV2l0 aE9wdGlvbnM6b3B0aW9uc10sIG51bGxwdHIsIFdlYktpdDo6V2ViQXV0aGVudGljYXRpb25QYW5l bFJlc3VsdDo6VW5hdmFpbGFibGUsIG51bGxwdHIsIHN0ZDo6bnVsbG9wdCwgeyB9LCB0cnVlLCBT dHJpbmcoKSwgbnVsbHB0ciwgdG9XZWJDb3JlKG1lZGlhdGlvbiksIHN0ZDo6bnVsbG9wdCB9LCBX VEZNb3ZlKGNhbGxiYWNrKSk7CiAjZW5kaWYKIH0KIAorLSAodm9pZCltYWtlQ3JlZGVudGlhbFdp dGhDbGllbnREYXRhSGFzaDooTlNEYXRhICopY2xpZW50RGF0YUhhc2ggb3B0aW9uczooX1dLUHVi bGljS2V5Q3JlZGVudGlhbENyZWF0aW9uT3B0aW9ucyAqKW9wdGlvbnMgY29tcGxldGlvbkhhbmRs ZXI6KHZvaWQgKF4pKF9XS0F1dGhlbnRpY2F0b3JBdHRlc3RhdGlvblJlc3BvbnNlICosIE5TRXJy b3IgKikpaGFuZGxlcgoreworICAgIFtzZWxmIG1ha2VDcmVkZW50aWFsV2l0aE1lZGlhdGlvblJl cXVpcmVtZW50Ol9XS1dlYkF1dGhlbnRpY2F0aW9uTWVkaWF0aW9uUmVxdWlyZW1lbnRPcHRpb25h bCBjbGllbnREYXRhSGFzaDpjbGllbnREYXRhSGFzaCBvcHRpb25zOm9wdGlvbnMgY29tcGxldGlv bkhhbmRsZXI6aGFuZGxlcl07Cit9CisKICsgKFdlYkNvcmU6OlB1YmxpY0tleUNyZWRlbnRpYWxS ZXF1ZXN0T3B0aW9ucyljb252ZXJ0VG9Db3JlUmVxdWVzdE9wdGlvbnNXaXRoT3B0aW9uczooX1dL UHVibGljS2V5Q3JlZGVudGlhbFJlcXVlc3RPcHRpb25zICopb3B0aW9ucwogewogICAgIFdlYkNv cmU6OlB1YmxpY0tleUNyZWRlbnRpYWxSZXF1ZXN0T3B0aW9ucyByZXN1bHQ7CkBAIC05MDgsNyAr OTMxLDcgQEAgc3RhdGljIFJldGFpblB0cjxfV0tBdXRoZW50aWNhdG9yQXNzZXJ0aW9uUmVzcG9u c2U+IHdrQXV0aGVudGljYXRvckFzc2VydGlvblJlc3AKICNlbmRpZgogfQogCi0tICh2b2lkKWdl dEFzc2VydGlvbldpdGhDbGllbnREYXRhSGFzaDooTlNEYXRhICopY2xpZW50RGF0YUhhc2ggb3B0 aW9uczooX1dLUHVibGljS2V5Q3JlZGVudGlhbFJlcXVlc3RPcHRpb25zICopb3B0aW9ucyBjb21w bGV0aW9uSGFuZGxlcjoodm9pZCAoXikoX1dLQXV0aGVudGljYXRvckFzc2VydGlvblJlc3BvbnNl ICosIE5TRXJyb3IgKikpaGFuZGxlcgorLSAodm9pZClnZXRBc3NlcnRpb25XaXRoTWVkaWF0aW9u UmVxdWlyZW1lbnQ6KF9XS1dlYkF1dGhlbnRpY2F0aW9uTWVkaWF0aW9uUmVxdWlyZW1lbnQpbWVk aWF0aW9uIGNsaWVudERhdGFIYXNoOihOU0RhdGEgKiljbGllbnREYXRhSGFzaCBvcHRpb25zOihf V0tQdWJsaWNLZXlDcmVkZW50aWFsUmVxdWVzdE9wdGlvbnMgKilvcHRpb25zIGNvbXBsZXRpb25I YW5kbGVyOih2b2lkICheKShfV0tBdXRoZW50aWNhdG9yQXNzZXJ0aW9uUmVzcG9uc2UgKiwgTlNF cnJvciAqKSloYW5kbGVyCiB7CiAjaWYgRU5BQkxFKFdFQl9BVVRITikKICAgICBhdXRvIGNhbGxi YWNrID0gW2hhbmRsZXIgPSBtYWtlQmxvY2tQdHIoaGFuZGxlcildIChzdGQ6OnZhcmlhbnQ8UmVm PFdlYkNvcmU6OkF1dGhlbnRpY2F0b3JSZXNwb25zZT4sIFdlYkNvcmU6OkV4Y2VwdGlvbkRhdGE+ JiYgcmVzdWx0KSBtdXRhYmxlIHsKQEAgLTkxOCwxMCArOTQxLDE1IEBAIHN0YXRpYyBSZXRhaW5Q dHI8X1dLQXV0aGVudGljYXRvckFzc2VydGlvblJlc3BvbnNlPiB3a0F1dGhlbnRpY2F0b3JBc3Nl cnRpb25SZXNwCiAgICAgICAgICAgICBoYW5kbGVyKG5pbCwgW05TRXJyb3IgZXJyb3JXaXRoRG9t YWluOldLRXJyb3JEb21haW4gY29kZTpXS0Vycm9yVW5rbm93biB1c2VySW5mbzpuaWxdKTsKICAg ICAgICAgfSk7CiAgICAgfTsKLSAgICBfcGFuZWwtPmhhbmRsZVJlcXVlc3QoeyB2ZWN0b3JGcm9t TlNEYXRhKGNsaWVudERhdGFIYXNoKSwgW19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwgY29udmVy dFRvQ29yZVJlcXVlc3RPcHRpb25zV2l0aE9wdGlvbnM6b3B0aW9uc10sIG51bGxwdHIsIFdlYktp dDo6V2ViQXV0aGVudGljYXRpb25QYW5lbFJlc3VsdDo6VW5hdmFpbGFibGUsIG51bGxwdHIsIHN0 ZDo6bnVsbG9wdCwgeyB9LCB0cnVlLCBTdHJpbmcoKSwgbnVsbHB0ciwgc3RkOjpudWxsb3B0LCBz dGQ6Om51bGxvcHQgfSwgV1RGTW92ZShjYWxsYmFjaykpOworICAgIF9wYW5lbC0+aGFuZGxlUmVx dWVzdCh7IHZlY3RvckZyb21OU0RhdGEoY2xpZW50RGF0YUhhc2gpLCBbX1dLV2ViQXV0aGVudGlj YXRpb25QYW5lbCBjb252ZXJ0VG9Db3JlUmVxdWVzdE9wdGlvbnNXaXRoT3B0aW9uczpvcHRpb25z XSwgbnVsbHB0ciwgV2ViS2l0OjpXZWJBdXRoZW50aWNhdGlvblBhbmVsUmVzdWx0OjpVbmF2YWls YWJsZSwgbnVsbHB0ciwgc3RkOjpudWxsb3B0LCB7IH0sIHRydWUsIFN0cmluZygpLCBudWxscHRy LCB0b1dlYkNvcmUobWVkaWF0aW9uKSwgc3RkOjpudWxsb3B0IH0sIFdURk1vdmUoY2FsbGJhY2sp KTsKICNlbmRpZgogfQogCistICh2b2lkKWdldEFzc2VydGlvbldpdGhDbGllbnREYXRhSGFzaDoo TlNEYXRhICopY2xpZW50RGF0YUhhc2ggb3B0aW9uczooX1dLUHVibGljS2V5Q3JlZGVudGlhbFJl cXVlc3RPcHRpb25zICopb3B0aW9ucyBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoX1dLQXV0 aGVudGljYXRvckFzc2VydGlvblJlc3BvbnNlICosIE5TRXJyb3IgKikpaGFuZGxlcgoreworICAg IFtzZWxmIGdldEFzc2VydGlvbldpdGhNZWRpYXRpb25SZXF1aXJlbWVudDpfV0tXZWJBdXRoZW50 aWNhdGlvbk1lZGlhdGlvblJlcXVpcmVtZW50T3B0aW9uYWwgY2xpZW50RGF0YUhhc2g6Y2xpZW50 RGF0YUhhc2ggb3B0aW9uczpvcHRpb25zIGNvbXBsZXRpb25IYW5kbGVyOmhhbmRsZXJdOworfQor CiArIChCT09MKWlzVXNlclZlcmlmeWluZ1BsYXRmb3JtQXV0aGVudGljYXRvckF2YWlsYWJsZQog ewogI2lmIEVOQUJMRShXRUJfQVVUSE4pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9BdXRoZW50aWNhdG9yTWFuYWdlci5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9BdXRoZW50aWNhdG9yTWFuYWdlci5j cHAKaW5kZXggNjllMzkzZjZkYjI4YWE2MGU4NWU1MGNlZTNlZDJhMGNkNWVkM2U1OS4uNmI4MmNj ZGZjYmVjZjkzMzJjMGI3MWMzOWUxZmJmYjY2MTdmMTA4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQXV0aGVudGljYXRvck1hbmFnZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0F1dGhlbnRp Y2F0b3JNYW5hZ2VyLmNwcApAQCAtMjgxLDcgKzI4MSw3IEBAIHZvaWQgQXV0aGVudGljYXRvck1h bmFnZXI6OnNlcnZpY2VTdGF0dXNVcGRhdGVkKFdlYkF1dGhlbnRpY2F0aW9uU3RhdHVzIHN0YXR1 cykKIHZvaWQgQXV0aGVudGljYXRvck1hbmFnZXI6OnJlc3BvbmRSZWNlaXZlZChSZXNwb25kJiYg cmVzcG9uZCkKIHsKICAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwotICAgIGlmICghbV9y ZXF1ZXN0VGltZU91dFRpbWVyLmlzQWN0aXZlKCkpCisgICAgaWYgKCFtX3JlcXVlc3RUaW1lT3V0 VGltZXIuaXNBY3RpdmUoKSAmJiAobV9wZW5kaW5nUmVxdWVzdERhdGEubWVkaWF0aW9uICE9IFdl YkNvcmU6OkNyZWRlbnRpYWxSZXF1ZXN0T3B0aW9uczo6TWVkaWF0aW9uUmVxdWlyZW1lbnQ6OkNv bmRpdGlvbmFsIHx8ICFtX3BlbmRpbmdSZXF1ZXN0RGF0YSkpCiAgICAgICAgIHJldHVybjsKICAg ICBBU1NFUlQobV9wZW5kaW5nQ29tcGxldGlvbkhhbmRsZXIpOwogCkBAIC00MjUsNiArNDI1LDgg QEAgdm9pZCBBdXRoZW50aWNhdG9yTWFuYWdlcjo6c3RhcnREaXNjb3ZlcnkoY29uc3QgVHJhbnNw b3J0U2V0JiB0cmFuc3BvcnRzKQogCiB2b2lkIEF1dGhlbnRpY2F0b3JNYW5hZ2VyOjppbml0VGlt ZU91dFRpbWVyKCkKIHsKKyAgICBpZiAobV9wZW5kaW5nUmVxdWVzdERhdGEubWVkaWF0aW9uID09 IFdlYkNvcmU6OkNyZWRlbnRpYWxSZXF1ZXN0T3B0aW9uczo6TWVkaWF0aW9uUmVxdWlyZW1lbnQ6 OkNvbmRpdGlvbmFsKQorICAgICAgICByZXR1cm47CiAgICAgc3RkOjpvcHRpb25hbDx1bnNpZ25l ZD4gdGltZU91dEluTXM7CiAgICAgV1RGOjpzd2l0Y2hPbihtX3BlbmRpbmdSZXF1ZXN0RGF0YS5v cHRpb25zLCBbJl0oY29uc3QgUHVibGljS2V5Q3JlZGVudGlhbENyZWF0aW9uT3B0aW9ucyYgb3B0 aW9ucykgewogICAgICAgICB0aW1lT3V0SW5NcyA9IG9wdGlvbnMudGltZW91dDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL1dlYkF1 dGhlbnRpY2F0b3JDb29yZGluYXRvclByb3h5Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViQXV0aGVudGljYXRpb24vQ29jb2EvV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yUHJveHku bW0KaW5kZXggYjk4NDFjYjBhZjkyMjU5Yzk2YjE1ZjkyM2ZmZWI4MjM3NjVjNDlkNy4uOTA2YmJk MDZiNzcxYzNmYTk4ZTRiMWRiZTlhZGUxNmJmZjIzYzkxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvV2ViQXV0aGVudGljYXRvckNv b3JkaW5hdG9yUHJveHkubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVu dGljYXRpb24vQ29jb2EvV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yUHJveHkubW0KQEAgLTI0 MSw5ICsyNDEsMTIgQEAgc3RhdGljIFJldGFpblB0cjxBU0NDcmVkZW50aWFsUmVxdWVzdENvbnRl eHQ+IGNvbmZpZ3VyZVJlZ2lzdHJhdGlvblJlcXVlc3RDb250ZXgKICAgICBpZiAocmVxdWVzdFR5 cGVzICYgQVNDQ3JlZGVudGlhbFJlcXVlc3RUeXBlU2VjdXJpdHlLZXlQdWJsaWNLZXlSZWdpc3Ry YXRpb24pCiAgICAgICAgIFtyZXF1ZXN0Q29udGV4dCBzZXRTZWN1cml0eUtleUNyZWRlbnRpYWxD cmVhdGlvbk9wdGlvbnM6Y3JlZGVudGlhbENyZWF0aW9uT3B0aW9ucy5nZXQoKV07CiAKLSAgICBp ZiAob3B0aW9ucy5leHRlbnNpb25zICYmIFtjcmVkZW50aWFsQ3JlYXRpb25PcHRpb25zIHJlc3Bv bmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Ioc2V0RXh0ZW5zaW9uczopXSkKKyAgICBpZiAob3B0aW9u cy5leHRlbnNpb25zKQogICAgICAgICBbY3JlZGVudGlhbENyZWF0aW9uT3B0aW9ucyBzZXRFeHRl bnNpb25zOnRvQVNDRXh0ZW5zaW9ucygqb3B0aW9ucy5leHRlbnNpb25zKS5nZXQoKV07CiAKKyAg ICBpZiAob3B0aW9ucy50aW1lb3V0ICYmIFtjcmVkZW50aWFsQ3JlYXRpb25PcHRpb25zIHJlc3Bv bmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Ioc2V0VGltZW91dDopXSkKKyAgICAgICAgY3JlZGVudGlh bENyZWF0aW9uT3B0aW9ucy5nZXQoKS50aW1lb3V0ID0gW05TTnVtYmVyIG51bWJlcldpdGhVbnNp Z25lZEludDoqb3B0aW9ucy50aW1lb3V0XTsKKwogICAgIHJldHVybiByZXF1ZXN0Q29udGV4dDsK IH0KIApAQCAtMjU3LDEyICsyNjAsMTQgQEAgc3RhdGljIGlubGluZSBSZXRhaW5QdHI8QVNDUHVi bGljS2V5Q3JlZGVudGlhbEFzc2VydGlvbk9wdGlvbnM+IGNvbmZpZ3VyZUFzc2VydGkKICAgICAg ICAgYXV0byBjaGFsbGVuZ2UgPSBXZWJDb3JlOjp0b05TRGF0YShvcHRpb25zLmNoYWxsZW5nZSk7 CiAgICAgICAgIFthc3NlcnRpb25PcHRpb25zIGluaXRXaXRoS2luZDpBU0NQdWJsaWNLZXlDcmVk ZW50aWFsS2luZFBsYXRmb3JtIHJlbHlpbmdQYXJ0eUlkZW50aWZpZXI6b3B0aW9ucy5ycElkIGNo YWxsZW5nZTpjaGFsbGVuZ2UuZ2V0KCkgdXNlclZlcmlmaWNhdGlvblByZWZlcmVuY2U6dXNlclZl cmlmaWNhdGlvbi5nZXQoKSBhbGxvd2VkQ3JlZGVudGlhbHM6YWxsb3dlZENyZWRlbnRpYWxzLmdl dCgpXTsKICAgICB9Ci0gICAgaWYgKG9wdGlvbnMuZXh0ZW5zaW9ucyAmJiBbYXNzZXJ0aW9uT3B0 aW9ucyByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHNldEV4dGVuc2lvbnM6KV0pCisgICAg aWYgKG9wdGlvbnMuZXh0ZW5zaW9ucykKICAgICAgICAgW2Fzc2VydGlvbk9wdGlvbnMgc2V0RXh0 ZW5zaW9uczp0b0FTQ0V4dGVuc2lvbnMoKm9wdGlvbnMuZXh0ZW5zaW9ucykuZ2V0KCldOwogICAg IGlmIChwYXJlbnRPcmlnaW4gJiYgW2Fzc2VydGlvbk9wdGlvbnMgcmVzcG9uZHNUb1NlbGVjdG9y OkBzZWxlY3RvcihzZXREZXN0aW5hdGlvblNpdGVGb3JDcm9zc1NpdGVBc3NlcnRpb246KV0pCiAg ICAgICAgIGFzc2VydGlvbk9wdGlvbnMuZ2V0KCkuZGVzdGluYXRpb25TaXRlRm9yQ3Jvc3NTaXRl QXNzZXJ0aW9uID0gcGFyZW50T3JpZ2luLT50b1N0cmluZygpOwogICAgIGVsc2UgaWYgKHBhcmVu dE9yaWdpbiAmJiAhW2Fzc2VydGlvbk9wdGlvbnMgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rv cihzZXREZXN0aW5hdGlvblNpdGVGb3JDcm9zc1NpdGVBc3NlcnRpb246KV0pCiAgICAgICAgIHJl dHVybiBuaWw7CisgICAgaWYgKG9wdGlvbnMudGltZW91dCAmJiBbYXNzZXJ0aW9uT3B0aW9ucyBy ZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHNldFRpbWVvdXQ6KV0pCisgICAgICAgIGFzc2Vy dGlvbk9wdGlvbnMuZ2V0KCkudGltZW91dCA9IFtOU051bWJlciBudW1iZXJXaXRoVW5zaWduZWRJ bnQ6Km9wdGlvbnMudGltZW91dF07CiAgICAgcmV0dXJuIGFzc2VydGlvbk9wdGlvbnM7CiB9CiAK ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyNTVm MTQ2ZGM2OGVmMWJiYTM2NmFlNTFmZTJjZjVmODNmYjg0YmZmLi4zOTVlZTNiZmFiNTNkMzA2MGNk OWUxNTA3ZDE3ZjAxY2Q0NmZkMzU1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjItMDMtMjEgIEogUGFzY29lICA8 al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJBdXRobl0gUGFzcyBhbG9uZyB0aW1l b3V0IHRvIEFTQSBhbmQgaWdub3JlIHRpbWVvdXQgZm9yIGNvbmRpdGlvbmFsIG1lZGlhdGlvbiBy ZXF1ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjM4MTQ3CisgICAgICAgIHJkYXI6Ly85MDUwOTQ2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vZGlmeSBBUEkgdGVzdCB0byB1c2UgbmV3IFNQSS4K KworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvX1dLV2ViQXV0aGVu dGljYXRpb25QYW5lbC5tbToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorCiAyMDIy LTAzLTE4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBb Z2l0LXdlYmtpdF0gTWFrZSByYWRhciBjb25kaXRpb25hbCBvbiBhdXRoZW50aWNhdGlvbgpkaWZm IC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9fV0tXZWJBdXRo ZW50aWNhdGlvblBhbmVsLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLm1tCmluZGV4IGZlODBlYjVhNDIzMTg2ZWE3NTcx MmQ5NDdlZDk3ZGJlNjRiOTE4N2MuLjRhOTBmN2MzZTY4NWFhYjJmNzZkNTMxYzk0MDk4YjdmYmI2 MjVlMzYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev X1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwubW0KQEAgLTE4NjcsNyAr MTg2Nyw3IEBAIFRFU1QoV2ViQXV0aGVudGljYXRpb25QYW5lbCwgTWFrZUNyZWRlbnRpYWxMQSkK ICAgICBVdGlsOjpydW4oJndlYkF1dGhlbnRpY2F0aW9uUGFuZWxSYW4pOwogfQogCi1URVNUKFdl YkF1dGhlbnRpY2F0aW9uUGFuZWwsIE1ha2VDcmVkZW50aWFsTEFDbGllbnREYXRhSGFzaCkKK1RF U1QoV2ViQXV0aGVudGljYXRpb25QYW5lbCwgTWFrZUNyZWRlbnRpYWxMQUNsaWVudERhdGFIYXNo TWVkaWF0aW9uKQogewogICAgIHJlc2V0KCk7CiAKQEAgLTE4ODgsNyArMTg4OCw3IEBAIFRFU1Qo V2ViQXV0aGVudGljYXRpb25QYW5lbCwgTWFrZUNyZWRlbnRpYWxMQUNsaWVudERhdGFIYXNoKQog ICAgIGF1dG8gZGVsZWdhdGUgPSBhZG9wdE5TKFtbVGVzdFdlYkF1dGhlbnRpY2F0aW9uUGFuZWxE ZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOwogICAgIFtwYW5lbCBzZXREZWxlZ2F0ZTpkZWxlZ2F0ZS5n ZXQoKV07CiAKLSAgICBbcGFuZWwgbWFrZUNyZWRlbnRpYWxXaXRoQ2xpZW50RGF0YUhhc2g6bnNI YXNoLmdldCgpIG9wdGlvbnM6b3B0aW9ucy5nZXQoKSBjb21wbGV0aW9uSGFuZGxlcjpeKF9XS0F1 dGhlbnRpY2F0b3JBdHRlc3RhdGlvblJlc3BvbnNlICpyZXNwb25zZSwgTlNFcnJvciAqZXJyb3Ip IHsKKyAgICBbcGFuZWwgbWFrZUNyZWRlbnRpYWxXaXRoTWVkaWF0aW9uUmVxdWlyZW1lbnQ6X1dL V2ViQXV0aGVudGljYXRpb25NZWRpYXRpb25SZXF1aXJlbWVudE9wdGlvbmFsIGNsaWVudERhdGFI YXNoOm5zSGFzaC5nZXQoKSBvcHRpb25zOm9wdGlvbnMuZ2V0KCkgY29tcGxldGlvbkhhbmRsZXI6 XihfV0tBdXRoZW50aWNhdG9yQXR0ZXN0YXRpb25SZXNwb25zZSAqcmVzcG9uc2UsIE5TRXJyb3Ig KmVycm9yKSB7CiAgICAgICAgIHdlYkF1dGhlbnRpY2F0aW9uUGFuZWxSYW4gPSB0cnVlOwogICAg ICAgICBjbGVhblVwS2V5Y2hhaW4oImV4YW1wbGUuY29tIik7CiAKQEAgLTIwODgsNyArMjA4OCw3 IEBAIFRFU1QoV2ViQXV0aGVudGljYXRpb25QYW5lbCwgR2V0QXNzZXJ0aW9uTEEpCiAgICAgVXRp bDo6cnVuKCZ3ZWJBdXRoZW50aWNhdGlvblBhbmVsUmFuKTsKIH0KIAotVEVTVChXZWJBdXRoZW50 aWNhdGlvblBhbmVsLCBHZXRBc3NlcnRpb25MQUNsaWVudERhdGFIYXNoKQorVEVTVChXZWJBdXRo ZW50aWNhdGlvblBhbmVsLCBHZXRBc3NlcnRpb25MQUNsaWVudERhdGFIYXNoTWVkaWF0aW9uKQog ewogICAgIHJlc2V0KCk7CiAKQEAgLTIxMDUsNyArMjEwNSw3IEBAIFRFU1QoV2ViQXV0aGVudGlj YXRpb25QYW5lbCwgR2V0QXNzZXJ0aW9uTEFDbGllbnREYXRhSGFzaCkKICAgICBhdXRvIGRlbGVn YXRlID0gYWRvcHROUyhbW1Rlc3RXZWJBdXRoZW50aWNhdGlvblBhbmVsRGVsZWdhdGUgYWxsb2Nd IGluaXRdKTsKICAgICBbcGFuZWwgc2V0RGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOwogCi0gICAg W3BhbmVsIGdldEFzc2VydGlvbldpdGhDbGllbnREYXRhSGFzaDpuc0hhc2ggb3B0aW9uczpvcHRp b25zLmdldCgpIGNvbXBsZXRpb25IYW5kbGVyOl4oX1dLQXV0aGVudGljYXRvckFzc2VydGlvblJl c3BvbnNlICpyZXNwb25zZSwgTlNFcnJvciAqZXJyb3IpIHsKKyAgICBbcGFuZWwgZ2V0QXNzZXJ0 aW9uV2l0aE1lZGlhdGlvblJlcXVpcmVtZW50Ol9XS1dlYkF1dGhlbnRpY2F0aW9uTWVkaWF0aW9u UmVxdWlyZW1lbnRPcHRpb25hbCBjbGllbnREYXRhSGFzaDpuc0hhc2ggb3B0aW9uczpvcHRpb25z LmdldCgpIGNvbXBsZXRpb25IYW5kbGVyOl4oX1dLQXV0aGVudGljYXRvckFzc2VydGlvblJlc3Bv bnNlICpyZXNwb25zZSwgTlNFcnJvciAqZXJyb3IpIHsKICAgICAgICAgd2ViQXV0aGVudGljYXRp b25QYW5lbFJhbiA9IHRydWU7CiAgICAgICAgIGNsZWFuVXBLZXljaGFpbigiZXhhbXBsZS5jb20i KTsKIAo= 455277 2022-03-21 14:57:07 -0700 2022-03-22 10:13:29 -0700 Patch bug-238147-20220321145707.patch text/plain 19444 pascoe U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxNTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDg3MzlmOTExNzhlOTExNzE1 Y2E1Nzk5MDkyMDI5MmY2YmRlOGU1OGUuLjBiYjY3ZjRhZTA2MmRhYzA0YzJlZTAyMmNkYTVkNjIy NTUwYjY0YWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMjItMDMtMjEgIEogUGFzY29l ICA8al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJBdXRobl0gUGFzcyBhbG9uZyB0 aW1lb3V0IHRvIEFTQSBhbmQgaWdub3JlIHRpbWVvdXQgZm9yIGNvbmRpdGlvbmFsIG1lZGlhdGlv biByZXF1ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjM4MTQ3CisgICAgICAgIHJkYXI6Ly85MDUwOTQ2NAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnRseSB3ZSBkb24ndCBwYXNzIHRoZSB0 aW1lb3V0IGZyb20gdGhlIHJwIGludG8gQVNBLCBzbyB0aGUgZGVmYXVsdCB0aW1lb3V0IGlzIGFs d2F5cyB1c2VkLgorICAgICAgICBUaGlzIHBhdGNoIHN0YXJ0cyBwYXNzaW5nIGFsb25nIHRoZSB0 aW1lb3V0IHRvIEFTQSwgYW5kIGNyZWF0ZXMgYSBwbGFjZSBmb3IgQVNBIHRvIHNwZWNpZnkgdGhl CisgICAgICAgIG1lZGlhdGlvbiBvZiB0aGUgcmVxdWVzdCwgc28gd2UgY2FuIGlnbm9yZSB0aGUg dGltZW91dCBmb3IgcmVxdWVzdHMgdXNpbmcgY29uZGl0aW9uYWwgbWVkaWF0aW9uLgorCisgICAg ICAgIE1vZGlmaWVkIEFQSSB0ZXN0LgorCisgICAgICAgICogUGxhdGZvcm0vc3BpL0NvY29hL0F1 dGhlbnRpY2F0aW9uU2VydmljZXNDb3JlU1BJLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9D b2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9Db2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLm1tOgorICAgICAgICAodG9XZWJDb3Jl KToKKyAgICAgICAgKC1bX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbCBtYWtlQ3JlZGVudGlhbFdp dGhNZWRpYXRpb25SZXF1aXJlbWVudDpjbGllbnREYXRhSGFzaDpvcHRpb25zOmNvbXBsZXRpb25I YW5kbGVyOl0pOgorICAgICAgICAoLVtfV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsIG1ha2VDcmVk ZW50aWFsV2l0aENsaWVudERhdGFIYXNoOm9wdGlvbnM6Y29tcGxldGlvbkhhbmRsZXI6XSk6Cisg ICAgICAgICgtW19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwgZ2V0QXNzZXJ0aW9uV2l0aE1lZGlh dGlvblJlcXVpcmVtZW50OmNsaWVudERhdGFIYXNoOm9wdGlvbnM6Y29tcGxldGlvbkhhbmRsZXI6 XSk6CisgICAgICAgICgtW19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwgZ2V0QXNzZXJ0aW9uV2l0 aENsaWVudERhdGFIYXNoOm9wdGlvbnM6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAgICog VUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0F1dGhlbnRpY2F0b3JNYW5hZ2VyLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6QXV0aGVudGljYXRvck1hbmFnZXI6OnJlc3BvbmRSZWNlaXZlZCk6Cisg ICAgICAgIChXZWJLaXQ6OkF1dGhlbnRpY2F0b3JNYW5hZ2VyOjppbml0VGltZU91dFRpbWVyKToK KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvV2ViQXV0aGVudGlj YXRvckNvb3JkaW5hdG9yUHJveHkubW06CisgICAgICAgIChXZWJLaXQ6OmNvbmZpZ3VyZVJlZ2lz dHJhdGlvblJlcXVlc3RDb250ZXh0KToKKyAgICAgICAgKFdlYktpdDo6Y29uZmlndXJlQXNzZXJ0 aW9uT3B0aW9ucyk6CisKIDIwMjItMDMtMjEgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFt3YXRjaE9TXSBBZGQgcmVxdWlyZWQgc3lzY2FsbApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvQ29jb2EvQXV0aGVudGljYXRpb25TZXJ2 aWNlc0NvcmVTUEkuaCBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL0NvY29hL0F1dGhlbnRp Y2F0aW9uU2VydmljZXNDb3JlU1BJLmgKaW5kZXggODU3YmQ5YTY1MzEwYzVjMWE1OTQ3M2NkOTM3 YzBiMWU2MTk3M2YyNC4uNDU2ZGQ2Y2RkN2M5NWM0ODllZjY1OTFhNmZjYzlhYzRiZjYzZDhjNyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvQ29jb2EvQXV0aGVudGljYXRp b25TZXJ2aWNlc0NvcmVTUEkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9Db2Nv YS9BdXRoZW50aWNhdGlvblNlcnZpY2VzQ29yZVNQSS5oCkBAIC0xNjQsNiArMTY0LDcgQEAgdHlw ZWRlZiBOU19FTlVNKE5TVUludGVnZXIsIEFTQ1B1YmxpY0tleUNyZWRlbnRpYWxLaW5kKSB7CiBA cHJvcGVydHkgKG5vbmF0b21pYywgbnVsbGFibGUsIGNvcHkpIE5TRGF0YSAqY2xpZW50RGF0YUhh c2g7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgbnVsbGFibGUsIHJlYWRvbmx5LCBjb3B5KSBOU1N0 cmluZyAqdXNlclZlcmlmaWNhdGlvblByZWZlcmVuY2U7CiBAcHJvcGVydHkgKG5vbmF0b21pYywg bnVsbGFibGUsIGNvcHkpIEFTQ1dlYkF1dGhlbnRpY2F0aW9uRXh0ZW5zaW9uc0NsaWVudElucHV0 cyAqZXh0ZW5zaW9uczsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxsYWJsZSwgY29weSkgTlNO dW1iZXIgKnRpbWVvdXQ7CiAKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxsYWJsZSwgcmVhZG9u bHksIGNvcHkpIE5TQXJyYXk8QVNDUHVibGljS2V5Q3JlZGVudGlhbERlc2NyaXB0b3IgKj4gKmFs bG93ZWRDcmVkZW50aWFsczsKIApAQCAtMTk0LDYgKzE5NSw3IEBAIHR5cGVkZWYgTlNfT1BUSU9O UyhOU1VJbnRlZ2VyLCBBU0NDcmVkZW50aWFsUmVxdWVzdFR5cGVzKSB7CiBAcHJvcGVydHkgKG5v bmF0b21pYywgbnVsbGFibGUsIGNvcHkpIE5TU3RyaW5nICp1c2VyVmVyaWZpY2F0aW9uUHJlZmVy ZW5jZTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxsYWJsZSwgY29weSkgTlNTdHJpbmcgKmF0 dGVzdGF0aW9uUHJlZmVyZW5jZTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxsYWJsZSwgY29w eSkgQVNDV2ViQXV0aGVudGljYXRpb25FeHRlbnNpb25zQ2xpZW50SW5wdXRzICpleHRlbnNpb25z OworQHByb3BlcnR5IChub25hdG9taWMsIG51bGxhYmxlLCBjb3B5KSBOU051bWJlciAqdGltZW91 dDsKIAogQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgc2hvdWxkUmVxdWlyZVJlc2lkZW50S2V5 OwogQHByb3BlcnR5IChub25hdG9taWMsIGNvcHkpIE5TQXJyYXk8QVNDUHVibGljS2V5Q3JlZGVu dGlhbERlc2NyaXB0b3IgKj4gKmV4Y2x1ZGVkQ3JlZGVudGlhbHM7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5o IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9u UGFuZWwuaAppbmRleCA5ZjU0N2ZiOTUwYzY3ZmYxNjZhYmRiZThhNzgyMDUyNzYxMzBlZDgxLi5j OGMwOTBkOGM3ZjA5MzMzNDFmYmI4NTM0YTYyNDg5ZTRjNGZmN2MwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5o CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJBdXRoZW50aWNh dGlvblBhbmVsLmgKQEAgLTg2LDYgKzg2LDEzIEBAIHR5cGVkZWYgTlNfRU5VTShOU0ludGVnZXIs IF9XS1dlYkF1dGhlbnRpY2F0aW9uVXNlclZlcmlmaWNhdGlvbkF2YWlsYWJpbGl0eSkgewogICAg IF9XS1dlYkF1dGhlbnRpY2F0aW9uVXNlclZlcmlmaWNhdGlvbkF2YWlsYWJpbGl0eU5vdFN1cHBv cnRlZCwKIH0gV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19U QkEpKTsKIAordHlwZWRlZiBOU19FTlVNKE5TSW50ZWdlciwgX1dLV2ViQXV0aGVudGljYXRpb25N ZWRpYXRpb25SZXF1aXJlbWVudCkgeworICAgIF9XS1dlYkF1dGhlbnRpY2F0aW9uTWVkaWF0aW9u UmVxdWlyZW1lbnRTaWxlbnQsCisgICAgX1dLV2ViQXV0aGVudGljYXRpb25NZWRpYXRpb25SZXF1 aXJlbWVudE9wdGlvbmFsLAorICAgIF9XS1dlYkF1dGhlbnRpY2F0aW9uTWVkaWF0aW9uUmVxdWly ZW1lbnRSZXF1aXJlZCwKKyAgICBfV0tXZWJBdXRoZW50aWNhdGlvbk1lZGlhdGlvblJlcXVpcmVt ZW50Q29uZGl0aW9uYWwsCit9IFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlv cyhXS19JT1NfVEJBKSk7CisKIFdLX0VYUE9SVCBleHRlcm4gTlNTdHJpbmcgKiBjb25zdCBfV0tM b2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsTmFtZUtleTsKIFdLX0VYUE9SVCBleHRlcm4gTlNT dHJpbmcgKiBjb25zdCBfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsRGlzcGxheU5hbWVL ZXk7CiBXS19FWFBPUlQgZXh0ZXJuIE5TU3RyaW5nICogY29uc3QgX1dLTG9jYWxBdXRoZW50aWNh dG9yQ3JlZGVudGlhbElES2V5OwpAQCAtMTQxLDggKzE0OCwxMCBAQCBXS19DTEFTU19BVkFJTEFC TEUobWFjb3MoMTAuMTUuNCksIGlvcygxMy40KSkKIC8vIEZJWE1FOiA8cmRhcjovL3Byb2JsZW0v NzE1MDk0ODU+IEFkZHMgZGV0YWlsZWQgTlNFcnJvci4KIC0gKHZvaWQpbWFrZUNyZWRlbnRpYWxX aXRoQ2hhbGxlbmdlOihOU0RhdGEgKiljaGFsbGVuZ2Ugb3JpZ2luOihOU1N0cmluZyAqKW9yaWdp biBvcHRpb25zOihfV0tQdWJsaWNLZXlDcmVkZW50aWFsQ3JlYXRpb25PcHRpb25zICopb3B0aW9u cyBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoX1dLQXV0aGVudGljYXRvckF0dGVzdGF0aW9u UmVzcG9uc2UgKiwgTlNFcnJvciAqKSloYW5kbGVyIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTIu MCksIGlvcygxNS4wKSk7CiAtICh2b2lkKW1ha2VDcmVkZW50aWFsV2l0aENsaWVudERhdGFIYXNo OihOU0RhdGEgKiljbGllbnREYXRhSGFzaCBvcHRpb25zOihfV0tQdWJsaWNLZXlDcmVkZW50aWFs Q3JlYXRpb25PcHRpb25zICopb3B0aW9ucyBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoX1dL QXV0aGVudGljYXRvckF0dGVzdGF0aW9uUmVzcG9uc2UgKiwgTlNFcnJvciAqKSloYW5kbGVyIFdL X0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CistICh2 b2lkKW1ha2VDcmVkZW50aWFsV2l0aE1lZGlhdGlvblJlcXVpcmVtZW50OihfV0tXZWJBdXRoZW50 aWNhdGlvbk1lZGlhdGlvblJlcXVpcmVtZW50KW1lZGlhdGlvbiBjbGllbnREYXRhSGFzaDooTlNE YXRhICopY2xpZW50RGF0YUhhc2ggb3B0aW9uczooX1dLUHVibGljS2V5Q3JlZGVudGlhbENyZWF0 aW9uT3B0aW9ucyAqKW9wdGlvbnMgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKF9XS0F1dGhl bnRpY2F0b3JBdHRlc3RhdGlvblJlc3BvbnNlICosIE5TRXJyb3IgKikpaGFuZGxlciBXS19BUElf QVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwogLSAodm9pZCln ZXRBc3NlcnRpb25XaXRoQ2hhbGxlbmdlOihOU0RhdGEgKiljaGFsbGVuZ2Ugb3JpZ2luOihOU1N0 cmluZyAqKW9yaWdpbiBvcHRpb25zOihfV0tQdWJsaWNLZXlDcmVkZW50aWFsUmVxdWVzdE9wdGlv bnMgKilvcHRpb25zIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShfV0tBdXRoZW50aWNhdG9y QXNzZXJ0aW9uUmVzcG9uc2UgKiwgTlNFcnJvciAqKSloYW5kbGVyIFdLX0FQSV9BVkFJTEFCTEUo bWFjb3MoMTIuMCksIGlvcygxNS4wKSk7CiAtICh2b2lkKWdldEFzc2VydGlvbldpdGhDbGllbnRE YXRhSGFzaDooTlNEYXRhICopY2xpZW50RGF0YUhhc2ggb3B0aW9uczooX1dLUHVibGljS2V5Q3Jl ZGVudGlhbFJlcXVlc3RPcHRpb25zICopb3B0aW9ucyBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAo XikoX1dLQXV0aGVudGljYXRvckFzc2VydGlvblJlc3BvbnNlICosIE5TRXJyb3IgKikpaGFuZGxl ciBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwor LSAodm9pZClnZXRBc3NlcnRpb25XaXRoTWVkaWF0aW9uUmVxdWlyZW1lbnQ6KF9XS1dlYkF1dGhl bnRpY2F0aW9uTWVkaWF0aW9uUmVxdWlyZW1lbnQpbWVkaWF0aW9uIGNsaWVudERhdGFIYXNoOihO U0RhdGEgKiljbGllbnREYXRhSGFzaCBvcHRpb25zOihfV0tQdWJsaWNLZXlDcmVkZW50aWFsUmVx dWVzdE9wdGlvbnMgKilvcHRpb25zIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShfV0tBdXRo ZW50aWNhdG9yQXNzZXJ0aW9uUmVzcG9uc2UgKiwgTlNFcnJvciAqKSloYW5kbGVyIFdLX0FQSV9B VkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CiAtICh2b2lkKWNh bmNlbDsKIAogLy8gRklYTUU6IDxyZGFyOi8vcHJvYmxlbS83MTUwOTg0OD4gRGVwcmVjYXRlIHRo ZSBmb2xsb3dpbmcgcHJvcGVydGllcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLm1tIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwubW0KaW5kZXgg NjBjZjExZTM4M2Y5MWU5YzQ5MDVlYjIyMWI0NjBlOWYyOGI4OGU3My4uZjU5YTg1OTdlZGU1Mjc1 MzQyNmVjOTg5MDRkMmRlYTM3MDc1YWNiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwubW0KKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwubW0K QEAgLTQ4LDYgKzQ4LDcgQEAKICNpbXBvcnQgPFdlYkNvcmUvQnVmZmVyU291cmNlLmg+CiAjaW1w b3J0IDxXZWJDb3JlL0NCT1JSZWFkZXIuaD4KICNpbXBvcnQgPFdlYkNvcmUvQ0JPUldyaXRlci5o PgorI2ltcG9ydCA8V2ViQ29yZS9DcmVkZW50aWFsUmVxdWVzdE9wdGlvbnMuaD4KICNpbXBvcnQg PFdlYkNvcmUvRGV2aWNlUmVxdWVzdENvbnZlcnRlci5oPgogI2ltcG9ydCA8V2ViQ29yZS9GaWRv Q29uc3RhbnRzLmg+CiAjaW1wb3J0IDxXZWJDb3JlL01vY2tXZWJBdXRoZW50aWNhdGlvbkNvbmZp Z3VyYXRpb24uaD4KQEAgLTc4Niw2ICs3ODcsMjMgQEAgc3RhdGljIFdlYkNvcmU6OkF1dGhlbnRp Y2F0aW9uRXh0ZW5zaW9uc0NsaWVudElucHV0cyBhdXRoZW50aWNhdGlvbkV4dGVuc2lvbnNDbGkK IAogICAgIHJldHVybiByZXN1bHQ7CiB9CisKK3N0YXRpYyBXZWJDb3JlOjpDcmVkZW50aWFsUmVx dWVzdE9wdGlvbnM6Ok1lZGlhdGlvblJlcXVpcmVtZW50IHRvV2ViQ29yZShfV0tXZWJBdXRoZW50 aWNhdGlvbk1lZGlhdGlvblJlcXVpcmVtZW50IG1lZGlhdGlvbikKK3sKKyAgICBzd2l0Y2ggKG1l ZGlhdGlvbikgeworICAgIGNhc2UgX1dLV2ViQXV0aGVudGljYXRpb25NZWRpYXRpb25SZXF1aXJl bWVudFNpbGVudDoKKyAgICAgICAgcmV0dXJuIFdlYkNvcmU6OkNyZWRlbnRpYWxSZXF1ZXN0T3B0 aW9uczo6TWVkaWF0aW9uUmVxdWlyZW1lbnQ6OlNpbGVudDsKKyAgICBjYXNlIF9XS1dlYkF1dGhl bnRpY2F0aW9uTWVkaWF0aW9uUmVxdWlyZW1lbnRPcHRpb25hbDoKKyAgICAgICAgcmV0dXJuIFdl YkNvcmU6OkNyZWRlbnRpYWxSZXF1ZXN0T3B0aW9uczo6TWVkaWF0aW9uUmVxdWlyZW1lbnQ6Ok9w dGlvbmFsOworICAgIGNhc2UgX1dLV2ViQXV0aGVudGljYXRpb25NZWRpYXRpb25SZXF1aXJlbWVu dFJlcXVpcmVkOgorICAgICAgICByZXR1cm4gV2ViQ29yZTo6Q3JlZGVudGlhbFJlcXVlc3RPcHRp b25zOjpNZWRpYXRpb25SZXF1aXJlbWVudDo6UmVxdWlyZWQ7CisgICAgY2FzZSBfV0tXZWJBdXRo ZW50aWNhdGlvbk1lZGlhdGlvblJlcXVpcmVtZW50Q29uZGl0aW9uYWw6CisgICAgICAgIHJldHVy biBXZWJDb3JlOjpDcmVkZW50aWFsUmVxdWVzdE9wdGlvbnM6Ok1lZGlhdGlvblJlcXVpcmVtZW50 OjpDb25kaXRpb25hbDsKKyAgICBkZWZhdWx0OgorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKKyAgICAgICAgcmV0dXJuIFdlYkNvcmU6OkNyZWRlbnRpYWxSZXF1ZXN0T3B0aW9uczo6TWVk aWF0aW9uUmVxdWlyZW1lbnQ6Ok9wdGlvbmFsOworICAgIH0KK30KICNlbmRpZgogCiArIChXZWJD b3JlOjpQdWJsaWNLZXlDcmVkZW50aWFsQ3JlYXRpb25PcHRpb25zKWNvbnZlcnRUb0NvcmVDcmVh dGlvbk9wdGlvbnNXaXRoT3B0aW9uczooX1dLUHVibGljS2V5Q3JlZGVudGlhbENyZWF0aW9uT3B0 aW9ucyAqKW9wdGlvbnMKQEAgLTg0NCw3ICs4NjIsNyBAQCBzdGF0aWMgUmV0YWluUHRyPF9XS0F1 dGhlbnRpY2F0b3JBdHRlc3RhdGlvblJlc3BvbnNlPiB3a0F1dGhlbnRpY2F0b3JBdHRlc3RhdGlv bgogI2VuZGlmCiB9CiAKLS0gKHZvaWQpbWFrZUNyZWRlbnRpYWxXaXRoQ2xpZW50RGF0YUhhc2g6 KE5TRGF0YSAqKWNsaWVudERhdGFIYXNoIG9wdGlvbnM6KF9XS1B1YmxpY0tleUNyZWRlbnRpYWxD cmVhdGlvbk9wdGlvbnMgKilvcHRpb25zIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShfV0tB dXRoZW50aWNhdG9yQXR0ZXN0YXRpb25SZXNwb25zZSAqLCBOU0Vycm9yICopKWhhbmRsZXIKKy0g KHZvaWQpbWFrZUNyZWRlbnRpYWxXaXRoTWVkaWF0aW9uUmVxdWlyZW1lbnQ6KF9XS1dlYkF1dGhl bnRpY2F0aW9uTWVkaWF0aW9uUmVxdWlyZW1lbnQpbWVkaWF0aW9uIGNsaWVudERhdGFIYXNoOihO U0RhdGEgKiljbGllbnREYXRhSGFzaCBvcHRpb25zOihfV0tQdWJsaWNLZXlDcmVkZW50aWFsQ3Jl YXRpb25PcHRpb25zICopb3B0aW9ucyBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoX1dLQXV0 aGVudGljYXRvckF0dGVzdGF0aW9uUmVzcG9uc2UgKiwgTlNFcnJvciAqKSloYW5kbGVyCiB7CiAj aWYgRU5BQkxFKFdFQl9BVVRITikKICAgICBhdXRvIGNhbGxiYWNrID0gW2hhbmRsZXIgPSBtYWtl QmxvY2tQdHIoaGFuZGxlcildIChzdGQ6OnZhcmlhbnQ8UmVmPFdlYkNvcmU6OkF1dGhlbnRpY2F0 b3JSZXNwb25zZT4sIFdlYkNvcmU6OkV4Y2VwdGlvbkRhdGE+JiYgcmVzdWx0KSBtdXRhYmxlIHsK QEAgLTg1NCwxMCArODcyLDE1IEBAIHN0YXRpYyBSZXRhaW5QdHI8X1dLQXV0aGVudGljYXRvckF0 dGVzdGF0aW9uUmVzcG9uc2U+IHdrQXV0aGVudGljYXRvckF0dGVzdGF0aW9uCiAgICAgICAgICAg ICBoYW5kbGVyKG5pbCwgW05TRXJyb3IgZXJyb3JXaXRoRG9tYWluOldLRXJyb3JEb21haW4gY29k ZTpleGNlcHRpb24uY29kZSB1c2VySW5mbzpAeyBOU0xvY2FsaXplZERlc2NyaXB0aW9uS2V5OiBl eGNlcHRpb24ubWVzc2FnZSB9XSk7CiAgICAgICAgIH0pOwogICAgIH07Ci0gICAgX3BhbmVsLT5o YW5kbGVSZXF1ZXN0KHsgdmVjdG9yRnJvbU5TRGF0YShjbGllbnREYXRhSGFzaCksIFtfV0tXZWJB dXRoZW50aWNhdGlvblBhbmVsIGNvbnZlcnRUb0NvcmVDcmVhdGlvbk9wdGlvbnNXaXRoT3B0aW9u czpvcHRpb25zXSwgbnVsbHB0ciwgV2ViS2l0OjpXZWJBdXRoZW50aWNhdGlvblBhbmVsUmVzdWx0 OjpVbmF2YWlsYWJsZSwgbnVsbHB0ciwgc3RkOjpudWxsb3B0LCB7IH0sIHRydWUsIFN0cmluZygp LCBudWxscHRyLCBzdGQ6Om51bGxvcHQsIHN0ZDo6bnVsbG9wdCB9LCBXVEZNb3ZlKGNhbGxiYWNr KSk7CisgICAgX3BhbmVsLT5oYW5kbGVSZXF1ZXN0KHsgdmVjdG9yRnJvbU5TRGF0YShjbGllbnRE YXRhSGFzaCksIFtfV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsIGNvbnZlcnRUb0NvcmVDcmVhdGlv bk9wdGlvbnNXaXRoT3B0aW9uczpvcHRpb25zXSwgbnVsbHB0ciwgV2ViS2l0OjpXZWJBdXRoZW50 aWNhdGlvblBhbmVsUmVzdWx0OjpVbmF2YWlsYWJsZSwgbnVsbHB0ciwgc3RkOjpudWxsb3B0LCB7 IH0sIHRydWUsIFN0cmluZygpLCBudWxscHRyLCB0b1dlYkNvcmUobWVkaWF0aW9uKSwgc3RkOjpu dWxsb3B0IH0sIFdURk1vdmUoY2FsbGJhY2spKTsKICNlbmRpZgogfQogCistICh2b2lkKW1ha2VD cmVkZW50aWFsV2l0aENsaWVudERhdGFIYXNoOihOU0RhdGEgKiljbGllbnREYXRhSGFzaCBvcHRp b25zOihfV0tQdWJsaWNLZXlDcmVkZW50aWFsQ3JlYXRpb25PcHRpb25zICopb3B0aW9ucyBjb21w bGV0aW9uSGFuZGxlcjoodm9pZCAoXikoX1dLQXV0aGVudGljYXRvckF0dGVzdGF0aW9uUmVzcG9u c2UgKiwgTlNFcnJvciAqKSloYW5kbGVyCit7CisgICAgW3NlbGYgbWFrZUNyZWRlbnRpYWxXaXRo TWVkaWF0aW9uUmVxdWlyZW1lbnQ6X1dLV2ViQXV0aGVudGljYXRpb25NZWRpYXRpb25SZXF1aXJl bWVudE9wdGlvbmFsIGNsaWVudERhdGFIYXNoOmNsaWVudERhdGFIYXNoIG9wdGlvbnM6b3B0aW9u cyBjb21wbGV0aW9uSGFuZGxlcjpoYW5kbGVyXTsKK30KKwogKyAoV2ViQ29yZTo6UHVibGljS2V5 Q3JlZGVudGlhbFJlcXVlc3RPcHRpb25zKWNvbnZlcnRUb0NvcmVSZXF1ZXN0T3B0aW9uc1dpdGhP cHRpb25zOihfV0tQdWJsaWNLZXlDcmVkZW50aWFsUmVxdWVzdE9wdGlvbnMgKilvcHRpb25zCiB7 CiAgICAgV2ViQ29yZTo6UHVibGljS2V5Q3JlZGVudGlhbFJlcXVlc3RPcHRpb25zIHJlc3VsdDsK QEAgLTkwOCw3ICs5MzEsNyBAQCBzdGF0aWMgUmV0YWluUHRyPF9XS0F1dGhlbnRpY2F0b3JBc3Nl cnRpb25SZXNwb25zZT4gd2tBdXRoZW50aWNhdG9yQXNzZXJ0aW9uUmVzcAogI2VuZGlmCiB9CiAK LS0gKHZvaWQpZ2V0QXNzZXJ0aW9uV2l0aENsaWVudERhdGFIYXNoOihOU0RhdGEgKiljbGllbnRE YXRhSGFzaCBvcHRpb25zOihfV0tQdWJsaWNLZXlDcmVkZW50aWFsUmVxdWVzdE9wdGlvbnMgKilv cHRpb25zIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShfV0tBdXRoZW50aWNhdG9yQXNzZXJ0 aW9uUmVzcG9uc2UgKiwgTlNFcnJvciAqKSloYW5kbGVyCistICh2b2lkKWdldEFzc2VydGlvbldp dGhNZWRpYXRpb25SZXF1aXJlbWVudDooX1dLV2ViQXV0aGVudGljYXRpb25NZWRpYXRpb25SZXF1 aXJlbWVudCltZWRpYXRpb24gY2xpZW50RGF0YUhhc2g6KE5TRGF0YSAqKWNsaWVudERhdGFIYXNo IG9wdGlvbnM6KF9XS1B1YmxpY0tleUNyZWRlbnRpYWxSZXF1ZXN0T3B0aW9ucyAqKW9wdGlvbnMg Y29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKF9XS0F1dGhlbnRpY2F0b3JBc3NlcnRpb25SZXNw b25zZSAqLCBOU0Vycm9yICopKWhhbmRsZXIKIHsKICNpZiBFTkFCTEUoV0VCX0FVVEhOKQogICAg IGF1dG8gY2FsbGJhY2sgPSBbaGFuZGxlciA9IG1ha2VCbG9ja1B0cihoYW5kbGVyKV0gKHN0ZDo6 dmFyaWFudDxSZWY8V2ViQ29yZTo6QXV0aGVudGljYXRvclJlc3BvbnNlPiwgV2ViQ29yZTo6RXhj ZXB0aW9uRGF0YT4mJiByZXN1bHQpIG11dGFibGUgewpAQCAtOTE4LDEwICs5NDEsMTUgQEAgc3Rh dGljIFJldGFpblB0cjxfV0tBdXRoZW50aWNhdG9yQXNzZXJ0aW9uUmVzcG9uc2U+IHdrQXV0aGVu dGljYXRvckFzc2VydGlvblJlc3AKICAgICAgICAgICAgIGhhbmRsZXIobmlsLCBbTlNFcnJvciBl cnJvcldpdGhEb21haW46V0tFcnJvckRvbWFpbiBjb2RlOldLRXJyb3JVbmtub3duIHVzZXJJbmZv Om5pbF0pOwogICAgICAgICB9KTsKICAgICB9OwotICAgIF9wYW5lbC0+aGFuZGxlUmVxdWVzdCh7 IHZlY3RvckZyb21OU0RhdGEoY2xpZW50RGF0YUhhc2gpLCBbX1dLV2ViQXV0aGVudGljYXRpb25Q YW5lbCBjb252ZXJ0VG9Db3JlUmVxdWVzdE9wdGlvbnNXaXRoT3B0aW9uczpvcHRpb25zXSwgbnVs bHB0ciwgV2ViS2l0OjpXZWJBdXRoZW50aWNhdGlvblBhbmVsUmVzdWx0OjpVbmF2YWlsYWJsZSwg bnVsbHB0ciwgc3RkOjpudWxsb3B0LCB7IH0sIHRydWUsIFN0cmluZygpLCBudWxscHRyLCBzdGQ6 Om51bGxvcHQsIHN0ZDo6bnVsbG9wdCB9LCBXVEZNb3ZlKGNhbGxiYWNrKSk7CisgICAgX3BhbmVs LT5oYW5kbGVSZXF1ZXN0KHsgdmVjdG9yRnJvbU5TRGF0YShjbGllbnREYXRhSGFzaCksIFtfV0tX ZWJBdXRoZW50aWNhdGlvblBhbmVsIGNvbnZlcnRUb0NvcmVSZXF1ZXN0T3B0aW9uc1dpdGhPcHRp b25zOm9wdGlvbnNdLCBudWxscHRyLCBXZWJLaXQ6OldlYkF1dGhlbnRpY2F0aW9uUGFuZWxSZXN1 bHQ6OlVuYXZhaWxhYmxlLCBudWxscHRyLCBzdGQ6Om51bGxvcHQsIHsgfSwgdHJ1ZSwgU3RyaW5n KCksIG51bGxwdHIsIHRvV2ViQ29yZShtZWRpYXRpb24pLCBzdGQ6Om51bGxvcHQgfSwgV1RGTW92 ZShjYWxsYmFjaykpOwogI2VuZGlmCiB9CiAKKy0gKHZvaWQpZ2V0QXNzZXJ0aW9uV2l0aENsaWVu dERhdGFIYXNoOihOU0RhdGEgKiljbGllbnREYXRhSGFzaCBvcHRpb25zOihfV0tQdWJsaWNLZXlD cmVkZW50aWFsUmVxdWVzdE9wdGlvbnMgKilvcHRpb25zIGNvbXBsZXRpb25IYW5kbGVyOih2b2lk ICheKShfV0tBdXRoZW50aWNhdG9yQXNzZXJ0aW9uUmVzcG9uc2UgKiwgTlNFcnJvciAqKSloYW5k bGVyCit7CisgICAgW3NlbGYgZ2V0QXNzZXJ0aW9uV2l0aE1lZGlhdGlvblJlcXVpcmVtZW50Ol9X S1dlYkF1dGhlbnRpY2F0aW9uTWVkaWF0aW9uUmVxdWlyZW1lbnRPcHRpb25hbCBjbGllbnREYXRh SGFzaDpjbGllbnREYXRhSGFzaCBvcHRpb25zOm9wdGlvbnMgY29tcGxldGlvbkhhbmRsZXI6aGFu ZGxlcl07Cit9CisKICsgKEJPT0wpaXNVc2VyVmVyaWZ5aW5nUGxhdGZvcm1BdXRoZW50aWNhdG9y QXZhaWxhYmxlCiB7CiAjaWYgRU5BQkxFKFdFQl9BVVRITikKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0F1dGhlbnRpY2F0b3JNYW5hZ2VyLmNw cCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0F1dGhlbnRpY2F0 b3JNYW5hZ2VyLmNwcAppbmRleCA2OWUzOTNmNmRiMjhhYTYwZTg1ZTUwY2VlM2VkMmEwY2Q1ZWQz ZTU5Li5iMzY0NzFlMzU2MjEzNjAzOTM2YjI2NTFmODM3MGYwMDk0NjA5NjgwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9BdXRoZW50aWNhdG9y TWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRp b24vQXV0aGVudGljYXRvck1hbmFnZXIuY3BwCkBAIC0yODEsNyArMjgxLDcgQEAgdm9pZCBBdXRo ZW50aWNhdG9yTWFuYWdlcjo6c2VydmljZVN0YXR1c1VwZGF0ZWQoV2ViQXV0aGVudGljYXRpb25T dGF0dXMgc3RhdHVzKQogdm9pZCBBdXRoZW50aWNhdG9yTWFuYWdlcjo6cmVzcG9uZFJlY2VpdmVk KFJlc3BvbmQmJiByZXNwb25kKQogewogICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7Ci0g ICAgaWYgKCFtX3JlcXVlc3RUaW1lT3V0VGltZXIuaXNBY3RpdmUoKSkKKyAgICBpZiAoIW1fcmVx dWVzdFRpbWVPdXRUaW1lci5pc0FjdGl2ZSgpICYmIChtX3BlbmRpbmdSZXF1ZXN0RGF0YS5tZWRp YXRpb24gIT0gV2ViQ29yZTo6Q3JlZGVudGlhbFJlcXVlc3RPcHRpb25zOjpNZWRpYXRpb25SZXF1 aXJlbWVudDo6Q29uZGl0aW9uYWwgfHwgIW1fcGVuZGluZ0NvbXBsZXRpb25IYW5kbGVyKSkKICAg ICAgICAgcmV0dXJuOwogICAgIEFTU0VSVChtX3BlbmRpbmdDb21wbGV0aW9uSGFuZGxlcik7CiAK QEAgLTQyNSw2ICs0MjUsOCBAQCB2b2lkIEF1dGhlbnRpY2F0b3JNYW5hZ2VyOjpzdGFydERpc2Nv dmVyeShjb25zdCBUcmFuc3BvcnRTZXQmIHRyYW5zcG9ydHMpCiAKIHZvaWQgQXV0aGVudGljYXRv ck1hbmFnZXI6OmluaXRUaW1lT3V0VGltZXIoKQogeworICAgIGlmIChtX3BlbmRpbmdSZXF1ZXN0 RGF0YS5tZWRpYXRpb24gPT0gV2ViQ29yZTo6Q3JlZGVudGlhbFJlcXVlc3RPcHRpb25zOjpNZWRp YXRpb25SZXF1aXJlbWVudDo6Q29uZGl0aW9uYWwpCisgICAgICAgIHJldHVybjsKICAgICBzdGQ6 Om9wdGlvbmFsPHVuc2lnbmVkPiB0aW1lT3V0SW5NczsKICAgICBXVEY6OnN3aXRjaE9uKG1fcGVu ZGluZ1JlcXVlc3REYXRhLm9wdGlvbnMsIFsmXShjb25zdCBQdWJsaWNLZXlDcmVkZW50aWFsQ3Jl YXRpb25PcHRpb25zJiBvcHRpb25zKSB7CiAgICAgICAgIHRpbWVPdXRJbk1zID0gb3B0aW9ucy50 aW1lb3V0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGlj YXRpb24vQ29jb2EvV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yUHJveHkubW0gYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9XZWJBdXRoZW50aWNhdG9y Q29vcmRpbmF0b3JQcm94eS5tbQppbmRleCBiOTg0MWNiMGFmOTIyNTljOTZiMTVmOTIzZmZlYjgy Mzc2NWM0OWQ3Li45MDZiYmQwNmI3NzFjM2ZhOThlNGIxZGJlOWFkZTE2YmZmMjNjOTE5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9X ZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3JQcm94eS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9XZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0 b3JQcm94eS5tbQpAQCAtMjQxLDkgKzI0MSwxMiBAQCBzdGF0aWMgUmV0YWluUHRyPEFTQ0NyZWRl bnRpYWxSZXF1ZXN0Q29udGV4dD4gY29uZmlndXJlUmVnaXN0cmF0aW9uUmVxdWVzdENvbnRleAog ICAgIGlmIChyZXF1ZXN0VHlwZXMgJiBBU0NDcmVkZW50aWFsUmVxdWVzdFR5cGVTZWN1cml0eUtl eVB1YmxpY0tleVJlZ2lzdHJhdGlvbikKICAgICAgICAgW3JlcXVlc3RDb250ZXh0IHNldFNlY3Vy aXR5S2V5Q3JlZGVudGlhbENyZWF0aW9uT3B0aW9uczpjcmVkZW50aWFsQ3JlYXRpb25PcHRpb25z LmdldCgpXTsKIAotICAgIGlmIChvcHRpb25zLmV4dGVuc2lvbnMgJiYgW2NyZWRlbnRpYWxDcmVh dGlvbk9wdGlvbnMgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihzZXRFeHRlbnNpb25zOild KQorICAgIGlmIChvcHRpb25zLmV4dGVuc2lvbnMpCiAgICAgICAgIFtjcmVkZW50aWFsQ3JlYXRp b25PcHRpb25zIHNldEV4dGVuc2lvbnM6dG9BU0NFeHRlbnNpb25zKCpvcHRpb25zLmV4dGVuc2lv bnMpLmdldCgpXTsKIAorICAgIGlmIChvcHRpb25zLnRpbWVvdXQgJiYgW2NyZWRlbnRpYWxDcmVh dGlvbk9wdGlvbnMgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihzZXRUaW1lb3V0OildKQor ICAgICAgICBjcmVkZW50aWFsQ3JlYXRpb25PcHRpb25zLmdldCgpLnRpbWVvdXQgPSBbTlNOdW1i ZXIgbnVtYmVyV2l0aFVuc2lnbmVkSW50OipvcHRpb25zLnRpbWVvdXRdOworCiAgICAgcmV0dXJu IHJlcXVlc3RDb250ZXh0OwogfQogCkBAIC0yNTcsMTIgKzI2MCwxNCBAQCBzdGF0aWMgaW5saW5l IFJldGFpblB0cjxBU0NQdWJsaWNLZXlDcmVkZW50aWFsQXNzZXJ0aW9uT3B0aW9ucz4gY29uZmln dXJlQXNzZXJ0aQogICAgICAgICBhdXRvIGNoYWxsZW5nZSA9IFdlYkNvcmU6OnRvTlNEYXRhKG9w dGlvbnMuY2hhbGxlbmdlKTsKICAgICAgICAgW2Fzc2VydGlvbk9wdGlvbnMgaW5pdFdpdGhLaW5k OkFTQ1B1YmxpY0tleUNyZWRlbnRpYWxLaW5kUGxhdGZvcm0gcmVseWluZ1BhcnR5SWRlbnRpZmll cjpvcHRpb25zLnJwSWQgY2hhbGxlbmdlOmNoYWxsZW5nZS5nZXQoKSB1c2VyVmVyaWZpY2F0aW9u UHJlZmVyZW5jZTp1c2VyVmVyaWZpY2F0aW9uLmdldCgpIGFsbG93ZWRDcmVkZW50aWFsczphbGxv d2VkQ3JlZGVudGlhbHMuZ2V0KCldOwogICAgIH0KLSAgICBpZiAob3B0aW9ucy5leHRlbnNpb25z ICYmIFthc3NlcnRpb25PcHRpb25zIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Ioc2V0RXh0 ZW5zaW9uczopXSkKKyAgICBpZiAob3B0aW9ucy5leHRlbnNpb25zKQogICAgICAgICBbYXNzZXJ0 aW9uT3B0aW9ucyBzZXRFeHRlbnNpb25zOnRvQVNDRXh0ZW5zaW9ucygqb3B0aW9ucy5leHRlbnNp b25zKS5nZXQoKV07CiAgICAgaWYgKHBhcmVudE9yaWdpbiAmJiBbYXNzZXJ0aW9uT3B0aW9ucyBy ZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHNldERlc3RpbmF0aW9uU2l0ZUZvckNyb3NzU2l0 ZUFzc2VydGlvbjopXSkKICAgICAgICAgYXNzZXJ0aW9uT3B0aW9ucy5nZXQoKS5kZXN0aW5hdGlv blNpdGVGb3JDcm9zc1NpdGVBc3NlcnRpb24gPSBwYXJlbnRPcmlnaW4tPnRvU3RyaW5nKCk7CiAg ICAgZWxzZSBpZiAocGFyZW50T3JpZ2luICYmICFbYXNzZXJ0aW9uT3B0aW9ucyByZXNwb25kc1Rv U2VsZWN0b3I6QHNlbGVjdG9yKHNldERlc3RpbmF0aW9uU2l0ZUZvckNyb3NzU2l0ZUFzc2VydGlv bjopXSkKICAgICAgICAgcmV0dXJuIG5pbDsKKyAgICBpZiAob3B0aW9ucy50aW1lb3V0ICYmIFth c3NlcnRpb25PcHRpb25zIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Ioc2V0VGltZW91dDop XSkKKyAgICAgICAgYXNzZXJ0aW9uT3B0aW9ucy5nZXQoKS50aW1lb3V0ID0gW05TTnVtYmVyIG51 bWJlcldpdGhVbnNpZ25lZEludDoqb3B0aW9ucy50aW1lb3V0XTsKICAgICByZXR1cm4gYXNzZXJ0 aW9uT3B0aW9uczsKIH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hh bmdlTG9nCmluZGV4IDRkZWI4N2YyZmFjNGJkZmRkMjFmOGE1N2U4ZWQzODhkMjdjMWNmM2UuLjBj OTk0OGIxYzBlZTlhNDYxN2YwZjgwZTkwOWEwMWJmYmU1YWI0NzAgMTAwNjQ0Ci0tLSBhL1Rvb2xz L0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMi0w My0yMSAgSiBQYXNjb2UgIDxqX3Bhc2NvZUBhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYkF1dGhu XSBQYXNzIGFsb25nIHRpbWVvdXQgdG8gQVNBIGFuZCBpZ25vcmUgdGltZW91dCBmb3IgY29uZGl0 aW9uYWwgbWVkaWF0aW9uIHJlcXVlc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMzgxNDcKKyAgICAgICAgcmRhcjovLzkwNTA5NDY0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW9kaWZ5IEFQSSB0ZXN0 IHRvIHVzZSBuZXcgU1BJLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLm1tOgorICAgICAgICAoVGVzdFdlYktpdEFQ STo6VEVTVCk6CisKIDIwMjItMDMtMjEgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFw cGxlLmNvbT4KIAogICAgICAgICBbV2ViR1BVXSBBZGQgYSBidWlsZC13ZWJncHUgc2NyaXB0CmRp ZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL19XS1dlYkF1 dGhlbnRpY2F0aW9uUGFuZWwubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwubW0KaW5kZXggZmU4MGViNWE0MjMxODZlYTc1 NzEyZDk0N2VkOTdkYmU2NGI5MTg3Yy4uNGE5MGY3YzNlNjg1YWFiMmY3NmQ1MzFjOTQwOThiN2Zi YjYyNWUzNiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbQpAQCAtMTg2Nyw3 ICsxODY3LDcgQEAgVEVTVChXZWJBdXRoZW50aWNhdGlvblBhbmVsLCBNYWtlQ3JlZGVudGlhbExB KQogICAgIFV0aWw6OnJ1bigmd2ViQXV0aGVudGljYXRpb25QYW5lbFJhbik7CiB9CiAKLVRFU1Qo V2ViQXV0aGVudGljYXRpb25QYW5lbCwgTWFrZUNyZWRlbnRpYWxMQUNsaWVudERhdGFIYXNoKQor VEVTVChXZWJBdXRoZW50aWNhdGlvblBhbmVsLCBNYWtlQ3JlZGVudGlhbExBQ2xpZW50RGF0YUhh c2hNZWRpYXRpb24pCiB7CiAgICAgcmVzZXQoKTsKIApAQCAtMTg4OCw3ICsxODg4LDcgQEAgVEVT VChXZWJBdXRoZW50aWNhdGlvblBhbmVsLCBNYWtlQ3JlZGVudGlhbExBQ2xpZW50RGF0YUhhc2gp CiAgICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tUZXN0V2ViQXV0aGVudGljYXRpb25QYW5l bERlbGVnYXRlIGFsbG9jXSBpbml0XSk7CiAgICAgW3BhbmVsIHNldERlbGVnYXRlOmRlbGVnYXRl LmdldCgpXTsKIAotICAgIFtwYW5lbCBtYWtlQ3JlZGVudGlhbFdpdGhDbGllbnREYXRhSGFzaDpu c0hhc2guZ2V0KCkgb3B0aW9uczpvcHRpb25zLmdldCgpIGNvbXBsZXRpb25IYW5kbGVyOl4oX1dL QXV0aGVudGljYXRvckF0dGVzdGF0aW9uUmVzcG9uc2UgKnJlc3BvbnNlLCBOU0Vycm9yICplcnJv cikgeworICAgIFtwYW5lbCBtYWtlQ3JlZGVudGlhbFdpdGhNZWRpYXRpb25SZXF1aXJlbWVudDpf V0tXZWJBdXRoZW50aWNhdGlvbk1lZGlhdGlvblJlcXVpcmVtZW50T3B0aW9uYWwgY2xpZW50RGF0 YUhhc2g6bnNIYXNoLmdldCgpIG9wdGlvbnM6b3B0aW9ucy5nZXQoKSBjb21wbGV0aW9uSGFuZGxl cjpeKF9XS0F1dGhlbnRpY2F0b3JBdHRlc3RhdGlvblJlc3BvbnNlICpyZXNwb25zZSwgTlNFcnJv ciAqZXJyb3IpIHsKICAgICAgICAgd2ViQXV0aGVudGljYXRpb25QYW5lbFJhbiA9IHRydWU7CiAg ICAgICAgIGNsZWFuVXBLZXljaGFpbigiZXhhbXBsZS5jb20iKTsKIApAQCAtMjA4OCw3ICsyMDg4 LDcgQEAgVEVTVChXZWJBdXRoZW50aWNhdGlvblBhbmVsLCBHZXRBc3NlcnRpb25MQSkKICAgICBV dGlsOjpydW4oJndlYkF1dGhlbnRpY2F0aW9uUGFuZWxSYW4pOwogfQogCi1URVNUKFdlYkF1dGhl bnRpY2F0aW9uUGFuZWwsIEdldEFzc2VydGlvbkxBQ2xpZW50RGF0YUhhc2gpCitURVNUKFdlYkF1 dGhlbnRpY2F0aW9uUGFuZWwsIEdldEFzc2VydGlvbkxBQ2xpZW50RGF0YUhhc2hNZWRpYXRpb24p CiB7CiAgICAgcmVzZXQoKTsKIApAQCAtMjEwNSw3ICsyMTA1LDcgQEAgVEVTVChXZWJBdXRoZW50 aWNhdGlvblBhbmVsLCBHZXRBc3NlcnRpb25MQUNsaWVudERhdGFIYXNoKQogICAgIGF1dG8gZGVs ZWdhdGUgPSBhZG9wdE5TKFtbVGVzdFdlYkF1dGhlbnRpY2F0aW9uUGFuZWxEZWxlZ2F0ZSBhbGxv Y10gaW5pdF0pOwogICAgIFtwYW5lbCBzZXREZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CiAKLSAg ICBbcGFuZWwgZ2V0QXNzZXJ0aW9uV2l0aENsaWVudERhdGFIYXNoOm5zSGFzaCBvcHRpb25zOm9w dGlvbnMuZ2V0KCkgY29tcGxldGlvbkhhbmRsZXI6XihfV0tBdXRoZW50aWNhdG9yQXNzZXJ0aW9u UmVzcG9uc2UgKnJlc3BvbnNlLCBOU0Vycm9yICplcnJvcikgeworICAgIFtwYW5lbCBnZXRBc3Nl cnRpb25XaXRoTWVkaWF0aW9uUmVxdWlyZW1lbnQ6X1dLV2ViQXV0aGVudGljYXRpb25NZWRpYXRp b25SZXF1aXJlbWVudE9wdGlvbmFsIGNsaWVudERhdGFIYXNoOm5zSGFzaCBvcHRpb25zOm9wdGlv bnMuZ2V0KCkgY29tcGxldGlvbkhhbmRsZXI6XihfV0tBdXRoZW50aWNhdG9yQXNzZXJ0aW9uUmVz cG9uc2UgKnJlc3BvbnNlLCBOU0Vycm9yICplcnJvcikgewogICAgICAgICB3ZWJBdXRoZW50aWNh dGlvblBhbmVsUmFuID0gdHJ1ZTsKICAgICAgICAgY2xlYW5VcEtleWNoYWluKCJleGFtcGxlLmNv bSIpOwogCg==