140682 2015-01-20 10:11:45 -0800 Log types of resources being loaded using DiagnosticLoggingClient 2015-01-20 12:37:23 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 140463 1 cdumez cdumez barraclough commit-queue japhet jer.noble kling koivisto oldest_to_newest 1062785 0 cdumez 2015-01-20 10:11:45 -0800 Log types of resources being loaded using DiagnosticLoggingClient instead of the legacy FeatureCounter. 1062795 1 244997 cdumez 2015-01-20 10:31:50 -0800 Created attachment 244997 Patch 1062846 2 244997 commit-queue 2015-01-20 12:37:18 -0800 Comment on attachment 244997 Patch Clearing flags on attachment: 244997 Committed r178733: <http://trac.webkit.org/changeset/178733> 1062847 3 commit-queue 2015-01-20 12:37:23 -0800 All reviewed patches have been landed. Closing bug. 244997 2015-01-20 10:31:50 -0800 2015-01-20 12:37:18 -0800 Patch bug-140682-20150120103158.patch text/plain 11584 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4NzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGZlOWRmOTkzZDc2MjNm ZmExYjMxNDQ1YzVlMDhlODY2YzQ3OGQ3Yy4uNGRhNTM4NjNlYTMzZTc3MzVkYjcwOWFhMzAyNGFi ZTI3Y2QwY2FhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE1LTAxLTIwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTG9nIHR5cGVzIG9mIHJlc291 cmNlcyBiZWluZyBsb2FkZWQgdXNpbmcgRGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDY4MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExvZyB0eXBlcyBvZiByZXNv dXJjZXMgYmVpbmcgbG9hZGVkIHVzaW5nIERpYWdub3N0aWNMb2dnaW5nQ2xpZW50CisgICAgICAg IGluc3RlYWQgb2YgdGhlIGxlZ2FjeSBGZWF0dXJlQ291bnRlci4KKworICAgICAgICAqIGxvYWRl ci9TdWJyZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsb2dSZXNvdXJjZUxv YWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6ZGlkRmluaXNoTG9h ZGluZyk6CisgICAgICAgIChXZWJDb3JlOjpsb2dSZXNvdXJjZUxvYWRlZFVzaW5nRmVhdHVyZUNv dW50ZXIpOiBEZWxldGVkLgorICAgICAgICAqIHBhZ2UvRGlhZ25vc3RpY0xvZ2dpbmdLZXlzLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6b3RoZXJLZXkpOgor ICAgICAgICAoV2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjptYWluUmVzb3VyY2VLZXkp OgorICAgICAgICAoV2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpsb2FkZWRLZXkpOgor ICAgICAgICAoV2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjppbWFnZUtleSk6CisgICAg ICAgIChXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnJhd0tleSk6CisgICAgICAgIChX ZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnJlc291cmNlS2V5KToKKyAgICAgICAgKFdl YkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6c2NyaXB0S2V5KToKKyAgICAgICAgKFdlYkNv cmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6c3R5bGVTaGVldEtleSk6CisgICAgICAgIChXZWJD b3JlOjpEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnN2Z0RvY3VtZW50S2V5KToKKyAgICAgICAgKFdl YkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6Zm9udEtleSk6CisgICAgICAgICogcGFnZS9E aWFnbm9zdGljTG9nZ2luZ0tleXMuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9GZWF0dXJlQ291bnRl cktleXMuaDoKKwogMjAxNS0wMS0yMCAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQu b3JnPgogCiAgICAgICAgIEZpeCB1bnVzZWQtcHJpdmF0ZS1maWVsZCB3YXJuaW5nIGluIEljb25F ZmwuY3BwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2Fk ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcAppbmRl eCBhODk2OTc1ZWZlOWQwNWNjMGNmM2U5ODYzMGY0YmJkM2MyOGU0MTYwLi5hZDRhNTI0ODZlMDIx MzM1YWIxMmJhNmFhNjcwYmYxM2Q1MDI5MzM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9T dWJyZXNvdXJjZUxvYWRlci5jcHAKQEAgLTMwLDE0ICszMCwxOCBAQAogI2luY2x1ZGUgIlN1YnJl c291cmNlTG9hZGVyLmgiCiAKICNpbmNsdWRlICJDYWNoZWRSZXNvdXJjZUxvYWRlci5oIgorI2lu Y2x1ZGUgIkRpYWdub3N0aWNMb2dnaW5nQ2xpZW50LmgiCisjaW5jbHVkZSAiRGlhZ25vc3RpY0xv Z2dpbmdLZXlzLmgiCiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJEb2N1bWVudExv YWRlci5oIgogI2luY2x1ZGUgIkZlYXR1cmVDb3VudGVyLmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIK ICNpbmNsdWRlICJGcmFtZUxvYWRlci5oIgogI2luY2x1ZGUgIkxvZ2dpbmcuaCIKKyNpbmNsdWRl ICJNYWluRnJhbWUuaCIKICNpbmNsdWRlICJNZW1vcnlDYWNoZS5oIgogI2luY2x1ZGUgIlBhZ2Uu aCIKKyNpbmNsdWRlICJTZXR0aW5ncy5oIgogI2luY2x1ZGUgPHd0Zi9SZWYuaD4KICNpbmNsdWRl IDx3dGYvUmVmQ291bnRlZExlYWtDb3VudGVyLmg+CiAjaW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJh cy5oPgpAQCAtMjkyLDM2ICsyOTYsMzkgQEAgYm9vbCBTdWJyZXNvdXJjZUxvYWRlcjo6Y2hlY2tG b3JIVFRQU3RhdHVzQ29kZUVycm9yKCkKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotc3RhdGljIHZv aWQgbG9nUmVzb3VyY2VMb2FkZWRVc2luZ0ZlYXR1cmVDb3VudGVyKFBhZ2UqIHBhZ2UsIENhY2hl ZFJlc291cmNlOjpUeXBlIHR5cGUpCitzdGF0aWMgdm9pZCBsb2dSZXNvdXJjZUxvYWRlZChGcmFt ZSogZnJhbWUsIENhY2hlZFJlc291cmNlOjpUeXBlIHR5cGUpCiB7Ci0gICAgY29uc3QgY2hhciog a2V5OworICAgIGlmICghZnJhbWUgfHwgIWZyYW1lLT5zZXR0aW5ncygpLmRpYWdub3N0aWNMb2dn aW5nRW5hYmxlZCgpKQorICAgICAgICByZXR1cm47CisKKyAgICBTdHJpbmcgcmVzb3VyY2VUeXBl OwogICAgIHN3aXRjaCAodHlwZSkgewogICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6Ok1haW5SZXNv dXJjZToKLSAgICAgICAga2V5ID0gRmVhdHVyZUNvdW50ZXJSZXNvdXJjZUxvYWRlZE1haW5SZXNv dXJjZUtleTsKKyAgICAgICAgcmVzb3VyY2VUeXBlID0gRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpt YWluUmVzb3VyY2VLZXkoKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBDYWNoZWRSZXNvdXJj ZTo6SW1hZ2VSZXNvdXJjZToKLSAgICAgICAga2V5ID0gRmVhdHVyZUNvdW50ZXJSZXNvdXJjZUxv YWRlZEltYWdlS2V5OworICAgICAgICByZXNvdXJjZVR5cGUgPSBEaWFnbm9zdGljTG9nZ2luZ0tl eXM6OmltYWdlS2V5KCk7CiAgICAgICAgIGJyZWFrOwogI2lmIEVOQUJMRShYU0xUKQogICAgIGNh c2UgQ2FjaGVkUmVzb3VyY2U6OlhTTFN0eWxlU2hlZXQ6CiAjZW5kaWYKICAgICBjYXNlIENhY2hl ZFJlc291cmNlOjpDU1NTdHlsZVNoZWV0OgotICAgICAgICBrZXkgPSBGZWF0dXJlQ291bnRlclJl c291cmNlTG9hZGVkU3R5bGVTaGVldEtleTsKKyAgICAgICAgcmVzb3VyY2VUeXBlID0gRGlhZ25v c3RpY0xvZ2dpbmdLZXlzOjpzdHlsZVNoZWV0S2V5KCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNh c2UgQ2FjaGVkUmVzb3VyY2U6OlNjcmlwdDoKLSAgICAgICAga2V5ID0gRmVhdHVyZUNvdW50ZXJS ZXNvdXJjZUxvYWRlZFNjcmlwdEtleTsKKyAgICAgICAgcmVzb3VyY2VUeXBlID0gRGlhZ25vc3Rp Y0xvZ2dpbmdLZXlzOjpzY3JpcHRLZXkoKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBDYWNo ZWRSZXNvdXJjZTo6Rm9udFJlc291cmNlOgogI2lmIEVOQUJMRShTVkdfRk9OVFMpCiAgICAgY2Fz ZSBDYWNoZWRSZXNvdXJjZTo6U1ZHRm9udFJlc291cmNlOgogI2VuZGlmCi0gICAgICAgIGtleSA9 IEZlYXR1cmVDb3VudGVyUmVzb3VyY2VMb2FkZWRGb250S2V5OworICAgICAgICByZXNvdXJjZVR5 cGUgPSBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmZvbnRLZXkoKTsKICAgICAgICAgYnJlYWs7CiAg ICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6UmF3UmVzb3VyY2U6Ci0gICAgICAgIGtleSA9IEZlYXR1 cmVDb3VudGVyUmVzb3VyY2VMb2FkZWRSYXdLZXk7CisgICAgICAgIHJlc291cmNlVHlwZSA9IERp YWdub3N0aWNMb2dnaW5nS2V5czo6cmF3S2V5KCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2Ug Q2FjaGVkUmVzb3VyY2U6OlNWR0RvY3VtZW50UmVzb3VyY2U6Ci0gICAgICAgIGtleSA9IEZlYXR1 cmVDb3VudGVyUmVzb3VyY2VMb2FkZWRTVkdEb2N1bWVudEtleTsKKyAgICAgICAgcmVzb3VyY2VU eXBlID0gRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpzdmdEb2N1bWVudEtleSgpOwogICAgICAgICBi cmVhazsKICNpZiBFTkFCTEUoTElOS19QUkVGRVRDSCkKICAgICBjYXNlIENhY2hlZFJlc291cmNl OjpMaW5rUHJlZmV0Y2g6CkBAIC0zMzAsMTAgKzMzNywxMSBAQCBzdGF0aWMgdm9pZCBsb2dSZXNv dXJjZUxvYWRlZFVzaW5nRmVhdHVyZUNvdW50ZXIoUGFnZSogcGFnZSwgQ2FjaGVkUmVzb3VyY2U6 OlR5cAogI2lmIEVOQUJMRShWSURFT19UUkFDSykKICAgICBjYXNlIENhY2hlZFJlc291cmNlOjpU ZXh0VHJhY2tSZXNvdXJjZToKICNlbmRpZgotICAgICAgICBrZXkgPSBGZWF0dXJlQ291bnRlclJl c291cmNlTG9hZGVkT3RoZXJLZXk7CisgICAgICAgIHJlc291cmNlVHlwZSA9IERpYWdub3N0aWNM b2dnaW5nS2V5czo6b3RoZXJLZXkoKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQotICAgIEZFQVRV UkVfQ09VTlRFUl9JTkNSRU1FTlRfS0VZKHBhZ2UsIGtleSk7CisgICAgaWYgKGF1dG8qIGNsaWVu dCA9IGZyYW1lLT5tYWluRnJhbWUoKS5kaWFnbm9zdGljTG9nZ2luZ0NsaWVudCgpKQorICAgICAg ICBjbGllbnQtPmxvZ0RpYWdub3N0aWNNZXNzYWdlV2l0aFZhbHVlKERpYWdub3N0aWNMb2dnaW5n S2V5czo6cmVzb3VyY2VLZXkoKSwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpsb2FkZWRLZXkoKSwg cmVzb3VyY2VUeXBlKTsKIH0KIAogdm9pZCBTdWJyZXNvdXJjZUxvYWRlcjo6ZGlkRmluaXNoTG9h ZGluZyhkb3VibGUgZmluaXNoVGltZSkKQEAgLTM0NSw3ICszNTMsNyBAQCB2b2lkIFN1YnJlc291 cmNlTG9hZGVyOjpkaWRGaW5pc2hMb2FkaW5nKGRvdWJsZSBmaW5pc2hUaW1lKQogICAgIC8vIEZJ WE1FICgxMjkzOTQpOiBXZSBzaG91bGQgY2FuY2VsIHRoZSBsb2FkIHdoZW4gYSBkZWNvZGUgZXJy b3Igb2NjdXJzIGluc3RlYWQgb2YgY29udGludWluZyB0aGUgbG9hZCB0byBjb21wbGV0aW9uLgog ICAgIEFTU0VSVCghbV9yZXNvdXJjZS0+ZXJyb3JPY2N1cnJlZCgpIHx8IG1fcmVzb3VyY2UtPnN0 YXR1cygpID09IENhY2hlZFJlc291cmNlOjpEZWNvZGVFcnJvcik7CiAgICAgTE9HKFJlc291cmNl TG9hZGluZywgIlJlY2VpdmVkICclcycuIiwgbV9yZXNvdXJjZS0+dXJsKCkuc3RyaW5nKCkubGF0 aW4xKCkuZGF0YSgpKTsKLSAgICBsb2dSZXNvdXJjZUxvYWRlZFVzaW5nRmVhdHVyZUNvdW50ZXIo bV9mcmFtZSA/IG1fZnJhbWUtPnBhZ2UoKSA6IG51bGxwdHIsIG1fcmVzb3VyY2UtPnR5cGUoKSk7 CisgICAgbG9nUmVzb3VyY2VMb2FkZWQobV9mcmFtZS5nZXQoKSwgbV9yZXNvdXJjZS0+dHlwZSgp KTsKIAogICAgIFJlZjxTdWJyZXNvdXJjZUxvYWRlcj4gcHJvdGVjdCgqdGhpcyk7CiAgICAgQ2Fj aGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmVzb3VyY2U+IHByb3RlY3RSZXNvdXJjZShtX3Jlc291 cmNlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGlhZ25vc3RpY0xvZ2dpbmdL ZXlzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGlhZ25vc3RpY0xvZ2dpbmdLZXlzLmNwcApp bmRleCAwZDdjYWNkNmM0ZTVmODYzNTJmZTY3MDY5MWIwNDEwNTY1MTA4NTJkLi4wMmIyYzZlMGE1 YTdmM2JkMTQ5ZTIzYmViOGYzZDBmYTdhNDhlY2VkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0RpYWdub3N0aWNMb2dnaW5nS2V5cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9EaWFnbm9zdGljTG9nZ2luZ0tleXMuY3BwCkBAIC0xMDMsMTYgKzEwMywzMSBAQCBTdHJpbmcg RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpub0RvY3VtZW50TG9hZGVyS2V5KCkKICAgICByZXR1cm4g QVNDSUlMaXRlcmFsKCJub0RvY3VtZW50TG9hZGVyIik7CiB9CiAKK1N0cmluZyBEaWFnbm9zdGlj TG9nZ2luZ0tleXM6Om90aGVyS2V5KCkKK3sKKyAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJvdGhl ciIpOworfQorCiBTdHJpbmcgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjptYWluRG9jdW1lbnRFcnJv cktleSgpCiB7CiAgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgibWFpbkRvY3VtZW50RXJyb3IiKTsK IH0KIAorU3RyaW5nIERpYWdub3N0aWNMb2dnaW5nS2V5czo6bWFpblJlc291cmNlS2V5KCkKK3sK KyAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJtYWluUmVzb3VyY2UiKTsKK30KKwogU3RyaW5nIERp YWdub3N0aWNMb2dnaW5nS2V5czo6aXNFcnJvclBhZ2VLZXkoKQogewogICAgIHJldHVybiBBU0NJ SUxpdGVyYWwoImlzRXJyb3JQYWdlIik7CiB9CiAKK1N0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tl eXM6OmxvYWRlZEtleSgpCit7CisgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgibG9hZGVkIik7Cit9 CisKIFN0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6Omhhc1BsdWdpbnNLZXkoKQogewogICAg IHJldHVybiBBU0NJSUxpdGVyYWwoImhhc1BsdWdpbnMiKTsKQEAgLTEyMyw2ICsxMzgsMTEgQEAg U3RyaW5nIERpYWdub3N0aWNMb2dnaW5nS2V5czo6aHR0cHNOb1N0b3JlS2V5KCkKICAgICByZXR1 cm4gQVNDSUlMaXRlcmFsKCJodHRwc05vU3RvcmUiKTsKIH0KIAorU3RyaW5nIERpYWdub3N0aWNM b2dnaW5nS2V5czo6aW1hZ2VLZXkoKQoreworICAgIHJldHVybiBBU0NJSUxpdGVyYWwoImltYWdl Iik7Cit9CisKIFN0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6Omhhc09wZW5EYXRhYmFzZXNL ZXkoKQogewogICAgIHJldHVybiBBU0NJSUxpdGVyYWwoImhhc09wZW5EYXRhYmFzZXMiKTsKQEAg LTEzOCw2ICsxNTgsMTEgQEAgU3RyaW5nIERpYWdub3N0aWNMb2dnaW5nS2V5czo6cXVpcmtSZWRp cmVjdENvbWluZ0tleSgpCiAgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgicXVpcmtSZWRpcmVjdENv bWluZyIpOwogfQogCitTdHJpbmcgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpyYXdLZXkoKQorewor ICAgIHJldHVybiBBU0NJSUxpdGVyYWwoInJhdyIpOworfQorCiBTdHJpbmcgRGlhZ25vc3RpY0xv Z2dpbmdLZXlzOjpsb2FkaW5nQVBJU2Vuc2VLZXkoKQogewogICAgIHJldHVybiBBU0NJSUxpdGVy YWwoImxvYWRpbmdBUElTZW5zZSIpOwpAQCAtMTgzLDYgKzIwOCwxMSBAQCBTdHJpbmcgRGlhZ25v c3RpY0xvZ2dpbmdLZXlzOjpyZWxvYWRLZXkoKQogICAgIHJldHVybiBBU0NJSUxpdGVyYWwoInJl bG9hZCIpOwogfQogCitTdHJpbmcgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpyZXNvdXJjZUtleSgp Cit7CisgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgicmVzb3VyY2UiKTsKK30KKwogU3RyaW5nIERp YWdub3N0aWNMb2dnaW5nS2V5czo6cmVsb2FkRnJvbU9yaWdpbktleSgpCiB7CiAgICAgcmV0dXJu IEFTQ0lJTGl0ZXJhbCgicmVsb2FkRnJvbU9yaWdpbiIpOwpAQCAtMTkzLDExICsyMjMsMzEgQEAg U3RyaW5nIERpYWdub3N0aWNMb2dnaW5nS2V5czo6c2FtZUxvYWRLZXkoKQogICAgIHJldHVybiBB U0NJSUxpdGVyYWwoInNhbWVMb2FkIik7CiB9CiAKK1N0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tl eXM6OnNjcmlwdEtleSgpCit7CisgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgic2NyaXB0Iik7Cit9 CisKK1N0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnN0eWxlU2hlZXRLZXkoKQoreworICAg IHJldHVybiBBU0NJSUxpdGVyYWwoInN0eWxlU2hlZXQiKTsKK30KKworU3RyaW5nIERpYWdub3N0 aWNMb2dnaW5nS2V5czo6c3ZnRG9jdW1lbnRLZXkoKQoreworICAgIHJldHVybiBBU0NJSUxpdGVy YWwoInN2Z0RvY3VtZW50Iik7Cit9CisKIFN0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmV4 cGlyZWRLZXkoKQogewogICAgIHJldHVybiBBU0NJSUxpdGVyYWwoImV4cGlyZWQiKTsKIH0KIAor U3RyaW5nIERpYWdub3N0aWNMb2dnaW5nS2V5czo6Zm9udEtleSgpCit7CisgICAgcmV0dXJuIEFT Q0lJTGl0ZXJhbCgiZm9udCIpOworfQorCiBTdHJpbmcgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpw cnVuZWREdWVUb01lbW9yeVByZXNzdXJlS2V5KCkKIHsKICAgICByZXR1cm4gQVNDSUlMaXRlcmFs KCJwcnVuZWQubWVtb3J5UHJlc3N1cmUiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRGlhZ25vc3RpY0xvZ2dpbmdLZXlzLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RpYWdub3N0 aWNMb2dnaW5nS2V5cy5oCmluZGV4IGEyNjM0ZWQxZWU3OGI0OWI1NmMzNDQ1YjM0NzBkNDEzYzA4 MDAzMmEuLmQzZGEzZjcwNDRhNDNlMzI3YWMyZTJkMWYxNDUyMmJhY2ZmNGE1YTIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGlhZ25vc3RpY0xvZ2dpbmdLZXlzLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9EaWFnbm9zdGljTG9nZ2luZ0tleXMuaApAQCAtNDEsMTcgKzQxLDIy IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgU3RyaW5nIGRvY3VtZW50TG9hZGVyU3RvcHBpbmdLZXko KTsKICAgICBzdGF0aWMgU3RyaW5nIGVuZ2luZUZhaWxlZFRvTG9hZEtleSgpOwogICAgIHN0YXRp YyBTdHJpbmcgZXhwaXJlZEtleSgpOworICAgIHN0YXRpYyBTdHJpbmcgZm9udEtleSgpOwogICAg IHN0YXRpYyBTdHJpbmcgaGFzT3BlbkRhdGFiYXNlc0tleSgpOwogICAgIHN0YXRpYyBTdHJpbmcg aGFzUGx1Z2luc0tleSgpOwogICAgIHN0YXRpYyBTdHJpbmcgaHR0cHNOb1N0b3JlS2V5KCk7Cisg ICAgc3RhdGljIFN0cmluZyBpbWFnZUtleSgpOwogICAgIHN0YXRpYyBTdHJpbmcgaXNFcnJvclBh Z2VLZXkoKTsKKyAgICBzdGF0aWMgU3RyaW5nIGxvYWRlZEtleSgpOwogICAgIHN0YXRpYyBTdHJp bmcgbG9hZGluZ0FQSVNlbnNlS2V5KCk7CiAgICAgc3RhdGljIFN0cmluZyBtYWluRG9jdW1lbnRF cnJvcktleSgpOworICAgIHN0YXRpYyBTdHJpbmcgbWFpblJlc291cmNlS2V5KCk7CiAgICAgc3Rh dGljIFN0cmluZyBtZWRpYUxvYWRlZEtleSgpOwogICAgIHN0YXRpYyBTdHJpbmcgbWVkaWFMb2Fk aW5nRmFpbGVkS2V5KCk7CiAgICAgc3RhdGljIFN0cmluZyBuYXZpZ2F0aW9uS2V5KCk7CiAgICAg c3RhdGljIFN0cmluZyBub0N1cnJlbnRIaXN0b3J5SXRlbUtleSgpOwogICAgIHN0YXRpYyBTdHJp bmcgbm9Eb2N1bWVudExvYWRlcktleSgpOworICAgIHN0YXRpYyBTdHJpbmcgb3RoZXJLZXkoKTsK ICAgICBzdGF0aWMgU3RyaW5nIHBhZ2VDYWNoZUtleSgpOwogICAgIHN0YXRpYyBTdHJpbmcgcGFn ZUNvbnRhaW5zQXRMZWFzdE9uZU1lZGlhRW5naW5lS2V5KCk7CiAgICAgc3RhdGljIFN0cmluZyBw YWdlQ29udGFpbnNBdExlYXN0T25lUGx1Z2luS2V5KCk7CkBAIC02NCw5ICs2OSwxNCBAQCBwdWJs aWM6CiAgICAgc3RhdGljIFN0cmluZyBwcnVuZWREdWVUb01lbW9yeVByZXNzdXJlS2V5KCk7CiAg ICAgc3RhdGljIFN0cmluZyBwcnVuZWREdWVUb1Byb2Nlc3NTdXNwZW5kZWQoKTsKICAgICBzdGF0 aWMgU3RyaW5nIHF1aXJrUmVkaXJlY3RDb21pbmdLZXkoKTsKKyAgICBzdGF0aWMgU3RyaW5nIHJh d0tleSgpOwogICAgIHN0YXRpYyBTdHJpbmcgcmVsb2FkRnJvbU9yaWdpbktleSgpOwogICAgIHN0 YXRpYyBTdHJpbmcgcmVsb2FkS2V5KCk7CisgICAgc3RhdGljIFN0cmluZyByZXNvdXJjZUtleSgp OwogICAgIHN0YXRpYyBTdHJpbmcgc2FtZUxvYWRLZXkoKTsKKyAgICBzdGF0aWMgU3RyaW5nIHNj cmlwdEtleSgpOworICAgIHN0YXRpYyBTdHJpbmcgc3R5bGVTaGVldEtleSgpOworICAgIHN0YXRp YyBTdHJpbmcgc3ZnRG9jdW1lbnRLZXkoKTsKIAogICAgIC8vIFN1Y2Nlc3MgLyBGYWlsdXJlIGtl eXMuCiAgICAgc3RhdGljIFN0cmluZyBzdWNjZXNzS2V5KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9GZWF0dXJlQ291bnRlcktleXMuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL0ZlYXR1cmVDb3VudGVyS2V5cy5oCmluZGV4IDM3OWZmZDExYWZlOGRlM2EyOTlkNDZk NWNkY2MzYzkxMzZjMWJmMDkuLmU0ZmRmYzdmMzM2YWE0ZjQ0OTg2NWE4YTE5MzU4YzMxYmE2ZjFj NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0ZlYXR1cmVDb3VudGVyS2V5 cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0ZlYXR1cmVDb3VudGVyS2V5cy5oCkBA IC00MywxNiArNDMsNiBAQCBzdGF0aWMgY29uc3QgY2hhciBGZWF0dXJlQ291bnRlck1lZGlhQXVk aW9FbGVtZW50TG9hZGluZ0tleVtdID0gImNvbS5hcHBsZS5XZWJLaQogc3RhdGljIGNvbnN0IGNo YXIgRmVhdHVyZUNvdW50ZXJNZWRpYVZpZGVvRWxlbWVudFBsYXllZEtleVtdID0gImNvbS5hcHBs ZS5XZWJLaXQubWVkaWEudmlkZW8ucGxheWVkIjsKIHN0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVD b3VudGVyTWVkaWFBdWRpb0VsZW1lbnRQbGF5ZWRLZXlbXSA9ICJjb20uYXBwbGUuV2ViS2l0Lm1l ZGlhLmF1ZGlvLnBsYXllZCI7CiAKLS8vIFJlc291cmNlIHR5cGVzLgotc3RhdGljIGNvbnN0IGNo YXIgRmVhdHVyZUNvdW50ZXJSZXNvdXJjZUxvYWRlZEZvbnRLZXlbXSA9ICJjb20uYXBwbGUuV2Vi S2l0LnJlc291cmNlLmxvYWRlZC5mb250IjsKLXN0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVDb3Vu dGVyUmVzb3VyY2VMb2FkZWRJbWFnZUtleVtdID0gImNvbS5hcHBsZS5XZWJLaXQucmVzb3VyY2Uu bG9hZGVkLmltYWdlIjsKLXN0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVDb3VudGVyUmVzb3VyY2VM b2FkZWRNYWluUmVzb3VyY2VLZXlbXSA9ICJjb20uYXBwbGUuV2ViS2l0LnJlc291cmNlLmxvYWRl ZC5tYWluUmVzb3VyY2UiOwotc3RhdGljIGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJSZXNvdXJj ZUxvYWRlZFJhd0tleVtdID0gImNvbS5hcHBsZS5XZWJLaXQucmVzb3VyY2UubG9hZGVkLnJhdyI7 Ci1zdGF0aWMgY29uc3QgY2hhciBGZWF0dXJlQ291bnRlclJlc291cmNlTG9hZGVkU1ZHRG9jdW1l bnRLZXlbXSA9ICJjb20uYXBwbGUuV2ViS2l0LnJlc291cmNlLmxvYWRlZC5zdmdEb2N1bWVudCI7 Ci1zdGF0aWMgY29uc3QgY2hhciBGZWF0dXJlQ291bnRlclJlc291cmNlTG9hZGVkU2NyaXB0S2V5 W10gPSAiY29tLmFwcGxlLldlYktpdC5yZXNvdXJjZS5sb2FkZWQuc2NyaXB0IjsKLXN0YXRpYyBj b25zdCBjaGFyIEZlYXR1cmVDb3VudGVyUmVzb3VyY2VMb2FkZWRTdHlsZVNoZWV0S2V5W10gPSAi Y29tLmFwcGxlLldlYktpdC5yZXNvdXJjZS5sb2FkZWQuc3R5bGVTaGVldCI7Ci1zdGF0aWMgY29u c3QgY2hhciBGZWF0dXJlQ291bnRlclJlc291cmNlTG9hZGVkT3RoZXJLZXlbXSA9ICJjb20uYXBw bGUuV2ViS2l0LnJlc291cmNlLmxvYWRlZC5vdGhlciI7Ci0KIC8vIE1lbW9yeSBjYWNoZS4KIHN0 YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVDb3VudGVyUmVzb3VyY2VSZXF1ZXN0SW5NZW1vcnlDYWNo ZUtleVtdID0gImNvbS5hcHBsZS5XZWJLaXQucmVzb3VyY2VSZXF1ZXN0LmluTWVtb3J5Q2FjaGUi Owogc3RhdGljIGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJSZXNvdXJjZVJlcXVlc3ROb3RJbk1l bW9yeUNhY2hlS2V5W10gPSAiY29tLmFwcGxlLldlYktpdC5yZXNvdXJjZVJlcXVlc3Qubm90SW5N ZW1vcnlDYWNoZSI7Cg==