140650 2015-01-19 16:52:47 -0800 Use DiagnosticLoggingClient to log page cache failures 2015-01-20 02:07:24 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 140463 1 cdumez cdumez barraclough commit-queue jer.noble kling koivisto oldest_to_newest 1062554 0 cdumez 2015-01-19 16:52:47 -0800 Use DiagnosticLoggingClient to log page cache failures instead of the legacy FeatureCounter. 1062590 1 244951 cdumez 2015-01-19 18:50:46 -0800 Created attachment 244951 Patch 1062674 2 244951 kling 2015-01-20 01:23:46 -0800 Comment on attachment 244951 Patch r=me 1062679 3 244951 commit-queue 2015-01-20 02:07:19 -0800 Comment on attachment 244951 Patch Clearing flags on attachment: 244951 Committed r178702: <http://trac.webkit.org/changeset/178702> 1062680 4 commit-queue 2015-01-20 02:07:24 -0800 All reviewed patches have been landed. Closing bug. 244951 2015-01-19 18:50:46 -0800 2015-01-20 02:07:19 -0800 Patch bug-140650-20150119185054.patch text/plain 31538 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4Njg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTYzOWZkZGZkZWYyMTVl NTExMjhkYmFmMDliMjE2ZDcyZTlkYWI4MS4uNDc0ZmE5OWE4Y2ZhNjMzNDJjOTBiNjA5ZjRjYTA5 ZGMyZjAyN2VhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDYwIEBACiAyMDE1LTAxLTE5ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgVXNlIERpYWdub3N0aWNMb2dn aW5nQ2xpZW50IHRvIGxvZyBwYWdlIGNhY2hlIGZhaWx1cmVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDA2NTAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgRGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQg dG8gbG9nIHBhZ2UgY2FjaGUgZmFpbHVyZXMgaW5zdGVhZCBvZiB0aGUKKyAgICAgICAgbGVnYWN5 IEZlYXR1cmVDb3VudGVyLgorCisgICAgICAgICogaGlzdG9yeS9QYWdlQ2FjaGUuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6bG9nUGFnZUNhY2hlRmFpbHVyZURpYWdub3N0aWNNZXNzYWdlKToKKyAg ICAgICAgKFdlYkNvcmU6OmxvZ0NhbkNhY2hlRnJhbWVEZWNpc2lvbik6CisgICAgICAgIChXZWJD b3JlOjpsb2dDYW5DYWNoZVBhZ2VEZWNpc2lvbik6CisgICAgICAgIChXZWJDb3JlOjpQYWdlQ2Fj aGU6OmNhbkNhY2hlKToKKyAgICAgICAgKFdlYkNvcmU6OnBydW5pbmdSZWFzb25Ub0RpYWdub3N0 aWNMb2dnaW5nS2V5KToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VDYWNoZTo6dGFrZSk6CisgICAg ICAgIChXZWJDb3JlOjpQYWdlQ2FjaGU6OmdldCk6CisgICAgICAgIChXZWJDb3JlOjpwcnVuaW5n UmVhc29uVG9GZWF0dXJlQ291bnRlcktleSk6IERlbGV0ZWQuCisgICAgICAgICogcGFnZS9EaWFn bm9zdGljTG9nZ2luZ0tleXMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dp bmdLZXlzOjpzdWNjZXNzS2V5KToKKyAgICAgICAgKFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5n S2V5czo6ZmFpbHVyZUtleSk6CisgICAgICAgIChXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ0tl eXM6OnBhZ2VMb2FkZWRLZXkpOgorICAgICAgICAoV2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdL ZXlzOjplbmdpbmVGYWlsZWRUb0xvYWRLZXkpOgorICAgICAgICAoV2ViQ29yZTo6RGlhZ25vc3Rp Y0xvZ2dpbmdLZXlzOjpuYXZpZ2F0aW9uS2V5KToKKyAgICAgICAgKFdlYkNvcmU6OkRpYWdub3N0 aWNMb2dnaW5nS2V5czo6cGFnZUNhY2hlS2V5KToKKyAgICAgICAgKFdlYkNvcmU6OkRpYWdub3N0 aWNMb2dnaW5nS2V5czo6bm9Eb2N1bWVudExvYWRlcktleSk6CisgICAgICAgIChXZWJDb3JlOjpE aWFnbm9zdGljTG9nZ2luZ0tleXM6Om1haW5Eb2N1bWVudEVycm9yS2V5KToKKyAgICAgICAgKFdl YkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6aXNFcnJvclBhZ2VLZXkpOgorICAgICAgICAo V2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpoYXNQbHVnaW5zS2V5KToKKyAgICAgICAg KFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6aHR0cHNOb1N0b3JlS2V5KToKKyAgICAg ICAgKFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6aGFzT3BlbkRhdGFiYXNlc0tleSk6 CisgICAgICAgIChXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ0tleXM6Om5vQ3VycmVudEhpc3Rv cnlJdGVtS2V5KToKKyAgICAgICAgKFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6cXVp cmtSZWRpcmVjdENvbWluZ0tleSk6CisgICAgICAgIChXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2lu Z0tleXM6OmxvYWRpbmdBUElTZW5zZUtleSk6CisgICAgICAgIChXZWJDb3JlOjpEaWFnbm9zdGlj TG9nZ2luZ0tleXM6OmRvY3VtZW50TG9hZGVyU3RvcHBpbmdLZXkpOgorICAgICAgICAoV2ViQ29y ZTo6RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpjYW5ub3RTdXNwZW5kQWN0aXZlRE9NT2JqZWN0c0tl eSk6CisgICAgICAgIChXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmFwcGxpY2F0aW9u Q2FjaGVLZXkpOgorICAgICAgICAoV2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpkZW5p ZWRCeUNsaWVudEtleSk6CisgICAgICAgIChXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ0tleXM6 OmRldmljZU1vdGlvbktleSk6CisgICAgICAgIChXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ0tl eXM6OmRldmljZU9yaWVudGF0aW9uS2V5KToKKyAgICAgICAgKFdlYkNvcmU6OkRpYWdub3N0aWNM b2dnaW5nS2V5czo6ZGV2aWNlUHJveGltaXR5S2V5KToKKyAgICAgICAgKFdlYkNvcmU6OkRpYWdu b3N0aWNMb2dnaW5nS2V5czo6cmVsb2FkS2V5KToKKyAgICAgICAgKFdlYkNvcmU6OkRpYWdub3N0 aWNMb2dnaW5nS2V5czo6cmVsb2FkRnJvbU9yaWdpbktleSk6CisgICAgICAgIChXZWJDb3JlOjpE aWFnbm9zdGljTG9nZ2luZ0tleXM6OnNhbWVMb2FkS2V5KToKKyAgICAgICAgKFdlYkNvcmU6OkRp YWdub3N0aWNMb2dnaW5nS2V5czo6ZXhwaXJlZEtleSk6CisgICAgICAgIChXZWJDb3JlOjpEaWFn bm9zdGljTG9nZ2luZ0tleXM6OnBydW5lZER1ZVRvTWVtb3J5UHJlc3N1cmVLZXkpOgorICAgICAg ICAoV2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpwcnVuZWREdWVUb0NhcGFjaXR5UmVh Y2hlZCk6CisgICAgICAgIChXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnBydW5lZER1 ZVRvUHJvY2Vzc1N1c3BlbmRlZCk6CisgICAgICAgIChXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2lu Z0tleXM6OnBhc3NLZXkpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RGlhZ25vc3RpY0xv Z2dpbmdLZXlzOjpmYWlsS2V5KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkRpYWdub3N0 aWNMb2dnaW5nS2V5czo6bm9vcEtleSk6IERlbGV0ZWQuCisgICAgICAgICogcGFnZS9EaWFnbm9z dGljTG9nZ2luZ0tleXMuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9GZWF0dXJlQ291bnRlcktleXMu aDoKKworMjAxNS0wMS0xOSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCiAgICAg ICAgIFN0b3AgdXNpbmcgRmVhdHVyZUNvdW50ZXIgdG8gbG9nIG5hdmlnYXRpb24gdHlwZXMKICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDY0MgogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L1BhZ2VDYWNoZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9oaXN0b3J5L1BhZ2VDYWNoZS5jcHAKaW5kZXggOWRiYTQ5N2UxYzcyN2FhYzRhODg3 OWI5N2VkNWY5YzY1M2U4ODM1MC4uY2Y2NWMwZjg2MDhmOWViZmEyYmMzNjllNjA1ZDc3MzQxMDRk MzE1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9QYWdlQ2FjaGUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvUGFnZUNhY2hlLmNwcApAQCAtMzQsOSArMzQsMTAg QEAKICNpbmNsdWRlICJEYXRhYmFzZU1hbmFnZXIuaCIKICNpbmNsdWRlICJEZXZpY2VNb3Rpb25D b250cm9sbGVyLmgiCiAjaW5jbHVkZSAiRGV2aWNlT3JpZW50YXRpb25Db250cm9sbGVyLmgiCisj aW5jbHVkZSAiRGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQuaCIKKyNpbmNsdWRlICJEaWFnbm9zdGlj TG9nZ2luZ0tleXMuaCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIkRvY3VtZW50 TG9hZGVyLmgiCi0jaW5jbHVkZSAiRmVhdHVyZUNvdW50ZXIuaCIKICNpbmNsdWRlICJGcmFtZUxv YWRlci5oIgogI2luY2x1ZGUgIkZyYW1lTG9hZGVyQ2xpZW50LmgiCiAjaW5jbHVkZSAiRnJhbWVM b2FkZXJTdGF0ZU1hY2hpbmUuaCIKQEAgLTk1LDk5ICs5NiwxMTUgQEAgZW51bSBSZWFzb25GcmFt ZUNhbm5vdEJlSW5QYWdlQ2FjaGUgewogfTsKIENPTVBJTEVfQVNTRVJUKE51bWJlck9mUmVhc29u c0ZyYW1lc0Nhbm5vdEJlSW5QYWdlQ2FjaGUgPD0gc2l6ZW9mKHVuc2lnbmVkKSo4LCBSZWFzb25G cmFtZUNhbm5vdEJlSW5QYWdlQ2FjaGVEb2VzTm90Rml0SW5CaXRtYXApOwogCi1zdGF0aWMgdW5z aWduZWQgbG9nQ2FuQ2FjaGVGcmFtZURlY2lzaW9uKEZyYW1lKiBmcmFtZSwgaW50IGluZGVudExl dmVsKQorc3RhdGljIGlubGluZSB2b2lkIGxvZ1BhZ2VDYWNoZUZhaWx1cmVEaWFnbm9zdGljTWVz c2FnZShEaWFnbm9zdGljTG9nZ2luZ0NsaWVudCogY2xpZW50LCBjb25zdCBTdHJpbmcmIHJlYXNv bikKK3sKKyAgICBpZiAoY2xpZW50KQorICAgICAgICBjbGllbnQtPmxvZ0RpYWdub3N0aWNNZXNz YWdlV2l0aFZhbHVlKERpYWdub3N0aWNMb2dnaW5nS2V5czo6cGFnZUNhY2hlS2V5KCksIERpYWdu b3N0aWNMb2dnaW5nS2V5czo6ZmFpbHVyZUtleSgpLCByZWFzb24pOworfQorCitzdGF0aWMgaW5s aW5lIHZvaWQgbG9nUGFnZUNhY2hlRmFpbHVyZURpYWdub3N0aWNNZXNzYWdlKFBhZ2UqIHBhZ2Us IGNvbnN0IFN0cmluZyYgcmVhc29uKQoreworICAgIGlmICghcGFnZSkKKyAgICAgICAgcmV0dXJu OworCisgICAgTWFpbkZyYW1lJiBtYWluRnJhbWUgPSBwYWdlLT5tYWluRnJhbWUoKTsKKyAgICBp ZiAobWFpbkZyYW1lLnNldHRpbmdzKCkuZGlhZ25vc3RpY0xvZ2dpbmdFbmFibGVkKCkpCisgICAg ICAgIGxvZ1BhZ2VDYWNoZUZhaWx1cmVEaWFnbm9zdGljTWVzc2FnZShtYWluRnJhbWUuZGlhZ25v c3RpY0xvZ2dpbmdDbGllbnQoKSwgcmVhc29uKTsKK30KKworc3RhdGljIHVuc2lnbmVkIGxvZ0Nh bkNhY2hlRnJhbWVEZWNpc2lvbihGcmFtZSYgZnJhbWUsIERpYWdub3N0aWNMb2dnaW5nQ2xpZW50 KiBkaWFnbm9zdGljTG9nZ2luZ0NsaWVudCwgaW50IGluZGVudExldmVsKQogewogICAgIFBDTE9H KCIrLS0tIik7Ci0gICAgaWYgKCFmcmFtZS0+bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKSkgewor ICAgIGlmICghZnJhbWUubG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKSkgewogICAgICAgICBQQ0xP RygiICAgLVRoZXJlIGlzIG5vIERvY3VtZW50TG9hZGVyIG9iamVjdCIpOwotICAgICAgICBGRUFU VVJFX0NPVU5URVJfSU5DUkVNRU5UX0tFWShmcmFtZS0+cGFnZSgpLCBGZWF0dXJlQ291bnRlclBh Z2VDYWNoZUZhaWx1cmVOb0RvY3VtZW50TG9hZGVyS2V5KTsKKyAgICAgICAgbG9nUGFnZUNhY2hl RmFpbHVyZURpYWdub3N0aWNNZXNzYWdlKGRpYWdub3N0aWNMb2dnaW5nQ2xpZW50LCBEaWFnbm9z dGljTG9nZ2luZ0tleXM6Om5vRG9jdW1lbnRMb2FkZXJLZXkoKSk7CiAgICAgICAgIHJldHVybiAx IDw8IE5vRG9jdW1lbnRMb2FkZXI7CiAgICAgfQogCi0gICAgVVJMIGN1cnJlbnRVUkwgPSBmcmFt ZS0+bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKS0+dXJsKCk7Ci0gICAgVVJMIG5ld1VSTCA9IGZy YW1lLT5sb2FkZXIoKS5wcm92aXNpb25hbERvY3VtZW50TG9hZGVyKCkgPyBmcmFtZS0+bG9hZGVy KCkucHJvdmlzaW9uYWxEb2N1bWVudExvYWRlcigpLT51cmwoKSA6IFVSTCgpOworICAgIFVSTCBj dXJyZW50VVJMID0gZnJhbWUubG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKS0+dXJsKCk7CisgICAg VVJMIG5ld1VSTCA9IGZyYW1lLmxvYWRlcigpLnByb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIoKSA/ IGZyYW1lLmxvYWRlcigpLnByb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIoKS0+dXJsKCkgOiBVUkwo KTsKICAgICBpZiAoIW5ld1VSTC5pc0VtcHR5KCkpCiAgICAgICAgIFBDTE9HKCIgRGV0ZXJtaW5p bmcgaWYgZnJhbWUgY2FuIGJlIGNhY2hlZCBuYXZpZ2F0aW5nIGZyb20gKCIsIGN1cnJlbnRVUkwu c3RyaW5nKCksICIpIHRvICgiLCBuZXdVUkwuc3RyaW5nKCksICIpOiIpOwogICAgIGVsc2UKICAg ICAgICAgUENMT0coIiBEZXRlcm1pbmluZyBpZiBzdWJmcmFtZSB3aXRoIFVSTCAoIiwgY3VycmVu dFVSTC5zdHJpbmcoKSwgIikgY2FuIGJlIGNhY2hlZDoiKTsKICAgICAgCiAgICAgdW5zaWduZWQg cmVqZWN0UmVhc29ucyA9IDA7Ci0gICAgaWYgKCFmcmFtZS0+bG9hZGVyKCkuZG9jdW1lbnRMb2Fk ZXIoKS0+bWFpbkRvY3VtZW50RXJyb3IoKS5pc051bGwoKSkgeworICAgIGlmICghZnJhbWUubG9h ZGVyKCkuZG9jdW1lbnRMb2FkZXIoKS0+bWFpbkRvY3VtZW50RXJyb3IoKS5pc051bGwoKSkgewog ICAgICAgICBQQ0xPRygiICAgLU1haW4gZG9jdW1lbnQgaGFzIGFuIGVycm9yIik7Ci0gICAgICAg IEZFQVRVUkVfQ09VTlRFUl9JTkNSRU1FTlRfS0VZKGZyYW1lLT5wYWdlKCksIEZlYXR1cmVDb3Vu dGVyUGFnZUNhY2hlRmFpbHVyZU1haW5Eb2N1bWVudEVycm9yS2V5KTsKKyAgICAgICAgbG9nUGFn ZUNhY2hlRmFpbHVyZURpYWdub3N0aWNNZXNzYWdlKGRpYWdub3N0aWNMb2dnaW5nQ2xpZW50LCBE aWFnbm9zdGljTG9nZ2luZ0tleXM6Om1haW5Eb2N1bWVudEVycm9yS2V5KCkpOwogI2lmICFQTEFU Rk9STShJT1MpCiAgICAgICAgIHJlamVjdFJlYXNvbnMgfD0gMSA8PCBNYWluRG9jdW1lbnRFcnJv cjsKICNlbHNlCi0gICAgICAgIGlmIChmcmFtZS0+bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKS0+ bWFpbkRvY3VtZW50RXJyb3IoKS5pc0NhbmNlbGxhdGlvbigpICYmIGZyYW1lLT5sb2FkZXIoKS5k b2N1bWVudExvYWRlcigpLT5zdWJyZXNvdXJjZUxvYWRlcnNBcmVQYWdlQ2FjaGVBY2NlcHRhYmxl KCkpCisgICAgICAgIGlmIChmcmFtZS5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpLT5tYWluRG9j dW1lbnRFcnJvcigpLmlzQ2FuY2VsbGF0aW9uKCkgJiYgZnJhbWUubG9hZGVyKCkuZG9jdW1lbnRM b2FkZXIoKS0+c3VicmVzb3VyY2VMb2FkZXJzQXJlUGFnZUNhY2hlQWNjZXB0YWJsZSgpKQogICAg ICAgICAgICAgUENMT0coIiAgICAtQnV0LCBpdCB3YXMgYSBjYW5jZWxsYXRpb24gYW5kIGFsbCBs b2FkZXJzIGR1cmluZyB0aGUgY2FuY2VsIHdlcmUgbG9hZGluZyBpbWFnZXMuIik7CiAgICAgICAg IGVsc2UKICAgICAgICAgICAgIHJlamVjdFJlYXNvbnMgfD0gMSA8PCBNYWluRG9jdW1lbnRFcnJv cjsKICNlbmRpZgogICAgIH0KLSAgICBpZiAoZnJhbWUtPmxvYWRlcigpLmRvY3VtZW50TG9hZGVy KCktPnN1YnN0aXR1dGVEYXRhKCkuaXNWYWxpZCgpICYmIGZyYW1lLT5sb2FkZXIoKS5kb2N1bWVu dExvYWRlcigpLT5zdWJzdGl0dXRlRGF0YSgpLmZhaWxpbmdVUkwoKS5pc0VtcHR5KCkpIHsKKyAg ICBpZiAoZnJhbWUubG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKS0+c3Vic3RpdHV0ZURhdGEoKS5p c1ZhbGlkKCkgJiYgZnJhbWUubG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKS0+c3Vic3RpdHV0ZURh dGEoKS5mYWlsaW5nVVJMKCkuaXNFbXB0eSgpKSB7CiAgICAgICAgIFBDTE9HKCIgICAtRnJhbWUg aXMgYW4gZXJyb3IgcGFnZSIpOwotICAgICAgICBGRUFUVVJFX0NPVU5URVJfSU5DUkVNRU5UX0tF WShmcmFtZS0+cGFnZSgpLCBGZWF0dXJlQ291bnRlclBhZ2VDYWNoZUZhaWx1cmVJc0Vycm9yUGFn ZUtleSk7CisgICAgICAgIGxvZ1BhZ2VDYWNoZUZhaWx1cmVEaWFnbm9zdGljTWVzc2FnZShkaWFn bm9zdGljTG9nZ2luZ0NsaWVudCwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjppc0Vycm9yUGFnZUtl eSgpKTsKICAgICAgICAgcmVqZWN0UmVhc29ucyB8PSAxIDw8IElzRXJyb3JQYWdlOwogICAgIH0K LSAgICBpZiAoZnJhbWUtPmxvYWRlcigpLnN1YmZyYW1lTG9hZGVyKCkuY29udGFpbnNQbHVnaW5z KCkgJiYgIWZyYW1lLT5wYWdlKCktPnNldHRpbmdzKCkucGFnZUNhY2hlU3VwcG9ydHNQbHVnaW5z KCkpIHsKKyAgICBpZiAoZnJhbWUubG9hZGVyKCkuc3ViZnJhbWVMb2FkZXIoKS5jb250YWluc1Bs dWdpbnMoKSAmJiAhZnJhbWUucGFnZSgpLT5zZXR0aW5ncygpLnBhZ2VDYWNoZVN1cHBvcnRzUGx1 Z2lucygpKSB7CiAgICAgICAgIFBDTE9HKCIgICAtRnJhbWUgY29udGFpbnMgcGx1Z2lucyIpOwot ICAgICAgICBGRUFUVVJFX0NPVU5URVJfSU5DUkVNRU5UX0tFWShmcmFtZS0+cGFnZSgpLCBGZWF0 dXJlQ291bnRlclBhZ2VDYWNoZUZhaWx1cmVIYXNQbHVnaW5zKTsKKyAgICAgICAgbG9nUGFnZUNh Y2hlRmFpbHVyZURpYWdub3N0aWNNZXNzYWdlKGRpYWdub3N0aWNMb2dnaW5nQ2xpZW50LCBEaWFn bm9zdGljTG9nZ2luZ0tleXM6Omhhc1BsdWdpbnNLZXkoKSk7CiAgICAgICAgIHJlamVjdFJlYXNv bnMgfD0gMSA8PCBIYXNQbHVnaW5zOwogICAgIH0KLSAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1l KCkgJiYgZnJhbWUtPmRvY3VtZW50KCktPnVybCgpLnByb3RvY29sSXMoImh0dHBzIikgJiYgZnJh bWUtPmxvYWRlcigpLmRvY3VtZW50TG9hZGVyKCktPnJlc3BvbnNlKCkuY2FjaGVDb250cm9sQ29u dGFpbnNOb1N0b3JlKCkpIHsKKyAgICBpZiAoZnJhbWUuaXNNYWluRnJhbWUoKSAmJiBmcmFtZS5k b2N1bWVudCgpLT51cmwoKS5wcm90b2NvbElzKCJodHRwcyIpICYmIGZyYW1lLmxvYWRlcigpLmRv Y3VtZW50TG9hZGVyKCktPnJlc3BvbnNlKCkuY2FjaGVDb250cm9sQ29udGFpbnNOb1N0b3JlKCkp IHsKICAgICAgICAgUENMT0coIiAgIC1GcmFtZSBpcyBIVFRQUywgYW5kIGNhY2hlIGNvbnRyb2wg cHJvaGliaXRzIHN0b3JpbmciKTsKLSAgICAgICAgRkVBVFVSRV9DT1VOVEVSX0lOQ1JFTUVOVF9L RVkoZnJhbWUtPnBhZ2UoKSwgRmVhdHVyZUNvdW50ZXJQYWdlQ2FjaGVGYWlsdXJlSFRUUFNOb1N0 b3JlS2V5KTsKKyAgICAgICAgbG9nUGFnZUNhY2hlRmFpbHVyZURpYWdub3N0aWNNZXNzYWdlKGRp YWdub3N0aWNMb2dnaW5nQ2xpZW50LCBEaWFnbm9zdGljTG9nZ2luZ0tleXM6Omh0dHBzTm9TdG9y ZUtleSgpKTsKICAgICAgICAgcmVqZWN0UmVhc29ucyB8PSAxIDw8IElzSHR0cHNBbmRDYWNoZUNv bnRyb2xsZWQ7CiAgICAgfQotICAgIGlmIChEYXRhYmFzZU1hbmFnZXI6Om1hbmFnZXIoKS5oYXNP cGVuRGF0YWJhc2VzKGZyYW1lLT5kb2N1bWVudCgpKSkgeworICAgIGlmIChEYXRhYmFzZU1hbmFn ZXI6Om1hbmFnZXIoKS5oYXNPcGVuRGF0YWJhc2VzKGZyYW1lLmRvY3VtZW50KCkpKSB7CiAgICAg ICAgIFBDTE9HKCIgICAtRnJhbWUgaGFzIG9wZW4gZGF0YWJhc2UgaGFuZGxlcyIpOwotICAgICAg ICBGRUFUVVJFX0NPVU5URVJfSU5DUkVNRU5UX0tFWShmcmFtZS0+cGFnZSgpLCBGZWF0dXJlQ291 bnRlclBhZ2VDYWNoZUZhaWx1cmVIYXNPcGVuRGF0YWJhc2VzS2V5KTsKKyAgICAgICAgbG9nUGFn ZUNhY2hlRmFpbHVyZURpYWdub3N0aWNNZXNzYWdlKGRpYWdub3N0aWNMb2dnaW5nQ2xpZW50LCBE aWFnbm9zdGljTG9nZ2luZ0tleXM6Omhhc09wZW5EYXRhYmFzZXNLZXkoKSk7CiAgICAgICAgIHJl amVjdFJlYXNvbnMgfD0gMSA8PCBIYXNEYXRhYmFzZUhhbmRsZXM7CiAgICAgfQotICAgIGlmICgh ZnJhbWUtPmxvYWRlcigpLmhpc3RvcnkoKS5jdXJyZW50SXRlbSgpKSB7CisgICAgaWYgKCFmcmFt ZS5sb2FkZXIoKS5oaXN0b3J5KCkuY3VycmVudEl0ZW0oKSkgewogICAgICAgICBQQ0xPRygiICAg LU5vIGN1cnJlbnQgaGlzdG9yeSBpdGVtIik7Ci0gICAgICAgIEZFQVRVUkVfQ09VTlRFUl9JTkNS RU1FTlRfS0VZKGZyYW1lLT5wYWdlKCksIEZlYXR1cmVDb3VudGVyUGFnZUNhY2hlRmFpbHVyZU5v Q3VycmVudEhpc3RvcnlJdGVtS2V5KTsKKyAgICAgICAgbG9nUGFnZUNhY2hlRmFpbHVyZURpYWdu b3N0aWNNZXNzYWdlKGRpYWdub3N0aWNMb2dnaW5nQ2xpZW50LCBEaWFnbm9zdGljTG9nZ2luZ0tl eXM6Om5vQ3VycmVudEhpc3RvcnlJdGVtS2V5KCkpOwogICAgICAgICByZWplY3RSZWFzb25zIHw9 IDEgPDwgTm9IaXN0b3J5SXRlbTsKICAgICB9Ci0gICAgaWYgKGZyYW1lLT5sb2FkZXIoKS5xdWlj a1JlZGlyZWN0Q29taW5nKCkpIHsKKyAgICBpZiAoZnJhbWUubG9hZGVyKCkucXVpY2tSZWRpcmVj dENvbWluZygpKSB7CiAgICAgICAgIFBDTE9HKCIgICAtUXVpY2sgcmVkaXJlY3QgaXMgY29taW5n Iik7Ci0gICAgICAgIEZFQVRVUkVfQ09VTlRFUl9JTkNSRU1FTlRfS0VZKGZyYW1lLT5wYWdlKCks IEZlYXR1cmVDb3VudGVyUGFnZUNhY2hlRmFpbHVyZVF1aXJrUmVkaXJlY3RDb21pbmdLZXkpOwor ICAgICAgICBsb2dQYWdlQ2FjaGVGYWlsdXJlRGlhZ25vc3RpY01lc3NhZ2UoZGlhZ25vc3RpY0xv Z2dpbmdDbGllbnQsIERpYWdub3N0aWNMb2dnaW5nS2V5czo6cXVpcmtSZWRpcmVjdENvbWluZ0tl eSgpKTsKICAgICAgICAgcmVqZWN0UmVhc29ucyB8PSAxIDw8IFF1aWNrUmVkaXJlY3RDb21pbmc7 CiAgICAgfQotICAgIGlmIChmcmFtZS0+bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKS0+aXNMb2Fk aW5nSW5BUElTZW5zZSgpKSB7CisgICAgaWYgKGZyYW1lLmxvYWRlcigpLmRvY3VtZW50TG9hZGVy KCktPmlzTG9hZGluZ0luQVBJU2Vuc2UoKSkgewogICAgICAgICBQQ0xPRygiICAgLURvY3VtZW50 TG9hZGVyIGlzIHN0aWxsIGxvYWRpbmcgaW4gQVBJIHNlbnNlIik7Ci0gICAgICAgIEZFQVRVUkVf Q09VTlRFUl9JTkNSRU1FTlRfS0VZKGZyYW1lLT5wYWdlKCksIEZlYXR1cmVDb3VudGVyUGFnZUNh Y2hlRmFpbHVyZUxvYWRpbmdBUElTZW5zZUtleSk7CisgICAgICAgIGxvZ1BhZ2VDYWNoZUZhaWx1 cmVEaWFnbm9zdGljTWVzc2FnZShkaWFnbm9zdGljTG9nZ2luZ0NsaWVudCwgRGlhZ25vc3RpY0xv Z2dpbmdLZXlzOjpsb2FkaW5nQVBJU2Vuc2VLZXkoKSk7CiAgICAgICAgIHJlamVjdFJlYXNvbnMg fD0gMSA8PCBJc0xvYWRpbmdJbkFQSVNlbnNlOwogICAgIH0KLSAgICBpZiAoZnJhbWUtPmxvYWRl cigpLmRvY3VtZW50TG9hZGVyKCktPmlzU3RvcHBpbmcoKSkgeworICAgIGlmIChmcmFtZS5sb2Fk ZXIoKS5kb2N1bWVudExvYWRlcigpLT5pc1N0b3BwaW5nKCkpIHsKICAgICAgICAgUENMT0coIiAg IC1Eb2N1bWVudExvYWRlciBpcyBpbiB0aGUgbWlkZGxlIG9mIHN0b3BwaW5nIik7Ci0gICAgICAg IEZFQVRVUkVfQ09VTlRFUl9JTkNSRU1FTlRfS0VZKGZyYW1lLT5wYWdlKCksIEZlYXR1cmVDb3Vu dGVyUGFnZUNhY2hlRmFpbHVyZURvY3VtZW50TG9hZGVyU3RvcHBpbmdLZXkpOworICAgICAgICBs b2dQYWdlQ2FjaGVGYWlsdXJlRGlhZ25vc3RpY01lc3NhZ2UoZGlhZ25vc3RpY0xvZ2dpbmdDbGll bnQsIERpYWdub3N0aWNMb2dnaW5nS2V5czo6ZG9jdW1lbnRMb2FkZXJTdG9wcGluZ0tleSgpKTsK ICAgICAgICAgcmVqZWN0UmVhc29ucyB8PSAxIDw8IElzU3RvcHBpbmc7CiAgICAgfQogCiAgICAg VmVjdG9yPEFjdGl2ZURPTU9iamVjdCo+IHVuc3VzcGVuZGFibGVPYmplY3RzOwotICAgIGlmICgh ZnJhbWUtPmRvY3VtZW50KCktPmNhblN1c3BlbmRBY3RpdmVET01PYmplY3RzKCZ1bnN1c3BlbmRh YmxlT2JqZWN0cykpIHsKKyAgICBpZiAoIWZyYW1lLmRvY3VtZW50KCktPmNhblN1c3BlbmRBY3Rp dmVET01PYmplY3RzKCZ1bnN1c3BlbmRhYmxlT2JqZWN0cykpIHsKICAgICAgICAgUENMT0coIiAg IC1UaGUgZG9jdW1lbnQgY2Fubm90IHN1c3BlbmQgaXRzIGFjdGl2ZSBET00gT2JqZWN0cyIpOwog ICAgICAgICBmb3IgKGF1dG8qIGFjdGl2ZURPTU9iamVjdCA6IHVuc3VzcGVuZGFibGVPYmplY3Rz KSB7CiAgICAgICAgICAgICBQQ0xPRygiICAgIC0gVW5zdXNwZW5kYWJsZTogIiwgYWN0aXZlRE9N T2JqZWN0LT5hY3RpdmVET01PYmplY3ROYW1lKCkpOwogICAgICAgICAgICAgVU5VU0VEX1BBUkFN KGFjdGl2ZURPTU9iamVjdCk7CiAgICAgICAgIH0KLSAgICAgICAgRkVBVFVSRV9DT1VOVEVSX0lO Q1JFTUVOVF9LRVkoZnJhbWUtPnBhZ2UoKSwgRmVhdHVyZUNvdW50ZXJQYWdlQ2FjaGVGYWlsdXJl Q2Fubm90U3VzcGVuZEFjdGl2ZURPTU9iamVjdHNLZXkpOworICAgICAgICBsb2dQYWdlQ2FjaGVG YWlsdXJlRGlhZ25vc3RpY01lc3NhZ2UoZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQsIERpYWdub3N0 aWNMb2dnaW5nS2V5czo6Y2Fubm90U3VzcGVuZEFjdGl2ZURPTU9iamVjdHNLZXkoKSk7CiAgICAg ICAgIHJlamVjdFJlYXNvbnMgfD0gMSA8PCBDYW5ub3RTdXNwZW5kQWN0aXZlRE9NT2JqZWN0czsK ICAgICB9Ci0gICAgaWYgKCFmcmFtZS0+bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKS0+YXBwbGlj YXRpb25DYWNoZUhvc3QoKS0+Y2FuQ2FjaGVJblBhZ2VDYWNoZSgpKSB7CisgICAgaWYgKCFmcmFt ZS5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpLT5hcHBsaWNhdGlvbkNhY2hlSG9zdCgpLT5jYW5D YWNoZUluUGFnZUNhY2hlKCkpIHsKICAgICAgICAgUENMT0coIiAgIC1UaGUgRG9jdW1lbnRMb2Fk ZXIgdXNlcyBhbiBhcHBsaWNhdGlvbiBjYWNoZSIpOwotICAgICAgICBGRUFUVVJFX0NPVU5URVJf SU5DUkVNRU5UX0tFWShmcmFtZS0+cGFnZSgpLCBGZWF0dXJlQ291bnRlclBhZ2VDYWNoZUZhaWx1 cmVBcHBsaWNhdGlvbkNhY2hlS2V5KTsKKyAgICAgICAgbG9nUGFnZUNhY2hlRmFpbHVyZURpYWdu b3N0aWNNZXNzYWdlKGRpYWdub3N0aWNMb2dnaW5nQ2xpZW50LCBEaWFnbm9zdGljTG9nZ2luZ0tl eXM6OmFwcGxpY2F0aW9uQ2FjaGVLZXkoKSk7CiAgICAgICAgIHJlamVjdFJlYXNvbnMgfD0gMSA8 PCBEb2N1bWVudExvYWRlclVzZXNBcHBsaWNhdGlvbkNhY2hlOwogICAgIH0KLSAgICBpZiAoIWZy YW1lLT5sb2FkZXIoKS5jbGllbnQoKS5jYW5DYWNoZVBhZ2UoKSkgeworICAgIGlmICghZnJhbWUu bG9hZGVyKCkuY2xpZW50KCkuY2FuQ2FjaGVQYWdlKCkpIHsKICAgICAgICAgUENMT0coIiAgIC1U aGUgY2xpZW50IHNheXMgdGhpcyBmcmFtZSBjYW5ub3QgYmUgY2FjaGVkIik7Ci0gICAgICAgIEZF QVRVUkVfQ09VTlRFUl9JTkNSRU1FTlRfS0VZKGZyYW1lLT5wYWdlKCksIEZlYXR1cmVDb3VudGVy UGFnZUNhY2hlRmFpbHVyZURlbmllZEJ5Q2xpZW50S2V5KTsKKyAgICAgICAgbG9nUGFnZUNhY2hl RmFpbHVyZURpYWdub3N0aWNNZXNzYWdlKGRpYWdub3N0aWNMb2dnaW5nQ2xpZW50LCBEaWFnbm9z dGljTG9nZ2luZ0tleXM6OmRlbmllZEJ5Q2xpZW50S2V5KCkpOwogICAgICAgICByZWplY3RSZWFz b25zIHw9IDEgPDwgQ2xpZW50RGVuaWVzQ2FjaGluZzsKICAgICB9CiAKLSAgICBmb3IgKEZyYW1l KiBjaGlsZCA9IGZyYW1lLT50cmVlKCkuZmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGls ZC0+dHJlZSgpLm5leHRTaWJsaW5nKCkpCi0gICAgICAgIHJlamVjdFJlYXNvbnMgfD0gbG9nQ2Fu Q2FjaGVGcmFtZURlY2lzaW9uKGNoaWxkLCBpbmRlbnRMZXZlbCArIDEpOworICAgIGZvciAoRnJh bWUqIGNoaWxkID0gZnJhbWUudHJlZSgpLmZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hp bGQtPnRyZWUoKS5uZXh0U2libGluZygpKQorICAgICAgICByZWplY3RSZWFzb25zIHw9IGxvZ0Nh bkNhY2hlRnJhbWVEZWNpc2lvbigqY2hpbGQsIGRpYWdub3N0aWNMb2dnaW5nQ2xpZW50LCBpbmRl bnRMZXZlbCArIDEpOwogICAgIAogICAgIFBDTE9HKHJlamVjdFJlYXNvbnMgPyAiIEZyYW1lIENB Tk5PVCBiZSBjYWNoZWQiIDogIiBGcmFtZSBDQU4gYmUgY2FjaGVkIik7CiAgICAgUENMT0coIist LS0iKTsKQEAgLTIxMCwxMiArMjI3LDEyIEBAIGVudW0gUmVhc29uUGFnZUNhbm5vdEJlSW5QYWdl Q2FjaGUgewogfTsKIENPTVBJTEVfQVNTRVJUKE51bWJlck9mUmVhc29uc1BhZ2VzQ2Fubm90QmVJ blBhZ2VDYWNoZSA8PSBzaXplb2YodW5zaWduZWQpKjgsIFJlYXNvblBhZ2VDYW5ub3RCZUluUGFn ZUNhY2hlRG9lc05vdEZpdEluQml0bWFwKTsKIAotc3RhdGljIHZvaWQgbG9nQ2FuQ2FjaGVQYWdl RGVjaXNpb24oUGFnZSogcGFnZSkKK3N0YXRpYyB2b2lkIGxvZ0NhbkNhY2hlUGFnZURlY2lzaW9u KFBhZ2UmIHBhZ2UpCiB7CiAgICAgLy8gT25seSBib3RoZXIgbG9nZ2luZyBmb3IgbWFpbiBmcmFt ZXMgdGhhdCBoYXZlIGFjdHVhbGx5IGxvYWRlZCBhbmQgaGF2ZSBjb250ZW50LgotICAgIGlmIChw YWdlLT5tYWluRnJhbWUoKS5sb2FkZXIoKS5zdGF0ZU1hY2hpbmUoKS5jcmVhdGluZ0luaXRpYWxF bXB0eURvY3VtZW50KCkpCisgICAgaWYgKHBhZ2UubWFpbkZyYW1lKCkubG9hZGVyKCkuc3RhdGVN YWNoaW5lKCkuY3JlYXRpbmdJbml0aWFsRW1wdHlEb2N1bWVudCgpKQogICAgICAgICByZXR1cm47 Ci0gICAgVVJMIGN1cnJlbnRVUkwgPSBwYWdlLT5tYWluRnJhbWUoKS5sb2FkZXIoKS5kb2N1bWVu dExvYWRlcigpID8gcGFnZS0+bWFpbkZyYW1lKCkubG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKS0+ dXJsKCkgOiBVUkwoKTsKKyAgICBVUkwgY3VycmVudFVSTCA9IHBhZ2UubWFpbkZyYW1lKCkubG9h ZGVyKCkuZG9jdW1lbnRMb2FkZXIoKSA/IHBhZ2UubWFpbkZyYW1lKCkubG9hZGVyKCkuZG9jdW1l bnRMb2FkZXIoKS0+dXJsKCkgOiBVUkwoKTsKICAgICBpZiAoY3VycmVudFVSTC5pc0VtcHR5KCkp CiAgICAgICAgIHJldHVybjsKICAgICAKQEAgLTIyMyw1NyArMjQwLDU5IEBAIHN0YXRpYyB2b2lk IGxvZ0NhbkNhY2hlUGFnZURlY2lzaW9uKFBhZ2UqIHBhZ2UpCiAgICAgUENMT0coIi0tLS0tLS0t XG4gRGV0ZXJtaW5pbmcgaWYgcGFnZSBjYW4gYmUgY2FjaGVkOiIpOwogICAgIAogICAgIHVuc2ln bmVkIHJlamVjdFJlYXNvbnMgPSAwOwotICAgIHVuc2lnbmVkIGZyYW1lUmVqZWN0UmVhc29ucyA9 IGxvZ0NhbkNhY2hlRnJhbWVEZWNpc2lvbigmcGFnZS0+bWFpbkZyYW1lKCksIGluZGVudExldmVs KzEpOworICAgIE1haW5GcmFtZSYgbWFpbkZyYW1lID0gcGFnZS5tYWluRnJhbWUoKTsKKyAgICBE aWFnbm9zdGljTG9nZ2luZ0NsaWVudCogZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQgPSBtYWluRnJh bWUuc2V0dGluZ3MoKS5kaWFnbm9zdGljTG9nZ2luZ0VuYWJsZWQoKSA/IG1haW5GcmFtZS5kaWFn bm9zdGljTG9nZ2luZ0NsaWVudCgpIDogbnVsbHB0cjsKKyAgICB1bnNpZ25lZCBmcmFtZVJlamVj dFJlYXNvbnMgPSBsb2dDYW5DYWNoZUZyYW1lRGVjaXNpb24obWFpbkZyYW1lLCBkaWFnbm9zdGlj TG9nZ2luZ0NsaWVudCwgaW5kZW50TGV2ZWwgKyAxKTsKICAgICBpZiAoZnJhbWVSZWplY3RSZWFz b25zKQogICAgICAgICByZWplY3RSZWFzb25zIHw9IDEgPDwgRnJhbWVDYW5ub3RCZUluUGFnZUNh Y2hlOwogICAgIAotICAgIGlmICghcGFnZS0+c2V0dGluZ3MoKS51c2VzUGFnZUNhY2hlKCkpIHsK KyAgICBpZiAoIXBhZ2Uuc2V0dGluZ3MoKS51c2VzUGFnZUNhY2hlKCkpIHsKICAgICAgICAgUENM T0coIiAgIC1QYWdlIHNldHRpbmdzIHNheXMgYi9mIGNhY2hlIGRpc2FibGVkIik7CiAgICAgICAg IHJlamVjdFJlYXNvbnMgfD0gMSA8PCBEaXNhYmxlZFBhZ2VDYWNoZTsKICAgICB9CiAjaWYgRU5B QkxFKERFVklDRV9PUklFTlRBVElPTikgJiYgIVBMQVRGT1JNKElPUykKICAgICBpZiAoRGV2aWNl TW90aW9uQ29udHJvbGxlcjo6aXNBY3RpdmVBdChwYWdlKSkgewogICAgICAgICBQQ0xPRygiICAg LVBhZ2UgaXMgdXNpbmcgRGV2aWNlTW90aW9uIik7Ci0gICAgICAgIEZFQVRVUkVfQ09VTlRFUl9J TkNSRU1FTlRfS0VZKHBhZ2UsIEZlYXR1cmVDb3VudGVyUGFnZUNhY2hlRmFpbHVyZURldmljZU1v dGlvbktleSk7CisgICAgICAgIGxvZ1BhZ2VDYWNoZUZhaWx1cmVEaWFnbm9zdGljTWVzc2FnZShk aWFnbm9zdGljTG9nZ2luZ0NsaWVudCwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpkZXZpY2VNb3Rp b25LZXkoKSk7CiAgICAgICAgIHJlamVjdFJlYXNvbnMgfD0gMSA8PCBVc2VzRGV2aWNlTW90aW9u OwogICAgIH0KICAgICBpZiAoRGV2aWNlT3JpZW50YXRpb25Db250cm9sbGVyOjppc0FjdGl2ZUF0 KHBhZ2UpKSB7CiAgICAgICAgIFBDTE9HKCIgICAtUGFnZSBpcyB1c2luZyBEZXZpY2VPcmllbnRh dGlvbiIpOwotICAgICAgICBGRUFUVVJFX0NPVU5URVJfSU5DUkVNRU5UX0tFWShwYWdlLCBGZWF0 dXJlQ291bnRlclBhZ2VDYWNoZUZhaWx1cmVEZXZpY2VPcmllbnRhdGlvbktleSk7CisgICAgICAg IGxvZ1BhZ2VDYWNoZUZhaWx1cmVEaWFnbm9zdGljTWVzc2FnZShkaWFnbm9zdGljTG9nZ2luZ0Ns aWVudCwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpkZXZpY2VPcmllbnRhdGlvbktleSgpKTsKICAg ICAgICAgcmVqZWN0UmVhc29ucyB8PSAxIDw8IFVzZXNEZXZpY2VPcmllbnRhdGlvbjsKICAgICB9 CiAjZW5kaWYKICNpZiBFTkFCTEUoUFJPWElNSVRZX0VWRU5UUykKICAgICBpZiAoRGV2aWNlUHJv eGltaXR5Q29udHJvbGxlcjo6aXNBY3RpdmVBdChwYWdlKSkgewogICAgICAgICBQQ0xPRygiICAg LVBhZ2UgaXMgdXNpbmcgRGV2aWNlUHJveGltaXR5Iik7Ci0gICAgICAgIEZFQVRVUkVfQ09VTlRF Ul9JTkNSRU1FTlRfS0VZKHBhZ2UsIEZlYXR1cmVDb3VudGVyUGFnZUNhY2hlRmFpbHVyZURldmlj ZVByb3hpbWl0eUtleSk7CisgICAgICAgIGxvZ1BhZ2VDYWNoZUZhaWx1cmVEaWFnbm9zdGljTWVz c2FnZShkaWFnbm9zdGljTG9nZ2luZ0NsaWVudCwgZGV2aWNlUHJveGltaXR5S2V5KTsKICAgICAg ICAgcmVqZWN0UmVhc29ucyB8PSAxIDw8IFVzZXNEZXZpY2VNb3Rpb247CiAgICAgfQogI2VuZGlm Ci0gICAgRnJhbWVMb2FkVHlwZSBsb2FkVHlwZSA9IHBhZ2UtPm1haW5GcmFtZSgpLmxvYWRlcigp LmxvYWRUeXBlKCk7CisgICAgRnJhbWVMb2FkVHlwZSBsb2FkVHlwZSA9IHBhZ2UubWFpbkZyYW1l KCkubG9hZGVyKCkubG9hZFR5cGUoKTsKICAgICBpZiAobG9hZFR5cGUgPT0gRnJhbWVMb2FkVHlw ZTo6UmVsb2FkKSB7CiAgICAgICAgIFBDTE9HKCIgICAtTG9hZCB0eXBlIGlzOiBSZWxvYWQiKTsK LSAgICAgICAgRkVBVFVSRV9DT1VOVEVSX0lOQ1JFTUVOVF9LRVkocGFnZSwgRmVhdHVyZUNvdW50 ZXJQYWdlQ2FjaGVGYWlsdXJlUmVsb2FkS2V5KTsKKyAgICAgICAgbG9nUGFnZUNhY2hlRmFpbHVy ZURpYWdub3N0aWNNZXNzYWdlKGRpYWdub3N0aWNMb2dnaW5nQ2xpZW50LCBEaWFnbm9zdGljTG9n Z2luZ0tleXM6OnJlbG9hZEtleSgpKTsKICAgICAgICAgcmVqZWN0UmVhc29ucyB8PSAxIDw8IElz UmVsb2FkOwogICAgIH0KICAgICBpZiAobG9hZFR5cGUgPT0gRnJhbWVMb2FkVHlwZTo6UmVsb2Fk RnJvbU9yaWdpbikgewogICAgICAgICBQQ0xPRygiICAgLUxvYWQgdHlwZSBpczogUmVsb2FkIGZy b20gb3JpZ2luIik7Ci0gICAgICAgIEZFQVRVUkVfQ09VTlRFUl9JTkNSRU1FTlRfS0VZKHBhZ2Us IEZlYXR1cmVDb3VudGVyUGFnZUNhY2hlRmFpbHVyZVJlbG9hZEZyb21PcmlnaW5LZXkpOworICAg ICAgICBsb2dQYWdlQ2FjaGVGYWlsdXJlRGlhZ25vc3RpY01lc3NhZ2UoZGlhZ25vc3RpY0xvZ2dp bmdDbGllbnQsIERpYWdub3N0aWNMb2dnaW5nS2V5czo6cmVsb2FkRnJvbU9yaWdpbktleSgpKTsK ICAgICAgICAgcmVqZWN0UmVhc29ucyB8PSAxIDw8IElzUmVsb2FkRnJvbU9yaWdpbjsKICAgICB9 CiAgICAgaWYgKGxvYWRUeXBlID09IEZyYW1lTG9hZFR5cGU6OlNhbWUpIHsKICAgICAgICAgUENM T0coIiAgIC1Mb2FkIHR5cGUgaXM6IFNhbWUiKTsKLSAgICAgICAgRkVBVFVSRV9DT1VOVEVSX0lO Q1JFTUVOVF9LRVkocGFnZSwgRmVhdHVyZUNvdW50ZXJQYWdlQ2FjaGVGYWlsdXJlU2FtZUxvYWRL ZXkpOworICAgICAgICBsb2dQYWdlQ2FjaGVGYWlsdXJlRGlhZ25vc3RpY01lc3NhZ2UoZGlhZ25v c3RpY0xvZ2dpbmdDbGllbnQsIERpYWdub3N0aWNMb2dnaW5nS2V5czo6c2FtZUxvYWRLZXkoKSk7 CiAgICAgICAgIHJlamVjdFJlYXNvbnMgfD0gMSA8PCBJc1NhbWVMb2FkOwogICAgIH0KICAgICAK LSAgICBpZiAocmVqZWN0UmVhc29ucykgeworICAgIGlmIChyZWplY3RSZWFzb25zKQogICAgICAg ICBQQ0xPRygiIFBhZ2UgQ0FOTk9UIGJlIGNhY2hlZFxuLS0tLS0tLS0iKTsKLSAgICAgICAgRkVB VFVSRV9DT1VOVEVSX0lOQ1JFTUVOVF9LRVkocGFnZSwgRmVhdHVyZUNvdW50ZXJQYWdlQ2FjaGVG YWlsdXJlS2V5KTsKLSAgICB9IGVsc2UgeworICAgIGVsc2UKICAgICAgICAgUENMT0coIiBQYWdl IENBTiBiZSBjYWNoZWRcbi0tLS0tLS0tIik7Ci0gICAgICAgIEZFQVRVUkVfQ09VTlRFUl9JTkNS RU1FTlRfS0VZKHBhZ2UsIEZlYXR1cmVDb3VudGVyUGFnZUNhY2hlU3VjY2Vzc0tleSk7Ci0gICAg fQorCisgICAgaWYgKGRpYWdub3N0aWNMb2dnaW5nQ2xpZW50KQorICAgICAgICBkaWFnbm9zdGlj TG9nZ2luZ0NsaWVudC0+bG9nRGlhZ25vc3RpY01lc3NhZ2VXaXRoUmVzdWx0KERpYWdub3N0aWNM b2dnaW5nS2V5czo6cGFnZUNhY2hlS2V5KCksIGVtcHR5U3RyaW5nKCksIHJlamVjdFJlYXNvbnMg PyBEaWFnbm9zdGljTG9nZ2luZ1Jlc3VsdEZhaWwgOiBEaWFnbm9zdGljTG9nZ2luZ1Jlc3VsdFBh c3MpOwogfQogCiBQYWdlQ2FjaGUqIHBhZ2VDYWNoZSgpCkBAIC0zMjksNyArMzQ4LDcgQEAgYm9v bCBQYWdlQ2FjaGU6OmNhbkNhY2hlKFBhZ2UqIHBhZ2UpIGNvbnN0CiAgICAgaWYgKCFwYWdlKQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgCi0gICAgbG9nQ2FuQ2FjaGVQYWdlRGVjaXNpb24o cGFnZSk7CisgICAgbG9nQ2FuQ2FjaGVQYWdlRGVjaXNpb24oKnBhZ2UpOwogCiAgICAgaWYgKG1l bW9yeVByZXNzdXJlSGFuZGxlcigpLmlzVW5kZXJNZW1vcnlQcmVzc3VyZSgpKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CkBAIC00MTksMjEgKzQzOCwyMCBAQCB2b2lkIFBhZ2VDYWNoZTo6bWFya1Bh Z2VzRm9yQ2FwdGlvblByZWZlcmVuY2VzQ2hhbmdlZCgpCiB9CiAjZW5kaWYKIAotc3RhdGljIGNv bnN0IGNoYXIqIHBydW5pbmdSZWFzb25Ub0ZlYXR1cmVDb3VudGVyS2V5KFBydW5pbmdSZWFzb24g cHJ1bmluZ1JlYXNvbikKK3N0YXRpYyBTdHJpbmcgcHJ1bmluZ1JlYXNvblRvRGlhZ25vc3RpY0xv Z2dpbmdLZXkoUHJ1bmluZ1JlYXNvbiBwcnVuaW5nUmVhc29uKQogewogICAgIHN3aXRjaCAocHJ1 bmluZ1JlYXNvbikgewogICAgIGNhc2UgUHJ1bmluZ1JlYXNvbjo6TWVtb3J5UHJlc3N1cmU6Ci0g ICAgICAgIHJldHVybiBGZWF0dXJlQ291bnRlclBhZ2VDYWNoZUZhaWx1cmVQcnVuZWRNZW1vcnlQ cmVzc3VyZUtleTsKKyAgICAgICAgcmV0dXJuIERpYWdub3N0aWNMb2dnaW5nS2V5czo6cHJ1bmVk RHVlVG9NZW1vcnlQcmVzc3VyZUtleSgpOwogICAgIGNhc2UgUHJ1bmluZ1JlYXNvbjo6UHJvY2Vz c1N1c3BlbmRlZDoKLSAgICAgICAgcmV0dXJuIEZlYXR1cmVDb3VudGVyUGFnZUNhY2hlRmFpbHVy ZVBydW5lZFByb2Nlc3NlZFN1c3BlbmRlZEtleTsKKyAgICAgICAgcmV0dXJuIERpYWdub3N0aWNM b2dnaW5nS2V5czo6cHJ1bmVkRHVlVG9Qcm9jZXNzU3VzcGVuZGVkKCk7CiAgICAgY2FzZSBQcnVu aW5nUmVhc29uOjpSZWFjaGVkQ2FwYWNpdHk6Ci0gICAgICAgIHJldHVybiBGZWF0dXJlQ291bnRl clBhZ2VDYWNoZUZhaWx1cmVQcnVuZWRDYXBhY2l0eVJlYWNoZWRLZXk7CisgICAgICAgIHJldHVy biBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnBydW5lZER1ZVRvQ2FwYWNpdHlSZWFjaGVkKCk7CiAg ICAgY2FzZSBQcnVuaW5nUmVhc29uOjpOb25lOgotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKLSAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgICAgIGJyZWFrOwogICAgIH0KICAgICBB U1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICByZXR1cm4gbnVsbHB0cjsKKyAgICByZXR1cm4gZW1w dHlTdHJpbmcoKTsKIH0KIAogdm9pZCBQYWdlQ2FjaGU6OmFkZChQYXNzUmVmUHRyPEhpc3RvcnlJ dGVtPiBwcnBJdGVtLCBQYWdlJiBwYWdlKQpAQCAtNDY5LDEzICs0ODcsMTMgQEAgc3RkOjp1bmlx dWVfcHRyPENhY2hlZFBhZ2U+IFBhZ2VDYWNoZTo6dGFrZShIaXN0b3J5SXRlbSogaXRlbSwgUGFn ZSogcGFnZSkKIAogICAgIGlmICghY2FjaGVkUGFnZSkgewogICAgICAgICBpZiAoaXRlbS0+bV9w cnVuaW5nUmVhc29uICE9IFBydW5pbmdSZWFzb246Ok5vbmUpCi0gICAgICAgICAgICBGRUFUVVJF X0NPVU5URVJfSU5DUkVNRU5UX0tFWShwYWdlLCBwcnVuaW5nUmVhc29uVG9GZWF0dXJlQ291bnRl cktleShpdGVtLT5tX3BydW5pbmdSZWFzb24pKTsKKyAgICAgICAgICAgIGxvZ1BhZ2VDYWNoZUZh aWx1cmVEaWFnbm9zdGljTWVzc2FnZShwYWdlLCBwcnVuaW5nUmVhc29uVG9EaWFnbm9zdGljTG9n Z2luZ0tleShpdGVtLT5tX3BydW5pbmdSZWFzb24pKTsKICAgICAgICAgcmV0dXJuIG51bGxwdHI7 CiAgICAgfQogCiAgICAgaWYgKGNhY2hlZFBhZ2UtPmhhc0V4cGlyZWQoKSkgewogICAgICAgICBM T0coUGFnZUNhY2hlLCAiTm90IHJlc3RvcmluZyBwYWdlIGZvciAlcyBmcm9tIGJhY2svZm9yd2Fy ZCBjYWNoZSBiZWNhdXNlIGNhY2hlIGVudHJ5IGhhcyBleHBpcmVkIiwgaXRlbS0+dXJsKCkuc3Ry aW5nKCkuYXNjaWkoKS5kYXRhKCkpOwotICAgICAgICBGRUFUVVJFX0NPVU5URVJfSU5DUkVNRU5U X0tFWShwYWdlLCBGZWF0dXJlQ291bnRlclBhZ2VDYWNoZUZhaWx1cmVFeHBpcmVkS2V5KTsKKyAg ICAgICAgbG9nUGFnZUNhY2hlRmFpbHVyZURpYWdub3N0aWNNZXNzYWdlKHBhZ2UsIERpYWdub3N0 aWNMb2dnaW5nS2V5czo6ZXhwaXJlZEtleSgpKTsKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAg ICAgfQogCkBAIC00OTIsMTAgKzUxMCwxMCBAQCBDYWNoZWRQYWdlKiBQYWdlQ2FjaGU6OmdldChI aXN0b3J5SXRlbSogaXRlbSwgUGFnZSogcGFnZSkKICAgICAgICAgICAgIHJldHVybiBjYWNoZWRQ YWdlOwogICAgICAgICAKICAgICAgICAgTE9HKFBhZ2VDYWNoZSwgIk5vdCByZXN0b3JpbmcgcGFn ZSBmb3IgJXMgZnJvbSBiYWNrL2ZvcndhcmQgY2FjaGUgYmVjYXVzZSBjYWNoZSBlbnRyeSBoYXMg ZXhwaXJlZCIsIGl0ZW0tPnVybCgpLnN0cmluZygpLmFzY2lpKCkuZGF0YSgpKTsKLSAgICAgICAg RkVBVFVSRV9DT1VOVEVSX0lOQ1JFTUVOVF9LRVkocGFnZSwgRmVhdHVyZUNvdW50ZXJQYWdlQ2Fj aGVGYWlsdXJlRXhwaXJlZEtleSk7CisgICAgICAgIGxvZ1BhZ2VDYWNoZUZhaWx1cmVEaWFnbm9z dGljTWVzc2FnZShwYWdlLCBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmV4cGlyZWRLZXkoKSk7CiAg ICAgICAgIHBhZ2VDYWNoZSgpLT5yZW1vdmUoaXRlbSk7CiAgICAgfSBlbHNlIGlmIChpdGVtLT5t X3BydW5pbmdSZWFzb24gIT0gUHJ1bmluZ1JlYXNvbjo6Tm9uZSkKLSAgICAgICAgRkVBVFVSRV9D T1VOVEVSX0lOQ1JFTUVOVF9LRVkocGFnZSwgcHJ1bmluZ1JlYXNvblRvRmVhdHVyZUNvdW50ZXJL ZXkoaXRlbS0+bV9wcnVuaW5nUmVhc29uKSk7CisgICAgICAgIGxvZ1BhZ2VDYWNoZUZhaWx1cmVE aWFnbm9zdGljTWVzc2FnZShwYWdlLCBwcnVuaW5nUmVhc29uVG9EaWFnbm9zdGljTG9nZ2luZ0tl eShpdGVtLT5tX3BydW5pbmdSZWFzb24pKTsKIAogICAgIHJldHVybiBudWxscHRyOwogfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9EaWFnbm9zdGljTG9nZ2luZ0tleXMuY3BwIGIv U291cmNlL1dlYkNvcmUvcGFnZS9EaWFnbm9zdGljTG9nZ2luZ0tleXMuY3BwCmluZGV4IDY2ZWIy N2QzNjI1OTQ5YTJkYjU1ZDJkYzBmMzM5ODM2OTZlOTVhZWIuLjBkN2NhY2Q2YzRlNWY4NjM1MmZl NjcwNjkxYjA0MTA1NjUxMDg1MmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGlh Z25vc3RpY0xvZ2dpbmdLZXlzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RpYWdub3N0 aWNMb2dnaW5nS2V5cy5jcHAKQEAgLTY4LDM1ICs2OCwxNTAgQEAgU3RyaW5nIERpYWdub3N0aWNM b2dnaW5nS2V5czo6cGFnZUNvbnRhaW5zQXRMZWFzdE9uZU1lZGlhRW5naW5lS2V5KCkKICAgICBy ZXR1cm4gQVNDSUlMaXRlcmFsKCJwYWdlQ29udGFpbnNBdExlYXN0T25lTWVkaWFFbmdpbmUiKTsK IH0KIAotU3RyaW5nIERpYWdub3N0aWNMb2dnaW5nS2V5czo6cGFzc0tleSgpCitTdHJpbmcgRGlh Z25vc3RpY0xvZ2dpbmdLZXlzOjpzdWNjZXNzS2V5KCkKIHsKLSAgICByZXR1cm4gQVNDSUlMaXRl cmFsKCJwYXNzIik7CisgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgic3VjY2VzcyIpOwogfQogCi1T dHJpbmcgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpmYWlsS2V5KCkKK1N0cmluZyBEaWFnbm9zdGlj TG9nZ2luZ0tleXM6OmZhaWx1cmVLZXkoKQogewotICAgIHJldHVybiBBU0NJSUxpdGVyYWwoImZh aWwiKTsKKyAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJmYWlsdXJlIik7CiB9CiAKLVN0cmluZyBE aWFnbm9zdGljTG9nZ2luZ0tleXM6Om5vb3BLZXkoKQorU3RyaW5nIERpYWdub3N0aWNMb2dnaW5n S2V5czo6cGFnZUxvYWRlZEtleSgpCiB7Ci0gICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgibm9vcCIp OworICAgIHJldHVybiBBU0NJSUxpdGVyYWwoInBhZ2VMb2FkZWQiKTsKIH0KIAotU3RyaW5nIERp YWdub3N0aWNMb2dnaW5nS2V5czo6cGFnZUxvYWRlZEtleSgpCitTdHJpbmcgRGlhZ25vc3RpY0xv Z2dpbmdLZXlzOjplbmdpbmVGYWlsZWRUb0xvYWRLZXkoKQogewotICAgIHJldHVybiBXVEY6OkFT Q0lJTGl0ZXJhbCgicGFnZUxvYWRlZCIpOworICAgIHJldHVybiBBU0NJSUxpdGVyYWwoImVuZ2lu ZUZhaWxlZFRvTG9hZCIpOwogfQogCi1TdHJpbmcgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjplbmdp bmVGYWlsZWRUb0xvYWRLZXkoKQorU3RyaW5nIERpYWdub3N0aWNMb2dnaW5nS2V5czo6bmF2aWdh dGlvbktleSgpCit7CisgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgibmF2aWdhdGlvbiIpOworfQor CitTdHJpbmcgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpwYWdlQ2FjaGVLZXkoKQoreworICAgIHJl dHVybiBBU0NJSUxpdGVyYWwoInBhZ2VDYWNoZSIpOworfQorCitTdHJpbmcgRGlhZ25vc3RpY0xv Z2dpbmdLZXlzOjpub0RvY3VtZW50TG9hZGVyS2V5KCkKK3sKKyAgICByZXR1cm4gQVNDSUlMaXRl cmFsKCJub0RvY3VtZW50TG9hZGVyIik7Cit9CisKK1N0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tl eXM6Om1haW5Eb2N1bWVudEVycm9yS2V5KCkKK3sKKyAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJt YWluRG9jdW1lbnRFcnJvciIpOworfQorCitTdHJpbmcgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpp c0Vycm9yUGFnZUtleSgpCit7CisgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgiaXNFcnJvclBhZ2Ui KTsKK30KKworU3RyaW5nIERpYWdub3N0aWNMb2dnaW5nS2V5czo6aGFzUGx1Z2luc0tleSgpCit7 CisgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgiaGFzUGx1Z2lucyIpOworfQorCitTdHJpbmcgRGlh Z25vc3RpY0xvZ2dpbmdLZXlzOjpodHRwc05vU3RvcmVLZXkoKQoreworICAgIHJldHVybiBBU0NJ SUxpdGVyYWwoImh0dHBzTm9TdG9yZSIpOworfQorCitTdHJpbmcgRGlhZ25vc3RpY0xvZ2dpbmdL ZXlzOjpoYXNPcGVuRGF0YWJhc2VzS2V5KCkKK3sKKyAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJo YXNPcGVuRGF0YWJhc2VzIik7Cit9CisKK1N0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6Om5v Q3VycmVudEhpc3RvcnlJdGVtS2V5KCkKK3sKKyAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJub0N1 cnJlbnRIaXN0b3J5SXRlbSIpOworfQorCitTdHJpbmcgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpx dWlya1JlZGlyZWN0Q29taW5nS2V5KCkKK3sKKyAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJxdWly a1JlZGlyZWN0Q29taW5nIik7Cit9CisKK1N0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6Omxv YWRpbmdBUElTZW5zZUtleSgpCit7CisgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgibG9hZGluZ0FQ SVNlbnNlIik7Cit9CisKK1N0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmRvY3VtZW50TG9h ZGVyU3RvcHBpbmdLZXkoKQoreworICAgIHJldHVybiBBU0NJSUxpdGVyYWwoImRvY3VtZW50TG9h ZGVyU3RvcHBpbmciKTsKK30KKworU3RyaW5nIERpYWdub3N0aWNMb2dnaW5nS2V5czo6Y2Fubm90 U3VzcGVuZEFjdGl2ZURPTU9iamVjdHNLZXkoKQoreworICAgIHJldHVybiBBU0NJSUxpdGVyYWwo ImNhbm5vdFN1c3BlbmRBY3RpdmVET01PYmplY3RzIik7Cit9CisKK1N0cmluZyBEaWFnbm9zdGlj TG9nZ2luZ0tleXM6OmFwcGxpY2F0aW9uQ2FjaGVLZXkoKQoreworICAgIHJldHVybiBBU0NJSUxp dGVyYWwoImFwcGxpY2F0aW9uQ2FjaGUiKTsKK30KKworU3RyaW5nIERpYWdub3N0aWNMb2dnaW5n S2V5czo6ZGVuaWVkQnlDbGllbnRLZXkoKQoreworICAgIHJldHVybiBBU0NJSUxpdGVyYWwoImRl bmllZEJ5Q2xpZW50Iik7Cit9CisKK1N0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmRldmlj ZU1vdGlvbktleSgpCit7CisgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgiZGV2aWNlTW90aW9uIik7 Cit9CisKK1N0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmRldmljZU9yaWVudGF0aW9uS2V5 KCkKK3sKKyAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJkZXZpY2VPcmllbnRhdGlvbiIpOworfQor CitTdHJpbmcgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpkZXZpY2VQcm94aW1pdHlLZXkoKQorewor ICAgIHJldHVybiBBU0NJSUxpdGVyYWwoImRldmljZVByb3hpbWl0eSIpOworfQorCitTdHJpbmcg RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpyZWxvYWRLZXkoKQoreworICAgIHJldHVybiBBU0NJSUxp dGVyYWwoInJlbG9hZCIpOworfQorCitTdHJpbmcgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpyZWxv YWRGcm9tT3JpZ2luS2V5KCkKK3sKKyAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJyZWxvYWRGcm9t T3JpZ2luIik7Cit9CisKK1N0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnNhbWVMb2FkS2V5 KCkKIHsKLSAgICByZXR1cm4gV1RGOjpBU0NJSUxpdGVyYWwoImVuZ2luZUZhaWxlZFRvTG9hZCIp OworICAgIHJldHVybiBBU0NJSUxpdGVyYWwoInNhbWVMb2FkIik7CiB9CiAKLVdURjo6U3RyaW5n IERpYWdub3N0aWNMb2dnaW5nS2V5czo6bmF2aWdhdGlvbktleSgpCitTdHJpbmcgRGlhZ25vc3Rp Y0xvZ2dpbmdLZXlzOjpleHBpcmVkS2V5KCkKIHsKLSAgICByZXR1cm4gV1RGOjpBU0NJSUxpdGVy YWwoIm5hdmlnYXRpb24iKTsKKyAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJleHBpcmVkIik7CiB9 CiAKK1N0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnBydW5lZER1ZVRvTWVtb3J5UHJlc3N1 cmVLZXkoKQoreworICAgIHJldHVybiBBU0NJSUxpdGVyYWwoInBydW5lZC5tZW1vcnlQcmVzc3Vy ZSIpOworfQorCitTdHJpbmcgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpwcnVuZWREdWVUb0NhcGFj aXR5UmVhY2hlZCgpCit7CisgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgicHJ1bmVkLmNhcGFjaXR5 UmVhY2hlZCIpOwogfQogCitTdHJpbmcgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpwcnVuZWREdWVU b1Byb2Nlc3NTdXNwZW5kZWQoKQoreworICAgIHJldHVybiBBU0NJSUxpdGVyYWwoInBydW5lZC5w cm9jZXNzU3VzcGVuZGVkIik7Cit9CisKK30gLy8gbmFtZXNwYWNlIFdlYkNvcmUKKwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9EaWFnbm9zdGljTG9nZ2luZ0tleXMuaCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRGlhZ25vc3RpY0xvZ2dpbmdLZXlzLmgKaW5kZXggMWRmNDAyMDYxOWFh MDlkZDRiYzIwNzdjYmViZGE0YmJlNjBmZDU4Ni4uYTI2MzRlZDFlZTc4YjQ5YjU2YzM0NDViMzQ3 MGQ0MTNjMDgwMDMyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9EaWFnbm9zdGlj TG9nZ2luZ0tleXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RpYWdub3N0aWNMb2dnaW5n S2V5cy5oCkBAIC0zMiwyMyArMzIsNDUgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBE aWFnbm9zdGljTG9nZ2luZ0tleXMgewogcHVibGljOgotICAgIC8vIE1lc3NhZ2Uga2V5cy4KKyAg ICBzdGF0aWMgU3RyaW5nIGFwcGxpY2F0aW9uQ2FjaGVLZXkoKTsKKyAgICBzdGF0aWMgU3RyaW5n IGNhbm5vdFN1c3BlbmRBY3RpdmVET01PYmplY3RzS2V5KCk7CisgICAgc3RhdGljIFN0cmluZyBk ZW5pZWRCeUNsaWVudEtleSgpOworICAgIHN0YXRpYyBTdHJpbmcgZGV2aWNlTW90aW9uS2V5KCk7 CisgICAgc3RhdGljIFN0cmluZyBkZXZpY2VPcmllbnRhdGlvbktleSgpOworICAgIHN0YXRpYyBT dHJpbmcgZGV2aWNlUHJveGltaXR5S2V5KCk7CisgICAgc3RhdGljIFN0cmluZyBkb2N1bWVudExv YWRlclN0b3BwaW5nS2V5KCk7CisgICAgc3RhdGljIFN0cmluZyBlbmdpbmVGYWlsZWRUb0xvYWRL ZXkoKTsKKyAgICBzdGF0aWMgU3RyaW5nIGV4cGlyZWRLZXkoKTsKKyAgICBzdGF0aWMgU3RyaW5n IGhhc09wZW5EYXRhYmFzZXNLZXkoKTsKKyAgICBzdGF0aWMgU3RyaW5nIGhhc1BsdWdpbnNLZXko KTsKKyAgICBzdGF0aWMgU3RyaW5nIGh0dHBzTm9TdG9yZUtleSgpOworICAgIHN0YXRpYyBTdHJp bmcgaXNFcnJvclBhZ2VLZXkoKTsKKyAgICBzdGF0aWMgU3RyaW5nIGxvYWRpbmdBUElTZW5zZUtl eSgpOworICAgIHN0YXRpYyBTdHJpbmcgbWFpbkRvY3VtZW50RXJyb3JLZXkoKTsKICAgICBzdGF0 aWMgU3RyaW5nIG1lZGlhTG9hZGVkS2V5KCk7CiAgICAgc3RhdGljIFN0cmluZyBtZWRpYUxvYWRp bmdGYWlsZWRLZXkoKTsKLSAgICBzdGF0aWMgU3RyaW5nIHBsdWdpbkxvYWRlZEtleSgpOwotICAg IHN0YXRpYyBTdHJpbmcgcGx1Z2luTG9hZGluZ0ZhaWxlZEtleSgpOwotICAgIHN0YXRpYyBTdHJp bmcgcGFnZUNvbnRhaW5zUGx1Z2luS2V5KCk7CisgICAgc3RhdGljIFN0cmluZyBuYXZpZ2F0aW9u S2V5KCk7CisgICAgc3RhdGljIFN0cmluZyBub0N1cnJlbnRIaXN0b3J5SXRlbUtleSgpOworICAg IHN0YXRpYyBTdHJpbmcgbm9Eb2N1bWVudExvYWRlcktleSgpOworICAgIHN0YXRpYyBTdHJpbmcg cGFnZUNhY2hlS2V5KCk7CisgICAgc3RhdGljIFN0cmluZyBwYWdlQ29udGFpbnNBdExlYXN0T25l TWVkaWFFbmdpbmVLZXkoKTsKICAgICBzdGF0aWMgU3RyaW5nIHBhZ2VDb250YWluc0F0TGVhc3RP bmVQbHVnaW5LZXkoKTsKICAgICBzdGF0aWMgU3RyaW5nIHBhZ2VDb250YWluc01lZGlhRW5naW5l S2V5KCk7Ci0gICAgc3RhdGljIFN0cmluZyBwYWdlQ29udGFpbnNBdExlYXN0T25lTWVkaWFFbmdp bmVLZXkoKTsKKyAgICBzdGF0aWMgU3RyaW5nIHBhZ2VDb250YWluc1BsdWdpbktleSgpOwogICAg IHN0YXRpYyBTdHJpbmcgcGFnZUxvYWRlZEtleSgpOwotICAgIHN0YXRpYyBTdHJpbmcgZW5naW5l RmFpbGVkVG9Mb2FkS2V5KCk7Ci0gICAgc3RhdGljIFN0cmluZyBuYXZpZ2F0aW9uS2V5KCk7Cisg ICAgc3RhdGljIFN0cmluZyBwbHVnaW5Mb2FkZWRLZXkoKTsKKyAgICBzdGF0aWMgU3RyaW5nIHBs dWdpbkxvYWRpbmdGYWlsZWRLZXkoKTsKKyAgICBzdGF0aWMgU3RyaW5nIHBydW5lZER1ZVRvQ2Fw YWNpdHlSZWFjaGVkKCk7CisgICAgc3RhdGljIFN0cmluZyBwcnVuZWREdWVUb01lbW9yeVByZXNz dXJlS2V5KCk7CisgICAgc3RhdGljIFN0cmluZyBwcnVuZWREdWVUb1Byb2Nlc3NTdXNwZW5kZWQo KTsKKyAgICBzdGF0aWMgU3RyaW5nIHF1aXJrUmVkaXJlY3RDb21pbmdLZXkoKTsKKyAgICBzdGF0 aWMgU3RyaW5nIHJlbG9hZEZyb21PcmlnaW5LZXkoKTsKKyAgICBzdGF0aWMgU3RyaW5nIHJlbG9h ZEtleSgpOworICAgIHN0YXRpYyBTdHJpbmcgc2FtZUxvYWRLZXkoKTsKIAotICAgIC8vIFN1Y2Nl c3Mga2V5cy4KLSAgICBzdGF0aWMgU3RyaW5nIHBhc3NLZXkoKTsKLSAgICBzdGF0aWMgU3RyaW5n IGZhaWxLZXkoKTsKLSAgICBzdGF0aWMgU3RyaW5nIG5vb3BLZXkoKTsKKyAgICAvLyBTdWNjZXNz IC8gRmFpbHVyZSBrZXlzLgorICAgIHN0YXRpYyBTdHJpbmcgc3VjY2Vzc0tleSgpOworICAgIHN0 YXRpYyBTdHJpbmcgZmFpbHVyZUtleSgpOwogfTsKIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vRmVhdHVyZUNvdW50ZXJLZXlzLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9GZWF0dXJlQ291bnRlcktleXMuaAppbmRleCA2Yjk5N2FlZTZhMTVlMWIxNTM2MDgxYmJm Yzc1YTI0ZjVjMWMzM2YzLi4zNzlmZmQxMWFmZThkZTNhMjk5ZDQ2ZDVjZGNjM2M5MTM2YzFiZjA5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9GZWF0dXJlQ291bnRlcktleXMu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9GZWF0dXJlQ291bnRlcktleXMuaApAQCAt MjgsMzcgKzI4LDYgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0vLyBQYWdlIGNhY2hlLgot c3RhdGljIGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJQYWdlQ2FjaGVGYWlsdXJlTm9Eb2N1bWVu dExvYWRlcktleVtdID0gImNvbS5hcHBsZS5XZWJLaXQucGFnZUNhY2hlLmZhaWx1cmUubm9Eb2N1 bWVudExvYWRlciI7Ci1zdGF0aWMgY29uc3QgY2hhciBGZWF0dXJlQ291bnRlclBhZ2VDYWNoZUZh aWx1cmVNYWluRG9jdW1lbnRFcnJvcktleVtdID0gImNvbS5hcHBsZS5XZWJLaXQucGFnZUNhY2hl LmZhaWx1cmUubWFpbkRvY3VtZW50RXJyb3IiOwotc3RhdGljIGNvbnN0IGNoYXIgRmVhdHVyZUNv dW50ZXJQYWdlQ2FjaGVGYWlsdXJlSXNFcnJvclBhZ2VLZXlbXSA9ICJjb20uYXBwbGUuV2ViS2l0 LnBhZ2VDYWNoZS5mYWlsdXJlLmlzRXJyb3JQYWdlIjsKLXN0YXRpYyBjb25zdCBjaGFyIEZlYXR1 cmVDb3VudGVyUGFnZUNhY2hlRmFpbHVyZUhhc1BsdWdpbnNbXSA9ICJjb20uYXBwbGUuV2ViS2l0 LnBhZ2VDYWNoZS5mYWlsdXJlLmhhc1BsdWdpbnMiOwotc3RhdGljIGNvbnN0IGNoYXIgRmVhdHVy ZUNvdW50ZXJQYWdlQ2FjaGVGYWlsdXJlSFRUUFNOb1N0b3JlS2V5W10gPSAiY29tLmFwcGxlLldl YktpdC5wYWdlQ2FjaGUuZmFpbHVyZS5odHRwc05vU3RvcmUiOwotc3RhdGljIGNvbnN0IGNoYXIg RmVhdHVyZUNvdW50ZXJQYWdlQ2FjaGVGYWlsdXJlSGFzT3BlbkRhdGFiYXNlc0tleVtdID0gImNv bS5hcHBsZS5XZWJLaXQucGFnZUNhY2hlLmZhaWx1cmUuaGFzT3BlbkRhdGFiYXNlcyI7Ci1zdGF0 aWMgY29uc3QgY2hhciBGZWF0dXJlQ291bnRlclBhZ2VDYWNoZUZhaWx1cmVOb0N1cnJlbnRIaXN0 b3J5SXRlbUtleVtdID0gImNvbS5hcHBsZS5XZWJLaXQucGFnZUNhY2hlLmZhaWx1cmUubm9DdXJy ZW50SGlzdG9yeUl0ZW0iOwotc3RhdGljIGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJQYWdlQ2Fj aGVGYWlsdXJlUXVpcmtSZWRpcmVjdENvbWluZ0tleVtdID0gImNvbS5hcHBsZS5XZWJLaXQucGFn ZUNhY2hlLmZhaWx1cmUucXVpcmtSZWRpcmVjdENvbWluZyI7Ci1zdGF0aWMgY29uc3QgY2hhciBG ZWF0dXJlQ291bnRlclBhZ2VDYWNoZUZhaWx1cmVMb2FkaW5nQVBJU2Vuc2VLZXlbXSA9ICJjb20u YXBwbGUuV2ViS2l0LnBhZ2VDYWNoZS5mYWlsdXJlLmxvYWRpbmdBUElTZW5zZSI7Ci1zdGF0aWMg Y29uc3QgY2hhciBGZWF0dXJlQ291bnRlclBhZ2VDYWNoZUZhaWx1cmVEb2N1bWVudExvYWRlclN0 b3BwaW5nS2V5W10gPSAiY29tLmFwcGxlLldlYktpdC5wYWdlQ2FjaGUuZmFpbHVyZS5kb2N1bWVu dExvYWRlclN0b3BwaW5nIjsKLXN0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVDb3VudGVyUGFnZUNh Y2hlRmFpbHVyZUNhbm5vdFN1c3BlbmRBY3RpdmVET01PYmplY3RzS2V5W10gPSAiY29tLmFwcGxl LldlYktpdC5wYWdlQ2FjaGUuZmFpbHVyZS5jYW5ub3RTdXNwZW5kQWN0aXZlRE9NT2JqZWN0cyI7 Ci1zdGF0aWMgY29uc3QgY2hhciBGZWF0dXJlQ291bnRlclBhZ2VDYWNoZUZhaWx1cmVBcHBsaWNh dGlvbkNhY2hlS2V5W10gPSAiY29tLmFwcGxlLldlYktpdC5wYWdlQ2FjaGUuZmFpbHVyZS5hcHBs aWNhdGlvbkNhY2hlIjsKLXN0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVDb3VudGVyUGFnZUNhY2hl RmFpbHVyZURlbmllZEJ5Q2xpZW50S2V5W10gPSAiY29tLmFwcGxlLldlYktpdC5wYWdlQ2FjaGUu ZmFpbHVyZS5kZW5pZWRCeUNsaWVudCI7Ci0jaWYgRU5BQkxFKERFVklDRV9PUklFTlRBVElPTikK LXN0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVDb3VudGVyUGFnZUNhY2hlRmFpbHVyZURldmljZU1v dGlvbktleVtdID0gImNvbS5hcHBsZS5XZWJLaXQucGFnZUNhY2hlLmZhaWx1cmUuZGV2aWNlTW90 aW9uIjsKLXN0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVDb3VudGVyUGFnZUNhY2hlRmFpbHVyZURl dmljZU9yaWVudGF0aW9uS2V5W10gPSAiY29tLmFwcGxlLldlYktpdC5wYWdlQ2FjaGUuZmFpbHVy ZS5kZXZpY2VPcmllbnRhdGlvbiI7Ci0jZW5kaWYKLSNpZiBFTkFCTEUoUFJPWElNSVRZX0VWRU5U UykKLXN0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVDb3VudGVyUGFnZUNhY2hlRmFpbHVyZURldmlj ZVByb3hpbWl0eUtleVtdID0gImNvbS5hcHBsZS5XZWJLaXQucGFnZUNhY2hlLmZhaWx1cmUuZGV2 aWNlUHJveGltaXR5IjsKLSNlbmRpZgotc3RhdGljIGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJQ YWdlQ2FjaGVGYWlsdXJlUmVsb2FkS2V5W10gPSAiY29tLmFwcGxlLldlYktpdC5wYWdlQ2FjaGUu ZmFpbHVyZS5yZWxvYWQiOwotc3RhdGljIGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJQYWdlQ2Fj aGVGYWlsdXJlUmVsb2FkRnJvbU9yaWdpbktleVtdID0gImNvbS5hcHBsZS5XZWJLaXQucGFnZUNh Y2hlLmZhaWx1cmUucmVsb2FkRnJvbU9yaWdpbiI7Ci1zdGF0aWMgY29uc3QgY2hhciBGZWF0dXJl Q291bnRlclBhZ2VDYWNoZUZhaWx1cmVTYW1lTG9hZEtleVtdID0gImNvbS5hcHBsZS5XZWJLaXQu cGFnZUNhY2hlLmZhaWx1cmUuc2FtZUxvYWQiOwotc3RhdGljIGNvbnN0IGNoYXIgRmVhdHVyZUNv dW50ZXJQYWdlQ2FjaGVGYWlsdXJlRXhwaXJlZEtleVtdID0gImNvbS5hcHBsZS5XZWJLaXQucGFn ZUNhY2hlLmZhaWx1cmUuZXhwaXJlZCI7Ci1zdGF0aWMgY29uc3QgY2hhciBGZWF0dXJlQ291bnRl clBhZ2VDYWNoZUZhaWx1cmVQcnVuZWRNZW1vcnlQcmVzc3VyZUtleVtdID0gImNvbS5hcHBsZS5X ZWJLaXQucGFnZUNhY2hlLmZhaWx1cmUucHJ1bmVkLm1lbW9yeVByZXNzdXJlIjsKLXN0YXRpYyBj b25zdCBjaGFyIEZlYXR1cmVDb3VudGVyUGFnZUNhY2hlRmFpbHVyZVBydW5lZENhcGFjaXR5UmVh Y2hlZEtleVtdID0gImNvbS5hcHBsZS5XZWJLaXQucGFnZUNhY2hlLmZhaWx1cmUucHJ1bmVkLmNh cGFjaXR5UmVhY2hlZCI7Ci1zdGF0aWMgY29uc3QgY2hhciBGZWF0dXJlQ291bnRlclBhZ2VDYWNo ZUZhaWx1cmVQcnVuZWRQcm9jZXNzZWRTdXNwZW5kZWRLZXlbXSA9ICJjb20uYXBwbGUuV2ViS2l0 LnBhZ2VDYWNoZS5mYWlsdXJlLnBydW5lZC5wcm9jZXNzU3VzcGVuZGVkIjsKLXN0YXRpYyBjb25z dCBjaGFyIEZlYXR1cmVDb3VudGVyUGFnZUNhY2hlRmFpbHVyZUtleVtdID0gImNvbS5hcHBsZS5X ZWJLaXQucGFnZUNhY2hlLmZhaWx1cmUiOwotc3RhdGljIGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50 ZXJQYWdlQ2FjaGVTdWNjZXNzS2V5W10gPSAiY29tLmFwcGxlLldlYktpdC5wYWdlQ2FjaGUuc3Vj Y2VzcyI7Ci0KIC8vIENhY2hlZCByZXNvdXJjZXMgcmV2YWxpZGF0aW9uLgogc3RhdGljIGNvbnN0 IGNoYXIgRmVhdHVyZUNvdW50ZXJDYWNoZWRSZXNvdXJjZVJldmFsaWRhdGlvblN1Y2Nlc3NLZXlb XSA9ICJjb20uYXBwbGUuV2ViS2l0LmNhY2hlZFJlc291cmNlUmV2YWxpZGF0aW9uLnN1Y2Nlc3Mi Owogc3RhdGljIGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJDYWNoZWRSZXNvdXJjZVJldmFsaWRh dGlvbkZhaWx1cmVLZXlbXSA9ICJjb20uYXBwbGUuV2ViS2l0LmNhY2hlZFJlc291cmNlUmV2YWxp ZGF0aW9uLmZhaWx1cmUiOwo=