167512 2017-01-27 10:14:50 -0800 Fix diagnostic logging under loader/ 2017-01-27 13:09:21 -0800 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez achristensen beidson commit-queue dbates japhet oldest_to_newest 1270673 0 cdumez 2017-01-27 10:14:50 -0800 Fix diagnostic logging under loader/. We should not be using logDiagnosticLoggingWithValue() without a numeric value. 1270674 1 299941 cdumez 2017-01-27 10:16:44 -0800 Created attachment 299941 Patch 1270724 2 299941 achristensen 2017-01-27 12:01:50 -0800 Comment on attachment 299941 Patch Seriously, make logDiagnosticMessageWithValue take a double 1270732 3 cdumez 2017-01-27 12:11:14 -0800 (In reply to comment #2) > Comment on attachment 299941 [details] > Patch > > Seriously, make logDiagnosticMessageWithValue take a double Yes. I am *first* fixing all the call sites that do not pass a number, *then* I'll fix the API. 1270751 4 299941 cdumez 2017-01-27 13:09:17 -0800 Comment on attachment 299941 Patch Clearing flags on attachment: 299941 Committed r211301: <http://trac.webkit.org/changeset/211301> 1270752 5 cdumez 2017-01-27 13:09:21 -0800 All reviewed patches have been landed. Closing bug. 299941 2017-01-27 10:16:44 -0800 2017-01-27 13:09:17 -0800 Patch bug-167512-20170127101440.patch text/plain 12608 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjExMjg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGRjOGFmNTI3MmNjZjQ0 OGY0NjEzNTU3ZWRjNGVjMjE1NDE3NTg4Yi4uZWZmODVmNmUyZjE1MjQwYzNkNzAyMGQ5ZGEyNTBm NTEyMDdlNzVmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE3LTAxLTI3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IGRpYWdub3N0aWMgbG9n Z2luZyB1bmRlciBsb2FkZXIvCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjc1MTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBGaXggZGlhZ25vc3RpYyBsb2dnaW5nIHVuZGVyIGxvYWRlci8uIFdlIHNob3Vs ZCBub3QgYmUgdXNpbmcgbG9nRGlhZ25vc3RpY0xvZ2dpbmdXaXRoVmFsdWUoKQorICAgICAgICB3 aXRob3V0IGEgbnVtZXJpYyB2YWx1ZS4KKworICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsb2dSZXNvdXJjZVJlc3BvbnNlU291cmNlKToKKyAg ICAgICAgKiBsb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 bG9nUmVzb3VyY2VMb2FkZWQpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJj ZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsb2dNZW1vcnlDYWNoZVJlc291cmNlUmVx dWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFJl c291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6OmxvZ1JldmFsaWRhdGlvbik6CisgICAgICAgICog cGFnZS9EaWFnbm9zdGljTG9nZ2luZ0tleXMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGlhZ25v c3RpY0xvZ2dpbmdLZXlzOjptZW1vcnlDYWNoZUVudHJ5RGVjaXNpb25LZXkpOgorICAgICAgICAo V2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjptZW1vcnlDYWNoZVVzYWdlS2V5KToKKyAg ICAgICAgKFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6Y2FjaGVkUmVzb3VyY2VSZXZh bGlkYXRpb25SZWFzb25LZXkpOgorICAgICAgICAoV2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdL ZXlzOjpyZXNvdXJjZUxvYWRlZEtleSk6CisgICAgICAgIChXZWJDb3JlOjpEaWFnbm9zdGljTG9n Z2luZ0tleXM6OnJlc291cmNlUmVzcG9uc2VTb3VyY2VLZXkpOgorICAgICAgICAqIHBhZ2UvRGlh Z25vc3RpY0xvZ2dpbmdLZXlzLmg6CisKIDIwMTctMDEtMjcgIFJ5YW4gSGFkZGFkICA8cnlhbmhh ZGRhZEBhcHBsZS5jb20+CiAKICAgICAgICAgUmViYXNlbGluZSBiaW5kaW5ncyB0ZXN0cyBhZnRl ciByMjExMjM4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9h ZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5jcHAKaW5kZXgg MzQzYTVlNGEwNjYzZjcwMzdiMGExYTNmZWRjYmEyZjljZWQ0OTJiYy4uZmY3NjE5ZDM5NWU5YWQ4 MmFjM2NmMzI0NTEzY2E1ZGQ2MTM4OWJjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL1Jlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3Vy Y2VMb2FkZXIuY3BwCkBAIC00MzEsNyArNDMxLDcgQEAgc3RhdGljIHZvaWQgbG9nUmVzb3VyY2VS ZXNwb25zZVNvdXJjZShGcmFtZSogZnJhbWUsIFJlc291cmNlUmVzcG9uc2U6OlNvdXJjZSBzb3UK ICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGZyYW1lLT5wYWdlKCktPmRpYWdub3N0aWNM b2dnaW5nQ2xpZW50KCkubG9nRGlhZ25vc3RpY01lc3NhZ2VXaXRoVmFsdWUoRGlhZ25vc3RpY0xv Z2dpbmdLZXlzOjpyZXNvdXJjZVJlc3BvbnNlS2V5KCksIERpYWdub3N0aWNMb2dnaW5nS2V5czo6 c291cmNlS2V5KCksIHNvdXJjZUtleSwgU2hvdWxkU2FtcGxlOjpZZXMpOworICAgIGZyYW1lLT5w YWdlKCktPmRpYWdub3N0aWNMb2dnaW5nQ2xpZW50KCkubG9nRGlhZ25vc3RpY01lc3NhZ2UoRGlh Z25vc3RpY0xvZ2dpbmdLZXlzOjpyZXNvdXJjZVJlc3BvbnNlU291cmNlS2V5KCksIHNvdXJjZUtl eSwgU2hvdWxkU2FtcGxlOjpZZXMpOwogfQogCiB2b2lkIFJlc291cmNlTG9hZGVyOjpkaWRSZWNl aXZlUmVzcG9uc2UoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcikKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IDhkNjViY2QwYmQ4ZDQwOGIxNzE0NzQx MTcxNTBhODNlM2QyMTNjYTUuLmJkODcyNjM0ZWFhNWI4MTcwZmY2YzMwNjQ3YTU5MzZhOGQ1MDA3 ZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcApAQCAt NDU1LDcgKzQ1NSw3IEBAIHN0YXRpYyB2b2lkIGxvZ1Jlc291cmNlTG9hZGVkKEZyYW1lKiBmcmFt ZSwgQ2FjaGVkUmVzb3VyY2U6OlR5cGUgdHlwZSkKICAgICAgICAgcmVzb3VyY2VUeXBlID0gRGlh Z25vc3RpY0xvZ2dpbmdLZXlzOjpvdGhlcktleSgpOwogICAgICAgICBicmVhazsKICAgICB9Ci0g ICAgZnJhbWUtPnBhZ2UoKS0+ZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQoKS5sb2dEaWFnbm9zdGlj TWVzc2FnZVdpdGhWYWx1ZShEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnJlc291cmNlS2V5KCksIERp YWdub3N0aWNMb2dnaW5nS2V5czo6bG9hZGVkS2V5KCksIHJlc291cmNlVHlwZSwgU2hvdWxkU2Ft cGxlOjpZZXMpOworICAgIGZyYW1lLT5wYWdlKCktPmRpYWdub3N0aWNMb2dnaW5nQ2xpZW50KCku bG9nRGlhZ25vc3RpY01lc3NhZ2UoRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpyZXNvdXJjZUxvYWRl ZEtleSgpLCByZXNvdXJjZVR5cGUsIFNob3VsZFNhbXBsZTo6WWVzKTsKIH0KIAogYm9vbCBTdWJy ZXNvdXJjZUxvYWRlcjo6Y2hlY2tSZXNwb25zZUNyb3NzT3JpZ2luQWNjZXNzQ29udHJvbChjb25z dCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgU3RyaW5nJiBlcnJvckRlc2NyaXB0aW9uKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9h ZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRl ci5jcHAKaW5kZXggYWQxMDU2OWVkZjE3YzBlZTRlZDlhNGE1ZThmMTNlOGJmYTkxMTI3MC4uNjhl ZTc5ZTdiOWFiOWMyYTYwNDRkMGM0NzhhOGY2MWZhMjJjNzgxMSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC02MzEs MTQgKzYzMSwxMSBAQCBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4gQ2FjaGVk UmVzb3VyY2VMb2FkZXI6OnVwZGF0ZUNhY2hlZFJlc291cmNlVwogICAgIHJldHVybiByZXNvdXJj ZUhhbmRsZTsKIH0KIAotc3RhdGljIGlubGluZSB2b2lkIGxvZ01lbW9yeUNhY2hlUmVzb3VyY2VS ZXF1ZXN0KEZyYW1lKiBmcmFtZSwgY29uc3QgU3RyaW5nJiBkZXNjcmlwdGlvbiwgY29uc3QgU3Ry aW5nJiB2YWx1ZSA9IFN0cmluZygpKQorc3RhdGljIGlubGluZSB2b2lkIGxvZ01lbW9yeUNhY2hl UmVzb3VyY2VSZXF1ZXN0KEZyYW1lKiBmcmFtZSwgY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0 cmluZyYgZGVzY3JpcHRpb24pCiB7CiAgICAgaWYgKCFmcmFtZSB8fCAhZnJhbWUtPnBhZ2UoKSkK ICAgICAgICAgcmV0dXJuOwotICAgIGlmICh2YWx1ZS5pc051bGwoKSkKLSAgICAgICAgZnJhbWUt PnBhZ2UoKS0+ZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQoKS5sb2dEaWFnbm9zdGljTWVzc2FnZShE aWFnbm9zdGljTG9nZ2luZ0tleXM6OnJlc291cmNlUmVxdWVzdEtleSgpLCBkZXNjcmlwdGlvbiwg U2hvdWxkU2FtcGxlOjpZZXMpOwotICAgIGVsc2UKLSAgICAgICAgZnJhbWUtPnBhZ2UoKS0+ZGlh Z25vc3RpY0xvZ2dpbmdDbGllbnQoKS5sb2dEaWFnbm9zdGljTWVzc2FnZVdpdGhWYWx1ZShEaWFn bm9zdGljTG9nZ2luZ0tleXM6OnJlc291cmNlUmVxdWVzdEtleSgpLCBkZXNjcmlwdGlvbiwgdmFs dWUsIFNob3VsZFNhbXBsZTo6WWVzKTsKKyAgICBmcmFtZS0+cGFnZSgpLT5kaWFnbm9zdGljTG9n Z2luZ0NsaWVudCgpLmxvZ0RpYWdub3N0aWNNZXNzYWdlKGtleSwgZGVzY3JpcHRpb24sIFNob3Vs ZFNhbXBsZTo6WWVzKTsKIH0KIAogdm9pZCBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cHJlcGFyZUZl dGNoKENhY2hlZFJlc291cmNlOjpUeXBlIHR5cGUsIENhY2hlZFJlc291cmNlUmVxdWVzdCYgcmVx dWVzdCkKQEAgLTc0NSw3ICs3NDIsNyBAQCBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRSZXNv dXJjZT4gQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OnJlcXVlc3RSZXNvdXJjZShDYWNoZQogICAgIGlm IChyZXF1ZXN0LmFsbG93c0NhY2hpbmcoKSkKICAgICAgICAgcmVzb3VyY2UgPSBtZW1vcnlDYWNo ZS5yZXNvdXJjZUZvclJlcXVlc3QocmVxdWVzdC5yZXNvdXJjZVJlcXVlc3QoKSwgc2Vzc2lvbklE KCkpOwogCi0gICAgbG9nTWVtb3J5Q2FjaGVSZXNvdXJjZVJlcXVlc3QoZnJhbWUoKSwgcmVzb3Vy Y2UgPyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmluTWVtb3J5Q2FjaGVLZXkoKSA6IERpYWdub3N0 aWNMb2dnaW5nS2V5czo6bm90SW5NZW1vcnlDYWNoZUtleSgpKTsKKyAgICBsb2dNZW1vcnlDYWNo ZVJlc291cmNlUmVxdWVzdChmcmFtZSgpLCBEaWFnbm9zdGljTG9nZ2luZ0tleXM6Om1lbW9yeUNh Y2hlVXNhZ2VLZXkoKSwgcmVzb3VyY2UgPyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmluTWVtb3J5 Q2FjaGVLZXkoKSA6IERpYWdub3N0aWNMb2dnaW5nS2V5czo6bm90SW5NZW1vcnlDYWNoZUtleSgp KTsKIAogICAgIFJldmFsaWRhdGlvblBvbGljeSBwb2xpY3kgPSBkZXRlcm1pbmVSZXZhbGlkYXRp b25Qb2xpY3kodHlwZSwgcmVxdWVzdCwgcmVzb3VyY2UuZ2V0KCksIGZvclByZWxvYWQsIGRlZmVy KTsKICAgICBzd2l0Y2ggKHBvbGljeSkgewpAQCAtNzU0LDEyICs3NTEsMTIgQEAgQ2FjaGVkUmVz b3VyY2VIYW5kbGU8Q2FjaGVkUmVzb3VyY2U+IENhY2hlZFJlc291cmNlTG9hZGVyOjpyZXF1ZXN0 UmVzb3VyY2UoQ2FjaGUKICAgICAgICAgRkFMTFRIUk9VR0g7CiAgICAgY2FzZSBMb2FkOgogICAg ICAgICBpZiAocmVzb3VyY2UpCi0gICAgICAgICAgICBsb2dNZW1vcnlDYWNoZVJlc291cmNlUmVx dWVzdChmcmFtZSgpLCBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmluTWVtb3J5Q2FjaGVLZXkoKSwg RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjp1bnVzZWRLZXkoKSk7CisgICAgICAgICAgICBsb2dNZW1v cnlDYWNoZVJlc291cmNlUmVxdWVzdChmcmFtZSgpLCBEaWFnbm9zdGljTG9nZ2luZ0tleXM6Om1l bW9yeUNhY2hlRW50cnlEZWNpc2lvbktleSgpLCBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnVudXNl ZEtleSgpKTsKICAgICAgICAgcmVzb3VyY2UgPSBsb2FkUmVzb3VyY2UodHlwZSwgV1RGTW92ZShy ZXF1ZXN0KSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgUmV2YWxpZGF0ZToKICAgICAgICAg aWYgKHJlc291cmNlKQotICAgICAgICAgICAgbG9nTWVtb3J5Q2FjaGVSZXNvdXJjZVJlcXVlc3Qo ZnJhbWUoKSwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjppbk1lbW9yeUNhY2hlS2V5KCksIERpYWdu b3N0aWNMb2dnaW5nS2V5czo6cmV2YWxpZGF0aW5nS2V5KCkpOworICAgICAgICAgICAgbG9nTWVt b3J5Q2FjaGVSZXNvdXJjZVJlcXVlc3QoZnJhbWUoKSwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpt ZW1vcnlDYWNoZUVudHJ5RGVjaXNpb25LZXkoKSwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpyZXZh bGlkYXRpbmdLZXkoKSk7CiAgICAgICAgIHJlc291cmNlID0gcmV2YWxpZGF0ZVJlc291cmNlKFdU Rk1vdmUocmVxdWVzdCksICpyZXNvdXJjZSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgVXNl OgpAQCAtNzcxLDcgKzc2OCw3IEBAIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFJlc291cmNl PiBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFJlc291cmNlKENhY2hlCiAgICAgICAgIH0g ZWxzZSB7CiAgICAgICAgICAgICBpZiAoIXNob3VsZENvbnRpbnVlQWZ0ZXJOb3RpZnlpbmdMb2Fk ZWRGcm9tTWVtb3J5Q2FjaGUocmVxdWVzdCwgcmVzb3VyY2UuZ2V0KCkpKQogICAgICAgICAgICAg ICAgIHJldHVybiBudWxscHRyOwotICAgICAgICAgICAgbG9nTWVtb3J5Q2FjaGVSZXNvdXJjZVJl cXVlc3QoZnJhbWUoKSwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjppbk1lbW9yeUNhY2hlS2V5KCks IERpYWdub3N0aWNMb2dnaW5nS2V5czo6dXNlZEtleSgpKTsKKyAgICAgICAgICAgIGxvZ01lbW9y eUNhY2hlUmVzb3VyY2VSZXF1ZXN0KGZyYW1lKCksIERpYWdub3N0aWNMb2dnaW5nS2V5czo6bWVt b3J5Q2FjaGVFbnRyeURlY2lzaW9uS2V5KCksIERpYWdub3N0aWNMb2dnaW5nS2V5czo6dXNlZEtl eSgpKTsKICAgICAgICAgICAgIG1lbW9yeUNhY2hlLnJlc291cmNlQWNjZXNzZWQoKnJlc291cmNl KTsKICNpZiBFTkFCTEUoV0VCX1RJTUlORykKICAgICAgICAgICAgIGlmIChkb2N1bWVudCgpICYm IFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkucmVzb3VyY2VUaW1pbmdF bmFibGVkKCkpIHsKQEAgLTg3MSw3ICs4NjgsNyBAQCBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNo ZWRSZXNvdXJjZT4gQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OmxvYWRSZXNvdXJjZShDYWNoZWRSZQog CiBzdGF0aWMgdm9pZCBsb2dSZXZhbGlkYXRpb24oY29uc3QgU3RyaW5nJiByZWFzb24sIERpYWdu b3N0aWNMb2dnaW5nQ2xpZW50JiBsb2dDbGllbnQpCiB7Ci0gICAgbG9nQ2xpZW50LmxvZ0RpYWdu b3N0aWNNZXNzYWdlV2l0aFZhbHVlKERpYWdub3N0aWNMb2dnaW5nS2V5czo6Y2FjaGVkUmVzb3Vy Y2VSZXZhbGlkYXRpb25LZXkoKSwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpyZWFzb25LZXkoKSwg cmVhc29uLCBTaG91bGRTYW1wbGU6Olllcyk7CisgICAgbG9nQ2xpZW50LmxvZ0RpYWdub3N0aWNN ZXNzYWdlKERpYWdub3N0aWNMb2dnaW5nS2V5czo6Y2FjaGVkUmVzb3VyY2VSZXZhbGlkYXRpb25S ZWFzb25LZXkoKSwgcmVhc29uLCBTaG91bGRTYW1wbGU6Olllcyk7CiB9CiAKIHN0YXRpYyB2b2lk IGxvZ1Jlc291cmNlUmV2YWxpZGF0aW9uRGVjaXNpb24oQ2FjaGVkUmVzb3VyY2U6OlJldmFsaWRh dGlvbkRlY2lzaW9uIHJlYXNvbiwgY29uc3QgRnJhbWUqIGZyYW1lKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGFnZS9EaWFnbm9zdGljTG9nZ2luZ0tleXMuY3BwIGIvU291cmNlL1dlYkNv cmUvcGFnZS9EaWFnbm9zdGljTG9nZ2luZ0tleXMuY3BwCmluZGV4IDI1ZWZkZGRiMjkwZmZjODQ4 YWM1Y2M3NTIxZmUwZmFkOGFjOGJjMzYuLjZjMDIwMzBhM2ExYzEzNGFlNDAzN2NjMjk4MzBkZmY1 MTVkYzM0M2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGlhZ25vc3RpY0xvZ2dp bmdLZXlzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RpYWdub3N0aWNMb2dnaW5nS2V5 cy5jcHAKQEAgLTM4LDYgKzM4LDE2IEBAIFN0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6Om1l ZGlhTG9hZGluZ0ZhaWxlZEtleSgpCiAgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgibWVkaWFGYWls ZWRMb2FkaW5nIik7CiB9CiAKK1N0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6Om1lbW9yeUNh Y2hlRW50cnlEZWNpc2lvbktleSgpCit7CisgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgibWVtb3J5 Q2FjaGVFbnRyeURlY2lzaW9uIik7Cit9CisKK1N0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6 Om1lbW9yeUNhY2hlVXNhZ2VLZXkoKQoreworICAgIHJldHVybiBBU0NJSUxpdGVyYWwoIm1lbW9y eUNhY2hlVXNhZ2UiKTsKK30KKwogU3RyaW5nIERpYWdub3N0aWNMb2dnaW5nS2V5czo6bWlzc2lu Z1ZhbGlkYXRvckZpZWxkc0tleSgpCiB7CiAgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgibWlzc2lu Z1ZhbGlkYXRvckZpZWxkcyIpOwpAQCAtMjQzLDExICsyNTMsNiBAQCBTdHJpbmcgRGlhZ25vc3Rp Y0xvZ2dpbmdLZXlzOjppc1JlbG9hZElnbm9yaW5nQ2FjaGVEYXRhS2V5KCkKICAgICByZXR1cm4g QVNDSUlMaXRlcmFsKCJpc1JlbG9hZElnbm9yaW5nQ2FjaGVEYXRhIik7CiB9CiAKLVN0cmluZyBE aWFnbm9zdGljTG9nZ2luZ0tleXM6OmxvYWRlZEtleSgpCi17Ci0gICAgcmV0dXJuIEFTQ0lJTGl0 ZXJhbCgibG9hZGVkIik7Ci19Ci0KIFN0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmxvYWRp bmdLZXkoKQogewogICAgIHJldHVybiBBU0NJSUxpdGVyYWwoImxvYWRpbmciKTsKQEAgLTMxOCwx MSArMzIzLDYgQEAgU3RyaW5nIERpYWdub3N0aWNMb2dnaW5nS2V5czo6cmF3S2V5KCkKICAgICBy ZXR1cm4gQVNDSUlMaXRlcmFsKCJyYXciKTsKIH0KIAotU3RyaW5nIERpYWdub3N0aWNMb2dnaW5n S2V5czo6cmVhc29uS2V5KCkKLXsKLSAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJyZWFzb24iKTsK LX0KLQogU3RyaW5nIERpYWdub3N0aWNMb2dnaW5nS2V5czo6cmVkaXJlY3RLZXkoKQogewogICAg IHJldHVybiBBU0NJSUxpdGVyYWwoInJlZGlyZWN0Iik7CkBAIC0zOTgsNiArMzk4LDExIEBAIFN0 cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmNhY2hlZFJlc291cmNlUmV2YWxpZGF0aW9uS2V5 KCkKICAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJjYWNoZWRSZXNvdXJjZVJldmFsaWRhdGlvbiIp OwogfQogCitTdHJpbmcgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpjYWNoZWRSZXNvdXJjZVJldmFs aWRhdGlvblJlYXNvbktleSgpCit7CisgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgiY2FjaGVkUmVz b3VyY2VSZXZhbGlkYXRpb25SZWFzb24iKTsKK30KKwogU3RyaW5nIERpYWdub3N0aWNMb2dnaW5n S2V5czo6ZGVuaWVkQnlDbGllbnRLZXkoKQogewogICAgIHJldHVybiBBU0NJSUxpdGVyYWwoImRl bmllZEJ5Q2xpZW50Iik7CkBAIC00NDgsMTkgKzQ1MywxNCBAQCBTdHJpbmcgRGlhZ25vc3RpY0xv Z2dpbmdLZXlzOjpyZXRyaWV2YWxSZXF1ZXN0S2V5KCkKICAgICByZXR1cm4gQVNDSUlMaXRlcmFs KCJyZXRyaWV2YWxSZXF1ZXN0Iik7CiB9CiAKLVN0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6 OnJlc291cmNlS2V5KCkKLXsKLSAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJyZXNvdXJjZSIpOwot fQotCi1TdHJpbmcgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpyZXNvdXJjZVJlcXVlc3RLZXkoKQor U3RyaW5nIERpYWdub3N0aWNMb2dnaW5nS2V5czo6cmVzb3VyY2VMb2FkZWRLZXkoKQogewotICAg IHJldHVybiBBU0NJSUxpdGVyYWwoInJlc291cmNlUmVxdWVzdCIpOworICAgIHJldHVybiBBU0NJ SUxpdGVyYWwoInJlc291cmNlTG9hZGVkIik7CiB9CiAKLVN0cmluZyBEaWFnbm9zdGljTG9nZ2lu Z0tleXM6OnJlc291cmNlUmVzcG9uc2VLZXkoKQorU3RyaW5nIERpYWdub3N0aWNMb2dnaW5nS2V5 czo6cmVzb3VyY2VSZXNwb25zZVNvdXJjZUtleSgpCiB7Ci0gICAgcmV0dXJuIEFTQ0lJTGl0ZXJh bCgicmVzb3VyY2VSZXNwb25zZSIpOworICAgIHJldHVybiBBU0NJSUxpdGVyYWwoInJlc291cmNl UmVzcG9uc2VTb3VyY2UiKTsKIH0KIAogU3RyaW5nIERpYWdub3N0aWNMb2dnaW5nS2V5czo6cmV0 cmlldmFsS2V5KCkKQEAgLTQ4OCwxMSArNDg4LDYgQEAgU3RyaW5nIERpYWdub3N0aWNMb2dnaW5n S2V5czo6c2NyaXB0S2V5KCkKICAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJzY3JpcHQiKTsKIH0K IAotU3RyaW5nIERpYWdub3N0aWNMb2dnaW5nS2V5czo6c291cmNlS2V5KCkKLXsKLSAgICByZXR1 cm4gQVNDSUlMaXRlcmFsKCJzb3VyY2UiKTsKLX0KLQogU3RyaW5nIERpYWdub3N0aWNMb2dnaW5n S2V5czo6c3RyZWFtaW5nTWVkaWEoKQogewogICAgIHJldHVybiBBU0NJSUxpdGVyYWwoInN0cmVh bWluZ01lZGlhIik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RpYWdub3N0aWNM b2dnaW5nS2V5cy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9EaWFnbm9zdGljTG9nZ2luZ0tleXMu aAppbmRleCA1M2QwZGE0Zjc1YjIwNTk2OTE5Yjg1NzBjMWVlMTM3ZTM1YjkwMzYxLi4xOWZiNWM1 MGFmNjU2YWJiYjhhYTFhNDY4ZDhhYTViZWJiOGQwYjY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0RpYWdub3N0aWNMb2dnaW5nS2V5cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRGlhZ25vc3RpY0xvZ2dpbmdLZXlzLmgKQEAgLTM4LDYgKzM4LDcgQEAgcHVibGljOgogICAg IFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBTdHJpbmcgYmFja05hdmlnYXRpb25LZXkoKTsKICAgICBX RUJDT1JFX0VYUE9SVCBzdGF0aWMgU3RyaW5nIGNhY2hlQ29udHJvbE5vU3RvcmVLZXkoKTsKICAg ICBzdGF0aWMgU3RyaW5nIGNhY2hlZFJlc291cmNlUmV2YWxpZGF0aW9uS2V5KCk7CisgICAgc3Rh dGljIFN0cmluZyBjYWNoZWRSZXNvdXJjZVJldmFsaWRhdGlvblJlYXNvbktleSgpOwogICAgIHN0 YXRpYyBTdHJpbmcgY2FuQ2FjaGVLZXkoKTsKICAgICBzdGF0aWMgU3RyaW5nIGNhbm5vdFN1c3Bl bmRBY3RpdmVET01PYmplY3RzS2V5KCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIFN0cmlu ZyBjcHVVc2FnZUtleSgpOwpAQCAtNzAsNyArNzEsNiBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFN0 cmluZyBpc0Vycm9yUGFnZUtleSgpOwogICAgIHN0YXRpYyBTdHJpbmcgaXNFeHBpcmVkS2V5KCk7 CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIFN0cmluZyBpc1JlbG9hZElnbm9yaW5nQ2FjaGVE YXRhS2V5KCk7Ci0gICAgc3RhdGljIFN0cmluZyBsb2FkZWRLZXkoKTsKICAgICBzdGF0aWMgU3Ry aW5nIGxvYWRpbmdLZXkoKTsKICAgICBzdGF0aWMgU3RyaW5nIGlzTG9hZGluZ0tleSgpOwogICAg IHN0YXRpYyBTdHJpbmcgbWFpbkRvY3VtZW50RXJyb3JLZXkoKTsKQEAgLTc4LDYgKzc4LDggQEAg cHVibGljOgogICAgIHN0YXRpYyBTdHJpbmcgbWVkaWFLZXkoKTsKICAgICBzdGF0aWMgU3RyaW5n IG1lZGlhTG9hZGVkS2V5KCk7CiAgICAgc3RhdGljIFN0cmluZyBtZWRpYUxvYWRpbmdGYWlsZWRL ZXkoKTsKKyAgICBzdGF0aWMgU3RyaW5nIG1lbW9yeUNhY2hlRW50cnlEZWNpc2lvbktleSgpOwor ICAgIHN0YXRpYyBTdHJpbmcgbWVtb3J5Q2FjaGVVc2FnZUtleSgpOwogICAgIFdFQkNPUkVfRVhQ T1JUIHN0YXRpYyBTdHJpbmcgbWlzc2luZ1ZhbGlkYXRvckZpZWxkc0tleSgpOwogICAgIHN0YXRp YyBTdHJpbmcgbmF2aWdhdGlvbktleSgpOwogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBTdHJp bmcgbmVlZHNSZXZhbGlkYXRpb25LZXkoKTsKQEAgLTExNiwyMSArMTE4LDE4IEBAIHB1YmxpYzoK ICAgICBzdGF0aWMgU3RyaW5nIHBydW5lZER1ZVRvUHJvY2Vzc1N1c3BlbmRlZCgpOwogICAgIHN0 YXRpYyBTdHJpbmcgcXVpcmtSZWRpcmVjdENvbWluZ0tleSgpOwogICAgIHN0YXRpYyBTdHJpbmcg cmF3S2V5KCk7Ci0gICAgc3RhdGljIFN0cmluZyByZWFzb25LZXkoKTsKICAgICBzdGF0aWMgU3Ry aW5nIHJlZGlyZWN0S2V5KCk7CiAgICAgc3RhdGljIFN0cmluZyByZWxvYWRGcm9tT3JpZ2luS2V5 KCk7CiAgICAgc3RhdGljIFN0cmluZyByZWxvYWRLZXkoKTsKICAgICBzdGF0aWMgU3RyaW5nIHJl cGxhY2VLZXkoKTsKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgU3RyaW5nIHJlcXVlc3RLZXko KTsKLSAgICBzdGF0aWMgU3RyaW5nIHJlc291cmNlS2V5KCk7Ci0gICAgc3RhdGljIFN0cmluZyBy ZXNvdXJjZVJlcXVlc3RLZXkoKTsKLSAgICBzdGF0aWMgU3RyaW5nIHJlc291cmNlUmVzcG9uc2VL ZXkoKTsKKyAgICBzdGF0aWMgU3RyaW5nIHJlc291cmNlTG9hZGVkS2V5KCk7CisgICAgc3RhdGlj IFN0cmluZyByZXNvdXJjZVJlc3BvbnNlU291cmNlS2V5KCk7CiAgICAgV0VCQ09SRV9FWFBPUlQg c3RhdGljIFN0cmluZyByZXRyaWV2YWxLZXkoKTsKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMg U3RyaW5nIHJldHJpZXZhbFJlcXVlc3RLZXkoKTsKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMg U3RyaW5nIHJldmFsaWRhdGluZ0tleSgpOwogICAgIHN0YXRpYyBTdHJpbmcgc2FtZUxvYWRLZXko KTsKICAgICBzdGF0aWMgU3RyaW5nIHNjcmlwdEtleSgpOwotICAgIHN0YXRpYyBTdHJpbmcgc291 cmNlS2V5KCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIFN0cmluZyBzdHJlYW1pbmdNZWRp YSgpOwogICAgIHN0YXRpYyBTdHJpbmcgc3R5bGVTaGVldEtleSgpOwogICAgIFdFQkNPUkVfRVhQ T1JUIHN0YXRpYyBTdHJpbmcgc3VjY2Vzc2Z1bFNwZWN1bGF0aXZlV2FybXVwV2l0aFJldmFsaWRh dGlvbktleSgpOwo=