221926 2021-02-15 14:28:46 -0800 Style::Resolver::styleForKeyframe() should take in the parent style 2021-02-16 00:57:13 -0800 1 1 1 Unclassified WebKit Animations WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 221931 1 graouts graouts changseok darin dino esprehn+autocc ews-watchlist glenn graouts koivisto kondapallykalyan pdr webkit-bug-importer oldest_to_newest 1729377 0 graouts 2021-02-15 14:28:46 -0800 Style::Resolver::styleForKeyframe() should take in the parent style 1729383 1 420373 graouts 2021-02-15 14:33:46 -0800 Created attachment 420373 Patch 1729395 2 420377 graouts 2021-02-15 14:47:23 -0800 Created attachment 420377 Patch 1729578 3 ews-feeder 2021-02-16 00:56:56 -0800 Committed r272898: <https://commits.webkit.org/r272898> All reviewed patches have been landed. Closing bug and clearing flags on attachment 420377. 1729579 4 webkit-bug-importer 2021-02-16 00:57:13 -0800 <rdar://problem/74383030> 420373 2021-02-15 14:33:46 -0800 2021-02-15 14:47:19 -0800 Patch bug-221926-20210215233345.patch text/plain 23639 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyODMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWRmZDJjZjM3ZjgzZDU5 ZjYyNzk4MzVhYjBkMmYyZWZjMWYxMDQ3NS4uNWRlYjNhNGIyMzJhMWNjM2U4YjU1YWEwMmY5MWI5 ODkyZWQ1NzdjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ1IEBACisyMDIxLTAyLTE1ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgorCisgICAgICAgIFN0eWxlOjpSZXNvbHZl cjo6c3R5bGVGb3JLZXlmcmFtZSgpIHNob3VsZCB0YWtlIGluIHRoZSBwYXJlbnQgc3R5bGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTkyNgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZHJlc3MgdGhl IEZJWE1FIGluIFN0eWxlOjpUcmVlUmVzb2x2ZXI6OmNyZWF0ZUFuaW1hdGVkRWxlbWVudFVwZGF0 ZSgpIHN1Y2ggdGhhdCB0aGUgcGFyZW50CisgICAgICAgIHN0eWxlIGlzIHBhc3NlZCBhbGwgdGhl IHdheSBmcm9tIHRoYXQgZnVuY3Rpb24gZG93biB0byBTdHlsZTo6UmVzb2x2ZXI6OnN0eWxlRm9y S2V5ZnJhbWUoKQorICAgICAgICByZW1vdmluZyB0aGUgbmVlZCBmb3IgU3R5bGU6OlJlc29sdmVy OjpzZXRQYXJlbnRFbGVtZW50U3R5bGVGb3JLZXlmcmFtZXMoKS4KKworICAgICAgICBUaGlzIGlz IGEgcmVmYWN0b3JpbmcgY2hhbmdlIG9ubHkgd2hpY2ggc2hvdWxkIG5vdCBoYXZlIHNob3cgYW55 IGJlaGF2aW9yIGNoYW5nZSwgc28gdGhlcmUKKyAgICAgICAgaXMgbm8gbmV3IHRlc3QuCisKKyAg ICAgICAgKiBhbmltYXRpb24vQW5pbWF0aW9uVGltZWxpbmUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6QW5pbWF0aW9uVGltZWxpbmU6OnVwZGF0ZUNTU0FuaW1hdGlvbnNGb3JTdHlsZWFibGUpOgor ICAgICAgICAqIGFuaW1hdGlvbi9BbmltYXRpb25UaW1lbGluZS5oOgorICAgICAgICAqIGFuaW1h dGlvbi9DU1NBbmltYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTQW5pbWF0aW9uOjpj cmVhdGUpOgorICAgICAgICAqIGFuaW1hdGlvbi9DU1NBbmltYXRpb24uaDoKKyAgICAgICAgKiBh bmltYXRpb24vQ1NTVHJhbnNpdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NUcmFuc2l0 aW9uOjpjcmVhdGUpOgorICAgICAgICAqIGFuaW1hdGlvbi9EZWNsYXJhdGl2ZUFuaW1hdGlvbi5j cHA6CisgICAgICAgIChXZWJDb3JlOjpEZWNsYXJhdGl2ZUFuaW1hdGlvbjo6aW5pdGlhbGl6ZSk6 CisgICAgICAgICogYW5pbWF0aW9uL0RlY2xhcmF0aXZlQW5pbWF0aW9uLmg6CisgICAgICAgICog YW5pbWF0aW9uL0tleWZyYW1lRWZmZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1l RWZmZWN0Ojp1cGRhdGVCbGVuZGluZ0tleWZyYW1lcyk6CisgICAgICAgIChXZWJDb3JlOjpLZXlm cmFtZUVmZmVjdDo6Y29tcHV0ZURlY2xhcmF0aXZlQW5pbWF0aW9uQmxlbmRpbmdLZXlmcmFtZXMp OgorICAgICAgICAoV2ViQ29yZTo6S2V5ZnJhbWVFZmZlY3Q6OmNvbXB1dGVDU1NBbmltYXRpb25C bGVuZGluZ0tleWZyYW1lcyk6CisgICAgICAgIChXZWJDb3JlOjpLZXlmcmFtZUVmZmVjdDo6YXBw bHlQZW5kaW5nQWNjZWxlcmF0ZWRBY3Rpb25zKToKKyAgICAgICAgKiBhbmltYXRpb24vS2V5ZnJh bWVFZmZlY3QuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvS2V5ZnJhbWVMaXN0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1lTGlzdDo6ZmlsbEltcGxpY2l0S2V5ZnJhbWVzKToK KyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvS2V5ZnJhbWVMaXN0Lmg6CisgICAgICAgICogc3R5 bGUvU3R5bGVSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UmVzb2x2ZXI6 OnN0eWxlRm9yS2V5ZnJhbWUpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlJlc29sdmVyOjpr ZXlmcmFtZVN0eWxlc0ZvckFuaW1hdGlvbik6CisgICAgICAgICogc3R5bGUvU3R5bGVSZXNvbHZl ci5oOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlJlc29sdmVyOjpzZXRQYXJlbnRFbGVtZW50 U3R5bGVGb3JLZXlmcmFtZXMpOiBEZWxldGVkLgorICAgICAgICAqIHN0eWxlL1N0eWxlVHJlZVJl c29sdmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpUcmVlUmVzb2x2ZXI6OmNyZWF0 ZUFuaW1hdGVkRWxlbWVudFVwZGF0ZSk6CisKIDIwMjEtMDItMTIgIEplciBOb2JsZSAgPGplci5u b2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgW01hY10gU291bmQgZG9lcyBub3QgcGxheSBvbiBZ b3VUdWJlIGFmdGVyIHN3aXRjaGluZyBiYWNrIHRvIGZvcmVncm91bmQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9BbmltYXRpb25UaW1lbGluZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9hbmltYXRpb24vQW5pbWF0aW9uVGltZWxpbmUuY3BwCmluZGV4IDI3ZGViMDVlMjI1ODdl NTc0ZmE4M2M4ZjUxMWQyNDFhM2FmYjIwODMuLmIwYWE5MGE2N2RlZDNkNTIzZmE3M2I4OGIzMjYw ZjFlMWJlYWU1ZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9BbmltYXRp b25UaW1lbGluZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0FuaW1hdGlvblRp bWVsaW5lLmNwcApAQCAtMjAwLDcgKzIwMCw3IEBAIHN0YXRpYyBib29sIHNob3VsZENvbnNpZGVy QW5pbWF0aW9uKEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IEFuaW1hdGlvbiYgYW5pbWF0aW9uCiAg ICAgcmV0dXJuIGZhbHNlOwogfQogCi12b2lkIEFuaW1hdGlvblRpbWVsaW5lOjp1cGRhdGVDU1NB bmltYXRpb25zRm9yU3R5bGVhYmxlKGNvbnN0IFN0eWxlYWJsZSYgc3R5bGVhYmxlLCBjb25zdCBS ZW5kZXJTdHlsZSogY3VycmVudFN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSYgbmV3U3R5bGUpCit2 b2lkIEFuaW1hdGlvblRpbWVsaW5lOjp1cGRhdGVDU1NBbmltYXRpb25zRm9yU3R5bGVhYmxlKGNv bnN0IFN0eWxlYWJsZSYgc3R5bGVhYmxlLCBjb25zdCBSZW5kZXJTdHlsZSogY3VycmVudFN0eWxl LCBjb25zdCBSZW5kZXJTdHlsZSYgbmV3U3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlKiBwYXJlbnRF bGVtZW50U3R5bGUpCiB7CiAgICAgYXV0byYga2V5ZnJhbWVFZmZlY3RTdGFjayA9IHN0eWxlYWJs ZS5lbnN1cmVLZXlmcmFtZUVmZmVjdFN0YWNrKCk7CiAKQEAgLTI1MCw3ICsyNTAsNyBAQCB2b2lk IEFuaW1hdGlvblRpbWVsaW5lOjp1cGRhdGVDU1NBbmltYXRpb25zRm9yU3R5bGVhYmxlKGNvbnN0 IFN0eWxlYWJsZSYgc3R5bGVhYgogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBpZiAoIWZv dW5kTWF0Y2hpbmdBbmltYXRpb24pCi0gICAgICAgICAgICAgICAgbmV3QW5pbWF0aW9ucy5hZGQo Q1NTQW5pbWF0aW9uOjpjcmVhdGUoc3R5bGVhYmxlLCBjdXJyZW50QW5pbWF0aW9uLCBjdXJyZW50 U3R5bGUsIG5ld1N0eWxlKSk7CisgICAgICAgICAgICAgICAgbmV3QW5pbWF0aW9ucy5hZGQoQ1NT QW5pbWF0aW9uOjpjcmVhdGUoc3R5bGVhYmxlLCBjdXJyZW50QW5pbWF0aW9uLCBjdXJyZW50U3R5 bGUsIG5ld1N0eWxlLCBwYXJlbnRFbGVtZW50U3R5bGUpKTsKICAgICAgICAgfQogICAgIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0FuaW1hdGlvblRpbWVsaW5lLmgg Yi9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQW5pbWF0aW9uVGltZWxpbmUuaAppbmRleCBiZTJm NmMxNWI1MDc5NzgwZjk2ZWRiOGViMzgxZDEyZjIyZTNhMzhkLi40N2ZmN2NlYTJkOGEyZGVhOTlj MWQ5NDc2ZTJhMjJhMDdiNDZkMzczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRp b24vQW5pbWF0aW9uVGltZWxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQW5p bWF0aW9uVGltZWxpbmUuaApAQCAtNzEsNyArNzEsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHJl bW92ZURlY2xhcmF0aXZlQW5pbWF0aW9uRnJvbUxpc3RzRm9yT3duaW5nRWxlbWVudChXZWJBbmlt YXRpb24mLCBjb25zdCBTdHlsZWFibGUmKTsKIAotICAgIHZvaWQgdXBkYXRlQ1NTQW5pbWF0aW9u c0ZvclN0eWxlYWJsZShjb25zdCBTdHlsZWFibGUmLCBjb25zdCBSZW5kZXJTdHlsZSogY3VycmVu dFN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSYgYWZ0ZXJDaGFuZ2VTdHlsZSk7CisgICAgdm9pZCB1 cGRhdGVDU1NBbmltYXRpb25zRm9yU3R5bGVhYmxlKGNvbnN0IFN0eWxlYWJsZSYsIGNvbnN0IFJl bmRlclN0eWxlKiBjdXJyZW50U3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlJiBhZnRlckNoYW5nZVN0 eWxlLCBjb25zdCBSZW5kZXJTdHlsZSogcGFyZW50RWxlbWVudFN0eWxlKTsKICAgICB2b2lkIHVw ZGF0ZUNTU1RyYW5zaXRpb25zRm9yU3R5bGVhYmxlKGNvbnN0IFN0eWxlYWJsZSYsIGNvbnN0IFJl bmRlclN0eWxlJiBjdXJyZW50U3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlJiBuZXdTdHlsZSk7CiAK IHByb3RlY3RlZDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9DU1NBbmlt YXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0NTU0FuaW1hdGlvbi5jcHAKaW5k ZXggYzkwZGQxYjk5NjI1MGI0ZWFjOGQ5MmQ2MjczM2JhZjVjYTc4YWE4NS4uMThjYzAzZDQ4OGJh YWI1MzY3MzYxMmNjZDVjYjU5NGZiMWFmZTc2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YW5pbWF0aW9uL0NTU0FuaW1hdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9u L0NTU0FuaW1hdGlvbi5jcHAKQEAgLTM2LDEwICszNiwxMCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKIFdURl9NQUtFX0lTT19BTExPQ0FURURfSU1QTChDU1NBbmltYXRpb24pOwogCi1SZWY8Q1NT QW5pbWF0aW9uPiBDU1NBbmltYXRpb246OmNyZWF0ZShjb25zdCBTdHlsZWFibGUmIG93bmluZ0Vs ZW1lbnQsIGNvbnN0IEFuaW1hdGlvbiYgYmFja2luZ0FuaW1hdGlvbiwgY29uc3QgUmVuZGVyU3R5 bGUqIG9sZFN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSYgbmV3U3R5bGUpCitSZWY8Q1NTQW5pbWF0 aW9uPiBDU1NBbmltYXRpb246OmNyZWF0ZShjb25zdCBTdHlsZWFibGUmIG93bmluZ0VsZW1lbnQs IGNvbnN0IEFuaW1hdGlvbiYgYmFja2luZ0FuaW1hdGlvbiwgY29uc3QgUmVuZGVyU3R5bGUqIG9s ZFN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSYgbmV3U3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlKiBw YXJlbnRFbGVtZW50U3R5bGUpCiB7CiAgICAgYXV0byByZXN1bHQgPSBhZG9wdFJlZigqbmV3IENT U0FuaW1hdGlvbihvd25pbmdFbGVtZW50LCBiYWNraW5nQW5pbWF0aW9uKSk7Ci0gICAgcmVzdWx0 LT5pbml0aWFsaXplKG9sZFN0eWxlLCBuZXdTdHlsZSk7CisgICAgcmVzdWx0LT5pbml0aWFsaXpl KG9sZFN0eWxlLCBuZXdTdHlsZSwgcGFyZW50RWxlbWVudFN0eWxlKTsKIAogICAgIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6ZGlkQ3JlYXRlV2ViQW5pbWF0aW9uKHJlc3VsdC5nZXQoKSk7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9DU1NBbmltYXRpb24uaCBiL1Nv dXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9DU1NBbmltYXRpb24uaAppbmRleCAyYzA1YWI1NWFkZWQx YzYxYTc2N2ZkODk0Mzg4OWIzOTg2NzE3NmRlLi5hZmM5NWY1MzEzNjY1MTM1NDQ4OTFkN2RmNGIw N2NhYTQ2N2MzM2YyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQ1NTQW5p bWF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0NTU0FuaW1hdGlvbi5oCkBA IC0zOCw3ICszOCw3IEBAIGNsYXNzIFJlbmRlclN0eWxlOwogY2xhc3MgQ1NTQW5pbWF0aW9uIGZp bmFsIDogcHVibGljIERlY2xhcmF0aXZlQW5pbWF0aW9uIHsKICAgICBXVEZfTUFLRV9JU09fQUxM T0NBVEVEKENTU0FuaW1hdGlvbik7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFJlZjxDU1NBbmltYXRp b24+IGNyZWF0ZShjb25zdCBTdHlsZWFibGUmLCBjb25zdCBBbmltYXRpb24mLCBjb25zdCBSZW5k ZXJTdHlsZSogb2xkU3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlJiBuZXdTdHlsZSk7CisgICAgc3Rh dGljIFJlZjxDU1NBbmltYXRpb24+IGNyZWF0ZShjb25zdCBTdHlsZWFibGUmLCBjb25zdCBBbmlt YXRpb24mLCBjb25zdCBSZW5kZXJTdHlsZSogb2xkU3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlJiBu ZXdTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUqIHBhcmVudEVsZW1lbnRTdHlsZSk7CiAgICAgfkNT U0FuaW1hdGlvbigpID0gZGVmYXVsdDsKIAogICAgIGJvb2wgaXNDU1NBbmltYXRpb24oKSBjb25z dCBvdmVycmlkZSB7IHJldHVybiB0cnVlOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9h bmltYXRpb24vQ1NTVHJhbnNpdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQ1NT VHJhbnNpdGlvbi5jcHAKaW5kZXggOWU2MDYwOTFjMTg4OWViNzhhYWUxODk2ZmQwYzE1NDU0M2Y2 OWVkZS4uNTAwNzAxOGU2NWRkODAyM2EzNTMwNDcwMDcwODljZWQ0OGRjZTM4ZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0NTU1RyYW5zaXRpb24uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2FuaW1hdGlvbi9DU1NUcmFuc2l0aW9uLmNwcApAQCAtNDEsNyArNDEsNyBAQCBS ZWY8Q1NTVHJhbnNpdGlvbj4gQ1NTVHJhbnNpdGlvbjo6Y3JlYXRlKGNvbnN0IFN0eWxlYWJsZSYg b3duaW5nRWxlbWVudCwgQ1NTUHJvcAogewogICAgIEFTU0VSVChvbGRTdHlsZSk7CiAgICAgYXV0 byByZXN1bHQgPSBhZG9wdFJlZigqbmV3IENTU1RyYW5zaXRpb24ob3duaW5nRWxlbWVudCwgcHJv cGVydHksIGdlbmVyYXRpb25UaW1lLCBiYWNraW5nQW5pbWF0aW9uLCAqb2xkU3R5bGUsIG5ld1N0 eWxlLCByZXZlcnNpbmdBZGp1c3RlZFN0YXJ0U3R5bGUsIHJldmVyc2luZ1Nob3J0ZW5pbmdGYWN0 b3IpKTsKLSAgICByZXN1bHQtPmluaXRpYWxpemUob2xkU3R5bGUsIG5ld1N0eWxlKTsKKyAgICBy ZXN1bHQtPmluaXRpYWxpemUob2xkU3R5bGUsIG5ld1N0eWxlLCBudWxscHRyKTsKICAgICByZXN1 bHQtPnNldFRpbWluZ1Byb3BlcnRpZXMoZGVsYXksIGR1cmF0aW9uKTsKIAogICAgIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6ZGlkQ3JlYXRlV2ViQW5pbWF0aW9uKHJlc3VsdC5nZXQoKSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vRGVjbGFyYXRpdmVBbmltYXRpb24u Y3BwIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0RlY2xhcmF0aXZlQW5pbWF0aW9uLmNwcApp bmRleCBkOGRkOGY1YzM3MDYxMjYxNzhkY2MzZjFiN2EzMzg3MTJhMDdlM2MwLi42NjM2ZmI1NjNk MGE0YjMzNGY1MmE5MTY1ODYxM2RiYjliNGE5OTQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9hbmltYXRpb24vRGVjbGFyYXRpdmVBbmltYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2FuaW1hdGlvbi9EZWNsYXJhdGl2ZUFuaW1hdGlvbi5jcHAKQEAgLTEwNiw3ICsxMDYsNyBAQCB2 b2lkIERlY2xhcmF0aXZlQW5pbWF0aW9uOjpzZXRCYWNraW5nQW5pbWF0aW9uKGNvbnN0IEFuaW1h dGlvbiYgYmFja2luZ0FuaW1hdGlvbgogICAgIHN5bmNQcm9wZXJ0aWVzV2l0aEJhY2tpbmdBbmlt YXRpb24oKTsKIH0KIAotdm9pZCBEZWNsYXJhdGl2ZUFuaW1hdGlvbjo6aW5pdGlhbGl6ZShjb25z dCBSZW5kZXJTdHlsZSogb2xkU3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlJiBuZXdTdHlsZSkKK3Zv aWQgRGVjbGFyYXRpdmVBbmltYXRpb246OmluaXRpYWxpemUoY29uc3QgUmVuZGVyU3R5bGUqIG9s ZFN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSYgbmV3U3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlKiBw YXJlbnRFbGVtZW50U3R5bGUpCiB7CiAgICAgLy8gV2UgbmVlZCB0byBzdXNwZW5kIGludmFsaWRh dGlvbiBvZiB0aGUgYW5pbWF0aW9uJ3Mga2V5ZnJhbWUgZWZmZWN0IGR1cmluZyBpdHMgY3JlYXRp b24KICAgICAvLyBhcyBpdCB3b3VsZCBvdGhlcndpc2UgdHJpZ2dlciBpbnZhbGlkYXRpb24gb2Yg dGhlIGRvY3VtZW50J3Mgc3R5bGUgYW5kIHRoaXMgd291bGQgYmUKQEAgLTExNyw3ICsxMTcsNyBA QCB2b2lkIERlY2xhcmF0aXZlQW5pbWF0aW9uOjppbml0aWFsaXplKGNvbnN0IFJlbmRlclN0eWxl KiBvbGRTdHlsZSwgY29uc3QgUmVuZGVyUwogCiAgICAgc2V0RWZmZWN0KEtleWZyYW1lRWZmZWN0 OjpjcmVhdGUoKm1fb3duaW5nRWxlbWVudCwgbV9vd25pbmdQc2V1ZG9JZCkpOwogICAgIHNldFRp bWVsaW5lKCZtX293bmluZ0VsZW1lbnQtPmRvY3VtZW50KCkudGltZWxpbmUoKSk7Ci0gICAgZG93 bmNhc3Q8S2V5ZnJhbWVFZmZlY3Q+KGVmZmVjdCgpKS0+Y29tcHV0ZURlY2xhcmF0aXZlQW5pbWF0 aW9uQmxlbmRpbmdLZXlmcmFtZXMob2xkU3R5bGUsIG5ld1N0eWxlKTsKKyAgICBkb3duY2FzdDxL ZXlmcmFtZUVmZmVjdD4oZWZmZWN0KCkpLT5jb21wdXRlRGVjbGFyYXRpdmVBbmltYXRpb25CbGVu ZGluZ0tleWZyYW1lcyhvbGRTdHlsZSwgbmV3U3R5bGUsIHBhcmVudEVsZW1lbnRTdHlsZSk7CiAg ICAgc3luY1Byb3BlcnRpZXNXaXRoQmFja2luZ0FuaW1hdGlvbigpOwogICAgIGlmIChiYWNraW5n QW5pbWF0aW9uKCkucGxheVN0YXRlKCkgPT0gQW5pbWF0aW9uUGxheVN0YXRlOjpQbGF5aW5nKQog ICAgICAgICBwbGF5KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vRGVj bGFyYXRpdmVBbmltYXRpb24uaCBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9EZWNsYXJhdGl2 ZUFuaW1hdGlvbi5oCmluZGV4IDMxYzRmNjUzMzk3YWI4OGQ3MzViNWMyZGFhYWFiMWNjYjNlZDgz NmUuLjY5NWNkZjczYWIyY2U4MDM0MTkzYmM5M2EyODUwZDc5MTg0ODkyMDIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9EZWNsYXJhdGl2ZUFuaW1hdGlvbi5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9EZWNsYXJhdGl2ZUFuaW1hdGlvbi5oCkBAIC03NSw3ICs3 NSw3IEBAIHB1YmxpYzoKIHByb3RlY3RlZDoKICAgICBEZWNsYXJhdGl2ZUFuaW1hdGlvbihjb25z dCBTdHlsZWFibGUmLCBjb25zdCBBbmltYXRpb24mKTsKIAotICAgIHZpcnR1YWwgdm9pZCBpbml0 aWFsaXplKGNvbnN0IFJlbmRlclN0eWxlKiBvbGRTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUmIG5l d1N0eWxlKTsKKyAgICB2aXJ0dWFsIHZvaWQgaW5pdGlhbGl6ZShjb25zdCBSZW5kZXJTdHlsZSog b2xkU3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlJiBuZXdTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUq IHBhcmVudEVsZW1lbnRTdHlsZSk7CiAgICAgdmlydHVhbCB2b2lkIHN5bmNQcm9wZXJ0aWVzV2l0 aEJhY2tpbmdBbmltYXRpb24oKTsKICAgICAvLyBlbGFwc2VkVGltZSBpcyB0aGUgYW5pbWF0aW9u J3MgY3VycmVudCB0aW1lIGF0IHRoZSB0aW1lIHRoZSBldmVudCBpcyBhZGRlZCBhbmQgaXMgZXhw b3NlZCB0aHJvdWdoIHRoZSBET00gQVBJLCB0aW1lbGluZVRpbWUgaXMgdGhlIGFuaW1hdGlvbnMn CiAgICAgLy8gdGltZWxpbmUgY3VycmVudCB0aW1lIGFuZCBpcyBub3QgZXhwb3NlZCB0aHJvdWdo IHRoZSBET00gQVBJIGJ1dCB1c2VkIGJ5IHRoZSBEb2N1bWVudFRpbWVsaW5lIGZvciBzb3J0aW5n IGV2ZW50cyBiZWZvcmUgZGlzcGF0Y2guIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYW5p bWF0aW9uL0tleWZyYW1lRWZmZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlm cmFtZUVmZmVjdC5jcHAKaW5kZXggZjI5ODJiNDZjZGU3MDJkNWM1OThjM2RhNDQxMWFmN2VjYzk5 ZWFiOC4uOWE5MzMwMjU3MzAxZTljZmNlMmRhOTIxNzQ1NzUzNGFmNzJmMGYzZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0tleWZyYW1lRWZmZWN0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9hbmltYXRpb24vS2V5ZnJhbWVFZmZlY3QuY3BwCkBAIC04MjcsNyArODI3LDcg QEAgdm9pZCBLZXlmcmFtZUVmZmVjdDo6dXBkYXRlQmxlbmRpbmdLZXlmcmFtZXMoUmVuZGVyU3R5 bGUmIGVsZW1lbnRTdHlsZSkKICAgICAgICAgICAgIGtleWZyYW1lTGlzdC5hZGRQcm9wZXJ0eShz dHlsZVByb3BlcnRpZXMtPnByb3BlcnR5QXQoaSkuaWQoKSk7CiAKICAgICAgICAgYXV0byBrZXlm cmFtZVJ1bGUgPSBTdHlsZVJ1bGVLZXlmcmFtZTo6Y3JlYXRlKFdURk1vdmUoc3R5bGVQcm9wZXJ0 aWVzKSk7Ci0gICAgICAgIGtleWZyYW1lVmFsdWUuc2V0U3R5bGUoc3R5bGVSZXNvbHZlci5zdHls ZUZvcktleWZyYW1lKCptX3RhcmdldCwgJmVsZW1lbnRTdHlsZSwga2V5ZnJhbWVSdWxlLnB0cigp LCBrZXlmcmFtZVZhbHVlKSk7CisgICAgICAgIGtleWZyYW1lVmFsdWUuc2V0U3R5bGUoc3R5bGVS ZXNvbHZlci5zdHlsZUZvcktleWZyYW1lKCptX3RhcmdldCwgJmVsZW1lbnRTdHlsZSwgbnVsbHB0 ciwga2V5ZnJhbWVSdWxlLnB0cigpLCBrZXlmcmFtZVZhbHVlKSk7CiAgICAgICAgIGtleWZyYW1l TGlzdC5pbnNlcnQoV1RGTW92ZShrZXlmcmFtZVZhbHVlKSk7CiAgICAgfQogCkBAIC05ODUsMTYg Kzk4NSwxNiBAQCB2b2lkIEtleWZyYW1lRWZmZWN0OjpjaGVja0Zvck1hdGNoaW5nQ29sb3JGaWx0 ZXJGdW5jdGlvbkxpc3RzKCkKICAgICB9KTsKIH0KIAotdm9pZCBLZXlmcmFtZUVmZmVjdDo6Y29t cHV0ZURlY2xhcmF0aXZlQW5pbWF0aW9uQmxlbmRpbmdLZXlmcmFtZXMoY29uc3QgUmVuZGVyU3R5 bGUqIG9sZFN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSYgbmV3U3R5bGUpCit2b2lkIEtleWZyYW1l RWZmZWN0Ojpjb21wdXRlRGVjbGFyYXRpdmVBbmltYXRpb25CbGVuZGluZ0tleWZyYW1lcyhjb25z dCBSZW5kZXJTdHlsZSogb2xkU3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlJiBuZXdTdHlsZSwgY29u c3QgUmVuZGVyU3R5bGUqIHBhcmVudEVsZW1lbnRTdHlsZSkKIHsKICAgICBBU1NFUlQoaXM8RGVj bGFyYXRpdmVBbmltYXRpb24+KGFuaW1hdGlvbigpKSk7CiAgICAgaWYgKGlzPENTU0FuaW1hdGlv bj4oYW5pbWF0aW9uKCkpKQotICAgICAgICBjb21wdXRlQ1NTQW5pbWF0aW9uQmxlbmRpbmdLZXlm cmFtZXMobmV3U3R5bGUpOworICAgICAgICBjb21wdXRlQ1NTQW5pbWF0aW9uQmxlbmRpbmdLZXlm cmFtZXMobmV3U3R5bGUsIHBhcmVudEVsZW1lbnRTdHlsZSk7CiAgICAgZWxzZSBpZiAoaXM8Q1NT VHJhbnNpdGlvbj4oYW5pbWF0aW9uKCkpKQogICAgICAgICBjb21wdXRlQ1NTVHJhbnNpdGlvbkJs ZW5kaW5nS2V5ZnJhbWVzKG9sZFN0eWxlLCBuZXdTdHlsZSk7CiB9CiAKLXZvaWQgS2V5ZnJhbWVF ZmZlY3Q6OmNvbXB1dGVDU1NBbmltYXRpb25CbGVuZGluZ0tleWZyYW1lcyhjb25zdCBSZW5kZXJT dHlsZSYgdW5hbmltYXRlZFN0eWxlKQordm9pZCBLZXlmcmFtZUVmZmVjdDo6Y29tcHV0ZUNTU0Fu aW1hdGlvbkJsZW5kaW5nS2V5ZnJhbWVzKGNvbnN0IFJlbmRlclN0eWxlJiB1bmFuaW1hdGVkU3R5 bGUsIGNvbnN0IFJlbmRlclN0eWxlKiBwYXJlbnRFbGVtZW50U3R5bGUpCiB7CiAgICAgQVNTRVJU KGlzPENTU0FuaW1hdGlvbj4oYW5pbWF0aW9uKCkpKTsKICAgICBBU1NFUlQoZG9jdW1lbnQoKSk7 CkBAIC0xMDA0LDcgKzEwMDQsNyBAQCB2b2lkIEtleWZyYW1lRWZmZWN0Ojpjb21wdXRlQ1NTQW5p bWF0aW9uQmxlbmRpbmdLZXlmcmFtZXMoY29uc3QgUmVuZGVyU3R5bGUmIHVuYQogCiAgICAgS2V5 ZnJhbWVMaXN0IGtleWZyYW1lTGlzdChiYWNraW5nQW5pbWF0aW9uLm5hbWUoKSk7CiAgICAgaWYg KGF1dG8qIHN0eWxlU2NvcGUgPSBTdHlsZTo6U2NvcGU6OmZvck9yZGluYWwoKm1fdGFyZ2V0LCBi YWNraW5nQW5pbWF0aW9uLm5hbWVTdHlsZVNjb3BlT3JkaW5hbCgpKSkKLSAgICAgICAgc3R5bGVT Y29wZS0+cmVzb2x2ZXIoKS5rZXlmcmFtZVN0eWxlc0ZvckFuaW1hdGlvbigqbV90YXJnZXQsICZ1 bmFuaW1hdGVkU3R5bGUsIGtleWZyYW1lTGlzdCk7CisgICAgICAgIHN0eWxlU2NvcGUtPnJlc29s dmVyKCkua2V5ZnJhbWVTdHlsZXNGb3JBbmltYXRpb24oKm1fdGFyZ2V0LCAmdW5hbmltYXRlZFN0 eWxlLCBwYXJlbnRFbGVtZW50U3R5bGUsIGtleWZyYW1lTGlzdCk7CiAKICAgICAvLyBFbnN1cmUg cmVzb3VyY2UgbG9hZHMgZm9yIGFsbCB0aGUgZnJhbWVzLgogICAgIGZvciAoYXV0byYga2V5ZnJh bWUgOiBrZXlmcmFtZUxpc3Qua2V5ZnJhbWVzKCkpIHsKQEAgLTE3MjMsNyArMTcyMyw3IEBAIE9w dGlvblNldDxBY2NlbGVyYXRlZEFjdGlvbkFwcGxpY2F0aW9uUmVzdWx0PiBLZXlmcmFtZUVmZmVj dDo6YXBwbHlQZW5kaW5nQWNjZWxlCiAKICAgICAgICAgS2V5ZnJhbWVMaXN0IGV4cGxpY2l0S2V5 ZnJhbWVzKG1fYmxlbmRpbmdLZXlmcmFtZXMuYW5pbWF0aW9uTmFtZSgpKTsKICAgICAgICAgZXhw bGljaXRLZXlmcmFtZXMuY29weUtleWZyYW1lcyhtX2JsZW5kaW5nS2V5ZnJhbWVzKTsKLSAgICAg ICAgZXhwbGljaXRLZXlmcmFtZXMuZmlsbEltcGxpY2l0S2V5ZnJhbWVzKCptX3RhcmdldCwgbV90 YXJnZXQtPnN0eWxlUmVzb2x2ZXIoKSwgbGFzdFN0eWxlQ2hhbmdlRXZlbnRTdHlsZSk7CisgICAg ICAgIGV4cGxpY2l0S2V5ZnJhbWVzLmZpbGxJbXBsaWNpdEtleWZyYW1lcygqbV90YXJnZXQsIG1f dGFyZ2V0LT5zdHlsZVJlc29sdmVyKCksIGxhc3RTdHlsZUNoYW5nZUV2ZW50U3R5bGUsIG51bGxw dHIpOwogICAgICAgICByZXR1cm4gcmVuZGVyZXItPnN0YXJ0QW5pbWF0aW9uKHRpbWVPZmZzZXQs IGJhY2tpbmdBbmltYXRpb25Gb3JDb21wb3NpdGVkUmVuZGVyZXIoKSwgZXhwbGljaXRLZXlmcmFt ZXMpID8gUnVubmluZ0FjY2VsZXJhdGVkOjpZZXMgOiBSdW5uaW5nQWNjZWxlcmF0ZWQ6Ok5vOwog ICAgIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFtZUVm ZmVjdC5oIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0tleWZyYW1lRWZmZWN0LmgKaW5kZXgg OWVlNGYxOTk1YjQwYjAzODhmNzViMTZmODUyYWQ2NWIyMjY3OTljNS4uNDg2NDljYjA1OWZlNzAw NjgyYjM4NWYxN2NjYTdkMTc4ZjQwOTVhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYW5p bWF0aW9uL0tleWZyYW1lRWZmZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0tl eWZyYW1lRWZmZWN0LmgKQEAgLTE1NCw3ICsxNTQsNyBAQCBwdWJsaWM6CiAjZW5kaWYKICAgICBi b29sIGNvbG9yRmlsdGVyRnVuY3Rpb25MaXN0c01hdGNoKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1 cm4gbV9jb2xvckZpbHRlckZ1bmN0aW9uTGlzdHNNYXRjaDsgfQogCi0gICAgdm9pZCBjb21wdXRl RGVjbGFyYXRpdmVBbmltYXRpb25CbGVuZGluZ0tleWZyYW1lcyhjb25zdCBSZW5kZXJTdHlsZSog b2xkU3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlJiBuZXdTdHlsZSk7CisgICAgdm9pZCBjb21wdXRl RGVjbGFyYXRpdmVBbmltYXRpb25CbGVuZGluZ0tleWZyYW1lcyhjb25zdCBSZW5kZXJTdHlsZSog b2xkU3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlJiBuZXdTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUq IHBhcmVudEVsZW1lbnRTdHlsZSk7CiAgICAgY29uc3QgS2V5ZnJhbWVMaXN0JiBibGVuZGluZ0tl eWZyYW1lcygpIGNvbnN0IHsgcmV0dXJuIG1fYmxlbmRpbmdLZXlmcmFtZXM7IH0KICAgICBjb25z dCBIYXNoU2V0PENTU1Byb3BlcnR5SUQ+JiBhbmltYXRlZFByb3BlcnRpZXMoKSBjb25zdCB7IHJl dHVybiBtX2JsZW5kaW5nS2V5ZnJhbWVzLnByb3BlcnRpZXMoKTsgfQogICAgIGJvb2wgYW5pbWF0 ZXNQcm9wZXJ0eShDU1NQcm9wZXJ0eUlEKSBjb25zdDsKQEAgLTE5OSw3ICsxOTksNyBAQCBwcml2 YXRlOgogICAgIHZvaWQgY29tcHV0ZVNvbWVLZXlmcmFtZXNVc2VTdGVwc1RpbWluZ0Z1bmN0aW9u KCk7CiAgICAgdm9pZCBjbGVhckJsZW5kaW5nS2V5ZnJhbWVzKCk7CiAgICAgdm9pZCB1cGRhdGVC bGVuZGluZ0tleWZyYW1lcyhSZW5kZXJTdHlsZSYpOwotICAgIHZvaWQgY29tcHV0ZUNTU0FuaW1h dGlvbkJsZW5kaW5nS2V5ZnJhbWVzKGNvbnN0IFJlbmRlclN0eWxlJik7CisgICAgdm9pZCBjb21w dXRlQ1NTQW5pbWF0aW9uQmxlbmRpbmdLZXlmcmFtZXMoY29uc3QgUmVuZGVyU3R5bGUmIHVuYW5p bWF0ZWRTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUqIHBhcmVudEVsZW1lbnRTdHlsZSk7CiAgICAg dm9pZCBjb21wdXRlQ1NTVHJhbnNpdGlvbkJsZW5kaW5nS2V5ZnJhbWVzKGNvbnN0IFJlbmRlclN0 eWxlKiBvbGRTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUmIG5ld1N0eWxlKTsKICAgICB2b2lkIGNv bXB1dGVBY2NlbGVyYXRlZFByb3BlcnRpZXNTdGF0ZSgpOwogICAgIHZvaWQgc2V0QmxlbmRpbmdL ZXlmcmFtZXMoS2V5ZnJhbWVMaXN0Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc3R5bGUvS2V5ZnJhbWVMaXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9LZXlmcmFtZUxpc3QuY3BwCmluZGV4IDQyZDE4N2QwNzNhZWEzNmM1N2Q2ZmIyNDlmNGMz N2RjNjhhMTBlNzMuLjFiZDFiN2Y4NjhmNzU0M2I0OWUzNWI2M2NjNWE3YzZkMTJlZjg0MTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9LZXlmcmFtZUxpc3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9LZXlmcmFtZUxpc3QuY3BwCkBA IC0xMTMsMjAgKzExMywyMCBAQCBzdGF0aWMgY29uc3QgU3R5bGVSdWxlS2V5ZnJhbWUmIGh1bmRy ZWRQZXJjZW50S2V5ZnJhbWUoKQogICAgIHJldHVybiBydWxlLmdldCgpLmdldCgpOwogfQogCi12 b2lkIEtleWZyYW1lTGlzdDo6ZmlsbEltcGxpY2l0S2V5ZnJhbWVzKGNvbnN0IEVsZW1lbnQmIGVs ZW1lbnQsIFN0eWxlOjpSZXNvbHZlciYgc3R5bGVSZXNvbHZlciwgY29uc3QgUmVuZGVyU3R5bGUq IGVsZW1lbnRTdHlsZSkKK3ZvaWQgS2V5ZnJhbWVMaXN0OjpmaWxsSW1wbGljaXRLZXlmcmFtZXMo Y29uc3QgRWxlbWVudCYgZWxlbWVudCwgU3R5bGU6OlJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBj b25zdCBSZW5kZXJTdHlsZSogZWxlbWVudFN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSogcGFyZW50 RWxlbWVudFN0eWxlKQogewogICAgIC8vIElmIHRoZSAwJSBrZXlmcmFtZSBpcyBtaXNzaW5nLCBj cmVhdGUgaXQgKGJ1dCBvbmx5IGlmIHRoZXJlIGlzIGF0IGxlYXN0IG9uZSBvdGhlciBrZXlmcmFt ZSkuCiAgICAgYXV0byBpbml0aWFsU2l6ZSA9IHNpemUoKTsKICAgICBpZiAoaW5pdGlhbFNpemUg PiAwICYmIG1fa2V5ZnJhbWVzWzBdLmtleSgpKSB7CiAgICAgICAgIEtleWZyYW1lVmFsdWUga2V5 ZnJhbWVWYWx1ZSgwLCBudWxscHRyKTsKLSAgICAgICAga2V5ZnJhbWVWYWx1ZS5zZXRTdHlsZShz dHlsZVJlc29sdmVyLnN0eWxlRm9yS2V5ZnJhbWUoZWxlbWVudCwgZWxlbWVudFN0eWxlLCAmemVy b1BlcmNlbnRLZXlmcmFtZSgpLCBrZXlmcmFtZVZhbHVlKSk7CisgICAgICAgIGtleWZyYW1lVmFs dWUuc2V0U3R5bGUoc3R5bGVSZXNvbHZlci5zdHlsZUZvcktleWZyYW1lKGVsZW1lbnQsIGVsZW1l bnRTdHlsZSwgcGFyZW50RWxlbWVudFN0eWxlLCAmemVyb1BlcmNlbnRLZXlmcmFtZSgpLCBrZXlm cmFtZVZhbHVlKSk7CiAgICAgICAgIGluc2VydChXVEZNb3ZlKGtleWZyYW1lVmFsdWUpKTsKICAg ICB9CiAKICAgICAvLyBJZiB0aGUgMTAwJSBrZXlmcmFtZSBpcyBtaXNzaW5nLCBjcmVhdGUgaXQg KGJ1dCBvbmx5IGlmIHRoZXJlIGlzIGF0IGxlYXN0IG9uZSBvdGhlciBrZXlmcmFtZSkuCiAgICAg aWYgKGluaXRpYWxTaXplID4gMCAmJiAobV9rZXlmcmFtZXNbc2l6ZSgpIC0gMV0ua2V5KCkgIT0g MSkpIHsKICAgICAgICAgS2V5ZnJhbWVWYWx1ZSBrZXlmcmFtZVZhbHVlKDEsIG51bGxwdHIpOwot ICAgICAgICBrZXlmcmFtZVZhbHVlLnNldFN0eWxlKHN0eWxlUmVzb2x2ZXIuc3R5bGVGb3JLZXlm cmFtZShlbGVtZW50LCBlbGVtZW50U3R5bGUsICZodW5kcmVkUGVyY2VudEtleWZyYW1lKCksIGtl eWZyYW1lVmFsdWUpKTsKKyAgICAgICAga2V5ZnJhbWVWYWx1ZS5zZXRTdHlsZShzdHlsZVJlc29s dmVyLnN0eWxlRm9yS2V5ZnJhbWUoZWxlbWVudCwgZWxlbWVudFN0eWxlLCBwYXJlbnRFbGVtZW50 U3R5bGUsICZodW5kcmVkUGVyY2VudEtleWZyYW1lKCksIGtleWZyYW1lVmFsdWUpKTsKICAgICAg ICAgaW5zZXJ0KFdURk1vdmUoa2V5ZnJhbWVWYWx1ZSkpOwogICAgIH0KIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9LZXlmcmFtZUxpc3QuaCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9LZXlmcmFtZUxpc3QuaAppbmRleCAzNmExNWI4ZDhiMzM4 YTZiODYyYzZlOWNmYzMzNGYwYzhhODA1YTM0Li4xNzgyM2UzNjQ4ZTA0N2U4MWIxNmE3NzcwNjgy NDAxNzc1NGIzNzZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv S2V5ZnJhbWVMaXN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0tleWZy YW1lTGlzdC5oCkBAIC05NSw3ICs5NSw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgY29weUtleWZy YW1lcyhLZXlmcmFtZUxpc3QmKTsKICAgICBib29sIGhhc0ltcGxpY2l0S2V5ZnJhbWVzKCkgY29u c3Q7Ci0gICAgdm9pZCBmaWxsSW1wbGljaXRLZXlmcmFtZXMoY29uc3QgRWxlbWVudCYsIFN0eWxl OjpSZXNvbHZlciYsIGNvbnN0IFJlbmRlclN0eWxlKik7CisgICAgdm9pZCBmaWxsSW1wbGljaXRL ZXlmcmFtZXMoY29uc3QgRWxlbWVudCYsIFN0eWxlOjpSZXNvbHZlciYsIGNvbnN0IFJlbmRlclN0 eWxlKiBlbGVtZW50U3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlKiBwYXJlbnRFbGVtZW50U3R5bGUp OwogCiBwcml2YXRlOgogICAgIEF0b21TdHJpbmcgbV9hbmltYXRpb25OYW1lOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9zdHlsZS9TdHlsZVJlc29sdmVyLmNwcAppbmRleCA0Y2JhNWI3ZjliYjdiMzYwZTc3NzEyY2Zl ODU4YzM4NmQ0MDI4MTcwLi4zNGU4MDJmYWZjMTdhNzU3ZjIyNzYxMmMzMGYyYzhjMjBlOWE5ODc1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJlc29sdmVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJlc29sdmVyLmNwcApAQCAtMjQ5LDcgKzI0OSw3 IEBAIEVsZW1lbnRTdHlsZSBSZXNvbHZlcjo6c3R5bGVGb3JFbGVtZW50KGNvbnN0IEVsZW1lbnQm IGVsZW1lbnQsIGNvbnN0IFJlbmRlclN0eWxlCiAgICAgcmV0dXJuIHsgc3RhdGUudGFrZVN0eWxl KCksIFdURk1vdmUoZWxlbWVudFN0eWxlUmVsYXRpb25zKSB9OwogfQogCi1zdGQ6OnVuaXF1ZV9w dHI8UmVuZGVyU3R5bGU+IFJlc29sdmVyOjpzdHlsZUZvcktleWZyYW1lKGNvbnN0IEVsZW1lbnQm IGVsZW1lbnQsIGNvbnN0IFJlbmRlclN0eWxlKiBlbGVtZW50U3R5bGUsIGNvbnN0IFN0eWxlUnVs ZUtleWZyYW1lKiBrZXlmcmFtZSwgS2V5ZnJhbWVWYWx1ZSYga2V5ZnJhbWVWYWx1ZSkKK3N0ZDo6 dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4gUmVzb2x2ZXI6OnN0eWxlRm9yS2V5ZnJhbWUoY29uc3Qg RWxlbWVudCYgZWxlbWVudCwgY29uc3QgUmVuZGVyU3R5bGUqIGVsZW1lbnRTdHlsZSwgY29uc3Qg UmVuZGVyU3R5bGUqIHBhcmVudEVsZW1lbnRTdHlsZSwgY29uc3QgU3R5bGVSdWxlS2V5ZnJhbWUq IGtleWZyYW1lLCBLZXlmcmFtZVZhbHVlJiBrZXlmcmFtZVZhbHVlKQogewogICAgIFJFTEVBU0Vf QVNTRVJUKCFtX2lzRGVsZXRlZCk7CiAKQEAgLTI1OSw3ICsyNTksNyBAQCBzdGQ6OnVuaXF1ZV9w dHI8UmVuZGVyU3R5bGU+IFJlc29sdmVyOjpzdHlsZUZvcktleWZyYW1lKGNvbnN0IEVsZW1lbnQm IGVsZW1lbnQsCiAgICAgYXV0byBzdGF0ZSA9IFN0YXRlKGVsZW1lbnQsIG51bGxwdHIsIG1fb3Zl cnJpZGVEb2N1bWVudEVsZW1lbnRTdHlsZSk7CiAKICAgICBzdGF0ZS5zZXRTdHlsZShSZW5kZXJT dHlsZTo6Y2xvbmVQdHIoKmVsZW1lbnRTdHlsZSkpOwotICAgIHN0YXRlLnNldFBhcmVudFN0eWxl KFJlbmRlclN0eWxlOjpjbG9uZVB0cihtX3BhcmVudEVsZW1lbnRTdHlsZUZvcktleWZyYW1lcyA/ ICptX3BhcmVudEVsZW1lbnRTdHlsZUZvcktleWZyYW1lcyA6ICplbGVtZW50U3R5bGUpKTsKKyAg ICBzdGF0ZS5zZXRQYXJlbnRTdHlsZShSZW5kZXJTdHlsZTo6Y2xvbmVQdHIocGFyZW50RWxlbWVu dFN0eWxlID8gKnBhcmVudEVsZW1lbnRTdHlsZSA6ICplbGVtZW50U3R5bGUpKTsKIAogICAgIEJ1 aWxkZXIgYnVpbGRlcigqc3RhdGUuc3R5bGUoKSwgYnVpbGRlckNvbnRleHQoc3RhdGUpLCByZXN1 bHQsIHsgQ2FzY2FkZUxldmVsOjpBdXRob3IgfSk7CiAgICAgYnVpbGRlci5hcHBseUFsbFByb3Bl cnRpZXMoKTsKQEAgLTI4NSw3ICsyODUsNyBAQCBib29sIFJlc29sdmVyOjppc0FuaW1hdGlvbk5h bWVWYWxpZChjb25zdCBTdHJpbmcmIG5hbWUpCiAgICAgcmV0dXJuIG1fa2V5ZnJhbWVzUnVsZU1h cC5maW5kKEF0b21TdHJpbmcobmFtZSkuaW1wbCgpKSAhPSBtX2tleWZyYW1lc1J1bGVNYXAuZW5k KCk7CiB9CiAKLXZvaWQgUmVzb2x2ZXI6OmtleWZyYW1lU3R5bGVzRm9yQW5pbWF0aW9uKGNvbnN0 IEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IFJlbmRlclN0eWxlKiBlbGVtZW50U3R5bGUsIEtleWZy YW1lTGlzdCYgbGlzdCkKK3ZvaWQgUmVzb2x2ZXI6OmtleWZyYW1lU3R5bGVzRm9yQW5pbWF0aW9u KGNvbnN0IEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IFJlbmRlclN0eWxlKiBlbGVtZW50U3R5bGUs IGNvbnN0IFJlbmRlclN0eWxlKiBwYXJlbnRFbGVtZW50U3R5bGUsIEtleWZyYW1lTGlzdCYgbGlz dCkKIHsKICAgICBsaXN0LmNsZWFyKCk7CiAKQEAgLTM0Nyw3ICszNDcsNyBAQCB2b2lkIFJlc29s dmVyOjprZXlmcmFtZVN0eWxlc0ZvckFuaW1hdGlvbihjb25zdCBFbGVtZW50JiBlbGVtZW50LCBj b25zdCBSZW5kZXJTdAogICAgICAgICAvLyBBZGQgdGhpcyBrZXlmcmFtZSBzdHlsZSB0byBhbGwg dGhlIGluZGljYXRlZCBrZXkgdGltZXMKICAgICAgICAgZm9yIChhdXRvIGtleSA6IGtleWZyYW1l LT5rZXlzKCkpIHsKICAgICAgICAgICAgIEtleWZyYW1lVmFsdWUga2V5ZnJhbWVWYWx1ZSgwLCBu dWxscHRyKTsKLSAgICAgICAgICAgIGtleWZyYW1lVmFsdWUuc2V0U3R5bGUoc3R5bGVGb3JLZXlm cmFtZShlbGVtZW50LCBlbGVtZW50U3R5bGUsIGtleWZyYW1lLnB0cigpLCBrZXlmcmFtZVZhbHVl KSk7CisgICAgICAgICAgICBrZXlmcmFtZVZhbHVlLnNldFN0eWxlKHN0eWxlRm9yS2V5ZnJhbWUo ZWxlbWVudCwgZWxlbWVudFN0eWxlLCBwYXJlbnRFbGVtZW50U3R5bGUsIGtleWZyYW1lLnB0cigp LCBrZXlmcmFtZVZhbHVlKSk7CiAgICAgICAgICAgICBrZXlmcmFtZVZhbHVlLnNldEtleShrZXkp OwogICAgICAgICAgICAgaWYgKGF1dG8gdGltaW5nRnVuY3Rpb25DU1NWYWx1ZSA9IGtleWZyYW1l LT5wcm9wZXJ0aWVzKCkuZ2V0UHJvcGVydHlDU1NWYWx1ZShDU1NQcm9wZXJ0eUFuaW1hdGlvblRp bWluZ0Z1bmN0aW9uKSkKICAgICAgICAgICAgICAgICBrZXlmcmFtZVZhbHVlLnNldFRpbWluZ0Z1 bmN0aW9uKFRpbWluZ0Z1bmN0aW9uOjpjcmVhdGVGcm9tQ1NTVmFsdWUoKnRpbWluZ0Z1bmN0aW9u Q1NTVmFsdWUuZ2V0KCkpKTsKQEAgLTM1NSw3ICszNTUsNyBAQCB2b2lkIFJlc29sdmVyOjprZXlm cmFtZVN0eWxlc0ZvckFuaW1hdGlvbihjb25zdCBFbGVtZW50JiBlbGVtZW50LCBjb25zdCBSZW5k ZXJTdAogICAgICAgICB9CiAgICAgfQogCi0gICAgbGlzdC5maWxsSW1wbGljaXRLZXlmcmFtZXMo ZWxlbWVudCwgKnRoaXMsIGVsZW1lbnRTdHlsZSk7CisgICAgbGlzdC5maWxsSW1wbGljaXRLZXlm cmFtZXMoZWxlbWVudCwgKnRoaXMsIGVsZW1lbnRTdHlsZSwgcGFyZW50RWxlbWVudFN0eWxlKTsK IH0KIAogc3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0eWxlPiBSZXNvbHZlcjo6cHNldWRvU3R5bGVG b3JFbGVtZW50KGNvbnN0IEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IFBzZXVkb0VsZW1lbnRSZXF1 ZXN0JiBwc2V1ZG9FbGVtZW50UmVxdWVzdCwgY29uc3QgUmVuZGVyU3R5bGUmIHBhcmVudFN0eWxl LCBjb25zdCBSZW5kZXJTdHlsZSogcGFyZW50Qm94U3R5bGUsIGNvbnN0IFNlbGVjdG9yRmlsdGVy KiBzZWxlY3RvckZpbHRlcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxl UmVzb2x2ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZXIuaAppbmRleCA2 MTQ4NjkyOTI3YjdlZGJkYTMwYWVjYjg3OTEwZmZkMzZjNjYzYzIyLi45ZTAyZmIyYTZmZmNkOTI0 OGI1Zjc3Njk0ZGZhOGMzZTU4NjQ1MTM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHls ZS9TdHlsZVJlc29sdmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZl ci5oCkBAIC04Nyw3ICs4Nyw3IEBAIHB1YmxpYzoKIAogICAgIEVsZW1lbnRTdHlsZSBzdHlsZUZv ckVsZW1lbnQoY29uc3QgRWxlbWVudCYsIGNvbnN0IFJlbmRlclN0eWxlKiBwYXJlbnRTdHlsZSwg Y29uc3QgUmVuZGVyU3R5bGUqIHBhcmVudEJveFN0eWxlID0gbnVsbHB0ciwgUnVsZU1hdGNoaW5n QmVoYXZpb3IgPSBSdWxlTWF0Y2hpbmdCZWhhdmlvcjo6TWF0Y2hBbGxSdWxlcywgY29uc3QgU2Vs ZWN0b3JGaWx0ZXIqID0gbnVsbHB0cik7CiAKLSAgICB2b2lkIGtleWZyYW1lU3R5bGVzRm9yQW5p bWF0aW9uKGNvbnN0IEVsZW1lbnQmLCBjb25zdCBSZW5kZXJTdHlsZSosIEtleWZyYW1lTGlzdCYp OworICAgIHZvaWQga2V5ZnJhbWVTdHlsZXNGb3JBbmltYXRpb24oY29uc3QgRWxlbWVudCYsIGNv bnN0IFJlbmRlclN0eWxlKiBlbGVtZW50U3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlKiBwYXJlbnRF bGVtZW50U3R5bGUsIEtleWZyYW1lTGlzdCYpOwogCiAgICAgV0VCQ09SRV9FWFBPUlQgc3RkOjp1 bmlxdWVfcHRyPFJlbmRlclN0eWxlPiBwc2V1ZG9TdHlsZUZvckVsZW1lbnQoY29uc3QgRWxlbWVu dCYsIGNvbnN0IFBzZXVkb0VsZW1lbnRSZXF1ZXN0JiwgY29uc3QgUmVuZGVyU3R5bGUmIHBhcmVu dFN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSogcGFyZW50Qm94U3R5bGUgPSBudWxscHRyLCBjb25z dCBTZWxlY3RvckZpbHRlciogPSBudWxscHRyKTsKIApAQCAtMTA4LDEyICsxMDgsOSBAQCBwdWJs aWM6CiAgICAgY29uc3QgUmVuZGVyU3R5bGUqIG92ZXJyaWRlRG9jdW1lbnRFbGVtZW50U3R5bGUo KSBjb25zdCB7IHJldHVybiBtX292ZXJyaWRlRG9jdW1lbnRFbGVtZW50U3R5bGU7IH0KICAgICB2 b2lkIHNldE92ZXJyaWRlRG9jdW1lbnRFbGVtZW50U3R5bGUoY29uc3QgUmVuZGVyU3R5bGUqIHN0 eWxlKSB7IG1fb3ZlcnJpZGVEb2N1bWVudEVsZW1lbnRTdHlsZSA9IHN0eWxlOyB9CiAKLSAgICAv LyBGSVhNRTogUmVtb3ZlIGFuZCBwYXNzIHRoaXMgdGhyb3VnaCB0aGUgYW5pbWF0aW9uIHN5c3Rl bSBub3JtYWxseS4KLSAgICB2b2lkIHNldFBhcmVudEVsZW1lbnRTdHlsZUZvcktleWZyYW1lcyhj b25zdCBSZW5kZXJTdHlsZSogc3R5bGUpIHsgbV9wYXJlbnRFbGVtZW50U3R5bGVGb3JLZXlmcmFt ZXMgPSBzdHlsZTsgfQotCiAgICAgdm9pZCBhZGRDdXJyZW50U1ZHRm9udEZhY2VSdWxlcygpOwog Ci0gICAgc3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0eWxlPiBzdHlsZUZvcktleWZyYW1lKGNvbnN0 IEVsZW1lbnQmLCBjb25zdCBSZW5kZXJTdHlsZSosIGNvbnN0IFN0eWxlUnVsZUtleWZyYW1lKiwg S2V5ZnJhbWVWYWx1ZSYpOworICAgIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4gc3R5bGVG b3JLZXlmcmFtZShjb25zdCBFbGVtZW50JiwgY29uc3QgUmVuZGVyU3R5bGUqIGVsZW1lbnRTdHls ZSwgY29uc3QgUmVuZGVyU3R5bGUqIHBhcmVudEVsZW1lbnRTdHlsZSwgY29uc3QgU3R5bGVSdWxl S2V5ZnJhbWUqLCBLZXlmcmFtZVZhbHVlJik7CiAgICAgYm9vbCBpc0FuaW1hdGlvbk5hbWVWYWxp ZChjb25zdCBTdHJpbmcmKTsKIAogICAgIC8vIFRoZXNlIG1ldGhvZHMgd2lsbCBnaXZlIGJhY2sg dGhlIHNldCBvZiBydWxlcyB0aGF0IG1hdGNoZWQgZm9yIGEgZ2l2ZW4gZWxlbWVudCAob3IgYSBw c2V1ZG8tZWxlbWVudCkuCkBAIC0xOTEsNyArMTg4LDYgQEAgcHJpdmF0ZToKICAgICBEb2N1bWVu dCYgbV9kb2N1bWVudDsKIAogICAgIGNvbnN0IFJlbmRlclN0eWxlKiBtX292ZXJyaWRlRG9jdW1l bnRFbGVtZW50U3R5bGUgeyBudWxscHRyIH07Ci0gICAgY29uc3QgUmVuZGVyU3R5bGUqIG1fcGFy ZW50RWxlbWVudFN0eWxlRm9yS2V5ZnJhbWVzIHsgbnVsbHB0ciB9OwogCiAgICAgSW5zcGVjdG9y Q1NTT01XcmFwcGVycyBtX2luc3BlY3RvckNTU09NV3JhcHBlcnM7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmNwcAppbmRleCA5OTNmMTMwOWFkOTYyNzNlYTIzMjFk OGIyOWU0MzJmZmNlMmJlNDgxLi45YjRjYzBjYWI0ODhkNmVmZTFkMTY0OGI1Njc4MDg1N2E1ZmVk MDBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVUcmVlUmVzb2x2ZXIuY3BwCkBAIC0z MzMsMTIgKzMzMyw3IEBAIEVsZW1lbnRVcGRhdGUgVHJlZVJlc29sdmVyOjpjcmVhdGVBbmltYXRl ZEVsZW1lbnRVcGRhdGUoc3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0CiAgICAgICAgIC8vIHRvIHVz ZSBDU1MgQW5pbWF0aW9ucyBhcyBkZWZpbmVkIGluIHRoZSBwcmV2aW91cyBzdHlsZSBjaGFuZ2Ug ZXZlbnQuIEFzIHN1Y2gsIHdlIHVwZGF0ZSBDU1MgQW5pbWF0aW9ucyBhZnRlciBDU1MgVHJhbnNp dGlvbnMKICAgICAgICAgLy8gc3VjaCB0aGF0IHdoZW4gQ1NTIFRyYW5zaXRpb25zIGFyZSB1cGRh dGVkIHRoZSBDU1MgQW5pbWF0aW9ucyBkYXRhIGlzIHRoZSBzYW1lIGFzIGR1cmluZyB0aGUgcHJl dmlvdXMgc3R5bGUgY2hhbmdlIGV2ZW50LgogICAgICAgICBpZiAoKG9sZFN0eWxlICYmIG9sZFN0 eWxlLT5oYXNBbmltYXRpb25zKCkpIHx8IG5ld1N0eWxlLT5oYXNBbmltYXRpb25zKCkpIHsKLSAg ICAgICAgICAgIC8vIEZJWE1FOiBSZW1vdmUgdGhpcyBoYWNrIGFuZCBwYXNzIHRoZSBwYXJlbnQg c3R5bGUgdmlhIHVwZGF0ZUNTU0FuaW1hdGlvbnNGb3JTdHlsZWFibGUuCi0gICAgICAgICAgICBz Y29wZSgpLnJlc29sdmVyLnNldFBhcmVudEVsZW1lbnRTdHlsZUZvcktleWZyYW1lcygmcGFyZW50 KCkuc3R5bGUpOwotCi0gICAgICAgICAgICBtX2RvY3VtZW50LnRpbWVsaW5lKCkudXBkYXRlQ1NT QW5pbWF0aW9uc0ZvclN0eWxlYWJsZShzdHlsZWFibGUsIG9sZFN0eWxlLCAqbmV3U3R5bGUpOwot Ci0gICAgICAgICAgICBzY29wZSgpLnJlc29sdmVyLnNldFBhcmVudEVsZW1lbnRTdHlsZUZvcktl eWZyYW1lcyhudWxscHRyKTsKKyAgICAgICAgICAgIG1fZG9jdW1lbnQudGltZWxpbmUoKS51cGRh dGVDU1NBbmltYXRpb25zRm9yU3R5bGVhYmxlKHN0eWxlYWJsZSwgb2xkU3R5bGUsICpuZXdTdHls ZSwgJnBhcmVudCgpLnN0eWxlKTsKICAgICAgICAgfQogICAgIH0KIAo= 420377 2021-02-15 14:47:23 -0800 2021-02-16 00:56:57 -0800 Patch bug-221926-20210215234722.patch text/plain 23892 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyODMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWRmZDJjZjM3ZjgzZDU5 ZjYyNzk4MzVhYjBkMmYyZWZjMWYxMDQ3NS4uZDMxNDMwYjU0NTVhYjgyOTRlNDdjNGNjZTVkN2U3 YTU4MDNiOWRhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDIxLTAyLTE1ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgorCisgICAgICAgIFN0eWxlOjpSZXNvbHZl cjo6c3R5bGVGb3JLZXlmcmFtZSgpIHNob3VsZCB0YWtlIGluIHRoZSBwYXJlbnQgc3R5bGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTkyNgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZHJlc3MgdGhl IEZJWE1FIGluIFN0eWxlOjpUcmVlUmVzb2x2ZXI6OmNyZWF0ZUFuaW1hdGVkRWxlbWVudFVwZGF0 ZSgpIHN1Y2ggdGhhdCB0aGUgcGFyZW50CisgICAgICAgIHN0eWxlIGlzIHBhc3NlZCBhbGwgdGhl IHdheSBmcm9tIHRoYXQgZnVuY3Rpb24gZG93biB0byBTdHlsZTo6UmVzb2x2ZXI6OnN0eWxlRm9y S2V5ZnJhbWUoKQorICAgICAgICByZW1vdmluZyB0aGUgbmVlZCBmb3IgU3R5bGU6OlJlc29sdmVy OjpzZXRQYXJlbnRFbGVtZW50U3R5bGVGb3JLZXlmcmFtZXMoKS4KKworICAgICAgICBUaGlzIGlz IGEgcmVmYWN0b3JpbmcgY2hhbmdlIG9ubHksIHNvIHRoZXJlIGlzIG5vIG5ldyB0ZXN0LgorCisg ICAgICAgICogYW5pbWF0aW9uL0FuaW1hdGlvblRpbWVsaW5lLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkFuaW1hdGlvblRpbWVsaW5lOjp1cGRhdGVDU1NBbmltYXRpb25zRm9yU3R5bGVhYmxlKToK KyAgICAgICAgKiBhbmltYXRpb24vQW5pbWF0aW9uVGltZWxpbmUuaDoKKyAgICAgICAgKiBhbmlt YXRpb24vQ1NTQW5pbWF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0FuaW1hdGlvbjo6 Y3JlYXRlKToKKyAgICAgICAgKiBhbmltYXRpb24vQ1NTQW5pbWF0aW9uLmg6CisgICAgICAgICog YW5pbWF0aW9uL0NTU1RyYW5zaXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTVHJhbnNp dGlvbjo6Y3JlYXRlKToKKyAgICAgICAgKiBhbmltYXRpb24vRGVjbGFyYXRpdmVBbmltYXRpb24u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RGVjbGFyYXRpdmVBbmltYXRpb246OmluaXRpYWxpemUp OgorICAgICAgICAqIGFuaW1hdGlvbi9EZWNsYXJhdGl2ZUFuaW1hdGlvbi5oOgorICAgICAgICAq IGFuaW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpLZXlmcmFt ZUVmZmVjdDo6dXBkYXRlQmxlbmRpbmdLZXlmcmFtZXMpOgorICAgICAgICAoV2ViQ29yZTo6S2V5 ZnJhbWVFZmZlY3Q6OmNvbXB1dGVEZWNsYXJhdGl2ZUFuaW1hdGlvbkJsZW5kaW5nS2V5ZnJhbWVz KToKKyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1lRWZmZWN0Ojpjb21wdXRlQ1NTQW5pbWF0aW9u QmxlbmRpbmdLZXlmcmFtZXMpOgorICAgICAgICAoV2ViQ29yZTo6S2V5ZnJhbWVFZmZlY3Q6OmFw cGx5UGVuZGluZ0FjY2VsZXJhdGVkQWN0aW9ucyk6CisgICAgICAgICogYW5pbWF0aW9uL0tleWZy YW1lRWZmZWN0Lmg6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL0tleWZyYW1lTGlzdC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpLZXlmcmFtZUxpc3Q6OmZpbGxJbXBsaWNpdEtleWZyYW1lcyk6 CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL0tleWZyYW1lTGlzdC5oOgorICAgICAgICAqIHN0 eWxlL1N0eWxlUmVzb2x2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlJlc29sdmVy OjpzdHlsZUZvcktleWZyYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpSZXNvbHZlcjo6 a2V5ZnJhbWVTdHlsZXNGb3JBbmltYXRpb24pOgorICAgICAgICAqIHN0eWxlL1N0eWxlUmVzb2x2 ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpSZXNvbHZlcjo6c2V0UGFyZW50RWxlbWVu dFN0eWxlRm9yS2V5ZnJhbWVzKTogRGVsZXRlZC4KKyAgICAgICAgKiBzdHlsZS9TdHlsZVRyZWVS ZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6VHJlZVJlc29sdmVyOjpjcmVh dGVBbmltYXRlZEVsZW1lbnRVcGRhdGUpOgorCiAyMDIxLTAyLTEyICBKZXIgTm9ibGUgIDxqZXIu bm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNdIFNvdW5kIGRvZXMgbm90IHBsYXkgb24g WW91VHViZSBhZnRlciBzd2l0Y2hpbmcgYmFjayB0byBmb3JlZ3JvdW5kCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQW5pbWF0aW9uVGltZWxpbmUuY3BwIGIvU291cmNlL1dl YkNvcmUvYW5pbWF0aW9uL0FuaW1hdGlvblRpbWVsaW5lLmNwcAppbmRleCAyN2RlYjA1ZTIyNTg3 ZTU3NGZhODNjOGY1MTFkMjQxYTNhZmIyMDgzLi5iMGFhOTBhNjdkZWQzZDUyM2ZhNzNiODhiMzI2 MGYxZTFiZWFlNWQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQW5pbWF0 aW9uVGltZWxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9BbmltYXRpb25U aW1lbGluZS5jcHAKQEAgLTIwMCw3ICsyMDAsNyBAQCBzdGF0aWMgYm9vbCBzaG91bGRDb25zaWRl ckFuaW1hdGlvbihFbGVtZW50JiBlbGVtZW50LCBjb25zdCBBbmltYXRpb24mIGFuaW1hdGlvbgog ICAgIHJldHVybiBmYWxzZTsKIH0KIAotdm9pZCBBbmltYXRpb25UaW1lbGluZTo6dXBkYXRlQ1NT QW5pbWF0aW9uc0ZvclN0eWxlYWJsZShjb25zdCBTdHlsZWFibGUmIHN0eWxlYWJsZSwgY29uc3Qg UmVuZGVyU3R5bGUqIGN1cnJlbnRTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUmIG5ld1N0eWxlKQor dm9pZCBBbmltYXRpb25UaW1lbGluZTo6dXBkYXRlQ1NTQW5pbWF0aW9uc0ZvclN0eWxlYWJsZShj b25zdCBTdHlsZWFibGUmIHN0eWxlYWJsZSwgY29uc3QgUmVuZGVyU3R5bGUqIGN1cnJlbnRTdHls ZSwgY29uc3QgUmVuZGVyU3R5bGUmIG5ld1N0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSogcGFyZW50 RWxlbWVudFN0eWxlKQogewogICAgIGF1dG8mIGtleWZyYW1lRWZmZWN0U3RhY2sgPSBzdHlsZWFi bGUuZW5zdXJlS2V5ZnJhbWVFZmZlY3RTdGFjaygpOwogCkBAIC0yNTAsNyArMjUwLDcgQEAgdm9p ZCBBbmltYXRpb25UaW1lbGluZTo6dXBkYXRlQ1NTQW5pbWF0aW9uc0ZvclN0eWxlYWJsZShjb25z dCBTdHlsZWFibGUmIHN0eWxlYWIKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgaWYgKCFm b3VuZE1hdGNoaW5nQW5pbWF0aW9uKQotICAgICAgICAgICAgICAgIG5ld0FuaW1hdGlvbnMuYWRk KENTU0FuaW1hdGlvbjo6Y3JlYXRlKHN0eWxlYWJsZSwgY3VycmVudEFuaW1hdGlvbiwgY3VycmVu dFN0eWxlLCBuZXdTdHlsZSkpOworICAgICAgICAgICAgICAgIG5ld0FuaW1hdGlvbnMuYWRkKENT U0FuaW1hdGlvbjo6Y3JlYXRlKHN0eWxlYWJsZSwgY3VycmVudEFuaW1hdGlvbiwgY3VycmVudFN0 eWxlLCBuZXdTdHlsZSwgcGFyZW50RWxlbWVudFN0eWxlKSk7CiAgICAgICAgIH0KICAgICB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9BbmltYXRpb25UaW1lbGluZS5o IGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0FuaW1hdGlvblRpbWVsaW5lLmgKaW5kZXggYmUy ZjZjMTViNTA3OTc4MGY5NmVkYjhlYjM4MWQxMmYyMmUzYTM4ZC4uNDdmZjdjZWEyZDhhMmRlYTk5 YzFkOTQ3NmUyYTIyYTA3YjQ2ZDM3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYW5pbWF0 aW9uL0FuaW1hdGlvblRpbWVsaW5lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0Fu aW1hdGlvblRpbWVsaW5lLmgKQEAgLTcxLDcgKzcxLDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBy ZW1vdmVEZWNsYXJhdGl2ZUFuaW1hdGlvbkZyb21MaXN0c0Zvck93bmluZ0VsZW1lbnQoV2ViQW5p bWF0aW9uJiwgY29uc3QgU3R5bGVhYmxlJik7CiAKLSAgICB2b2lkIHVwZGF0ZUNTU0FuaW1hdGlv bnNGb3JTdHlsZWFibGUoY29uc3QgU3R5bGVhYmxlJiwgY29uc3QgUmVuZGVyU3R5bGUqIGN1cnJl bnRTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUmIGFmdGVyQ2hhbmdlU3R5bGUpOworICAgIHZvaWQg dXBkYXRlQ1NTQW5pbWF0aW9uc0ZvclN0eWxlYWJsZShjb25zdCBTdHlsZWFibGUmLCBjb25zdCBS ZW5kZXJTdHlsZSogY3VycmVudFN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSYgYWZ0ZXJDaGFuZ2VT dHlsZSwgY29uc3QgUmVuZGVyU3R5bGUqIHBhcmVudEVsZW1lbnRTdHlsZSk7CiAgICAgdm9pZCB1 cGRhdGVDU1NUcmFuc2l0aW9uc0ZvclN0eWxlYWJsZShjb25zdCBTdHlsZWFibGUmLCBjb25zdCBS ZW5kZXJTdHlsZSYgY3VycmVudFN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSYgbmV3U3R5bGUpOwog CiBwcm90ZWN0ZWQ6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQ1NTQW5p bWF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9DU1NBbmltYXRpb24uY3BwCmlu ZGV4IGM5MGRkMWI5OTYyNTBiNGVhYzhkOTJkNjI3MzNiYWY1Y2E3OGFhODUuLjE4Y2MwM2Q0ODhi YWFiNTM2NzM2MTJjY2Q1Y2I1OTRmYjFhZmU3NjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2FuaW1hdGlvbi9DU1NBbmltYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlv bi9DU1NBbmltYXRpb24uY3BwCkBAIC0zNiwxMCArMzYsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogCiBXVEZfTUFLRV9JU09fQUxMT0NBVEVEX0lNUEwoQ1NTQW5pbWF0aW9uKTsKIAotUmVmPENT U0FuaW1hdGlvbj4gQ1NTQW5pbWF0aW9uOjpjcmVhdGUoY29uc3QgU3R5bGVhYmxlJiBvd25pbmdF bGVtZW50LCBjb25zdCBBbmltYXRpb24mIGJhY2tpbmdBbmltYXRpb24sIGNvbnN0IFJlbmRlclN0 eWxlKiBvbGRTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUmIG5ld1N0eWxlKQorUmVmPENTU0FuaW1h dGlvbj4gQ1NTQW5pbWF0aW9uOjpjcmVhdGUoY29uc3QgU3R5bGVhYmxlJiBvd25pbmdFbGVtZW50 LCBjb25zdCBBbmltYXRpb24mIGJhY2tpbmdBbmltYXRpb24sIGNvbnN0IFJlbmRlclN0eWxlKiBv bGRTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUmIG5ld1N0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSog cGFyZW50RWxlbWVudFN0eWxlKQogewogICAgIGF1dG8gcmVzdWx0ID0gYWRvcHRSZWYoKm5ldyBD U1NBbmltYXRpb24ob3duaW5nRWxlbWVudCwgYmFja2luZ0FuaW1hdGlvbikpOwotICAgIHJlc3Vs dC0+aW5pdGlhbGl6ZShvbGRTdHlsZSwgbmV3U3R5bGUpOworICAgIHJlc3VsdC0+aW5pdGlhbGl6 ZShvbGRTdHlsZSwgbmV3U3R5bGUsIHBhcmVudEVsZW1lbnRTdHlsZSk7CiAKICAgICBJbnNwZWN0 b3JJbnN0cnVtZW50YXRpb246OmRpZENyZWF0ZVdlYkFuaW1hdGlvbihyZXN1bHQuZ2V0KCkpOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQ1NTQW5pbWF0aW9uLmggYi9T b3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQ1NTQW5pbWF0aW9uLmgKaW5kZXggMmMwNWFiNTVhZGVk MWM2MWE3NjdmZDg5NDM4ODliMzk4NjcxNzZkZS4uYWZjOTVmNTMxMzY2NTEzNTQ0ODkxZDdkZjRi MDdjYWE0NjdjMzNmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0NTU0Fu aW1hdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9DU1NBbmltYXRpb24uaApA QCAtMzgsNyArMzgsNyBAQCBjbGFzcyBSZW5kZXJTdHlsZTsKIGNsYXNzIENTU0FuaW1hdGlvbiBm aW5hbCA6IHB1YmxpYyBEZWNsYXJhdGl2ZUFuaW1hdGlvbiB7CiAgICAgV1RGX01BS0VfSVNPX0FM TE9DQVRFRChDU1NBbmltYXRpb24pOwogcHVibGljOgotICAgIHN0YXRpYyBSZWY8Q1NTQW5pbWF0 aW9uPiBjcmVhdGUoY29uc3QgU3R5bGVhYmxlJiwgY29uc3QgQW5pbWF0aW9uJiwgY29uc3QgUmVu ZGVyU3R5bGUqIG9sZFN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSYgbmV3U3R5bGUpOworICAgIHN0 YXRpYyBSZWY8Q1NTQW5pbWF0aW9uPiBjcmVhdGUoY29uc3QgU3R5bGVhYmxlJiwgY29uc3QgQW5p bWF0aW9uJiwgY29uc3QgUmVuZGVyU3R5bGUqIG9sZFN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSYg bmV3U3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlKiBwYXJlbnRFbGVtZW50U3R5bGUpOwogICAgIH5D U1NBbmltYXRpb24oKSA9IGRlZmF1bHQ7CiAKICAgICBib29sIGlzQ1NTQW5pbWF0aW9uKCkgY29u c3Qgb3ZlcnJpZGUgeyByZXR1cm4gdHJ1ZTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YW5pbWF0aW9uL0NTU1RyYW5zaXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0NT U1RyYW5zaXRpb24uY3BwCmluZGV4IDllNjA2MDkxYzE4ODllYjc4YWFlMTg5NmZkMGMxNTQ1NDNm NjllZGUuLjUwMDcwMThlNjVkZDgwMjNhMzUzMDQ3MDA3MDg5Y2VkNDhkY2UzOGYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9DU1NUcmFuc2l0aW9uLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9hbmltYXRpb24vQ1NTVHJhbnNpdGlvbi5jcHAKQEAgLTQxLDcgKzQxLDcgQEAg UmVmPENTU1RyYW5zaXRpb24+IENTU1RyYW5zaXRpb246OmNyZWF0ZShjb25zdCBTdHlsZWFibGUm IG93bmluZ0VsZW1lbnQsIENTU1Byb3AKIHsKICAgICBBU1NFUlQob2xkU3R5bGUpOwogICAgIGF1 dG8gcmVzdWx0ID0gYWRvcHRSZWYoKm5ldyBDU1NUcmFuc2l0aW9uKG93bmluZ0VsZW1lbnQsIHBy b3BlcnR5LCBnZW5lcmF0aW9uVGltZSwgYmFja2luZ0FuaW1hdGlvbiwgKm9sZFN0eWxlLCBuZXdT dHlsZSwgcmV2ZXJzaW5nQWRqdXN0ZWRTdGFydFN0eWxlLCByZXZlcnNpbmdTaG9ydGVuaW5nRmFj dG9yKSk7Ci0gICAgcmVzdWx0LT5pbml0aWFsaXplKG9sZFN0eWxlLCBuZXdTdHlsZSk7CisgICAg cmVzdWx0LT5pbml0aWFsaXplKG9sZFN0eWxlLCBuZXdTdHlsZSwgbnVsbHB0cik7CiAgICAgcmVz dWx0LT5zZXRUaW1pbmdQcm9wZXJ0aWVzKGRlbGF5LCBkdXJhdGlvbik7CiAKICAgICBJbnNwZWN0 b3JJbnN0cnVtZW50YXRpb246OmRpZENyZWF0ZVdlYkFuaW1hdGlvbihyZXN1bHQuZ2V0KCkpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0RlY2xhcmF0aXZlQW5pbWF0aW9u LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9EZWNsYXJhdGl2ZUFuaW1hdGlvbi5jcHAK aW5kZXggZDhkZDhmNWMzNzA2MTI2MTc4ZGNjM2YxYjdhMzM4NzEyYTA3ZTNjMC4uNjYzNmZiNTYz ZDBhNGIzMzRmNTJhOTE2NTg2MTNkYmI5YjRhOTk0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYW5pbWF0aW9uL0RlY2xhcmF0aXZlQW5pbWF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9hbmltYXRpb24vRGVjbGFyYXRpdmVBbmltYXRpb24uY3BwCkBAIC0xMDYsNyArMTA2LDcgQEAg dm9pZCBEZWNsYXJhdGl2ZUFuaW1hdGlvbjo6c2V0QmFja2luZ0FuaW1hdGlvbihjb25zdCBBbmlt YXRpb24mIGJhY2tpbmdBbmltYXRpb24KICAgICBzeW5jUHJvcGVydGllc1dpdGhCYWNraW5nQW5p bWF0aW9uKCk7CiB9CiAKLXZvaWQgRGVjbGFyYXRpdmVBbmltYXRpb246OmluaXRpYWxpemUoY29u c3QgUmVuZGVyU3R5bGUqIG9sZFN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSYgbmV3U3R5bGUpCit2 b2lkIERlY2xhcmF0aXZlQW5pbWF0aW9uOjppbml0aWFsaXplKGNvbnN0IFJlbmRlclN0eWxlKiBv bGRTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUmIG5ld1N0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSog cGFyZW50RWxlbWVudFN0eWxlKQogewogICAgIC8vIFdlIG5lZWQgdG8gc3VzcGVuZCBpbnZhbGlk YXRpb24gb2YgdGhlIGFuaW1hdGlvbidzIGtleWZyYW1lIGVmZmVjdCBkdXJpbmcgaXRzIGNyZWF0 aW9uCiAgICAgLy8gYXMgaXQgd291bGQgb3RoZXJ3aXNlIHRyaWdnZXIgaW52YWxpZGF0aW9uIG9m IHRoZSBkb2N1bWVudCdzIHN0eWxlIGFuZCB0aGlzIHdvdWxkIGJlCkBAIC0xMTcsNyArMTE3LDcg QEAgdm9pZCBEZWNsYXJhdGl2ZUFuaW1hdGlvbjo6aW5pdGlhbGl6ZShjb25zdCBSZW5kZXJTdHls ZSogb2xkU3R5bGUsIGNvbnN0IFJlbmRlclMKIAogICAgIHNldEVmZmVjdChLZXlmcmFtZUVmZmVj dDo6Y3JlYXRlKCptX293bmluZ0VsZW1lbnQsIG1fb3duaW5nUHNldWRvSWQpKTsKICAgICBzZXRU aW1lbGluZSgmbV9vd25pbmdFbGVtZW50LT5kb2N1bWVudCgpLnRpbWVsaW5lKCkpOwotICAgIGRv d25jYXN0PEtleWZyYW1lRWZmZWN0PihlZmZlY3QoKSktPmNvbXB1dGVEZWNsYXJhdGl2ZUFuaW1h dGlvbkJsZW5kaW5nS2V5ZnJhbWVzKG9sZFN0eWxlLCBuZXdTdHlsZSk7CisgICAgZG93bmNhc3Q8 S2V5ZnJhbWVFZmZlY3Q+KGVmZmVjdCgpKS0+Y29tcHV0ZURlY2xhcmF0aXZlQW5pbWF0aW9uQmxl bmRpbmdLZXlmcmFtZXMob2xkU3R5bGUsIG5ld1N0eWxlLCBwYXJlbnRFbGVtZW50U3R5bGUpOwog ICAgIHN5bmNQcm9wZXJ0aWVzV2l0aEJhY2tpbmdBbmltYXRpb24oKTsKICAgICBpZiAoYmFja2lu Z0FuaW1hdGlvbigpLnBsYXlTdGF0ZSgpID09IEFuaW1hdGlvblBsYXlTdGF0ZTo6UGxheWluZykK ICAgICAgICAgcGxheSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0Rl Y2xhcmF0aXZlQW5pbWF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vRGVjbGFyYXRp dmVBbmltYXRpb24uaAppbmRleCAzMWM0ZjY1MzM5N2FiODhkNzM1YjVjMmRhYWFhYjFjY2IzZWQ4 MzZlLi42OTVjZGY3M2FiMmNlODAzNDE5M2JjOTNhMjg1MGQ3OTE4NDg5MjAyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vRGVjbGFyYXRpdmVBbmltYXRpb24uaAorKysgYi9T b3VyY2UvV2ViQ29yZS9hbmltYXRpb24vRGVjbGFyYXRpdmVBbmltYXRpb24uaApAQCAtNzUsNyAr NzUsNyBAQCBwdWJsaWM6CiBwcm90ZWN0ZWQ6CiAgICAgRGVjbGFyYXRpdmVBbmltYXRpb24oY29u c3QgU3R5bGVhYmxlJiwgY29uc3QgQW5pbWF0aW9uJik7CiAKLSAgICB2aXJ0dWFsIHZvaWQgaW5p dGlhbGl6ZShjb25zdCBSZW5kZXJTdHlsZSogb2xkU3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlJiBu ZXdTdHlsZSk7CisgICAgdmlydHVhbCB2b2lkIGluaXRpYWxpemUoY29uc3QgUmVuZGVyU3R5bGUq IG9sZFN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSYgbmV3U3R5bGUsIGNvbnN0IFJlbmRlclN0eWxl KiBwYXJlbnRFbGVtZW50U3R5bGUpOwogICAgIHZpcnR1YWwgdm9pZCBzeW5jUHJvcGVydGllc1dp dGhCYWNraW5nQW5pbWF0aW9uKCk7CiAgICAgLy8gZWxhcHNlZFRpbWUgaXMgdGhlIGFuaW1hdGlv bidzIGN1cnJlbnQgdGltZSBhdCB0aGUgdGltZSB0aGUgZXZlbnQgaXMgYWRkZWQgYW5kIGlzIGV4 cG9zZWQgdGhyb3VnaCB0aGUgRE9NIEFQSSwgdGltZWxpbmVUaW1lIGlzIHRoZSBhbmltYXRpb25z JwogICAgIC8vIHRpbWVsaW5lIGN1cnJlbnQgdGltZSBhbmQgaXMgbm90IGV4cG9zZWQgdGhyb3Vn aCB0aGUgRE9NIEFQSSBidXQgdXNlZCBieSB0aGUgRG9jdW1lbnRUaW1lbGluZSBmb3Igc29ydGlu ZyBldmVudHMgYmVmb3JlIGRpc3BhdGNoLiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Fu aW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vS2V5 ZnJhbWVFZmZlY3QuY3BwCmluZGV4IGYyOTgyYjQ2Y2RlNzAyZDVjNTk4YzNkYTQ0MTFhZjdlY2M5 OWVhYjguLjlhOTMzMDI1NzMwMWU5Y2ZjZTJkYTkyMTc0NTc1MzRhZjcyZjBmM2QgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0tleWZyYW1lRWZmZWN0LmNwcApAQCAtODI3LDcgKzgyNyw3 IEBAIHZvaWQgS2V5ZnJhbWVFZmZlY3Q6OnVwZGF0ZUJsZW5kaW5nS2V5ZnJhbWVzKFJlbmRlclN0 eWxlJiBlbGVtZW50U3R5bGUpCiAgICAgICAgICAgICBrZXlmcmFtZUxpc3QuYWRkUHJvcGVydHko c3R5bGVQcm9wZXJ0aWVzLT5wcm9wZXJ0eUF0KGkpLmlkKCkpOwogCiAgICAgICAgIGF1dG8ga2V5 ZnJhbWVSdWxlID0gU3R5bGVSdWxlS2V5ZnJhbWU6OmNyZWF0ZShXVEZNb3ZlKHN0eWxlUHJvcGVy dGllcykpOwotICAgICAgICBrZXlmcmFtZVZhbHVlLnNldFN0eWxlKHN0eWxlUmVzb2x2ZXIuc3R5 bGVGb3JLZXlmcmFtZSgqbV90YXJnZXQsICZlbGVtZW50U3R5bGUsIGtleWZyYW1lUnVsZS5wdHIo KSwga2V5ZnJhbWVWYWx1ZSkpOworICAgICAgICBrZXlmcmFtZVZhbHVlLnNldFN0eWxlKHN0eWxl UmVzb2x2ZXIuc3R5bGVGb3JLZXlmcmFtZSgqbV90YXJnZXQsICZlbGVtZW50U3R5bGUsIG51bGxw dHIsIGtleWZyYW1lUnVsZS5wdHIoKSwga2V5ZnJhbWVWYWx1ZSkpOwogICAgICAgICBrZXlmcmFt ZUxpc3QuaW5zZXJ0KFdURk1vdmUoa2V5ZnJhbWVWYWx1ZSkpOwogICAgIH0KIApAQCAtOTg1LDE2 ICs5ODUsMTYgQEAgdm9pZCBLZXlmcmFtZUVmZmVjdDo6Y2hlY2tGb3JNYXRjaGluZ0NvbG9yRmls dGVyRnVuY3Rpb25MaXN0cygpCiAgICAgfSk7CiB9CiAKLXZvaWQgS2V5ZnJhbWVFZmZlY3Q6OmNv bXB1dGVEZWNsYXJhdGl2ZUFuaW1hdGlvbkJsZW5kaW5nS2V5ZnJhbWVzKGNvbnN0IFJlbmRlclN0 eWxlKiBvbGRTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUmIG5ld1N0eWxlKQordm9pZCBLZXlmcmFt ZUVmZmVjdDo6Y29tcHV0ZURlY2xhcmF0aXZlQW5pbWF0aW9uQmxlbmRpbmdLZXlmcmFtZXMoY29u c3QgUmVuZGVyU3R5bGUqIG9sZFN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSYgbmV3U3R5bGUsIGNv bnN0IFJlbmRlclN0eWxlKiBwYXJlbnRFbGVtZW50U3R5bGUpCiB7CiAgICAgQVNTRVJUKGlzPERl Y2xhcmF0aXZlQW5pbWF0aW9uPihhbmltYXRpb24oKSkpOwogICAgIGlmIChpczxDU1NBbmltYXRp b24+KGFuaW1hdGlvbigpKSkKLSAgICAgICAgY29tcHV0ZUNTU0FuaW1hdGlvbkJsZW5kaW5nS2V5 ZnJhbWVzKG5ld1N0eWxlKTsKKyAgICAgICAgY29tcHV0ZUNTU0FuaW1hdGlvbkJsZW5kaW5nS2V5 ZnJhbWVzKG5ld1N0eWxlLCBwYXJlbnRFbGVtZW50U3R5bGUpOwogICAgIGVsc2UgaWYgKGlzPENT U1RyYW5zaXRpb24+KGFuaW1hdGlvbigpKSkKICAgICAgICAgY29tcHV0ZUNTU1RyYW5zaXRpb25C bGVuZGluZ0tleWZyYW1lcyhvbGRTdHlsZSwgbmV3U3R5bGUpOwogfQogCi12b2lkIEtleWZyYW1l RWZmZWN0Ojpjb21wdXRlQ1NTQW5pbWF0aW9uQmxlbmRpbmdLZXlmcmFtZXMoY29uc3QgUmVuZGVy U3R5bGUmIHVuYW5pbWF0ZWRTdHlsZSkKK3ZvaWQgS2V5ZnJhbWVFZmZlY3Q6OmNvbXB1dGVDU1NB bmltYXRpb25CbGVuZGluZ0tleWZyYW1lcyhjb25zdCBSZW5kZXJTdHlsZSYgdW5hbmltYXRlZFN0 eWxlLCBjb25zdCBSZW5kZXJTdHlsZSogcGFyZW50RWxlbWVudFN0eWxlKQogewogICAgIEFTU0VS VChpczxDU1NBbmltYXRpb24+KGFuaW1hdGlvbigpKSk7CiAgICAgQVNTRVJUKGRvY3VtZW50KCkp OwpAQCAtMTAwNCw3ICsxMDA0LDcgQEAgdm9pZCBLZXlmcmFtZUVmZmVjdDo6Y29tcHV0ZUNTU0Fu aW1hdGlvbkJsZW5kaW5nS2V5ZnJhbWVzKGNvbnN0IFJlbmRlclN0eWxlJiB1bmEKIAogICAgIEtl eWZyYW1lTGlzdCBrZXlmcmFtZUxpc3QoYmFja2luZ0FuaW1hdGlvbi5uYW1lKCkpOwogICAgIGlm IChhdXRvKiBzdHlsZVNjb3BlID0gU3R5bGU6OlNjb3BlOjpmb3JPcmRpbmFsKCptX3RhcmdldCwg YmFja2luZ0FuaW1hdGlvbi5uYW1lU3R5bGVTY29wZU9yZGluYWwoKSkpCi0gICAgICAgIHN0eWxl U2NvcGUtPnJlc29sdmVyKCkua2V5ZnJhbWVTdHlsZXNGb3JBbmltYXRpb24oKm1fdGFyZ2V0LCAm dW5hbmltYXRlZFN0eWxlLCBrZXlmcmFtZUxpc3QpOworICAgICAgICBzdHlsZVNjb3BlLT5yZXNv bHZlcigpLmtleWZyYW1lU3R5bGVzRm9yQW5pbWF0aW9uKCptX3RhcmdldCwgJnVuYW5pbWF0ZWRT dHlsZSwgcGFyZW50RWxlbWVudFN0eWxlLCBrZXlmcmFtZUxpc3QpOwogCiAgICAgLy8gRW5zdXJl IHJlc291cmNlIGxvYWRzIGZvciBhbGwgdGhlIGZyYW1lcy4KICAgICBmb3IgKGF1dG8mIGtleWZy YW1lIDoga2V5ZnJhbWVMaXN0LmtleWZyYW1lcygpKSB7CkBAIC0xNzIzLDcgKzE3MjMsNyBAQCBP cHRpb25TZXQ8QWNjZWxlcmF0ZWRBY3Rpb25BcHBsaWNhdGlvblJlc3VsdD4gS2V5ZnJhbWVFZmZl Y3Q6OmFwcGx5UGVuZGluZ0FjY2VsZQogCiAgICAgICAgIEtleWZyYW1lTGlzdCBleHBsaWNpdEtl eWZyYW1lcyhtX2JsZW5kaW5nS2V5ZnJhbWVzLmFuaW1hdGlvbk5hbWUoKSk7CiAgICAgICAgIGV4 cGxpY2l0S2V5ZnJhbWVzLmNvcHlLZXlmcmFtZXMobV9ibGVuZGluZ0tleWZyYW1lcyk7Ci0gICAg ICAgIGV4cGxpY2l0S2V5ZnJhbWVzLmZpbGxJbXBsaWNpdEtleWZyYW1lcygqbV90YXJnZXQsIG1f dGFyZ2V0LT5zdHlsZVJlc29sdmVyKCksIGxhc3RTdHlsZUNoYW5nZUV2ZW50U3R5bGUpOworICAg ICAgICBleHBsaWNpdEtleWZyYW1lcy5maWxsSW1wbGljaXRLZXlmcmFtZXMoKm1fdGFyZ2V0LCBt X3RhcmdldC0+c3R5bGVSZXNvbHZlcigpLCBsYXN0U3R5bGVDaGFuZ2VFdmVudFN0eWxlLCBudWxs cHRyKTsKICAgICAgICAgcmV0dXJuIHJlbmRlcmVyLT5zdGFydEFuaW1hdGlvbih0aW1lT2Zmc2V0 LCBiYWNraW5nQW5pbWF0aW9uRm9yQ29tcG9zaXRlZFJlbmRlcmVyKCksIGV4cGxpY2l0S2V5ZnJh bWVzKSA/IFJ1bm5pbmdBY2NlbGVyYXRlZDo6WWVzIDogUnVubmluZ0FjY2VsZXJhdGVkOjpObzsK ICAgICB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vS2V5ZnJhbWVF ZmZlY3QuaCBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5oCmluZGV4 IDllZTRmMTk5NWI0MGIwMzg4Zjc1YjE2Zjg1MmFkNjViMjI2Nzk5YzUuLjQ4NjQ5Y2IwNTlmZTcw MDY4MmIzODVmMTdjY2E3ZDE3OGY0MDk1YTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Fu aW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9L ZXlmcmFtZUVmZmVjdC5oCkBAIC0xNTQsNyArMTU0LDcgQEAgcHVibGljOgogI2VuZGlmCiAgICAg Ym9vbCBjb2xvckZpbHRlckZ1bmN0aW9uTGlzdHNNYXRjaCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0 dXJuIG1fY29sb3JGaWx0ZXJGdW5jdGlvbkxpc3RzTWF0Y2g7IH0KIAotICAgIHZvaWQgY29tcHV0 ZURlY2xhcmF0aXZlQW5pbWF0aW9uQmxlbmRpbmdLZXlmcmFtZXMoY29uc3QgUmVuZGVyU3R5bGUq IG9sZFN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSYgbmV3U3R5bGUpOworICAgIHZvaWQgY29tcHV0 ZURlY2xhcmF0aXZlQW5pbWF0aW9uQmxlbmRpbmdLZXlmcmFtZXMoY29uc3QgUmVuZGVyU3R5bGUq IG9sZFN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSYgbmV3U3R5bGUsIGNvbnN0IFJlbmRlclN0eWxl KiBwYXJlbnRFbGVtZW50U3R5bGUpOwogICAgIGNvbnN0IEtleWZyYW1lTGlzdCYgYmxlbmRpbmdL ZXlmcmFtZXMoKSBjb25zdCB7IHJldHVybiBtX2JsZW5kaW5nS2V5ZnJhbWVzOyB9CiAgICAgY29u c3QgSGFzaFNldDxDU1NQcm9wZXJ0eUlEPiYgYW5pbWF0ZWRQcm9wZXJ0aWVzKCkgY29uc3QgeyBy ZXR1cm4gbV9ibGVuZGluZ0tleWZyYW1lcy5wcm9wZXJ0aWVzKCk7IH0KICAgICBib29sIGFuaW1h dGVzUHJvcGVydHkoQ1NTUHJvcGVydHlJRCkgY29uc3Q7CkBAIC0xOTksNyArMTk5LDcgQEAgcHJp dmF0ZToKICAgICB2b2lkIGNvbXB1dGVTb21lS2V5ZnJhbWVzVXNlU3RlcHNUaW1pbmdGdW5jdGlv bigpOwogICAgIHZvaWQgY2xlYXJCbGVuZGluZ0tleWZyYW1lcygpOwogICAgIHZvaWQgdXBkYXRl QmxlbmRpbmdLZXlmcmFtZXMoUmVuZGVyU3R5bGUmKTsKLSAgICB2b2lkIGNvbXB1dGVDU1NBbmlt YXRpb25CbGVuZGluZ0tleWZyYW1lcyhjb25zdCBSZW5kZXJTdHlsZSYpOworICAgIHZvaWQgY29t cHV0ZUNTU0FuaW1hdGlvbkJsZW5kaW5nS2V5ZnJhbWVzKGNvbnN0IFJlbmRlclN0eWxlJiB1bmFu aW1hdGVkU3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlKiBwYXJlbnRFbGVtZW50U3R5bGUpOwogICAg IHZvaWQgY29tcHV0ZUNTU1RyYW5zaXRpb25CbGVuZGluZ0tleWZyYW1lcyhjb25zdCBSZW5kZXJT dHlsZSogb2xkU3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlJiBuZXdTdHlsZSk7CiAgICAgdm9pZCBj b21wdXRlQWNjZWxlcmF0ZWRQcm9wZXJ0aWVzU3RhdGUoKTsKICAgICB2b2lkIHNldEJsZW5kaW5n S2V5ZnJhbWVzKEtleWZyYW1lTGlzdCYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL0tleWZyYW1lTGlzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3R5bGUvS2V5ZnJhbWVMaXN0LmNwcAppbmRleCA0MmQxODdkMDczYWVhMzZjNTdkNmZiMjQ5ZjRj MzdkYzY4YTEwZTczLi4xYmQxYjdmODY4Zjc1NDNiNDllMzViNjNjYzVhN2M2ZDEyZWY4NDEzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvS2V5ZnJhbWVMaXN0LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvS2V5ZnJhbWVMaXN0LmNwcApA QCAtMTEzLDIwICsxMTMsMjAgQEAgc3RhdGljIGNvbnN0IFN0eWxlUnVsZUtleWZyYW1lJiBodW5k cmVkUGVyY2VudEtleWZyYW1lKCkKICAgICByZXR1cm4gcnVsZS5nZXQoKS5nZXQoKTsKIH0KIAot dm9pZCBLZXlmcmFtZUxpc3Q6OmZpbGxJbXBsaWNpdEtleWZyYW1lcyhjb25zdCBFbGVtZW50JiBl bGVtZW50LCBTdHlsZTo6UmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIsIGNvbnN0IFJlbmRlclN0eWxl KiBlbGVtZW50U3R5bGUpCit2b2lkIEtleWZyYW1lTGlzdDo6ZmlsbEltcGxpY2l0S2V5ZnJhbWVz KGNvbnN0IEVsZW1lbnQmIGVsZW1lbnQsIFN0eWxlOjpSZXNvbHZlciYgc3R5bGVSZXNvbHZlciwg Y29uc3QgUmVuZGVyU3R5bGUqIGVsZW1lbnRTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUqIHBhcmVu dEVsZW1lbnRTdHlsZSkKIHsKICAgICAvLyBJZiB0aGUgMCUga2V5ZnJhbWUgaXMgbWlzc2luZywg Y3JlYXRlIGl0IChidXQgb25seSBpZiB0aGVyZSBpcyBhdCBsZWFzdCBvbmUgb3RoZXIga2V5ZnJh bWUpLgogICAgIGF1dG8gaW5pdGlhbFNpemUgPSBzaXplKCk7CiAgICAgaWYgKGluaXRpYWxTaXpl ID4gMCAmJiBtX2tleWZyYW1lc1swXS5rZXkoKSkgewogICAgICAgICBLZXlmcmFtZVZhbHVlIGtl eWZyYW1lVmFsdWUoMCwgbnVsbHB0cik7Ci0gICAgICAgIGtleWZyYW1lVmFsdWUuc2V0U3R5bGUo c3R5bGVSZXNvbHZlci5zdHlsZUZvcktleWZyYW1lKGVsZW1lbnQsIGVsZW1lbnRTdHlsZSwgJnpl cm9QZXJjZW50S2V5ZnJhbWUoKSwga2V5ZnJhbWVWYWx1ZSkpOworICAgICAgICBrZXlmcmFtZVZh bHVlLnNldFN0eWxlKHN0eWxlUmVzb2x2ZXIuc3R5bGVGb3JLZXlmcmFtZShlbGVtZW50LCBlbGVt ZW50U3R5bGUsIHBhcmVudEVsZW1lbnRTdHlsZSwgJnplcm9QZXJjZW50S2V5ZnJhbWUoKSwga2V5 ZnJhbWVWYWx1ZSkpOwogICAgICAgICBpbnNlcnQoV1RGTW92ZShrZXlmcmFtZVZhbHVlKSk7CiAg ICAgfQogCiAgICAgLy8gSWYgdGhlIDEwMCUga2V5ZnJhbWUgaXMgbWlzc2luZywgY3JlYXRlIGl0 IChidXQgb25seSBpZiB0aGVyZSBpcyBhdCBsZWFzdCBvbmUgb3RoZXIga2V5ZnJhbWUpLgogICAg IGlmIChpbml0aWFsU2l6ZSA+IDAgJiYgKG1fa2V5ZnJhbWVzW3NpemUoKSAtIDFdLmtleSgpICE9 IDEpKSB7CiAgICAgICAgIEtleWZyYW1lVmFsdWUga2V5ZnJhbWVWYWx1ZSgxLCBudWxscHRyKTsK LSAgICAgICAga2V5ZnJhbWVWYWx1ZS5zZXRTdHlsZShzdHlsZVJlc29sdmVyLnN0eWxlRm9yS2V5 ZnJhbWUoZWxlbWVudCwgZWxlbWVudFN0eWxlLCAmaHVuZHJlZFBlcmNlbnRLZXlmcmFtZSgpLCBr ZXlmcmFtZVZhbHVlKSk7CisgICAgICAgIGtleWZyYW1lVmFsdWUuc2V0U3R5bGUoc3R5bGVSZXNv bHZlci5zdHlsZUZvcktleWZyYW1lKGVsZW1lbnQsIGVsZW1lbnRTdHlsZSwgcGFyZW50RWxlbWVu dFN0eWxlLCAmaHVuZHJlZFBlcmNlbnRLZXlmcmFtZSgpLCBrZXlmcmFtZVZhbHVlKSk7CiAgICAg ICAgIGluc2VydChXVEZNb3ZlKGtleWZyYW1lVmFsdWUpKTsKICAgICB9CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvS2V5ZnJhbWVMaXN0LmggYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvS2V5ZnJhbWVMaXN0LmgKaW5kZXggMzZhMTViOGQ4YjMz OGE2Yjg2MmM2ZTljZmMzMzRmMGM4YTgwNWEzNC4uMTc4MjNlMzY0OGUwNDdlODFiMTZhNzc3MDY4 MjQwMTc3NTRiMzc2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxl L0tleWZyYW1lTGlzdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9LZXlm cmFtZUxpc3QuaApAQCAtOTUsNyArOTUsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGNvcHlLZXlm cmFtZXMoS2V5ZnJhbWVMaXN0Jik7CiAgICAgYm9vbCBoYXNJbXBsaWNpdEtleWZyYW1lcygpIGNv bnN0OwotICAgIHZvaWQgZmlsbEltcGxpY2l0S2V5ZnJhbWVzKGNvbnN0IEVsZW1lbnQmLCBTdHls ZTo6UmVzb2x2ZXImLCBjb25zdCBSZW5kZXJTdHlsZSopOworICAgIHZvaWQgZmlsbEltcGxpY2l0 S2V5ZnJhbWVzKGNvbnN0IEVsZW1lbnQmLCBTdHlsZTo6UmVzb2x2ZXImLCBjb25zdCBSZW5kZXJT dHlsZSogZWxlbWVudFN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSogcGFyZW50RWxlbWVudFN0eWxl KTsKIAogcHJpdmF0ZToKICAgICBBdG9tU3RyaW5nIG1fYW5pbWF0aW9uTmFtZTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvc3R5bGUvU3R5bGVSZXNvbHZlci5jcHAKaW5kZXggNGNiYTViN2Y5YmI3YjM2MGU3NzcxMmNm ZTg1OGMzODZkNDAyODE3MC4uMzRlODAyZmFmYzE3YTc1N2YyMjc2MTJjMzBmMmM4YzIwZTlhOTg3 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlci5jcHAKQEAgLTI0OSw3ICsyNDks NyBAQCBFbGVtZW50U3R5bGUgUmVzb2x2ZXI6OnN0eWxlRm9yRWxlbWVudChjb25zdCBFbGVtZW50 JiBlbGVtZW50LCBjb25zdCBSZW5kZXJTdHlsZQogICAgIHJldHVybiB7IHN0YXRlLnRha2VTdHls ZSgpLCBXVEZNb3ZlKGVsZW1lbnRTdHlsZVJlbGF0aW9ucykgfTsKIH0KIAotc3RkOjp1bmlxdWVf cHRyPFJlbmRlclN0eWxlPiBSZXNvbHZlcjo6c3R5bGVGb3JLZXlmcmFtZShjb25zdCBFbGVtZW50 JiBlbGVtZW50LCBjb25zdCBSZW5kZXJTdHlsZSogZWxlbWVudFN0eWxlLCBjb25zdCBTdHlsZVJ1 bGVLZXlmcmFtZSoga2V5ZnJhbWUsIEtleWZyYW1lVmFsdWUmIGtleWZyYW1lVmFsdWUpCitzdGQ6 OnVuaXF1ZV9wdHI8UmVuZGVyU3R5bGU+IFJlc29sdmVyOjpzdHlsZUZvcktleWZyYW1lKGNvbnN0 IEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IFJlbmRlclN0eWxlKiBlbGVtZW50U3R5bGUsIGNvbnN0 IFJlbmRlclN0eWxlKiBwYXJlbnRFbGVtZW50U3R5bGUsIGNvbnN0IFN0eWxlUnVsZUtleWZyYW1l KiBrZXlmcmFtZSwgS2V5ZnJhbWVWYWx1ZSYga2V5ZnJhbWVWYWx1ZSkKIHsKICAgICBSRUxFQVNF X0FTU0VSVCghbV9pc0RlbGV0ZWQpOwogCkBAIC0yNTksNyArMjU5LDcgQEAgc3RkOjp1bmlxdWVf cHRyPFJlbmRlclN0eWxlPiBSZXNvbHZlcjo6c3R5bGVGb3JLZXlmcmFtZShjb25zdCBFbGVtZW50 JiBlbGVtZW50LAogICAgIGF1dG8gc3RhdGUgPSBTdGF0ZShlbGVtZW50LCBudWxscHRyLCBtX292 ZXJyaWRlRG9jdW1lbnRFbGVtZW50U3R5bGUpOwogCiAgICAgc3RhdGUuc2V0U3R5bGUoUmVuZGVy U3R5bGU6OmNsb25lUHRyKCplbGVtZW50U3R5bGUpKTsKLSAgICBzdGF0ZS5zZXRQYXJlbnRTdHls ZShSZW5kZXJTdHlsZTo6Y2xvbmVQdHIobV9wYXJlbnRFbGVtZW50U3R5bGVGb3JLZXlmcmFtZXMg PyAqbV9wYXJlbnRFbGVtZW50U3R5bGVGb3JLZXlmcmFtZXMgOiAqZWxlbWVudFN0eWxlKSk7Cisg ICAgc3RhdGUuc2V0UGFyZW50U3R5bGUoUmVuZGVyU3R5bGU6OmNsb25lUHRyKHBhcmVudEVsZW1l bnRTdHlsZSA/ICpwYXJlbnRFbGVtZW50U3R5bGUgOiAqZWxlbWVudFN0eWxlKSk7CiAKICAgICBC dWlsZGVyIGJ1aWxkZXIoKnN0YXRlLnN0eWxlKCksIGJ1aWxkZXJDb250ZXh0KHN0YXRlKSwgcmVz dWx0LCB7IENhc2NhZGVMZXZlbDo6QXV0aG9yIH0pOwogICAgIGJ1aWxkZXIuYXBwbHlBbGxQcm9w ZXJ0aWVzKCk7CkBAIC0yODUsNyArMjg1LDcgQEAgYm9vbCBSZXNvbHZlcjo6aXNBbmltYXRpb25O YW1lVmFsaWQoY29uc3QgU3RyaW5nJiBuYW1lKQogICAgIHJldHVybiBtX2tleWZyYW1lc1J1bGVN YXAuZmluZChBdG9tU3RyaW5nKG5hbWUpLmltcGwoKSkgIT0gbV9rZXlmcmFtZXNSdWxlTWFwLmVu ZCgpOwogfQogCi12b2lkIFJlc29sdmVyOjprZXlmcmFtZVN0eWxlc0ZvckFuaW1hdGlvbihjb25z dCBFbGVtZW50JiBlbGVtZW50LCBjb25zdCBSZW5kZXJTdHlsZSogZWxlbWVudFN0eWxlLCBLZXlm cmFtZUxpc3QmIGxpc3QpCit2b2lkIFJlc29sdmVyOjprZXlmcmFtZVN0eWxlc0ZvckFuaW1hdGlv bihjb25zdCBFbGVtZW50JiBlbGVtZW50LCBjb25zdCBSZW5kZXJTdHlsZSogZWxlbWVudFN0eWxl LCBjb25zdCBSZW5kZXJTdHlsZSogcGFyZW50RWxlbWVudFN0eWxlLCBLZXlmcmFtZUxpc3QmIGxp c3QpCiB7CiAgICAgbGlzdC5jbGVhcigpOwogCkBAIC0zNDcsNyArMzQ3LDcgQEAgdm9pZCBSZXNv bHZlcjo6a2V5ZnJhbWVTdHlsZXNGb3JBbmltYXRpb24oY29uc3QgRWxlbWVudCYgZWxlbWVudCwg Y29uc3QgUmVuZGVyU3QKICAgICAgICAgLy8gQWRkIHRoaXMga2V5ZnJhbWUgc3R5bGUgdG8gYWxs IHRoZSBpbmRpY2F0ZWQga2V5IHRpbWVzCiAgICAgICAgIGZvciAoYXV0byBrZXkgOiBrZXlmcmFt ZS0+a2V5cygpKSB7CiAgICAgICAgICAgICBLZXlmcmFtZVZhbHVlIGtleWZyYW1lVmFsdWUoMCwg bnVsbHB0cik7Ci0gICAgICAgICAgICBrZXlmcmFtZVZhbHVlLnNldFN0eWxlKHN0eWxlRm9yS2V5 ZnJhbWUoZWxlbWVudCwgZWxlbWVudFN0eWxlLCBrZXlmcmFtZS5wdHIoKSwga2V5ZnJhbWVWYWx1 ZSkpOworICAgICAgICAgICAga2V5ZnJhbWVWYWx1ZS5zZXRTdHlsZShzdHlsZUZvcktleWZyYW1l KGVsZW1lbnQsIGVsZW1lbnRTdHlsZSwgcGFyZW50RWxlbWVudFN0eWxlLCBrZXlmcmFtZS5wdHIo KSwga2V5ZnJhbWVWYWx1ZSkpOwogICAgICAgICAgICAga2V5ZnJhbWVWYWx1ZS5zZXRLZXkoa2V5 KTsKICAgICAgICAgICAgIGlmIChhdXRvIHRpbWluZ0Z1bmN0aW9uQ1NTVmFsdWUgPSBrZXlmcmFt ZS0+cHJvcGVydGllcygpLmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NTUHJvcGVydHlBbmltYXRpb25U aW1pbmdGdW5jdGlvbikpCiAgICAgICAgICAgICAgICAga2V5ZnJhbWVWYWx1ZS5zZXRUaW1pbmdG dW5jdGlvbihUaW1pbmdGdW5jdGlvbjo6Y3JlYXRlRnJvbUNTU1ZhbHVlKCp0aW1pbmdGdW5jdGlv bkNTU1ZhbHVlLmdldCgpKSk7CkBAIC0zNTUsNyArMzU1LDcgQEAgdm9pZCBSZXNvbHZlcjo6a2V5 ZnJhbWVTdHlsZXNGb3JBbmltYXRpb24oY29uc3QgRWxlbWVudCYgZWxlbWVudCwgY29uc3QgUmVu ZGVyU3QKICAgICAgICAgfQogICAgIH0KIAotICAgIGxpc3QuZmlsbEltcGxpY2l0S2V5ZnJhbWVz KGVsZW1lbnQsICp0aGlzLCBlbGVtZW50U3R5bGUpOworICAgIGxpc3QuZmlsbEltcGxpY2l0S2V5 ZnJhbWVzKGVsZW1lbnQsICp0aGlzLCBlbGVtZW50U3R5bGUsIHBhcmVudEVsZW1lbnRTdHlsZSk7 CiB9CiAKIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4gUmVzb2x2ZXI6OnBzZXVkb1N0eWxl Rm9yRWxlbWVudChjb25zdCBFbGVtZW50JiBlbGVtZW50LCBjb25zdCBQc2V1ZG9FbGVtZW50UmVx dWVzdCYgcHNldWRvRWxlbWVudFJlcXVlc3QsIGNvbnN0IFJlbmRlclN0eWxlJiBwYXJlbnRTdHls ZSwgY29uc3QgUmVuZGVyU3R5bGUqIHBhcmVudEJveFN0eWxlLCBjb25zdCBTZWxlY3RvckZpbHRl ciogc2VsZWN0b3JGaWx0ZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHls ZVJlc29sdmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJlc29sdmVyLmgKaW5kZXgg NjE0ODY5MjkyN2I3ZWRiZGEzMGFlY2I4NzkxMGZmZDM2YzY2M2MyMi4uOWUwMmZiMmE2ZmZjZDky NDhiNWY3NzY5NGRmYThjM2U1ODY0NTEzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5 bGUvU3R5bGVSZXNvbHZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2 ZXIuaApAQCAtODcsNyArODcsNyBAQCBwdWJsaWM6CiAKICAgICBFbGVtZW50U3R5bGUgc3R5bGVG b3JFbGVtZW50KGNvbnN0IEVsZW1lbnQmLCBjb25zdCBSZW5kZXJTdHlsZSogcGFyZW50U3R5bGUs IGNvbnN0IFJlbmRlclN0eWxlKiBwYXJlbnRCb3hTdHlsZSA9IG51bGxwdHIsIFJ1bGVNYXRjaGlu Z0JlaGF2aW9yID0gUnVsZU1hdGNoaW5nQmVoYXZpb3I6Ok1hdGNoQWxsUnVsZXMsIGNvbnN0IFNl bGVjdG9yRmlsdGVyKiA9IG51bGxwdHIpOwogCi0gICAgdm9pZCBrZXlmcmFtZVN0eWxlc0ZvckFu aW1hdGlvbihjb25zdCBFbGVtZW50JiwgY29uc3QgUmVuZGVyU3R5bGUqLCBLZXlmcmFtZUxpc3Qm KTsKKyAgICB2b2lkIGtleWZyYW1lU3R5bGVzRm9yQW5pbWF0aW9uKGNvbnN0IEVsZW1lbnQmLCBj b25zdCBSZW5kZXJTdHlsZSogZWxlbWVudFN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSogcGFyZW50 RWxlbWVudFN0eWxlLCBLZXlmcmFtZUxpc3QmKTsKIAogICAgIFdFQkNPUkVfRVhQT1JUIHN0ZDo6 dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4gcHNldWRvU3R5bGVGb3JFbGVtZW50KGNvbnN0IEVsZW1l bnQmLCBjb25zdCBQc2V1ZG9FbGVtZW50UmVxdWVzdCYsIGNvbnN0IFJlbmRlclN0eWxlJiBwYXJl bnRTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUqIHBhcmVudEJveFN0eWxlID0gbnVsbHB0ciwgY29u c3QgU2VsZWN0b3JGaWx0ZXIqID0gbnVsbHB0cik7CiAKQEAgLTEwOCwxMiArMTA4LDkgQEAgcHVi bGljOgogICAgIGNvbnN0IFJlbmRlclN0eWxlKiBvdmVycmlkZURvY3VtZW50RWxlbWVudFN0eWxl KCkgY29uc3QgeyByZXR1cm4gbV9vdmVycmlkZURvY3VtZW50RWxlbWVudFN0eWxlOyB9CiAgICAg dm9pZCBzZXRPdmVycmlkZURvY3VtZW50RWxlbWVudFN0eWxlKGNvbnN0IFJlbmRlclN0eWxlKiBz dHlsZSkgeyBtX292ZXJyaWRlRG9jdW1lbnRFbGVtZW50U3R5bGUgPSBzdHlsZTsgfQogCi0gICAg Ly8gRklYTUU6IFJlbW92ZSBhbmQgcGFzcyB0aGlzIHRocm91Z2ggdGhlIGFuaW1hdGlvbiBzeXN0 ZW0gbm9ybWFsbHkuCi0gICAgdm9pZCBzZXRQYXJlbnRFbGVtZW50U3R5bGVGb3JLZXlmcmFtZXMo Y29uc3QgUmVuZGVyU3R5bGUqIHN0eWxlKSB7IG1fcGFyZW50RWxlbWVudFN0eWxlRm9yS2V5ZnJh bWVzID0gc3R5bGU7IH0KLQogICAgIHZvaWQgYWRkQ3VycmVudFNWR0ZvbnRGYWNlUnVsZXMoKTsK IAotICAgIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4gc3R5bGVGb3JLZXlmcmFtZShjb25z dCBFbGVtZW50JiwgY29uc3QgUmVuZGVyU3R5bGUqLCBjb25zdCBTdHlsZVJ1bGVLZXlmcmFtZSos IEtleWZyYW1lVmFsdWUmKTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3R5bGU+IHN0eWxl Rm9yS2V5ZnJhbWUoY29uc3QgRWxlbWVudCYsIGNvbnN0IFJlbmRlclN0eWxlKiBlbGVtZW50U3R5 bGUsIGNvbnN0IFJlbmRlclN0eWxlKiBwYXJlbnRFbGVtZW50U3R5bGUsIGNvbnN0IFN0eWxlUnVs ZUtleWZyYW1lKiwgS2V5ZnJhbWVWYWx1ZSYpOwogICAgIGJvb2wgaXNBbmltYXRpb25OYW1lVmFs aWQoY29uc3QgU3RyaW5nJik7CiAKICAgICAvLyBUaGVzZSBtZXRob2RzIHdpbGwgZ2l2ZSBiYWNr IHRoZSBzZXQgb2YgcnVsZXMgdGhhdCBtYXRjaGVkIGZvciBhIGdpdmVuIGVsZW1lbnQgKG9yIGEg cHNldWRvLWVsZW1lbnQpLgpAQCAtMTkxLDcgKzE4OCw2IEBAIHByaXZhdGU6CiAgICAgRG9jdW1l bnQmIG1fZG9jdW1lbnQ7CiAKICAgICBjb25zdCBSZW5kZXJTdHlsZSogbV9vdmVycmlkZURvY3Vt ZW50RWxlbWVudFN0eWxlIHsgbnVsbHB0ciB9OwotICAgIGNvbnN0IFJlbmRlclN0eWxlKiBtX3Bh cmVudEVsZW1lbnRTdHlsZUZvcktleWZyYW1lcyB7IG51bGxwdHIgfTsKIAogICAgIEluc3BlY3Rv ckNTU09NV3JhcHBlcnMgbV9pbnNwZWN0b3JDU1NPTVdyYXBwZXJzOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHAKaW5kZXggOTkzZjEzMDlhZDk2MjczZWEyMzIx ZDhiMjllNDMyZmZjZTJiZTQ4MS4uMjAwZjNlNmJmN2U0NWE0NzczOTlhNGI5NDc0Yjk0N2IwZDdm ZWMyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVUcmVlUmVzb2x2ZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmNwcApAQCAt MzMyLDE0ICszMzIsOCBAQCBFbGVtZW50VXBkYXRlIFRyZWVSZXNvbHZlcjo6Y3JlYXRlQW5pbWF0 ZWRFbGVtZW50VXBkYXRlKHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdAogICAgICAgICAvLyBUaGUg b3JkZXIgaW4gd2hpY2ggQ1NTIFRyYW5zaXRpb25zIGFuZCBDU1MgQW5pbWF0aW9ucyBhcmUgdXBk YXRlZCBtYXR0ZXJzIHNpbmNlIENTUyBUcmFuc2l0aW9ucyBkZWZpbmUgdGhlIGFmdGVyLWNoYW5n ZSBzdHlsZQogICAgICAgICAvLyB0byB1c2UgQ1NTIEFuaW1hdGlvbnMgYXMgZGVmaW5lZCBpbiB0 aGUgcHJldmlvdXMgc3R5bGUgY2hhbmdlIGV2ZW50LiBBcyBzdWNoLCB3ZSB1cGRhdGUgQ1NTIEFu aW1hdGlvbnMgYWZ0ZXIgQ1NTIFRyYW5zaXRpb25zCiAgICAgICAgIC8vIHN1Y2ggdGhhdCB3aGVu IENTUyBUcmFuc2l0aW9ucyBhcmUgdXBkYXRlZCB0aGUgQ1NTIEFuaW1hdGlvbnMgZGF0YSBpcyB0 aGUgc2FtZSBhcyBkdXJpbmcgdGhlIHByZXZpb3VzIHN0eWxlIGNoYW5nZSBldmVudC4KLSAgICAg ICAgaWYgKChvbGRTdHlsZSAmJiBvbGRTdHlsZS0+aGFzQW5pbWF0aW9ucygpKSB8fCBuZXdTdHls ZS0+aGFzQW5pbWF0aW9ucygpKSB7Ci0gICAgICAgICAgICAvLyBGSVhNRTogUmVtb3ZlIHRoaXMg aGFjayBhbmQgcGFzcyB0aGUgcGFyZW50IHN0eWxlIHZpYSB1cGRhdGVDU1NBbmltYXRpb25zRm9y U3R5bGVhYmxlLgotICAgICAgICAgICAgc2NvcGUoKS5yZXNvbHZlci5zZXRQYXJlbnRFbGVtZW50 U3R5bGVGb3JLZXlmcmFtZXMoJnBhcmVudCgpLnN0eWxlKTsKLQotICAgICAgICAgICAgbV9kb2N1 bWVudC50aW1lbGluZSgpLnVwZGF0ZUNTU0FuaW1hdGlvbnNGb3JTdHlsZWFibGUoc3R5bGVhYmxl LCBvbGRTdHlsZSwgKm5ld1N0eWxlKTsKLQotICAgICAgICAgICAgc2NvcGUoKS5yZXNvbHZlci5z ZXRQYXJlbnRFbGVtZW50U3R5bGVGb3JLZXlmcmFtZXMobnVsbHB0cik7Ci0gICAgICAgIH0KKyAg ICAgICAgaWYgKChvbGRTdHlsZSAmJiBvbGRTdHlsZS0+aGFzQW5pbWF0aW9ucygpKSB8fCBuZXdT dHlsZS0+aGFzQW5pbWF0aW9ucygpKQorICAgICAgICAgICAgbV9kb2N1bWVudC50aW1lbGluZSgp LnVwZGF0ZUNTU0FuaW1hdGlvbnNGb3JTdHlsZWFibGUoc3R5bGVhYmxlLCBvbGRTdHlsZSwgKm5l d1N0eWxlLCAmcGFyZW50KCkuc3R5bGUpOwogICAgIH0KIAogICAgIC8vIE5vdyB3ZSBjYW4gdXBk YXRlIGFsbCBXZWIgYW5pbWF0aW9ucywgd2hpY2ggd2lsbCBpbmNsdWRlIENTUyBBbmltYXRpb25z IGFzIHdlbGwK