205375 2019-12-17 21:18:46 -0800 [WebAuthn] Merge some of the CTAP response decoder's code 2020-02-10 12:27:18 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 181943 1 jiewen_tan jiewen_tan bfulgham commit-queue darin jiewen_tan webkit-bug-importer oldest_to_newest 1599687 0 jiewen_tan 2019-12-17 21:18:46 -0800 Consider merging some of the CTAP request/response encoder/decoder's code. 1616402 1 390134 jiewen_tan 2020-02-07 15:17:41 -0800 Created attachment 390134 Patch 1616972 2 390134 jiewen_tan 2020-02-10 11:03:30 -0800 Comment on attachment 390134 Patch Thanks for r+ this patch, Darin. 1617016 3 commit-queue 2020-02-10 12:07:20 -0800 The commit-queue encountered the following flaky tests while processing attachment 390134: editing/spelling/spellcheck-attribute.html bug 206178 (authors: g.czajkowski@samsung.com, mark.lam@apple.com, and rniwa@webkit.org) The commit-queue is continuing to process your patch. 1617019 4 commit-queue 2020-02-10 12:07:34 -0800 The commit-queue encountered the following flaky tests while processing attachment 390134: editing/spelling/spellcheck-async-remove-frame.html bug 158401 (authors: morrita@google.com, rniwa@webkit.org, and tony@chromium.org) The commit-queue is continuing to process your patch. 1617029 5 390134 commit-queue 2020-02-10 12:26:09 -0800 Comment on attachment 390134 Patch Clearing flags on attachment: 390134 Committed r256201: <https://trac.webkit.org/changeset/256201> 1617030 6 commit-queue 2020-02-10 12:26:10 -0800 All reviewed patches have been landed. Closing bug. 1617031 7 webkit-bug-importer 2020-02-10 12:27:18 -0800 <rdar://problem/59321089> 390134 2020-02-07 15:17:41 -0800 2020-02-10 12:26:09 -0800 Patch bug-205375-20200207151740.patch text/plain 10017 jiewen_tan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU1Njg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGJkZTc1YmRjYzAwNmIy ZDJlMTk5ZjBjNGViZDFhYzVlMzY5M2ZiNS4uYTQ5MjljZDcwNTc0Yzk3NjNhMzQxMjg3MGVlOTQ1 YjExN2I3YmNhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTAyLTA3ICBKaWV3 ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYkF1dGhuXSBNZXJn ZSBzb21lIG9mIHRoZSBDVEFQIHJlc3BvbnNlIGRlY29kZXIncyBjb2RlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDUzNzUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIG1ha2VzIHRob3Nl IGNvZGUgbW9yZSBjb21wYWN0IGFuZCBtYWludGFpbmFibGUuCisKKyAgICAgICAgTm8gY2hhbmdl IG9mIGJlaGF2aW9ycy4KKworICAgICAgICAqIE1vZHVsZXMvd2ViYXV0aG4vZmlkby9EZXZpY2VS ZXNwb25zZUNvbnZlcnRlci5jcHA6CisgICAgICAgIChmaWRvOjpkZWNvZGVSZXNwb25zZU1hcCk6 CisgICAgICAgIChmaWRvOjpyZWFkQ1RBUE1ha2VDcmVkZW50aWFsUmVzcG9uc2UpOgorICAgICAg ICAoZmlkbzo6cmVhZENUQVBHZXRBc3NlcnRpb25SZXNwb25zZSk6CisgICAgICAgIChmaWRvOjpy ZWFkQ1RBUEdldEluZm9SZXNwb25zZSk6CisgICAgICAgICogTW9kdWxlcy93ZWJhdXRobi9maWRv L0RldmljZVJlc3BvbnNlQ29udmVydGVyLmg6CisgICAgICAgICogTW9kdWxlcy93ZWJhdXRobi9m aWRvL1Bpbi5jcHA6CisgICAgICAgIChmaWRvOjpwaW46OmVuY29kZVBpbkNvbW1hbmQpOgorICAg ICAgICAoZmlkbzo6cGluOjpSZXRyaWVzUmVzcG9uc2U6OnBhcnNlKToKKyAgICAgICAgKGZpZG86 OnBpbjo6S2V5QWdyZWVtZW50UmVzcG9uc2U6OnBhcnNlKToKKyAgICAgICAgKGZpZG86OnBpbjo6 VG9rZW5SZXNwb25zZTo6cGFyc2UpOgorCiAyMDIwLTAyLTA0ICB5b3Vlbm4gZmFibGV0ICA8eW91 ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBOZXR3b3JrUHJvY2VzcyBzaG91bGQgYmUgbm90aWZp ZWQgYnkgVUlQcm9jZXNzIHdoZW4gaXRzIHNlcnZpY2Ugd29ya2VyIHByb2Nlc3MgY29ubmVjdGlv biBzaG91bGQgYmUgb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXV0 aG4vZmlkby9EZXZpY2VSZXNwb25zZUNvbnZlcnRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL3dlYmF1dGhuL2ZpZG8vRGV2aWNlUmVzcG9uc2VDb252ZXJ0ZXIuY3BwCmluZGV4IDlmNTMx MWQ0N2M4ZTFjOWJkMGIyZjc4YmY3YWFkOWQ3OTkwZDFjYWIuLjhkMzRiZTkzZDFiZTQ4MTNhN2E5 YjM4NTViYTRjYTFmMDRjZjY4ODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv d2ViYXV0aG4vZmlkby9EZXZpY2VSZXNwb25zZUNvbnZlcnRlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy93ZWJhdXRobi9maWRvL0RldmljZVJlc3BvbnNlQ29udmVydGVyLmNwcApA QCAtNTQsNiArNTQsMTkgQEAgc3RhdGljIFByb3RvY29sVmVyc2lvbiBjb252ZXJ0U3RyaW5nVG9Q cm90b2NvbFZlcnNpb24oY29uc3QgU3RyaW5nJiB2ZXJzaW9uKQogICAgIHJldHVybiBQcm90b2Nv bFZlcnNpb246OmtVbmtub3duOwogfQogCitPcHRpb25hbDxjYm9yOjpDQk9SVmFsdWU+IGRlY29k ZVJlc3BvbnNlTWFwKGNvbnN0IFZlY3Rvcjx1aW50OF90PiYgaW5CdWZmZXIpCit7CisgICAgaWYg KGluQnVmZmVyLnNpemUoKSA8PSBrUmVzcG9uc2VDb2RlTGVuZ3RoIHx8IGdldFJlc3BvbnNlQ29k ZShpbkJ1ZmZlcikgIT0gQ3RhcERldmljZVJlc3BvbnNlQ29kZTo6a1N1Y2Nlc3MpCisgICAgICAg IHJldHVybiBXVEY6Om51bGxvcHQ7CisKKyAgICBWZWN0b3I8dWludDhfdD4gYnVmZmVyOworICAg IGJ1ZmZlci5hcHBlbmQoaW5CdWZmZXIuZGF0YSgpICsgMSwgaW5CdWZmZXIuc2l6ZSgpIC0gMSk7 CisgICAgT3B0aW9uYWw8Q0JPUj4gZGVjb2RlZFJlc3BvbnNlID0gY2Jvcjo6Q0JPUlJlYWRlcjo6 cmVhZChidWZmZXIpOworICAgIGlmICghZGVjb2RlZFJlc3BvbnNlIHx8ICFkZWNvZGVkUmVzcG9u c2UtPmlzTWFwKCkpCisgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CisgICAgcmV0dXJuIGRl Y29kZWRSZXNwb25zZTsKK30KKwogQ3RhcERldmljZVJlc3BvbnNlQ29kZSBnZXRSZXNwb25zZUNv ZGUoY29uc3QgVmVjdG9yPHVpbnQ4X3Q+JiBidWZmZXIpCiB7CiAgICAgaWYgKGJ1ZmZlci5pc0Vt cHR5KCkpCkBAIC04NSwyMyArOTgsMTggQEAgc3RhdGljIFZlY3Rvcjx1aW50OF90PiBnZXRDcmVk ZW50aWFsSWQoY29uc3QgVmVjdG9yPHVpbnQ4X3Q+JiBhdXRoZW50aWNhdG9yRGF0YSkKIC8vIGNo ZWNrcyBmb3IgY29ycmVjdCBlbmNvZGluZyBmb3JtYXQuCiBSZWZQdHI8QXV0aGVudGljYXRvckF0 dGVzdGF0aW9uUmVzcG9uc2U+IHJlYWRDVEFQTWFrZUNyZWRlbnRpYWxSZXNwb25zZShjb25zdCBW ZWN0b3I8dWludDhfdD4mIGluQnVmZmVyLCBjb25zdCBBdHRlc3RhdGlvbkNvbnZleWFuY2VQcmVm ZXJlbmNlJiBhdHRlc3RhdGlvbikKIHsKLSAgICBpZiAoaW5CdWZmZXIuc2l6ZSgpIDw9IGtSZXNw b25zZUNvZGVMZW5ndGgpCisgICAgYXV0byBkZWNvZGVkTWFwID0gZGVjb2RlUmVzcG9uc2VNYXAo aW5CdWZmZXIpOworICAgIGlmICghZGVjb2RlZE1hcCkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7 CisgICAgY29uc3QgYXV0byYgcmVzcG9uc2VNYXAgPSBkZWNvZGVkTWFwLT5nZXRNYXAoKTsKIAot ICAgIFZlY3Rvcjx1aW50OF90PiBidWZmZXI7Ci0gICAgYnVmZmVyLmFwcGVuZChpbkJ1ZmZlci5k YXRhKCkgKyAxLCBpbkJ1ZmZlci5zaXplKCkgLSAxKTsKLSAgICBPcHRpb25hbDxDQk9SPiBkZWNv ZGVkUmVzcG9uc2UgPSBjYm9yOjpDQk9SUmVhZGVyOjpyZWFkKGJ1ZmZlcik7Ci0gICAgaWYgKCFk ZWNvZGVkUmVzcG9uc2UgfHwgIWRlY29kZWRSZXNwb25zZS0+aXNNYXAoKSkKLSAgICAgICAgcmV0 dXJuIG51bGxwdHI7Ci0gICAgY29uc3QgYXV0byYgZGVjb2RlZE1hcCA9IGRlY29kZWRSZXNwb25z ZS0+Z2V0TWFwKCk7Ci0KLSAgICBhdXRvIGl0ID0gZGVjb2RlZE1hcC5maW5kKENCT1IoMSkpOwot ICAgIGlmIChpdCA9PSBkZWNvZGVkTWFwLmVuZCgpIHx8ICFpdC0+c2Vjb25kLmlzU3RyaW5nKCkp CisgICAgYXV0byBpdCA9IHJlc3BvbnNlTWFwLmZpbmQoQ0JPUigxKSk7CisgICAgaWYgKGl0ID09 IHJlc3BvbnNlTWFwLmVuZCgpIHx8ICFpdC0+c2Vjb25kLmlzU3RyaW5nKCkpCiAgICAgICAgIHJl dHVybiBudWxscHRyOwogICAgIGF1dG8gZm9ybWF0ID0gaXQtPnNlY29uZC5jbG9uZSgpOwogCi0g ICAgaXQgPSBkZWNvZGVkTWFwLmZpbmQoQ0JPUigyKSk7Ci0gICAgaWYgKGl0ID09IGRlY29kZWRN YXAuZW5kKCkgfHwgIWl0LT5zZWNvbmQuaXNCeXRlU3RyaW5nKCkpCisgICAgaXQgPSByZXNwb25z ZU1hcC5maW5kKENCT1IoMikpOworICAgIGlmIChpdCA9PSByZXNwb25zZU1hcC5lbmQoKSB8fCAh aXQtPnNlY29uZC5pc0J5dGVTdHJpbmcoKSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAg YXV0byBhdXRoZW50aWNhdG9yRGF0YSA9IGl0LT5zZWNvbmQuY2xvbmUoKTsKIApAQCAtMTA5LDgg KzExNyw4IEBAIFJlZlB0cjxBdXRoZW50aWNhdG9yQXR0ZXN0YXRpb25SZXNwb25zZT4gcmVhZENU QVBNYWtlQ3JlZGVudGlhbFJlc3BvbnNlKGNvbnN0IFZlCiAgICAgaWYgKGNyZWRlbnRpYWxJZC5p c0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCi0gICAgaXQgPSBkZWNvZGVkTWFw LmZpbmQoQ0JPUigzKSk7Ci0gICAgaWYgKGl0ID09IGRlY29kZWRNYXAuZW5kKCkgfHwgIWl0LT5z ZWNvbmQuaXNNYXAoKSkKKyAgICBpdCA9IHJlc3BvbnNlTWFwLmZpbmQoQ0JPUigzKSk7CisgICAg aWYgKGl0ID09IHJlc3BvbnNlTWFwLmVuZCgpIHx8ICFpdC0+c2Vjb25kLmlzTWFwKCkpCiAgICAg ICAgIHJldHVybiBudWxscHRyOwogICAgIGF1dG8gYXR0U3RtdCA9IGl0LT5zZWNvbmQuY2xvbmUo KTsKIApAQCAtMTMzLDE3ICsxNDEsMTAgQEAgUmVmUHRyPEF1dGhlbnRpY2F0b3JBdHRlc3RhdGlv blJlc3BvbnNlPiByZWFkQ1RBUE1ha2VDcmVkZW50aWFsUmVzcG9uc2UoY29uc3QgVmUKIAogUmVm UHRyPEF1dGhlbnRpY2F0b3JBc3NlcnRpb25SZXNwb25zZT4gcmVhZENUQVBHZXRBc3NlcnRpb25S ZXNwb25zZShjb25zdCBWZWN0b3I8dWludDhfdD4mIGluQnVmZmVyKQogewotICAgIGlmIChpbkJ1 ZmZlci5zaXplKCkgPD0ga1Jlc3BvbnNlQ29kZUxlbmd0aCkKLSAgICAgICAgcmV0dXJuIG51bGxw dHI7Ci0KLSAgICBWZWN0b3I8dWludDhfdD4gYnVmZmVyOwotICAgIGJ1ZmZlci5hcHBlbmQoaW5C dWZmZXIuZGF0YSgpICsgMSwgaW5CdWZmZXIuc2l6ZSgpIC0gMSk7Ci0gICAgT3B0aW9uYWw8Q0JP Uj4gZGVjb2RlZFJlc3BvbnNlID0gY2Jvcjo6Q0JPUlJlYWRlcjo6cmVhZChidWZmZXIpOwotCi0g ICAgaWYgKCFkZWNvZGVkUmVzcG9uc2UgfHwgIWRlY29kZWRSZXNwb25zZS0+aXNNYXAoKSkKKyAg ICBhdXRvIGRlY29kZWRNYXAgPSBkZWNvZGVSZXNwb25zZU1hcChpbkJ1ZmZlcik7CisgICAgaWYg KCFkZWNvZGVkTWFwKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKLQotICAgIGF1dG8mIHJlc3Bv bnNlTWFwID0gZGVjb2RlZFJlc3BvbnNlLT5nZXRNYXAoKTsKKyAgICBjb25zdCBhdXRvJiByZXNw b25zZU1hcCA9IGRlY29kZWRNYXAtPmdldE1hcCgpOwogCiAgICAgYXV0byBpdCA9IHJlc3BvbnNl TWFwLmZpbmQoQ0JPUigxKSk7CiAgICAgaWYgKGl0ID09IHJlc3BvbnNlTWFwLmVuZCgpIHx8ICFp dC0+c2Vjb25kLmlzTWFwKCkpCkBAIC0yMDAsMTUgKzIwMSwxMCBAQCBSZWZQdHI8QXV0aGVudGlj YXRvckFzc2VydGlvblJlc3BvbnNlPiByZWFkQ1RBUEdldEFzc2VydGlvblJlc3BvbnNlKGNvbnN0 IFZlY3RvcgogCiBPcHRpb25hbDxBdXRoZW50aWNhdG9yR2V0SW5mb1Jlc3BvbnNlPiByZWFkQ1RB UEdldEluZm9SZXNwb25zZShjb25zdCBWZWN0b3I8dWludDhfdD4mIGluQnVmZmVyKQogewotICAg IGlmIChpbkJ1ZmZlci5zaXplKCkgPD0ga1Jlc3BvbnNlQ29kZUxlbmd0aCB8fCBnZXRSZXNwb25z ZUNvZGUoaW5CdWZmZXIpICE9IEN0YXBEZXZpY2VSZXNwb25zZUNvZGU6OmtTdWNjZXNzKQotICAg ICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwotCi0gICAgVmVjdG9yPHVpbnQ4X3Q+IGJ1ZmZlcjsK LSAgICBidWZmZXIuYXBwZW5kKGluQnVmZmVyLmRhdGEoKSArIDEsIGluQnVmZmVyLnNpemUoKSAt IDEpOwotICAgIE9wdGlvbmFsPENCT1I+IGRlY29kZWRSZXNwb25zZSA9IGNib3I6OkNCT1JSZWFk ZXI6OnJlYWQoYnVmZmVyKTsKLSAgICBpZiAoIWRlY29kZWRSZXNwb25zZSB8fCAhZGVjb2RlZFJl c3BvbnNlLT5pc01hcCgpKQorICAgIGF1dG8gZGVjb2RlZE1hcCA9IGRlY29kZVJlc3BvbnNlTWFw KGluQnVmZmVyKTsKKyAgICBpZiAoIWRlY29kZWRNYXApCiAgICAgICAgIHJldHVybiBXVEY6Om51 bGxvcHQ7Ci0gICAgY29uc3QgYXV0byYgcmVzcG9uc2VNYXAgPSBkZWNvZGVkUmVzcG9uc2UtPmdl dE1hcCgpOworICAgIGNvbnN0IGF1dG8mIHJlc3BvbnNlTWFwID0gZGVjb2RlZE1hcC0+Z2V0TWFw KCk7CiAKICAgICBhdXRvIGl0ID0gcmVzcG9uc2VNYXAuZmluZChDQk9SKDEpKTsKICAgICBpZiAo aXQgPT0gcmVzcG9uc2VNYXAuZW5kKCkgfHwgIWl0LT5zZWNvbmQuaXNBcnJheSgpKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdXRobi9maWRvL0RldmljZVJlc3BvbnNl Q29udmVydGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1dGhuL2ZpZG8vRGV2aWNl UmVzcG9uc2VDb252ZXJ0ZXIuaAppbmRleCA0YjhkNWZlNTY0YzM0ZWZiODhmNDMxZjA0MWNmOGYy ZDgwYjE3NTBkLi4wZTEzYWJkZjM5MjlkNTkxNzI3NzMxY2Q2YzJlMjk1NGMwNjg5MTIzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1dGhuL2ZpZG8vRGV2aWNlUmVzcG9u c2VDb252ZXJ0ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1dGhuL2ZpZG8v RGV2aWNlUmVzcG9uc2VDb252ZXJ0ZXIuaApAQCAtNDIsNiArNDIsOCBAQAogLy8gQ1RBUCBwcm90 b2NvbCwgbnVsbCBvcHRpb25hbCBpcyByZXR1cm5lZC4KIG5hbWVzcGFjZSBmaWRvIHsKIAorT3B0 aW9uYWw8Y2Jvcjo6Q0JPUlZhbHVlPiBkZWNvZGVSZXNwb25zZU1hcChjb25zdCBWZWN0b3I8dWlu dDhfdD4mKTsKKwogLy8gUGFyc2VzIHJlc3BvbnNlIGNvZGUgZnJvbSByZXNwb25zZSByZWNlaXZl ZCBmcm9tIHRoZSBhdXRoZW50aWNhdG9yLiBJZgogLy8gdW5rbm93biByZXNwb25zZSBjb2RlIHZh bHVlIGlzIHJlY2VpdmVkLCB0aGVuIENUQVAyX0VSUl9PVEhFUiBpcyByZXR1cm5lZC4KIFdFQkNP UkVfRVhQT1JUIEN0YXBEZXZpY2VSZXNwb25zZUNvZGUgZ2V0UmVzcG9uc2VDb2RlKGNvbnN0IFZl Y3Rvcjx1aW50OF90PiYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJh dXRobi9maWRvL1Bpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1dGhuL2ZpZG8v UGluLmNwcAppbmRleCAyNzE2ZWZkNDY3ZDk3YjMxYzRjNjBlNzQ4Y2ZmZjNjZDE5NWFiMTJiLi45 NzlkNDc0N2I5M2I1NTJmZGY1MjIyYzkwOTY5NDk2NGE1M2MxNzBlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1dGhuL2ZpZG8vUGluLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL3dlYmF1dGhuL2ZpZG8vUGluLmNwcApAQCAtMTAyLDcgKzEwMiw2IEBAIHN0 YXRpYyBWZWN0b3I8dWludDhfdD4gZW5jb2RlUGluQ29tbWFuZChTdWJjb21tYW5kIHN1YmNvbW1h bmQsIEZ1bmN0aW9uPHZvaWQoQ0JPCiAgICAgaWYgKGFkZEFkZGl0aW9uYWwpCiAgICAgICAgIGFk ZEFkZGl0aW9uYWwoJm1hcCk7CiAKLSAgICAvLyBGSVhNRSgyMDUzNzUpCiAgICAgYXV0byBzZXJp YWxpemVkUGFyYW0gPSBDQk9SV3JpdGVyOjp3cml0ZShDQk9SVmFsdWUoV1RGTW92ZShtYXApKSk7 CiAgICAgQVNTRVJUKHNlcmlhbGl6ZWRQYXJhbSk7CiAKQEAgLTExNSwxNiArMTE0LDEwIEBAIFJl dHJpZXNSZXNwb25zZTo6UmV0cmllc1Jlc3BvbnNlKCkgPSBkZWZhdWx0OwogCiBPcHRpb25hbDxS ZXRyaWVzUmVzcG9uc2U+IFJldHJpZXNSZXNwb25zZTo6cGFyc2UoY29uc3QgVmVjdG9yPHVpbnQ4 X3Q+JiBpbkJ1ZmZlcikKIHsKLSAgICAvLyBGSVhNRSgyMDUzNzUpCi0gICAgaWYgKGluQnVmZmVy LnNpemUoKSA8PSBrUmVzcG9uc2VDb2RlTGVuZ3RoIHx8IGdldFJlc3BvbnNlQ29kZShpbkJ1ZmZl cikgIT0gQ3RhcERldmljZVJlc3BvbnNlQ29kZTo6a1N1Y2Nlc3MpCisgICAgYXV0byBkZWNvZGVk TWFwID0gZGVjb2RlUmVzcG9uc2VNYXAoaW5CdWZmZXIpOworICAgIGlmICghZGVjb2RlZE1hcCkK ICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKLQotICAgIFZlY3Rvcjx1aW50OF90PiBidWZm ZXI7Ci0gICAgYnVmZmVyLmFwcGVuZChpbkJ1ZmZlci5kYXRhKCkgKyAxLCBpbkJ1ZmZlci5zaXpl KCkgLSAxKTsKLSAgICBPcHRpb25hbDxDQk9SPiBkZWNvZGVkUmVzcG9uc2UgPSBjYm9yOjpDQk9S UmVhZGVyOjpyZWFkKGJ1ZmZlcik7Ci0gICAgaWYgKCFkZWNvZGVkUmVzcG9uc2UgfHwgIWRlY29k ZWRSZXNwb25zZS0+aXNNYXAoKSkKLSAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKLSAgICBj b25zdCBhdXRvJiByZXNwb25zZU1hcCA9IGRlY29kZWRSZXNwb25zZS0+Z2V0TWFwKCk7CisgICAg Y29uc3QgYXV0byYgcmVzcG9uc2VNYXAgPSBkZWNvZGVkTWFwLT5nZXRNYXAoKTsKIAogICAgIGF1 dG8gaXQgPSByZXNwb25zZU1hcC5maW5kKENCT1JWYWx1ZShzdGF0aWNfY2FzdDxpbnQ2NF90PihS ZXNwb25zZUtleTo6a1JldHJpZXMpKSk7CiAgICAgaWYgKGl0ID09IHJlc3BvbnNlTWFwLmVuZCgp IHx8ICFpdC0+c2Vjb25kLmlzVW5zaWduZWQoKSkKQEAgLTE0MiwxNiArMTM1LDEwIEBAIEtleUFn cmVlbWVudFJlc3BvbnNlOjpLZXlBZ3JlZW1lbnRSZXNwb25zZShSZWY8Q3J5cHRvS2V5RUM+JiYg cGVlcktleSkKIAogT3B0aW9uYWw8S2V5QWdyZWVtZW50UmVzcG9uc2U+IEtleUFncmVlbWVudFJl c3BvbnNlOjpwYXJzZShjb25zdCBWZWN0b3I8dWludDhfdD4mIGluQnVmZmVyKQogewotICAgIC8v IEZJWE1FKDIwNTM3NSkKLSAgICBpZiAoaW5CdWZmZXIuc2l6ZSgpIDw9IGtSZXNwb25zZUNvZGVM ZW5ndGggfHwgZ2V0UmVzcG9uc2VDb2RlKGluQnVmZmVyKSAhPSBDdGFwRGV2aWNlUmVzcG9uc2VD b2RlOjprU3VjY2VzcykKLSAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKLQotICAgIFZlY3Rv cjx1aW50OF90PiBidWZmZXI7Ci0gICAgYnVmZmVyLmFwcGVuZChpbkJ1ZmZlci5kYXRhKCkgKyAx LCBpbkJ1ZmZlci5zaXplKCkgLSAxKTsKLSAgICBhdXRvIGRlY29kZWRSZXNwb25zZSA9IGNib3I6 OkNCT1JSZWFkZXI6OnJlYWQoYnVmZmVyKTsKLSAgICBpZiAoIWRlY29kZWRSZXNwb25zZSB8fCAh ZGVjb2RlZFJlc3BvbnNlLT5pc01hcCgpKQorICAgIGF1dG8gZGVjb2RlZE1hcCA9IGRlY29kZVJl c3BvbnNlTWFwKGluQnVmZmVyKTsKKyAgICBpZiAoIWRlY29kZWRNYXApCiAgICAgICAgIHJldHVy biBXVEY6Om51bGxvcHQ7Ci0gICAgY29uc3QgYXV0byYgcmVzcG9uc2VNYXAgPSBkZWNvZGVkUmVz cG9uc2UtPmdldE1hcCgpOworICAgIGNvbnN0IGF1dG8mIHJlc3BvbnNlTWFwID0gZGVjb2RlZE1h cC0+Z2V0TWFwKCk7CiAKICAgICAvLyBUaGUgZXBoZW1lcmFsIGtleSBpcyBlbmNvZGVkIGFzIGEg Q09TRSBzdHJ1Y3R1cmUuCiAgICAgYXV0byBpdCA9IHJlc3BvbnNlTWFwLmZpbmQoQ0JPUlZhbHVl KHN0YXRpY19jYXN0PGludDY0X3Q+KFJlc3BvbnNlS2V5OjprS2V5QWdyZWVtZW50KSkpOwpAQCAt MjE2LDE2ICsyMDMsMTAgQEAgVG9rZW5SZXNwb25zZTo6VG9rZW5SZXNwb25zZShSZWY8V2ViQ29y ZTo6Q3J5cHRvS2V5SE1BQz4mJiB0b2tlbikKIAogT3B0aW9uYWw8VG9rZW5SZXNwb25zZT4gVG9r ZW5SZXNwb25zZTo6cGFyc2UoY29uc3QgV2ViQ29yZTo6Q3J5cHRvS2V5QUVTJiBzaGFyZWRLZXks IGNvbnN0IFZlY3Rvcjx1aW50OF90PiYgaW5CdWZmZXIpCiB7Ci0gICAgLy8gRklYTUUoMjA1Mzc1 KQotICAgIGlmIChpbkJ1ZmZlci5zaXplKCkgPD0ga1Jlc3BvbnNlQ29kZUxlbmd0aCB8fCBnZXRS ZXNwb25zZUNvZGUoaW5CdWZmZXIpICE9IEN0YXBEZXZpY2VSZXNwb25zZUNvZGU6OmtTdWNjZXNz KQotICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwotCi0gICAgVmVjdG9yPHVpbnQ4X3Q+IGJ1 ZmZlcjsKLSAgICBidWZmZXIuYXBwZW5kKGluQnVmZmVyLmRhdGEoKSArIDEsIGluQnVmZmVyLnNp emUoKSAtIDEpOwotICAgIGF1dG8gZGVjb2RlZFJlc3BvbnNlID0gY2Jvcjo6Q0JPUlJlYWRlcjo6 cmVhZChidWZmZXIpOwotICAgIGlmICghZGVjb2RlZFJlc3BvbnNlIHx8ICFkZWNvZGVkUmVzcG9u c2UtPmlzTWFwKCkpCisgICAgYXV0byBkZWNvZGVkTWFwID0gZGVjb2RlUmVzcG9uc2VNYXAoaW5C dWZmZXIpOworICAgIGlmICghZGVjb2RlZE1hcCkKICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9w dDsKLSAgICBjb25zdCBhdXRvJiByZXNwb25zZU1hcCA9IGRlY29kZWRSZXNwb25zZS0+Z2V0TWFw KCk7CisgICAgY29uc3QgYXV0byYgcmVzcG9uc2VNYXAgPSBkZWNvZGVkTWFwLT5nZXRNYXAoKTsK IAogICAgIGF1dG8gaXQgPSByZXNwb25zZU1hcC5maW5kKENCT1JWYWx1ZShzdGF0aWNfY2FzdDxp bnQ2NF90PihSZXNwb25zZUtleTo6a1BpblRva2VuKSkpOwogICAgIGlmIChpdCA9PSByZXNwb25z ZU1hcC5lbmQoKSB8fCAhaXQtPnNlY29uZC5pc0J5dGVTdHJpbmcoKSkK