207409 2020-02-07 14:36:32 -0800 Remember if we used legacy TLS in the back/forward cache like we remember if we have only secure content 2020-02-07 15:31:17 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez dbates ews-watchlist japhet webkit-bug-importer oldest_to_newest 1616376 0 achristensen 2020-02-07 14:36:32 -0800 Remember if we used legacy TLS in the back/forward cache like we remember if we have only secure content 1616378 1 390125 achristensen 2020-02-07 14:41:38 -0800 Created attachment 390125 Patch 1616379 2 achristensen 2020-02-07 14:43:13 -0800 Part of rdar://problem/59048822 1616407 3 390125 cdumez 2020-02-07 15:22:42 -0800 Comment on attachment 390125 Patch Looks great, r=me. 1616415 4 390137 achristensen 2020-02-07 15:28:35 -0800 Created attachment 390137 patch for landing 1616416 5 achristensen 2020-02-07 15:30:42 -0800 http://trac.webkit.org/r256073 1616417 6 webkit-bug-importer 2020-02-07 15:31:17 -0800 <rdar://problem/59276300> 390125 2020-02-07 14:41:38 -0800 2020-02-07 15:28:35 -0800 Patch bug-207409-20200207144138.patch text/plain 23201 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1NjA0MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDIwLTAyLTA3ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1lbWJlciBp ZiB3ZSB1c2VkIGxlZ2FjeSBUTFMgaW4gdGhlIGJhY2svZm9yd2FyZCBjYWNoZSBsaWtlIHdlIHJl bWVtYmVyIGlmIHdlIGhhdmUgb25seSBzZWN1cmUgY29udGVudAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA3NDA5CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ292ZXJlZCBieSBhbiBBUEkgdGVzdC4KKwor ICAgICAgICAqIGhpc3RvcnkvQ2FjaGVkRnJhbWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2Fj aGVkRnJhbWU6OnNldEhhc0luc2VjdXJlQ29udGVudCk6CisgICAgICAgICogaGlzdG9yeS9DYWNo ZWRGcmFtZS5oOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkRnJhbWU6OnVzZWRMZWdhY3lUTFMg Y29uc3QpOgorICAgICAgICAqIGxvYWRlci9FbXB0eUZyYW1lTG9hZGVyQ2xpZW50Lmg6CisgICAg ICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9h ZGVyOjpyZWNlaXZlZEZpcnN0RGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6 Y29tbWl0UHJvdmlzaW9uYWxMb2FkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpk aXNwYXRjaERpZENvbW1pdExvYWQpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5oOgor ICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oOgorCiAyMDIwLTAyLTA3ICBOaWtv cyBNb3VjaHRhcmlzICA8bm1vdWNodGFyaXNAYXBwbGUuY29tPgogCiAgICAgICAgIFtBcHBsZSBQ YXldIFByb3ZpZGUgYSByZWRhY3RlZCBiaWxsaW5nIGNvbnRhY3QgZHVyaW5nIHBheW1lbnQgbWV0 aG9kIHNlbGVjdGlvbgpJbmRleDogU291cmNlL1dlYkNvcmUvaGlzdG9yeS9DYWNoZWRGcmFtZS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaGlzdG9yeS9DYWNoZWRGcmFtZS5jcHAJ KHJldmlzaW9uIDI1NjA0MikKKysrIFNvdXJjZS9XZWJDb3JlL2hpc3RvcnkvQ2FjaGVkRnJhbWUu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMDIsOSArMzAyLDEwIEBAIENhY2hlZEZyYW1lUGxhdGZv cm1EYXRhKiBDYWNoZWRGcmFtZTo6Y2EKICAgICByZXR1cm4gbV9jYWNoZWRGcmFtZVBsYXRmb3Jt RGF0YS5nZXQoKTsKIH0KIAotdm9pZCBDYWNoZWRGcmFtZTo6c2V0SGFzSW5zZWN1cmVDb250ZW50 KEhhc0luc2VjdXJlQ29udGVudCBoYXNJbnNlY3VyZUNvbnRlbnQpCit2b2lkIENhY2hlZEZyYW1l OjpzZXRIYXNJbnNlY3VyZUNvbnRlbnQoSGFzSW5zZWN1cmVDb250ZW50IGhhc0luc2VjdXJlQ29u dGVudCwgVXNlZExlZ2FjeVRMUyB1c2VkTGVnYWN5VExTKQogewogICAgIG1faGFzSW5zZWN1cmVD b250ZW50ID0gaGFzSW5zZWN1cmVDb250ZW50OworICAgIG1fdXNlZExlZ2FjeVRMUyA9IHVzZWRM ZWdhY3lUTFM7CiB9CiAKIGludCBDYWNoZWRGcmFtZTo6ZGVzY2VuZGFudEZyYW1lQ291bnQoKSBj b25zdApJbmRleDogU291cmNlL1dlYkNvcmUvaGlzdG9yeS9DYWNoZWRGcmFtZS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2hpc3RvcnkvQ2FjaGVkRnJhbWUuaAkocmV2aXNpb24gMjU2 MDQyKQorKysgU291cmNlL1dlYkNvcmUvaGlzdG9yeS9DYWNoZWRGcmFtZS5oCSh3b3JraW5nIGNv cHkpCkBAIC0zOSw2ICszOSw3IEBAIGNsYXNzIERvY3VtZW50TG9hZGVyOwogY2xhc3MgRnJhbWVW aWV3OwogY2xhc3MgTm9kZTsKIGVudW0gY2xhc3MgSGFzSW5zZWN1cmVDb250ZW50IDogYm9vbDsK K2VudW0gY2xhc3MgVXNlZExlZ2FjeVRMUyA6IGJvb2w7CiAKIGNsYXNzIENhY2hlZEZyYW1lQmFz ZSB7CiBwdWJsaWM6CkBAIC02Myw2ICs2NCw3IEBAIHByb3RlY3RlZDoKICAgICBzdGQ6OnVuaXF1 ZV9wdHI8Q2FjaGVkRnJhbWVQbGF0Zm9ybURhdGE+IG1fY2FjaGVkRnJhbWVQbGF0Zm9ybURhdGE7 CiAgICAgYm9vbCBtX2lzTWFpbkZyYW1lOwogICAgIE9wdGlvbmFsPEhhc0luc2VjdXJlQ29udGVu dD4gbV9oYXNJbnNlY3VyZUNvbnRlbnQ7CisgICAgT3B0aW9uYWw8VXNlZExlZ2FjeVRMUz4gbV91 c2VkTGVnYWN5VExTOwogCiAgICAgVmVjdG9yPHN0ZDo6dW5pcXVlX3B0cjxDYWNoZWRGcmFtZT4+ IG1fY2hpbGRGcmFtZXM7CiB9OwpAQCAtNzksOCArODEsOSBAQCBwdWJsaWM6CiAgICAgV0VCQ09S RV9FWFBPUlQgdm9pZCBzZXRDYWNoZWRGcmFtZVBsYXRmb3JtRGF0YShzdGQ6OnVuaXF1ZV9wdHI8 Q2FjaGVkRnJhbWVQbGF0Zm9ybURhdGE+KTsKICAgICBXRUJDT1JFX0VYUE9SVCBDYWNoZWRGcmFt ZVBsYXRmb3JtRGF0YSogY2FjaGVkRnJhbWVQbGF0Zm9ybURhdGEoKTsKIAotICAgIFdFQkNPUkVf RVhQT1JUIHZvaWQgc2V0SGFzSW5zZWN1cmVDb250ZW50KEhhc0luc2VjdXJlQ29udGVudCk7Cisg ICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRIYXNJbnNlY3VyZUNvbnRlbnQoSGFzSW5zZWN1cmVD b250ZW50LCBVc2VkTGVnYWN5VExTKTsKICAgICBPcHRpb25hbDxIYXNJbnNlY3VyZUNvbnRlbnQ+ IGhhc0luc2VjdXJlQ29udGVudCgpIGNvbnN0IHsgcmV0dXJuIG1faGFzSW5zZWN1cmVDb250ZW50 OyB9CisgICAgT3B0aW9uYWw8VXNlZExlZ2FjeVRMUz4gdXNlZExlZ2FjeVRMUygpIGNvbnN0IHsg cmV0dXJuIG1fdXNlZExlZ2FjeVRMUzsgfQogCiAgICAgdXNpbmcgQ2FjaGVkRnJhbWVCYXNlOjpk b2N1bWVudDsKICAgICB1c2luZyBDYWNoZWRGcmFtZUJhc2U6OnZpZXc7CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRW1wdHlGcmFtZUxvYWRlckNsaWVudC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUZyYW1lTG9hZGVyQ2xpZW50LmgJKHJldmlzaW9uIDI1 NjA0MikKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUZyYW1lTG9hZGVyQ2xpZW50LmgJ KHdvcmtpbmcgY29weSkKQEAgLTg5LDcgKzg5LDcgQEAgY2xhc3MgV0VCQ09SRV9FWFBPUlQgRW1w dHlGcmFtZUxvYWRlckNsaQogICAgIHZvaWQgZGlzcGF0Y2hXaWxsQ2xvc2UoKSBmaW5hbCB7IH0K ICAgICB2b2lkIGRpc3BhdGNoRGlkU3RhcnRQcm92aXNpb25hbExvYWQoKSBmaW5hbCB7IH0KICAg ICB2b2lkIGRpc3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFN0cmluZ1dpdGhEaXJlY3Rpb24m KSBmaW5hbCB7IH0KLSAgICB2b2lkIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChPcHRpb25hbDxIYXNJ bnNlY3VyZUNvbnRlbnQ+KSBmaW5hbCB7IH0KKyAgICB2b2lkIGRpc3BhdGNoRGlkQ29tbWl0TG9h ZChPcHRpb25hbDxIYXNJbnNlY3VyZUNvbnRlbnQ+LCBPcHRpb25hbDxVc2VkTGVnYWN5VExTPikg ZmluYWwgeyB9CiAgICAgdm9pZCBkaXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQoY29uc3Qg UmVzb3VyY2VFcnJvciYsIFdpbGxDb250aW51ZUxvYWRpbmcpIGZpbmFsIHsgfQogICAgIHZvaWQg ZGlzcGF0Y2hEaWRGYWlsTG9hZChjb25zdCBSZXNvdXJjZUVycm9yJikgZmluYWwgeyB9CiAgICAg dm9pZCBkaXNwYXRjaERpZEZpbmlzaERvY3VtZW50TG9hZCgpIGZpbmFsIHsgfQpJbmRleDogU291 cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCShyZXZpc2lvbiAyNTYwNDIpCisrKyBTb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MDUs NyArNzA1LDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6Y2xlYXIoRG9jdW1lbnQqIG5ld0RvYwogCiB2 b2lkIEZyYW1lTG9hZGVyOjpyZWNlaXZlZEZpcnN0RGF0YSgpCiB7Ci0gICAgZGlzcGF0Y2hEaWRD b21taXRMb2FkKFdURjo6bnVsbG9wdCk7CisgICAgZGlzcGF0Y2hEaWRDb21taXRMb2FkKFdURjo6 bnVsbG9wdCwgV1RGOjpudWxsb3B0KTsKICAgICBkaXNwYXRjaERpZENsZWFyV2luZG93T2JqZWN0 c0luQWxsV29ybGRzKCk7CiAgICAgZGlzcGF0Y2hHbG9iYWxPYmplY3RBdmFpbGFibGVJbkFsbFdv cmxkcygpOwogCkBAIC0yMDcyLDggKzIwNzIsOSBAQCB2b2lkIEZyYW1lTG9hZGVyOjpjb21taXRQ cm92aXNpb25hbExvYWQoCiAgICAgICAgIG5vdGlmaWVyKCkuZGlzcGF0Y2hEaWRSZWNlaXZlUmVz cG9uc2UoY2FjaGVkUGFnZS0+ZG9jdW1lbnRMb2FkZXIoKSwgbWFpblJlc291cmNlSWRlbnRpZmll ciwgY2FjaGVkUGFnZS0+ZG9jdW1lbnRMb2FkZXIoKS0+cmVzcG9uc2UoKSk7CiAKICAgICAgICAg T3B0aW9uYWw8SGFzSW5zZWN1cmVDb250ZW50PiBoYXNJbnNlY3VyZUNvbnRlbnQgPSBjYWNoZWRQ YWdlLT5jYWNoZWRNYWluRnJhbWUoKS0+aGFzSW5zZWN1cmVDb250ZW50KCk7CisgICAgICAgIE9w dGlvbmFsPFVzZWRMZWdhY3lUTFM+IHVzZWRMZWdhY3lUTFMgPSBjYWNoZWRQYWdlLT5jYWNoZWRN YWluRnJhbWUoKS0+dXNlZExlZ2FjeVRMUygpOwogCi0gICAgICAgIGRpc3BhdGNoRGlkQ29tbWl0 TG9hZChoYXNJbnNlY3VyZUNvbnRlbnQpOworICAgICAgICBkaXNwYXRjaERpZENvbW1pdExvYWQo aGFzSW5zZWN1cmVDb250ZW50LCB1c2VkTGVnYWN5VExTKTsKIAogICAgICAgICAvLyBGSVhNRTog VGhpcyBBUEkgc2hvdWxkIGJlIHR1cm5lZCBhcm91bmQgc28gdGhhdCB3ZSBncm91bmQgQ2FjaGVk UGFnZSBpbnRvIHRoZSBQYWdlLgogICAgICAgICBjYWNoZWRQYWdlLT5yZXN0b3JlKCptX2ZyYW1l LnBhZ2UoKSk7CkBAIC00MDA3LDEyICs0MDA4LDEyIEBAIHZvaWQgRnJhbWVMb2FkZXI6OmRpZENo YW5nZVRpdGxlKERvY3VtZW4KICNlbmRpZgogfQogCi12b2lkIEZyYW1lTG9hZGVyOjpkaXNwYXRj aERpZENvbW1pdExvYWQoT3B0aW9uYWw8SGFzSW5zZWN1cmVDb250ZW50PiBpbml0aWFsSGFzSW5z ZWN1cmVDb250ZW50KQordm9pZCBGcmFtZUxvYWRlcjo6ZGlzcGF0Y2hEaWRDb21taXRMb2FkKE9w dGlvbmFsPEhhc0luc2VjdXJlQ29udGVudD4gaW5pdGlhbEhhc0luc2VjdXJlQ29udGVudCwgT3B0 aW9uYWw8VXNlZExlZ2FjeVRMUz4gaW5pdGlhbFVzZWRMZWdhY3lUTFMpCiB7CiAgICAgaWYgKG1f c3RhdGVNYWNoaW5lLmNyZWF0aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQoKSkKICAgICAgICAgcmV0 dXJuOwogCi0gICAgbV9jbGllbnQuZGlzcGF0Y2hEaWRDb21taXRMb2FkKGluaXRpYWxIYXNJbnNl Y3VyZUNvbnRlbnQpOworICAgIG1fY2xpZW50LmRpc3BhdGNoRGlkQ29tbWl0TG9hZChpbml0aWFs SGFzSW5zZWN1cmVDb250ZW50LCBpbml0aWFsVXNlZExlZ2FjeVRMUyk7CiAKICAgICBpZiAobV9m cmFtZS5pc01haW5GcmFtZSgpKSB7CiAgICAgICAgIG1fZnJhbWUucGFnZSgpLT5yZXNldFNlZW5Q bHVnaW5zKCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAkocmV2aXNpb24g MjU2MDQyKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgJKHdvcmtpbmcg Y29weSkKQEAgLTg3LDYgKzg3LDcgQEAgY2xhc3MgU3Vic3RpdHV0ZURhdGE7CiBlbnVtIGNsYXNz IE5ld0xvYWRJblByb2dyZXNzIDogYm9vbDsKIGVudW0gY2xhc3MgTmF2aWdhdGlvblBvbGljeURl Y2lzaW9uIDogdWludDhfdDsKIGVudW0gY2xhc3MgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2Fk IDogYm9vbDsKK2VudW0gY2xhc3MgVXNlZExlZ2FjeVRMUyA6IGJvb2w7CiAKIHN0cnVjdCBXaW5k b3dGZWF0dXJlczsKIApAQCAtMzc3LDcgKzM3OCw3IEBAIHByaXZhdGU6CiAKICAgICBib29sIHNo b3VsZFJlbG9hZFRvSGFuZGxlVW5yZWFjaGFibGVVUkwoRG9jdW1lbnRMb2FkZXImKTsKIAotICAg IHZvaWQgZGlzcGF0Y2hEaWRDb21taXRMb2FkKE9wdGlvbmFsPEhhc0luc2VjdXJlQ29udGVudD4g aW5pdGlhbEhhc0luc2VjdXJlQ29udGVudCk7CisgICAgdm9pZCBkaXNwYXRjaERpZENvbW1pdExv YWQoT3B0aW9uYWw8SGFzSW5zZWN1cmVDb250ZW50PiBpbml0aWFsSGFzSW5zZWN1cmVDb250ZW50 LCBPcHRpb25hbDxVc2VkTGVnYWN5VExTPiBpbml0aWFsVXNlZExlZ2FjeVRMUyk7CiAKICAgICB2 b2lkIHVybFNlbGVjdGVkKEZyYW1lTG9hZFJlcXVlc3QmJiwgRXZlbnQqLCBPcHRpb25hbDxBZENs aWNrQXR0cmlidXRpb24+JiYgPSBXVEY6Om51bGxvcHQpOwogCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaAkocmV2aXNpb24gMjU2MDQyKQorKysgU291cmNl L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTEw Miw2ICsxMDIsNyBAQCBjbGFzcyBXaWRnZXQ7CiAKIGVudW0gY2xhc3MgTG9ja0JhY2tGb3J3YXJk TGlzdCA6IGJvb2w7CiBlbnVtIGNsYXNzIFBvbGljeURlY2lzaW9uTW9kZTsKK2VudW0gY2xhc3Mg VXNlZExlZ2FjeVRMUyA6IGJvb2w7CiAKIHN0cnVjdCBTdHJpbmdXaXRoRGlyZWN0aW9uOwogCkBA IC0xNzMsNyArMTc0LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZFJl Y2VpdmVJY29uKCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkU3RhcnRQcm92aXNp b25hbExvYWQoKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkUmVjZWl2ZVRpdGxl KGNvbnN0IFN0cmluZ1dpdGhEaXJlY3Rpb24mKSA9IDA7Ci0gICAgdmlydHVhbCB2b2lkIGRpc3Bh dGNoRGlkQ29tbWl0TG9hZChPcHRpb25hbDxIYXNJbnNlY3VyZUNvbnRlbnQ+KSA9IDA7CisgICAg dmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChPcHRpb25hbDxIYXNJbnNlY3VyZUNv bnRlbnQ+LCBPcHRpb25hbDxVc2VkTGVnYWN5VExTPikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBk aXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQoY29uc3QgUmVzb3VyY2VFcnJvciYsIFdpbGxD b250aW51ZUxvYWRpbmcpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRGYWlsTG9h ZChjb25zdCBSZXNvdXJjZUVycm9yJikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERp ZEZpbmlzaERvY3VtZW50TG9hZCgpID0gMDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTYwNDIp CisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIw IEBACisyMDIwLTAyLTA3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQGFwcGxlLmNv bT4KKworICAgICAgICBSZW1lbWJlciBpZiB3ZSB1c2VkIGxlZ2FjeSBUTFMgaW4gdGhlIGJhY2sv Zm9yd2FyZCBjYWNoZSBsaWtlIHdlIHJlbWVtYmVyIGlmIHdlIGhhdmUgb25seSBzZWN1cmUgY29u dGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA3 NDA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdC9tZXNzYWdlcy5weToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpoYXNJbnNlY3VyZUNvbnRl bnQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVBy b2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRDb21taXRMb2FkKToKKyAgICAgICAgKFdl YktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OnNhdmVQbGF0Zm9ybURhdGFUb0NhY2hlZEZyYW1l KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xp ZW50Lmg6CisKIDIwMjAtMDItMDcgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBs ZS5jb20+CiAKICAgICAgICAgVXBkYXRlIFdlYlZpZXcgY2F0ZWdvcnkgbmFtZSB0byBiZSBtb3Jl IGFjY3VyYXRlCkluZGV4OiBTb3VyY2UvV2ViS2l0L1NjcmlwdHMvd2Via2l0L21lc3NhZ2VzLnB5 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvU2NyaXB0cy93ZWJraXQvbWVzc2FnZXMucHkJ KHJldmlzaW9uIDI1NjA0MikKKysrIFNvdXJjZS9XZWJLaXQvU2NyaXB0cy93ZWJraXQvbWVzc2Fn ZXMucHkJKHdvcmtpbmcgY29weSkKQEAgLTYwMiw2ICs2MDIsNyBAQCBkZWYgaGVhZGVyc19mb3Jf dHlwZSh0eXBlKToKICAgICAgICAgJ1dlYkNvcmU6OlRleHRJbmRpY2F0b3JEYXRhJzogWyc8V2Vi Q29yZS9UZXh0SW5kaWNhdG9yLmg+J10sCiAgICAgICAgICdXZWJDb3JlOjpUaGlyZFBhcnR5Q29v a2llQmxvY2tpbmdNb2RlJzogWyc8V2ViQ29yZS9OZXR3b3JrU3RvcmFnZVNlc3Npb24uaD4nXSwK ICAgICAgICAgJ1dlYkNvcmU6OkZpcnN0UGFydHlXZWJzaXRlRGF0YVJlbW92YWxNb2RlJzogWyc8 V2ViQ29yZS9OZXR3b3JrU3RvcmFnZVNlc3Npb24uaD4nXSwKKyAgICAgICAgJ1dlYkNvcmU6OlVz ZWRMZWdhY3lUTFMnOiBbJzxXZWJDb3JlL1Jlc291cmNlUmVzcG9uc2VCYXNlLmg+J10sCiAgICAg ICAgICdXZWJDb3JlOjpWaWV3cG9ydEF0dHJpYnV0ZXMnOiBbJzxXZWJDb3JlL1ZpZXdwb3J0QXJn dW1lbnRzLmg+J10sCiAgICAgICAgICdXZWJDb3JlOjpXaWxsQ29udGludWVMb2FkaW5nJzogWyc8 V2ViQ29yZS9GcmFtZUxvYWRlclR5cGVzLmg+J10sCiAgICAgICAgICdXZWJDb3JlOjpTZWxlY3Rp b25SZWN0JzogWyciRWRpdG9yU3RhdGUuaCInXSwKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gMjU2MDQyKQorKysgU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDIyNCw5ICs0MjI0 LDEyIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzZXROZXR3b3JrUmVxdWVzdHNJblAKICAgICBtX3Bh Z2VMb2FkU3RhdGUuc2V0TmV0d29ya1JlcXVlc3RzSW5Qcm9ncmVzcyh0cmFuc2FjdGlvbiwgbmV0 d29ya1JlcXVlc3RzSW5Qcm9ncmVzcyk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpoYXNJbnNl Y3VyZUNvbnRlbnQoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChXZWJDb3JlOjpIYXNJbnNlY3VyZUNv bnRlbnQpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQordm9pZCBXZWJQYWdlUHJveHk6Omhhc0luc2Vj dXJlQ29udGVudChDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFdlYkNvcmU6Okhhc0luc2VjdXJlQ29u dGVudCwgV2ViQ29yZTo6VXNlZExlZ2FjeVRMUyk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0g ICAgY29tcGxldGlvbkhhbmRsZXIobV9wYWdlTG9hZFN0YXRlLmNvbW1pdHRlZEhhc0luc2VjdXJl Q29udGVudCgpID8gSGFzSW5zZWN1cmVDb250ZW50OjpZZXMgOiBIYXNJbnNlY3VyZUNvbnRlbnQ6 Ok5vKTsKKyAgICBjb21wbGV0aW9uSGFuZGxlcigKKyAgICAgICAgbV9wYWdlTG9hZFN0YXRlLmNv bW1pdHRlZEhhc0luc2VjdXJlQ29udGVudCgpID8gSGFzSW5zZWN1cmVDb250ZW50OjpZZXMgOiBI YXNJbnNlY3VyZUNvbnRlbnQ6Ok5vLAorICAgICAgICBtX3BhZ2VMb2FkU3RhdGUuaGFzTmVnb3Rp YXRlZExlZ2FjeVRMUygpID8gVXNlZExlZ2FjeVRMUzo6WWVzIDogVXNlZExlZ2FjeVRMUzo6Tm8K KyAgICApOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRGVzdHJveU5hdmlnYXRpb24odWlu dDY0X3QgbmF2aWdhdGlvbklEKQpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmgJKHJldmlzaW9uIDI1NjA0MikKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNzYwLDcgKzE3NjAsNyBAQCBwcml2YXRlOgog ICAgIHZvaWQgZGlkRmluaXNoUHJvZ3Jlc3MoKTsKICAgICB2b2lkIHNldE5ldHdvcmtSZXF1ZXN0 c0luUHJvZ3Jlc3MoYm9vbCk7CiAKLSAgICB2b2lkIGhhc0luc2VjdXJlQ29udGVudChDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudCk+JiYpOworICAgIHZv aWQgaGFzSW5zZWN1cmVDb250ZW50KENvbXBsZXRpb25IYW5kbGVyPHZvaWQoV2ViQ29yZTo6SGFz SW5zZWN1cmVDb250ZW50LCBXZWJDb3JlOjpVc2VkTGVnYWN5VExTKT4mJik7CiAKICAgICB2b2lk IGRpZERlc3Ryb3lOYXZpZ2F0aW9uKHVpbnQ2NF90IG5hdmlnYXRpb25JRCk7CiAKSW5kZXg6IFNv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4JKHJl dmlzaW9uIDI1NjA0MikKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5t ZXNzYWdlcy5pbgkod29ya2luZyBjb3B5KQpAQCAtMTQyLDcgKzE0Miw3IEBAIG1lc3NhZ2VzIC0+ IFdlYlBhZ2VQcm94eSB7CiAgICAgRGlkRXhwbGljaXRPcGVuRm9yRnJhbWUoV2ViQ29yZTo6RnJh bWVJZGVudGlmaWVyIGZyYW1lSUQsIFVSTCB1cmwsIFN0cmluZyBtaW1lVHlwZSkKICAgICBEaWRE ZXN0cm95TmF2aWdhdGlvbih1aW50NjRfdCBuYXZpZ2F0aW9uSUQpCiAKLSAgICBIYXNJbnNlY3Vy ZUNvbnRlbnQoKSAtPiAoZW51bTpib29sIFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudCBoYXNJ bnNlY3VyZUNvbnRlbnQpIFN5bmNocm9ub3VzCisgICAgSGFzSW5zZWN1cmVDb250ZW50KCkgLT4g KGVudW06Ym9vbCBXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQgaGFzSW5zZWN1cmVDb250ZW50 LCBlbnVtOmJvb2wgV2ViQ29yZTo6VXNlZExlZ2FjeVRMUyB1c2VkTGVnYWN5VExTKSBTeW5jaHJv bm91cwogCiAgICAgTWFpbkZyYW1lUGx1Z2luSGFuZGxlc1BhZ2VTY2FsZUdlc3R1cmVEaWRDaGFu Z2UoYm9vbCBtYWluRnJhbWVQbHVnaW5IYW5kbGVzUGFnZVNjYWxlR2VzdHVyZSkKIApJbmRleDog U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xp ZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1 cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCShyZXZpc2lvbiAyNTYwNDIpCisrKyBTb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NDUsNyArNTQ1LDcgQEAgdm9pZCBXZWJGcmFtZUxvYWRl ckNsaWVudDo6ZGlzcGF0Y2hEaWRSZQogICAgIHdlYlBhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2VQcm94eTo6RGlkUmVjZWl2ZVRpdGxlRm9yRnJhbWUobV9mcmFtZS0+ZnJhbWVJRCgpLCB0cnVu Y2F0ZWRUaXRsZS5zdHJpbmcsIFVzZXJEYXRhKFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnRyYW5z Zm9ybU9iamVjdHNUb0hhbmRsZXModXNlckRhdGEuZ2V0KCkpLmdldCgpKSkpOwogfQogCi12b2lk IFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZENvbW1pdExvYWQoT3B0aW9uYWw8SGFz SW5zZWN1cmVDb250ZW50PiBoYXNJbnNlY3VyZUNvbnRlbnQpCit2b2lkIFdlYkZyYW1lTG9hZGVy Q2xpZW50OjpkaXNwYXRjaERpZENvbW1pdExvYWQoT3B0aW9uYWw8SGFzSW5zZWN1cmVDb250ZW50 PiBoYXNJbnNlY3VyZUNvbnRlbnQsIE9wdGlvbmFsPFVzZWRMZWdhY3lUTFM+IHVzZWRMZWdhY3lU TFNGcm9tUGFnZUNhY2hlKQogewogICAgIFdlYlBhZ2UqIHdlYlBhZ2UgPSBtX2ZyYW1lLT5wYWdl KCk7CiAgICAgaWYgKCF3ZWJQYWdlKQpAQCAtNTU5LDggKzU1OSwxMiBAQCB2b2lkIFdlYkZyYW1l TG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZENvCiAKICAgICB3ZWJQYWdlLT5zYW5kYm94RXh0ZW5z aW9uVHJhY2tlcigpLmRpZENvbW1pdFByb3Zpc2lvbmFsTG9hZChtX2ZyYW1lKTsKIAorICAgIGJv b2wgdXNlZExlZ2FjeVRMUyA9IGRvY3VtZW50TG9hZGVyLnJlc3BvbnNlKCkudXNlZExlZ2FjeVRM UygpOworICAgIGlmICghdXNlZExlZ2FjeVRMUyAmJiB1c2VkTGVnYWN5VExTRnJvbVBhZ2VDYWNo ZSkKKyAgICAgICAgdXNlZExlZ2FjeVRMUyA9IHVzZWRMZWdhY3lUTFNGcm9tUGFnZUNhY2hlID09 IFVzZWRMZWdhY3lUTFM6OlllczsKKyAgICAKICAgICAvLyBOb3RpZnkgdGhlIFVJUHJvY2Vzcy4K LSAgICB3ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENvbW1pdExvYWRG b3JGcmFtZShtX2ZyYW1lLT5mcmFtZUlEKCksIGRvY3VtZW50TG9hZGVyLm5hdmlnYXRpb25JRCgp LCBkb2N1bWVudExvYWRlci5yZXNwb25zZSgpLm1pbWVUeXBlKCksIG1fZnJhbWVIYXNDdXN0b21D b250ZW50UHJvdmlkZXIsIHN0YXRpY19jYXN0PHVpbnQzMl90PihtX2ZyYW1lLT5jb3JlRnJhbWUo KS0+bG9hZGVyKCkubG9hZFR5cGUoKSksIHZhbHVlT3JDb21wdXRlKGRvY3VtZW50TG9hZGVyLnJl c3BvbnNlKCkuY2VydGlmaWNhdGVJbmZvKCksIFtdIHsgcmV0dXJuIENlcnRpZmljYXRlSW5mbygp OyB9KSwgZG9jdW1lbnRMb2FkZXIucmVzcG9uc2UoKS51c2VkTGVnYWN5VExTKCksIG1fZnJhbWUt PmNvcmVGcmFtZSgpLT5kb2N1bWVudCgpLT5pc1BsdWdpbkRvY3VtZW50KCksIGhhc0luc2VjdXJl Q29udGVudCwgVXNlckRhdGEoV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkudHJhbnNmb3JtT2JqZWN0 c1RvSGFuZGxlcyh1c2VyRGF0YS5nZXQoKSkuZ2V0KCkpKSk7CisgICAgd2ViUGFnZS0+c2VuZChN ZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDb21taXRMb2FkRm9yRnJhbWUobV9mcmFtZS0+ZnJh bWVJRCgpLCBkb2N1bWVudExvYWRlci5uYXZpZ2F0aW9uSUQoKSwgZG9jdW1lbnRMb2FkZXIucmVz cG9uc2UoKS5taW1lVHlwZSgpLCBtX2ZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCBzdGF0 aWNfY2FzdDx1aW50MzJfdD4obV9mcmFtZS0+Y29yZUZyYW1lKCktPmxvYWRlcigpLmxvYWRUeXBl KCkpLCB2YWx1ZU9yQ29tcHV0ZShkb2N1bWVudExvYWRlci5yZXNwb25zZSgpLmNlcnRpZmljYXRl SW5mbygpLCBbXSB7IHJldHVybiBDZXJ0aWZpY2F0ZUluZm8oKTsgfSksIHVzZWRMZWdhY3lUTFMs IG1fZnJhbWUtPmNvcmVGcmFtZSgpLT5kb2N1bWVudCgpLT5pc1BsdWdpbkRvY3VtZW50KCksIGhh c0luc2VjdXJlQ29udGVudCwgVXNlckRhdGEoV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkudHJhbnNm b3JtT2JqZWN0c1RvSGFuZGxlcyh1c2VyRGF0YS5nZXQoKSkuZ2V0KCkpKSk7CiAgICAgd2ViUGFn ZS0+ZGlkQ29tbWl0TG9hZChtX2ZyYW1lKTsKIH0KIApAQCAtMTQ2Nyw4ICsxNDcxLDkgQEAgdm9p ZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6c2F2ZVBsYXRmb3JtRAogICAgICAgICByZXR1cm47CiAK ICAgICBIYXNJbnNlY3VyZUNvbnRlbnQgaGFzSW5zZWN1cmVDb250ZW50OwotICAgIGlmICh3ZWJQ YWdlLT5zZW5kU3luYyhNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpIYXNJbnNlY3VyZUNvbnRlbnQo KSwgTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6SGFzSW5zZWN1cmVDb250ZW50OjpSZXBseShoYXNJ bnNlY3VyZUNvbnRlbnQpKSkKLSAgICAgICAgY2FjaGVkRnJhbWUtPnNldEhhc0luc2VjdXJlQ29u dGVudChoYXNJbnNlY3VyZUNvbnRlbnQpOworICAgIFVzZWRMZWdhY3lUTFMgdXNlZExlZ2FjeVRM UzsKKyAgICBpZiAod2ViUGFnZS0+c2VuZFN5bmMoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6SGFz SW5zZWN1cmVDb250ZW50KCksIE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Okhhc0luc2VjdXJlQ29u dGVudDo6UmVwbHkoaGFzSW5zZWN1cmVDb250ZW50LCB1c2VkTGVnYWN5VExTKSkpCisgICAgICAg IGNhY2hlZEZyYW1lLT5zZXRIYXNJbnNlY3VyZUNvbnRlbnQoaGFzSW5zZWN1cmVDb250ZW50LCB1 c2VkTGVnYWN5VExTKTsKIH0KIAogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6dHJhbnNpdGlv blRvQ29tbWl0dGVkRnJvbUNhY2hlZEZyYW1lKENhY2hlZEZyYW1lKikKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJG cmFtZUxvYWRlckNsaWVudC5oCShyZXZpc2lvbiAyNTYwNDIpCisrKyBTb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaAkod29ya2luZyBj b3B5KQpAQCAtMTE0LDcgKzExNCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaXNwYXRjaFdpbGxD bG9zZSgpIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCgp IGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZlVGl0bGUoY29uc3QgV2ViQ29yZTo6 U3RyaW5nV2l0aERpcmVjdGlvbiYpIGZpbmFsOwotICAgIHZvaWQgZGlzcGF0Y2hEaWRDb21taXRM b2FkKE9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4pIGZpbmFsOworICAgIHZv aWQgZGlzcGF0Y2hEaWRDb21taXRMb2FkKE9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29u dGVudD4sIE9wdGlvbmFsPFdlYkNvcmU6OlVzZWRMZWdhY3lUTFM+KSBmaW5hbDsKICAgICB2b2lk IGRpc3BhdGNoRGlkRmFpbFByb3Zpc2lvbmFsTG9hZChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVy cm9yJiwgV2ViQ29yZTo6V2lsbENvbnRpbnVlTG9hZGluZykgZmluYWw7CiAgICAgdm9pZCBkaXNw YXRjaERpZEZhaWxMb2FkKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImKSBmaW5hbDsKICAg ICB2b2lkIGRpc3BhdGNoRGlkRmluaXNoRG9jdW1lbnRMb2FkKCkgZmluYWw7CkluZGV4OiBTb3Vy Y2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dExlZ2FjeS9tYWMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTYwNDIpCisrKyBTb3VyY2UvV2ViS2l0 TGVnYWN5L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAy MC0wMi0wNyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkBhcHBsZS5jb20+CisKKyAg ICAgICAgUmVtZW1iZXIgaWYgd2UgdXNlZCBsZWdhY3kgVExTIGluIHRoZSBiYWNrL2ZvcndhcmQg Y2FjaGUgbGlrZSB3ZSByZW1lbWJlciBpZiB3ZSBoYXZlIG9ubHkgc2VjdXJlIGNvbnRlbnQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNzQwOQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1 cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaDoKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9X ZWJGcmFtZUxvYWRlckNsaWVudC5tbToKKyAgICAgICAgKFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojpk aXNwYXRjaERpZENvbW1pdExvYWQpOgorCiAyMDIwLTAyLTA2ICBCcmVudCBGdWxnaGFtICA8YmZ1 bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFByZXZlbnQgbmF2aWdhdGluZyB0b3AgbGV2ZWwg ZnJhbWVzIHRvIERhdGEgVVJMcwpJbmRleDogU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29y ZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0TGVnYWN5L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCShyZXZp c2lvbiAyNTYwNDIpCisrKyBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3JlU3VwcG9ydC9X ZWJGcmFtZUxvYWRlckNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTUsNyArMTE1LDcgQEAg cHJpdmF0ZToKICAgICB2b2lkIGRpc3BhdGNoV2lsbENsb3NlKCkgZmluYWw7CiAgICAgdm9pZCBk aXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKCkgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRj aERpZFJlY2VpdmVUaXRsZShjb25zdCBXZWJDb3JlOjpTdHJpbmdXaXRoRGlyZWN0aW9uJikgZmlu YWw7Ci0gICAgdm9pZCBkaXNwYXRjaERpZENvbW1pdExvYWQoT3B0aW9uYWw8V2ViQ29yZTo6SGFz SW5zZWN1cmVDb250ZW50PikgZmluYWw7CisgICAgdm9pZCBkaXNwYXRjaERpZENvbW1pdExvYWQo T3B0aW9uYWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50PiwgT3B0aW9uYWw8V2ViQ29yZTo6 VXNlZExlZ2FjeVRMUz4pIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hEaWRGYWlsUHJvdmlzaW9u YWxMb2FkKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImLCBXZWJDb3JlOjpXaWxsQ29udGlu dWVMb2FkaW5nKSBmaW5hbDsKICAgICB2b2lkIGRpc3BhdGNoRGlkRmFpbExvYWQoY29uc3QgV2Vi Q29yZTo6UmVzb3VyY2VFcnJvciYpIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hEaWRGaW5pc2hE b2N1bWVudExvYWQoKSBmaW5hbDsKSW5kZXg6IFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYkNv cmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXRMZWdhY3kvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCShy ZXZpc2lvbiAyNTYwNDIpCisrKyBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3JlU3VwcG9y dC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQkod29ya2luZyBjb3B5KQpAQCAtNjk4LDcgKzY5OCw3 IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkUmUKICAgICB9CiB9CiAK LXZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkQ29tbWl0TG9hZChPcHRpb25h bDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+KQordm9pZCBXZWJGcmFtZUxvYWRlckNsaWVu dDo6ZGlzcGF0Y2hEaWRDb21taXRMb2FkKE9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29u dGVudD4sIE9wdGlvbmFsPFdlYkNvcmU6OlVzZWRMZWdhY3lUTFM+KQogewogICAgIC8vIFRlbGwg dGhlIGNsaWVudCB3ZSd2ZSBjb21taXR0ZWQgdGhpcyBVUkwuCiAgICAgQVNTRVJUKFttX3dlYkZy YW1lLT5fcHJpdmF0ZS0+d2ViRnJhbWVWaWV3IGRvY3VtZW50Vmlld10gIT0gbmlsKTsKSW5kZXg6 IFNvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1NjA0MikKKysrIFNvdXJjZS9X ZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBA CisyMDIwLTAyLTA3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQGFwcGxlLmNvbT4K KworICAgICAgICBSZW1lbWJlciBpZiB3ZSB1c2VkIGxlZ2FjeSBUTFMgaW4gdGhlIGJhY2svZm9y d2FyZCBjYWNoZSBsaWtlIHdlIHJlbWVtYmVyIGlmIHdlIGhhdmUgb25seSBzZWN1cmUgY29udGVu dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA3NDA5 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJD b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJGcmFtZUxv YWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRDb21taXRMb2FkKToKKyAgICAgICAgKiBXZWJDb3JlU3Vw cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oOgorCiAyMDIwLTAyLTA2ICBCcmVudCBGdWxnaGFt ICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFByZXZlbnQgbmF2aWdhdGluZyB0b3Ag bGV2ZWwgZnJhbWVzIHRvIERhdGEgVVJMcwpJbmRleDogU291cmNlL1dlYktpdExlZ2FjeS93aW4v V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50 LmNwcAkocmV2aXNpb24gMjU2MDQyKQorKysgU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViQ29y ZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Mzgs NyArNDM4LDcgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRSZQogICAg ICAgICBmcmFtZUxvYWREZWxlZ2F0ZS0+ZGlkUmVjZWl2ZVRpdGxlKHdlYlZpZXcsIEJTdHJpbmco dGl0bGUuc3RyaW5nKSwgbV93ZWJGcmFtZSk7CiB9CiAKLXZvaWQgV2ViRnJhbWVMb2FkZXJDbGll bnQ6OmRpc3BhdGNoRGlkQ29tbWl0TG9hZChPcHRpb25hbDxIYXNJbnNlY3VyZUNvbnRlbnQ+KQor dm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRDb21taXRMb2FkKE9wdGlvbmFs PEhhc0luc2VjdXJlQ29udGVudD4sIE9wdGlvbmFsPFVzZWRMZWdhY3lUTFM+KQogewogICAgIFdl YlZpZXcqIHdlYlZpZXcgPSBtX3dlYkZyYW1lLT53ZWJWaWV3KCk7CiAgICAgQ09NUHRyPElXZWJG cmFtZUxvYWREZWxlZ2F0ZT4gZnJhbWVMb2FkRGVsZWdhdGU7CkluZGV4OiBTb3VyY2UvV2ViS2l0 TGVnYWN5L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9h ZGVyQ2xpZW50LmgJKHJldmlzaW9uIDI1NjA0MikKKysrIFNvdXJjZS9XZWJLaXRMZWdhY3kvd2lu L1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAg LTkyLDcgKzkyLDcgQEAgcHVibGljOgogICAgIHZvaWQgZGlzcGF0Y2hXaWxsQ2xvc2UoKSBvdmVy cmlkZTsKICAgICB2b2lkIGRpc3BhdGNoRGlkU3RhcnRQcm92aXNpb25hbExvYWQoKSBvdmVycmlk ZTsKICAgICB2b2lkIGRpc3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFdlYkNvcmU6OlN0cmlu Z1dpdGhEaXJlY3Rpb24mKSBvdmVycmlkZTsKLSAgICB2b2lkIGRpc3BhdGNoRGlkQ29tbWl0TG9h ZChPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+KSBvdmVycmlkZTsKKyAgICB2 b2lkIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNv bnRlbnQ+LCBPcHRpb25hbDxXZWJDb3JlOjpVc2VkTGVnYWN5VExTPikgb3ZlcnJpZGU7CiAgICAg dm9pZCBkaXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQoY29uc3QgV2ViQ29yZTo6UmVzb3Vy Y2VFcnJvciYsIFdlYkNvcmU6OldpbGxDb250aW51ZUxvYWRpbmcpIG92ZXJyaWRlOwogICAgIHZv aWQgZGlzcGF0Y2hEaWRGYWlsTG9hZChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJikgb3Zl cnJpZGU7CiAgICAgdm9pZCBkaXNwYXRjaERpZEZpbmlzaERvY3VtZW50TG9hZCgpIG92ZXJyaWRl OwpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwko cmV2aXNpb24gMjU2MDYzKQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMTMgQEAKKzIwMjAtMDItMDcgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5A YXBwbGUuY29tPgorCisgICAgICAgIFJlbWVtYmVyIGlmIHdlIHVzZWQgbGVnYWN5IFRMUyBpbiB0 aGUgYmFjay9mb3J3YXJkIGNhY2hlIGxpa2Ugd2UgcmVtZW1iZXIgaWYgd2UgaGF2ZSBvbmx5IHNl Y3VyZSBjb250ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMDc0MDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVExTRGVwcmVjYXRpb24ubW06 CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKwogMjAyMC0wMi0wNyAgSmlld2VuIFRh biAgPGppZXdlbl90YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJBdXRobl0gUmVwb3J0IENU QVAgQ2xpZW50IFBpbiBFcnJvciB0byBjbGllbnRzCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL1RMU0RlcHJlY2F0aW9uLm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVExTRGVwcmVjYXRpb24ubW0JKHJldmlz aW9uIDI1NjA0MikKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVExT RGVwcmVjYXRpb24ubW0JKHdvcmtpbmcgY29weSkKQEAgLTMxMiw3ICszMTIsOCBAQCBURVNUKFRM U1ZlcnNpb24sIFN1YnJlc291cmNlKQogICAgIH0sIEhUVFBTZXJ2ZXI6OlByb3RvY29sOjpIdHRw c1dpdGhMZWdhY3lUTFMpOwogCiAgICAgSFRUUFNlcnZlciBtb2Rlcm5UTFNTZXJ2ZXIoewotICAg ICAgICB7ICIvIiwgeyBtYWtlU3RyaW5nKCI8c2NyaXB0PmZldGNoKCdodHRwczovLzEyNy4wLjAu MToiLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4obGVnYWN5VExTU2VydmVyLnBvcnQoKSksICIvJyx7 bW9kZTonbm8tY29ycyd9KTwvc2NyaXB0PiIpIH0gfQorICAgICAgICB7ICIvIiwgeyBtYWtlU3Ry aW5nKCI8c2NyaXB0PmZldGNoKCdodHRwczovLzEyNy4wLjAuMToiLCBzdGF0aWNfY2FzdDx1bnNp Z25lZD4obGVnYWN5VExTU2VydmVyLnBvcnQoKSksICIvJyx7bW9kZTonbm8tY29ycyd9KTwvc2Ny aXB0PiIpIH0gfSwKKyAgICAgICAgeyAiL3BhZ2VXaXRob3V0U3VicmVzb3VyY2UiLCB7ICJoZWxs byIgfX0KICAgICB9LCBIVFRQU2VydmVyOjpQcm90b2NvbDo6SHR0cHMpOwogICAgIAogICAgIGF1 dG8gW3dlYlZpZXcsIGRlbGVnYXRlXSA9IHdlYlZpZXdXaXRoTmF2aWdhdGlvbkRlbGVnYXRlKCk7 CkBAIC0zMjMsNiArMzI0LDE1IEBAIFRFU1QoVExTVmVyc2lvbiwgU3VicmVzb3VyY2UpCiAgICAg W3dlYlZpZXcgbG9hZFJlcXVlc3Q6bW9kZXJuVExTU2VydmVyLnJlcXVlc3QoKV07CiAgICAgd2hp bGUgKCFbd2ViVmlldyBfbmVnb3RpYXRlZExlZ2FjeVRMU10pCiAgICAgICAgIFtvYnNlcnZlciB3 YWl0VW50aWxOZWdvdGlhdGVkTGVnYWN5VExTQ2hhbmdlZF07CisgICAgCisgICAgRVhQRUNUX1RS VUUoW3dlYlZpZXcgX25lZ290aWF0ZWRMZWdhY3lUTFNdKTsKKyAgICBbd2ViVmlldyBsb2FkUmVx dWVzdDpbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOltO U1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiaHR0cHM6Ly8xMjcuMC4wLjE6JWQvcGFnZVdpdGhv dXRTdWJyZXNvdXJjZSIsIG1vZGVyblRMU1NlcnZlci5wb3J0KCldXV1dOworICAgIFtkZWxlZ2F0 ZSB3YWl0Rm9yRGlkRmluaXNoTmF2aWdhdGlvbl07CisgICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3 IF9uZWdvdGlhdGVkTGVnYWN5VExTXSk7CisKKyAgICBbd2ViVmlldyBnb0JhY2tdOworICAgIFtk ZWxlZ2F0ZSB3YWl0Rm9yRGlkRmluaXNoTmF2aWdhdGlvbl07CisgICAgRVhQRUNUX1RSVUUoW3dl YlZpZXcgX25lZ290aWF0ZWRMZWdhY3lUTFNdKTsKIAogICAgIFt3ZWJWaWV3IHJlbW92ZU9ic2Vy dmVyOm9ic2VydmVyLmdldCgpIGZvcktleVBhdGg6QCJfbmVnb3RpYXRlZExlZ2FjeVRMUyJdOwog fQo= 390137 2020-02-07 15:28:35 -0800 2020-02-07 15:28:35 -0800 patch for landing patch_for_landing text/plain 22658 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1NjA0MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDIwLTAyLTA3ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1lbWJlciBp ZiB3ZSB1c2VkIGxlZ2FjeSBUTFMgaW4gdGhlIGJhY2svZm9yd2FyZCBjYWNoZSBsaWtlIHdlIHJl bWVtYmVyIGlmIHdlIGhhdmUgb25seSBzZWN1cmUgY29udGVudAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA3NDA5CisgICAgICAgIHJkYXI6Ly9wcm9i bGVtLzU5Mjc1NjQxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRHVtZXouCisKKyAgICAg ICAgQ292ZXJlZCBieSBhbiBBUEkgdGVzdC4KKworICAgICAgICAqIGhpc3RvcnkvQ2FjaGVkRnJh bWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkRnJhbWU6OnNldEhhc0luc2VjdXJlQ29u dGVudCk6CisgICAgICAgICogaGlzdG9yeS9DYWNoZWRGcmFtZS5oOgorICAgICAgICAoV2ViQ29y ZTo6Q2FjaGVkRnJhbWU6OnVzZWRMZWdhY3lUTFMgY29uc3QpOgorICAgICAgICAqIGxvYWRlci9F bXB0eUZyYW1lTG9hZGVyQ2xpZW50Lmg6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpyZWNlaXZlZEZpcnN0RGF0YSk6Cisg ICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6Y29tbWl0UHJvdmlzaW9uYWxMb2FkKToKKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpkaXNwYXRjaERpZENvbW1pdExvYWQpOgorICAg ICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5oOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRl ckNsaWVudC5oOgorCiAyMDIwLTAyLTA3ICBOaWtvcyBNb3VjaHRhcmlzICA8bm1vdWNodGFyaXNA YXBwbGUuY29tPgogCiAgICAgICAgIFtBcHBsZSBQYXldIFByb3ZpZGUgYSByZWRhY3RlZCBiaWxs aW5nIGNvbnRhY3QgZHVyaW5nIHBheW1lbnQgbWV0aG9kIHNlbGVjdGlvbgpJbmRleDogU291cmNl L1dlYkNvcmUvaGlzdG9yeS9DYWNoZWRGcmFtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvaGlzdG9yeS9DYWNoZWRGcmFtZS5jcHAJKHJldmlzaW9uIDI1NjA0MikKKysrIFNvdXJj ZS9XZWJDb3JlL2hpc3RvcnkvQ2FjaGVkRnJhbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMDIs OSArMzAyLDEwIEBACiAgICAgcmV0dXJuIG1fY2FjaGVkRnJhbWVQbGF0Zm9ybURhdGEuZ2V0KCk7 CiB9CiAKLXZvaWQgQ2FjaGVkRnJhbWU6OnNldEhhc0luc2VjdXJlQ29udGVudChIYXNJbnNlY3Vy ZUNvbnRlbnQgaGFzSW5zZWN1cmVDb250ZW50KQordm9pZCBDYWNoZWRGcmFtZTo6c2V0SGFzSW5z ZWN1cmVDb250ZW50KEhhc0luc2VjdXJlQ29udGVudCBoYXNJbnNlY3VyZUNvbnRlbnQsIFVzZWRM ZWdhY3lUTFMgdXNlZExlZ2FjeVRMUykKIHsKICAgICBtX2hhc0luc2VjdXJlQ29udGVudCA9IGhh c0luc2VjdXJlQ29udGVudDsKKyAgICBtX3VzZWRMZWdhY3lUTFMgPSB1c2VkTGVnYWN5VExTOwog fQogCiBpbnQgQ2FjaGVkRnJhbWU6OmRlc2NlbmRhbnRGcmFtZUNvdW50KCkgY29uc3QKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2hpc3RvcnkvQ2FjaGVkRnJhbWUuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9oaXN0b3J5L0NhY2hlZEZyYW1lLmgJKHJldmlzaW9uIDI1NjA0MikKKysrIFNv dXJjZS9XZWJDb3JlL2hpc3RvcnkvQ2FjaGVkRnJhbWUuaAkod29ya2luZyBjb3B5KQpAQCAtMzks NiArMzksNyBAQAogY2xhc3MgRnJhbWVWaWV3OwogY2xhc3MgTm9kZTsKIGVudW0gY2xhc3MgSGFz SW5zZWN1cmVDb250ZW50IDogYm9vbDsKK2VudW0gY2xhc3MgVXNlZExlZ2FjeVRMUyA6IGJvb2w7 CiAKIGNsYXNzIENhY2hlZEZyYW1lQmFzZSB7CiBwdWJsaWM6CkBAIC02Myw2ICs2NCw3IEBACiAg ICAgc3RkOjp1bmlxdWVfcHRyPENhY2hlZEZyYW1lUGxhdGZvcm1EYXRhPiBtX2NhY2hlZEZyYW1l UGxhdGZvcm1EYXRhOwogICAgIGJvb2wgbV9pc01haW5GcmFtZTsKICAgICBPcHRpb25hbDxIYXNJ bnNlY3VyZUNvbnRlbnQ+IG1faGFzSW5zZWN1cmVDb250ZW50OworICAgIE9wdGlvbmFsPFVzZWRM ZWdhY3lUTFM+IG1fdXNlZExlZ2FjeVRMUzsKIAogICAgIFZlY3RvcjxzdGQ6OnVuaXF1ZV9wdHI8 Q2FjaGVkRnJhbWU+PiBtX2NoaWxkRnJhbWVzOwogfTsKQEAgLTc5LDggKzgxLDkgQEAKICAgICBX RUJDT1JFX0VYUE9SVCB2b2lkIHNldENhY2hlZEZyYW1lUGxhdGZvcm1EYXRhKHN0ZDo6dW5pcXVl X3B0cjxDYWNoZWRGcmFtZVBsYXRmb3JtRGF0YT4pOwogICAgIFdFQkNPUkVfRVhQT1JUIENhY2hl ZEZyYW1lUGxhdGZvcm1EYXRhKiBjYWNoZWRGcmFtZVBsYXRmb3JtRGF0YSgpOwogCi0gICAgV0VC Q09SRV9FWFBPUlQgdm9pZCBzZXRIYXNJbnNlY3VyZUNvbnRlbnQoSGFzSW5zZWN1cmVDb250ZW50 KTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldEhhc0luc2VjdXJlQ29udGVudChIYXNJbnNl Y3VyZUNvbnRlbnQsIFVzZWRMZWdhY3lUTFMpOwogICAgIE9wdGlvbmFsPEhhc0luc2VjdXJlQ29u dGVudD4gaGFzSW5zZWN1cmVDb250ZW50KCkgY29uc3QgeyByZXR1cm4gbV9oYXNJbnNlY3VyZUNv bnRlbnQ7IH0KKyAgICBPcHRpb25hbDxVc2VkTGVnYWN5VExTPiB1c2VkTGVnYWN5VExTKCkgY29u c3QgeyByZXR1cm4gbV91c2VkTGVnYWN5VExTOyB9CiAKICAgICB1c2luZyBDYWNoZWRGcmFtZUJh c2U6OmRvY3VtZW50OwogICAgIHVzaW5nIENhY2hlZEZyYW1lQmFzZTo6dmlldzsKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUZyYW1lTG9hZGVyQ2xpZW50LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5RnJhbWVMb2FkZXJDbGllbnQuaAkocmV2aXNp b24gMjU2MDQyKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5RnJhbWVMb2FkZXJDbGll bnQuaAkod29ya2luZyBjb3B5KQpAQCAtODksNyArODksNyBAQAogICAgIHZvaWQgZGlzcGF0Y2hX aWxsQ2xvc2UoKSBmaW5hbCB7IH0KICAgICB2b2lkIGRpc3BhdGNoRGlkU3RhcnRQcm92aXNpb25h bExvYWQoKSBmaW5hbCB7IH0KICAgICB2b2lkIGRpc3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0 IFN0cmluZ1dpdGhEaXJlY3Rpb24mKSBmaW5hbCB7IH0KLSAgICB2b2lkIGRpc3BhdGNoRGlkQ29t bWl0TG9hZChPcHRpb25hbDxIYXNJbnNlY3VyZUNvbnRlbnQ+KSBmaW5hbCB7IH0KKyAgICB2b2lk IGRpc3BhdGNoRGlkQ29tbWl0TG9hZChPcHRpb25hbDxIYXNJbnNlY3VyZUNvbnRlbnQ+LCBPcHRp b25hbDxVc2VkTGVnYWN5VExTPikgZmluYWwgeyB9CiAgICAgdm9pZCBkaXNwYXRjaERpZEZhaWxQ cm92aXNpb25hbExvYWQoY29uc3QgUmVzb3VyY2VFcnJvciYsIFdpbGxDb250aW51ZUxvYWRpbmcp IGZpbmFsIHsgfQogICAgIHZvaWQgZGlzcGF0Y2hEaWRGYWlsTG9hZChjb25zdCBSZXNvdXJjZUVy cm9yJikgZmluYWwgeyB9CiAgICAgdm9pZCBkaXNwYXRjaERpZEZpbmlzaERvY3VtZW50TG9hZCgp IGZpbmFsIHsgfQpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCShyZXZp c2lvbiAyNTYwNDIpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC03MDUsNyArNzA1LDcgQEAKIAogdm9pZCBGcmFtZUxvYWRlcjo6cmVj ZWl2ZWRGaXJzdERhdGEoKQogewotICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChXVEY6Om51bGxv cHQpOworICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChXVEY6Om51bGxvcHQsIFdURjo6bnVsbG9w dCk7CiAgICAgZGlzcGF0Y2hEaWRDbGVhcldpbmRvd09iamVjdHNJbkFsbFdvcmxkcygpOwogICAg IGRpc3BhdGNoR2xvYmFsT2JqZWN0QXZhaWxhYmxlSW5BbGxXb3JsZHMoKTsKIApAQCAtMjA3Miw4 ICsyMDcyLDkgQEAKICAgICAgICAgbm90aWZpZXIoKS5kaXNwYXRjaERpZFJlY2VpdmVSZXNwb25z ZShjYWNoZWRQYWdlLT5kb2N1bWVudExvYWRlcigpLCBtYWluUmVzb3VyY2VJZGVudGlmaWVyLCBj YWNoZWRQYWdlLT5kb2N1bWVudExvYWRlcigpLT5yZXNwb25zZSgpKTsKIAogICAgICAgICBPcHRp b25hbDxIYXNJbnNlY3VyZUNvbnRlbnQ+IGhhc0luc2VjdXJlQ29udGVudCA9IGNhY2hlZFBhZ2Ut PmNhY2hlZE1haW5GcmFtZSgpLT5oYXNJbnNlY3VyZUNvbnRlbnQoKTsKKyAgICAgICAgT3B0aW9u YWw8VXNlZExlZ2FjeVRMUz4gdXNlZExlZ2FjeVRMUyA9IGNhY2hlZFBhZ2UtPmNhY2hlZE1haW5G cmFtZSgpLT51c2VkTGVnYWN5VExTKCk7CiAKLSAgICAgICAgZGlzcGF0Y2hEaWRDb21taXRMb2Fk KGhhc0luc2VjdXJlQ29udGVudCk7CisgICAgICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChoYXNJ bnNlY3VyZUNvbnRlbnQsIHVzZWRMZWdhY3lUTFMpOwogCiAgICAgICAgIC8vIEZJWE1FOiBUaGlz IEFQSSBzaG91bGQgYmUgdHVybmVkIGFyb3VuZCBzbyB0aGF0IHdlIGdyb3VuZCBDYWNoZWRQYWdl IGludG8gdGhlIFBhZ2UuCiAgICAgICAgIGNhY2hlZFBhZ2UtPnJlc3RvcmUoKm1fZnJhbWUucGFn ZSgpKTsKQEAgLTQwMDcsMTIgKzQwMDgsMTIgQEAKICNlbmRpZgogfQogCi12b2lkIEZyYW1lTG9h ZGVyOjpkaXNwYXRjaERpZENvbW1pdExvYWQoT3B0aW9uYWw8SGFzSW5zZWN1cmVDb250ZW50PiBp bml0aWFsSGFzSW5zZWN1cmVDb250ZW50KQordm9pZCBGcmFtZUxvYWRlcjo6ZGlzcGF0Y2hEaWRD b21taXRMb2FkKE9wdGlvbmFsPEhhc0luc2VjdXJlQ29udGVudD4gaW5pdGlhbEhhc0luc2VjdXJl Q29udGVudCwgT3B0aW9uYWw8VXNlZExlZ2FjeVRMUz4gaW5pdGlhbFVzZWRMZWdhY3lUTFMpCiB7 CiAgICAgaWYgKG1fc3RhdGVNYWNoaW5lLmNyZWF0aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQoKSkK ICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9jbGllbnQuZGlzcGF0Y2hEaWRDb21taXRMb2FkKGlu aXRpYWxIYXNJbnNlY3VyZUNvbnRlbnQpOworICAgIG1fY2xpZW50LmRpc3BhdGNoRGlkQ29tbWl0 TG9hZChpbml0aWFsSGFzSW5zZWN1cmVDb250ZW50LCBpbml0aWFsVXNlZExlZ2FjeVRMUyk7CiAK ICAgICBpZiAobV9mcmFtZS5pc01haW5GcmFtZSgpKSB7CiAgICAgICAgIG1fZnJhbWUucGFnZSgp LT5yZXNldFNlZW5QbHVnaW5zKCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVM b2FkZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIu aAkocmV2aXNpb24gMjU2MDQyKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVy LmgJKHdvcmtpbmcgY29weSkKQEAgLTg3LDYgKzg3LDcgQEAKIGVudW0gY2xhc3MgTmV3TG9hZElu UHJvZ3Jlc3MgOiBib29sOwogZW51bSBjbGFzcyBOYXZpZ2F0aW9uUG9saWN5RGVjaXNpb24gOiB1 aW50OF90OwogZW51bSBjbGFzcyBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQgOiBib29sOwor ZW51bSBjbGFzcyBVc2VkTGVnYWN5VExTIDogYm9vbDsKIAogc3RydWN0IFdpbmRvd0ZlYXR1cmVz OwogCkBAIC0zNzcsNyArMzc4LDcgQEAKIAogICAgIGJvb2wgc2hvdWxkUmVsb2FkVG9IYW5kbGVV bnJlYWNoYWJsZVVSTChEb2N1bWVudExvYWRlciYpOwogCi0gICAgdm9pZCBkaXNwYXRjaERpZENv bW1pdExvYWQoT3B0aW9uYWw8SGFzSW5zZWN1cmVDb250ZW50PiBpbml0aWFsSGFzSW5zZWN1cmVD b250ZW50KTsKKyAgICB2b2lkIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChPcHRpb25hbDxIYXNJbnNl Y3VyZUNvbnRlbnQ+IGluaXRpYWxIYXNJbnNlY3VyZUNvbnRlbnQsIE9wdGlvbmFsPFVzZWRMZWdh Y3lUTFM+IGluaXRpYWxVc2VkTGVnYWN5VExTKTsKIAogICAgIHZvaWQgdXJsU2VsZWN0ZWQoRnJh bWVMb2FkUmVxdWVzdCYmLCBFdmVudCosIE9wdGlvbmFsPEFkQ2xpY2tBdHRyaWJ1dGlvbj4mJiA9 IFdURjo6bnVsbG9wdCk7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ckNsaWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ckNsaWVudC5oCShyZXZpc2lvbiAyNTYwNDIpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXJDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMTAyLDYgKzEwMiw3IEBACiAKIGVu dW0gY2xhc3MgTG9ja0JhY2tGb3J3YXJkTGlzdCA6IGJvb2w7CiBlbnVtIGNsYXNzIFBvbGljeURl Y2lzaW9uTW9kZTsKK2VudW0gY2xhc3MgVXNlZExlZ2FjeVRMUyA6IGJvb2w7CiAKIHN0cnVjdCBT dHJpbmdXaXRoRGlyZWN0aW9uOwogCkBAIC0xNzMsNyArMTc0LDcgQEAKICAgICB2aXJ0dWFsIHZv aWQgZGlzcGF0Y2hEaWRSZWNlaXZlSWNvbigpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRj aERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRj aERpZFJlY2VpdmVUaXRsZShjb25zdCBTdHJpbmdXaXRoRGlyZWN0aW9uJikgPSAwOwotICAgIHZp cnR1YWwgdm9pZCBkaXNwYXRjaERpZENvbW1pdExvYWQoT3B0aW9uYWw8SGFzSW5zZWN1cmVDb250 ZW50PikgPSAwOworICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZENvbW1pdExvYWQoT3B0aW9u YWw8SGFzSW5zZWN1cmVDb250ZW50PiwgT3B0aW9uYWw8VXNlZExlZ2FjeVRMUz4pID0gMDsKICAg ICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRGYWlsUHJvdmlzaW9uYWxMb2FkKGNvbnN0IFJlc291 cmNlRXJyb3ImLCBXaWxsQ29udGludWVMb2FkaW5nKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRp c3BhdGNoRGlkRmFpbExvYWQoY29uc3QgUmVzb3VyY2VFcnJvciYpID0gMDsKICAgICB2aXJ0dWFs IHZvaWQgZGlzcGF0Y2hEaWRGaW5pc2hEb2N1bWVudExvYWQoKSA9IDA7CkluZGV4OiBTb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwko cmV2aXNpb24gMjU2MDQyKQorKysgU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwyMSBAQAorMjAyMC0wMi0wNyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJp c3RlbnNlbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtZW1iZXIgaWYgd2UgdXNlZCBsZWdhY3kg VExTIGluIHRoZSBiYWNrL2ZvcndhcmQgY2FjaGUgbGlrZSB3ZSByZW1lbWJlciBpZiB3ZSBoYXZl IG9ubHkgc2VjdXJlIGNvbnRlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIwNzQwOQorICAgICAgICByZGFyOi8vcHJvYmxlbS81OTI3NTY0MQorCisg ICAgICAgIFJldmlld2VkIGJ5IENocmlzIER1bWV6LgorCisgICAgICAgICogU2NyaXB0cy93ZWJr aXQvbWVzc2FnZXMucHk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6aGFzSW5zZWN1cmVDb250ZW50KToKKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2Fk ZXJDbGllbnQ6OmRpc3BhdGNoRGlkQ29tbWl0TG9hZCk6CisgICAgICAgIChXZWJLaXQ6OldlYkZy YW1lTG9hZGVyQ2xpZW50OjpzYXZlUGxhdGZvcm1EYXRhVG9DYWNoZWRGcmFtZSk6CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oOgorCiAy MDIwLTAyLTA3ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgogCiAg ICAgICAgIFVwZGF0ZSBXZWJWaWV3IGNhdGVnb3J5IG5hbWUgdG8gYmUgbW9yZSBhY2N1cmF0ZQpJ bmRleDogU291cmNlL1dlYktpdC9TY3JpcHRzL3dlYmtpdC9tZXNzYWdlcy5weQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L1NjcmlwdHMvd2Via2l0L21lc3NhZ2VzLnB5CShyZXZpc2lvbiAy NTYwNDIpCisrKyBTb3VyY2UvV2ViS2l0L1NjcmlwdHMvd2Via2l0L21lc3NhZ2VzLnB5CSh3b3Jr aW5nIGNvcHkpCkBAIC02MDIsNiArNjAyLDcgQEAKICAgICAgICAgJ1dlYkNvcmU6OlRleHRJbmRp Y2F0b3JEYXRhJzogWyc8V2ViQ29yZS9UZXh0SW5kaWNhdG9yLmg+J10sCiAgICAgICAgICdXZWJD b3JlOjpUaGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlJzogWyc8V2ViQ29yZS9OZXR3b3JrU3Rv cmFnZVNlc3Npb24uaD4nXSwKICAgICAgICAgJ1dlYkNvcmU6OkZpcnN0UGFydHlXZWJzaXRlRGF0 YVJlbW92YWxNb2RlJzogWyc8V2ViQ29yZS9OZXR3b3JrU3RvcmFnZVNlc3Npb24uaD4nXSwKKyAg ICAgICAgJ1dlYkNvcmU6OlVzZWRMZWdhY3lUTFMnOiBbJzxXZWJDb3JlL1Jlc291cmNlUmVzcG9u c2VCYXNlLmg+J10sCiAgICAgICAgICdXZWJDb3JlOjpWaWV3cG9ydEF0dHJpYnV0ZXMnOiBbJzxX ZWJDb3JlL1ZpZXdwb3J0QXJndW1lbnRzLmg+J10sCiAgICAgICAgICdXZWJDb3JlOjpXaWxsQ29u dGludWVMb2FkaW5nJzogWyc8V2ViQ29yZS9GcmFtZUxvYWRlclR5cGVzLmg+J10sCiAgICAgICAg ICdXZWJDb3JlOjpTZWxlY3Rpb25SZWN0JzogWyciRWRpdG9yU3RhdGUuaCInXSwKSW5kZXg6IFNv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gMjU2MDQyKQor KysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNDIyNCw5ICs0MjI0LDEyIEBACiAgICAgbV9wYWdlTG9hZFN0YXRlLnNldE5ldHdvcmtS ZXF1ZXN0c0luUHJvZ3Jlc3ModHJhbnNhY3Rpb24sIG5ldHdvcmtSZXF1ZXN0c0luUHJvZ3Jlc3Mp OwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6aGFzSW5zZWN1cmVDb250ZW50KENvbXBsZXRpb25I YW5kbGVyPHZvaWQoV2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50KT4mJiBjb21wbGV0aW9uSGFu ZGxlcikKK3ZvaWQgV2ViUGFnZVByb3h5OjpoYXNJbnNlY3VyZUNvbnRlbnQoQ29tcGxldGlvbkhh bmRsZXI8dm9pZChXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQsIFdlYkNvcmU6OlVzZWRMZWdh Y3lUTFMpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIGNvbXBsZXRpb25IYW5kbGVyKG1f cGFnZUxvYWRTdGF0ZS5jb21taXR0ZWRIYXNJbnNlY3VyZUNvbnRlbnQoKSA/IEhhc0luc2VjdXJl Q29udGVudDo6WWVzIDogSGFzSW5zZWN1cmVDb250ZW50OjpObyk7CisgICAgY29tcGxldGlvbkhh bmRsZXIoCisgICAgICAgIG1fcGFnZUxvYWRTdGF0ZS5jb21taXR0ZWRIYXNJbnNlY3VyZUNvbnRl bnQoKSA/IEhhc0luc2VjdXJlQ29udGVudDo6WWVzIDogSGFzSW5zZWN1cmVDb250ZW50OjpObywK KyAgICAgICAgbV9wYWdlTG9hZFN0YXRlLmhhc05lZ290aWF0ZWRMZWdhY3lUTFMoKSA/IFVzZWRM ZWdhY3lUTFM6OlllcyA6IFVzZWRMZWdhY3lUTFM6Ok5vCisgICAgKTsKIH0KIAogdm9pZCBXZWJQ YWdlUHJveHk6OmRpZERlc3Ryb3lOYXZpZ2F0aW9uKHVpbnQ2NF90IG5hdmlnYXRpb25JRCkKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiAyNTYwNDIp CisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5 KQpAQCAtMTc2MCw3ICsxNzYwLDcgQEAKICAgICB2b2lkIGRpZEZpbmlzaFByb2dyZXNzKCk7CiAg ICAgdm9pZCBzZXROZXR3b3JrUmVxdWVzdHNJblByb2dyZXNzKGJvb2wpOwogCi0gICAgdm9pZCBo YXNJbnNlY3VyZUNvbnRlbnQoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChXZWJDb3JlOjpIYXNJbnNl Y3VyZUNvbnRlbnQpPiYmKTsKKyAgICB2b2lkIGhhc0luc2VjdXJlQ29udGVudChDb21wbGV0aW9u SGFuZGxlcjx2b2lkKFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudCwgV2ViQ29yZTo6VXNlZExl Z2FjeVRMUyk+JiYpOwogCiAgICAgdm9pZCBkaWREZXN0cm95TmF2aWdhdGlvbih1aW50NjRfdCBu YXZpZ2F0aW9uSUQpOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5Lm1lc3NhZ2VzLmluCShyZXZpc2lvbiAyNTYwNDIpCisrKyBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTE0 Miw3ICsxNDIsNyBAQAogICAgIERpZEV4cGxpY2l0T3BlbkZvckZyYW1lKFdlYkNvcmU6OkZyYW1l SWRlbnRpZmllciBmcmFtZUlELCBVUkwgdXJsLCBTdHJpbmcgbWltZVR5cGUpCiAgICAgRGlkRGVz dHJveU5hdmlnYXRpb24odWludDY0X3QgbmF2aWdhdGlvbklEKQogCi0gICAgSGFzSW5zZWN1cmVD b250ZW50KCkgLT4gKGVudW06Ym9vbCBXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQgaGFzSW5z ZWN1cmVDb250ZW50KSBTeW5jaHJvbm91cworICAgIEhhc0luc2VjdXJlQ29udGVudCgpIC0+IChl bnVtOmJvb2wgV2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50IGhhc0luc2VjdXJlQ29udGVudCwg ZW51bTpib29sIFdlYkNvcmU6OlVzZWRMZWdhY3lUTFMgdXNlZExlZ2FjeVRMUykgU3luY2hyb25v dXMKIAogICAgIE1haW5GcmFtZVBsdWdpbkhhbmRsZXNQYWdlU2NhbGVHZXN0dXJlRGlkQ2hhbmdl KGJvb2wgbWFpbkZyYW1lUGx1Z2luSGFuZGxlc1BhZ2VTY2FsZUdlc3R1cmUpCiAKSW5kZXg6IFNv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAkocmV2aXNpb24gMjU2MDQyKQorKysgU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNw cAkod29ya2luZyBjb3B5KQpAQCAtNTQ1LDcgKzU0NSw3IEBACiAgICAgd2ViUGFnZS0+c2VuZChN ZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRSZWNlaXZlVGl0bGVGb3JGcmFtZShtX2ZyYW1lLT5m cmFtZUlEKCksIHRydW5jYXRlZFRpdGxlLnN0cmluZywgVXNlckRhdGEoV2ViUHJvY2Vzczo6c2lu Z2xldG9uKCkudHJhbnNmb3JtT2JqZWN0c1RvSGFuZGxlcyh1c2VyRGF0YS5nZXQoKSkuZ2V0KCkp KSk7CiB9CiAKLXZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkQ29tbWl0TG9h ZChPcHRpb25hbDxIYXNJbnNlY3VyZUNvbnRlbnQ+IGhhc0luc2VjdXJlQ29udGVudCkKK3ZvaWQg V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkQ29tbWl0TG9hZChPcHRpb25hbDxIYXNJ bnNlY3VyZUNvbnRlbnQ+IGhhc0luc2VjdXJlQ29udGVudCwgT3B0aW9uYWw8VXNlZExlZ2FjeVRM Uz4gdXNlZExlZ2FjeVRMU0Zyb21QYWdlQ2FjaGUpCiB7CiAgICAgV2ViUGFnZSogd2ViUGFnZSA9 IG1fZnJhbWUtPnBhZ2UoKTsKICAgICBpZiAoIXdlYlBhZ2UpCkBAIC01NTksOCArNTU5LDEyIEBA CiAKICAgICB3ZWJQYWdlLT5zYW5kYm94RXh0ZW5zaW9uVHJhY2tlcigpLmRpZENvbW1pdFByb3Zp c2lvbmFsTG9hZChtX2ZyYW1lKTsKIAorICAgIGJvb2wgdXNlZExlZ2FjeVRMUyA9IGRvY3VtZW50 TG9hZGVyLnJlc3BvbnNlKCkudXNlZExlZ2FjeVRMUygpOworICAgIGlmICghdXNlZExlZ2FjeVRM UyAmJiB1c2VkTGVnYWN5VExTRnJvbVBhZ2VDYWNoZSkKKyAgICAgICAgdXNlZExlZ2FjeVRMUyA9 IHVzZWRMZWdhY3lUTFNGcm9tUGFnZUNhY2hlID09IFVzZWRMZWdhY3lUTFM6OlllczsKKyAgICAK ICAgICAvLyBOb3RpZnkgdGhlIFVJUHJvY2Vzcy4KLSAgICB3ZWJQYWdlLT5zZW5kKE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6OkRpZENvbW1pdExvYWRGb3JGcmFtZShtX2ZyYW1lLT5mcmFtZUlEKCks IGRvY3VtZW50TG9hZGVyLm5hdmlnYXRpb25JRCgpLCBkb2N1bWVudExvYWRlci5yZXNwb25zZSgp Lm1pbWVUeXBlKCksIG1fZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIsIHN0YXRpY19jYXN0 PHVpbnQzMl90PihtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkubG9hZFR5cGUoKSksIHZh bHVlT3JDb21wdXRlKGRvY3VtZW50TG9hZGVyLnJlc3BvbnNlKCkuY2VydGlmaWNhdGVJbmZvKCks IFtdIHsgcmV0dXJuIENlcnRpZmljYXRlSW5mbygpOyB9KSwgZG9jdW1lbnRMb2FkZXIucmVzcG9u c2UoKS51c2VkTGVnYWN5VExTKCksIG1fZnJhbWUtPmNvcmVGcmFtZSgpLT5kb2N1bWVudCgpLT5p c1BsdWdpbkRvY3VtZW50KCksIGhhc0luc2VjdXJlQ29udGVudCwgVXNlckRhdGEoV2ViUHJvY2Vz czo6c2luZ2xldG9uKCkudHJhbnNmb3JtT2JqZWN0c1RvSGFuZGxlcyh1c2VyRGF0YS5nZXQoKSku Z2V0KCkpKSk7CisgICAgd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRD b21taXRMb2FkRm9yRnJhbWUobV9mcmFtZS0+ZnJhbWVJRCgpLCBkb2N1bWVudExvYWRlci5uYXZp Z2F0aW9uSUQoKSwgZG9jdW1lbnRMb2FkZXIucmVzcG9uc2UoKS5taW1lVHlwZSgpLCBtX2ZyYW1l SGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyLCBzdGF0aWNfY2FzdDx1aW50MzJfdD4obV9mcmFtZS0+ Y29yZUZyYW1lKCktPmxvYWRlcigpLmxvYWRUeXBlKCkpLCB2YWx1ZU9yQ29tcHV0ZShkb2N1bWVu dExvYWRlci5yZXNwb25zZSgpLmNlcnRpZmljYXRlSW5mbygpLCBbXSB7IHJldHVybiBDZXJ0aWZp Y2F0ZUluZm8oKTsgfSksIHVzZWRMZWdhY3lUTFMsIG1fZnJhbWUtPmNvcmVGcmFtZSgpLT5kb2N1 bWVudCgpLT5pc1BsdWdpbkRvY3VtZW50KCksIGhhc0luc2VjdXJlQ29udGVudCwgVXNlckRhdGEo V2ViUHJvY2Vzczo6c2luZ2xldG9uKCkudHJhbnNmb3JtT2JqZWN0c1RvSGFuZGxlcyh1c2VyRGF0 YS5nZXQoKSkuZ2V0KCkpKSk7CiAgICAgd2ViUGFnZS0+ZGlkQ29tbWl0TG9hZChtX2ZyYW1lKTsK IH0KIApAQCAtMTQ2Nyw4ICsxNDcxLDkgQEAKICAgICAgICAgcmV0dXJuOwogCiAgICAgSGFzSW5z ZWN1cmVDb250ZW50IGhhc0luc2VjdXJlQ29udGVudDsKLSAgICBpZiAod2ViUGFnZS0+c2VuZFN5 bmMoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6SGFzSW5zZWN1cmVDb250ZW50KCksIE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6Okhhc0luc2VjdXJlQ29udGVudDo6UmVwbHkoaGFzSW5zZWN1cmVDb250 ZW50KSkpCi0gICAgICAgIGNhY2hlZEZyYW1lLT5zZXRIYXNJbnNlY3VyZUNvbnRlbnQoaGFzSW5z ZWN1cmVDb250ZW50KTsKKyAgICBVc2VkTGVnYWN5VExTIHVzZWRMZWdhY3lUTFM7CisgICAgaWYg KHdlYlBhZ2UtPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Okhhc0luc2VjdXJlQ29u dGVudCgpLCBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpIYXNJbnNlY3VyZUNvbnRlbnQ6OlJlcGx5 KGhhc0luc2VjdXJlQ29udGVudCwgdXNlZExlZ2FjeVRMUykpKQorICAgICAgICBjYWNoZWRGcmFt ZS0+c2V0SGFzSW5zZWN1cmVDb250ZW50KGhhc0luc2VjdXJlQ29udGVudCwgdXNlZExlZ2FjeVRM Uyk7CiB9CiAKIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1pdHRl ZEZyb21DYWNoZWRGcmFtZShDYWNoZWRGcmFtZSopCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJD bGllbnQuaAkocmV2aXNpb24gMjU2MDQyKQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTEx NCw3ICsxMTQsNyBAQAogICAgIHZvaWQgZGlzcGF0Y2hXaWxsQ2xvc2UoKSBmaW5hbDsKICAgICB2 b2lkIGRpc3BhdGNoRGlkU3RhcnRQcm92aXNpb25hbExvYWQoKSBmaW5hbDsKICAgICB2b2lkIGRp c3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFdlYkNvcmU6OlN0cmluZ1dpdGhEaXJlY3Rpb24m KSBmaW5hbDsKLSAgICB2b2lkIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChPcHRpb25hbDxXZWJDb3Jl OjpIYXNJbnNlY3VyZUNvbnRlbnQ+KSBmaW5hbDsKKyAgICB2b2lkIGRpc3BhdGNoRGlkQ29tbWl0 TG9hZChPcHRpb25hbDxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+LCBPcHRpb25hbDxXZWJD b3JlOjpVc2VkTGVnYWN5VExTPikgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaERpZEZhaWxQcm92 aXNpb25hbExvYWQoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIFdlYkNvcmU6OldpbGxD b250aW51ZUxvYWRpbmcpIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hEaWRGYWlsTG9hZChjb25z dCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJikgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaERpZEZp bmlzaERvY3VtZW50TG9hZCgpIGZpbmFsOwpJbmRleDogU291cmNlL1dlYktpdExlZ2FjeS9tYWMv Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxv ZwkocmV2aXNpb24gMjU2MDQyKQorKysgU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9n CSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDItMDcgIEFsZXggQ2hyaXN0 ZW5zZW4gIDxhY2hyaXN0ZW5zZW5AYXBwbGUuY29tPgorCisgICAgICAgIFJlbWVtYmVyIGlmIHdl IHVzZWQgbGVnYWN5IFRMUyBpbiB0aGUgYmFjay9mb3J3YXJkIGNhY2hlIGxpa2Ugd2UgcmVtZW1i ZXIgaWYgd2UgaGF2ZSBvbmx5IHNlY3VyZSBjb250ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDc0MDkKKyAgICAgICAgcmRhcjovL3Byb2JsZW0v NTkyNzU2NDEKKworICAgICAgICBSZXZpZXdlZCBieSBDaHJpcyBEdW1lei4KKworICAgICAgICAq IFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lmg6CisgICAgICAgICogV2ViQ29y ZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW06CisgICAgICAgIChXZWJGcmFtZUxvYWRl ckNsaWVudDo6ZGlzcGF0Y2hEaWRDb21taXRMb2FkKToKKwogMjAyMC0wMi0wNiAgQnJlbnQgRnVs Z2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBQcmV2ZW50IG5hdmlnYXRpbmcg dG9wIGxldmVsIGZyYW1lcyB0byBEYXRhIFVSTHMKSW5kZXg6IFNvdXJjZS9XZWJLaXRMZWdhY3kv bWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGll bnQuaAkocmV2aXNpb24gMjU2MDQyKQorKysgU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29y ZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMTE1LDcg KzExNSw3IEBACiAgICAgdm9pZCBkaXNwYXRjaFdpbGxDbG9zZSgpIGZpbmFsOwogICAgIHZvaWQg ZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCgpIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0 Y2hEaWRSZWNlaXZlVGl0bGUoY29uc3QgV2ViQ29yZTo6U3RyaW5nV2l0aERpcmVjdGlvbiYpIGZp bmFsOwotICAgIHZvaWQgZGlzcGF0Y2hEaWRDb21taXRMb2FkKE9wdGlvbmFsPFdlYkNvcmU6Okhh c0luc2VjdXJlQ29udGVudD4pIGZpbmFsOworICAgIHZvaWQgZGlzcGF0Y2hEaWRDb21taXRMb2Fk KE9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4sIE9wdGlvbmFsPFdlYkNvcmU6 OlVzZWRMZWdhY3lUTFM+KSBmaW5hbDsKICAgICB2b2lkIGRpc3BhdGNoRGlkRmFpbFByb3Zpc2lv bmFsTG9hZChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgV2ViQ29yZTo6V2lsbENvbnRp bnVlTG9hZGluZykgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaERpZEZhaWxMb2FkKGNvbnN0IFdl YkNvcmU6OlJlc291cmNlRXJyb3ImKSBmaW5hbDsKICAgICB2b2lkIGRpc3BhdGNoRGlkRmluaXNo RG9jdW1lbnRMb2FkKCkgZmluYWw7CkluZGV4OiBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJD b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0TGVnYWN5L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQko cmV2aXNpb24gMjU2MDQyKQorKysgU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29yZVN1cHBv cnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0JKHdvcmtpbmcgY29weSkKQEAgLTY5OCw3ICs2OTgs NyBAQAogICAgIH0KIH0KIAotdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRD b21taXRMb2FkKE9wdGlvbmFsPFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudD4pCit2b2lkIFdl YkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZENvbW1pdExvYWQoT3B0aW9uYWw8V2ViQ29y ZTo6SGFzSW5zZWN1cmVDb250ZW50PiwgT3B0aW9uYWw8V2ViQ29yZTo6VXNlZExlZ2FjeVRMUz4p CiB7CiAgICAgLy8gVGVsbCB0aGUgY2xpZW50IHdlJ3ZlIGNvbW1pdHRlZCB0aGlzIFVSTC4KICAg ICBBU1NFUlQoW21fd2ViRnJhbWUtPl9wcml2YXRlLT53ZWJGcmFtZVZpZXcgZG9jdW1lbnRWaWV3 XSAhPSBuaWwpOwpJbmRleDogU291cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZwkocmV2aXNpb24gMjU2 MDQyKQorKysgU291cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDItMDcgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0 ZW5zZW5AYXBwbGUuY29tPgorCisgICAgICAgIFJlbWVtYmVyIGlmIHdlIHVzZWQgbGVnYWN5IFRM UyBpbiB0aGUgYmFjay9mb3J3YXJkIGNhY2hlIGxpa2Ugd2UgcmVtZW1iZXIgaWYgd2UgaGF2ZSBv bmx5IHNlY3VyZSBjb250ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMDc0MDkKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNTkyNzU2NDEKKworICAg ICAgICBSZXZpZXdlZCBieSBDaHJpcyBEdW1lei4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0 L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYkZyYW1lTG9hZGVyQ2xpZW50 OjpkaXNwYXRjaERpZENvbW1pdExvYWQpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZy YW1lTG9hZGVyQ2xpZW50Lmg6CisKIDIwMjAtMDItMDYgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hh bUBhcHBsZS5jb20+CiAKICAgICAgICAgUHJldmVudCBuYXZpZ2F0aW5nIHRvcCBsZXZlbCBmcmFt ZXMgdG8gRGF0YSBVUkxzCkluZGV4OiBTb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJDb3JlU3Vw cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dExlZ2FjeS93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCShyZXZp c2lvbiAyNTYwNDIpCisrKyBTb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJDb3JlU3VwcG9ydC9X ZWJGcmFtZUxvYWRlckNsaWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQzOCw3ICs0MzgsNyBA QAogICAgICAgICBmcmFtZUxvYWREZWxlZ2F0ZS0+ZGlkUmVjZWl2ZVRpdGxlKHdlYlZpZXcsIEJT dHJpbmcodGl0bGUuc3RyaW5nKSwgbV93ZWJGcmFtZSk7CiB9CiAKLXZvaWQgV2ViRnJhbWVMb2Fk ZXJDbGllbnQ6OmRpc3BhdGNoRGlkQ29tbWl0TG9hZChPcHRpb25hbDxIYXNJbnNlY3VyZUNvbnRl bnQ+KQordm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRDb21taXRMb2FkKE9w dGlvbmFsPEhhc0luc2VjdXJlQ29udGVudD4sIE9wdGlvbmFsPFVzZWRMZWdhY3lUTFM+KQogewog ICAgIFdlYlZpZXcqIHdlYlZpZXcgPSBtX3dlYkZyYW1lLT53ZWJWaWV3KCk7CiAgICAgQ09NUHRy PElXZWJGcmFtZUxvYWREZWxlZ2F0ZT4gZnJhbWVMb2FkRGVsZWdhdGU7CkluZGV4OiBTb3VyY2Uv V2ViS2l0TGVnYWN5L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZy YW1lTG9hZGVyQ2xpZW50LmgJKHJldmlzaW9uIDI1NjA0MikKKysrIFNvdXJjZS9XZWJLaXRMZWdh Y3kvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgJKHdvcmtpbmcgY29w eSkKQEAgLTkyLDcgKzkyLDcgQEAKICAgICB2b2lkIGRpc3BhdGNoV2lsbENsb3NlKCkgb3ZlcnJp ZGU7CiAgICAgdm9pZCBkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKCkgb3ZlcnJpZGU7 CiAgICAgdm9pZCBkaXNwYXRjaERpZFJlY2VpdmVUaXRsZShjb25zdCBXZWJDb3JlOjpTdHJpbmdX aXRoRGlyZWN0aW9uJikgb3ZlcnJpZGU7Ci0gICAgdm9pZCBkaXNwYXRjaERpZENvbW1pdExvYWQo T3B0aW9uYWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50Pikgb3ZlcnJpZGU7CisgICAgdm9p ZCBkaXNwYXRjaERpZENvbW1pdExvYWQoT3B0aW9uYWw8V2ViQ29yZTo6SGFzSW5zZWN1cmVDb250 ZW50PiwgT3B0aW9uYWw8V2ViQ29yZTo6VXNlZExlZ2FjeVRMUz4pIG92ZXJyaWRlOwogICAgIHZv aWQgZGlzcGF0Y2hEaWRGYWlsUHJvdmlzaW9uYWxMb2FkKGNvbnN0IFdlYkNvcmU6OlJlc291cmNl RXJyb3ImLCBXZWJDb3JlOjpXaWxsQ29udGludWVMb2FkaW5nKSBvdmVycmlkZTsKICAgICB2b2lk IGRpc3BhdGNoRGlkRmFpbExvYWQoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYpIG92ZXJy aWRlOwogICAgIHZvaWQgZGlzcGF0Y2hEaWRGaW5pc2hEb2N1bWVudExvYWQoKSBvdmVycmlkZTsK SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NjA2MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDIwLTAyLTA3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQGFw cGxlLmNvbT4KKworICAgICAgICBSZW1lbWJlciBpZiB3ZSB1c2VkIGxlZ2FjeSBUTFMgaW4gdGhl IGJhY2svZm9yd2FyZCBjYWNoZSBsaWtlIHdlIHJlbWVtYmVyIGlmIHdlIGhhdmUgb25seSBzZWN1 cmUgY29udGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjA3NDA5CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzU5Mjc1NjQxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgQ2hyaXMgRHVtZXouCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1RMU0RlcHJlY2F0aW9uLm1tOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVT VCk6CisKIDIwMjAtMDItMDcgIEppZXdlbiBUYW4gIDxqaWV3ZW5fdGFuQGFwcGxlLmNvbT4KIAog ICAgICAgICBbV2ViQXV0aG5dIFJlcG9ydCBDVEFQIENsaWVudCBQaW4gRXJyb3IgdG8gY2xpZW50 cwpJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9UTFNEZXByZWNh dGlvbi5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL1RMU0RlcHJlY2F0aW9uLm1tCShyZXZpc2lvbiAyNTYwNDIpCisrKyBUb29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1RMU0RlcHJlY2F0aW9uLm1tCSh3b3JraW5nIGNvcHkp CkBAIC0zMTIsNyArMzEyLDggQEAKICAgICB9LCBIVFRQU2VydmVyOjpQcm90b2NvbDo6SHR0cHNX aXRoTGVnYWN5VExTKTsKIAogICAgIEhUVFBTZXJ2ZXIgbW9kZXJuVExTU2VydmVyKHsKLSAgICAg ICAgeyAiLyIsIHsgbWFrZVN0cmluZygiPHNjcmlwdD5mZXRjaCgnaHR0cHM6Ly8xMjcuMC4wLjE6 Iiwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGxlZ2FjeVRMU1NlcnZlci5wb3J0KCkpLCAiLycse21v ZGU6J25vLWNvcnMnfSk8L3NjcmlwdD4iKSB9IH0KKyAgICAgICAgeyAiLyIsIHsgbWFrZVN0cmlu ZygiPHNjcmlwdD5mZXRjaCgnaHR0cHM6Ly8xMjcuMC4wLjE6Iiwgc3RhdGljX2Nhc3Q8dW5zaWdu ZWQ+KGxlZ2FjeVRMU1NlcnZlci5wb3J0KCkpLCAiLycse21vZGU6J25vLWNvcnMnfSk8L3Njcmlw dD4iKSB9IH0sCisgICAgICAgIHsgIi9wYWdlV2l0aG91dFN1YnJlc291cmNlIiwgeyAiaGVsbG8i IH19CiAgICAgfSwgSFRUUFNlcnZlcjo6UHJvdG9jb2w6Okh0dHBzKTsKICAgICAKICAgICBhdXRv IFt3ZWJWaWV3LCBkZWxlZ2F0ZV0gPSB3ZWJWaWV3V2l0aE5hdmlnYXRpb25EZWxlZ2F0ZSgpOwpA QCAtMzIzLDcgKzMyNCwxNiBAQAogICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0Om1vZGVyblRMU1Nl cnZlci5yZXF1ZXN0KCldOwogICAgIHdoaWxlICghW3dlYlZpZXcgX25lZ290aWF0ZWRMZWdhY3lU TFNdKQogICAgICAgICBbb2JzZXJ2ZXIgd2FpdFVudGlsTmVnb3RpYXRlZExlZ2FjeVRMU0NoYW5n ZWRdOworICAgIAorICAgIEVYUEVDVF9UUlVFKFt3ZWJWaWV3IF9uZWdvdGlhdGVkTGVnYWN5VExT XSk7CisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVS TDpbTlNVUkwgVVJMV2l0aFN0cmluZzpbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAImh0dHBz Oi8vMTI3LjAuMC4xOiVkL3BhZ2VXaXRob3V0U3VicmVzb3VyY2UiLCBtb2Rlcm5UTFNTZXJ2ZXIu cG9ydCgpXV1dXTsKKyAgICBbZGVsZWdhdGUgd2FpdEZvckRpZEZpbmlzaE5hdmlnYXRpb25dOwor ICAgIEVYUEVDVF9GQUxTRShbd2ViVmlldyBfbmVnb3RpYXRlZExlZ2FjeVRMU10pOwogCisgICAg W3dlYlZpZXcgZ29CYWNrXTsKKyAgICBbZGVsZWdhdGUgd2FpdEZvckRpZEZpbmlzaE5hdmlnYXRp b25dOworICAgIEVYUEVDVF9UUlVFKFt3ZWJWaWV3IF9uZWdvdGlhdGVkTGVnYWN5VExTXSk7CisK ICAgICBbd2ViVmlldyByZW1vdmVPYnNlcnZlcjpvYnNlcnZlci5nZXQoKSBmb3JLZXlQYXRoOkAi X25lZ290aWF0ZWRMZWdhY3lUTFMiXTsKIH0KIAo=