205970 2020-01-08 16:10:14 -0800 [Cocoa] persistent-usage-record message fails first time; succeeds subsequent times 2020-01-09 12:18:49 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson webkit-bug-importer oldest_to_newest 1604346 0 jer.noble 2020-01-08 16:10:14 -0800 [Cocoa] persistent-usage-record message fails first time; succeeds subsequent times 1604353 1 jer.noble 2020-01-08 16:15:37 -0800 <rdar://problem/57785647> 1604354 2 387156 jer.noble 2020-01-08 16:16:53 -0800 Created attachment 387156 Patch 1604361 3 387156 eric.carlson 2020-01-08 16:29:47 -0800 Comment on attachment 387156 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=387156&action=review > Source/WebCore/ChangeLog:12 > + Drive-by fix: fix the exeptional case where a PUR session is closed but PUR data isn't available; send s/exeptional/exceptional/ 1604368 4 387162 jer.noble 2020-01-08 16:50:16 -0800 Created attachment 387162 Patch for landing 1604771 5 387162 commit-queue 2020-01-09 12:18:48 -0800 Comment on attachment 387162 Patch for landing Clearing flags on attachment: 387162 Committed r254288: <https://trac.webkit.org/changeset/254288> 1604772 6 commit-queue 2020-01-09 12:18:49 -0800 All reviewed patches have been landed. Closing bug. 387156 2020-01-08 16:16:53 -0800 2020-01-08 16:50:15 -0800 Patch bug-205970-20200108161648.patch text/plain 5311 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MDgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjgzOGJkMjcwYTE4ZGFm ZDkyYTI5YTZjYWZkNDk2MDk3MGY4YTEzOC4uYzI1NjJhOTQ1ZTZlNDI0MDkwMWMyYjI1ZTUzNDkz NDY4NWY4MzExNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTAxLTA4ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gcGVyc2lzdGVu dC11c2FnZS1yZWNvcmQgbWVzc2FnZSBmYWlscyBmaXJzdCB0aW1lOyBzdWNjZWVkcyBzdWJzZXF1 ZW50IHRpbWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDU5NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUaGUgQVZDb250ZW50S2V5U2Vzc2lvbiBpcyBjcmVhdGVkIHRvbyBlYXJseTsgYmVmb3JlIHRo ZSBDRE0gaGFzIGEgY2hhbmNlIHRvIHByb3ZpZGUgdGhlIHN0b3JhZ2UgcGF0aAorICAgICAgICBm b3IgcGVyc2lzdGVudCB1c2FnZSByZWNvcmRzLiBEZWxheSBjcmVhdGlvbiBvZiB0aGUgQVZDS1Mg dW50aWwgaXQncyBhY3R1YWxseSBuZWVkZWQgZHVyaW5nIHRoZSBmaXJzdAorICAgICAgICBsaWNl bnNlIHJlcXVlc3QuCisKKyAgICAgICAgRHJpdmUtYnkgZml4OiBmaXggdGhlIGV4ZXB0aW9uYWwg Y2FzZSB3aGVyZSBhIFBVUiBzZXNzaW9uIGlzIGNsb3NlZCBidXQgUFVSIGRhdGEgaXNuJ3QgYXZh aWxhYmxlOyBzZW5kCisgICAgICAgIGEgbnVsbCBtZXNzYWdlIHJhdGhlciB0aGFuIGFuIGVtcHR5 IGFycmF5LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMv Q0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMuaDoKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5n QVZGT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6OkNETUluc3RhbmNlRmFpclBsYXlTdHJlYW1p bmdBVkZPYmpDOjpjb250ZW50S2V5U2Vzc2lvbik6CisgICAgICAgIChXZWJDb3JlOjpDRE1JbnN0 YW5jZVNlc3Npb25GYWlyUGxheVN0cmVhbWluZ0FWRk9iakM6OnJlbW92ZVNlc3Npb25EYXRhKToK KyAgICAgICAgKFdlYkNvcmU6OkNETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDOjpD RE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQyk6IERlbGV0ZWQuCisgICAgICAgIChX ZWJDb3JlOjpDRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6ZW5zdXJlU2Vzc2lv bik6IERlbGV0ZWQuCisKIDIwMTktMTItMjAgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5j b20+CiAKICAgICAgICAgQWRkIGxvZ2dpbmcgZm9yIE1vZGVybiBFTUUgbWV0aG9kcy4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpj L0NETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDLmggYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1JbnN0YW5jZUZhaXJQbGF5U3Ry ZWFtaW5nQVZGT2JqQy5oCmluZGV4IGQ0MTY5MjNlMDQ2NzcxZmZhNjRhNDRmNWM0ZDA2MGYzZjBm YTI2NTIuLjQ3NzJmY2IzMjM2ZDM5MDI5NTM0YzQ2ZmI0ZjEwMjk5NzgzZTZjYjYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NE TUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNSW5zdGFuY2VGYWlyUGxheVN0 cmVhbWluZ0FWRk9iakMuaApAQCAtODcsNyArODcsNyBAQCBwdWJsaWM6CiAgICAgTlNVUkwgKnN0 b3JhZ2VVUkwoKSBjb25zdCB7IHJldHVybiBtX3N0b3JhZ2VVUkwuZ2V0KCk7IH0KICAgICBib29s IHBlcnNpc3RlbnRTdGF0ZUFsbG93ZWQoKSBjb25zdCB7IHJldHVybiBtX3BlcnNpc3RlbnRTdGF0 ZUFsbG93ZWQ7IH0KICAgICBTaGFyZWRCdWZmZXIqIHNlcnZlckNlcnRpZmljYXRlKCkgY29uc3Qg eyByZXR1cm4gbV9zZXJ2ZXJDZXJ0aWZpY2F0ZS5nZXQoKTsgfQotICAgIEFWQ29udGVudEtleVNl c3Npb24qIGNvbnRlbnRLZXlTZXNzaW9uKCkgeyByZXR1cm4gbV9zZXNzaW9uLmdldCgpOyB9Cisg ICAgQVZDb250ZW50S2V5U2Vzc2lvbiogY29udGVudEtleVNlc3Npb24oKTsKIAogICAgIC8vIEFW Q29udGVudEtleVNlc3Npb25EZWxlZ2F0ZUNsaWVudAogICAgIHZvaWQgZGlkUHJvdmlkZVJlcXVl c3QoQVZDb250ZW50S2V5UmVxdWVzdCopIGZpbmFsOwpAQCAtMTA2LDggKzEwNiw2IEBAIHB1Ymxp YzoKICAgICBDRE1JbnN0YW5jZVNlc3Npb25GYWlyUGxheVN0cmVhbWluZ0FWRk9iakMqIHNlc3Np b25Gb3JHcm91cChBVkNvbnRlbnRLZXlSZXBvcnRHcm91cCopIGNvbnN0OwogCiBwcml2YXRlOgot ICAgIHZvaWQgZW5zdXJlU2Vzc2lvbigpOwotCiAgICAgUmV0YWluUHRyPEFWQ29udGVudEtleVNl c3Npb24+IG1fc2Vzc2lvbjsKICAgICBSZXRhaW5QdHI8V2ViQ29yZUZQU0NvbnRlbnRLZXlTZXNz aW9uRGVsZWdhdGU+IG1fZGVsZWdhdGU7CiAgICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gbV9zZXJ2 ZXJDZXJ0aWZpY2F0ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpD Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMv Q0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMubW0KaW5kZXggMTY0NzRmYmZiZWM1 NjQ5ZjhhODRjMDJhM2NmODk3NTM3YTgzNjkwMS4uOTk3MjhlNDQ2NzYwNzViNTQ1MzU4NzU4MjEx OTFkNzQ2ZjkxNTE2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29i amMvQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMubW0KQEAgLTE1OSwxOSArMTU5 LDE4IEBAIEBlbmQKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1DRE1JbnN0YW5jZUZhaXJQbGF5 U3RyZWFtaW5nQVZGT2JqQzo6Q0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMoKQot ewotICAgIGlmIChQQUw6OmdldEFWQ29udGVudEtleVJlcG9ydEdyb3VwQ2xhc3MoKSkKLSAgICAg ICAgZW5zdXJlU2Vzc2lvbigpOwotfQorQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9i akM6OkNETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDKCkgPSBkZWZhdWx0OwogCi12 b2lkIENETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDOjplbnN1cmVTZXNzaW9uKCkK K0FWQ29udGVudEtleVNlc3Npb24qIENETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpD Ojpjb250ZW50S2V5U2Vzc2lvbigpCiB7CiAgICAgaWYgKG1fc2Vzc2lvbikKLSAgICAgICAgcmV0 dXJuOworICAgICAgICByZXR1cm4gbV9zZXNzaW9uLmdldCgpOwogCiAgICAgaWYgKCFQQUw6OmNh bkxvYWRfQVZGb3VuZGF0aW9uX0FWQ29udGVudEtleVN5c3RlbUZhaXJQbGF5U3RyZWFtaW5nKCkp Ci0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICBpZiAoIVBB TDo6Z2V0QVZDb250ZW50S2V5UmVwb3J0R3JvdXBDbGFzcygpKQorICAgICAgICByZXR1cm4gbnVs bHB0cjsKIAogICAgIGF1dG8gc3RvcmFnZVVSTCA9IHRoaXMtPnN0b3JhZ2VVUkwoKTsKICAgICBp ZiAoIXBlcnNpc3RlbnRTdGF0ZUFsbG93ZWQoKSB8fCAhc3RvcmFnZVVSTCkKQEAgLTE4MCwxMiAr MTc5LDEzIEBAIHZvaWQgQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakM6OmVuc3Vy ZVNlc3Npb24oKQogICAgICAgICBtX3Nlc3Npb24gPSBbUEFMOjpnZXRBVkNvbnRlbnRLZXlTZXNz aW9uQ2xhc3MoKSBjb250ZW50S2V5U2Vzc2lvbldpdGhLZXlTeXN0ZW06QVZDb250ZW50S2V5U3lz dGVtRmFpclBsYXlTdHJlYW1pbmcgc3RvcmFnZURpcmVjdG9yeUF0VVJMOnN0b3JhZ2VVUkxdOwog CiAgICAgaWYgKCFtX3Nlc3Npb24pCi0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIG51 bGxwdHI7CiAKICAgICBpZiAoIW1fZGVsZWdhdGUpCiAgICAgICAgIG1fZGVsZWdhdGUgPSBhZG9w dE5TKFtbV2ViQ29yZUZQU0NvbnRlbnRLZXlTZXNzaW9uRGVsZWdhdGUgYWxsb2NdIGluaXRXaXRo UGFyZW50OnRoaXNdKTsKIAogICAgIFttX3Nlc3Npb24gc2V0RGVsZWdhdGU6bV9kZWxlZ2F0ZS5n ZXQoKSBxdWV1ZTpkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpXTsKKyAgICByZXR1cm4gbV9zZXNz aW9uLmdldCgpOwogfQogCiBjbGFzcyBDRE1JbnN0YW5jZVNlc3Npb25GYWlyUGxheVN0cmVhbWlu Z0FWRk9iakM6OlVwZGF0ZVJlc3BvbnNlQ29sbGVjdG9yIHsKQEAgLTgxNiw2ICs4MTYsMTEgQEAg dm9pZCBDRE1JbnN0YW5jZVNlc3Npb25GYWlyUGxheVN0cmVhbWluZ0FWRk9iakM6OnJlbW92ZVNl c3Npb25EYXRhKGNvbnN0IFN0cmluZyYKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCisgICAg ICAgIGlmICghZXhwaXJlZFNlc3Npb25zQXJyYXkuZ2V0KCkuY291bnQpIHsKKyAgICAgICAgICAg IGNhbGxiYWNrKFdURk1vdmUoY2hhbmdlZEtleXMpLCBXVEY6Om51bGxvcHQsIFN1Y2NlZWRlZCk7 CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKwogICAgICAgICBSZXRhaW5QdHI8TlNE YXRhPiBleHBpcmVkU2Vzc2lvbnNEYXRhID0gW05TUHJvcGVydHlMaXN0U2VyaWFsaXphdGlvbiBk YXRhV2l0aFByb3BlcnR5TGlzdDpleHBpcmVkU2Vzc2lvbnNBcnJheS5nZXQoKSBmb3JtYXQ6TlNQ cm9wZXJ0eUxpc3RCaW5hcnlGb3JtYXRfdjFfMCBvcHRpb25zOmtDRlByb3BlcnR5TGlzdEltbXV0 YWJsZSBlcnJvcjpudWxscHRyXTsKIAogICAgICAgICBjYWxsYmFjayhXVEZNb3ZlKGNoYW5nZWRL ZXlzKSwgU2hhcmVkQnVmZmVyOjpjcmVhdGUoZXhwaXJlZFNlc3Npb25zRGF0YS5nZXQoKSksIFN1 Y2NlZWRlZCk7Cg== 387162 2020-01-08 16:50:16 -0800 2020-01-09 12:18:48 -0800 Patch for landing bug-205970-20200108165011.patch text/plain 5345 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MDgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjgzOGJkMjcwYTE4ZGFm ZDkyYTI5YTZjYWZkNDk2MDk3MGY4YTEzOC4uZWZjZDYwMzBkNDMzYTc5NTU2Y2YwNzFkMzRkZjM2 YjA1NTNiNTlkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTAxLTA4ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gcGVyc2lzdGVu dC11c2FnZS1yZWNvcmQgbWVzc2FnZSBmYWlscyBmaXJzdCB0aW1lOyBzdWNjZWVkcyBzdWJzZXF1 ZW50IHRpbWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDU5NzAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU3Nzg1NjQ3PgorCisgICAgICAgIFJl dmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICBUaGUgQVZDb250ZW50S2V5U2Vzc2lv biBpcyBjcmVhdGVkIHRvbyBlYXJseTsgYmVmb3JlIHRoZSBDRE0gaGFzIGEgY2hhbmNlIHRvIHBy b3ZpZGUgdGhlIHN0b3JhZ2UgcGF0aAorICAgICAgICBmb3IgcGVyc2lzdGVudCB1c2FnZSByZWNv cmRzLiBEZWxheSBjcmVhdGlvbiBvZiB0aGUgQVZDS1MgdW50aWwgaXQncyBhY3R1YWxseSBuZWVk ZWQgZHVyaW5nIHRoZSBmaXJzdAorICAgICAgICBsaWNlbnNlIHJlcXVlc3QuCisKKyAgICAgICAg RHJpdmUtYnkgZml4OiBmaXggdGhlIGV4Y2VwdGlvbmFsIGNhc2Ugd2hlcmUgYSBQVVIgc2Vzc2lv biBpcyBjbG9zZWQgYnV0IFBVUiBkYXRhIGlzbid0IGF2YWlsYWJsZTsgc2VuZAorICAgICAgICBh IG51bGwgbWVzc2FnZSByYXRoZXIgdGhhbiBhbiBlbXB0eSBhcnJheS4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETUluc3RhbmNlRmFpclBsYXlTdHJl YW1pbmdBVkZPYmpDLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9u L29iamMvQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMubW06CisgICAgICAgIChX ZWJDb3JlOjpDRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6Y29udGVudEtleVNl c3Npb24pOgorICAgICAgICAoV2ViQ29yZTo6Q0RNSW5zdGFuY2VTZXNzaW9uRmFpclBsYXlTdHJl YW1pbmdBVkZPYmpDOjpyZW1vdmVTZXNzaW9uRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpDRE1J bnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6Q0RNSW5zdGFuY2VGYWlyUGxheVN0cmVh bWluZ0FWRk9iakMpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Q0RNSW5zdGFuY2VGYWly UGxheVN0cmVhbWluZ0FWRk9iakM6OmVuc3VyZVNlc3Npb24pOiBEZWxldGVkLgorCiAyMDE5LTEy LTIwICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBsb2dn aW5nIGZvciBNb2Rlcm4gRU1FIG1ldGhvZHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1JbnN0YW5jZUZhaXJQbGF5U3Ry ZWFtaW5nQVZGT2JqQy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3Vu ZGF0aW9uL29iamMvQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMuaAppbmRleCBk NDE2OTIzZTA0Njc3MWZmYTY0YTQ0ZjVjNGQwNjBmM2YwZmEyNjUyLi40NzcyZmNiMzIzNmQzOTAy OTUzNGM0NmZiNGYxMDI5OTc4M2U2Y2I2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFt aW5nQVZGT2JqQy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9vYmpjL0NETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDLmgKQEAgLTg3 LDcgKzg3LDcgQEAgcHVibGljOgogICAgIE5TVVJMICpzdG9yYWdlVVJMKCkgY29uc3QgeyByZXR1 cm4gbV9zdG9yYWdlVVJMLmdldCgpOyB9CiAgICAgYm9vbCBwZXJzaXN0ZW50U3RhdGVBbGxvd2Vk KCkgY29uc3QgeyByZXR1cm4gbV9wZXJzaXN0ZW50U3RhdGVBbGxvd2VkOyB9CiAgICAgU2hhcmVk QnVmZmVyKiBzZXJ2ZXJDZXJ0aWZpY2F0ZSgpIGNvbnN0IHsgcmV0dXJuIG1fc2VydmVyQ2VydGlm aWNhdGUuZ2V0KCk7IH0KLSAgICBBVkNvbnRlbnRLZXlTZXNzaW9uKiBjb250ZW50S2V5U2Vzc2lv bigpIHsgcmV0dXJuIG1fc2Vzc2lvbi5nZXQoKTsgfQorICAgIEFWQ29udGVudEtleVNlc3Npb24q IGNvbnRlbnRLZXlTZXNzaW9uKCk7CiAKICAgICAvLyBBVkNvbnRlbnRLZXlTZXNzaW9uRGVsZWdh dGVDbGllbnQKICAgICB2b2lkIGRpZFByb3ZpZGVSZXF1ZXN0KEFWQ29udGVudEtleVJlcXVlc3Qq KSBmaW5hbDsKQEAgLTEwNiw4ICsxMDYsNiBAQCBwdWJsaWM6CiAgICAgQ0RNSW5zdGFuY2VTZXNz aW9uRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDKiBzZXNzaW9uRm9yR3JvdXAoQVZDb250ZW50S2V5 UmVwb3J0R3JvdXAqKSBjb25zdDsKIAogcHJpdmF0ZToKLSAgICB2b2lkIGVuc3VyZVNlc3Npb24o KTsKLQogICAgIFJldGFpblB0cjxBVkNvbnRlbnRLZXlTZXNzaW9uPiBtX3Nlc3Npb247CiAgICAg UmV0YWluUHRyPFdlYkNvcmVGUFNDb250ZW50S2V5U2Vzc2lvbkRlbGVnYXRlPiBtX2RlbGVnYXRl OwogICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IG1fc2VydmVyQ2VydGlmaWNhdGU7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9D RE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQy5tbSBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETUluc3RhbmNlRmFpclBsYXlTdHJl YW1pbmdBVkZPYmpDLm1tCmluZGV4IDE2NDc0ZmJmYmVjNTY0OWY4YTg0YzAyYTNjZjg5NzUzN2E4 MzY5MDEuLjk5NzI4ZTQ0Njc2MDc1YjU0NTM1ODc1ODIxMTkxZDc0NmY5MTUxNjEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NE TUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDLm1tCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETUluc3RhbmNlRmFpclBsYXlT dHJlYW1pbmdBVkZPYmpDLm1tCkBAIC0xNTksMTkgKzE1OSwxOCBAQCBAZW5kCiAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIAotQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakM6OkNETUlu c3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDKCkKLXsKLSAgICBpZiAoUEFMOjpnZXRBVkNv bnRlbnRLZXlSZXBvcnRHcm91cENsYXNzKCkpCi0gICAgICAgIGVuc3VyZVNlc3Npb24oKTsKLX0K K0NETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDOjpDRE1JbnN0YW5jZUZhaXJQbGF5 U3RyZWFtaW5nQVZGT2JqQygpID0gZGVmYXVsdDsKIAotdm9pZCBDRE1JbnN0YW5jZUZhaXJQbGF5 U3RyZWFtaW5nQVZGT2JqQzo6ZW5zdXJlU2Vzc2lvbigpCitBVkNvbnRlbnRLZXlTZXNzaW9uKiBD RE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6Y29udGVudEtleVNlc3Npb24oKQog ewogICAgIGlmIChtX3Nlc3Npb24pCi0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIG1f c2Vzc2lvbi5nZXQoKTsKIAogICAgIGlmICghUEFMOjpjYW5Mb2FkX0FWRm91bmRhdGlvbl9BVkNv bnRlbnRLZXlTeXN0ZW1GYWlyUGxheVN0cmVhbWluZygpKQotICAgICAgICByZXR1cm47CisgICAg ICAgIHJldHVybiBudWxscHRyOworCisgICAgaWYgKCFQQUw6OmdldEFWQ29udGVudEtleVJlcG9y dEdyb3VwQ2xhc3MoKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBhdXRvIHN0b3Jh Z2VVUkwgPSB0aGlzLT5zdG9yYWdlVVJMKCk7CiAgICAgaWYgKCFwZXJzaXN0ZW50U3RhdGVBbGxv d2VkKCkgfHwgIXN0b3JhZ2VVUkwpCkBAIC0xODAsMTIgKzE3OSwxMyBAQCB2b2lkIENETUluc3Rh bmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDOjplbnN1cmVTZXNzaW9uKCkKICAgICAgICAgbV9z ZXNzaW9uID0gW1BBTDo6Z2V0QVZDb250ZW50S2V5U2Vzc2lvbkNsYXNzKCkgY29udGVudEtleVNl c3Npb25XaXRoS2V5U3lzdGVtOkFWQ29udGVudEtleVN5c3RlbUZhaXJQbGF5U3RyZWFtaW5nIHN0 b3JhZ2VEaXJlY3RvcnlBdFVSTDpzdG9yYWdlVVJMXTsKIAogICAgIGlmICghbV9zZXNzaW9uKQot ICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgaWYgKCFtX2Rl bGVnYXRlKQogICAgICAgICBtX2RlbGVnYXRlID0gYWRvcHROUyhbW1dlYkNvcmVGUFNDb250ZW50 S2V5U2Vzc2lvbkRlbGVnYXRlIGFsbG9jXSBpbml0V2l0aFBhcmVudDp0aGlzXSk7CiAKICAgICBb bV9zZXNzaW9uIHNldERlbGVnYXRlOm1fZGVsZWdhdGUuZ2V0KCkgcXVldWU6ZGlzcGF0Y2hfZ2V0 X21haW5fcXVldWUoKV07CisgICAgcmV0dXJuIG1fc2Vzc2lvbi5nZXQoKTsKIH0KIAogY2xhc3Mg Q0RNSW5zdGFuY2VTZXNzaW9uRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDOjpVcGRhdGVSZXNwb25z ZUNvbGxlY3RvciB7CkBAIC04MTYsNiArODE2LDExIEBAIHZvaWQgQ0RNSW5zdGFuY2VTZXNzaW9u RmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDOjpyZW1vdmVTZXNzaW9uRGF0YShjb25zdCBTdHJpbmcm CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAorICAgICAgICBpZiAoIWV4cGlyZWRTZXNzaW9u c0FycmF5LmdldCgpLmNvdW50KSB7CisgICAgICAgICAgICBjYWxsYmFjayhXVEZNb3ZlKGNoYW5n ZWRLZXlzKSwgV1RGOjpudWxsb3B0LCBTdWNjZWVkZWQpOworICAgICAgICAgICAgcmV0dXJuOwor ICAgICAgICB9CisKICAgICAgICAgUmV0YWluUHRyPE5TRGF0YT4gZXhwaXJlZFNlc3Npb25zRGF0 YSA9IFtOU1Byb3BlcnR5TGlzdFNlcmlhbGl6YXRpb24gZGF0YVdpdGhQcm9wZXJ0eUxpc3Q6ZXhw aXJlZFNlc3Npb25zQXJyYXkuZ2V0KCkgZm9ybWF0Ok5TUHJvcGVydHlMaXN0QmluYXJ5Rm9ybWF0 X3YxXzAgb3B0aW9uczprQ0ZQcm9wZXJ0eUxpc3RJbW11dGFibGUgZXJyb3I6bnVsbHB0cl07CiAK ICAgICAgICAgY2FsbGJhY2soV1RGTW92ZShjaGFuZ2VkS2V5cyksIFNoYXJlZEJ1ZmZlcjo6Y3Jl YXRlKGV4cGlyZWRTZXNzaW9uc0RhdGEuZ2V0KCkpLCBTdWNjZWVkZWQpOwo=