218809 2020-11-11 09:53:09 -0800 Don't look in keychain for SecKeyRef after deserializing SecIdentityRef 2020-11-11 11:59:22 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen benjamin cdumez cmarcelo ews-watchlist ggaren webkit-bug-importer oldest_to_newest 1706501 0 achristensen 2020-11-11 09:53:09 -0800 Don't look in keychain for SecKeyRef after deserializing SecIdentityRef 1706503 1 413835 achristensen 2020-11-11 10:01:22 -0800 Created attachment 413835 Patch 1706505 2 413835 ggaren 2020-11-11 10:05:34 -0800 Comment on attachment 413835 Patch r=me 1706551 3 ews-feeder 2020-11-11 11:58:09 -0800 Committed r269696: <https://trac.webkit.org/changeset/269696> All reviewed patches have been landed. Closing bug and clearing flags on attachment 413835. 1706552 4 webkit-bug-importer 2020-11-11 11:59:22 -0800 <rdar://problem/71292960> 413835 2020-11-11 10:01:22 -0800 2020-11-11 11:58:09 -0800 Patch bug-218809-20201111100121.patch text/plain 13625 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NTg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDdhYzk0N2Q3NDczMjk5OWVhYzUwYzFj OGNkMzU5ZDYyYTYyNjg0NzQuLjM0ODdmOWY5YjE3MTcxNjBlYmQxZTBhYWZjNTdmY2NmNzgyYzVm NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMTEtMTEgIEFsZXggQ2hyaXN0ZW5zZW4gIDxh Y2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBEb24ndCBsb29rIGluIGtleWNoYWlu IGZvciBTZWNLZXlSZWYgYWZ0ZXIgZGVzZXJpYWxpemluZyBTZWNJZGVudGl0eVJlZgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE4ODA5CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS82OTM5NDAxOD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHd0Zi9zcGkvY29jb2EvU2VjdXJpdHlTUEkuaDoKKwogMjAy MC0xMS0wOSAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAKICAgICAgICAg W21hY09TXSBTZXQgcHJlZmVyZW5jZSBmb3Igb3ZlcnJpZGRlbiBsYW5ndWFnZXMgaW4gdGhlIFdl YkNvbnRlbnQgcHJvY2VzcyBhZnRlciBlbnRlcmluZyB0aGUgc2FuZGJveC4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXgg NzRlNGE3M2UxNDE2NWZhOTUyYjdjMDM0NmRhNjI2N2ZiZjA3NmFiYi4uMDg5N2ViYTNkMWMwZjBh YmI5MThmOWJmOWE5ZDg0Njk5OTQzZWQ5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNyBAQAorMjAy MC0xMS0xMSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisg ICAgICAgIERvbid0IGxvb2sgaW4ga2V5Y2hhaW4gZm9yIFNlY0tleVJlZiBhZnRlciBkZXNlcmlh bGl6aW5nIFNlY0lkZW50aXR5UmVmCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTg4MDkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY5Mzk0MDE4Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIHllIG9s ZGVuIGRheXMgb2YgV2ViS2l0Miwgd2UgdXNlZCB0byB1c2Ugc3BlY2lhbCBjb2RlIHRvIHNlcmlh bGl6ZSBhbiBOU1VSTENyZWRlbnRpYWwgd2l0aCBhbiBpZGVudGl0eS4KKyAgICAgICAgV2UgbmVl ZGVkIHRvIHNlcmlhbGl6ZSB0aGUgY2VydGlmaWNhdGUgY2hhaW4gYW5kIGEgd2F5IHRvIGxvb2sg aW4gdGhlIGtleWNoYWluIHRvIGZpbmQgdGhlIHByaXZhdGUga2V5LgorICAgICAgICBUaGF0IGRp ZG4ndCB3b3JrIHdpdGggdGhpcmQgcGFydHkgYXBwcyBub3QgZW50aXRsZWQgdG8gbG9vayBpbiB0 aGUga2V5Y2hhaW4sIGFuZCBpdCBhbHNvIGRpZG4ndCB3b3JrIHdpdGggaGFyZHdhcmUKKyAgICAg ICAga2V5cyB0aGF0IHJldGFpbiB0aGUgcHJpdmF0ZSBrZXkgdGhlbXNlbHZlcywgc28gd2UgaW50 cm9kdWNlZCBTZWNLZXlQcm94eS4gIE5vdywgYWxsIHRob3NlIHRoaW5ncyB3b3JrIGFuZCB3ZSBk b24ndAorICAgICAgICBzZXJpYWxpemUgU2VjSWRlbnRpdHlSZWZzIGFueSBtb3JlLCBzbyBsZXQn cyByZW1vdmUgdGhlIHByb2JsZW1hdGljIGRlYWQgY29kZSB0aGF0IHdvdWxkIGhhdmUgdHJpZWQu CisgICAgICAgIEx1Y2tpbHksIHdlIG5vdyBoYXZlIEFQSSB0ZXN0cyB0aGF0IHZlcmlmeSB0aGF0 IGNsaWVudCBjZXJ0aWZpY2F0ZSBhdXRoZW50aWNhdGlvbiBzdGlsbCB3b3Jrcy4KKworICAgICAg ICByMTY5OTM4IGFkZGVkIGEgcmVzdHJpY3Rpb24gdG8gbG9va2luZyBpbiB0aGUga2V5Y2hhaW4g b25seSBpZiB0aGUgcGFyZW50IGFwcCBoYXMgZW50aXRsZW1lbnRzIG5lZWRlZCB0byBkbyBzby4K KyAgICAgICAgVGhhdCByZXN0cmljdGlvbiBpc24ndCBuZWVkZWQgYW55IG1vcmUgYmVjYXVzZSBu b2JvZHkgbG9va3MgaW4gdGhlIGtleWNoYWluIGZyb20gdGhlIG5ldHdvcmsgcHJvY2Vzcy4KKwor ICAgICAgICByMjY5MTYyIGVudGlyZWx5IHJlbW92ZWQgbG9va2luZyBpbiB0aGUga2V5Y2hhaW4g Zm9yIHByaXZhdGUga2V5cyBmb3IgY2xpZW50IGNlcnRpZmljYXRlIGF1dGhlbnRpY2F0aW9uLgor ICAgICAgICBUaGlzIGlzIG1vdmluZyBpbiB0aGF0IHNhbWUgZGlyZWN0aW9uLgorCisgICAgICAg ICogU2hhcmVkL0VudHJ5UG9pbnRVdGlsaXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2aWNl RW50cnlQb2ludC5tbToKKyAgICAgICAgKFdlYktpdDo6WFBDU2VydmljZUluaXRpYWxpemVyRGVs ZWdhdGU6OmNoZWNrRW50aXRsZW1lbnRzKToKKyAgICAgICAgKiBTaGFyZWQvY2YvQXJndW1lbnRD b2RlcnNDRi5jcHA6CisgICAgICAgIChJUEM6OnR5cGVGcm9tQ0ZUeXBlUmVmKToKKyAgICAgICAg KElQQzo6ZW5jb2RlKToKKyAgICAgICAgKElQQzo6ZGVjb2RlKToKKyAgICAgICAgKElQQzo6c2V0 QWxsb3dzRGVjb2RpbmdTZWNLZXlSZWYpOiBEZWxldGVkLgorICAgICAgICAoSVBDOjpjb3B5UGVy c2lzdGVudFJlZik6IERlbGV0ZWQuCisgICAgICAgICogU2hhcmVkL2NmL0FyZ3VtZW50Q29kZXJz Q0YuaDoKKyAgICAgICAgKiBTaGFyZWQvbWFjL1dlYkNvcmVBcmd1bWVudENvZGVyc01hYy5tbToK KyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxXZWJDb3JlOjpDcmVkZW50aWFsPjo6ZW5jb2Rl UGxhdGZvcm1EYXRhKToKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxXZWJDb3JlOjpDcmVk ZW50aWFsPjo6ZGVjb2RlUGxhdGZvcm1EYXRhKToKKwogMjAyMC0xMS0wOSAgUGVyIEFybmUgVm9s bGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW21hY09TXSBTZXQgcHJlZmVyZW5j ZSBmb3Igb3ZlcnJpZGRlbiBsYW5ndWFnZXMgaW4gdGhlIFdlYkNvbnRlbnQgcHJvY2VzcyBhZnRl ciBlbnRlcmluZyB0aGUgc2FuZGJveC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL3NwaS9j b2NvYS9TZWN1cml0eVNQSS5oIGIvU291cmNlL1dURi93dGYvc3BpL2NvY29hL1NlY3VyaXR5U1BJ LmgKaW5kZXggNzdkYzgzMGEzZWVlNmJkYWI2MGNiYWNmMzY0MTQ5NmQ0ZjM4MjNiNS4uNTYzNzI3 Yzk0MWRiNDczYzA1Y2UxMmJjMmVlYzVjY2E4OTg4OGY3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dU Ri93dGYvc3BpL2NvY29hL1NlY3VyaXR5U1BJLmgKKysrIGIvU291cmNlL1dURi93dGYvc3BpL2Nv Y29hL1NlY3VyaXR5U1BJLmgKQEAgLTc4LDcgKzc4LDYgQEAgU2VjVGFza1JlZiBTZWNUYXNrQ3Jl YXRlV2l0aEF1ZGl0VG9rZW4oQ0ZBbGxvY2F0b3JSZWYsIGF1ZGl0X3Rva2VuX3QpOwogU2VjVGFz a1JlZiBTZWNUYXNrQ3JlYXRlRnJvbVNlbGYoQ0ZBbGxvY2F0b3JSZWYpOwogQ0ZUeXBlUmVmIFNl Y1Rhc2tDb3B5VmFsdWVGb3JFbnRpdGxlbWVudChTZWNUYXNrUmVmLCBDRlN0cmluZ1JlZiBlbnRp dGxlbWVudCwgQ0ZFcnJvclJlZiopOwogU2VjSWRlbnRpdHlSZWYgU2VjSWRlbnRpdHlDcmVhdGUo Q0ZBbGxvY2F0b3JSZWYsIFNlY0NlcnRpZmljYXRlUmVmLCBTZWNLZXlSZWYpOwotT1NTdGF0dXMg U2VjS2V5RmluZFdpdGhQZXJzaXN0ZW50UmVmKENGRGF0YVJlZiBwZXJzaXN0ZW50UmVmLCBTZWNL ZXlSZWYqIGxvb2tlZFVwRGF0YSk7CiBTZWNBY2Nlc3NDb250cm9sUmVmIFNlY0FjY2Vzc0NvbnRy b2xDcmVhdGVGcm9tRGF0YShDRkFsbG9jYXRvclJlZiwgQ0ZEYXRhUmVmLCBDRkVycm9yUmVmKik7 CiBDRkRhdGFSZWYgU2VjQWNjZXNzQ29udHJvbENvcHlEYXRhKFNlY0FjY2Vzc0NvbnRyb2xSZWYp OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVz L0NvY29hL1hQQ1NlcnZpY2UvWFBDU2VydmljZUVudHJ5UG9pbnQubW0gYi9Tb3VyY2UvV2ViS2l0 L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVzL0NvY29hL1hQQ1NlcnZpY2UvWFBDU2VydmljZUVu dHJ5UG9pbnQubW0KaW5kZXggYmZlZDQzY2E0ZTcxOWJkYjY1YzI1NzQzMjRiMDViODJjZGVkMGI5 ZS4uODgwODcyOTg0OTBmZTg2MGY4MzhmOTNiYjk4ODkxNzFhMDI2ZGQ1OSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9TaGFyZWQvRW50cnlQb2ludFV0aWxpdGllcy9Db2NvYS9YUENTZXJ2aWNl L1hQQ1NlcnZpY2VFbnRyeVBvaW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VudHJ5 UG9pbnRVdGlsaXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2aWNlRW50cnlQb2ludC5tbQpA QCAtNTIsMTkgKzUyLDYgQEAgYm9vbCBYUENTZXJ2aWNlSW5pdGlhbGl6ZXJEZWxlZ2F0ZTo6Y2hl Y2tFbnRpdGxlbWVudHMoKQogICAgICAgICB9CiAgICAgfQogI2VuZGlmCi0jaWYgUExBVEZPUk0o SU9TX0ZBTUlMWSkKLSAgICBhdXRvIHZhbHVlID0gYWRvcHRPU09iamVjdCh4cGNfY29ubmVjdGlv bl9jb3B5X2VudGl0bGVtZW50X3ZhbHVlKG1fY29ubmVjdGlvbi5nZXQoKSwgImtleWNoYWluLWFj Y2Vzcy1ncm91cHMiKSk7Ci0gICAgaWYgKHZhbHVlICYmIHhwY19nZXRfdHlwZSh2YWx1ZS5nZXQo KSkgPT0gWFBDX1RZUEVfQVJSQVkpIHsKLSAgICAgICAgeHBjX2FycmF5X2FwcGx5KHZhbHVlLmdl dCgpLCBeYm9vbChzaXplX3QgaW5kZXgsIHhwY19vYmplY3RfdCBvYmplY3QpIHsKLSAgICAgICAg ICAgIGlmICh4cGNfZ2V0X3R5cGUob2JqZWN0KSA9PSBYUENfVFlQRV9TVFJJTkcgJiYgIXN0cmNt cCh4cGNfc3RyaW5nX2dldF9zdHJpbmdfcHRyKG9iamVjdCksICJjb20uYXBwbGUuaWRlbnRpdGll cyIpKSB7Ci0gICAgICAgICAgICAgICAgSVBDOjpzZXRBbGxvd3NEZWNvZGluZ1NlY0tleVJlZih0 cnVlKTsKLSAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICB9Ci0gICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgfSk7Ci0gICAgfQotI2VuZGlmCi0KICAgICBy ZXR1cm4gdHJ1ZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvY2YvQXJn dW1lbnRDb2RlcnNDRi5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9jZi9Bcmd1bWVudENvZGVy c0NGLmNwcAppbmRleCA3NTk0NGU5ZWUxN2IxN2YzMmMzMDdhNGY1MDk4YzhjNjQzNjliODdjLi45 YmQ4YTgxNzU0OWY1OGZlMzgzZDcyNWRhNjYzZjNiYzU0Y2EwZDc0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9jZi9Bcmd1bWVudENvZGVyc0NGLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9jZi9Bcmd1bWVudENvZGVyc0NGLmNwcApAQCAtNjIsNyArNjIsNiBAQCBlbnVt IGNsYXNzIENGVHlwZSA6IHVpbnQ4X3QgewogICAgIENGU3RyaW5nLAogICAgIENGVVJMLAogICAg IFNlY0NlcnRpZmljYXRlLAotICAgIFNlY0lkZW50aXR5LAogI2lmIEhBVkUoU0VDX0tFWUNIQUlO KQogICAgIFNlY0tleWNoYWluSXRlbSwKICNlbmRpZgpAQCAtMTA0LDggKzEwMyw2IEBAIHN0YXRp YyBDRlR5cGUgdHlwZUZyb21DRlR5cGVSZWYoQ0ZUeXBlUmVmIHR5cGUpCiAgICAgICAgIHJldHVy biBDRlR5cGU6OkNGVVJMOwogICAgIGlmICh0eXBlSUQgPT0gU2VjQ2VydGlmaWNhdGVHZXRUeXBl SUQoKSkKICAgICAgICAgcmV0dXJuIENGVHlwZTo6U2VjQ2VydGlmaWNhdGU7Ci0gICAgaWYgKHR5 cGVJRCA9PSBTZWNJZGVudGl0eUdldFR5cGVJRCgpKQotICAgICAgICByZXR1cm4gQ0ZUeXBlOjpT ZWNJZGVudGl0eTsKICNpZiBIQVZFKFNFQ19LRVlDSEFJTikKICAgICBpZiAodHlwZUlEID09IFNl Y0tleWNoYWluSXRlbUdldFR5cGVJRCgpKQogICAgICAgICByZXR1cm4gQ0ZUeXBlOjpTZWNLZXlj aGFpbkl0ZW07CkBAIC0xNTgsOSArMTU1LDYgQEAgdm9pZCBlbmNvZGUoRW5jb2RlciYgZW5jb2Rl ciwgQ0ZUeXBlUmVmIHR5cGVSZWYpCiAgICAgY2FzZSBDRlR5cGU6OlNlY0NlcnRpZmljYXRlOgog ICAgICAgICBlbmNvZGUoZW5jb2Rlciwgc3RhdGljX2Nhc3Q8U2VjQ2VydGlmaWNhdGVSZWY+KGNv bnN0X2Nhc3Q8dm9pZCo+KHR5cGVSZWYpKSk7CiAgICAgICAgIHJldHVybjsKLSAgICBjYXNlIENG VHlwZTo6U2VjSWRlbnRpdHk6Ci0gICAgICAgIGVuY29kZShlbmNvZGVyLCBzdGF0aWNfY2FzdDxT ZWNJZGVudGl0eVJlZj4oY29uc3RfY2FzdDx2b2lkKj4odHlwZVJlZikpKTsKLSAgICAgICAgcmV0 dXJuOwogI2lmIEhBVkUoU0VDX0tFWUNIQUlOKQogICAgIGNhc2UgQ0ZUeXBlOjpTZWNLZXljaGFp bkl0ZW06CiAgICAgICAgIGVuY29kZShlbmNvZGVyLCBzdGF0aWNfY2FzdDxTZWNLZXljaGFpbkl0 ZW1SZWY+KGNvbnN0X2Nhc3Q8dm9pZCo+KHR5cGVSZWYpKSk7CkBAIC0yNTgsMTMgKzI1Miw2IEBA IGJvb2wgZGVjb2RlKERlY29kZXImIGRlY29kZXIsIFJldGFpblB0cjxDRlR5cGVSZWY+JiByZXN1 bHQpCiAgICAgICAgIHJlc3VsdCA9IGFkb3B0Q0YoY2VydGlmaWNhdGUubGVha1JlZigpKTsKICAg ICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQotICAgIGNhc2UgQ0ZUeXBlOjpTZWNJZGVudGl0eTog ewotICAgICAgICBSZXRhaW5QdHI8U2VjSWRlbnRpdHlSZWY+IGlkZW50aXR5OwotICAgICAgICBp ZiAoIWRlY29kZShkZWNvZGVyLCBpZGVudGl0eSkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7 Ci0gICAgICAgIHJlc3VsdCA9IGFkb3B0Q0YoaWRlbnRpdHkubGVha1JlZigpKTsKLSAgICAgICAg cmV0dXJuIHRydWU7Ci0gICAgfQogI2lmIEhBVkUoU0VDX0tFWUNIQUlOKQogICAgIGNhc2UgQ0ZU eXBlOjpTZWNLZXljaGFpbkl0ZW06IHsKICAgICAgICAgUmV0YWluUHRyPFNlY0tleWNoYWluSXRl bVJlZj4ga2V5Y2hhaW5JdGVtOwpAQCAtNjYwLDk5ICs2NDcsNiBAQCBib29sIGRlY29kZShEZWNv ZGVyJiBkZWNvZGVyLCBSZXRhaW5QdHI8U2VjQ2VydGlmaWNhdGVSZWY+JiByZXN1bHQpCiAgICAg cmV0dXJuIHRydWU7CiB9CiAKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotc3RhdGljIGJvb2wg c2VjS2V5UmVmRGVjb2RpbmdBbGxvd2VkOwotCi12b2lkIHNldEFsbG93c0RlY29kaW5nU2VjS2V5 UmVmKGJvb2wgYWxsb3dzRGVjb2RpbmdTZWNLZXlSZWYpCi17Ci0gICAgc2VjS2V5UmVmRGVjb2Rp bmdBbGxvd2VkID0gYWxsb3dzRGVjb2RpbmdTZWNLZXlSZWY7Ci19Ci0KLXN0YXRpYyBDRkRhdGFS ZWYgY29weVBlcnNpc3RlbnRSZWYoU2VjS2V5UmVmIGtleSkKLXsKLSAgICBSRUxFQVNFX0FTU0VS VChoYXNQcm9jZXNzUHJpdmlsZWdlKFByb2Nlc3NQcml2aWxlZ2U6OkNhbkFjY2Vzc0NyZWRlbnRp YWxzKSk7Ci0gICAgLy8gVGhpcyBmdW5jdGlvbiBkaWZmZXJzIGZyb20gU2VjSXRlbUNvcHlQZXJz aXN0ZW50UmVmIGluIHRoYXQgaXQgc3BlY2lmaWVzIGFuIGFjY2VzcyBncm91cC4KLSAgICAvLyBU aGlzIGlzIG5lY2Vzc2FyeSBpbiBjYXNlIHRoZXJlIGFyZSBtdWx0aXBsZSBjb3BpZXMgb2YgdGhl IGtleSBpbiB0aGUga2V5Y2hhaW4sIGJlY2F1c2Ugd2UKLSAgICAvLyBuZWVkIGEgcmVmZXJlbmNl IHRvIHRoZSBvbmUgdGhhdCB0aGUgTmV0d29ya2luZyBwcm9jZXNzIHdpbGwgYmUgYWJsZSB0byBh Y2Nlc3MuCi0gICAgQ0ZEYXRhUmVmIHBlcnNpc3RlbnRSZWYgPSBudWxscHRyOwotICAgIFNlY0l0 ZW1Db3B5TWF0Y2hpbmcoKENGRGljdGlvbmFyeVJlZilAewotICAgICAgICAoaWQpa1NlY1JldHVy blBlcnNpc3RlbnRSZWY6IEBZRVMsCi0gICAgICAgIChpZClrU2VjVmFsdWVSZWY6IChpZClrZXks Ci0gICAgICAgIChpZClrU2VjQXR0clN5bmNocm9uaXphYmxlOiAoaWQpa1NlY0F0dHJTeW5jaHJv bml6YWJsZUFueSwKLSAgICAgICAgKGlkKWtTZWNBdHRyQWNjZXNzR3JvdXA6IEAiY29tLmFwcGxl LmlkZW50aXRpZXMiLAotICAgIH0sIChDRlR5cGVSZWYqKSZwZXJzaXN0ZW50UmVmKTsKLQotICAg IHJldHVybiBwZXJzaXN0ZW50UmVmOwotfQotI2VuZGlmCi0KLXZvaWQgZW5jb2RlKEVuY29kZXIm IGVuY29kZXIsIFNlY0lkZW50aXR5UmVmIGlkZW50aXR5KQotewotICAgIFNlY0NlcnRpZmljYXRl UmVmIGNlcnRpZmljYXRlID0gbnVsbHB0cjsKLSAgICBTZWNJZGVudGl0eUNvcHlDZXJ0aWZpY2F0 ZShpZGVudGl0eSwgJmNlcnRpZmljYXRlKTsKLSAgICBlbmNvZGUoZW5jb2RlciwgY2VydGlmaWNh dGUpOwotICAgIENGUmVsZWFzZShjZXJ0aWZpY2F0ZSk7Ci0KLSAgICBTZWNLZXlSZWYga2V5ID0g bnVsbHB0cjsKLSAgICBTZWNJZGVudGl0eUNvcHlQcml2YXRlS2V5KGlkZW50aXR5LCAma2V5KTsK LQotICAgIENGRGF0YVJlZiBrZXlEYXRhID0gbnVsbHB0cjsKLSNpZiBQTEFURk9STShJT1NfRkFN SUxZKQotICAgIGtleURhdGEgPSBjb3B5UGVyc2lzdGVudFJlZihrZXkpOwotI2VuZGlmCi0jaWYg UExBVEZPUk0oTUFDKQotICAgIFJFTEVBU0VfQVNTRVJUKGhhc1Byb2Nlc3NQcml2aWxlZ2UoUHJv Y2Vzc1ByaXZpbGVnZTo6Q2FuQWNjZXNzQ3JlZGVudGlhbHMpKTsKLSAgICBTZWNLZXljaGFpbkl0 ZW1DcmVhdGVQZXJzaXN0ZW50UmVmZXJlbmNlKChTZWNLZXljaGFpbkl0ZW1SZWYpa2V5LCAma2V5 RGF0YSk7Ci0jZW5kaWYKLSAgICBDRlJlbGVhc2Uoa2V5KTsKLQotICAgIGVuY29kZXIgPDwgISFr ZXlEYXRhOwotICAgIGlmIChrZXlEYXRhKSB7Ci0gICAgICAgIGVuY29kZShlbmNvZGVyLCBrZXlE YXRhKTsKLSAgICAgICAgQ0ZSZWxlYXNlKGtleURhdGEpOwotICAgIH0KLX0KLQotYm9vbCBkZWNv ZGUoRGVjb2RlciYgZGVjb2RlciwgUmV0YWluUHRyPFNlY0lkZW50aXR5UmVmPiYgcmVzdWx0KQot ewotICAgIFJldGFpblB0cjxTZWNDZXJ0aWZpY2F0ZVJlZj4gY2VydGlmaWNhdGU7Ci0gICAgaWYg KCFkZWNvZGUoZGVjb2RlciwgY2VydGlmaWNhdGUpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0K LSAgICBib29sIGhhc0tleTsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGhhc0tleSkpCi0gICAg ICAgIHJldHVybiBmYWxzZTsKLQotICAgIGlmICghaGFzS2V5KQotICAgICAgICByZXR1cm4gdHJ1 ZTsKLQotICAgIFJldGFpblB0cjxDRkRhdGFSZWY+IGtleURhdGE7Ci0gICAgaWYgKCFkZWNvZGUo ZGVjb2Rlciwga2V5RGF0YSkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotI2lmIFBMQVRGT1JN KENPQ09BKQotICAgIGlmICghaGFzUHJvY2Vzc1ByaXZpbGVnZShQcm9jZXNzUHJpdmlsZWdlOjpD YW5BY2Nlc3NDcmVkZW50aWFscykpCi0gICAgICAgIHJldHVybiB0cnVlOwotI2VuZGlmCi0KLSAg ICBTZWNLZXlSZWYga2V5ID0gbnVsbHB0cjsKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAg IGlmIChzZWNLZXlSZWZEZWNvZGluZ0FsbG93ZWQpCi0gICAgICAgIEFMTE9XX0RFUFJFQ0FURURf REVDTEFSQVRJT05TX0JFR0lOCi0gICAgICAgIFNlY0tleUZpbmRXaXRoUGVyc2lzdGVudFJlZihr ZXlEYXRhLmdldCgpLCAma2V5KTsKLSAgICAgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElP TlNfRU5ECi0jZW5kaWYKLSNpZiBQTEFURk9STShNQUMpCi0gICAgU2VjS2V5Y2hhaW5JdGVtQ29w eUZyb21QZXJzaXN0ZW50UmVmZXJlbmNlKGtleURhdGEuZ2V0KCksIChTZWNLZXljaGFpbkl0ZW1S ZWYqKSZrZXkpOwotI2VuZGlmCi0gICAgaWYgKGtleSkgewotICAgICAgICByZXN1bHQgPSBhZG9w dENGKFNlY0lkZW50aXR5Q3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1bHQsIGNlcnRpZmljYXRlLmdl dCgpLCBrZXkpKTsKLSAgICAgICAgQ0ZSZWxlYXNlKGtleSk7Ci0gICAgfQotCi0gICAgcmV0dXJu IHRydWU7Ci19Ci0KICNpZiBIQVZFKFNFQ19LRVlDSEFJTikKIHZvaWQgZW5jb2RlKEVuY29kZXIm IGVuY29kZXIsIFNlY0tleWNoYWluSXRlbVJlZiBrZXljaGFpbkl0ZW0pCiB7CkBAIC04NTYsNyAr NzUwLDYgQEAgdGVtcGxhdGU8PiBzdHJ1Y3QgRW51bVRyYWl0czxJUEM6OkNGVHlwZT4gewogICAg IElQQzo6Q0ZUeXBlOjpDRlN0cmluZywKICAgICBJUEM6OkNGVHlwZTo6Q0ZVUkwsCiAgICAgSVBD OjpDRlR5cGU6OlNlY0NlcnRpZmljYXRlLAotICAgIElQQzo6Q0ZUeXBlOjpTZWNJZGVudGl0eSwK ICNpZiBIQVZFKFNFQ19LRVlDSEFJTikKICAgICBJUEM6OkNGVHlwZTo6U2VjS2V5Y2hhaW5JdGVt LAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9jZi9Bcmd1bWVudENv ZGVyc0NGLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9jZi9Bcmd1bWVudENvZGVyc0NGLmgKaW5k ZXggYzUyMGFjOTQ3Nzk2Y2JlMDFjMmIwNmFkN2E5MjZlZmE2ZDNiNjQ0Ni4uMWIzYTE1ZDlmMTky YTllMTc1YmEwZGVkNmIxM2YzYWE5ZjU1MzkzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9T aGFyZWQvY2YvQXJndW1lbnRDb2RlcnNDRi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2Nm L0FyZ3VtZW50Q29kZXJzQ0YuaApAQCAtNzksMTAgKzc5LDYgQEAgV0FSTl9VTlVTRURfUkVUVVJO IGJvb2wgZGVjb2RlKERlY29kZXImLCBSZXRhaW5QdHI8Q0ZVUkxSZWY+JiByZXN1bHQpOwogdm9p ZCBlbmNvZGUoRW5jb2RlciYsIFNlY0NlcnRpZmljYXRlUmVmKTsKIFdBUk5fVU5VU0VEX1JFVFVS TiBib29sIGRlY29kZShEZWNvZGVyJiwgUmV0YWluUHRyPFNlY0NlcnRpZmljYXRlUmVmPiYgcmVz dWx0KTsKIAotLy8gU2VjSWRlbnRpdHlSZWYKLXZvaWQgZW5jb2RlKEVuY29kZXImLCBTZWNJZGVu dGl0eVJlZik7Ci1XQVJOX1VOVVNFRF9SRVRVUk4gYm9vbCBkZWNvZGUoRGVjb2RlciYsIFJldGFp blB0cjxTZWNJZGVudGl0eVJlZj4mIHJlc3VsdCk7Ci0KICNpZiBIQVZFKFNFQ19LRVlDSEFJTikK IC8vIFNlY0tleWNoYWluSXRlbVJlZgogdm9pZCBlbmNvZGUoRW5jb2RlciYsIFNlY0tleWNoYWlu SXRlbVJlZik7CkBAIC0xMDEsMTAgKzk3LDYgQEAgdm9pZCBlbmNvZGUoRW5jb2RlciYsIFNlY1Ry dXN0UmVmKTsKIFdBUk5fVU5VU0VEX1JFVFVSTiBib29sIGRlY29kZShEZWNvZGVyJiwgUmV0YWlu UHRyPFNlY1RydXN0UmVmPiYpOwogI2VuZGlmCiAKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQot dm9pZCBzZXRBbGxvd3NEZWNvZGluZ1NlY0tleVJlZihib29sKTsKLSNlbmRpZgotCiBDRlR5cGVS ZWYgdG9rZW5OdWxscHRyVHlwZVJlZigpOwogCiB9IC8vIG5hbWVzcGFjZSBJUEMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9XZWJDb3JlQXJndW1lbnRDb2RlcnNNYWMubW0g Yi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvV2ViQ29yZUFyZ3VtZW50Q29kZXJzTWFjLm1tCmlu ZGV4IGY1NDE1MWNkN2E4OThkMDU4Njg0NjRlOWM0MzhjYjc2ZTQ1YTc3M2YuLmVlOTFkMDhlMDE0 OTQzNjE0MDhjOTFjNDIwMGM2YWNlMzdiOWM3MWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv U2hhcmVkL21hYy9XZWJDb3JlQXJndW1lbnRDb2RlcnNNYWMubW0KKysrIGIvU291cmNlL1dlYktp dC9TaGFyZWQvbWFjL1dlYkNvcmVBcmd1bWVudENvZGVyc01hYy5tbQpAQCAtNDU0LDU5ICs0NTQs MTQgQEAgYm9vbCBBcmd1bWVudENvZGVyPFdlYkNvcmU6OlByb3RlY3Rpb25TcGFjZT46OmRlY29k ZVBsYXRmb3JtRGF0YShEZWNvZGVyJiBkZWNvZGUKIHZvaWQgQXJndW1lbnRDb2RlcjxXZWJDb3Jl OjpDcmVkZW50aWFsPjo6ZW5jb2RlUGxhdGZvcm1EYXRhKEVuY29kZXImIGVuY29kZXIsIGNvbnN0 IFdlYkNvcmU6OkNyZWRlbnRpYWwmIGNyZWRlbnRpYWwpCiB7CiAgICAgTlNVUkxDcmVkZW50aWFs ICpuc0NyZWRlbnRpYWwgPSBjcmVkZW50aWFsLm5zQ3JlZGVudGlhbCgpOwotICAgIC8vIE5TVVJM Q3JlZGVudGlhbCBkb2Vzbid0IHNlcmlhbGl6ZSBpZGVudGl0aWVzIGNvcnJlY3RseSwgc28gd2Ug ZW5jb2RlIHRoZSBwaWVjZXMgaW5kaXZpZHVhbGx5Ci0gICAgLy8gaW4gdGhlIGlkZW50aXR5IGNh c2UuIFNlZSA8cmRhcjovL3Byb2JsZW0vMTg4MDI0MzQ+LgotICAgIGlmIChTZWNJZGVudGl0eVJl ZiBpZGVudGl0eSA9IG5zQ3JlZGVudGlhbC5pZGVudGl0eSkgewotICAgICAgICBlbmNvZGVyIDw8 IHRydWU7Ci0gICAgICAgIElQQzo6ZW5jb2RlKGVuY29kZXIsIGlkZW50aXR5KTsKLQotICAgICAg ICBpZiAoTlNBcnJheSAqY2VydGlmaWNhdGVzID0gbnNDcmVkZW50aWFsLmNlcnRpZmljYXRlcykg ewotICAgICAgICAgICAgZW5jb2RlciA8PCB0cnVlOwotICAgICAgICAgICAgSVBDOjplbmNvZGUo ZW5jb2RlciwgKF9fYnJpZGdlIENGQXJyYXlSZWYpY2VydGlmaWNhdGVzKTsKLSAgICAgICAgfSBl bHNlCi0gICAgICAgICAgICBlbmNvZGVyIDw8IGZhbHNlOwotCi0gICAgICAgIGVuY29kZXIgPDwg c3RhdGljX2Nhc3Q8dWludDY0X3Q+KG5zQ3JlZGVudGlhbC5wZXJzaXN0ZW5jZSk7Ci0gICAgICAg IHJldHVybjsKLSAgICB9Ci0KLSAgICBlbmNvZGVyIDw8IGZhbHNlOwogICAgIGVuY29kZXIgPDwg bnNDcmVkZW50aWFsOwogfQogCiBib29sIEFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6Q3JlZGVudGlh bD46OmRlY29kZVBsYXRmb3JtRGF0YShEZWNvZGVyJiBkZWNvZGVyLCBXZWJDb3JlOjpDcmVkZW50 aWFsJiBjcmVkZW50aWFsKQogewotICAgIGJvb2wgaGFzSWRlbnRpdHk7Ci0gICAgaWYgKCFkZWNv ZGVyLmRlY29kZShoYXNJZGVudGl0eSkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIGlm IChoYXNJZGVudGl0eSkgewotICAgICAgICBSZXRhaW5QdHI8U2VjSWRlbnRpdHlSZWY+IGlkZW50 aXR5OwotICAgICAgICBpZiAoIUlQQzo6ZGVjb2RlKGRlY29kZXIsIGlkZW50aXR5KSkKLSAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgICAgICBSZXRhaW5QdHI8Q0ZBcnJheVJlZj4gY2Vy dGlmaWNhdGVzOwotICAgICAgICBib29sIGhhc0NlcnRpZmljYXRlczsKLSAgICAgICAgaWYgKCFk ZWNvZGVyLmRlY29kZShoYXNDZXJ0aWZpY2F0ZXMpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNl OwotCi0gICAgICAgIGlmIChoYXNDZXJ0aWZpY2F0ZXMpIHsKLSAgICAgICAgICAgIGlmICghSVBD OjpkZWNvZGUoZGVjb2RlciwgY2VydGlmaWNhdGVzKSkKLSAgICAgICAgICAgICAgICByZXR1cm4g ZmFsc2U7Ci0gICAgICAgIH0KLQotICAgICAgICB1aW50NjRfdCBwZXJzaXN0ZW5jZTsKLSAgICAg ICAgaWYgKCFkZWNvZGVyLmRlY29kZShwZXJzaXN0ZW5jZSkpCi0gICAgICAgICAgICByZXR1cm4g ZmFsc2U7Ci0KLSAgICAgICAgY3JlZGVudGlhbCA9IFdlYkNvcmU6OkNyZWRlbnRpYWwoYWRvcHRO UyhbW05TVVJMQ3JlZGVudGlhbCBhbGxvY10gaW5pdFdpdGhJZGVudGl0eTppZGVudGl0eS5nZXQo KSBjZXJ0aWZpY2F0ZXM6KF9fYnJpZGdlIE5TQXJyYXkgKiljZXJ0aWZpY2F0ZXMuZ2V0KCkgcGVy c2lzdGVuY2U6KE5TVVJMQ3JlZGVudGlhbFBlcnNpc3RlbmNlKXBlcnNpc3RlbmNlXSkuZ2V0KCkp OwotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0KICAgICBhdXRvIG5zQ3JlZGVudGlhbCA9 IElQQzo6ZGVjb2RlPE5TVVJMQ3JlZGVudGlhbD4oZGVjb2Rlcik7CiAgICAgaWYgKCFuc0NyZWRl bnRpYWwpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLQogICAgIGNyZWRlbnRpYWwgPSBXZWJDb3Jl OjpDcmVkZW50aWFsIHsgbnNDcmVkZW50aWFsLT5nZXQoKSB9OwogICAgIHJldHVybiB0cnVlOwog fQo=