228599 2021-07-29 12:33:53 -0700 [Payment Request] `additionalShippingMethods` are not used if a `paymentMethodType` is provided 2021-07-29 17:28:56 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 223621 1 hi hi aestes bdakin benjamin cdumez cmarcelo esprehn+autocc ews-watchlist hi kondapallykalyan megan_gardner thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1780512 0 hi 2021-07-29 12:33:53 -0700 r275169 made it so that `paymentMethodType` is no longer `required` so that `additionalShippingMethods` can be specified without having to limit it to a specific payment method type. While this works in theory, WebKit doesn't know about the user's selected payment method type until the user actually selects a payment method, meaning that until then the `additionalShippingMethods` are not used, and unfortunately (until now) `PKPaymentRequestPaymentMethodUpdate` did not support providing a `NSArray<PKShippingMethod *> *`, meaning that there was no way to update the list of shipping methods when the user changed their selected payment method, meaning that WebKit would have to wait/rely on the user to change their shipping address _after_ selecting a payment method in order for `additionalShippingMethods` to take effect. 1780513 1 hi 2021-07-29 12:34:08 -0700 <rdar://problem/81190366> 1780519 2 434560 hi 2021-07-29 12:51:52 -0700 Created attachment 434560 Patch 1780661 3 ews-feeder 2021-07-29 17:28:53 -0700 Committed r280459 (240094@main): <https://commits.webkit.org/240094@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 434560. 434560 2021-07-29 12:51:52 -0700 2021-07-29 17:28:54 -0700 Patch bug-228599-20210729125151.patch text/plain 38570 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggZDU0YTNmMGViYTBiOWE5YWQ2YzFiMjFhOWZhNTNjMDAwMmZlNGU4Mi4uOTM4Y2ZkNTg4 YzMxMDg1OWQxNmM1Nzc5ODhmNzYxZGUzYzkyOGExYyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dURi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAy MS0wNy0yOSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAgW1Bh eW1lbnQgUmVxdWVzdF0gYGFkZGl0aW9uYWxTaGlwcGluZ01ldGhvZHNgIGFyZSBub3QgdXNlZCBp ZiBhIGBwYXltZW50TWV0aG9kVHlwZWAgaXMgcHJvdmlkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODU5OQorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vODExOTAzNjY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgcjI3NTE2OSBtYWRlIGl0IHNvIHRoYXQgYHBheW1lbnRNZXRob2RUeXBlYCBpcyBubyBs b25nZXIgYHJlcXVpcmVkYCBzbyB0aGF0IGBhZGRpdGlvbmFsU2hpcHBpbmdNZXRob2RzYAorICAg ICAgICBjYW4gYmUgc3BlY2lmaWVkIHdpdGhvdXQgaGF2aW5nIHRvIGxpbWl0IGl0IHRvIGEgc3Bl Y2lmaWMgcGF5bWVudCBtZXRob2QgdHlwZS4gV2hpbGUgdGhpcworICAgICAgICB3b3JrcyBpbiB0 aGVvcnksIFdlYktpdCBkb2Vzbid0IGtub3cgYWJvdXQgdGhlIHVzZXIncyBzZWxlY3RlZCBwYXlt ZW50IG1ldGhvZCB0eXBlIHVudGlsIHRoZQorICAgICAgICB1c2VyIGFjdHVhbGx5IHNlbGVjdHMg YSBwYXltZW50IG1ldGhvZCwgbWVhbmluZyB0aGF0IHVudGlsIHRoZW4gdGhlIGBhZGRpdGlvbmFs U2hpcHBpbmdNZXRob2RzYAorICAgICAgICBhcmUgbm90IHVzZWQuIFVuZm9ydHVuYXRlbHkgKHVu dGlsIG5vdykgYFBLUGF5bWVudFJlcXVlc3RQYXltZW50TWV0aG9kVXBkYXRlYCBkaWQgbm90Cisg ICAgICAgIHN1cHBvcnQgcHJvdmlkaW5nIGEgYE5TQXJyYXk8UEtTaGlwcGluZ01ldGhvZCAqPiAq YCwgc28gdGhlcmUgd2FzIG5vIHdheSB0byB1cGRhdGUgdGhlIGxpc3QKKyAgICAgICAgb2Ygc2hp cHBpbmcgbWV0aG9kcyB3aGVuIHRoZSB1c2VyIGNoYW5nZWQgdGhlaXIgc2VsZWN0ZWQgcGF5bWVu dCBtZXRob2QsIG1lYW5pbmcgdGhhdCBXZWJLaXQKKyAgICAgICAgd291bGQgaGF2ZSB0byB3YWl0 L3JlbHkgb24gdGhlIHVzZXIgdG8gY2hhbmdlIHRoZWlyIHNoaXBwaW5nIGFkZHJlc3MgX2FmdGVy XyBzZWxlY3RpbmcgYQorICAgICAgICBwYXltZW50IG1ldGhvZCBpbiBvcmRlciBmb3IgYGFkZGl0 aW9uYWxTaGlwcGluZ01ldGhvZHNgIHRvIHRha2UgZWZmZWN0LgorCisgICAgICAgIFRoaXMgYWxz byBmaXhlcyBhbiBpc3N1ZSB3aXRoIFdlYktpdCdzIGltcGxlbWVudGF0aW9uIG9mIHRoZSBXM0Mg UGF5bWVudCBSZXF1ZXN0IEFQSSBieQorICAgICAgICBhbGxvd2luZyBhbnkgZ2VuZXJpYyAoaS5l LiB0aGluZ3Mgbm90IHNwZWNpZmljIHRvIEFwcGxlIFBheSkgYHNoaXBwaW5nT3B0aW9uc2AgcHJv dmlkZWQgaW4KKyAgICAgICAgYFBheW1lbnREZXRhaWxzVXBkYXRlYCB0byBhY3R1YWxseSBiZSB1 c2VkIGFuZCB1cGRhdGUgdGhlIEFwcGxlIFBheSBzaGVldCBhY2NvcmRpbmdseS4KKworICAgICAg ICAqIHd0Zi9QbGF0Zm9ybUhhdmUuaDoKKyAgICAgICAgKiB3dGYvUGxhdGZvcm1FbmFibGVDb2Nv YS5oOgorICAgICAgICBBZGQgbmV3IGNvbXBpbGUgZmxhZ3MgZm9yIFBhc3NLaXQgc3VwcG9ydGlu ZyBtb2RpZnlpbmcgc2hpcHBpbmcgbWV0aG9kcyB3aXRoIGFueSB1cGRhdGUuCisKIDIwMjEtMDct MjYgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmll d2VkLCBzcGVjdWxhdGl2ZSByZXZlcnQgb2YgcjI4MDE5MwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGU4ZWM4MDFi MmMwM2RkOGFkOWU4NmIwMzBhOTJjZWFjNTJmYmRlMmIuLmI3OTA3ZjY3MGQyNzc4MjEyNDhmYmIw OTczN2MwOGEyY2Q5ZDUzOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw1MyBAQAorMjAyMS0wNy0y OSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAgW1BheW1lbnQg UmVxdWVzdF0gYGFkZGl0aW9uYWxTaGlwcGluZ01ldGhvZHNgIGFyZSBub3QgdXNlZCBpZiBhIGBw YXltZW50TWV0aG9kVHlwZWAgaXMgcHJvdmlkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODU5OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODEx OTAzNjY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg cjI3NTE2OSBtYWRlIGl0IHNvIHRoYXQgYHBheW1lbnRNZXRob2RUeXBlYCBpcyBubyBsb25nZXIg YHJlcXVpcmVkYCBzbyB0aGF0IGBhZGRpdGlvbmFsU2hpcHBpbmdNZXRob2RzYAorICAgICAgICBj YW4gYmUgc3BlY2lmaWVkIHdpdGhvdXQgaGF2aW5nIHRvIGxpbWl0IGl0IHRvIGEgc3BlY2lmaWMg cGF5bWVudCBtZXRob2QgdHlwZS4gV2hpbGUgdGhpcworICAgICAgICB3b3JrcyBpbiB0aGVvcnks IFdlYktpdCBkb2Vzbid0IGtub3cgYWJvdXQgdGhlIHVzZXIncyBzZWxlY3RlZCBwYXltZW50IG1l dGhvZCB0eXBlIHVudGlsIHRoZQorICAgICAgICB1c2VyIGFjdHVhbGx5IHNlbGVjdHMgYSBwYXlt ZW50IG1ldGhvZCwgbWVhbmluZyB0aGF0IHVudGlsIHRoZW4gdGhlIGBhZGRpdGlvbmFsU2hpcHBp bmdNZXRob2RzYAorICAgICAgICBhcmUgbm90IHVzZWQuIFVuZm9ydHVuYXRlbHkgKHVudGlsIG5v dykgYFBLUGF5bWVudFJlcXVlc3RQYXltZW50TWV0aG9kVXBkYXRlYCBkaWQgbm90CisgICAgICAg IHN1cHBvcnQgcHJvdmlkaW5nIGEgYE5TQXJyYXk8UEtTaGlwcGluZ01ldGhvZCAqPiAqYCwgc28g dGhlcmUgd2FzIG5vIHdheSB0byB1cGRhdGUgdGhlIGxpc3QKKyAgICAgICAgb2Ygc2hpcHBpbmcg bWV0aG9kcyB3aGVuIHRoZSB1c2VyIGNoYW5nZWQgdGhlaXIgc2VsZWN0ZWQgcGF5bWVudCBtZXRo b2QsIG1lYW5pbmcgdGhhdCBXZWJLaXQKKyAgICAgICAgd291bGQgaGF2ZSB0byB3YWl0L3JlbHkg b24gdGhlIHVzZXIgdG8gY2hhbmdlIHRoZWlyIHNoaXBwaW5nIGFkZHJlc3MgX2FmdGVyXyBzZWxl Y3RpbmcgYQorICAgICAgICBwYXltZW50IG1ldGhvZCBpbiBvcmRlciBmb3IgYGFkZGl0aW9uYWxT aGlwcGluZ01ldGhvZHNgIHRvIHRha2UgZWZmZWN0LgorCisgICAgICAgIFRoaXMgYWxzbyBmaXhl cyBhbiBpc3N1ZSB3aXRoIFdlYktpdCdzIGltcGxlbWVudGF0aW9uIG9mIHRoZSBXM0MgUGF5bWVu dCBSZXF1ZXN0IEFQSSBieQorICAgICAgICBhbGxvd2luZyBhbnkgZ2VuZXJpYyAoaS5lLiB0aGlu Z3Mgbm90IHNwZWNpZmljIHRvIEFwcGxlIFBheSkgYHNoaXBwaW5nT3B0aW9uc2AgcHJvdmlkZWQg aW4KKyAgICAgICAgYFBheW1lbnREZXRhaWxzVXBkYXRlYCB0byBhY3R1YWxseSBiZSB1c2VkIGFu ZCB1cGRhdGUgdGhlIEFwcGxlIFBheSBzaGVldCBhY2NvcmRpbmdseS4KKworICAgICAgICBUZXN0 OiBodHRwL3Rlc3RzL3BheW1lbnRyZXF1ZXN0L0FwcGxlUGF5TW9kaWZpZXItcGF5bWVudE1ldGhv ZFR5cGUuaHR0cHMuaHRtbAorCisgICAgICAgICogTW9kdWxlcy9hcHBsZXBheS9BcHBsZVBheU1v ZGlmaWVyLmlkbDoKKyAgICAgICAgKiBNb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5TW9kaWZpZXIu aDoKKyAgICAgICAgKiBNb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5UGF5bWVudE1ldGhvZFVwZGF0 ZS5pZGw6CisgICAgICAgICogTW9kdWxlcy9hcHBsZXBheS9BcHBsZVBheVBheW1lbnRNZXRob2RV cGRhdGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxlUGF5UGF5bWVudE1ldGhvZFVwZGF0ZTo6 ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxlUGF5UGF5bWVudE1ldGhvZFVw ZGF0ZTo6ZGVjb2RlKToKKyAgICAgICAgKiBNb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5U2hpcHBp bmdNZXRob2RVcGRhdGUuaWRsOgorICAgICAgICAqIE1vZHVsZXMvYXBwbGVwYXkvQXBwbGVQYXlT aGlwcGluZ01ldGhvZFVwZGF0ZS5oOgorICAgICAgICAoV2ViQ29yZTo6QXBwbGVQYXlTaGlwcGlu Z01ldGhvZFVwZGF0ZTo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxlUGF5 U2hpcHBpbmdNZXRob2RVcGRhdGU6OmRlY29kZSk6CisgICAgICAgIEFkZCAob3Igd3JhcCBleGlz dGluZykgYGFkZGl0aW9uYWxTaGlwcGluZ01ldGhvZHNgL2BuZXdTaGlwcGluZ01ldGhvZHNgIHBy b3BlcnRpZXMuCisKKyAgICAgICAgKiBNb2R1bGVzL2FwcGxlcGF5L3BheW1lbnRyZXF1ZXN0L0Fw cGxlUGF5UGF5bWVudEhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBwbGVQYXlQYXlt ZW50SGFuZGxlcjo6Y29tcHV0ZVNoaXBwaW5nTWV0aG9kcyk6CisgICAgICAgIChXZWJDb3JlOjpB cHBsZVBheVBheW1lbnRIYW5kbGVyOjpkZXRhaWxzVXBkYXRlZCk6CisgICAgICAgIChXZWJDb3Jl OjpBcHBsZVBheVBheW1lbnRIYW5kbGVyOjpzaGlwcGluZ09wdGlvblVwZGF0ZWQpOgorICAgICAg ICAoV2ViQ29yZTo6QXBwbGVQYXlQYXltZW50SGFuZGxlcjo6cGF5bWVudE1ldGhvZFVwZGF0ZWQp OgorICAgICAgICBBbHNvIGNhbGwgYGNvbXB1dGVTaGlwcGluZ01ldGhvZHMoKWAgYW5kIGFkZCB0 aGUgcmVzdWx0IHRvIHRoZSB1cGRhdGUuCisKKyAgICAgICAgKiB0ZXN0aW5nL01vY2tQYXltZW50 Q29vcmRpbmF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TW9ja1BheW1lbnRDb29yZGluYXRv cjo6Y29tcGxldGVTaGlwcGluZ01ldGhvZFNlbGVjdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpN b2NrUGF5bWVudENvb3JkaW5hdG9yOjpjb21wbGV0ZVNoaXBwaW5nQ29udGFjdFNlbGVjdGlvbik6 CisgICAgICAgIChXZWJDb3JlOjpNb2NrUGF5bWVudENvb3JkaW5hdG9yOjpjb21wbGV0ZVBheW1l bnRNZXRob2RTZWxlY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6TW9ja1BheW1lbnRDb29yZGlu YXRvcjo6Y29tcGxldGVDb3Vwb25Db2RlQ2hhbmdlKToKKyAgICAgICAgU3VwcG9ydCBmb3IgdGVz dGluZy4KKwogMjAyMS0wNy0yNyAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAK ICAgICAgICAgW01vZGVybiBNZWRpYSBDb250cm9sc10gW21hY09TXSBPdmVyZmxvdyBidXR0b24g c3RpbGwgc2hvd3MgYXMgYG9uYCBldmVuIGFmdGVyIGNvbnRleHRtZW51IGlzIGRpc21pc3NlZApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3Jl L1BBTC9DaGFuZ2VMb2cKaW5kZXggMzdjMWY4NDdiNGNmMDgxNTkxOTA4ZDc2ZmI4YjE2MTA4MmE1 OTJiYi4uMjFkYTk1NjA0YmU0MDlmZjQ1MWZjZWIwMjdjNjVkODM5MTM2OGU1ZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMjEtMDctMjkgIERldmluIFJvdXNzbyAgPGRy b3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFtQYXltZW50IFJlcXVlc3RdIGBhZGRpdGlvbmFs U2hpcHBpbmdNZXRob2RzYCBhcmUgbm90IHVzZWQgaWYgYSBgcGF5bWVudE1ldGhvZFR5cGVgIGlz IHByb3ZpZGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjg1OTkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgxMTkwMzY2PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHIyNzUxNjkgbWFkZSBpdCBzbyB0 aGF0IGBwYXltZW50TWV0aG9kVHlwZWAgaXMgbm8gbG9uZ2VyIGByZXF1aXJlZGAgc28gdGhhdCBg YWRkaXRpb25hbFNoaXBwaW5nTWV0aG9kc2AKKyAgICAgICAgY2FuIGJlIHNwZWNpZmllZCB3aXRo b3V0IGhhdmluZyB0byBsaW1pdCBpdCB0byBhIHNwZWNpZmljIHBheW1lbnQgbWV0aG9kIHR5cGUu IFdoaWxlIHRoaXMKKyAgICAgICAgd29ya3MgaW4gdGhlb3J5LCBXZWJLaXQgZG9lc24ndCBrbm93 IGFib3V0IHRoZSB1c2VyJ3Mgc2VsZWN0ZWQgcGF5bWVudCBtZXRob2QgdHlwZSB1bnRpbCB0aGUK KyAgICAgICAgdXNlciBhY3R1YWxseSBzZWxlY3RzIGEgcGF5bWVudCBtZXRob2QsIG1lYW5pbmcg dGhhdCB1bnRpbCB0aGVuIHRoZSBgYWRkaXRpb25hbFNoaXBwaW5nTWV0aG9kc2AKKyAgICAgICAg YXJlIG5vdCB1c2VkLiBVbmZvcnR1bmF0ZWx5ICh1bnRpbCBub3cpIGBQS1BheW1lbnRSZXF1ZXN0 UGF5bWVudE1ldGhvZFVwZGF0ZWAgZGlkIG5vdAorICAgICAgICBzdXBwb3J0IHByb3ZpZGluZyBh IGBOU0FycmF5PFBLU2hpcHBpbmdNZXRob2QgKj4gKmAsIHNvIHRoZXJlIHdhcyBubyB3YXkgdG8g dXBkYXRlIHRoZSBsaXN0CisgICAgICAgIG9mIHNoaXBwaW5nIG1ldGhvZHMgd2hlbiB0aGUgdXNl ciBjaGFuZ2VkIHRoZWlyIHNlbGVjdGVkIHBheW1lbnQgbWV0aG9kLCBtZWFuaW5nIHRoYXQgV2Vi S2l0CisgICAgICAgIHdvdWxkIGhhdmUgdG8gd2FpdC9yZWx5IG9uIHRoZSB1c2VyIHRvIGNoYW5n ZSB0aGVpciBzaGlwcGluZyBhZGRyZXNzIF9hZnRlcl8gc2VsZWN0aW5nIGEKKyAgICAgICAgcGF5 bWVudCBtZXRob2QgaW4gb3JkZXIgZm9yIGBhZGRpdGlvbmFsU2hpcHBpbmdNZXRob2RzYCB0byB0 YWtlIGVmZmVjdC4KKworICAgICAgICBUaGlzIGFsc28gZml4ZXMgYW4gaXNzdWUgd2l0aCBXZWJL aXQncyBpbXBsZW1lbnRhdGlvbiBvZiB0aGUgVzNDIFBheW1lbnQgUmVxdWVzdCBBUEkgYnkKKyAg ICAgICAgYWxsb3dpbmcgYW55IGdlbmVyaWMgKGkuZS4gdGhpbmdzIG5vdCBzcGVjaWZpYyB0byBB cHBsZSBQYXkpIGBzaGlwcGluZ09wdGlvbnNgIHByb3ZpZGVkIGluCisgICAgICAgIGBQYXltZW50 RGV0YWlsc1VwZGF0ZWAgdG8gYWN0dWFsbHkgYmUgdXNlZCBhbmQgdXBkYXRlIHRoZSBBcHBsZSBQ YXkgc2hlZXQgYWNjb3JkaW5nbHkuCisKKyAgICAgICAgKiBwYWwvc3BpL2NvY29hL1Bhc3NLaXRT UEkuaDoKKyAgICAgICAgIC0gYWRkIHRoZSBuZXcgYHNoaXBwaW5nTWV0aG9kc2AgcHJvcGVydHkg b24gYFBLUGF5bWVudFJlcXVlc3RVcGRhdGVgCisgICAgICAgICAtIGFkZCB0aGUgZXhpc3Rpbmcg YGVycm9yc2AgcHJvcGVydHkgb24gYFBLUGF5bWVudFJlcXVlc3RQYXltZW50TWV0aG9kVXBkYXRl YAorCiAyMDIxLTA3LTI2ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgog CiAgICAgICAgIFttYWNPUyBNb250ZXJleV0gUHJlc3NpbmcgRm4rRSBzaG91bGQgcHJlc2VudCB0 aGUgZW1vamkgcGlja2VyIHdoZW4gZWRpdGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA3M2UxOTllMWI3ZWIyM2Q0 NzlmZTMwNTJjYmZiOTUwOWQxYmI1MmNjLi4xNTlhNmUyOTU1MTkzNmEwY2NlZjRhZWI3OGQyNGEx ZDhjZmJmNWE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIxLTA3LTI5ICBEZXZpbiBS b3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBbUGF5bWVudCBSZXF1ZXN0XSBg YWRkaXRpb25hbFNoaXBwaW5nTWV0aG9kc2AgYXJlIG5vdCB1c2VkIGlmIGEgYHBheW1lbnRNZXRo b2RUeXBlYCBpcyBwcm92aWRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjI4NTk5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84MTE5MDM2Nj4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICByMjc1MTY5IG1h ZGUgaXQgc28gdGhhdCBgcGF5bWVudE1ldGhvZFR5cGVgIGlzIG5vIGxvbmdlciBgcmVxdWlyZWRg IHNvIHRoYXQgYGFkZGl0aW9uYWxTaGlwcGluZ01ldGhvZHNgCisgICAgICAgIGNhbiBiZSBzcGVj aWZpZWQgd2l0aG91dCBoYXZpbmcgdG8gbGltaXQgaXQgdG8gYSBzcGVjaWZpYyBwYXltZW50IG1l dGhvZCB0eXBlLiBXaGlsZSB0aGlzCisgICAgICAgIHdvcmtzIGluIHRoZW9yeSwgV2ViS2l0IGRv ZXNuJ3Qga25vdyBhYm91dCB0aGUgdXNlcidzIHNlbGVjdGVkIHBheW1lbnQgbWV0aG9kIHR5cGUg dW50aWwgdGhlCisgICAgICAgIHVzZXIgYWN0dWFsbHkgc2VsZWN0cyBhIHBheW1lbnQgbWV0aG9k LCBtZWFuaW5nIHRoYXQgdW50aWwgdGhlbiB0aGUgYGFkZGl0aW9uYWxTaGlwcGluZ01ldGhvZHNg CisgICAgICAgIGFyZSBub3QgdXNlZC4gVW5mb3J0dW5hdGVseSAodW50aWwgbm93KSBgUEtQYXlt ZW50UmVxdWVzdFBheW1lbnRNZXRob2RVcGRhdGVgIGRpZCBub3QKKyAgICAgICAgc3VwcG9ydCBw cm92aWRpbmcgYSBgTlNBcnJheTxQS1NoaXBwaW5nTWV0aG9kICo+ICpgLCBzbyB0aGVyZSB3YXMg bm8gd2F5IHRvIHVwZGF0ZSB0aGUgbGlzdAorICAgICAgICBvZiBzaGlwcGluZyBtZXRob2RzIHdo ZW4gdGhlIHVzZXIgY2hhbmdlZCB0aGVpciBzZWxlY3RlZCBwYXltZW50IG1ldGhvZCwgbWVhbmlu ZyB0aGF0IFdlYktpdAorICAgICAgICB3b3VsZCBoYXZlIHRvIHdhaXQvcmVseSBvbiB0aGUgdXNl ciB0byBjaGFuZ2UgdGhlaXIgc2hpcHBpbmcgYWRkcmVzcyBfYWZ0ZXJfIHNlbGVjdGluZyBhCisg ICAgICAgIHBheW1lbnQgbWV0aG9kIGluIG9yZGVyIGZvciBgYWRkaXRpb25hbFNoaXBwaW5nTWV0 aG9kc2AgdG8gdGFrZSBlZmZlY3QuCisKKyAgICAgICAgVGhpcyBhbHNvIGZpeGVzIGFuIGlzc3Vl IHdpdGggV2ViS2l0J3MgaW1wbGVtZW50YXRpb24gb2YgdGhlIFczQyBQYXltZW50IFJlcXVlc3Qg QVBJIGJ5CisgICAgICAgIGFsbG93aW5nIGFueSBnZW5lcmljIChpLmUuIHRoaW5ncyBub3Qgc3Bl Y2lmaWMgdG8gQXBwbGUgUGF5KSBgc2hpcHBpbmdPcHRpb25zYCBwcm92aWRlZCBpbgorICAgICAg ICBgUGF5bWVudERldGFpbHNVcGRhdGVgIHRvIGFjdHVhbGx5IGJlIHVzZWQgYW5kIHVwZGF0ZSB0 aGUgQXBwbGUgUGF5IHNoZWV0IGFjY29yZGluZ2x5LgorCisgICAgICAgICogUGxhdGZvcm0vY29j b2EvUGF5bWVudEF1dGhvcml6YXRpb25QcmVzZW50ZXIubW06CisgICAgICAgIChXZWJLaXQ6OlBh eW1lbnRBdXRob3JpemF0aW9uUHJlc2VudGVyOjpjb21wbGV0ZVBheW1lbnRNZXRob2RTZWxlY3Rp b24pOgorICAgICAgICAoV2ViS2l0OjpQYXltZW50QXV0aG9yaXphdGlvblByZXNlbnRlcjo6Y29t cGxldGVTaGlwcGluZ01ldGhvZFNlbGVjdGlvbik6CisgICAgICAgIEFsc28gY29udmVydCBhbmQg c2V0IHRoZSBgc2hpcHBpbmdNZXRob2RzYCBvbiB0aGUgdXBkYXRlLgorCiAyMDIxLTA3LTI3ICBE ZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBbTW9kZXJuIE1lZGlh IENvbnRyb2xzXSBbbWFjT1NdIE92ZXJmbG93IGJ1dHRvbiBzdGlsbCBzaG93cyBhcyBgb25gIGV2 ZW4gYWZ0ZXIgY29udGV4dG1lbnUgaXMgZGlzbWlzc2VkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RG L3d0Zi9QbGF0Zm9ybUVuYWJsZUNvY29hLmggYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUVuYWJs ZUNvY29hLmgKaW5kZXggYTllMTBhMjUxOWUwOTM5MzEzYmYyZjU4ZjRhOTY5NmVlMjFmNTdhZC4u N2RhYTE5N2RiNWI2NGU3ZmY4ODY2ZGE0YTA1ZjBiZmRhNmViZjUzOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dURi93dGYvUGxhdGZvcm1FbmFibGVDb2NvYS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL1Bs YXRmb3JtRW5hYmxlQ29jb2EuaApAQCAtOTUsNiArOTUsMTAgQEAKICNkZWZpbmUgRU5BQkxFX0FQ UExFX1BBWV9TSElQUElOR19NRVRIT0RfREFURV9DT01QT05FTlRTX1JBTkdFIDEKICNlbmRpZgog CisjaWYgIWRlZmluZWQoRU5BQkxFX0FQUExFX1BBWV9VUERBVEVfU0hJUFBJTkdfTUVUSE9EU19X SEVOX0NIQU5HSU5HX0xJTkVfSVRFTVMpICYmIEhBVkUoUEFTU0tJVF9VUERBVEVfU0hJUFBJTkdf TUVUSE9EU19XSEVOX0NIQU5HSU5HX1NVTU1BUllfSVRFTVMpCisjZGVmaW5lIEVOQUJMRV9BUFBM RV9QQVlfVVBEQVRFX1NISVBQSU5HX01FVEhPRFNfV0hFTl9DSEFOR0lOR19MSU5FX0lURU1TIDEK KyNlbmRpZgorCiAjaWYgIWRlZmluZWQoRU5BQkxFX0FQUExJQ0FUSU9OX01BTklGRVNUKQogI2Rl ZmluZSBFTkFCTEVfQVBQTElDQVRJT05fTUFOSUZFU1QgMQogI2VuZGlmCmRpZmYgLS1naXQgYS9T b3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaCBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2 ZS5oCmluZGV4IDg2ZjQ0MWU4MGE1MzBhMzRkNWViZDg2YzU2OGZiOTdmOTczY2IwNTEuLmNlZTYy YzZlMDRiNjUyNTQ0OWQ4Y2I1NzRiNjgyMDI0MTQ0ZTIwNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X VEYvd3RmL1BsYXRmb3JtSGF2ZS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5o CkBAIC03MjUsNiArNzI1LDcgQEAKICNkZWZpbmUgSEFWRV9QQVNTS0lUX1NISVBQSU5HX01FVEhP RF9EQVRFX0NPTVBPTkVOVFNfUkFOR0UgMQogI2RlZmluZSBIQVZFX1BBU1NLSVRfQ09VUE9OX0NP REUgMQogI2RlZmluZSBIQVZFX1BBU1NLSVRfU0hJUFBJTkdfQ09OVEFDVF9FRElUSU5HX01PREUg MQorI2RlZmluZSBIQVZFX1BBU1NLSVRfVVBEQVRFX1NISVBQSU5HX01FVEhPRFNfV0hFTl9DSEFO R0lOR19TVU1NQVJZX0lURU1TIDEKICNlbmRpZgogCiAjaWYgKFBMQVRGT1JNKE1BQykgJiYgX19N QUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDE1MDApIHx8IFBMQVRGT1JNKElPUykg fHwgUExBVEZPUk0oTUFDQ0FUQUxZU1QpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2FwcGxlcGF5L0FwcGxlUGF5UGF5bWVudE1ldGhvZFVwZGF0ZS5oIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9hcHBsZXBheS9BcHBsZVBheVBheW1lbnRNZXRob2RVcGRhdGUuaAppbmRleCAx MTBmNTU2ZGU4MjFlY2I3MThjMmZkNjUxNjQ5OGY5ZmIzMjUzODExLi5hYzMxMDExNWQxZmRlNjE2 MTE4Y2JiMzUxMjA3NDUyZThmMDU3MDAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2FwcGxlcGF5L0FwcGxlUGF5UGF5bWVudE1ldGhvZFVwZGF0ZS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvQXBwbGVQYXlQYXltZW50TWV0aG9kVXBkYXRlLmgKQEAg LTI4LDExICsyOCwyMSBAQAogI2lmIEVOQUJMRShBUFBMRV9QQVkpCiAKICNpbmNsdWRlICJBcHBs ZVBheURldGFpbHNVcGRhdGVCYXNlLmgiCisjaW5jbHVkZSAiQXBwbGVQYXlFcnJvci5oIgorI2lu Y2x1ZGUgIkFwcGxlUGF5U2hpcHBpbmdNZXRob2QuaCIKKyNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+ CisjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5o PgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHN0cnVjdCBBcHBsZVBheVBheW1lbnRNZXRob2RV cGRhdGUgZmluYWwgOiBwdWJsaWMgQXBwbGVQYXlEZXRhaWxzVXBkYXRlQmFzZSB7CisjaWYgRU5B QkxFKEFQUExFX1BBWV9VUERBVEVfU0hJUFBJTkdfTUVUSE9EU19XSEVOX0NIQU5HSU5HX0xJTkVf SVRFTVMpCisgICAgVmVjdG9yPFJlZlB0cjxBcHBsZVBheUVycm9yPj4gZXJyb3JzOworCisgICAg VmVjdG9yPEFwcGxlUGF5U2hpcHBpbmdNZXRob2Q+IG5ld1NoaXBwaW5nTWV0aG9kczsKKyNlbmRp ZgorCiAjaWYgRU5BQkxFKEFQUExFX1BBWV9JTlNUQUxMTUVOVFMpCiAgICAgU3RyaW5nIGluc3Rh bGxtZW50R3JvdXBJZGVudGlmaWVyOwogI2VuZGlmIC8vIEVOQUJMRShBUFBMRV9QQVlfSU5TVEFM TE1FTlRTKQpAQCAtNDUsNiArNTUsMTAgQEAgdGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4KIHZvaWQg QXBwbGVQYXlQYXltZW50TWV0aG9kVXBkYXRlOjplbmNvZGUoRW5jb2RlciYgZW5jb2RlcikgY29u c3QKIHsKICAgICBBcHBsZVBheURldGFpbHNVcGRhdGVCYXNlOjplbmNvZGUoZW5jb2Rlcik7Cisj aWYgRU5BQkxFKEFQUExFX1BBWV9VUERBVEVfU0hJUFBJTkdfTUVUSE9EU19XSEVOX0NIQU5HSU5H X0xJTkVfSVRFTVMpCisgICAgZW5jb2RlciA8PCBlcnJvcnM7CisgICAgZW5jb2RlciA8PCBuZXdT aGlwcGluZ01ldGhvZHM7CisjZW5kaWYKICNpZiBFTkFCTEUoQVBQTEVfUEFZX0lOU1RBTExNRU5U UykKICAgICBlbmNvZGVyIDw8IGluc3RhbGxtZW50R3JvdXBJZGVudGlmaWVyOwogI2VuZGlmIC8v IEVOQUJMRShBUFBMRV9QQVlfSU5TVEFMTE1FTlRTKQpAQCAtNjUsNiArNzksMTEgQEAgc3RkOjpv cHRpb25hbDxBcHBsZVBheVBheW1lbnRNZXRob2RVcGRhdGU+IEFwcGxlUGF5UGF5bWVudE1ldGhv ZFVwZGF0ZTo6ZGVjb2RlKEQKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsgXAogICAgIHJl c3VsdC5uYW1lID0gV1RGTW92ZSgqbmFtZSk7IFwKIAorI2lmIEVOQUJMRShBUFBMRV9QQVlfVVBE QVRFX1NISVBQSU5HX01FVEhPRFNfV0hFTl9DSEFOR0lOR19MSU5FX0lURU1TKQorICAgIERFQ09E RShlcnJvcnMsIFZlY3RvcjxSZWZQdHI8QXBwbGVQYXlFcnJvcj4+KQorICAgIERFQ09ERShuZXdT aGlwcGluZ01ldGhvZHMsIFZlY3RvcjxBcHBsZVBheVNoaXBwaW5nTWV0aG9kPikKKyNlbmRpZgor CiAjaWYgRU5BQkxFKEFQUExFX1BBWV9JTlNUQUxMTUVOVFMpCiAgICAgREVDT0RFKGluc3RhbGxt ZW50R3JvdXBJZGVudGlmaWVyLCBTdHJpbmcpCiAjZW5kaWYgLy8gRU5BQkxFKEFQUExFX1BBWV9J TlNUQUxMTUVOVFMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5 L0FwcGxlUGF5UGF5bWVudE1ldGhvZFVwZGF0ZS5pZGwgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2FwcGxlcGF5L0FwcGxlUGF5UGF5bWVudE1ldGhvZFVwZGF0ZS5pZGwKaW5kZXggMjhlODdiMThk MWFhN2NjNjMyNjVhNDliMGZiYWY2YmNjYWViZDhiNS4uNWU3MDQwNmU3YzZhNzRmZDc2MWM3ZWFl YjlkYjRkNmUyYjc3NzJhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBs ZXBheS9BcHBsZVBheVBheW1lbnRNZXRob2RVcGRhdGUuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvYXBwbGVwYXkvQXBwbGVQYXlQYXltZW50TWV0aG9kVXBkYXRlLmlkbApAQCAtMjYs NSArMjYsOSBAQAogWwogICAgIENvbmRpdGlvbmFsPUFQUExFX1BBWSwKIF0gZGljdGlvbmFyeSBB cHBsZVBheVBheW1lbnRNZXRob2RVcGRhdGUgOiBBcHBsZVBheURldGFpbHNVcGRhdGVCYXNlIHsK KyAgICBbQ29uZGl0aW9uYWw9QVBQTEVfUEFZX1VQREFURV9TSElQUElOR19NRVRIT0RTX1dIRU5f Q0hBTkdJTkdfTElORV9JVEVNU10gc2VxdWVuY2U8QXBwbGVQYXlFcnJvcj4gZXJyb3JzOworCisg ICAgW0NvbmRpdGlvbmFsPUFQUExFX1BBWV9VUERBVEVfU0hJUFBJTkdfTUVUSE9EU19XSEVOX0NI QU5HSU5HX0xJTkVfSVRFTVNdIHNlcXVlbmNlPEFwcGxlUGF5U2hpcHBpbmdNZXRob2Q+IG5ld1No aXBwaW5nTWV0aG9kczsKKwogICAgIFtDb25kaXRpb25hbD1BUFBMRV9QQVlfSU5TVEFMTE1FTlRT XSBET01TdHJpbmcgaW5zdGFsbG1lbnRHcm91cElkZW50aWZpZXI7CiB9OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9BcHBsZVBheVNoaXBwaW5nTWV0aG9kVXBk YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5U2hpcHBpbmdN ZXRob2RVcGRhdGUuaAppbmRleCAyYTVlMzQ3Y2Y1ZTQxMzBlMjgzYmJjZWI2YTViMjJlODViZTAw MGQxLi42YmJiZDJmNTU4YTM2ZWRlZmFmZjVjOGJiYTM0ODcwYjk1MmNjNWVhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5U2hpcHBpbmdNZXRob2RV cGRhdGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5U2hp cHBpbmdNZXRob2RVcGRhdGUuaApAQCAtMjgsMTAgKzI4LDE2IEBACiAjaWYgRU5BQkxFKEFQUExF X1BBWSkKIAogI2luY2x1ZGUgIkFwcGxlUGF5RGV0YWlsc1VwZGF0ZUJhc2UuaCIKKyNpbmNsdWRl ICJBcHBsZVBheVNoaXBwaW5nTWV0aG9kLmgiCisjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCiBu YW1lc3BhY2UgV2ViQ29yZSB7CiAKIHN0cnVjdCBBcHBsZVBheVNoaXBwaW5nTWV0aG9kVXBkYXRl IGZpbmFsIDogcHVibGljIEFwcGxlUGF5RGV0YWlsc1VwZGF0ZUJhc2UgeworI2lmIEVOQUJMRShB UFBMRV9QQVlfVVBEQVRFX1NISVBQSU5HX01FVEhPRFNfV0hFTl9DSEFOR0lOR19MSU5FX0lURU1T KQorICAgIFZlY3RvcjxBcHBsZVBheVNoaXBwaW5nTWV0aG9kPiBuZXdTaGlwcGluZ01ldGhvZHM7 CisjZW5kaWYKKwogICAgIHRlbXBsYXRlPGNsYXNzIEVuY29kZXI+IHZvaWQgZW5jb2RlKEVuY29k ZXImKSBjb25zdDsKICAgICB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBzdGF0aWMgc3RkOjpvcHRp b25hbDxBcHBsZVBheVNoaXBwaW5nTWV0aG9kVXBkYXRlPiBkZWNvZGUoRGVjb2RlciYpOwogfTsK QEAgLTQwLDYgKzQ2LDkgQEAgdGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4KIHZvaWQgQXBwbGVQYXlT aGlwcGluZ01ldGhvZFVwZGF0ZTo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiB7CiAg ICAgQXBwbGVQYXlEZXRhaWxzVXBkYXRlQmFzZTo6ZW5jb2RlKGVuY29kZXIpOworI2lmIEVOQUJM RShBUFBMRV9QQVlfVVBEQVRFX1NISVBQSU5HX01FVEhPRFNfV0hFTl9DSEFOR0lOR19MSU5FX0lU RU1TKQorICAgIGVuY29kZXIgPDwgbmV3U2hpcHBpbmdNZXRob2RzOworI2VuZGlmCiB9CiAKIHRl bXBsYXRlPGNsYXNzIERlY29kZXI+CkBAIC01MCw2ICs1OSwxOSBAQCBzdGQ6Om9wdGlvbmFsPEFw cGxlUGF5U2hpcHBpbmdNZXRob2RVcGRhdGU+IEFwcGxlUGF5U2hpcHBpbmdNZXRob2RVcGRhdGU6 OmRlY29kZQogICAgIGlmICghcmVzdWx0LmRlY29kZUJhc2UoZGVjb2RlcikpCiAgICAgICAgIHJl dHVybiBzdGQ6Om51bGxvcHQ7CiAKKyNkZWZpbmUgREVDT0RFKG5hbWUsIHR5cGUpIFwKKyAgICBz dGQ6Om9wdGlvbmFsPHR5cGU+IG5hbWU7IFwKKyAgICBkZWNvZGVyID4+IG5hbWU7IFwKKyAgICBp ZiAoIW5hbWUpIFwKKyAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsgXAorICAgIHJlc3VsdC5u YW1lID0gV1RGTW92ZSgqbmFtZSk7IFwKKworI2lmIEVOQUJMRShBUFBMRV9QQVlfVVBEQVRFX1NI SVBQSU5HX01FVEhPRFNfV0hFTl9DSEFOR0lOR19MSU5FX0lURU1TKQorICAgIERFQ09ERShuZXdT aGlwcGluZ01ldGhvZHMsIFZlY3RvcjxBcHBsZVBheVNoaXBwaW5nTWV0aG9kPikKKyNlbmRpZgor CisjdW5kZWYgREVDT0RFCisKICAgICByZXR1cm4gcmVzdWx0OwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5U2hpcHBpbmdNZXRob2RVcGRh dGUuaWRsIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9BcHBsZVBheVNoaXBwaW5n TWV0aG9kVXBkYXRlLmlkbAppbmRleCAyZTU0NGM1MDc5ZmFhZjBjMDg5ZWUyZDIxODRmOWVjNjNj MzVkYjBhLi40ZmRjNTlkZjliNWVlZjU3NTU4M2QxYmFmZDY0MWI1OTMxMGFjMzk5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5U2hpcHBpbmdNZXRo b2RVcGRhdGUuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvQXBwbGVQ YXlTaGlwcGluZ01ldGhvZFVwZGF0ZS5pZGwKQEAgLTI2LDQgKzI2LDUgQEAKIFsKICAgICBDb25k aXRpb25hbD1BUFBMRV9QQVksCiBdIGRpY3Rpb25hcnkgQXBwbGVQYXlTaGlwcGluZ01ldGhvZFVw ZGF0ZSA6IEFwcGxlUGF5RGV0YWlsc1VwZGF0ZUJhc2UgeworICAgIFtDb25kaXRpb25hbD1BUFBM RV9QQVlfVVBEQVRFX1NISVBQSU5HX01FVEhPRFNfV0hFTl9DSEFOR0lOR19MSU5FX0lURU1TXSBz ZXF1ZW5jZTxBcHBsZVBheVNoaXBwaW5nTWV0aG9kPiBuZXdTaGlwcGluZ01ldGhvZHM7CiB9Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9wYXltZW50cmVxdWVz dC9BcHBsZVBheU1vZGlmaWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L3Bh eW1lbnRyZXF1ZXN0L0FwcGxlUGF5TW9kaWZpZXIuaAppbmRleCBhNTdiZDUxY2MxMGY3YTQ1MzY3 MjhiODI1YjdjMWRjM2E2OGRjZGM5Li5iMTY5ZTYyM2RjM2UxNmJjMDM4OTUxNTQ1ZTEyYTJkMjY1 M2VhODkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L3BheW1l bnRyZXF1ZXN0L0FwcGxlUGF5TW9kaWZpZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2FwcGxlcGF5L3BheW1lbnRyZXF1ZXN0L0FwcGxlUGF5TW9kaWZpZXIuaApAQCAtNDEsNyArNDEs OSBAQCBzdHJ1Y3QgQXBwbGVQYXlNb2RpZmllciB7CiAgICAgc3RkOjpvcHRpb25hbDxBcHBsZVBh eVBheW1lbnRNZXRob2RUeXBlPiBwYXltZW50TWV0aG9kVHlwZTsKICAgICBzdGQ6Om9wdGlvbmFs PEFwcGxlUGF5TGluZUl0ZW0+IHRvdGFsOwogICAgIFZlY3RvcjxBcHBsZVBheUxpbmVJdGVtPiBh ZGRpdGlvbmFsTGluZUl0ZW1zOworI2lmIEVOQUJMRShBUFBMRV9QQVlfVVBEQVRFX1NISVBQSU5H X01FVEhPRFNfV0hFTl9DSEFOR0lOR19MSU5FX0lURU1TKQogICAgIFZlY3RvcjxBcHBsZVBheVNo aXBwaW5nTWV0aG9kPiBhZGRpdGlvbmFsU2hpcHBpbmdNZXRob2RzOworI2VuZGlmCiAKICNpZiBk ZWZpbmVkKEFwcGxlUGF5TW9kaWZpZXJBZGRpdGlvbnNfbWVtYmVycykKICAgICBBcHBsZVBheU1v ZGlmaWVyQWRkaXRpb25zX21lbWJlcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvYXBwbGVwYXkvcGF5bWVudHJlcXVlc3QvQXBwbGVQYXlNb2RpZmllci5pZGwgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L3BheW1lbnRyZXF1ZXN0L0FwcGxlUGF5TW9kaWZpZXIu aWRsCmluZGV4IDA5MjllMDcxZjdiZGZmNTkzY2QxNDJmODJlZTZmOGYwYjFiYjJjODIuLjg0ODkz ZGQ2OWEwMTc1YzY1MjQ4ZmRhYzIyOTA0NThkNmNhNTNhYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvcGF5bWVudHJlcXVlc3QvQXBwbGVQYXlNb2RpZmllci5p ZGwKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9wYXltZW50cmVxdWVzdC9B cHBsZVBheU1vZGlmaWVyLmlkbApAQCAtMjksNSArMjksNSBAQAogICAgIEFwcGxlUGF5UGF5bWVu dE1ldGhvZFR5cGUgcGF5bWVudE1ldGhvZFR5cGU7CiAgICAgQXBwbGVQYXlMaW5lSXRlbSB0b3Rh bDsKICAgICBzZXF1ZW5jZTxBcHBsZVBheUxpbmVJdGVtPiBhZGRpdGlvbmFsTGluZUl0ZW1zOwot ICAgIHNlcXVlbmNlPEFwcGxlUGF5U2hpcHBpbmdNZXRob2Q+IGFkZGl0aW9uYWxTaGlwcGluZ01l dGhvZHM7CisgICAgW0NvbmRpdGlvbmFsPUFQUExFX1BBWV9VUERBVEVfU0hJUFBJTkdfTUVUSE9E U19XSEVOX0NIQU5HSU5HX0xJTkVfSVRFTVNdIHNlcXVlbmNlPEFwcGxlUGF5U2hpcHBpbmdNZXRo b2Q+IGFkZGl0aW9uYWxTaGlwcGluZ01ldGhvZHM7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9hcHBsZXBheS9wYXltZW50cmVxdWVzdC9BcHBsZVBheVBheW1lbnRIYW5k bGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvcGF5bWVudHJlcXVlc3Qv QXBwbGVQYXlQYXltZW50SGFuZGxlci5jcHAKaW5kZXggMDlkMzlmZjE3YzNjYjU5NzkyYmVmZTdh ZGFkNTNmMjRlNTY4NGNiMS4uZmYzZmY5OWVkZTRhYWMyMDkwNzAwYjFiMjFmYWQyZDE3NWY2YzAz OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9wYXltZW50cmVx dWVzdC9BcHBsZVBheVBheW1lbnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2FwcGxlcGF5L3BheW1lbnRyZXF1ZXN0L0FwcGxlUGF5UGF5bWVudEhhbmRsZXIuY3BwCkBA IC0zMDYsMTEgKzMwNiwxMyBAQCBFeGNlcHRpb25PcjxWZWN0b3I8QXBwbGVQYXlTaGlwcGluZ01l dGhvZD4+IEFwcGxlUGF5UGF5bWVudEhhbmRsZXI6OmNvbXB1dGVTaGlwcAogICAgICAgICB9CiAg ICAgfQogCisjaWYgRU5BQkxFKEFQUExFX1BBWV9VUERBVEVfU0hJUFBJTkdfTUVUSE9EU19XSEVO X0NIQU5HSU5HX0xJTkVfSVRFTVMpCiAgICAgYXV0byBtb2RpZmllckV4Y2VwdGlvbiA9IGZpcnN0 QXBwbGljYWJsZU1vZGlmaWVyKCk7CiAgICAgaWYgKG1vZGlmaWVyRXhjZXB0aW9uLmhhc0V4Y2Vw dGlvbigpKQogICAgICAgICByZXR1cm4gbW9kaWZpZXJFeGNlcHRpb24ucmVsZWFzZUV4Y2VwdGlv bigpOwogICAgIGlmIChhdXRvIG1vZGlmaWVyRGF0YSA9IG1vZGlmaWVyRXhjZXB0aW9uLnJlbGVh c2VSZXR1cm5WYWx1ZSgpKQogICAgICAgICBzaGlwcGluZ09wdGlvbnMuYXBwZW5kVmVjdG9yKFdU Rk1vdmUoc3RkOjpnZXQ8MT4oKm1vZGlmaWVyRGF0YSkuYWRkaXRpb25hbFNoaXBwaW5nTWV0aG9k cykpOworI2VuZGlmCiAKICAgICByZXR1cm4gV1RGTW92ZShzaGlwcGluZ09wdGlvbnMpOwogfQpA QCAtNTExLDcgKzUxMyw3IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IEFwcGxlUGF5UGF5bWVudEhhbmRs ZXI6OmRldGFpbHNVcGRhdGVkKFBheW1lbnRSZXF1ZXN0OjpVcGRhdGVSCiAgICAgY2FzZSBSZWFz b246OlNoaXBwaW5nT3B0aW9uQ2hhbmdlZDoKICAgICAgICAgcmV0dXJuIHNoaXBwaW5nT3B0aW9u VXBkYXRlZCgpOwogICAgIGNhc2UgUmVhc29uOjpQYXltZW50TWV0aG9kQ2hhbmdlZDoKLSAgICAg ICAgcmV0dXJuIHBheW1lbnRNZXRob2RVcGRhdGVkKGNvbXB1dGVFcnJvcnMocGF5bWVudE1ldGhv ZEVycm9ycykpOworICAgICAgICByZXR1cm4gcGF5bWVudE1ldGhvZFVwZGF0ZWQoY29tcHV0ZUVy cm9ycyhXVEZNb3ZlKGVycm9yKSwgV1RGTW92ZShhZGRyZXNzRXJyb3JzKSwgV1RGTW92ZShwYXll ckVycm9ycyksIHBheW1lbnRNZXRob2RFcnJvcnMpKTsKICAgICB9CiAKICAgICBBU1NFUlRfTk9U X1JFQUNIRUQoKTsKQEAgLTU3NCw2ICs1NzYsMTMgQEAgRXhjZXB0aW9uT3I8dm9pZD4gQXBwbGVQ YXlQYXltZW50SGFuZGxlcjo6c2hpcHBpbmdPcHRpb25VcGRhdGVkKCkKIAogICAgIEFwcGxlUGF5 U2hpcHBpbmdNZXRob2RVcGRhdGUgdXBkYXRlOwogCisjaWYgRU5BQkxFKEFQUExFX1BBWV9VUERB VEVfU0hJUFBJTkdfTUVUSE9EU19XSEVOX0NIQU5HSU5HX0xJTkVfSVRFTVMpCisgICAgYXV0byBu ZXdTaGlwcGluZ01ldGhvZHMgPSBjb21wdXRlU2hpcHBpbmdNZXRob2RzKCk7CisgICAgaWYgKG5l d1NoaXBwaW5nTWV0aG9kcy5oYXNFeGNlcHRpb24oKSkKKyAgICAgICAgcmV0dXJuIG5ld1NoaXBw aW5nTWV0aG9kcy5yZWxlYXNlRXhjZXB0aW9uKCk7CisgICAgdXBkYXRlLm5ld1NoaXBwaW5nTWV0 aG9kcyA9IG5ld1NoaXBwaW5nTWV0aG9kcy5yZWxlYXNlUmV0dXJuVmFsdWUoKTsKKyNlbmRpZgor CiAgICAgYXV0byBuZXdUb3RhbEFuZExpbmVJdGVtcyA9IGNvbXB1dGVUb3RhbEFuZExpbmVJdGVt cygpOwogICAgIGlmIChuZXdUb3RhbEFuZExpbmVJdGVtcy5oYXNFeGNlcHRpb24oKSkKICAgICAg ICAgcmV0dXJuIG5ld1RvdGFsQW5kTGluZUl0ZW1zLnJlbGVhc2VFeGNlcHRpb24oKTsKQEAgLTYx Nyw4ICs2MjYsNiBAQCBFeGNlcHRpb25Pcjx2b2lkPiBBcHBsZVBheVBheW1lbnRIYW5kbGVyOjpw YXltZW50TWV0aG9kVXBkYXRlZChWZWN0b3I8UmVmUHRyPEFwcAogICAgICAgICBwYXltZW50Q29v cmRpbmF0b3IoKS5jb21wbGV0ZUNvdXBvbkNvZGVDaGFuZ2UoV1RGTW92ZSh1cGRhdGUpKTsKICAg ICAgICAgcmV0dXJuIHsgfTsKICAgICB9Ci0jZWxzZQotICAgIFVOVVNFRF9QQVJBTShlcnJvcnMp OwogI2VuZGlmIC8vIEVOQUJMRShBUFBMRV9QQVlfQ09VUE9OX0NPREUpCiAKICAgICBBU1NFUlQo bV91cGRhdGVTdGF0ZSA9PSBVcGRhdGVTdGF0ZTo6UGF5bWVudE1ldGhvZCk7CkBAIC02MjYsNiAr NjMzLDE3IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IEFwcGxlUGF5UGF5bWVudEhhbmRsZXI6OnBheW1l bnRNZXRob2RVcGRhdGVkKFZlY3RvcjxSZWZQdHI8QXBwCiAKICAgICBBcHBsZVBheVBheW1lbnRN ZXRob2RVcGRhdGUgdXBkYXRlOwogCisjaWYgRU5BQkxFKEFQUExFX1BBWV9VUERBVEVfU0hJUFBJ TkdfTUVUSE9EU19XSEVOX0NIQU5HSU5HX0xJTkVfSVRFTVMpCisgICAgdXBkYXRlLmVycm9ycyA9 IFdURk1vdmUoZXJyb3JzKTsKKworICAgIGF1dG8gbmV3U2hpcHBpbmdNZXRob2RzID0gY29tcHV0 ZVNoaXBwaW5nTWV0aG9kcygpOworICAgIGlmIChuZXdTaGlwcGluZ01ldGhvZHMuaGFzRXhjZXB0 aW9uKCkpCisgICAgICAgIHJldHVybiBuZXdTaGlwcGluZ01ldGhvZHMucmVsZWFzZUV4Y2VwdGlv bigpOworICAgIHVwZGF0ZS5uZXdTaGlwcGluZ01ldGhvZHMgPSBuZXdTaGlwcGluZ01ldGhvZHMu cmVsZWFzZVJldHVyblZhbHVlKCk7CisjZWxzZQorICAgIFVOVVNFRF9QQVJBTShlcnJvcnMpOwor I2VuZGlmCisKICAgICBhdXRvIG5ld1RvdGFsQW5kTGluZUl0ZW1zID0gY29tcHV0ZVRvdGFsQW5k TGluZUl0ZW1zKCk7CiAgICAgaWYgKG5ld1RvdGFsQW5kTGluZUl0ZW1zLmhhc0V4Y2VwdGlvbigp KQogICAgICAgICByZXR1cm4gbmV3VG90YWxBbmRMaW5lSXRlbXMucmVsZWFzZUV4Y2VwdGlvbigp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvUGFzc0tpdFNQ SS5oIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvUGFzc0tpdFNQSS5oCmluZGV4 IGYwNGZjMDlhMDU5ZTEzYzVlZGU5MGJhOTZjOWYxNjQ1NzM4MzA5YmEuLmU0YjhlYzQ0NDQxZmQ0 MmZhZjAzNjNkYTVlZGMxMmQ1OGJhNjQ2ZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BB TC9wYWwvc3BpL2NvY29hL1Bhc3NLaXRTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFs L3NwaS9jb2NvYS9QYXNzS2l0U1BJLmgKQEAgLTQ0OSwxMyArNDQ5LDE0IEBAIE5TX0FTU1VNRV9O T05OVUxMX0JFR0lOCiBAaW50ZXJmYWNlIFBLUGF5bWVudFJlcXVlc3RVcGRhdGUgOiBOU09iamVj dAogLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoUGF5bWVudFN1bW1hcnlJdGVtczooTlNBcnJheTxQ S1BheW1lbnRTdW1tYXJ5SXRlbSAqPiAqKXBheW1lbnRTdW1tYXJ5SXRlbXM7CiBAcHJvcGVydHkg KG5vbmF0b21pYywgY29weSkgTlNBcnJheTxQS1BheW1lbnRTdW1tYXJ5SXRlbSAqPiAqcGF5bWVu dFN1bW1hcnlJdGVtczsKLSNpZiBIQVZFKFBBU1NLSVRfQ09VUE9OX0NPREUpCisjaWYgSEFWRShQ QVNTS0lUX1VQREFURV9TSElQUElOR19NRVRIT0RTX1dIRU5fQ0hBTkdJTkdfU1VNTUFSWV9JVEVN UykKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBjb3B5KSBOU0FycmF5PFBLU2hpcHBpbmdNZXRob2Qg Kj4gKnNoaXBwaW5nTWV0aG9kczsKICNlbmRpZgotCiBAZW5kCiAKIEBpbnRlcmZhY2UgUEtQYXlt ZW50UmVxdWVzdFBheW1lbnRNZXRob2RVcGRhdGUgOiBQS1BheW1lbnRSZXF1ZXN0VXBkYXRlCist IChpbnN0YW5jZXR5cGUpaW5pdFdpdGhFcnJvcnM6KG51bGxhYmxlIE5TQXJyYXk8TlNFcnJvciAq PiAqKWVycm9ycyBwYXltZW50U3VtbWFyeUl0ZW1zOihub25udWxsIE5TQXJyYXk8UEtQYXltZW50 U3VtbWFyeUl0ZW0gKj4gKilzdW1tYXJ5SXRlbXM7CitAcHJvcGVydHkgKG51bGxfcmVzZXR0YWJs ZSwgbm9uYXRvbWljLCBjb3B5KSBOU0FycmF5PE5TRXJyb3IgKj4gKmVycm9yczsKIEBlbmQKIAog QGludGVyZmFjZSBQS1BheW1lbnRSZXF1ZXN0U2hpcHBpbmdDb250YWN0VXBkYXRlIDogUEtQYXlt ZW50UmVxdWVzdFVwZGF0ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9Nb2Nr UGF5bWVudENvb3JkaW5hdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvTW9ja1BheW1l bnRDb29yZGluYXRvci5jcHAKaW5kZXggYzI0Y2U0MmM0YWE0NjI4YjY0OTI2NjE1NmUxNzY0NTU3 YWI0M2ViZS4uZGJlNzg5ZWNiMzhlYTE3MmY5ZmM5ZThhNDI0MmU5OTVjNDI1OTY1NiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9Nb2NrUGF5bWVudENvb3JkaW5hdG9yLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL01vY2tQYXltZW50Q29vcmRpbmF0b3IuY3BwCkBA IC0xNDcsNiArMTQ3LDkgQEAgdm9pZCBNb2NrUGF5bWVudENvb3JkaW5hdG9yOjpjb21wbGV0ZVNo aXBwaW5nTWV0aG9kU2VsZWN0aW9uKHN0ZDo6b3B0aW9uYWw8QXBwbGUKIAogICAgIG1fdG90YWwg PSBXVEZNb3ZlKHNoaXBwaW5nTWV0aG9kVXBkYXRlLT5uZXdUb3RhbCk7CiAgICAgbV9saW5lSXRl bXMgPSBXVEZNb3ZlKHNoaXBwaW5nTWV0aG9kVXBkYXRlLT5uZXdMaW5lSXRlbXMpOworI2lmIEVO QUJMRShBUFBMRV9QQVlfVVBEQVRFX1NISVBQSU5HX01FVEhPRFNfV0hFTl9DSEFOR0lOR19MSU5F X0lURU1TKQorICAgIG1fc2hpcHBpbmdNZXRob2RzID0gV1RGTW92ZShzaGlwcGluZ01ldGhvZFVw ZGF0ZS0+bmV3U2hpcHBpbmdNZXRob2RzKTsKKyNlbmRpZgogI2lmIGRlZmluZWQoTW9ja1BheW1l bnRDb29yZGluYXRvckFkZGl0aW9uc19jb21wbGV0ZVNoaXBwaW5nTWV0aG9kU2VsZWN0aW9uKQog ICAgIE1vY2tQYXltZW50Q29vcmRpbmF0b3JBZGRpdGlvbnNfY29tcGxldGVTaGlwcGluZ01ldGhv ZFNlbGVjdGlvbgogI2VuZGlmCkBAIC0xNjksOCArMTcyLDggQEAgdm9pZCBNb2NrUGF5bWVudENv b3JkaW5hdG9yOjpjb21wbGV0ZVNoaXBwaW5nQ29udGFjdFNlbGVjdGlvbihzdGQ6Om9wdGlvbmFs PEFwcGwKIAogICAgIG1fdG90YWwgPSBXVEZNb3ZlKHNoaXBwaW5nQ29udGFjdFVwZGF0ZS0+bmV3 VG90YWwpOwogICAgIG1fbGluZUl0ZW1zID0gV1RGTW92ZShzaGlwcGluZ0NvbnRhY3RVcGRhdGUt Pm5ld0xpbmVJdGVtcyk7Ci0gICAgbV9lcnJvcnMgPSBjb252ZXJ0KFdURk1vdmUoc2hpcHBpbmdD b250YWN0VXBkYXRlLT5lcnJvcnMpKTsKICAgICBtX3NoaXBwaW5nTWV0aG9kcyA9IFdURk1vdmUo c2hpcHBpbmdDb250YWN0VXBkYXRlLT5uZXdTaGlwcGluZ01ldGhvZHMpOworICAgIG1fZXJyb3Jz ID0gY29udmVydChXVEZNb3ZlKHNoaXBwaW5nQ29udGFjdFVwZGF0ZS0+ZXJyb3JzKSk7CiAjaWYg ZGVmaW5lZChNb2NrUGF5bWVudENvb3JkaW5hdG9yQWRkaXRpb25zX2NvbXBsZXRlU2hpcHBpbmdD b250YWN0U2VsZWN0aW9uKQogICAgIE1vY2tQYXltZW50Q29vcmRpbmF0b3JBZGRpdGlvbnNfY29t cGxldGVTaGlwcGluZ0NvbnRhY3RTZWxlY3Rpb24KICNlbmRpZgpAQCAtMTgzLDYgKzE4NiwxMCBA QCB2b2lkIE1vY2tQYXltZW50Q29vcmRpbmF0b3I6OmNvbXBsZXRlUGF5bWVudE1ldGhvZFNlbGVj dGlvbihzdGQ6Om9wdGlvbmFsPEFwcGxlUAogCiAgICAgbV90b3RhbCA9IFdURk1vdmUocGF5bWVu dE1ldGhvZFVwZGF0ZS0+bmV3VG90YWwpOwogICAgIG1fbGluZUl0ZW1zID0gV1RGTW92ZShwYXlt ZW50TWV0aG9kVXBkYXRlLT5uZXdMaW5lSXRlbXMpOworI2lmIEVOQUJMRShBUFBMRV9QQVlfVVBE QVRFX1NISVBQSU5HX01FVEhPRFNfV0hFTl9DSEFOR0lOR19MSU5FX0lURU1TKQorICAgIG1fc2hp cHBpbmdNZXRob2RzID0gV1RGTW92ZShwYXltZW50TWV0aG9kVXBkYXRlLT5uZXdTaGlwcGluZ01l dGhvZHMpOworICAgIG1fZXJyb3JzID0gY29udmVydChXVEZNb3ZlKHBheW1lbnRNZXRob2RVcGRh dGUtPmVycm9ycykpOworI2VuZGlmCiAjaWYgZGVmaW5lZChNb2NrUGF5bWVudENvb3JkaW5hdG9y QWRkaXRpb25zX2NvbXBsZXRlUGF5bWVudE1ldGhvZFNlbGVjdGlvbikKICAgICBNb2NrUGF5bWVu dENvb3JkaW5hdG9yQWRkaXRpb25zX2NvbXBsZXRlUGF5bWVudE1ldGhvZFNlbGVjdGlvbgogI2Vu ZGlmCkBAIC0xOTcsOCArMjA0LDggQEAgdm9pZCBNb2NrUGF5bWVudENvb3JkaW5hdG9yOjpjb21w bGV0ZUNvdXBvbkNvZGVDaGFuZ2Uoc3RkOjpvcHRpb25hbDxBcHBsZVBheUNvdXAKIAogICAgIG1f dG90YWwgPSBXVEZNb3ZlKGNvdXBvbkNvZGVVcGRhdGUtPm5ld1RvdGFsKTsKICAgICBtX2xpbmVJ dGVtcyA9IFdURk1vdmUoY291cG9uQ29kZVVwZGF0ZS0+bmV3TGluZUl0ZW1zKTsKLSAgICBtX2Vy cm9ycyA9IGNvbnZlcnQoV1RGTW92ZShjb3Vwb25Db2RlVXBkYXRlLT5lcnJvcnMpKTsKICAgICBt X3NoaXBwaW5nTWV0aG9kcyA9IFdURk1vdmUoY291cG9uQ29kZVVwZGF0ZS0+bmV3U2hpcHBpbmdN ZXRob2RzKTsKKyAgICBtX2Vycm9ycyA9IGNvbnZlcnQoV1RGTW92ZShjb3Vwb25Db2RlVXBkYXRl LT5lcnJvcnMpKTsKICNpZiBkZWZpbmVkKE1vY2tQYXltZW50Q29vcmRpbmF0b3JBZGRpdGlvbnNf Y29tcGxldGVDb3Vwb25Db2RlQ2hhbmdlKQogICAgIE1vY2tQYXltZW50Q29vcmRpbmF0b3JBZGRp dGlvbnNfY29tcGxldGVDb3Vwb25Db2RlQ2hhbmdlCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvUGxhdGZvcm0vY29jb2EvUGF5bWVudEF1dGhvcml6YXRpb25QcmVzZW50ZXIubW0g Yi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL2NvY29hL1BheW1lbnRBdXRob3JpemF0aW9uUHJlc2Vu dGVyLm1tCmluZGV4IDEzYjNlNzEzOTkwYzY3MmZlNDgyYzljNmNjMzZkMmY4MDU3ZjU4ZWUuLjBj OWFiZTIwODcwNjBlMzM0OGQ1NGU1MDJmMmU5ZDE1OTA4ZjUxZmEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvUGxhdGZvcm0vY29jb2EvUGF5bWVudEF1dGhvcml6YXRpb25QcmVzZW50ZXIubW0K KysrIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9jb2NvYS9QYXltZW50QXV0aG9yaXphdGlvblBy ZXNlbnRlci5tbQpAQCAtMjE3LDYgKzIxNywxMCBAQCB2b2lkIFBheW1lbnRBdXRob3JpemF0aW9u UHJlc2VudGVyOjpjb21wbGV0ZVBheW1lbnRNZXRob2RTZWxlY3Rpb24oc3RkOjpvcHRpb25hbAog ICAgIH0KIAogICAgIGF1dG8gcGF5bWVudE1ldGhvZFVwZGF0ZSA9IGFkb3B0TlMoW1BBTDo6YWxs b2NQS1BheW1lbnRSZXF1ZXN0UGF5bWVudE1ldGhvZFVwZGF0ZUluc3RhbmNlKCkgaW5pdFdpdGhQ YXltZW50U3VtbWFyeUl0ZW1zOldlYkNvcmU6OnBsYXRmb3JtU3VtbWFyeUl0ZW1zKFdURk1vdmUo dXBkYXRlLT5uZXdUb3RhbCksIFdURk1vdmUodXBkYXRlLT5uZXdMaW5lSXRlbXMpKV0pOworI2lm IEhBVkUoUEFTU0tJVF9VUERBVEVfU0hJUFBJTkdfTUVUSE9EU19XSEVOX0NIQU5HSU5HX1NVTU1B UllfSVRFTVMpCisgICAgW3BheW1lbnRNZXRob2RVcGRhdGUgc2V0RXJyb3JzOnRvTlNFcnJvcnMo V1RGTW92ZSh1cGRhdGUtPmVycm9ycykpLmdldCgpXTsKKyAgICBbcGF5bWVudE1ldGhvZFVwZGF0 ZSBzZXRTaGlwcGluZ01ldGhvZHM6dG9QS1NoaXBwaW5nTWV0aG9kcyhXVEZNb3ZlKHVwZGF0ZS0+ bmV3U2hpcHBpbmdNZXRob2RzKSkuZ2V0KCldOworI2VuZGlmCiAjaWYgSEFWRShQQVNTS0lUX0lO U1RBTExNRU5UUykgJiYgRU5BQkxFKEFQUExFX1BBWV9JTlNUQUxMTUVOVFMpCiAgICAgW3BheW1l bnRNZXRob2RVcGRhdGUgc2V0SW5zdGFsbG1lbnRHcm91cElkZW50aWZpZXI6V1RGTW92ZSh1cGRh dGUtPmluc3RhbGxtZW50R3JvdXBJZGVudGlmaWVyKV07CiAjZW5kaWYgLy8gSEFWRShQQVNTS0lU X0lOU1RBTExNRU5UUykgJiYgRU5BQkxFKEFQUExFX1BBWV9JTlNUQUxMTUVOVFMpCkBAIC0yNjAs NiArMjY0LDkgQEAgdm9pZCBQYXltZW50QXV0aG9yaXphdGlvblByZXNlbnRlcjo6Y29tcGxldGVT aGlwcGluZ01ldGhvZFNlbGVjdGlvbihzdGQ6Om9wdGlvbmEKICAgICB9CiAKICAgICBhdXRvIHNo aXBwaW5nTWV0aG9kVXBkYXRlID0gYWRvcHROUyhbUEFMOjphbGxvY1BLUGF5bWVudFJlcXVlc3RT aGlwcGluZ01ldGhvZFVwZGF0ZUluc3RhbmNlKCkgaW5pdFdpdGhQYXltZW50U3VtbWFyeUl0ZW1z OldlYkNvcmU6OnBsYXRmb3JtU3VtbWFyeUl0ZW1zKFdURk1vdmUodXBkYXRlLT5uZXdUb3RhbCks IFdURk1vdmUodXBkYXRlLT5uZXdMaW5lSXRlbXMpKV0pOworI2lmIEhBVkUoUEFTU0tJVF9VUERB VEVfU0hJUFBJTkdfTUVUSE9EU19XSEVOX0NIQU5HSU5HX1NVTU1BUllfSVRFTVMpCisgICAgW3No aXBwaW5nTWV0aG9kVXBkYXRlIHNldFNoaXBwaW5nTWV0aG9kczp0b1BLU2hpcHBpbmdNZXRob2Rz KFdURk1vdmUodXBkYXRlLT5uZXdTaGlwcGluZ01ldGhvZHMpKS5nZXQoKV07CisjZW5kaWYKICNp ZiBkZWZpbmVkKFBheW1lbnRBdXRob3JpemF0aW9uUHJlc2VudGVyQWRkaXRpb25zX2NvbXBsZXRl U2hpcHBpbmdNZXRob2RTZWxlY3Rpb24pCiAgICAgUGF5bWVudEF1dGhvcml6YXRpb25QcmVzZW50 ZXJBZGRpdGlvbnNfY29tcGxldGVTaGlwcGluZ01ldGhvZFNlbGVjdGlvbgogI2VuZGlmCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k ZXggZTFhZGMwZjQ1MWI5YTdmNzE5OGEzODQzMzEzNWI1ZWZmYjQxYTIwMC4uNmFkNjYzMTgzZDhl YjJmNzM2YWJmM2E3NWZjOWNjYTQzZWVlNmZiYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIx LTA3LTI5ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBbUGF5 bWVudCBSZXF1ZXN0XSBgYWRkaXRpb25hbFNoaXBwaW5nTWV0aG9kc2AgYXJlIG5vdCB1c2VkIGlm IGEgYHBheW1lbnRNZXRob2RUeXBlYCBpcyBwcm92aWRlZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4NTk5CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS84MTE5MDM2Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGh0dHAvdGVzdHMvcGF5bWVudHJlcXVlc3QvQXBwbGVQYXlNb2RpZmllci1wYXltZW50 TWV0aG9kVHlwZS5odHRwcy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL3BheW1l bnRyZXF1ZXN0L0FwcGxlUGF5TW9kaWZpZXItcGF5bWVudE1ldGhvZFR5cGUuaHR0cHMtZXhwZWN0 ZWQudHh0OiBBZGRlZC4KKworICAgICAgICAqIHBsYXRmb3JtL2lvcy0xNC13azIvVGVzdEV4cGVj dGF0aW9uczoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMtYmlnc3VyLXdrMi9UZXN0RXhwZWN0YXRp b25zOiBBZGRlZC4KKyAgICAgICAgU2tpcCBvbiBvbGRlciBtYWNPUy9pT1Mgc2luY2UgdGhleSBk b24ndCBzdXBwb3J0IG1vZGlmeWluZyBzaGlwcGluZyBtZXRob2RzIHdpdGggYW55IHVwZGF0ZS4K KwogMjAyMS0wNy0yNyAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KIAogICAgICAg ICBVcGRhdGUgcGxhdGZvcm0gc3BlY2lmaWMgVGVzdEV4cGVjdGF0aW9ucyBmb3IgaW1wb3J0ZWQg SW5kZXhlZERCIHRlc3RzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3BheW1l bnRyZXF1ZXN0L0FwcGxlUGF5TW9kaWZpZXItcGF5bWVudE1ldGhvZFR5cGUuaHR0cHMtZXhwZWN0 ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9wYXltZW50cmVxdWVzdC9BcHBsZVBheU1v ZGlmaWVyLXBheW1lbnRNZXRob2RUeXBlLmh0dHBzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4x ODY1NzVkZTUwMjAxMDliMjc2ZjdlMzNjNDA3ZGIzMDRjMWQ4ZGIzCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9wYXltZW50cmVxdWVzdC9BcHBsZVBheU1vZGlmaWVy LXBheW1lbnRNZXRob2RUeXBlLmh0dHBzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDcgQEAKKwor UEFTUyBTaG91bGQgaGF2ZSBhbGwgYWRkaXRpb25hbCBsaW5lIGl0ZW1zIGFuZCBzaGlwcGluZyBv cHRpb25zIGlmIGBwYXltZW50TWV0aG9kVHlwZWAgaXMgbm90IHByb3ZpZGVkLgorUEFTUyBTaG91 bGQgbm90IGhhdmUgYW55IGFkZGl0aW9uYWwgbGluZSBpdGVtcyBvciBzaGlwcGluZyBvcHRpb25z IGlmIGEgbm9uLW1hdGNoaW5nIGBwYXltZW50TWV0aG9kVHlwZWAgaXMgcHJvdmlkZWQgYW5kIHRo ZSB1c2VyIGhhcyBub3QgY2hvc2VuIGEgcGF5bWVudCBtZXRob2QgdHlwZSB5ZXQuCitQQVNTIFNo b3VsZCBub3QgaGF2ZSBhbnkgYWRkaXRpb25hbCBsaW5lIGl0ZW1zIG9yIHNoaXBwaW5nIG9wdGlv bnMgaWYgYHBheW1lbnRNZXRob2RUeXBlYCBpcyBwcm92aWRlZCBhbmQgdGhlIHVzZXIgY2hvc2Ug YSBub24tbWF0Y2hpbmcgcGF5bWVudCBtZXRob2QgdHlwZS4KK1BBU1MgU2hvdWxkIG5vdCBoYXZl IGFueSBhZGRpdGlvbmFsIGxpbmUgaXRlbXMgb3Igc2hpcHBpbmcgb3B0aW9ucyBpZiBhIG1hdGNo aW5nIGBwYXltZW50TWV0aG9kVHlwZWAgaXMgcHJvdmlkZWQgYW5kIHRoZSB1c2VyIGhhcyBub3Qg Y2hvc2VuIGEgcGF5bWVudCBtZXRob2QgdHlwZSB5ZXQuCitQQVNTIFNob3VsZCBoYXZlIGFsbCBh ZGRpdGlvbmFsIGxpbmUgaXRlbXMgYW5kIHNoaXBwaW5nIG9wdGlvbnMgaWYgYHBheW1lbnRNZXRo b2RUeXBlYCBpcyBwcm92aWRlZCBhbmQgdGhlIHVzZXIgY2hvc2UgYSBtYXRjaGluZyBwYXltZW50 IG1ldGhvZCB0eXBlLgorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3BheW1l bnRyZXF1ZXN0L0FwcGxlUGF5TW9kaWZpZXItcGF5bWVudE1ldGhvZFR5cGUuaHR0cHMuaHRtbCBi L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvcGF5bWVudHJlcXVlc3QvQXBwbGVQYXlNb2RpZmllci1w YXltZW50TWV0aG9kVHlwZS5odHRwcy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjM0NzBjNWVhMmM1NzdkNmM3 YjRkOTdjOWY4YTNlNjIxMDkxYzhmYTAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL3BheW1lbnRyZXF1ZXN0L0FwcGxlUGF5TW9kaWZpZXItcGF5bWVudE1ldGhvZFR5 cGUuaHR0cHMuaHRtbApAQCAtMCwwICsxLDE0MCBAQAorPCFET0NUWVBFIGh0bWw+Cis8bWV0YSBj aGFyc2V0PSJ1dGYtOCI+Cis8dGl0bGU+VGVzdHMgZm9yIHByb3ZpZGluZyBgcGF5bWVudE1ldGhv ZFR5cGVgIGFzIHBhcnQgb2YgYEFwcGxlUGF5TW9kaWZpZXJgLjwvdGl0bGU+Cis8c2NyaXB0IHNy Yz0iL2pzLXRlc3QtcmVzb3VyY2VzL3VpLWhlbHBlci5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNy Yz0iL3Jlc291cmNlcy9wYXltZW50LXJlcXVlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9 Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3MuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii9yZXNv dXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQuanMiPjwvc2NyaXB0PgorPGJvZHk+Cis8c2NyaXB0Pgor c2V0dXAoeyBleHBsaWNpdF9kb25lOiB0cnVlLCBleHBsaWNpdF90aW1lb3V0OiB0cnVlIH0pOwor Citjb25zdCBsaW5lSXRlbSA9IHsKKyAgICBsYWJlbDogIkFkZGl0aW9uYWwgUmVjdXJyaW5nIiwK KyAgICBhbW91bnQ6ICIyMC4wMCIsCisgICAgcGF5bWVudFRpbWluZzogInJlY3VycmluZyIsCisg ICAgcmVjdXJyaW5nUGF5bWVudFN0YXJ0RGF0ZTogbmV3IERhdGUoMCksCisgICAgcmVjdXJyaW5n UGF5bWVudEludGVydmFsVW5pdDogInllYXIiLAorICAgIHJlY3VycmluZ1BheW1lbnRJbnRlcnZh bENvdW50OiAxMCwKKyAgICByZWN1cnJpbmdQYXltZW50RW5kRGF0ZTogbmV3IERhdGUoMSksCit9 OworCitjb25zdCBzaGlwcGluZ01ldGhvZCA9IHsKKyAgICBhbW91bnQ6ICIxMC4wMCIsCisgICAg ZGV0YWlsOiAiZGV0YWlsIiwKKyAgICBpZGVudGlmaWVyOiAiYWRkaXRpb25hbC1zaGlwcGluZyIs CisgICAgbGFiZWw6ICJBZGRpdGlvbmFsIFNoaXBwaW5nIiwKKyAgICBkYXRlQ29tcG9uZW50c1Jh bmdlOiB7CisgICAgICAgIHN0YXJ0RGF0ZUNvbXBvbmVudHM6IHsgZGF5czogNSB9LAorICAgICAg ICBlbmREYXRlQ29tcG9uZW50czogeyBkYXlzOiAxMCB9LAorICAgIH0sCit9OworCitmdW5jdGlv biB2YWxpZFBheW1lbnREZXRhaWxzV2l0aE1vZGlmaWVyVGhhdEhhc1BheW1lbnRNZXRob2RUeXBl KHBheW1lbnRNZXRob2RUeXBlKSB7CisgICAgbGV0IGRldGFpbHMgPSB2YWxpZFBheW1lbnREZXRh aWxzKCk7CisgICAgZGV0YWlscy5tb2RpZmllcnMgPSBbCisgICAgICAgIHsKKyAgICAgICAgICAg IHN1cHBvcnRlZE1ldGhvZHM6ICJodHRwczovL2FwcGxlLmNvbS9hcHBsZS1wYXkiLAorICAgICAg ICAgICAgZGF0YTogeworICAgICAgICAgICAgICAgIHBheW1lbnRNZXRob2RUeXBlLAorICAgICAg ICAgICAgICAgIGFkZGl0aW9uYWxMaW5lSXRlbXM6IFsgbGluZUl0ZW0gXSwKKyAgICAgICAgICAg ICAgICBhZGRpdGlvbmFsU2hpcHBpbmdNZXRob2RzOiBbIHNoaXBwaW5nTWV0aG9kIF0sCisgICAg ICAgICAgICB9LAorICAgICAgICB9LAorICAgIF07CisgICAgcmV0dXJuIGRldGFpbHM7Cit9CisK K2Z1bmN0aW9uIHRlc3RQYXltZW50U2hpcHBpbmdPcHRpb25EYXRhKGRlc2NyaXB0aW9uLCB7c2lt dWxhdGVQYXltZW50TWV0aG9kQ2hhbmdlLCBwYXltZW50TWV0aG9kVHlwZSwgZXhwZWN0ZWRBZGRp dGlvbmFsTGluZUl0ZW1zLCBleHBlY3RlZEFkZGl0aW9uYWxTaGlwcGluZ01ldGhvZHN9KSB7Cisg ICAgdXNlcl9hY3RpdmF0aW9uX3Rlc3QoYXN5bmMgKHRlc3QpID0+IHsKKyAgICAgICAgbGV0IHJl cXVlc3QgPSBuZXcgUGF5bWVudFJlcXVlc3QoW3ZhbGlkUGF5bWVudE1ldGhvZCgpXSwgdmFsaWRQ YXltZW50RGV0YWlsc1dpdGhNb2RpZmllclRoYXRIYXNQYXltZW50TWV0aG9kVHlwZShwYXltZW50 TWV0aG9kVHlwZSksIHsgcmVxdWVzdFNoaXBwaW5nOiB0cnVlIH0pOworICAgICAgICByZXF1ZXN0 LmFkZEV2ZW50TGlzdGVuZXIoIm1lcmNoYW50dmFsaWRhdGlvbiIsIChldmVudCkgPT4geworICAg ICAgICAgICAgZXZlbnQuY29tcGxldGUoeyB9KTsKKyAgICAgICAgfSk7CisgICAgICAgIHJlcXVl c3QuYWRkRXZlbnRMaXN0ZW5lcigic2hpcHBpbmdhZGRyZXNzY2hhbmdlIiwgKGV2ZW50KSA9PiB7 CisgICAgICAgICAgICBldmVudC51cGRhdGVXaXRoKHsgfSk7CisKKyAgICAgICAgICAgIGlmIChz aW11bGF0ZVBheW1lbnRNZXRob2RDaGFuZ2UpCisgICAgICAgICAgICAgICAgaW50ZXJuYWxzLm1v Y2tQYXltZW50Q29vcmRpbmF0b3IuY2hhbmdlUGF5bWVudE1ldGhvZCh7IHR5cGU6ICJkZWJpdCIg fSk7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgaW50ZXJuYWxzLm1vY2tQYXlt ZW50Q29vcmRpbmF0b3IuYWNjZXB0UGF5bWVudCgpOworICAgICAgICB9KTsKKyAgICAgICAgaWYg KHNpbXVsYXRlUGF5bWVudE1ldGhvZENoYW5nZSkgeworICAgICAgICAgICAgcmVxdWVzdC5hZGRF dmVudExpc3RlbmVyKCJwYXltZW50bWV0aG9kY2hhbmdlIiwgKGV2ZW50KSA9PiB7CisgICAgICAg ICAgICAgICAgZXZlbnQudXBkYXRlV2l0aCh7IH0pOworCisgICAgICAgICAgICAgICAgaW50ZXJu YWxzLm1vY2tQYXltZW50Q29vcmRpbmF0b3IuYWNjZXB0UGF5bWVudCgpOworICAgICAgICAgICAg fSk7CisgICAgICAgIH0KKworICAgICAgICBsZXQgcmVzcG9uc2UgPSBhd2FpdCByZXF1ZXN0LnNo b3coKTsKKworICAgICAgICBsZXQgYWN0dWFsTGluZUl0ZW1zID0gaW50ZXJuYWxzLm1vY2tQYXlt ZW50Q29vcmRpbmF0b3IubGluZUl0ZW1zOworICAgICAgICBhc3NlcnRfZ3JlYXRlcl90aGFuX2Vx dWFsKGFjdHVhbExpbmVJdGVtcy5sZW5ndGgsIGV4cGVjdGVkQWRkaXRpb25hbExpbmVJdGVtcy5s ZW5ndGgsIGBjaGVjayB0aGF0IHRoZXJlIGFyZSBhdCBsZWFzdCAke2V4cGVjdGVkQWRkaXRpb25h bExpbmVJdGVtcy5sZW5ndGh9IGxpbmUgaXRlbXNgKTsKKyAgICAgICAgZm9yIChsZXQgaSA9IDA7 IGkgPCBleHBlY3RlZEFkZGl0aW9uYWxMaW5lSXRlbXMubGVuZ3RoOyArK2kpIHsKKyAgICAgICAg ICAgIGxldCBhY3R1YWxMaW5lSXRlbSA9IGFjdHVhbExpbmVJdGVtc1thY3R1YWxMaW5lSXRlbXMu bGVuZ3RoIC0gZXhwZWN0ZWRBZGRpdGlvbmFsTGluZUl0ZW1zLmxlbmd0aCArIGldOworICAgICAg ICAgICAgbGV0IGV4cGVjdGVkQWRkaXRpb25hbExpbmVJdGVtID0gZXhwZWN0ZWRBZGRpdGlvbmFs TGluZUl0ZW1zW2ldOworCisgICAgICAgICAgICBhc3NlcnRfZXF1YWxzKGFjdHVhbExpbmVJdGVt LmxhYmVsLCBleHBlY3RlZEFkZGl0aW9uYWxMaW5lSXRlbS5sYWJlbCwgYGNoZWNrIHRoYXQgdGhl IFxgbGFiZWxcYCBtYXRjaGVzIGZvciBhZGRpdGlvbmFsIGxpbmUgaXRlbSAke2l9YCk7CisgICAg ICAgICAgICBhc3NlcnRfZXF1YWxzKGFjdHVhbExpbmVJdGVtLmFtb3VudCwgZXhwZWN0ZWRBZGRp dGlvbmFsTGluZUl0ZW0uYW1vdW50LCBgY2hlY2sgdGhhdCB0aGUgXGBhbW91bnRcYCBtYXRjaGVz IGZvciBhZGRpdGlvbmFsIGxpbmUgaXRlbSAke2l9YCk7CisgICAgICAgICAgICBhc3NlcnRfZXF1 YWxzKGFjdHVhbExpbmVJdGVtLnBheW1lbnRUaW1pbmcsIGV4cGVjdGVkQWRkaXRpb25hbExpbmVJ dGVtLnBheW1lbnRUaW1pbmcsIGBjaGVjayB0aGF0IHRoZSBcYHBheW1lbnRUaW1pbmdcYCBtYXRj aGVzIGZvciBhZGRpdGlvbmFsIGxpbmUgaXRlbSAke2l9YCk7CisgICAgICAgICAgICBhc3NlcnRf ZXF1YWxzKGFjdHVhbExpbmVJdGVtLnJlY3VycmluZ1BheW1lbnRTdGFydERhdGU/LmdldFRpbWUo KSwgZXhwZWN0ZWRBZGRpdGlvbmFsTGluZUl0ZW0ucmVjdXJyaW5nUGF5bWVudFN0YXJ0RGF0ZT8u Z2V0VGltZSgpLCBgY2hlY2sgdGhhdCB0aGUgXGByZWN1cnJpbmdQYXltZW50U3RhcnREYXRlXGAg bWF0Y2hlcyBmb3IgYWRkaXRpb25hbCBsaW5lIGl0ZW0gJHtpfWApOworICAgICAgICAgICAgYXNz ZXJ0X2VxdWFscyhhY3R1YWxMaW5lSXRlbS5yZWN1cnJpbmdQYXltZW50SW50ZXJ2YWxVbml0LCBl eHBlY3RlZEFkZGl0aW9uYWxMaW5lSXRlbS5yZWN1cnJpbmdQYXltZW50SW50ZXJ2YWxVbml0LCBg Y2hlY2sgdGhhdCB0aGUgXGByZWN1cnJpbmdQYXltZW50SW50ZXJ2YWxVbml0XGAgbWF0Y2hlcyBm b3IgYWRkaXRpb25hbCBsaW5lIGl0ZW0gJHtpfWApOworICAgICAgICAgICAgYXNzZXJ0X2VxdWFs cyhhY3R1YWxMaW5lSXRlbS5yZWN1cnJpbmdQYXltZW50SW50ZXJ2YWxDb3VudCwgZXhwZWN0ZWRB ZGRpdGlvbmFsTGluZUl0ZW0ucmVjdXJyaW5nUGF5bWVudEludGVydmFsQ291bnQsIGBjaGVjayB0 aGF0IHRoZSBcYHJlY3VycmluZ1BheW1lbnRJbnRlcnZhbENvdW50XGAgbWF0Y2hlcyBmb3IgYWRk aXRpb25hbCBsaW5lIGl0ZW0gJHtpfWApOworICAgICAgICAgICAgYXNzZXJ0X2VxdWFscyhhY3R1 YWxMaW5lSXRlbS5yZWN1cnJpbmdQYXltZW50RW5kRGF0ZT8uZ2V0VGltZSgpLCBleHBlY3RlZEFk ZGl0aW9uYWxMaW5lSXRlbS5yZWN1cnJpbmdQYXltZW50RW5kRGF0ZT8uZ2V0VGltZSgpLCBgY2hl Y2sgdGhhdCB0aGUgXGByZWN1cnJpbmdQYXltZW50RW5kRGF0ZVxgIG1hdGNoZXMgZm9yIGFkZGl0 aW9uYWwgbGluZSBpdGVtICR7aX1gKTsKKyAgICAgICAgICAgIGFzc2VydF9lcXVhbHMoYWN0dWFs TGluZUl0ZW0uZGVmZXJyZWRQYXltZW50RGF0ZT8uZ2V0VGltZSgpLCBleHBlY3RlZEFkZGl0aW9u YWxMaW5lSXRlbS5kZWZlcnJlZFBheW1lbnREYXRlPy5nZXRUaW1lKCksIGBjaGVjayB0aGF0IHRo ZSBcYGRlZmVycmVkUGF5bWVudERhdGVcYCBtYXRjaGVzIGZvciBhZGRpdGlvbmFsIGxpbmUgaXRl bSAke2l9YCk7CisgICAgICAgIH0KKworICAgICAgICBsZXQgYWN0dWFsU2hpcHBpbmdNZXRob2Rz ID0gaW50ZXJuYWxzLm1vY2tQYXltZW50Q29vcmRpbmF0b3Iuc2hpcHBpbmdNZXRob2RzOworICAg ICAgICBhc3NlcnRfZ3JlYXRlcl90aGFuX2VxdWFsKGFjdHVhbFNoaXBwaW5nTWV0aG9kcy5sZW5n dGgsIGV4cGVjdGVkQWRkaXRpb25hbFNoaXBwaW5nTWV0aG9kcy5sZW5ndGgsIGBjaGVjayB0aGF0 IHRoZXJlIGFyZSBhdCBsZWFzdCAke2V4cGVjdGVkQWRkaXRpb25hbFNoaXBwaW5nTWV0aG9kcy5s ZW5ndGh9IHNoaXBwaW5nIG1ldGhvZHNgKTsKKyAgICAgICAgZm9yIChsZXQgaSA9IDA7IGkgPCBl eHBlY3RlZEFkZGl0aW9uYWxTaGlwcGluZ01ldGhvZHMubGVuZ3RoOyArK2kpIHsKKyAgICAgICAg ICAgIGxldCBhY3R1YWxTaGlwcGluZ01ldGhvZCA9IGFjdHVhbFNoaXBwaW5nTWV0aG9kc1thY3R1 YWxTaGlwcGluZ01ldGhvZHMubGVuZ3RoIC0gZXhwZWN0ZWRBZGRpdGlvbmFsU2hpcHBpbmdNZXRo b2RzLmxlbmd0aCArIGldOworICAgICAgICAgICAgbGV0IGV4cGVjdGVkQWRkaXRpb25hbFNoaXBw aW5nTWV0aG9kID0gZXhwZWN0ZWRBZGRpdGlvbmFsU2hpcHBpbmdNZXRob2RzW2ldOworCisgICAg ICAgICAgICBhc3NlcnRfZXF1YWxzKGFjdHVhbFNoaXBwaW5nTWV0aG9kLmFtb3VudCwgZXhwZWN0 ZWRBZGRpdGlvbmFsU2hpcHBpbmdNZXRob2QuYW1vdW50LCBgY2hlY2sgdGhhdCB0aGUgXGBhbW91 bnRcYCBtYXRjaGVzIGZvciBhZGRpdGlvbmFsIHNoaXBwaW5nIG1ldGhvZCAke2l9YCk7CisgICAg ICAgICAgICBhc3NlcnRfZXF1YWxzKGFjdHVhbFNoaXBwaW5nTWV0aG9kLmRldGFpbCwgZXhwZWN0 ZWRBZGRpdGlvbmFsU2hpcHBpbmdNZXRob2QuZGV0YWlsLCBgY2hlY2sgdGhhdCB0aGUgXGBkZXRh aWxcYCBtYXRjaGVzIGZvciBhZGRpdGlvbmFsIHNoaXBwaW5nIG1ldGhvZCAke2l9YCk7CisgICAg ICAgICAgICBhc3NlcnRfZXF1YWxzKGFjdHVhbFNoaXBwaW5nTWV0aG9kLmlkZW50aWZpZXIsIGV4 cGVjdGVkQWRkaXRpb25hbFNoaXBwaW5nTWV0aG9kLmlkZW50aWZpZXIsIGBjaGVjayB0aGF0IHRo ZSBcYGlkZW50aWZpZXJcYCBtYXRjaGVzIGZvciBhZGRpdGlvbmFsIHNoaXBwaW5nIG1ldGhvZCAk e2l9YCk7CisgICAgICAgICAgICBhc3NlcnRfZXF1YWxzKGFjdHVhbFNoaXBwaW5nTWV0aG9kLmxh YmVsLCBleHBlY3RlZEFkZGl0aW9uYWxTaGlwcGluZ01ldGhvZC5sYWJlbCwgYGNoZWNrIHRoYXQg dGhlIFxgbGFiZWxcYCBtYXRjaGVzIGZvciBhZGRpdGlvbmFsIHNoaXBwaW5nIG1ldGhvZCAke2l9 YCk7CisgICAgICAgICAgICBpZiAoZXhwZWN0ZWRBZGRpdGlvbmFsU2hpcHBpbmdNZXRob2QuZGF0 ZUNvbXBvbmVudHNSYW5nZSkKKyAgICAgICAgICAgICAgICBhc3NlcnRfb2JqZWN0X2VxdWFscyhh Y3R1YWxTaGlwcGluZ01ldGhvZC5kYXRlQ29tcG9uZW50c1JhbmdlLCBleHBlY3RlZEFkZGl0aW9u YWxTaGlwcGluZ01ldGhvZC5kYXRlQ29tcG9uZW50c1JhbmdlLCBgY2hlY2sgdGhhdCB0aGUgXGBk YXRlQ29tcG9uZW50c1JhbmdlXGAgbWF0Y2hlcyBmb3IgYWRkaXRpb25hbCBzaGlwcGluZyBtZXRo b2QgJHtpfWApOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIGFzc2VydF9lcXVh bHMoYWN0dWFsU2hpcHBpbmdNZXRob2QuZGF0ZUNvbXBvbmVudHNSYW5nZSwgZXhwZWN0ZWRBZGRp dGlvbmFsU2hpcHBpbmdNZXRob2QuZGF0ZUNvbXBvbmVudHNSYW5nZSwgYGNoZWNrIHRoYXQgdGhl IFxgZGF0ZUNvbXBvbmVudHNSYW5nZVxgIG1hdGNoZXMgZm9yIGFkZGl0aW9uYWwgc2hpcHBpbmcg bWV0aG9kICR7aX1gKTsKKyAgICAgICAgfQorCisgICAgICAgIGF3YWl0IHJlc3BvbnNlLmNvbXBs ZXRlKCJzdWNjZXNzIik7CisgICAgfSwgZGVzY3JpcHRpb24pOworfQorCit0ZXN0UGF5bWVudFNo aXBwaW5nT3B0aW9uRGF0YSgiU2hvdWxkIGhhdmUgYWxsIGFkZGl0aW9uYWwgbGluZSBpdGVtcyBh bmQgc2hpcHBpbmcgb3B0aW9ucyBpZiBgcGF5bWVudE1ldGhvZFR5cGVgIGlzIG5vdCBwcm92aWRl ZC4iLCB7CisgICAgcGF5bWVudE1ldGhvZFR5cGU6IHVuZGVmaW5lZCwKKyAgICBleHBlY3RlZEFk ZGl0aW9uYWxMaW5lSXRlbXM6IFsgXSwKKyAgICBleHBlY3RlZEFkZGl0aW9uYWxTaGlwcGluZ01l dGhvZHM6IFsgXSwKK30pOwordGVzdFBheW1lbnRTaGlwcGluZ09wdGlvbkRhdGEoIlNob3VsZCBu b3QgaGF2ZSBhbnkgYWRkaXRpb25hbCBsaW5lIGl0ZW1zIG9yIHNoaXBwaW5nIG9wdGlvbnMgaWYg YSBub24tbWF0Y2hpbmcgYHBheW1lbnRNZXRob2RUeXBlYCBpcyBwcm92aWRlZCBhbmQgdGhlIHVz ZXIgaGFzIG5vdCBjaG9zZW4gYSBwYXltZW50IG1ldGhvZCB0eXBlIHlldC4iLCB7CisgICAgc2lt dWxhdGVQYXltZW50TWV0aG9kQ2hhbmdlOiBmYWxzZSwKKyAgICBwYXltZW50TWV0aG9kVHlwZTog ImNyZWRpdCIsCisgICAgZXhwZWN0ZWRBZGRpdGlvbmFsTGluZUl0ZW1zOiBbIF0sCisgICAgZXhw ZWN0ZWRBZGRpdGlvbmFsU2hpcHBpbmdNZXRob2RzOiBbIF0sCit9KTsKK3Rlc3RQYXltZW50U2hp cHBpbmdPcHRpb25EYXRhKCJTaG91bGQgbm90IGhhdmUgYW55IGFkZGl0aW9uYWwgbGluZSBpdGVt cyBvciBzaGlwcGluZyBvcHRpb25zIGlmIGBwYXltZW50TWV0aG9kVHlwZWAgaXMgcHJvdmlkZWQg YW5kIHRoZSB1c2VyIGNob3NlIGEgbm9uLW1hdGNoaW5nIHBheW1lbnQgbWV0aG9kIHR5cGUuIiwg eworICAgIHNpbXVsYXRlUGF5bWVudE1ldGhvZENoYW5nZTogdHJ1ZSwKKyAgICBwYXltZW50TWV0 aG9kVHlwZTogImNyZWRpdCIsCisgICAgZXhwZWN0ZWRBZGRpdGlvbmFsTGluZUl0ZW1zOiBbIF0s CisgICAgZXhwZWN0ZWRBZGRpdGlvbmFsU2hpcHBpbmdNZXRob2RzOiBbIF0sCit9KTsKK3Rlc3RQ YXltZW50U2hpcHBpbmdPcHRpb25EYXRhKCJTaG91bGQgbm90IGhhdmUgYW55IGFkZGl0aW9uYWwg bGluZSBpdGVtcyBvciBzaGlwcGluZyBvcHRpb25zIGlmIGEgbWF0Y2hpbmcgYHBheW1lbnRNZXRo b2RUeXBlYCBpcyBwcm92aWRlZCBhbmQgdGhlIHVzZXIgaGFzIG5vdCBjaG9zZW4gYSBwYXltZW50 IG1ldGhvZCB0eXBlIHlldC4iLCB7CisgICAgc2ltdWxhdGVQYXltZW50TWV0aG9kQ2hhbmdlOiBm YWxzZSwKKyAgICBwYXltZW50TWV0aG9kVHlwZTogImRlYml0IiwKKyAgICBleHBlY3RlZEFkZGl0 aW9uYWxMaW5lSXRlbXM6IFsgXSwKKyAgICBleHBlY3RlZEFkZGl0aW9uYWxTaGlwcGluZ01ldGhv ZHM6IFsgXSwKK30pOwordGVzdFBheW1lbnRTaGlwcGluZ09wdGlvbkRhdGEoIlNob3VsZCBoYXZl IGFsbCBhZGRpdGlvbmFsIGxpbmUgaXRlbXMgYW5kIHNoaXBwaW5nIG9wdGlvbnMgaWYgYHBheW1l bnRNZXRob2RUeXBlYCBpcyBwcm92aWRlZCBhbmQgdGhlIHVzZXIgY2hvc2UgYSBtYXRjaGluZyBw YXltZW50IG1ldGhvZCB0eXBlLiIsIHsKKyAgICBzaW11bGF0ZVBheW1lbnRNZXRob2RDaGFuZ2U6 IHRydWUsCisgICAgcGF5bWVudE1ldGhvZFR5cGU6ICJkZWJpdCIsCisgICAgZXhwZWN0ZWRBZGRp dGlvbmFsTGluZUl0ZW1zOiBbIGxpbmVJdGVtIF0sCisgICAgZXhwZWN0ZWRBZGRpdGlvbmFsU2hp cHBpbmdNZXRob2RzOiBbIHNoaXBwaW5nTWV0aG9kIF0sCit9KTsKKworZG9uZSgpOworPC9zY3Jp cHQ+CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy0xNC13azIvVGVzdEV4 cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy0xNC13azIvVGVzdEV4cGVjdGF0 aW9ucwppbmRleCA4ZTgwNmU1NTRjNjA4MjBlM2RjNGQxYWY0MTBiODk2MjQ5ZTZiY2JmLi45ZGRm NjU1NjE0Y2M5M2RkNTQ4MmEwOTEzOTc2ZWQyOTE5NTU0ZGZkIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9pb3MtMTQtd2syL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVz dHMvcGxhdGZvcm0vaW9zLTE0LXdrMi9UZXN0RXhwZWN0YXRpb25zCkBAIC03LDQgKzcsNiBAQCBm YXN0L2ltYWdlcy90ZXh0LXJlY29nbml0aW9uL2lvcyBbIFNraXAgXQogZmFzdC9pbWFnZXMvdGV4 dC1yZWNvZ25pdGlvbi9tYWMgWyBTa2lwIF0KIAogIyBBY2Nlc3NpYmlsaXR5IHRleHQgcmVjb2du aXRpb24gc3VwcG9ydCB0ZXN0cy4KLWFjY2Vzc2liaWxpdHkvaW9zLXNpbXVsYXRvci9pbWFnZS1v dmVybGF5LWVsZW1lbnRzLmh0bWwgWyBTa2lwIF0KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxl CithY2Nlc3NpYmlsaXR5L2lvcy1zaW11bGF0b3IvaW1hZ2Utb3ZlcmxheS1lbGVtZW50cy5odG1s IFsgU2tpcCBdCisKK2h0dHAvdGVzdHMvcGF5bWVudHJlcXVlc3QvQXBwbGVQYXlNb2RpZmllci1w YXltZW50TWV0aG9kVHlwZS5odHRwcy5odG1sIFsgU2tpcCBdCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9tYWMtYmlnc3VyLXdrMi9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjLWJpZ3N1ci13azIvVGVzdEV4cGVjdGF0aW9ucwpuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5h YjIxNjQxNThjOGM5M2YwZDk4YTZjYjI1NjczOTQ1YjFkODU2MzkxCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLWJpZ3N1ci13azIvVGVzdEV4cGVjdGF0aW9ucwpA QCAtMCwwICsxIEBACitodHRwL3Rlc3RzL3BheW1lbnRyZXF1ZXN0L0FwcGxlUGF5TW9kaWZpZXIt cGF5bWVudE1ldGhvZFR5cGUuaHR0cHMuaHRtbCBbIFNraXAgXQo=