190984 2018-10-27 06:58:03 -0700 [EME] Add a logging macro 2018-10-27 08:35:24 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cturner cturner calvaris commit-queue jer.noble webkit-bug-importer oldest_to_newest 1472697 0 cturner 2018-10-27 06:58:03 -0700 [EME] Add a logging macro 1472698 1 353232 cturner 2018-10-27 06:58:42 -0700 Created attachment 353232 Patch 1472709 2 353232 commit-queue 2018-10-27 08:34:43 -0700 Comment on attachment 353232 Patch Clearing flags on attachment: 353232 Committed r237493: <https://trac.webkit.org/changeset/237493> 1472710 3 commit-queue 2018-10-27 08:34:45 -0700 All reviewed patches have been landed. Closing bug. 1472711 4 webkit-bug-importer 2018-10-27 08:35:24 -0700 <rdar://problem/45612074> 353232 2018-10-27 06:58:42 -0700 2018-10-27 08:34:43 -0700 Patch bug-190984-20181027145840.patch text/plain 9704 cturner U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3NDg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDAyYWRlYjk0YmJiMjAz OTVkNzg4NjY0Yjg4ZjhhYTkxMDczNTJkZi4uYzQxZmEwZWNiODc5MzMzYzMwZDI3ZTMyMTlhMjc2 MDY4ZjJlODg5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE4LTEwLTI3ICBDaGFy bGllIFR1cm5lciAgPGN0dXJuZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbRU1FXSBBZGQgYSBs b2dnaW5nIG1hY3JvCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xOTA5ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBObyB0ZXN0cyBzaW5jZSBubyBuZXcgZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIE1v ZHVsZXMvZW5jcnlwdGVkbWVkaWEvTWVkaWFLZXlTZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhS2V5U2Vzc2lvbjo6TWVkaWFLZXlTZXNzaW9uKToKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhS2V5U2Vzc2lvbjo6Z2VuZXJhdGVSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhS2V5U2Vzc2lvbjo6dXBkYXRlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhS2V5U2Vzc2lv bjo6Y2xvc2UpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFLZXlTZXNzaW9uOjpyZW1vdmUpOgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFLZXlTZXNzaW9uOjpzZXNzaW9uQ2xvc2VkKToKKyAgICAg ICAgKiBNb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlhS2V5cy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpNZWRpYUtleXM6OmNyZWF0ZVNlc3Npb24pOgorICAgICAgICAqIE1vZHVsZXMvZW5jcnlw dGVkbWVkaWEvTmF2aWdhdG9yRU1FLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5hdmlnYXRvckVN RTo6cmVxdWVzdE1lZGlhS2V5U3lzdGVtQWNjZXNzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9Mb2dn aW5nLmg6CisKIDIwMTgtMTAtMjcgIENoYXJsaWUgVHVybmVyICA8Y3R1cm5lckBpZ2FsaWEuY29t PgogCiAgICAgICAgIEZpeCByZWxlYXNlIGJ1aWxkIHdpdGggLURMT0dfRElTQUJMRUQ9MApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9NZWRpYUtleVNl c3Npb24uY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9NZWRpYUtl eVNlc3Npb24uY3BwCmluZGV4IGNlYjc0MWE4OTUwYjljZGNlYmNhNWQ5NjRhM2EwMDg4MTRiNjAz OTUuLmJiMzBhMjE1MzIxYjI5Njk3YzEyMTY4YzE1NTJhOGViZjkyNjkwZTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTWVkaWFLZXlTZXNzaW9uLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlhS2V5U2Vz c2lvbi5jcHAKQEAgLTM1LDYgKzM1LDcgQEAKICNpbmNsdWRlICJDRE1JbnN0YW5jZS5oIgogI2lu Y2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRXZlbnROYW1lcy5oIgorI2luY2x1ZGUgIkxv Z2dpbmcuaCIKICNpbmNsdWRlICJNZWRpYUtleU1lc3NhZ2VFdmVudC5oIgogI2luY2x1ZGUgIk1l ZGlhS2V5TWVzc2FnZVR5cGUuaCIKICNpbmNsdWRlICJNZWRpYUtleVN0YXR1c01hcC5oIgpAQCAt NzAsNiArNzEsOCBAQCBNZWRpYUtleVNlc3Npb246Ok1lZGlhS2V5U2Vzc2lvbihTY3JpcHRFeGVj dXRpb25Db250ZXh0JiBjb250ZXh0LCBXZWFrUHRyPE1lZGlhSwogICAgIC8vIFczQyBFZGl0b3In cyBEcmFmdCAwOSBOb3ZlbWJlciAyMDE2CiAgICAgLy8gY3JlYXRlU2Vzc2lvbigpLCBjdGQuCiAK KyAgICBMT0coRU1FLCAiRU1FIC0gbmV3IHNlc3Npb24gY3JlYXRlZCIpOworCiAgICAgLy8gMy4x LiBMZXQgdGhlIHNlc3Npb25JZCBhdHRyaWJ1dGUgYmUgdGhlIGVtcHR5IHN0cmluZy4KICAgICAv LyAzLjIuIExldCB0aGUgZXhwaXJhdGlvbiBhdHRyaWJ1dGUgYmUgTmFOLgogICAgIC8vIDMuMy4g TGV0IHRoZSBjbG9zZWQgYXR0cmlidXRlIGJlIGEgbmV3IHByb21pc2UuCkBAIC0xMjAsNiArMTIz LDggQEAgdm9pZCBNZWRpYUtleVNlc3Npb246OmdlbmVyYXRlUmVxdWVzdChjb25zdCBBdG9taWNT dHJpbmcmIGluaXREYXRhVHlwZSwgY29uc3QgQnUKICAgICAvLyBXaGVuIHRoaXMgbWV0aG9kIGlz IGludm9rZWQsIHRoZSB1c2VyIGFnZW50IG11c3QgcnVuIHRoZSBmb2xsb3dpbmcgc3RlcHM6CiAg ICAgLy8gMS4gSWYgdGhpcyBvYmplY3QgaXMgY2xvc2VkLCByZXR1cm4gYSBwcm9taXNlIHJlamVj dGVkIHdpdGggYW4gSW52YWxpZFN0YXRlRXJyb3IuCiAgICAgLy8gMi4gSWYgdGhpcyBvYmplY3Qn cyB1bmluaXRpYWxpemVkIHZhbHVlIGlzIGZhbHNlLCByZXR1cm4gYSBwcm9taXNlIHJlamVjdGVk IHdpdGggYW4gSW52YWxpZFN0YXRlRXJyb3IuCisgICAgTE9HKEVNRSwgIkVNRSAtIGdlbmVyYXRl IHJlcXVlc3QiKTsKKwogICAgIGlmIChtX2Nsb3NlZCB8fCAhbV91bmluaXRpYWxpemVkKSB7CiAg ICAgICAgIHByb21pc2UtPnJlamVjdChJbnZhbGlkU3RhdGVFcnJvcik7CiAgICAgICAgIHJldHVy bjsKQEAgLTE5NCw2ICsxOTksNyBAQCB2b2lkIE1lZGlhS2V5U2Vzc2lvbjo6Z2VuZXJhdGVSZXF1 ZXN0KGNvbnN0IEF0b21pY1N0cmluZyYgaW5pdERhdGFUeXBlLCBjb25zdCBCdQogICAgICAgICAg ICAgbV9sYXRlc3REZWNyeXB0VGltZSA9IDA7CiAgICAgICAgIH0KIAorICAgICAgICBMT0coRU1F LCAiRU1FIC0gcmVxdWVzdCBsaWNlbnNlIGZyb20gQ0RNIGltcGxlbWVudGF0aW9uIik7CiAgICAg ICAgIG1faW5zdGFuY2VTZXNzaW9uLT5yZXF1ZXN0TGljZW5zZShtX3Nlc3Npb25UeXBlLCBpbml0 RGF0YVR5cGUsIFdURk1vdmUoaW5pdERhdGEpLCBbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vha1B0 cigqdGhpcyksIHByb21pc2UgPSBXVEZNb3ZlKHByb21pc2UpXSAoUmVmPFNoYXJlZEJ1ZmZlcj4m JiBtZXNzYWdlLCBjb25zdCBTdHJpbmcmIHNlc3Npb25JZCwgYm9vbCBuZWVkc0luZGl2aWR1YWxp emF0aW9uLCBDRE1JbnN0YW5jZVNlc3Npb246OlN1Y2Nlc3NWYWx1ZSBzdWNjZWVkZWQpIG11dGFi bGUgewogICAgICAgICAgICAgaWYgKCF3ZWFrVGhpcykKICAgICAgICAgICAgICAgICByZXR1cm47 CkBAIC0zNTksNiArMzY1LDggQEAgdm9pZCBNZWRpYUtleVNlc3Npb246OnVwZGF0ZShjb25zdCBC dWZmZXJTb3VyY2UmIHJlc3BvbnNlLCBSZWY8RGVmZXJyZWRQcm9taXNlPiYKICAgICAvLyBXaGVu IHRoaXMgbWV0aG9kIGlzIGludm9rZWQsIHRoZSB1c2VyIGFnZW50IG11c3QgcnVuIHRoZSBmb2xs b3dpbmcgc3RlcHM6CiAgICAgLy8gMS4gSWYgdGhpcyBvYmplY3QgaXMgY2xvc2VkLCByZXR1cm4g YSBwcm9taXNlIHJlamVjdGVkIHdpdGggYW4gSW52YWxpZFN0YXRlRXJyb3IuCiAgICAgLy8gMi4g SWYgdGhpcyBvYmplY3QncyBjYWxsYWJsZSB2YWx1ZSBpcyBmYWxzZSwgcmV0dXJuIGEgcHJvbWlz ZSByZWplY3RlZCB3aXRoIGFuIEludmFsaWRTdGF0ZUVycm9yLgorICAgIExPRyhFTUUsICJFTUUg LSB1cGRhdGUgc2Vzc2lvbiBmb3IgJXMiLCBtX3Nlc3Npb25JZC51dGY4KCkuZGF0YSgpKTsKKwog ICAgIGlmIChtX2Nsb3NlZCB8fCAhbV9jYWxsYWJsZSkgewogICAgICAgICBwcm9taXNlLT5yZWpl Y3QoSW52YWxpZFN0YXRlRXJyb3IpOwogICAgICAgICByZXR1cm47CkBAIC00MTUsNiArNDIzLDcg QEAgdm9pZCBNZWRpYUtleVNlc3Npb246OnVwZGF0ZShjb25zdCBCdWZmZXJTb3VyY2UmIHJlc3Bv bnNlLCBSZWY8RGVmZXJyZWRQcm9taXNlPiYKICAgICAgICAgICAgIC8vIE5PVEU6IFN0ZXBzIDYu Ny4xLiBhbmQgNi43LjIuIHNob3VsZCBiZSBpbXBsZW1lbnRlZCBpbiBDRE1JbnN0YW5jZS4KIAog ICAgICAgICAgICAgaWYgKHN1Y2NlZWRlZCA9PSBDRE1JbnN0YW5jZVNlc3Npb246OlN1Y2Nlc3NW YWx1ZTo6RmFpbGVkKSB7CisgICAgICAgICAgICAgICAgTE9HKEVNRSwgIkVNRSAtIGZhaWxlZCB0 byB1cGRhdGUgQ0RNIGxpY2Vuc2UgZm9yICVzIiwgbV9zZXNzaW9uSWQudXRmOCgpLmRhdGEoKSk7 CiAgICAgICAgICAgICAgICAgcHJvbWlzZS0+cmVqZWN0KFR5cGVFcnJvcik7CiAgICAgICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQpAQCAtNDI0LDYgKzQzMyw3IEBAIHZvaWQgTWVk aWFLZXlTZXNzaW9uOjp1cGRhdGUoY29uc3QgQnVmZmVyU291cmNlJiByZXNwb25zZSwgUmVmPERl ZmVycmVkUHJvbWlzZT4mCiAgICAgICAgICAgICAvLyAgIDYuNy4zLjIuIExldCBtZXNzYWdlIHR5 cGUgYmUgdGhlIGFwcHJvcHJpYXRlIE1lZGlhS2V5TWVzc2FnZVR5cGUgZm9yIHRoZSBtZXNzYWdl LgogICAgICAgICAgICAgLy8gNi44LiBRdWV1ZSBhIHRhc2sgdG8gcnVuIHRoZSBmb2xsb3dpbmcg c3RlcHM6CiAgICAgICAgICAgICBtX3Rhc2tRdWV1ZS5lbnF1ZXVlVGFzayhbdGhpcywgc2Vzc2lv bldhc0Nsb3NlZCwgY2hhbmdlZEtleXMgPSBXVEZNb3ZlKGNoYW5nZWRLZXlzKSwgY2hhbmdlZEV4 cGlyYXRpb24gPSBXVEZNb3ZlKGNoYW5nZWRFeHBpcmF0aW9uKSwgbWVzc2FnZSA9IFdURk1vdmUo bWVzc2FnZSksIHByb21pc2UgPSBXVEZNb3ZlKHByb21pc2UpXSAoKSBtdXRhYmxlIHsKKyAgICAg ICAgICAgICAgICBMT0coRU1FLCAiRU1FIC0gdXBkYXRpbmcgQ0RNIGxpY2Vuc2Ugc3VjY2VlZGVk IGZvciBzZXNzaW9uICVzLCBzZW5kaW5nIGEgbWVzc2FnZSB0byB0aGUgbGljZW5zZSBzZXJ2ZXIi LCBtX3Nlc3Npb25JZC51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgICAgICAgICAvLyA2LjguMS4K ICAgICAgICAgICAgICAgICBpZiAoc2Vzc2lvbldhc0Nsb3NlZCkgewogICAgICAgICAgICAgICAg ICAgICAvLyDihrMgSWYgc2Vzc2lvbiBjbG9zZWQgaXMgdHJ1ZToKQEAgLTQ4NCw2ICs0OTQsOCBA QCB2b2lkIE1lZGlhS2V5U2Vzc2lvbjo6Y2xvc2UoUmVmPERlZmVycmVkUHJvbWlzZT4mJiBwcm9t aXNlKQogCiAgICAgLy8gMS4gTGV0IHNlc3Npb24gYmUgdGhlIGFzc29jaWF0ZWQgTWVkaWFLZXlT ZXNzaW9uIG9iamVjdC4KICAgICAvLyAyLiBJZiBzZXNzaW9uIGlzIGNsb3NlZCwgcmV0dXJuIGEg cmVzb2x2ZWQgcHJvbWlzZS4KKyAgICBMT0coRU1FLCAiRU1FIC0gY2xvc2luZyBzZXNzaW9uICVz IiwgbV9zZXNzaW9uSWQudXRmOCgpLmRhdGEoKSk7CisKICAgICBpZiAobV9jbG9zZWQpIHsKICAg ICAgICAgcHJvbWlzZS0+cmVzb2x2ZSgpOwogICAgICAgICByZXR1cm47CkBAIC01MDAsNiArNTEy LDcgQEAgdm9pZCBNZWRpYUtleVNlc3Npb246OmNsb3NlKFJlZjxEZWZlcnJlZFByb21pc2U+JiYg cHJvbWlzZSkKICAgICBtX3Rhc2tRdWV1ZS5lbnF1ZXVlVGFzayhbdGhpcywgcHJvbWlzZSA9IFdU Rk1vdmUocHJvbWlzZSldICgpIG11dGFibGUgewogICAgICAgICAvLyA1LjEuIExldCBjZG0gYmUg dGhlIENETSBpbnN0YW5jZSByZXByZXNlbnRlZCBieSBzZXNzaW9uJ3MgY2RtIGluc3RhbmNlIHZh bHVlLgogICAgICAgICAvLyA1LjIuIFVzZSBjZG0gdG8gY2xvc2UgdGhlIGtleSBzZXNzaW9uIGFz c29jaWF0ZWQgd2l0aCBzZXNzaW9uLgorICAgICAgICBMT0coRU1FLCAiRU1FIC0gY2xvc2luZyBD RE0gc2Vzc2lvbiAlcyIsIG1fc2Vzc2lvbklkLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICBtX2lu c3RhbmNlU2Vzc2lvbi0+Y2xvc2VTZXNzaW9uKG1fc2Vzc2lvbklkLCBbdGhpcywgd2Vha1RoaXMg PSBtYWtlV2Vha1B0cigqdGhpcyksIHByb21pc2UgPSBXVEZNb3ZlKHByb21pc2UpXSAoKSBtdXRh YmxlIHsKICAgICAgICAgICAgIGlmICghd2Vha1RoaXMpCiAgICAgICAgICAgICAgICAgcmV0dXJu OwpAQCAtNTI1LDYgKzUzOCw4IEBAIHZvaWQgTWVkaWFLZXlTZXNzaW9uOjpyZW1vdmUoUmVmPERl ZmVycmVkUHJvbWlzZT4mJiBwcm9taXNlKQogCiAgICAgLy8gMS4gSWYgdGhpcyBvYmplY3QgaXMg Y2xvc2VkLCByZXR1cm4gYSBwcm9taXNlIHJlamVjdGVkIHdpdGggYW4gSW52YWxpZFN0YXRlRXJy b3IuCiAgICAgLy8gMi4gSWYgdGhpcyBvYmplY3QncyBjYWxsYWJsZSB2YWx1ZSBpcyBmYWxzZSwg cmV0dXJuIGEgcHJvbWlzZSByZWplY3RlZCB3aXRoIGFuIEludmFsaWRTdGF0ZUVycm9yLgorICAg IExPRyhFTUUsICJFTUUgLSByZW1vdmluZyBzZXNzaW9uICVzIiwgbV9zZXNzaW9uSWQudXRmOCgp LmRhdGEoKSk7CisKICAgICBpZiAobV9jbG9zZWQgfHwgIW1fY2FsbGFibGUpIHsKICAgICAgICAg cHJvbWlzZS0+cmVqZWN0KEludmFsaWRTdGF0ZUVycm9yKTsKICAgICAgICAgcmV0dXJuOwpAQCAt NjYwLDYgKzY3NSw3IEBAIHZvaWQgTWVkaWFLZXlTZXNzaW9uOjpzZXNzaW9uQ2xvc2VkKCkKIHsK ICAgICAvLyBodHRwczovL3czYy5naXRodWIuaW8vZW5jcnlwdGVkLW1lZGlhLyNzZXNzaW9uLWNs b3NlZAogICAgIC8vIFczQyBFZGl0b3IncyBEcmFmdCAwOSBOb3ZlbWJlciAyMDE2CisgICAgTE9H KEVNRSwgIkVNRSAtIHNlc3Npb24gJXMgd2FzIGNsb3NlZCIsIG1fc2Vzc2lvbklkLnV0ZjgoKS5k YXRhKCkpOwogCiAgICAgLy8gMS4gTGV0IHNlc3Npb24gYmUgdGhlIGFzc29jaWF0ZWQgTWVkaWFL ZXlTZXNzaW9uIG9iamVjdC4KICAgICAvLyAyLiBJZiBzZXNzaW9uJ3Mgc2Vzc2lvbiB0eXBlIGlz ICJwZXJzaXN0ZW50LXVzYWdlLXJlY29yZCIsIGV4ZWN1dGUgdGhlIGZvbGxvd2luZyBzdGVwcyBp biBwYXJhbGxlbDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVk bWVkaWEvTWVkaWFLZXlzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVk aWEvTWVkaWFLZXlzLmNwcAppbmRleCBjZWMzYjg2ODY2ODM2ZTYwYjlhYTkxZmY3NmQzMDc5MWFi NGE1Yzk1Li5kMzM0NTg0Yjc2NDk1MGQ4MTYwNmMyY2JiNThhMjg4ZTk1NTNjZjNhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlhS2V5cy5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9NZWRpYUtleXMuY3Bw CkBAIC0zNCw2ICszNCw3IEBACiAjaW5jbHVkZSAiQ0RNLmgiCiAjaW5jbHVkZSAiQ0RNQ2xpZW50 LmgiCiAjaW5jbHVkZSAiQ0RNSW5zdGFuY2UuaCIKKyNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5j bHVkZSAiTWVkaWFLZXlTZXNzaW9uLmgiCiAjaW5jbHVkZSAiU2hhcmVkQnVmZmVyLmgiCiAKQEAg LTU0LDYgKzU1LDcgQEAgRXhjZXB0aW9uT3I8UmVmPE1lZGlhS2V5U2Vzc2lvbj4+IE1lZGlhS2V5 czo6Y3JlYXRlU2Vzc2lvbihTY3JpcHRFeGVjdXRpb25Db250ZXgKIHsKICAgICAvLyBodHRwczov L3czYy5naXRodWIuaW8vZW5jcnlwdGVkLW1lZGlhLyNkb20tbWVkaWFrZXlzLXNldHNlcnZlcmNl cnRpZmljYXRlCiAgICAgLy8gVzNDIEVkaXRvcidzIERyYWZ0IDA5IE5vdmVtYmVyIDIwMTYKKyAg ICBMT0coRU1FLCAiRU1FIC0gY2hlY2sgaWYgYSBuZXcgc2Vzc2lvbiBjYW4gYmUgY3JlYXRlZCIp OwogCiAgICAgLy8gV2hlbiB0aGlzIG1ldGhvZCBpcyBpbnZva2VkLCB0aGUgdXNlciBhZ2VudCBt dXN0IHJ1biB0aGUgZm9sbG93aW5nIHN0ZXBzOgogICAgIC8vIDEuIElmIHRoaXMgb2JqZWN0J3Mg c3VwcG9ydGVkIHNlc3Npb24gdHlwZXMgdmFsdWUgZG9lcyBub3QgY29udGFpbiBzZXNzaW9uVHlw ZSwgdGhyb3cgW1dlYklETF0gYSBOb3RTdXBwb3J0ZWRFcnJvci4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTmF2aWdhdG9yRU1FLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTmF2aWdhdG9yRU1FLmNwcAppbmRleCA4 MzVkNGY4YmZmMTUwYjU5MGViNzdlN2Y5NWRhZDI3Yzc3YTI1ZjIyLi5hZjhmZjVhMGE4MGNlOGJh YWFkMDdhMWQ1YmNhNjE0MGNlZTAzMGUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2VuY3J5cHRlZG1lZGlhL05hdmlnYXRvckVNRS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9OYXZpZ2F0b3JFTUUuY3BwCkBAIC0zNCw2ICszNCw3IEBA CiAjaW5jbHVkZSAiQ0RNLmgiCiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJKU01l ZGlhS2V5U3lzdGVtQWNjZXNzLmgiCisjaW5jbHVkZSAiTG9nZ2luZy5oIgogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKQEAgLTQzLDYgKzQ0LDcgQEAgdm9pZCBOYXZpZ2F0b3JFTUU6OnJlcXVlc3RN ZWRpYUtleVN5c3RlbUFjY2VzcyhOYXZpZ2F0b3ImLCBEb2N1bWVudCYgZG9jdW1lbnQsIGMKIHsK ICAgICAvLyBodHRwczovL3czYy5naXRodWIuaW8vZW5jcnlwdGVkLW1lZGlhLyNkb20tbmF2aWdh dG9yLXJlcXVlc3RtZWRpYWtleXN5c3RlbWFjY2VzcwogICAgIC8vIFczQyBFZGl0b3IncyBEcmFm dCAwOSBOb3ZlbWJlciAyMDE2CisgICAgTE9HKEVNRSwgIkVNRSAtIHJlcXVlc3QgbWVkaWEga2V5 IHN5c3RlbSBhY2Nlc3MgZm9yICVzIiwga2V5U3lzdGVtLnV0ZjgoKS5kYXRhKCkpOwogCiAgICAg Ly8gV2hlbiB0aGlzIG1ldGhvZCBpcyBpbnZva2VkLCB0aGUgdXNlciBhZ2VudCBtdXN0IHJ1biB0 aGUgZm9sbG93aW5nIHN0ZXBzOgogICAgIC8vIDEuIElmIGtleVN5c3RlbSBpcyB0aGUgZW1wdHkg c3RyaW5nLCByZXR1cm4gYSBwcm9taXNlIHJlamVjdGVkIHdpdGggYSBuZXdseSBjcmVhdGVkIFR5 cGVFcnJvci4KQEAgLTYwLDYgKzYyLDcgQEAgdm9pZCBOYXZpZ2F0b3JFTUU6OnJlcXVlc3RNZWRp YUtleVN5c3RlbUFjY2VzcyhOYXZpZ2F0b3ImLCBEb2N1bWVudCYgZG9jdW1lbnQsIGMKICAgICAg ICAgLy8gNi4xLiBJZiBrZXlTeXN0ZW0gaXMgbm90IG9uZSBvZiB0aGUgS2V5IFN5c3RlbXMgc3Vw cG9ydGVkIGJ5IHRoZSB1c2VyIGFnZW50LCByZWplY3QgcHJvbWlzZSB3aXRoIGEgTm90U3VwcG9y dGVkRXJyb3IuCiAgICAgICAgIC8vICAgICAgU3RyaW5nIGNvbXBhcmlzb24gaXMgY2FzZS1zZW5z aXRpdmUuCiAgICAgICAgIGlmICghQ0RNOjpzdXBwb3J0c0tleVN5c3RlbShrZXlTeXN0ZW0pKSB7 CisgICAgICAgICAgICBMT0coRU1FLCAiRU1FIC0gJXMgaXMgbm90IHN1cHBvcnRlZCIsIGtleVN5 c3RlbS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgICAgIHByb21pc2UtPnJlamVjdChOb3RTdXBw b3J0ZWRFcnJvcik7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvZ2dpbmcuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL0xvZ2dpbmcuaAppbmRleCBmMTA1NjdkNmMyNDJlMGQwOTQyYTI4NTgwYzBiMzkwMDJiNDAy MDBkLi4zYzcwM2Q2MDNkOTFmZWMyYWQ5ZmEyN2RjYWIwMjJmNjYwNDQwMjEzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2dnaW5nLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vTG9nZ2luZy5oCkBAIC00Niw2ICs0Niw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK ICAgICBNKERpc3BsYXlMaXN0cykgXAogICAgIE0oRE9NVGltZXJzKSBcCiAgICAgTShFZGl0aW5n KSBcCisgICAgTShFTUUpIFwKICAgICBNKEV2ZW50cykgXAogICAgIE0oRmlsZUFQSSkgXAogICAg IE0oRmlsdGVycykgXAo=