207108 2020-02-02 23:40:43 -0800 Make sure RTCVideoEncoderH264 generate a keyframe even if the frame that was supposed to be a key frame was dropped 2020-02-03 08:39:16 -0800 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf commit-queue eric.carlson ews-watchlist glenn jer.noble philipj sergio webkit-bug-importer youennf oldest_to_newest 1613872 0 youennf 2020-02-02 23:40:43 -0800 Make sure RTCVideoEncoderH264 generate a keyframe even if the frame that was supposed to be a key frame was dropped 1613873 1 389491 youennf 2020-02-02 23:43:34 -0800 Created attachment 389491 Patch 1613875 2 389492 youennf 2020-02-03 00:15:24 -0800 Created attachment 389492 Patch 1613964 3 commit-queue 2020-02-03 08:37:58 -0800 The commit-queue encountered the following flaky tests while processing attachment 389492: 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. 1613965 4 389492 commit-queue 2020-02-03 08:38:35 -0800 Comment on attachment 389492 Patch Clearing flags on attachment: 389492 Committed r255564: <https://trac.webkit.org/changeset/255564> 1613966 5 commit-queue 2020-02-03 08:38:36 -0800 All reviewed patches have been landed. Closing bug. 1613967 6 webkit-bug-importer 2020-02-03 08:39:16 -0800 <rdar://problem/59111507> 389491 2020-02-02 23:43:34 -0800 2020-02-03 00:15:20 -0800 Patch bug-207108-20200203084333.patch text/plain 6718 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjU1NDE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n ZUxvZwppbmRleCBiYjQ2N2YyYmY0MTU0MWRmZWQ5MGVmYmFkYjRiYmI2Y2EyMzU0MjVkLi43MDA1 NzJjMDYzOTljZmMxZDEzYzg3OTgwNTE5MTFlNGJlNGYyOWI4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAyMC0wMi0wMiAgeW91ZW5uIGZh YmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBzdXJlIFJUQ1ZpZGVvRW5j b2RlckgyNjQgZ2VuZXJhdGUgYSBrZXlmcmFtZSBldmVuIGlmIHRoZSBmcmFtZSB0aGF0IHdhcyBz dXBwb3NlZCB0byBiZSBhIGtleSBmcmFtZSB3YXMgZHJvcHBlZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA3MTA4CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgcGFyYW1ldGVyIHRlbGxpbmcgd2hl dGhlciBhIGZyYW1lIHRvIGJlIGVuY29kZWQgc2hvdWxkIGJlIGEga2V5IGZyYW1lLgorICAgICAg ICBJbiBlbmNvZGVyIGNhbGxiYWNrLCBpZiB0aGUgZnJhbWUgaXMgZXhwZWN0ZWQgdG8gYmUgYSBr ZXkgZnJhbWUsIHNldCBhIGZsYWcgdG8gZm9yY2UgdGhlIG5leHQgZnJhbWUgdG8gYmUgYSBrZXkg ZnJhbWUuCisgICAgICAgIFRoaXMgZW5zdXJlcyB0aGF0IGtleWZyYW1lIHNlbmRpbmcgaXMgbm90 IGRlbGF5ZWQgaW4gY2FzZSBlbmNvZGluZyBpcyBkcm9wcGluZyBvciBmYWlsaW5nIHRvIGVuY29k ZSBmcmFtZXMuCisKKyAgICAgICAgKiBTb3VyY2Uvd2VicnRjL3Nkay9vYmpjL2NvbXBvbmVudHMv dmlkZW9fY29kZWMvUlRDVmlkZW9FbmNvZGVySDI2NC5tbToKKyAgICAgICAgKC1bUlRDVmlkZW9F bmNvZGVySDI2NCBpbml0V2l0aENvZGVjSW5mbzpdKToKKyAgICAgICAgKC1bUlRDVmlkZW9FbmNv ZGVySDI2NCBlbmNvZGU6Y29kZWNTcGVjaWZpY0luZm86ZnJhbWVUeXBlczpdKToKKyAgICAgICAg KC1bUlRDVmlkZW9FbmNvZGVySDI2NCBmcmFtZVdhc0VuY29kZWQ6ZmxhZ3M6c2FtcGxlQnVmZmVy OmNvZGVjU3BlY2lmaWNJbmZvOndpZHRoOmhlaWdodDpyZW5kZXJUaW1lTXM6dGltZXN0YW1wOnJv dGF0aW9uOmlzS2V5RnJhbWVSZXF1aXJlZDpdKToKKwogMjAyMC0wMS0yMCAgeW91ZW5uIGZhYmxl dCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgU2V0dGluZyBrVlRDb21wcmVzc2lvblBy b3BlcnR5S2V5X0RhdGFSYXRlTGltaXRzIG9uIFJUQ1ZpZGVvRW5jb2RlckgyNjQgZmFpbHMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9v YmpjL2NvbXBvbmVudHMvdmlkZW9fY29kZWMvUlRDVmlkZW9FbmNvZGVySDI2NC5tbSBiL1NvdXJj ZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9vYmpjL2NvbXBvbmVudHMv dmlkZW9fY29kZWMvUlRDVmlkZW9FbmNvZGVySDI2NC5tbQppbmRleCA5NzUzMGUyM2I4ODE4ZDI2 YWU1YzRhNzI1OTk4MTVmNWY0MWNjODgxLi5jMTgxNWYxODllNDZhYjBmZjlhN2FiMjg5MGQxMmMw NDcxNjQ4NDExIDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNl L3dlYnJ0Yy9zZGsvb2JqYy9jb21wb25lbnRzL3ZpZGVvX2NvZGVjL1JUQ1ZpZGVvRW5jb2Rlckgy NjQubW0KKysrIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvc2Rr L29iamMvY29tcG9uZW50cy92aWRlb19jb2RlYy9SVENWaWRlb0VuY29kZXJIMjY0Lm1tCkBAIC04 Niw3ICs4Niw4IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc1N0YW5kYXJkRnJhbWVTaXplKGludDMy X3Qgd2lkdGgsIGludDMyX3QgaGVpZ2h0KQogICAgICAgICAgICAgICAgICBoZWlnaHQ6KGludDMy X3QpaGVpZ2h0CiAgICAgICAgICAgIHJlbmRlclRpbWVNczooaW50NjRfdClyZW5kZXJUaW1lTXMK ICAgICAgICAgICAgICAgdGltZXN0YW1wOih1aW50MzJfdCl0aW1lc3RhbXAKLSAgICAgICAgICAg ICAgIHJvdGF0aW9uOihSVENWaWRlb1JvdGF0aW9uKXJvdGF0aW9uOworICAgICAgICAgICAgICAg cm90YXRpb246KFJUQ1ZpZGVvUm90YXRpb24pcm90YXRpb24KKyAgICAgaXNLZXlGcmFtZVJlcXVp cmVkOihib29sKWlzS2V5RnJhbWVSZXF1aXJlZDsKIAogQGVuZAogCkBAIC0xMTIsOCArMTEzLDkg QEAgc3RydWN0IFJUQ0ZyYW1lRW5jb2RlUGFyYW1zIHsKICAgICAgICAgICAgICAgICAgICAgICAg aW50MzJfdCBoLAogICAgICAgICAgICAgICAgICAgICAgICBpbnQ2NF90IHJ0bXMsCiAgICAgICAg ICAgICAgICAgICAgICAgIHVpbnQzMl90IHRzLAotICAgICAgICAgICAgICAgICAgICAgICBSVENW aWRlb1JvdGF0aW9uIHIpCi0gICAgICA6IGVuY29kZXIoZSksIHdpZHRoKHcpLCBoZWlnaHQoaCks IHJlbmRlcl90aW1lX21zKHJ0bXMpLCB0aW1lc3RhbXAodHMpLCByb3RhdGlvbihyKSB7CisgICAg ICAgICAgICAgICAgICAgICAgIFJUQ1ZpZGVvUm90YXRpb24gciwKKyAgICAgICAgICAgICAgICAg ICAgICAgYm9vbCBpc0tleUZyYW1lUmVxdWlyZWQpCisgICAgICA6IGVuY29kZXIoZSksIHdpZHRo KHcpLCBoZWlnaHQoaCksIHJlbmRlcl90aW1lX21zKHJ0bXMpLCB0aW1lc3RhbXAodHMpLCByb3Rh dGlvbihyKSwgaXNLZXlGcmFtZVJlcXVpcmVkKGlzS2V5RnJhbWVSZXF1aXJlZCkgewogICAgIGlm IChjc2kpIHsKICAgICAgIGNvZGVjU3BlY2lmaWNJbmZvID0gY3NpOwogICAgIH0gZWxzZSB7CkBA IC0xMjgsNiArMTMwLDcgQEAgc3RydWN0IFJUQ0ZyYW1lRW5jb2RlUGFyYW1zIHsKICAgaW50NjRf dCByZW5kZXJfdGltZV9tczsKICAgdWludDMyX3QgdGltZXN0YW1wOwogICBSVENWaWRlb1JvdGF0 aW9uIHJvdGF0aW9uOworICBib29sIGlzS2V5RnJhbWVSZXF1aXJlZDsKIH07CiAKIC8vIFdlIHJl Y2VpdmUgSTQyMEZyYW1lcyBhcyBpbnB1dCwgYnV0IHdlIG5lZWQgdG8gZmVlZCBDVlBpeGVsQnVm ZmVycyBpbnRvIHRoZQpAQCAtMjA2LDcgKzIwOSw4IEBAIHZvaWQgY29tcHJlc3Npb25PdXRwdXRD YWxsYmFjayh2b2lkICplbmNvZGVyLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGhlaWdodDplbmNvZGVQYXJhbXMtPmhlaWdodAogICAgICAgICAgICAgICAgICAgICAgICAgICAg IHJlbmRlclRpbWVNczplbmNvZGVQYXJhbXMtPnJlbmRlcl90aW1lX21zCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdGltZXN0YW1wOmVuY29kZVBhcmFtcy0+dGltZXN0YW1wCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJvdGF0aW9uOmVuY29kZVBhcmFtcy0+cm90YXRp b25dOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByb3RhdGlvbjplbmNvZGVQYXJh bXMtPnJvdGF0aW9uCisgICAgICAgICAgICAgICAgICAgICAgaXNLZXlGcmFtZVJlcXVpcmVkOmVu Y29kZVBhcmFtcy0+aXNLZXlGcmFtZVJlcXVpcmVkXTsKIH0KIAogLy8gRXh0cmFjdCBWaWRlb1Rv b2xib3ggcHJvZmlsZSBvdXQgb2YgdGhlIHdlYnJ0Yzo6U2RwVmlkZW9Gb3JtYXQuIElmIHRoZXJl IGlzCkBAIC0zNzAsNiArMzc0LDcgQEAgTlNVSW50ZWdlciBHZXRNYXhTYW1wbGVSYXRlKGNvbnN0 IHdlYnJ0Yzo6SDI2NDo6UHJvZmlsZUxldmVsSWQgJnByb2ZpbGVfbGV2ZWxfaWQKICAgd2VicnRj OjpIMjY0Qml0c3RyZWFtUGFyc2VyIF9oMjY0Qml0c3RyZWFtUGFyc2VyOwogICBzdGQ6OnZlY3Rv cjx1aW50OF90PiBfZnJhbWVTY2FsZUJ1ZmZlcjsKICAgYm9vbCBfZGlzYWJsZUVuY29kaW5nOwor ICBib29sIF9pc0tleUZyYW1lUmVxdWlyZWQ7CiB9CiAKIC8vIC41IGlzIHNldCBhcyBhIG1pbmlu dW0gdG8gcHJldmVudCBvdmVyY29tcGVuc2F0aW5nIGZvciBsYXJnZSB0ZW1wb3JhcnkKQEAgLTQw MCw2ICs0MDUsOCBAQCBOU1VJbnRlZ2VyIEdldE1heFNhbXBsZVJhdGUoY29uc3Qgd2VicnRjOjpI MjY0OjpQcm9maWxlTGV2ZWxJZCAmcHJvZmlsZV9sZXZlbF9pZAogICAgIFJUQ19MT0coTFNfSU5G TykgPDwgIlVzaW5nIHByb2ZpbGUgIiA8PCBDRlN0cmluZ1RvU3RyaW5nKEV4dHJhY3RQcm9maWxl KCpfcHJvZmlsZV9sZXZlbF9pZCkpOwogICAgIFJUQ19DSEVDSyhbY29kZWNJbmZvLm5hbWUgaXNF cXVhbFRvU3RyaW5nOmtSVENWaWRlb0NvZGVjSDI2NE5hbWVdKTsKICAgfQorICBfaXNLZXlGcmFt ZVJlcXVpcmVkID0gZmFsc2U7CisKICAgcmV0dXJuIHNlbGY7CiB9CiAKQEAgLTQ1MCw3ICs0NTcs OCBAQCBOU1VJbnRlZ2VyIEdldE1heFNhbXBsZVJhdGUoY29uc3Qgd2VicnRjOjpIMjY0OjpQcm9m aWxlTGV2ZWxJZCAmcHJvZmlsZV9sZXZlbF9pZAogICBpZiAoIV9jYWxsYmFjayB8fCAhW3NlbGYg aGFzQ29tcHJlc3Npb25TZXNzaW9uXSkgewogICAgIHJldHVybiBXRUJSVENfVklERU9fQ09ERUNf VU5JTklUSUFMSVpFRDsKICAgfQotICBCT09MIGlzS2V5ZnJhbWVSZXF1aXJlZCA9IE5POworICBC T09MIGlzS2V5ZnJhbWVSZXF1aXJlZCA9IF9pc0tleUZyYW1lUmVxdWlyZWQ7CisgIF9pc0tleUZy YW1lUmVxdWlyZWQgPSBmYWxzZTsKIAogICAvLyBHZXQgYSBwaXhlbCBidWZmZXIgZnJvbSB0aGUg cG9vbCBhbmQgY29weSBmcmFtZSBkYXRhIG92ZXIuCiAgIGlmIChbc2VsZiByZXNldENvbXByZXNz aW9uU2Vzc2lvbklmTmVlZGVkV2l0aEZyYW1lOmZyYW1lXSkgewpAQCAtNTM0LDcgKzU0Miw4IEBA IE5TVUludGVnZXIgR2V0TWF4U2FtcGxlUmF0ZShjb25zdCB3ZWJydGM6OkgyNjQ6OlByb2ZpbGVM ZXZlbElkICZwcm9maWxlX2xldmVsX2lkCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgX2hlaWdodCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBmcmFtZS50aW1lU3RhbXBOcyAvIHJ0Yzo6a051bU5hbm9zZWNzUGVyTWls bGlzZWMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZnJh bWUudGltZVN0YW1wLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGZyYW1lLnJvdGF0aW9uKSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgZnJhbWUucm90YXRpb24sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgaXNLZXlmcmFtZVJlcXVpcmVkKSk7CiAgIGVuY29kZVBhcmFtcy0+ Y29kZWNTcGVjaWZpY0luZm8ucGFja2V0aXphdGlvbk1vZGUgPSBfcGFja2V0aXphdGlvbk1vZGU7 CiAKICAgLy8gVXBkYXRlIHRoZSBiaXRyYXRlIGlmIG5lZWRlZC4KQEAgLTk0NywxNSArOTU2LDIx IEBAIE5TVUludGVnZXIgR2V0TWF4U2FtcGxlUmF0ZShjb25zdCB3ZWJydGM6OkgyNjQ6OlByb2Zp bGVMZXZlbElkICZwcm9maWxlX2xldmVsX2lkCiAgICAgICAgICAgICAgICAgIGhlaWdodDooaW50 MzJfdCloZWlnaHQKICAgICAgICAgICAgcmVuZGVyVGltZU1zOihpbnQ2NF90KXJlbmRlclRpbWVN cwogICAgICAgICAgICAgICB0aW1lc3RhbXA6KHVpbnQzMl90KXRpbWVzdGFtcAotICAgICAgICAg ICAgICAgcm90YXRpb246KFJUQ1ZpZGVvUm90YXRpb24pcm90YXRpb24geworICAgICAgICAgICAg ICAgcm90YXRpb246KFJUQ1ZpZGVvUm90YXRpb24pcm90YXRpb24KKyAgICAgaXNLZXlGcmFtZVJl cXVpcmVkOihib29sKWlzS2V5RnJhbWVSZXF1aXJlZCB7CiAgIGlmIChzdGF0dXMgIT0gbm9FcnIp IHsKICAgICBSVENfTE9HKExTX0VSUk9SKSA8PCAiSDI2NCBlbmNvZGUgZmFpbGVkIHdpdGggY29k ZTogIiA8PCBzdGF0dXM7CisgICAgaWYgKGlzS2V5RnJhbWVSZXF1aXJlZCkKKyAgICAgIF9pc0tl eUZyYW1lUmVxdWlyZWQgPSB0cnVlOwogICAgIHJldHVybjsKICAgfQogICBpZiAoaW5mb0ZsYWdz ICYga1ZURW5jb2RlSW5mb19GcmFtZURyb3BwZWQpIHsKKyAgICBpZiAoaXNLZXlGcmFtZVJlcXVp cmVkKQorICAgICAgX2lzS2V5RnJhbWVSZXF1aXJlZCA9IHRydWU7CiAgICAgUlRDX0xPRyhMU19J TkZPKSA8PCAiSDI2NCBlbmNvZGUgZHJvcHBlZCBmcmFtZS4iOwogICAgIHJldHVybjsKICAgfQor ICBfaXNLZXlGcmFtZVJlcXVpcmVkID0gZmFsc2U7CiAKICAgQk9PTCBpc0tleWZyYW1lID0gTk87 CiAgIENGQXJyYXlSZWYgYXR0YWNobWVudHMgPSBDTVNhbXBsZUJ1ZmZlckdldFNhbXBsZUF0dGFj aG1lbnRzQXJyYXkoc2FtcGxlQnVmZmVyLCAwKTsKQEAgLTEwMDQsNiArMTAxOSw4IEBAIE5TVUlu dGVnZXIgR2V0TWF4U2FtcGxlUmF0ZShjb25zdCB3ZWJydGM6OkgyNjQ6OlByb2ZpbGVMZXZlbElk ICZwcm9maWxlX2xldmVsX2lkCiAgIEJPT0wgcmVzID0gX2NhbGxiYWNrKGZyYW1lLCBjb2RlY1Nw ZWNpZmljSW5mbywgaGVhZGVyKTsKICAgaWYgKCFyZXMpIHsKICAgICBSVENfTE9HKExTX0VSUk9S KSA8PCAiRW5jb2RlIGNhbGxiYWNrIGZhaWxlZCI7CisgICAgaWYgKGlzS2V5RnJhbWVSZXF1aXJl ZCkKKyAgICAgIF9pc0tleUZyYW1lUmVxdWlyZWQgPSB0cnVlOwogICAgIHJldHVybjsKICAgfQog ICBfYml0cmF0ZUFkanVzdGVyLT5VcGRhdGUoZnJhbWUuYnVmZmVyLmxlbmd0aCk7Cg== 389492 2020-02-03 00:15:24 -0800 2020-02-03 08:38:35 -0800 Patch bug-207108-20200203091522.patch text/plain 7097 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjU1NDE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n ZUxvZwppbmRleCBiYjQ2N2YyYmY0MTU0MWRmZWQ5MGVmYmFkYjRiYmI2Y2EyMzU0MjVkLi43MDA1 NzJjMDYzOTljZmMxZDEzYzg3OTgwNTE5MTFlNGJlNGYyOWI4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAyMC0wMi0wMiAgeW91ZW5uIGZh YmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBzdXJlIFJUQ1ZpZGVvRW5j b2RlckgyNjQgZ2VuZXJhdGUgYSBrZXlmcmFtZSBldmVuIGlmIHRoZSBmcmFtZSB0aGF0IHdhcyBz dXBwb3NlZCB0byBiZSBhIGtleSBmcmFtZSB3YXMgZHJvcHBlZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA3MTA4CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgcGFyYW1ldGVyIHRlbGxpbmcgd2hl dGhlciBhIGZyYW1lIHRvIGJlIGVuY29kZWQgc2hvdWxkIGJlIGEga2V5IGZyYW1lLgorICAgICAg ICBJbiBlbmNvZGVyIGNhbGxiYWNrLCBpZiB0aGUgZnJhbWUgaXMgZXhwZWN0ZWQgdG8gYmUgYSBr ZXkgZnJhbWUsIHNldCBhIGZsYWcgdG8gZm9yY2UgdGhlIG5leHQgZnJhbWUgdG8gYmUgYSBrZXkg ZnJhbWUuCisgICAgICAgIFRoaXMgZW5zdXJlcyB0aGF0IGtleWZyYW1lIHNlbmRpbmcgaXMgbm90 IGRlbGF5ZWQgaW4gY2FzZSBlbmNvZGluZyBpcyBkcm9wcGluZyBvciBmYWlsaW5nIHRvIGVuY29k ZSBmcmFtZXMuCisKKyAgICAgICAgKiBTb3VyY2Uvd2VicnRjL3Nkay9vYmpjL2NvbXBvbmVudHMv dmlkZW9fY29kZWMvUlRDVmlkZW9FbmNvZGVySDI2NC5tbToKKyAgICAgICAgKC1bUlRDVmlkZW9F bmNvZGVySDI2NCBpbml0V2l0aENvZGVjSW5mbzpdKToKKyAgICAgICAgKC1bUlRDVmlkZW9FbmNv ZGVySDI2NCBlbmNvZGU6Y29kZWNTcGVjaWZpY0luZm86ZnJhbWVUeXBlczpdKToKKyAgICAgICAg KC1bUlRDVmlkZW9FbmNvZGVySDI2NCBmcmFtZVdhc0VuY29kZWQ6ZmxhZ3M6c2FtcGxlQnVmZmVy OmNvZGVjU3BlY2lmaWNJbmZvOndpZHRoOmhlaWdodDpyZW5kZXJUaW1lTXM6dGltZXN0YW1wOnJv dGF0aW9uOmlzS2V5RnJhbWVSZXF1aXJlZDpdKToKKwogMjAyMC0wMS0yMCAgeW91ZW5uIGZhYmxl dCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgU2V0dGluZyBrVlRDb21wcmVzc2lvblBy b3BlcnR5S2V5X0RhdGFSYXRlTGltaXRzIG9uIFJUQ1ZpZGVvRW5jb2RlckgyNjQgZmFpbHMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9v YmpjL2NvbXBvbmVudHMvdmlkZW9fY29kZWMvUlRDVmlkZW9FbmNvZGVySDI2NC5tbSBiL1NvdXJj ZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9vYmpjL2NvbXBvbmVudHMv dmlkZW9fY29kZWMvUlRDVmlkZW9FbmNvZGVySDI2NC5tbQppbmRleCA5NzUzMGUyM2I4ODE4ZDI2 YWU1YzRhNzI1OTk4MTVmNWY0MWNjODgxLi5lNDJkZGFhZWI1ZGE4MzdiMjc3NDA3YjEzMDQ4ZGJk MTQ1OTI0ZWFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNl L3dlYnJ0Yy9zZGsvb2JqYy9jb21wb25lbnRzL3ZpZGVvX2NvZGVjL1JUQ1ZpZGVvRW5jb2Rlckgy NjQubW0KKysrIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvc2Rr L29iamMvY29tcG9uZW50cy92aWRlb19jb2RlYy9SVENWaWRlb0VuY29kZXJIMjY0Lm1tCkBAIC04 Niw3ICs4Niw4IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc1N0YW5kYXJkRnJhbWVTaXplKGludDMy X3Qgd2lkdGgsIGludDMyX3QgaGVpZ2h0KQogICAgICAgICAgICAgICAgICBoZWlnaHQ6KGludDMy X3QpaGVpZ2h0CiAgICAgICAgICAgIHJlbmRlclRpbWVNczooaW50NjRfdClyZW5kZXJUaW1lTXMK ICAgICAgICAgICAgICAgdGltZXN0YW1wOih1aW50MzJfdCl0aW1lc3RhbXAKLSAgICAgICAgICAg ICAgIHJvdGF0aW9uOihSVENWaWRlb1JvdGF0aW9uKXJvdGF0aW9uOworICAgICAgICAgICAgICAg cm90YXRpb246KFJUQ1ZpZGVvUm90YXRpb24pcm90YXRpb24KKyAgICAgaXNLZXlGcmFtZVJlcXVp cmVkOihib29sKWlzS2V5RnJhbWVSZXF1aXJlZDsKIAogQGVuZAogCkBAIC0xMTIsOCArMTEzLDkg QEAgc3RydWN0IFJUQ0ZyYW1lRW5jb2RlUGFyYW1zIHsKICAgICAgICAgICAgICAgICAgICAgICAg aW50MzJfdCBoLAogICAgICAgICAgICAgICAgICAgICAgICBpbnQ2NF90IHJ0bXMsCiAgICAgICAg ICAgICAgICAgICAgICAgIHVpbnQzMl90IHRzLAotICAgICAgICAgICAgICAgICAgICAgICBSVENW aWRlb1JvdGF0aW9uIHIpCi0gICAgICA6IGVuY29kZXIoZSksIHdpZHRoKHcpLCBoZWlnaHQoaCks IHJlbmRlcl90aW1lX21zKHJ0bXMpLCB0aW1lc3RhbXAodHMpLCByb3RhdGlvbihyKSB7CisgICAg ICAgICAgICAgICAgICAgICAgIFJUQ1ZpZGVvUm90YXRpb24gciwKKyAgICAgICAgICAgICAgICAg ICAgICAgYm9vbCBpc0tleUZyYW1lUmVxdWlyZWQpCisgICAgICA6IGVuY29kZXIoZSksIHdpZHRo KHcpLCBoZWlnaHQoaCksIHJlbmRlcl90aW1lX21zKHJ0bXMpLCB0aW1lc3RhbXAodHMpLCByb3Rh dGlvbihyKSwgaXNLZXlGcmFtZVJlcXVpcmVkKGlzS2V5RnJhbWVSZXF1aXJlZCkgewogICAgIGlm IChjc2kpIHsKICAgICAgIGNvZGVjU3BlY2lmaWNJbmZvID0gY3NpOwogICAgIH0gZWxzZSB7CkBA IC0xMjgsNiArMTMwLDcgQEAgc3RydWN0IFJUQ0ZyYW1lRW5jb2RlUGFyYW1zIHsKICAgaW50NjRf dCByZW5kZXJfdGltZV9tczsKICAgdWludDMyX3QgdGltZXN0YW1wOwogICBSVENWaWRlb1JvdGF0 aW9uIHJvdGF0aW9uOworICBib29sIGlzS2V5RnJhbWVSZXF1aXJlZDsKIH07CiAKIC8vIFdlIHJl Y2VpdmUgSTQyMEZyYW1lcyBhcyBpbnB1dCwgYnV0IHdlIG5lZWQgdG8gZmVlZCBDVlBpeGVsQnVm ZmVycyBpbnRvIHRoZQpAQCAtMjA2LDcgKzIwOSw4IEBAIHZvaWQgY29tcHJlc3Npb25PdXRwdXRD YWxsYmFjayh2b2lkICplbmNvZGVyLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGhlaWdodDplbmNvZGVQYXJhbXMtPmhlaWdodAogICAgICAgICAgICAgICAgICAgICAgICAgICAg IHJlbmRlclRpbWVNczplbmNvZGVQYXJhbXMtPnJlbmRlcl90aW1lX21zCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdGltZXN0YW1wOmVuY29kZVBhcmFtcy0+dGltZXN0YW1wCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJvdGF0aW9uOmVuY29kZVBhcmFtcy0+cm90YXRp b25dOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByb3RhdGlvbjplbmNvZGVQYXJh bXMtPnJvdGF0aW9uCisgICAgICAgICAgICAgICAgICAgICAgaXNLZXlGcmFtZVJlcXVpcmVkOmVu Y29kZVBhcmFtcy0+aXNLZXlGcmFtZVJlcXVpcmVkXTsKIH0KIAogLy8gRXh0cmFjdCBWaWRlb1Rv b2xib3ggcHJvZmlsZSBvdXQgb2YgdGhlIHdlYnJ0Yzo6U2RwVmlkZW9Gb3JtYXQuIElmIHRoZXJl IGlzCkBAIC0zNzAsNiArMzc0LDcgQEAgTlNVSW50ZWdlciBHZXRNYXhTYW1wbGVSYXRlKGNvbnN0 IHdlYnJ0Yzo6SDI2NDo6UHJvZmlsZUxldmVsSWQgJnByb2ZpbGVfbGV2ZWxfaWQKICAgd2VicnRj OjpIMjY0Qml0c3RyZWFtUGFyc2VyIF9oMjY0Qml0c3RyZWFtUGFyc2VyOwogICBzdGQ6OnZlY3Rv cjx1aW50OF90PiBfZnJhbWVTY2FsZUJ1ZmZlcjsKICAgYm9vbCBfZGlzYWJsZUVuY29kaW5nOwor ICBib29sIF9pc0tleUZyYW1lUmVxdWlyZWQ7CiB9CiAKIC8vIC41IGlzIHNldCBhcyBhIG1pbmlu dW0gdG8gcHJldmVudCBvdmVyY29tcGVuc2F0aW5nIGZvciBsYXJnZSB0ZW1wb3JhcnkKQEAgLTQw MCw2ICs0MDUsOCBAQCBOU1VJbnRlZ2VyIEdldE1heFNhbXBsZVJhdGUoY29uc3Qgd2VicnRjOjpI MjY0OjpQcm9maWxlTGV2ZWxJZCAmcHJvZmlsZV9sZXZlbF9pZAogICAgIFJUQ19MT0coTFNfSU5G TykgPDwgIlVzaW5nIHByb2ZpbGUgIiA8PCBDRlN0cmluZ1RvU3RyaW5nKEV4dHJhY3RQcm9maWxl KCpfcHJvZmlsZV9sZXZlbF9pZCkpOwogICAgIFJUQ19DSEVDSyhbY29kZWNJbmZvLm5hbWUgaXNF cXVhbFRvU3RyaW5nOmtSVENWaWRlb0NvZGVjSDI2NE5hbWVdKTsKICAgfQorICBfaXNLZXlGcmFt ZVJlcXVpcmVkID0gZmFsc2U7CisKICAgcmV0dXJuIHNlbGY7CiB9CiAKQEAgLTQ1MCw3ICs0NTcs OCBAQCBOU1VJbnRlZ2VyIEdldE1heFNhbXBsZVJhdGUoY29uc3Qgd2VicnRjOjpIMjY0OjpQcm9m aWxlTGV2ZWxJZCAmcHJvZmlsZV9sZXZlbF9pZAogICBpZiAoIV9jYWxsYmFjayB8fCAhW3NlbGYg aGFzQ29tcHJlc3Npb25TZXNzaW9uXSkgewogICAgIHJldHVybiBXRUJSVENfVklERU9fQ09ERUNf VU5JTklUSUFMSVpFRDsKICAgfQotICBCT09MIGlzS2V5ZnJhbWVSZXF1aXJlZCA9IE5POworICBC T09MIGlzS2V5ZnJhbWVSZXF1aXJlZCA9IF9pc0tleUZyYW1lUmVxdWlyZWQ7CisgIF9pc0tleUZy YW1lUmVxdWlyZWQgPSBmYWxzZTsKIAogICAvLyBHZXQgYSBwaXhlbCBidWZmZXIgZnJvbSB0aGUg cG9vbCBhbmQgY29weSBmcmFtZSBkYXRhIG92ZXIuCiAgIGlmIChbc2VsZiByZXNldENvbXByZXNz aW9uU2Vzc2lvbklmTmVlZGVkV2l0aEZyYW1lOmZyYW1lXSkgewpAQCAtNTEzLDYgKzUyMSw3IEBA IE5TVUludGVnZXIgR2V0TWF4U2FtcGxlUmF0ZShjb25zdCB3ZWJydGM6OkgyNjQ6OlByb2ZpbGVM ZXZlbElkICZwcm9maWxlX2xldmVsX2lkCiAgIGlmICghaXNLZXlmcmFtZVJlcXVpcmVkICYmIGZy YW1lVHlwZXMpIHsKICAgICBmb3IgKE5TTnVtYmVyICpmcmFtZVR5cGUgaW4gZnJhbWVUeXBlcykg ewogICAgICAgaWYgKChSVENGcmFtZVR5cGUpZnJhbWVUeXBlLmludFZhbHVlID09IFJUQ0ZyYW1l VHlwZVZpZGVvRnJhbWVLZXkpIHsKKyAgICAgICAgUlRDX0xPRyhMU19JTkZPKSA8PCAia2V5ZnJh bWUgcmVxdWVzdGVkIjsKICAgICAgICAgaXNLZXlmcmFtZVJlcXVpcmVkID0gWUVTOwogICAgICAg ICBicmVhazsKICAgICAgIH0KQEAgLTUzNCw3ICs1NDMsOCBAQCBOU1VJbnRlZ2VyIEdldE1heFNh bXBsZVJhdGUoY29uc3Qgd2VicnRjOjpIMjY0OjpQcm9maWxlTGV2ZWxJZCAmcHJvZmlsZV9sZXZl bF9pZAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF9oZWln aHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZnJhbWUu dGltZVN0YW1wTnMgLyBydGM6OmtOdW1OYW5vc2Vjc1Blck1pbGxpc2VjLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZyYW1lLnRpbWVTdGFtcCwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmcmFtZS5yb3RhdGlvbikp OworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZyYW1lLnJv dGF0aW9uLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlz S2V5ZnJhbWVSZXF1aXJlZCkpOwogICBlbmNvZGVQYXJhbXMtPmNvZGVjU3BlY2lmaWNJbmZvLnBh Y2tldGl6YXRpb25Nb2RlID0gX3BhY2tldGl6YXRpb25Nb2RlOwogCiAgIC8vIFVwZGF0ZSB0aGUg Yml0cmF0ZSBpZiBuZWVkZWQuCkBAIC05NDcsMTUgKzk1NywyMSBAQCBOU1VJbnRlZ2VyIEdldE1h eFNhbXBsZVJhdGUoY29uc3Qgd2VicnRjOjpIMjY0OjpQcm9maWxlTGV2ZWxJZCAmcHJvZmlsZV9s ZXZlbF9pZAogICAgICAgICAgICAgICAgICBoZWlnaHQ6KGludDMyX3QpaGVpZ2h0CiAgICAgICAg ICAgIHJlbmRlclRpbWVNczooaW50NjRfdClyZW5kZXJUaW1lTXMKICAgICAgICAgICAgICAgdGlt ZXN0YW1wOih1aW50MzJfdCl0aW1lc3RhbXAKLSAgICAgICAgICAgICAgIHJvdGF0aW9uOihSVENW aWRlb1JvdGF0aW9uKXJvdGF0aW9uIHsKKyAgICAgICAgICAgICAgIHJvdGF0aW9uOihSVENWaWRl b1JvdGF0aW9uKXJvdGF0aW9uCisgICAgIGlzS2V5RnJhbWVSZXF1aXJlZDooYm9vbClpc0tleUZy YW1lUmVxdWlyZWQgewogICBpZiAoc3RhdHVzICE9IG5vRXJyKSB7CiAgICAgUlRDX0xPRyhMU19F UlJPUikgPDwgIkgyNjQgZW5jb2RlIGZhaWxlZCB3aXRoIGNvZGU6ICIgPDwgc3RhdHVzOworICAg IGlmIChpc0tleUZyYW1lUmVxdWlyZWQpCisgICAgICBfaXNLZXlGcmFtZVJlcXVpcmVkID0gdHJ1 ZTsKICAgICByZXR1cm47CiAgIH0KICAgaWYgKGluZm9GbGFncyAmIGtWVEVuY29kZUluZm9fRnJh bWVEcm9wcGVkKSB7CisgICAgaWYgKGlzS2V5RnJhbWVSZXF1aXJlZCkKKyAgICAgIF9pc0tleUZy YW1lUmVxdWlyZWQgPSB0cnVlOwogICAgIFJUQ19MT0coTFNfSU5GTykgPDwgIkgyNjQgZW5jb2Rl IGRyb3BwZWQgZnJhbWUuIjsKICAgICByZXR1cm47CiAgIH0KKyAgX2lzS2V5RnJhbWVSZXF1aXJl ZCA9IGZhbHNlOwogCiAgIEJPT0wgaXNLZXlmcmFtZSA9IE5POwogICBDRkFycmF5UmVmIGF0dGFj aG1lbnRzID0gQ01TYW1wbGVCdWZmZXJHZXRTYW1wbGVBdHRhY2htZW50c0FycmF5KHNhbXBsZUJ1 ZmZlciwgMCk7CkBAIC0xMDA0LDYgKzEwMjAsOCBAQCBOU1VJbnRlZ2VyIEdldE1heFNhbXBsZVJh dGUoY29uc3Qgd2VicnRjOjpIMjY0OjpQcm9maWxlTGV2ZWxJZCAmcHJvZmlsZV9sZXZlbF9pZAog ICBCT09MIHJlcyA9IF9jYWxsYmFjayhmcmFtZSwgY29kZWNTcGVjaWZpY0luZm8sIGhlYWRlcik7 CiAgIGlmICghcmVzKSB7CiAgICAgUlRDX0xPRyhMU19FUlJPUikgPDwgIkVuY29kZSBjYWxsYmFj ayBmYWlsZWQiOworICAgIGlmIChpc0tleUZyYW1lUmVxdWlyZWQpCisgICAgICBfaXNLZXlGcmFt ZVJlcXVpcmVkID0gdHJ1ZTsKICAgICByZXR1cm47CiAgIH0KICAgX2JpdHJhdGVBZGp1c3Rlci0+ VXBkYXRlKGZyYW1lLmJ1ZmZlci5sZW5ndGgpOwo=