146172 2015-06-19 17:06:57 -0700 Fix format strings in NetworkCache.cpp and NetworkCacheStatistics.cpp and WebIDBServerConnection.cpp 2015-06-21 06:16:58 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC All RESOLVED FIXED P2 Minor --- 145121 1 mcatanzaro mcatanzaro cgarcia commit-queue darin mcatanzaro oldest_to_newest 1103507 0 mcatanzaro 2015-06-19 17:06:57 -0700 This is a follow-up to bug #145960. Apparently I missed two files. Note: this patch is not a completely literal translation like the last one, because it fixes WebIDBServerConnection::createObjectStore printing an int64_t as an unsigned long long. 1103508 1 mcatanzaro 2015-06-19 17:10:08 -0700 Also NetworkCache.cpp, which I almost missed next to NetworkCacheStatistics.cpp because it only has one warning. 1103520 2 255255 mcatanzaro 2015-06-19 17:44:03 -0700 Created attachment 255255 Patch 1103725 3 255255 commit-queue 2015-06-21 06:16:55 -0700 Comment on attachment 255255 Patch Clearing flags on attachment: 255255 Committed r185807: <http://trac.webkit.org/changeset/185807> 1103726 4 commit-queue 2015-06-21 06:16:58 -0700 All reviewed patches have been landed. Closing bug. 255255 2015-06-19 17:44:03 -0700 2015-06-21 06:16:55 -0700 Patch bug-146172-20150619194324.patch text/plain 31415 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NzYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWU1NmY5ZjBkMThiMmMw OGE5M2Q2MjA5YmMyNGQwYTVkNDcwZmRlOS4uYTJlNzk5MDNkMjA2NDY4YTNlYTM3NzFjZjkyZTAy YzVjZjMyNTBkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYyIEBACisyMDE1LTA2LTE5ICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KKworICAgICAgICBGaXggZm9y bWF0IHN0cmluZ3MgaW4gTmV0d29ya0NhY2hlLmNwcCBhbmQgTmV0d29ya0NhY2hlU3RhdGlzdGlj cy5jcHAgYW5kIFdlYklEQlNlcnZlckNvbm5lY3Rpb24uY3BwCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDYxNzIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgdGhlIGNvcnJlY3QgJSJQUkl1NjQiIGFu ZCAlIlBSSWk2NCIgZm9yIHVpbnQ2NF90IGFuZCBpbnQ2NF90LCBpbnN0ZWFkIG9mICVsbHUgYW5k ICVsbGkuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3Bw OgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OkNhY2hlOjpyZXRyaWV2ZSk6CisgICAg ICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RhdGlzdGljcy5jcHA6Cisg ICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3RhdGlzdGljczo6aW5pdGlhbGl6ZSk6Cisg ICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3RhdGlzdGljczo6cmVjb3JkTm90VXNpbmdD YWNoZUZvclJlcXVlc3QpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlN0YXRpc3Rp Y3M6OnJlY29yZFJldHJpZXZhbEZhaWx1cmUpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2Fj aGU6OlN0YXRpc3RpY3M6OnJlY29yZFJldHJpZXZlZENhY2hlZEVudHJ5KToKKyAgICAgICAgKFdl YktpdDo6TmV0d29ya0NhY2hlOjpTdGF0aXN0aWNzOjpyZWNvcmRSZXZhbGlkYXRpb25TdWNjZXNz KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0RhdGFiYXNlcy9JbmRleGVkREIvV2ViSURCU2VydmVy Q29ubmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYklEQlNlcnZlckNvbm5lY3Rpb246 OmRlbGV0ZURhdGFiYXNlKToKKyAgICAgICAgKFdlYktpdDo6V2ViSURCU2VydmVyQ29ubmVjdGlv bjo6ZGlkRGVsZXRlRGF0YWJhc2UpOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJTZXJ2ZXJDb25u ZWN0aW9uOjpnZXRPckVzdGFibGlzaElEQkRhdGFiYXNlTWV0YWRhdGEpOgorICAgICAgICAoV2Vi S2l0OjpXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpkaWRHZXRPckVzdGFibGlzaElEQkRhdGFiYXNl TWV0YWRhdGEpOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpvcGVu VHJhbnNhY3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpk aWRPcGVuVHJhbnNhY3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJTZXJ2ZXJDb25uZWN0 aW9uOjpiZWdpblRyYW5zYWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViSURCU2VydmVyQ29u bmVjdGlvbjo6ZGlkQmVnaW5UcmFuc2FjdGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYklEQlNl cnZlckNvbm5lY3Rpb246OmNvbW1pdFRyYW5zYWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2Vi SURCU2VydmVyQ29ubmVjdGlvbjo6ZGlkQ29tbWl0VHJhbnNhY3Rpb24pOgorICAgICAgICAoV2Vi S2l0OjpXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpyZXNldFRyYW5zYWN0aW9uKToKKyAgICAgICAg KFdlYktpdDo6V2ViSURCU2VydmVyQ29ubmVjdGlvbjo6ZGlkUmVzZXRUcmFuc2FjdGlvbik6Cisg ICAgICAgIChXZWJLaXQ6OldlYklEQlNlcnZlckNvbm5lY3Rpb246OnJvbGxiYWNrVHJhbnNhY3Rp b24pOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpkaWRSb2xsYmFj a1RyYW5zYWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViSURCU2VydmVyQ29ubmVjdGlvbjo6 Y3JlYXRlT2JqZWN0U3RvcmUpOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJTZXJ2ZXJDb25uZWN0 aW9uOjpkaWRDcmVhdGVPYmplY3RTdG9yZSk6CisgICAgICAgIChXZWJLaXQ6OldlYklEQlNlcnZl ckNvbm5lY3Rpb246OmNyZWF0ZUluZGV4KToKKyAgICAgICAgKFdlYktpdDo6V2ViSURCU2VydmVy Q29ubmVjdGlvbjo6ZGlkQ3JlYXRlSW5kZXgpOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJTZXJ2 ZXJDb25uZWN0aW9uOjpkZWxldGVJbmRleCk6CisgICAgICAgIChXZWJLaXQ6OldlYklEQlNlcnZl ckNvbm5lY3Rpb246OmRpZERlbGV0ZUluZGV4KToKKyAgICAgICAgKFdlYktpdDo6V2ViSURCU2Vy dmVyQ29ubmVjdGlvbjo6Z2V0KToKKyAgICAgICAgKFdlYktpdDo6V2ViSURCU2VydmVyQ29ubmVj dGlvbjo6cHV0KToKKyAgICAgICAgKFdlYktpdDo6V2ViSURCU2VydmVyQ29ubmVjdGlvbjo6ZGlk UHV0UmVjb3JkKToKKyAgICAgICAgKFdlYktpdDo6V2ViSURCU2VydmVyQ29ubmVjdGlvbjo6ZGlk R2V0UmVjb3JkKToKKyAgICAgICAgKFdlYktpdDo6V2ViSURCU2VydmVyQ29ubmVjdGlvbjo6ZGlk T3BlbkN1cnNvcik6CisgICAgICAgIChXZWJLaXQ6OldlYklEQlNlcnZlckNvbm5lY3Rpb246OmRp ZEFkdmFuY2VDdXJzb3IpOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJTZXJ2ZXJDb25uZWN0aW9u OjpkaWRJdGVyYXRlQ3Vyc29yKToKKyAgICAgICAgKFdlYktpdDo6V2ViSURCU2VydmVyQ29ubmVj dGlvbjo6Y291bnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpk aWRDb3VudCk6CisgICAgICAgIChXZWJLaXQ6OldlYklEQlNlcnZlckNvbm5lY3Rpb246OmRlbGV0 ZVJhbmdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViSURCU2VydmVyQ29ubmVjdGlvbjo6ZGlkRGVs ZXRlUmFuZ2UpOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpjbGVh ck9iamVjdFN0b3JlKToKKyAgICAgICAgKFdlYktpdDo6V2ViSURCU2VydmVyQ29ubmVjdGlvbjo6 ZGlkQ2xlYXJPYmplY3RTdG9yZSk6CisgICAgICAgIChXZWJLaXQ6OldlYklEQlNlcnZlckNvbm5l Y3Rpb246OmRlbGV0ZU9iamVjdFN0b3JlKToKKyAgICAgICAgKFdlYktpdDo6V2ViSURCU2VydmVy Q29ubmVjdGlvbjo6ZGlkRGVsZXRlT2JqZWN0U3RvcmUpOgorICAgICAgICAoV2ViS2l0OjpXZWJJ REJTZXJ2ZXJDb25uZWN0aW9uOjpjaGFuZ2VEYXRhYmFzZVZlcnNpb24pOgorICAgICAgICAoV2Vi S2l0OjpXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpkaWRDaGFuZ2VEYXRhYmFzZVZlcnNpb24pOgor ICAgICAgICAoV2ViS2l0OjpXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpvcGVuQ3Vyc29yKToKKyAg ICAgICAgKFdlYktpdDo6V2ViSURCU2VydmVyQ29ubmVjdGlvbjo6Y3Vyc29yQWR2YW5jZSk6Cisg ICAgICAgIChXZWJLaXQ6OldlYklEQlNlcnZlckNvbm5lY3Rpb246OmN1cnNvckl0ZXJhdGUpOgor CiAyMDE1LTA2LTE4ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAg ICAgIFtpT1NdIHNjcm9sbEludG9WaWV3SWZOZWVkZWQgaXMgbm90IHdvcmtpbmcgd2l0aCBzY3Jv bGwtc25hcCBwb2ludHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNz L2NhY2hlL05ldHdvcmtDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9j YWNoZS9OZXR3b3JrQ2FjaGUuY3BwCmluZGV4IDgyMDFhYWUzNDNjMDFlNTFiNzM0MGVhZjkyMGRk M2VkNzJmOGIxYmEuLmZhMWQ2MTBlZTUzNDhjZjg3ZDQ0OGMwZWJjYjZhZDcxYjk1M2U2NjYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNo ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0Nh Y2hlLmNwcApAQCAtMzc3LDggKzM3Nyw4IEBAIHZvaWQgQ2FjaGU6OnJldHJpZXZlKGNvbnN0IFdl YkNvcmU6OlJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxSZXF1ZXN0LCB1aW50NjRfdCB3CiAgICAg ICAgIH07CiAKICNpZiAhTE9HX0RJU0FCTEVECi0gICAgICAgIGF1dG8gZWxhcHNlZE1TID0gc3Rk OjpjaHJvbm86OmR1cmF0aW9uX2Nhc3Q8c3RkOjpjaHJvbm86Om1pbGxpc2Vjb25kcz4oc3RkOjpj aHJvbm86OnN5c3RlbV9jbG9jazo6bm93KCkgLSBzdGFydFRpbWUpLmNvdW50KCk7Ci0gICAgICAg IExPRyhOZXR3b3JrQ2FjaGUsICIoTmV0d29ya1Byb2Nlc3MpIHJldHJpZXZlIGNvbXBsZXRlIHVz ZURlY2lzaW9uPSVkIHByaW9yaXR5PSV1IHRpbWU9JWxsZG1zIiwgdXNlRGVjaXNpb24sIG9yaWdp bmFsUmVxdWVzdC5wcmlvcml0eSgpLCBlbGFwc2VkTVMpOworICAgICAgICBhdXRvIGVsYXBzZWRN UyA9IHN0YXRpY19jYXN0PGludDY0X3Q+KHN0ZDo6Y2hyb25vOjpkdXJhdGlvbl9jYXN0PHN0ZDo6 Y2hyb25vOjptaWxsaXNlY29uZHM+KHN0ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6Om5vdygpIC0g c3RhcnRUaW1lKS5jb3VudCgpKTsKKyAgICAgICAgTE9HKE5ldHdvcmtDYWNoZSwgIihOZXR3b3Jr UHJvY2VzcykgcmV0cmlldmUgY29tcGxldGUgdXNlRGVjaXNpb249JWQgcHJpb3JpdHk9JXUgdGlt ZT0lIiBQUklpNjQgIm1zIiwgdXNlRGVjaXNpb24sIG9yaWdpbmFsUmVxdWVzdC5wcmlvcml0eSgp LCBlbGFwc2VkTVMpOwogI2VuZGlmCiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKFdURjo6bW92 ZShlbnRyeSkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9j YWNoZS9OZXR3b3JrQ2FjaGVTdGF0aXN0aWNzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQ cm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0YXRpc3RpY3MuY3BwCmluZGV4IDhhZmZlYzg0NDJi N2QxNDhhN2FmMzZmNGUyY2M2NzY5ZTg3YjliYTcuLmZiZTE0NWVhYTViYzQxMjUzYmY3OGFlZmZk NzI1MTVlNThmMTUyOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNz L2NhY2hlL05ldHdvcmtDYWNoZVN0YXRpc3RpY3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL05l dHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0YXRpc3RpY3MuY3BwCkBAIC0xMjMsMTYg KzEyMywxNiBAQCB2b2lkIFN0YXRpc3RpY3M6OmluaXRpYWxpemUoY29uc3QgU3RyaW5nJiBkYXRh YmFzZVBhdGgpCiAgICAgICAgIG1fYXBwcm94aW1hdGVFbnRyeUNvdW50ID0gc3RhdGVtZW50Lmdl dENvbHVtbkludCgwKTsKIAogI2lmICFMT0dfRElTQUJMRUQKLSAgICAgICAgYXV0byBlbGFwc2Vk TVMgPSBzdGQ6OmNocm9ubzo6ZHVyYXRpb25fY2FzdDxzdGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRz PihzdGQ6OmNocm9ubzo6c3lzdGVtX2Nsb2NrOjpub3coKSAtIHN0YXJ0VGltZSkuY291bnQoKTsK KyAgICAgICAgYXV0byBlbGFwc2VkTVMgPSBzdGF0aWNfY2FzdDxpbnQ2NF90PihzdGQ6OmNocm9u bzo6ZHVyYXRpb25fY2FzdDxzdGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRzPihzdGQ6OmNocm9ubzo6 c3lzdGVtX2Nsb2NrOjpub3coKSAtIHN0YXJ0VGltZSkuY291bnQoKSk7CiAjZW5kaWYKLSAgICAg ICAgTE9HKE5ldHdvcmtDYWNoZSwgIihOZXR3b3JrUHJvY2VzcykgTmV0d29yayBjYWNoZSBzdGF0 aXN0aWNzIGRhdGFiYXNlIGxvYWQgY29tcGxldGUsIGVudHJpZXM9JWx1IHRpbWU9JWxsZG1zIiwg c3RhdGljX2Nhc3Q8c2l6ZV90PihtX2FwcHJveGltYXRlRW50cnlDb3VudCksIGVsYXBzZWRNUyk7 CisgICAgICAgIExPRyhOZXR3b3JrQ2FjaGUsICIoTmV0d29ya1Byb2Nlc3MpIE5ldHdvcmsgY2Fj aGUgc3RhdGlzdGljcyBkYXRhYmFzZSBsb2FkIGNvbXBsZXRlLCBlbnRyaWVzPSVsdSB0aW1lPSUi IFBSSWk2NCAibXMiLCBzdGF0aWNfY2FzdDxzaXplX3Q+KG1fYXBwcm94aW1hdGVFbnRyeUNvdW50 KSwgZWxhcHNlZE1TKTsKIAogICAgICAgICBpZiAoIW1fYXBwcm94aW1hdGVFbnRyeUNvdW50KSB7 CiAgICAgICAgICAgICBib290c3RyYXBGcm9tTmV0d29ya0NhY2hlKG5ldHdvcmtDYWNoZVBhdGhD YXB0dXJlLnN0cmluZygpKTsKICNpZiAhTE9HX0RJU0FCTEVECi0gICAgICAgICAgICBlbGFwc2Vk TVMgPSBzdGQ6OmNocm9ubzo6ZHVyYXRpb25fY2FzdDxzdGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRz PihzdGQ6OmNocm9ubzo6c3lzdGVtX2Nsb2NrOjpub3coKSAtIHN0YXJ0VGltZSkuY291bnQoKTsK KyAgICAgICAgICAgIGVsYXBzZWRNUyA9IHN0YXRpY19jYXN0PGludDY0X3Q+KHN0ZDo6Y2hyb25v OjpkdXJhdGlvbl9jYXN0PHN0ZDo6Y2hyb25vOjptaWxsaXNlY29uZHM+KHN0ZDo6Y2hyb25vOjpz eXN0ZW1fY2xvY2s6Om5vdygpIC0gc3RhcnRUaW1lKS5jb3VudCgpKTsKICNlbmRpZgotICAgICAg ICAgICAgTE9HKE5ldHdvcmtDYWNoZSwgIihOZXR3b3JrUHJvY2VzcykgTmV0d29yayBjYWNoZSBz dGF0aXN0aWNzIGRhdGFiYXNlIGJvb3RzdHJhcHBpbmcgY29tcGxldGUsIGVudHJpZXM9JWx1IHRp bWU9JWxsZG1zIiwgc3RhdGljX2Nhc3Q8c2l6ZV90PihtX2FwcHJveGltYXRlRW50cnlDb3VudCks IGVsYXBzZWRNUyk7CisgICAgICAgICAgICBMT0coTmV0d29ya0NhY2hlLCAiKE5ldHdvcmtQcm9j ZXNzKSBOZXR3b3JrIGNhY2hlIHN0YXRpc3RpY3MgZGF0YWJhc2UgYm9vdHN0cmFwcGluZyBjb21w bGV0ZSwgZW50cmllcz0lbHUgdGltZT0lIiBQUklpNjQgIm1zIiwgc3RhdGljX2Nhc3Q8c2l6ZV90 PihtX2FwcHJveGltYXRlRW50cnlDb3VudCksIGVsYXBzZWRNUyk7CiAgICAgICAgIH0KICAgICB9 KTsKIH0KQEAgLTIxOSw3ICsyMTksNyBAQCB2b2lkIFN0YXRpc3RpY3M6OnJlY29yZE5vdFVzaW5n Q2FjaGVGb3JSZXF1ZXN0KHVpbnQ2NF90IHdlYlBhZ2VJRCwgY29uc3QgS2V5JiBrZQogICAgIHF1 ZXJ5V2FzRXZlclJlcXVlc3RlZChoYXNoLCBOZWVkVW5jYWNoZWRSZWFzb246Ok5vLCBbdGhpcywg aGFzaCwgcmVxdWVzdFVSTCwgd2ViUGFnZUlELCByZXRyaWV2ZURlY2lzaW9uXShib29sIHdhc0V2 ZXJSZXF1ZXN0ZWQsIGNvbnN0IE9wdGlvbmFsPFN0b3JlRGVjaXNpb24+JikgewogICAgICAgICBp ZiAod2FzRXZlclJlcXVlc3RlZCkgewogICAgICAgICAgICAgU3RyaW5nIGRpYWdub3N0aWNLZXkg PSByZXRyaWV2ZURlY2lzaW9uVG9EaWFnbm9zdGljS2V5KHJldHJpZXZlRGVjaXNpb24pOwotICAg ICAgICAgICAgTE9HKE5ldHdvcmtDYWNoZSwgIihOZXR3b3JrUHJvY2Vzcykgd2ViUGFnZUlEICVs bHU6ICVzIHdhcyBwcmV2aW91c2x5IHJlcXVlc3RlZCBidXQgd2UgYXJlIG5vdCB1c2luZyB0aGUg Y2FjaGUsIHJlYXNvbjogJXMiLCB3ZWJQYWdlSUQsIHJlcXVlc3RVUkwuc3RyaW5nKCkuYXNjaWko KS5kYXRhKCksIGRpYWdub3N0aWNLZXkudXRmOCgpLmRhdGEoKSk7CisgICAgICAgICAgICBMT0co TmV0d29ya0NhY2hlLCAiKE5ldHdvcmtQcm9jZXNzKSB3ZWJQYWdlSUQgJSIgUFJJdTY0ICI6ICVz IHdhcyBwcmV2aW91c2x5IHJlcXVlc3RlZCBidXQgd2UgYXJlIG5vdCB1c2luZyB0aGUgY2FjaGUs IHJlYXNvbjogJXMiLCB3ZWJQYWdlSUQsIHJlcXVlc3RVUkwuc3RyaW5nKCkuYXNjaWkoKS5kYXRh KCksIGRpYWdub3N0aWNLZXkudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgICAgICBOZXR3b3JrUHJv Y2Vzczo6c2luZ2xldG9uKCkubG9nRGlhZ25vc3RpY01lc3NhZ2VXaXRoVmFsdWUod2ViUGFnZUlE LCBXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ0tleXM6Om5ldHdvcmtDYWNoZUtleSgpLCBXZWJD b3JlOjpEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnVudXNlZEtleSgpLCBkaWFnbm9zdGljS2V5LCBX ZWJDb3JlOjpTaG91bGRTYW1wbGU6Olllcyk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAg ICBOZXR3b3JrUHJvY2Vzczo6c2luZ2xldG9uKCkubG9nRGlhZ25vc3RpY01lc3NhZ2VXaXRoVmFs dWUod2ViUGFnZUlELCBXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ0tleXM6Om5ldHdvcmtDYWNo ZUtleSgpLCBXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnJlcXVlc3RLZXkoKSwgV2Vi Q29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpuZXZlclNlZW5CZWZvcmVLZXkoKSwgV2ViQ29y ZTo6U2hvdWxkU2FtcGxlOjpZZXMpOwpAQCAtMjYwLDcgKzI2MCw3IEBAIHZvaWQgU3RhdGlzdGlj czo6cmVjb3JkUmV0cmlldmFsRmFpbHVyZSh1aW50NjRfdCB3ZWJQYWdlSUQsIGNvbnN0IEtleSYg a2V5LCBjb25zCiAgICAgcXVlcnlXYXNFdmVyUmVxdWVzdGVkKGhhc2gsIE5lZWRVbmNhY2hlZFJl YXNvbjo6WWVzLCBbdGhpcywgaGFzaCwgcmVxdWVzdFVSTCwgd2ViUGFnZUlEXShib29sIHdhc1By ZXZpb3VzbHlSZXF1ZXN0ZWQsIGNvbnN0IE9wdGlvbmFsPFN0b3JlRGVjaXNpb24+JiBzdG9yZURl Y2lzaW9uKSB7CiAgICAgICAgIGlmICh3YXNQcmV2aW91c2x5UmVxdWVzdGVkKSB7CiAgICAgICAg ICAgICBTdHJpbmcgZGlhZ25vc3RpY0tleSA9IHN0b3JlRGVjaXNpb25Ub0RpYWdub3N0aWNLZXko c3RvcmVEZWNpc2lvbi52YWx1ZSgpKTsKLSAgICAgICAgICAgIExPRyhOZXR3b3JrQ2FjaGUsICIo TmV0d29ya1Byb2Nlc3MpIHdlYlBhZ2VJRCAlbGx1OiAlcyB3YXMgcHJldmlvdXNseSByZXF1ZXN0 IGJ1dCBpcyBub3QgaW4gdGhlIGNhY2hlLCByZWFzb246ICVzIiwgd2ViUGFnZUlELCByZXF1ZXN0 VVJMLnN0cmluZygpLmFzY2lpKCkuZGF0YSgpLCBkaWFnbm9zdGljS2V5LnV0ZjgoKS5kYXRhKCkp OworICAgICAgICAgICAgTE9HKE5ldHdvcmtDYWNoZSwgIihOZXR3b3JrUHJvY2Vzcykgd2ViUGFn ZUlEICUiIFBSSXU2NCAiOiAlcyB3YXMgcHJldmlvdXNseSByZXF1ZXN0IGJ1dCBpcyBub3QgaW4g dGhlIGNhY2hlLCByZWFzb246ICVzIiwgd2ViUGFnZUlELCByZXF1ZXN0VVJMLnN0cmluZygpLmFz Y2lpKCkuZGF0YSgpLCBkaWFnbm9zdGljS2V5LnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICAgICAg TmV0d29ya1Byb2Nlc3M6OnNpbmdsZXRvbigpLmxvZ0RpYWdub3N0aWNNZXNzYWdlV2l0aFZhbHVl KHdlYlBhZ2VJRCwgV2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpuZXR3b3JrQ2FjaGVL ZXkoKSwgV2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpub3RJbkNhY2hlS2V5KCksIGRp YWdub3N0aWNLZXksIFdlYkNvcmU6OlNob3VsZFNhbXBsZTo6WWVzKTsKICAgICAgICAgfSBlbHNl IHsKICAgICAgICAgICAgIE5ldHdvcmtQcm9jZXNzOjpzaW5nbGV0b24oKS5sb2dEaWFnbm9zdGlj TWVzc2FnZVdpdGhWYWx1ZSh3ZWJQYWdlSUQsIFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5 czo6bmV0d29ya0NhY2hlS2V5KCksIFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6cmVx dWVzdEtleSgpLCBXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ0tleXM6Om5ldmVyU2VlbkJlZm9y ZUtleSgpLCBXZWJDb3JlOjpTaG91bGRTYW1wbGU6Olllcyk7CkBAIC0yOTAsMjYgKzI5MCwyNiBA QCB2b2lkIFN0YXRpc3RpY3M6OnJlY29yZFJldHJpZXZlZENhY2hlZEVudHJ5KHVpbnQ2NF90IHdl YlBhZ2VJRCwgY29uc3QgS2V5JiBrZXksCiB7CiAgICAgV2ViQ29yZTo6VVJMIHJlcXVlc3RVUkwg PSByZXF1ZXN0LnVybCgpOwogICAgIGlmIChkZWNpc2lvbiA9PSBVc2VEZWNpc2lvbjo6VXNlKSB7 Ci0gICAgICAgIExPRyhOZXR3b3JrQ2FjaGUsICIoTmV0d29ya1Byb2Nlc3MpIHdlYlBhZ2VJRCAl bGx1OiAlcyBpcyBpbiB0aGUgY2FjaGUgYW5kIGlzIHVzZWQiLCB3ZWJQYWdlSUQsIHJlcXVlc3RV Ukwuc3RyaW5nKCkuYXNjaWkoKS5kYXRhKCkpOworICAgICAgICBMT0coTmV0d29ya0NhY2hlLCAi KE5ldHdvcmtQcm9jZXNzKSB3ZWJQYWdlSUQgJSIgUFJJdTY0ICI6ICVzIGlzIGluIHRoZSBjYWNo ZSBhbmQgaXMgdXNlZCIsIHdlYlBhZ2VJRCwgcmVxdWVzdFVSTC5zdHJpbmcoKS5hc2NpaSgpLmRh dGEoKSk7CiAgICAgICAgIE5ldHdvcmtQcm9jZXNzOjpzaW5nbGV0b24oKS5sb2dEaWFnbm9zdGlj TWVzc2FnZVdpdGhSZXN1bHQod2ViUGFnZUlELCBXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ0tl eXM6Om5ldHdvcmtDYWNoZUtleSgpLCBXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnJl dHJpZXZhbEtleSgpLCBXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ1Jlc3VsdFBhc3MsIFdlYkNv cmU6OlNob3VsZFNhbXBsZTo6WWVzKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIGlm IChkZWNpc2lvbiA9PSBVc2VEZWNpc2lvbjo6VmFsaWRhdGUpIHsKLSAgICAgICAgTE9HKE5ldHdv cmtDYWNoZSwgIihOZXR3b3JrUHJvY2Vzcykgd2ViUGFnZUlEICVsbHU6ICVzIGlzIGluIHRoZSBj YWNoZSBidXQgbmVlZHMgcmV2YWxpZGF0aW9uIiwgd2ViUGFnZUlELCByZXF1ZXN0VVJMLnN0cmlu ZygpLmFzY2lpKCkuZGF0YSgpKTsKKyAgICAgICAgTE9HKE5ldHdvcmtDYWNoZSwgIihOZXR3b3Jr UHJvY2Vzcykgd2ViUGFnZUlEICUiIFBSSXU2NCAiOiAlcyBpcyBpbiB0aGUgY2FjaGUgYnV0IG5l ZWRzIHJldmFsaWRhdGlvbiIsIHdlYlBhZ2VJRCwgcmVxdWVzdFVSTC5zdHJpbmcoKS5hc2NpaSgp LmRhdGEoKSk7CiAgICAgICAgIE5ldHdvcmtQcm9jZXNzOjpzaW5nbGV0b24oKS5sb2dEaWFnbm9z dGljTWVzc2FnZVdpdGhWYWx1ZSh3ZWJQYWdlSUQsIFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5n S2V5czo6bmV0d29ya0NhY2hlS2V5KCksIFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6 cmV0cmlldmFsS2V5KCksIFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6bmVlZHNSZXZh bGlkYXRpb25LZXkoKSwgV2ViQ29yZTo6U2hvdWxkU2FtcGxlOjpZZXMpOwogICAgICAgICByZXR1 cm47CiAgICAgfQogCiAgICAgU3RyaW5nIGRpYWdub3N0aWNLZXkgPSBjYWNoZWRFbnRyeVJldXNl RmFpbHVyZVRvRGlhZ25vc3RpY0tleShkZWNpc2lvbik7Ci0gICAgTE9HKE5ldHdvcmtDYWNoZSwg IihOZXR3b3JrUHJvY2Vzcykgd2ViUGFnZUlEICVsbHU6ICVzIGlzIGluIHRoZSBjYWNoZSBidXQg d2Fzbid0IHVzZWQsIHJlYXNvbjogJXMiLCB3ZWJQYWdlSUQsIHJlcXVlc3RVUkwuc3RyaW5nKCku YXNjaWkoKS5kYXRhKCksIGRpYWdub3N0aWNLZXkudXRmOCgpLmRhdGEoKSk7CisgICAgTE9HKE5l dHdvcmtDYWNoZSwgIihOZXR3b3JrUHJvY2Vzcykgd2ViUGFnZUlEICUiIFBSSXU2NCAiOiAlcyBp cyBpbiB0aGUgY2FjaGUgYnV0IHdhc24ndCB1c2VkLCByZWFzb246ICVzIiwgd2ViUGFnZUlELCBy ZXF1ZXN0VVJMLnN0cmluZygpLmFzY2lpKCkuZGF0YSgpLCBkaWFnbm9zdGljS2V5LnV0ZjgoKS5k YXRhKCkpOwogICAgIE5ldHdvcmtQcm9jZXNzOjpzaW5nbGV0b24oKS5sb2dEaWFnbm9zdGljTWVz c2FnZVdpdGhWYWx1ZSh3ZWJQYWdlSUQsIFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6 bmV0d29ya0NhY2hlS2V5KCksIFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6dW51c2Fi bGVDYWNoZWRFbnRyeUtleSgpLCBkaWFnbm9zdGljS2V5LCBXZWJDb3JlOjpTaG91bGRTYW1wbGU6 Olllcyk7CiB9CiAKIHZvaWQgU3RhdGlzdGljczo6cmVjb3JkUmV2YWxpZGF0aW9uU3VjY2Vzcyh1 aW50NjRfdCB3ZWJQYWdlSUQsIGNvbnN0IEtleSYga2V5LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJj ZVJlcXVlc3QmIHJlcXVlc3QpCiB7CiAgICAgV2ViQ29yZTo6VVJMIHJlcXVlc3RVUkwgPSByZXF1 ZXN0LnVybCgpOwotICAgIExPRyhOZXR3b3JrQ2FjaGUsICIoTmV0d29ya1Byb2Nlc3MpIHdlYlBh Z2VJRCAlbGx1OiAlcyB3YXMgc3VjY2Vzc2Z1bGx5IHJldmFsaWRhdGVkIiwgd2ViUGFnZUlELCBy ZXF1ZXN0VVJMLnN0cmluZygpLmFzY2lpKCkuZGF0YSgpKTsKKyAgICBMT0coTmV0d29ya0NhY2hl LCAiKE5ldHdvcmtQcm9jZXNzKSB3ZWJQYWdlSUQgJSIgUFJJdTY0ICI6ICVzIHdhcyBzdWNjZXNz ZnVsbHkgcmV2YWxpZGF0ZWQiLCB3ZWJQYWdlSUQsIHJlcXVlc3RVUkwuc3RyaW5nKCkuYXNjaWko KS5kYXRhKCkpOwogCiAgICAgTmV0d29ya1Byb2Nlc3M6OnNpbmdsZXRvbigpLmxvZ0RpYWdub3N0 aWNNZXNzYWdlV2l0aFJlc3VsdCh3ZWJQYWdlSUQsIFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5n S2V5czo6bmV0d29ya0NhY2hlS2V5KCksIFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6 cmV2YWxpZGF0aW5nS2V5KCksIFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nUmVzdWx0UGFzcywg V2ViQ29yZTo6U2hvdWxkU2FtcGxlOjpZZXMpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9EYXRhYmFzZXMvSW5kZXhlZERCL1dlYklEQlNlcnZlckNvbm5lY3Rpb24u Y3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9EYXRhYmFzZXMvSW5kZXhlZERCL1dlYklE QlNlcnZlckNvbm5lY3Rpb24uY3BwCmluZGV4IGIwNDI1OTk5MjQ0MWE3MDNkZmFlMzUyMGQ4MjAx ZTk3ZjQ4NjZlYTAuLjU4MWIzZjg3ZjE3OWU2NGNmMDczMjFkNWFkOTVmYTkwOGQ1YTFhYmYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvRGF0YWJhc2VzL0luZGV4ZWREQi9X ZWJJREJTZXJ2ZXJDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L0RhdGFiYXNlcy9JbmRleGVkREIvV2ViSURCU2VydmVyQ29ubmVjdGlvbi5jcHAKQEAgLTk2LDE0 ICs5NiwxNCBAQCB2b2lkIFdlYklEQlNlcnZlckNvbm5lY3Rpb246OmRlbGV0ZURhdGFiYXNlKGNv bnN0IFN0cmluZyYgbmFtZSwgQm9vbENhbGxiYWNrRnVuYwogICAgIEFTU0VSVCghbV9zZXJ2ZXJS ZXF1ZXN0cy5jb250YWlucyhyZXF1ZXN0SUQpKTsKICAgICBtX3NlcnZlclJlcXVlc3RzLmFkZChy ZXF1ZXN0SUQsIHNlcnZlclJlcXVlc3QucmVsZWFzZSgpKTsKIAotICAgIExPRyhJREIsICJXZWJQ cm9jZXNzIGRlbGV0ZURhdGFiYXNlIHJlcXVlc3QgSUQgJWxsdSIsIHJlcXVlc3RJRCk7CisgICAg TE9HKElEQiwgIldlYlByb2Nlc3MgZGVsZXRlRGF0YWJhc2UgcmVxdWVzdCBJRCAlIiBQUkl1NjQs IHJlcXVlc3RJRCk7CiAKICAgICBzZW5kKE1lc3NhZ2VzOjpEYXRhYmFzZVByb2Nlc3NJREJDb25u ZWN0aW9uOjpEZWxldGVEYXRhYmFzZShyZXF1ZXN0SUQsIG5hbWUpKTsKIH0KIAogdm9pZCBXZWJJ REJTZXJ2ZXJDb25uZWN0aW9uOjpkaWREZWxldGVEYXRhYmFzZSh1aW50NjRfdCByZXF1ZXN0SUQs IGJvb2wgc3VjY2VzcykKIHsKLSAgICBMT0coSURCLCAiV2ViUHJvY2VzcyBkaWREZWxldGVEYXRh YmFzZSByZXF1ZXN0IElEICVsbHUiLCByZXF1ZXN0SUQpOworICAgIExPRyhJREIsICJXZWJQcm9j ZXNzIGRpZERlbGV0ZURhdGFiYXNlIHJlcXVlc3QgSUQgJSIgUFJJdTY0LCByZXF1ZXN0SUQpOwog CiAgICAgUmVmUHRyPEFzeW5jUmVxdWVzdD4gc2VydmVyUmVxdWVzdCA9IG1fc2VydmVyUmVxdWVz dHMudGFrZShyZXF1ZXN0SUQpOwogCkBAIC0xMjYsMTQgKzEyNiwxNCBAQCB2b2lkIFdlYklEQlNl cnZlckNvbm5lY3Rpb246OmdldE9yRXN0YWJsaXNoSURCRGF0YWJhc2VNZXRhZGF0YShHZXRJREJE YXRhYmFzZU1ldAogICAgIEFTU0VSVCghbV9zZXJ2ZXJSZXF1ZXN0cy5jb250YWlucyhyZXF1ZXN0 SUQpKTsKICAgICBtX3NlcnZlclJlcXVlc3RzLmFkZChyZXF1ZXN0SUQsIHNlcnZlclJlcXVlc3Qu cmVsZWFzZSgpKTsKIAotICAgIExPRyhJREIsICJXZWJQcm9jZXNzIGdldE9yRXN0YWJsaXNoSURC RGF0YWJhc2VNZXRhZGF0YSByZXF1ZXN0IElEICVsbHUiLCByZXF1ZXN0SUQpOworICAgIExPRyhJ REIsICJXZWJQcm9jZXNzIGdldE9yRXN0YWJsaXNoSURCRGF0YWJhc2VNZXRhZGF0YSByZXF1ZXN0 IElEICUiIFBSSXU2NCwgcmVxdWVzdElEKTsKIAogICAgIHNlbmQoTWVzc2FnZXM6OkRhdGFiYXNl UHJvY2Vzc0lEQkNvbm5lY3Rpb246OkdldE9yRXN0YWJsaXNoSURCRGF0YWJhc2VNZXRhZGF0YShy ZXF1ZXN0SUQpKTsKIH0KIAogdm9pZCBXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpkaWRHZXRPckVz dGFibGlzaElEQkRhdGFiYXNlTWV0YWRhdGEodWludDY0X3QgcmVxdWVzdElELCBib29sIHN1Y2Nl c3MsIGNvbnN0IElEQkRhdGFiYXNlTWV0YWRhdGEmIG1ldGFkYXRhKQogewotICAgIExPRyhJREIs ICJXZWJQcm9jZXNzIGRpZEdldE9yRXN0YWJsaXNoSURCRGF0YWJhc2VNZXRhZGF0YSByZXF1ZXN0 IElEICVsbHUiLCByZXF1ZXN0SUQpOworICAgIExPRyhJREIsICJXZWJQcm9jZXNzIGRpZEdldE9y RXN0YWJsaXNoSURCRGF0YWJhc2VNZXRhZGF0YSByZXF1ZXN0IElEICUiIFBSSXU2NCwgcmVxdWVz dElEKTsKIAogICAgIFJlZlB0cjxBc3luY1JlcXVlc3Q+IHNlcnZlclJlcXVlc3QgPSBtX3NlcnZl clJlcXVlc3RzLnRha2UocmVxdWVzdElEKTsKIApAQCAtMTY5LDcgKzE2OSw3IEBAIHZvaWQgV2Vi SURCU2VydmVyQ29ubmVjdGlvbjo6b3BlblRyYW5zYWN0aW9uKGludDY0X3QgdHJhbnNhY3Rpb25J RCwgY29uc3QgSGFzaFNlCiAgICAgQVNTRVJUKCFtX3NlcnZlclJlcXVlc3RzLmNvbnRhaW5zKHJl cXVlc3RJRCkpOwogICAgIG1fc2VydmVyUmVxdWVzdHMuYWRkKHJlcXVlc3RJRCwgc2VydmVyUmVx dWVzdC5yZWxlYXNlKCkpOwogCi0gICAgTE9HKElEQiwgIldlYlByb2Nlc3Mgb3BlblRyYW5zYWN0 aW9uIElEICVsbGkgKHJlcXVlc3QgSUQgJWxsdSkiLCB0cmFuc2FjdGlvbklELCByZXF1ZXN0SUQp OworICAgIExPRyhJREIsICJXZWJQcm9jZXNzIG9wZW5UcmFuc2FjdGlvbiBJRCAlIiBQUklpNjQg IiAocmVxdWVzdCBJRCAlIiBQUkl1NjQgIikiLCB0cmFuc2FjdGlvbklELCByZXF1ZXN0SUQpOwog CiAgICAgVmVjdG9yPGludDY0X3Q+IG9iamVjdFN0b3JlSURWZWN0b3I7CiAgICAgY29weVRvVmVj dG9yKG9iamVjdFN0b3JlSURzLCBvYmplY3RTdG9yZUlEVmVjdG9yKTsKQEAgLTE3OCw3ICsxNzgs NyBAQCB2b2lkIFdlYklEQlNlcnZlckNvbm5lY3Rpb246Om9wZW5UcmFuc2FjdGlvbihpbnQ2NF90 IHRyYW5zYWN0aW9uSUQsIGNvbnN0IEhhc2hTZQogCiB2b2lkIFdlYklEQlNlcnZlckNvbm5lY3Rp b246OmRpZE9wZW5UcmFuc2FjdGlvbih1aW50NjRfdCByZXF1ZXN0SUQsIGJvb2wgc3VjY2VzcykK IHsKLSAgICBMT0coSURCLCAiV2ViUHJvY2VzcyBkaWRPcGVuVHJhbnNhY3Rpb24gcmVxdWVzdCBJ RCAlbGx1IiwgcmVxdWVzdElEKTsKKyAgICBMT0coSURCLCAiV2ViUHJvY2VzcyBkaWRPcGVuVHJh bnNhY3Rpb24gcmVxdWVzdCBJRCAlIiBQUkl1NjQsIHJlcXVlc3RJRCk7CiAKICAgICBSZWZQdHI8 QXN5bmNSZXF1ZXN0PiBzZXJ2ZXJSZXF1ZXN0ID0gbV9zZXJ2ZXJSZXF1ZXN0cy50YWtlKHJlcXVl c3RJRCk7CiAKQEAgLTE5NiwxNCArMTk2LDE0IEBAIHZvaWQgV2ViSURCU2VydmVyQ29ubmVjdGlv bjo6YmVnaW5UcmFuc2FjdGlvbihpbnQ2NF90IHRyYW5zYWN0aW9uSUQsIHN0ZDo6ZnVuY3RpCiAg ICAgQVNTRVJUKCFtX3NlcnZlclJlcXVlc3RzLmNvbnRhaW5zKHJlcXVlc3RJRCkpOwogICAgIG1f c2VydmVyUmVxdWVzdHMuYWRkKHJlcXVlc3RJRCwgc2VydmVyUmVxdWVzdC5yZWxlYXNlKCkpOwog Ci0gICAgTE9HKElEQiwgIldlYlByb2Nlc3MgYmVnaW5UcmFuc2FjdGlvbiBJRCAlbGxpIChyZXF1 ZXN0IElEICVsbHUpIiwgdHJhbnNhY3Rpb25JRCwgcmVxdWVzdElEKTsKKyAgICBMT0coSURCLCAi V2ViUHJvY2VzcyBiZWdpblRyYW5zYWN0aW9uIElEICUiIFBSSWk2NCAiIChyZXF1ZXN0IElEICUi IFBSSXU2NCAiKSIsIHRyYW5zYWN0aW9uSUQsIHJlcXVlc3RJRCk7CiAKICAgICBzZW5kKE1lc3Nh Z2VzOjpEYXRhYmFzZVByb2Nlc3NJREJDb25uZWN0aW9uOjpCZWdpblRyYW5zYWN0aW9uKHJlcXVl c3RJRCwgdHJhbnNhY3Rpb25JRCkpOwogfQogCiB2b2lkIFdlYklEQlNlcnZlckNvbm5lY3Rpb246 OmRpZEJlZ2luVHJhbnNhY3Rpb24odWludDY0X3QgcmVxdWVzdElELCBib29sKQogewotICAgIExP RyhJREIsICJXZWJQcm9jZXNzIGRpZEJlZ2luVHJhbnNhY3Rpb24gcmVxdWVzdCBJRCAlbGx1Iiwg cmVxdWVzdElEKTsKKyAgICBMT0coSURCLCAiV2ViUHJvY2VzcyBkaWRCZWdpblRyYW5zYWN0aW9u IHJlcXVlc3QgSUQgJSIgUFJJdTY0LCByZXF1ZXN0SUQpOwogCiAgICAgUmVmUHRyPEFzeW5jUmVx dWVzdD4gc2VydmVyUmVxdWVzdCA9IG1fc2VydmVyUmVxdWVzdHMudGFrZShyZXF1ZXN0SUQpOwog CkBAIC0yMjUsMTQgKzIyNSwxNCBAQCB2b2lkIFdlYklEQlNlcnZlckNvbm5lY3Rpb246OmNvbW1p dFRyYW5zYWN0aW9uKGludDY0X3QgdHJhbnNhY3Rpb25JRCwgQm9vbENhbGxiYQogICAgIEFTU0VS VCghbV9zZXJ2ZXJSZXF1ZXN0cy5jb250YWlucyhyZXF1ZXN0SUQpKTsKICAgICBtX3NlcnZlclJl cXVlc3RzLmFkZChyZXF1ZXN0SUQsIHNlcnZlclJlcXVlc3QucmVsZWFzZSgpKTsKIAotICAgIExP RyhJREIsICJXZWJQcm9jZXNzIGNvbW1pdFRyYW5zYWN0aW9uIElEICVsbGkgKHJlcXVlc3QgSUQg JWxsdSkiLCB0cmFuc2FjdGlvbklELCByZXF1ZXN0SUQpOworICAgIExPRyhJREIsICJXZWJQcm9j ZXNzIGNvbW1pdFRyYW5zYWN0aW9uIElEICUiIFBSSWk2NCAiIChyZXF1ZXN0IElEICUiIFBSSXU2 NCAiKSIsIHRyYW5zYWN0aW9uSUQsIHJlcXVlc3RJRCk7CiAKICAgICBzZW5kKE1lc3NhZ2VzOjpE YXRhYmFzZVByb2Nlc3NJREJDb25uZWN0aW9uOjpDb21taXRUcmFuc2FjdGlvbihyZXF1ZXN0SUQs IHRyYW5zYWN0aW9uSUQpKTsKIH0KIAogdm9pZCBXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpkaWRD b21taXRUcmFuc2FjdGlvbih1aW50NjRfdCByZXF1ZXN0SUQsIGJvb2wgc3VjY2VzcykKIHsKLSAg ICBMT0coSURCLCAiV2ViUHJvY2VzcyBkaWRDb21taXRUcmFuc2FjdGlvbiByZXF1ZXN0IElEICVs bHUiLCByZXF1ZXN0SUQpOworICAgIExPRyhJREIsICJXZWJQcm9jZXNzIGRpZENvbW1pdFRyYW5z YWN0aW9uIHJlcXVlc3QgSUQgJSIgUFJJdTY0LCByZXF1ZXN0SUQpOwogCiAgICAgUmVmUHRyPEFz eW5jUmVxdWVzdD4gc2VydmVyUmVxdWVzdCA9IG1fc2VydmVyUmVxdWVzdHMudGFrZShyZXF1ZXN0 SUQpOwogCkBAIC0yNTAsMTQgKzI1MCwxNCBAQCB2b2lkIFdlYklEQlNlcnZlckNvbm5lY3Rpb246 OnJlc2V0VHJhbnNhY3Rpb24oaW50NjRfdCB0cmFuc2FjdGlvbklELCBzdGQ6OmZ1bmN0aQogICAg IEFTU0VSVCghbV9zZXJ2ZXJSZXF1ZXN0cy5jb250YWlucyhyZXF1ZXN0SUQpKTsKICAgICBtX3Nl cnZlclJlcXVlc3RzLmFkZChyZXF1ZXN0SUQsIHNlcnZlclJlcXVlc3QucmVsZWFzZSgpKTsKIAot ICAgIExPRyhJREIsICJXZWJQcm9jZXNzIHJlc2V0VHJhbnNhY3Rpb24gSUQgJWxsaSAocmVxdWVz dCBJRCAlbGx1KSIsIHRyYW5zYWN0aW9uSUQsIHJlcXVlc3RJRCk7CisgICAgTE9HKElEQiwgIldl YlByb2Nlc3MgcmVzZXRUcmFuc2FjdGlvbiBJRCAlIiBQUklpNjQgIiAocmVxdWVzdCBJRCAlIiBQ Ukl1NjQgIikiLCB0cmFuc2FjdGlvbklELCByZXF1ZXN0SUQpOwogCiAgICAgc2VuZChNZXNzYWdl czo6RGF0YWJhc2VQcm9jZXNzSURCQ29ubmVjdGlvbjo6UmVzZXRUcmFuc2FjdGlvbihyZXF1ZXN0 SUQsIHRyYW5zYWN0aW9uSUQpKTsKIH0KIAogdm9pZCBXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpk aWRSZXNldFRyYW5zYWN0aW9uKHVpbnQ2NF90IHJlcXVlc3RJRCwgYm9vbCkKIHsKLSAgICBMT0co SURCLCAiV2ViUHJvY2VzcyBkaWRSZXNldFRyYW5zYWN0aW9uIHJlcXVlc3QgSUQgJWxsdSIsIHJl cXVlc3RJRCk7CisgICAgTE9HKElEQiwgIldlYlByb2Nlc3MgZGlkUmVzZXRUcmFuc2FjdGlvbiBy ZXF1ZXN0IElEICUiIFBSSXU2NCwgcmVxdWVzdElEKTsKIAogICAgIFJlZlB0cjxBc3luY1JlcXVl c3Q+IHNlcnZlclJlcXVlc3QgPSBtX3NlcnZlclJlcXVlc3RzLnRha2UocmVxdWVzdElEKTsKIApA QCAtMjgyLDE0ICsyODIsMTQgQEAgdm9pZCBXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpyb2xsYmFj a1RyYW5zYWN0aW9uKGludDY0X3QgdHJhbnNhY3Rpb25JRCwgc3RkOjpmdW4KICAgICBBU1NFUlQo IW1fc2VydmVyUmVxdWVzdHMuY29udGFpbnMocmVxdWVzdElEKSk7CiAgICAgbV9zZXJ2ZXJSZXF1 ZXN0cy5hZGQocmVxdWVzdElELCBzZXJ2ZXJSZXF1ZXN0LnJlbGVhc2UoKSk7CiAKLSAgICBMT0co SURCLCAiV2ViUHJvY2VzcyByb2xsYmFja1RyYW5zYWN0aW9uIElEICVsbGkgKHJlcXVlc3QgSUQg JWxsdSkiLCB0cmFuc2FjdGlvbklELCByZXF1ZXN0SUQpOworICAgIExPRyhJREIsICJXZWJQcm9j ZXNzIHJvbGxiYWNrVHJhbnNhY3Rpb24gSUQgJSIgUFJJaTY0ICIgKHJlcXVlc3QgSUQgJSIgUFJJ dTY0ICIpIiwgdHJhbnNhY3Rpb25JRCwgcmVxdWVzdElEKTsKIAogICAgIHNlbmQoTWVzc2FnZXM6 OkRhdGFiYXNlUHJvY2Vzc0lEQkNvbm5lY3Rpb246OlJvbGxiYWNrVHJhbnNhY3Rpb24ocmVxdWVz dElELCB0cmFuc2FjdGlvbklEKSk7CiB9CiAKIHZvaWQgV2ViSURCU2VydmVyQ29ubmVjdGlvbjo6 ZGlkUm9sbGJhY2tUcmFuc2FjdGlvbih1aW50NjRfdCByZXF1ZXN0SUQsIGJvb2wpCiB7Ci0gICAg TE9HKElEQiwgIldlYlByb2Nlc3MgZGlkUm9sbGJhY2tUcmFuc2FjdGlvbiByZXF1ZXN0IElEICVs bHUiLCByZXF1ZXN0SUQpOworICAgIExPRyhJREIsICJXZWJQcm9jZXNzIGRpZFJvbGxiYWNrVHJh bnNhY3Rpb24gcmVxdWVzdCBJRCAlIiBQUkl1NjQsIHJlcXVlc3RJRCk7CiAKICAgICBSZWZQdHI8 QXN5bmNSZXF1ZXN0PiBzZXJ2ZXJSZXF1ZXN0ID0gbV9zZXJ2ZXJSZXF1ZXN0cy50YWtlKHJlcXVl c3RJRCk7CiAKQEAgLTMyMywxNCArMzIzLDE0IEBAIHZvaWQgV2ViSURCU2VydmVyQ29ubmVjdGlv bjo6Y3JlYXRlT2JqZWN0U3RvcmUoSURCVHJhbnNhY3Rpb25CYWNrZW5kJiB0cmFuc2FjdGlvCiAg ICAgQVNTRVJUKCFtX3NlcnZlclJlcXVlc3RzLmNvbnRhaW5zKHJlcXVlc3RJRCkpOwogICAgIG1f c2VydmVyUmVxdWVzdHMuYWRkKHJlcXVlc3RJRCwgc2VydmVyUmVxdWVzdC5yZWxlYXNlKCkpOwog Ci0gICAgTE9HKElEQiwgIldlYlByb2Nlc3MgY3JlYXRlT2JqZWN0U3RvcmUgJyVzJyBpbiB0cmFu c2FjdGlvbiBJRCAlbGx1IChyZXF1ZXN0IElEICVsbHUpIiwgb3BlcmF0aW9uLm9iamVjdFN0b3Jl TWV0YWRhdGEoKS5uYW1lLnV0ZjgoKS5kYXRhKCksIHRyYW5zYWN0aW9uLmlkKCksIHJlcXVlc3RJ RCk7CisgICAgTE9HKElEQiwgIldlYlByb2Nlc3MgY3JlYXRlT2JqZWN0U3RvcmUgJyVzJyBpbiB0 cmFuc2FjdGlvbiBJRCAlIiBQUklpNjQgIiAocmVxdWVzdCBJRCAlIiBQUkl1NjQgIikiLCBvcGVy YXRpb24ub2JqZWN0U3RvcmVNZXRhZGF0YSgpLm5hbWUudXRmOCgpLmRhdGEoKSwgdHJhbnNhY3Rp b24uaWQoKSwgcmVxdWVzdElEKTsKIAogICAgIHNlbmQoTWVzc2FnZXM6OkRhdGFiYXNlUHJvY2Vz c0lEQkNvbm5lY3Rpb246OkNyZWF0ZU9iamVjdFN0b3JlKHJlcXVlc3RJRCwgdHJhbnNhY3Rpb24u aWQoKSwgb3BlcmF0aW9uLm9iamVjdFN0b3JlTWV0YWRhdGEoKSkpOwogfQogCiB2b2lkIFdlYklE QlNlcnZlckNvbm5lY3Rpb246OmRpZENyZWF0ZU9iamVjdFN0b3JlKHVpbnQ2NF90IHJlcXVlc3RJ RCwgYm9vbCBzdWNjZXNzKQogewotICAgIExPRyhJREIsICJXZWJQcm9jZXNzIGRpZENyZWF0ZU9i amVjdFN0b3JlIHJlcXVlc3QgSUQgJWxsdSIsIHJlcXVlc3RJRCk7CisgICAgTE9HKElEQiwgIldl YlByb2Nlc3MgZGlkQ3JlYXRlT2JqZWN0U3RvcmUgcmVxdWVzdCBJRCAlIiBQUkl1NjQsIHJlcXVl c3RJRCk7CiAKICAgICBSZWZQdHI8QXN5bmNSZXF1ZXN0PiBzZXJ2ZXJSZXF1ZXN0ID0gbV9zZXJ2 ZXJSZXF1ZXN0cy50YWtlKHJlcXVlc3RJRCk7CiAKQEAgLTM1MiwxNCArMzUyLDE0IEBAIHZvaWQg V2ViSURCU2VydmVyQ29ubmVjdGlvbjo6Y3JlYXRlSW5kZXgoSURCVHJhbnNhY3Rpb25CYWNrZW5k JnRyYW5zYWN0aW9uLCBjb25zCiAgICAgQVNTRVJUKCFtX3NlcnZlclJlcXVlc3RzLmNvbnRhaW5z KHJlcXVlc3RJRCkpOwogICAgIG1fc2VydmVyUmVxdWVzdHMuYWRkKHJlcXVlc3RJRCwgc2VydmVy UmVxdWVzdC5yZWxlYXNlKCkpOwogCi0gICAgTE9HKElEQiwgIldlYlByb2Nlc3MgY3JlYXRlIGlu ZGV4IHJlcXVlc3QgSUQgJWxsdSIsIHJlcXVlc3RJRCk7CisgICAgTE9HKElEQiwgIldlYlByb2Nl c3MgY3JlYXRlIGluZGV4IHJlcXVlc3QgSUQgJSIgUFJJdTY0LCByZXF1ZXN0SUQpOwogCiAgICAg c2VuZChNZXNzYWdlczo6RGF0YWJhc2VQcm9jZXNzSURCQ29ubmVjdGlvbjo6Q3JlYXRlSW5kZXgo cmVxdWVzdElELCB0cmFuc2FjdGlvbi5pZCgpLCBvcGVyYXRpb24ub2JqZWN0U3RvcmVJRCgpLCBv cGVyYXRpb24uaWRiSW5kZXhNZXRhZGF0YSgpKSk7CiB9CiAKIHZvaWQgV2ViSURCU2VydmVyQ29u bmVjdGlvbjo6ZGlkQ3JlYXRlSW5kZXgodWludDY0X3QgcmVxdWVzdElELCBib29sIHN1Y2Nlc3Mp CiB7Ci0gICAgTE9HKElEQiwgIldlYlByb2Nlc3MgZGlkQ3JlYXRlSW5kZXggcmVxdWVzdCBJRCAl bGx1IiwgcmVxdWVzdElEKTsKKyAgICBMT0coSURCLCAiV2ViUHJvY2VzcyBkaWRDcmVhdGVJbmRl eCByZXF1ZXN0IElEICUiIFBSSXU2NCwgcmVxdWVzdElEKTsKIAogICAgIFJlZlB0cjxBc3luY1Jl cXVlc3Q+IHNlcnZlclJlcXVlc3QgPSBtX3NlcnZlclJlcXVlc3RzLnRha2UocmVxdWVzdElEKTsK IApAQCAtMzgxLDE0ICszODEsMTQgQEAgdm9pZCBXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpkZWxl dGVJbmRleChJREJUcmFuc2FjdGlvbkJhY2tlbmQmdHJhbnNhY3Rpb24sIGNvbnMKICAgICBBU1NF UlQoIW1fc2VydmVyUmVxdWVzdHMuY29udGFpbnMocmVxdWVzdElEKSk7CiAgICAgbV9zZXJ2ZXJS ZXF1ZXN0cy5hZGQocmVxdWVzdElELCBzZXJ2ZXJSZXF1ZXN0LnJlbGVhc2UoKSk7CiAKLSAgICBM T0coSURCLCAiV2ViUHJvY2VzcyBkZWxldGUgaW5kZXggcmVxdWVzdCBJRCAlbGx1IiwgcmVxdWVz dElEKTsKKyAgICBMT0coSURCLCAiV2ViUHJvY2VzcyBkZWxldGUgaW5kZXggcmVxdWVzdCBJRCAl IiBQUkl1NjQsIHJlcXVlc3RJRCk7CiAKICAgICBzZW5kKE1lc3NhZ2VzOjpEYXRhYmFzZVByb2Nl c3NJREJDb25uZWN0aW9uOjpEZWxldGVJbmRleChyZXF1ZXN0SUQsIHRyYW5zYWN0aW9uLmlkKCks IG9wZXJhdGlvbi5vYmplY3RTdG9yZUlEKCksIG9wZXJhdGlvbi5pZGJJbmRleE1ldGFkYXRhKCku aWQpKTsKIH0KIAogdm9pZCBXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpkaWREZWxldGVJbmRleCh1 aW50NjRfdCByZXF1ZXN0SUQsIGJvb2wgc3VjY2VzcykKIHsKLSAgICBMT0coSURCLCAiV2ViUHJv Y2VzcyBkaWREZWxldGVJbmRleCByZXF1ZXN0IElEICVsbHUiLCByZXF1ZXN0SUQpOworICAgIExP RyhJREIsICJXZWJQcm9jZXNzIGRpZERlbGV0ZUluZGV4IHJlcXVlc3QgSUQgJSIgUFJJdTY0LCBy ZXF1ZXN0SUQpOwogCiAgICAgUmVmUHRyPEFzeW5jUmVxdWVzdD4gc2VydmVyUmVxdWVzdCA9IG1f c2VydmVyUmVxdWVzdHMudGFrZShyZXF1ZXN0SUQpOwogCkBAIC00MTAsNyArNDEwLDcgQEAgdm9p ZCBXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpnZXQoSURCVHJhbnNhY3Rpb25CYWNrZW5kJiB0cmFu c2FjdGlvbiwgY29uc3QgR2V0T3AKICAgICBBU1NFUlQoIW1fc2VydmVyUmVxdWVzdHMuY29udGFp bnMocmVxdWVzdElEKSk7CiAgICAgbV9zZXJ2ZXJSZXF1ZXN0cy5hZGQocmVxdWVzdElELCBzZXJ2 ZXJSZXF1ZXN0LnJlbGVhc2UoKSk7CiAKLSAgICBMT0coSURCLCAiV2ViUHJvY2VzcyBnZXQgcmVx dWVzdCBJRCAlbGx1IiwgcmVxdWVzdElEKTsKKyAgICBMT0coSURCLCAiV2ViUHJvY2VzcyBnZXQg cmVxdWVzdCBJRCAlIiBQUkl1NjQsIHJlcXVlc3RJRCk7CiAKICAgICBBU1NFUlQob3BlcmF0aW9u LmtleVJhbmdlKCkpOwogCkBAIC00MjksNyArNDI5LDcgQEAgdm9pZCBXZWJJREJTZXJ2ZXJDb25u ZWN0aW9uOjpwdXQoSURCVHJhbnNhY3Rpb25CYWNrZW5kJiB0cmFuc2FjdGlvbiwgY29uc3QgUHV0 T3AKICAgICBBU1NFUlQoIW1fc2VydmVyUmVxdWVzdHMuY29udGFpbnMocmVxdWVzdElEKSk7CiAg ICAgbV9zZXJ2ZXJSZXF1ZXN0cy5hZGQocmVxdWVzdElELCBzZXJ2ZXJSZXF1ZXN0LnJlbGVhc2Uo KSk7CiAKLSAgICBMT0coSURCLCAiV2ViUHJvY2VzcyBwdXQgcmVxdWVzdCBJRCAlbGx1IiwgcmVx dWVzdElEKTsKKyAgICBMT0coSURCLCAiV2ViUHJvY2VzcyBwdXQgcmVxdWVzdCBJRCAlIiBQUkl1 NjQsIHJlcXVlc3RJRCk7CiAKICAgICBBU1NFUlQob3BlcmF0aW9uLnZhbHVlKCkpOwogCkBAIC00 NDcsNyArNDQ3LDcgQEAgdm9pZCBXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpwdXQoSURCVHJhbnNh Y3Rpb25CYWNrZW5kJiB0cmFuc2FjdGlvbiwgY29uc3QgUHV0T3AKIAogdm9pZCBXZWJJREJTZXJ2 ZXJDb25uZWN0aW9uOjpkaWRQdXRSZWNvcmQodWludDY0X3QgcmVxdWVzdElELCBjb25zdCBXZWJD b3JlOjpJREJLZXlEYXRhJiByZXN1bHRLZXksIHVpbnQzMl90IGVycm9yQ29kZSwgY29uc3QgU3Ry aW5nJiBlcnJvck1lc3NhZ2UpCiB7Ci0gICAgTE9HKElEQiwgIldlYlByb2Nlc3MgZGlkUHV0UmVj b3JkIHJlcXVlc3QgSUQgJWxsdSAoZXJyb3IgLSAlcykiLCByZXF1ZXN0SUQsIGVycm9yTWVzc2Fn ZS51dGY4KCkuZGF0YSgpKTsKKyAgICBMT0coSURCLCAiV2ViUHJvY2VzcyBkaWRQdXRSZWNvcmQg cmVxdWVzdCBJRCAlIiBQUkl1NjQgIiAoZXJyb3IgLSAlcykiLCByZXF1ZXN0SUQsIGVycm9yTWVz c2FnZS51dGY4KCkuZGF0YSgpKTsKIAogICAgIFJlZlB0cjxBc3luY1JlcXVlc3Q+IHNlcnZlclJl cXVlc3QgPSBtX3NlcnZlclJlcXVlc3RzLnRha2UocmVxdWVzdElEKTsKIApAQCAtNDU5LDcgKzQ1 OSw3IEBAIHZvaWQgV2ViSURCU2VydmVyQ29ubmVjdGlvbjo6ZGlkUHV0UmVjb3JkKHVpbnQ2NF90 IHJlcXVlc3RJRCwgY29uc3QgV2ViQ29yZTo6SURCCiAKIHZvaWQgV2ViSURCU2VydmVyQ29ubmVj dGlvbjo6ZGlkR2V0UmVjb3JkKHVpbnQ2NF90IHJlcXVlc3RJRCwgY29uc3QgV2ViQ29yZTo6SURC R2V0UmVzdWx0JiBnZXRSZXN1bHQsIHVpbnQzMl90IGVycm9yQ29kZSwgY29uc3QgU3RyaW5nJiBl cnJvck1lc3NhZ2UpCiB7Ci0gICAgTE9HKElEQiwgIldlYlByb2Nlc3MgZGlkR2V0UmVjb3JkIHJl cXVlc3QgSUQgJWxsdSAoZXJyb3IgLSAlcykiLCByZXF1ZXN0SUQsIGVycm9yTWVzc2FnZS51dGY4 KCkuZGF0YSgpKTsKKyAgICBMT0coSURCLCAiV2ViUHJvY2VzcyBkaWRHZXRSZWNvcmQgcmVxdWVz dCBJRCAlIiBQUkl1NjQgIiAoZXJyb3IgLSAlcykiLCByZXF1ZXN0SUQsIGVycm9yTWVzc2FnZS51 dGY4KCkuZGF0YSgpKTsKIAogICAgIFJlZlB0cjxBc3luY1JlcXVlc3Q+IHNlcnZlclJlcXVlc3Qg PSBtX3NlcnZlclJlcXVlc3RzLnRha2UocmVxdWVzdElEKTsKIApAQCAtNDcxLDcgKzQ3MSw3IEBA IHZvaWQgV2ViSURCU2VydmVyQ29ubmVjdGlvbjo6ZGlkR2V0UmVjb3JkKHVpbnQ2NF90IHJlcXVl c3RJRCwgY29uc3QgV2ViQ29yZTo6SURCCiAKIHZvaWQgV2ViSURCU2VydmVyQ29ubmVjdGlvbjo6 ZGlkT3BlbkN1cnNvcih1aW50NjRfdCByZXF1ZXN0SUQsIGludDY0X3QgY3Vyc29ySUQsIGNvbnN0 IElEQktleURhdGEmIGtleSwgY29uc3QgSURCS2V5RGF0YSYgcHJpbWFyeUtleSwgY29uc3QgSVBD OjpEYXRhUmVmZXJlbmNlJiB2YWx1ZURhdGEsIHVpbnQzMl90IGVycm9yQ29kZSwgY29uc3QgU3Ry aW5nJiBlcnJvck1lc3NhZ2UpCiB7Ci0gICAgTE9HKElEQiwgIldlYlByb2Nlc3MgZGlkT3BlbkN1 cnNvciByZXF1ZXN0IElEICVsbHUgKGVycm9yIC0gJXMpIiwgcmVxdWVzdElELCBlcnJvck1lc3Nh Z2UudXRmOCgpLmRhdGEoKSk7CisgICAgTE9HKElEQiwgIldlYlByb2Nlc3MgZGlkT3BlbkN1cnNv ciByZXF1ZXN0IElEICUiIFBSSXU2NCAiIChlcnJvciAtICVzKSIsIHJlcXVlc3RJRCwgZXJyb3JN ZXNzYWdlLnV0ZjgoKS5kYXRhKCkpOwogCiAgICAgUmVmUHRyPEFzeW5jUmVxdWVzdD4gc2VydmVy UmVxdWVzdCA9IG1fc2VydmVyUmVxdWVzdHMudGFrZShyZXF1ZXN0SUQpOwogCkBAIC00ODQsNyAr NDg0LDcgQEAgdm9pZCBXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpkaWRPcGVuQ3Vyc29yKHVpbnQ2 NF90IHJlcXVlc3RJRCwgaW50NjRfdCBjdXJzb3JJRCwKIAogdm9pZCBXZWJJREJTZXJ2ZXJDb25u ZWN0aW9uOjpkaWRBZHZhbmNlQ3Vyc29yKHVpbnQ2NF90IHJlcXVlc3RJRCwgY29uc3QgSURCS2V5 RGF0YSYga2V5LCBjb25zdCBJREJLZXlEYXRhJiBwcmltYXJ5S2V5LCBjb25zdCBJUEM6OkRhdGFS ZWZlcmVuY2UmIHZhbHVlRGF0YSwgdWludDMyX3QgZXJyb3JDb2RlLCBjb25zdCBTdHJpbmcmIGVy cm9yTWVzc2FnZSkKIHsKLSAgICBMT0coSURCLCAiV2ViUHJvY2VzcyBkaWRBZHZhbmNlQ3Vyc29y IHJlcXVlc3QgSUQgJWxsdSAoZXJyb3IgLSAlcykiLCByZXF1ZXN0SUQsIGVycm9yTWVzc2FnZS51 dGY4KCkuZGF0YSgpKTsKKyAgICBMT0coSURCLCAiV2ViUHJvY2VzcyBkaWRBZHZhbmNlQ3Vyc29y IHJlcXVlc3QgSUQgJSIgUFJJdTY0ICIgKGVycm9yIC0gJXMpIiwgcmVxdWVzdElELCBlcnJvck1l c3NhZ2UudXRmOCgpLmRhdGEoKSk7CiAKICAgICBSZWZQdHI8QXN5bmNSZXF1ZXN0PiBzZXJ2ZXJS ZXF1ZXN0ID0gbV9zZXJ2ZXJSZXF1ZXN0cy50YWtlKHJlcXVlc3RJRCk7CiAKQEAgLTQ5Nyw3ICs0 OTcsNyBAQCB2b2lkIFdlYklEQlNlcnZlckNvbm5lY3Rpb246OmRpZEFkdmFuY2VDdXJzb3IodWlu dDY0X3QgcmVxdWVzdElELCBjb25zdCBJREJLZXlEYQogCiB2b2lkIFdlYklEQlNlcnZlckNvbm5l Y3Rpb246OmRpZEl0ZXJhdGVDdXJzb3IodWludDY0X3QgcmVxdWVzdElELCBjb25zdCBJREJLZXlE YXRhJiBrZXksIGNvbnN0IElEQktleURhdGEmIHByaW1hcnlLZXksIGNvbnN0IElQQzo6RGF0YVJl ZmVyZW5jZSYgdmFsdWVEYXRhLCB1aW50MzJfdCBlcnJvckNvZGUsIGNvbnN0IFN0cmluZyYgZXJy b3JNZXNzYWdlKQogewotICAgIExPRyhJREIsICJXZWJQcm9jZXNzIGRpZEl0ZXJhdGVDdXJzb3Ig cmVxdWVzdCBJRCAlbGx1IChlcnJvciAtICVzKSIsIHJlcXVlc3RJRCwgZXJyb3JNZXNzYWdlLnV0 ZjgoKS5kYXRhKCkpOworICAgIExPRyhJREIsICJXZWJQcm9jZXNzIGRpZEl0ZXJhdGVDdXJzb3Ig cmVxdWVzdCBJRCAlIiBQUkl1NjQgIiAoZXJyb3IgLSAlcykiLCByZXF1ZXN0SUQsIGVycm9yTWVz c2FnZS51dGY4KCkuZGF0YSgpKTsKIAogICAgIFJlZlB0cjxBc3luY1JlcXVlc3Q+IHNlcnZlclJl cXVlc3QgPSBtX3NlcnZlclJlcXVlc3RzLnRha2UocmVxdWVzdElEKTsKIApAQCAtNTIwLDE0ICs1 MjAsMTQgQEAgdm9pZCBXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpjb3VudChJREJUcmFuc2FjdGlv bkJhY2tlbmQmIHRyYW5zYWN0aW9uLCBjb25zdCBDb3UKICAgICBBU1NFUlQoIW1fc2VydmVyUmVx dWVzdHMuY29udGFpbnMocmVxdWVzdElEKSk7CiAgICAgbV9zZXJ2ZXJSZXF1ZXN0cy5hZGQocmVx dWVzdElELCBzZXJ2ZXJSZXF1ZXN0LnJlbGVhc2UoKSk7CiAKLSAgICBMT0coSURCLCAiV2ViUHJv Y2VzcyBjb3VudCByZXF1ZXN0IElEICVsbHUiLCByZXF1ZXN0SUQpOworICAgIExPRyhJREIsICJX ZWJQcm9jZXNzIGNvdW50IHJlcXVlc3QgSUQgJSIgUFJJdTY0LCByZXF1ZXN0SUQpOwogCiAgICAg c2VuZChNZXNzYWdlczo6RGF0YWJhc2VQcm9jZXNzSURCQ29ubmVjdGlvbjo6Q291bnQocmVxdWVz dElELCB0cmFuc2FjdGlvbi5pZCgpLCBvcGVyYXRpb24ub2JqZWN0U3RvcmVJRCgpLCBvcGVyYXRp b24uaW5kZXhJRCgpLCBJREJLZXlSYW5nZURhdGEob3BlcmF0aW9uLmtleVJhbmdlKCkpKSk7CiB9 CiAKIHZvaWQgV2ViSURCU2VydmVyQ29ubmVjdGlvbjo6ZGlkQ291bnQodWludDY0X3QgcmVxdWVz dElELCBpbnQ2NF90IGNvdW50LCB1aW50MzJfdCBlcnJvckNvZGUsIGNvbnN0IFN0cmluZyYgZXJy b3JNZXNzYWdlKQogewotICAgIExPRyhJREIsICJXZWJQcm9jZXNzIGRpZENvdW50ICVsbGkgcmVx dWVzdCBJRCAlbGx1IChlcnJvciAtICVzKSIsIGNvdW50LCByZXF1ZXN0SUQsIGVycm9yTWVzc2Fn ZS51dGY4KCkuZGF0YSgpKTsKKyAgICBMT0coSURCLCAiV2ViUHJvY2VzcyBkaWRDb3VudCAlIiBQ UklpNjQgIiByZXF1ZXN0IElEICUiIFBSSXU2NCAiIChlcnJvciAtICVzKSIsIGNvdW50LCByZXF1 ZXN0SUQsIGVycm9yTWVzc2FnZS51dGY4KCkuZGF0YSgpKTsKIAogICAgIFJlZlB0cjxBc3luY1Jl cXVlc3Q+IHNlcnZlclJlcXVlc3QgPSBtX3NlcnZlclJlcXVlc3RzLnRha2UocmVxdWVzdElEKTsK IApAQCAtNTQ5LDE0ICs1NDksMTQgQEAgdm9pZCBXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpkZWxl dGVSYW5nZShJREJUcmFuc2FjdGlvbkJhY2tlbmQmIHRyYW5zYWN0aW9uLCBjb24KICAgICBBU1NF UlQoIW1fc2VydmVyUmVxdWVzdHMuY29udGFpbnMocmVxdWVzdElEKSk7CiAgICAgbV9zZXJ2ZXJS ZXF1ZXN0cy5hZGQocmVxdWVzdElELCBzZXJ2ZXJSZXF1ZXN0LnJlbGVhc2UoKSk7CiAKLSAgICBM T0coSURCLCAiV2ViUHJvY2VzcyBkZWxldGVSYW5nZSByZXF1ZXN0IElEICVsbHUiLCByZXF1ZXN0 SUQpOworICAgIExPRyhJREIsICJXZWJQcm9jZXNzIGRlbGV0ZVJhbmdlIHJlcXVlc3QgSUQgJSIg UFJJdTY0LCByZXF1ZXN0SUQpOwogCiAgICAgc2VuZChNZXNzYWdlczo6RGF0YWJhc2VQcm9jZXNz SURCQ29ubmVjdGlvbjo6RGVsZXRlUmFuZ2UocmVxdWVzdElELCB0cmFuc2FjdGlvbi5pZCgpLCBv cGVyYXRpb24ub2JqZWN0U3RvcmVJRCgpLCBJREJLZXlSYW5nZURhdGEob3BlcmF0aW9uLmtleVJh bmdlKCkpKSk7CiB9CiAKIHZvaWQgV2ViSURCU2VydmVyQ29ubmVjdGlvbjo6ZGlkRGVsZXRlUmFu Z2UodWludDY0X3QgcmVxdWVzdElELCB1aW50MzJfdCBlcnJvckNvZGUsIGNvbnN0IFN0cmluZyYg ZXJyb3JNZXNzYWdlKQogewotICAgIExPRyhJREIsICJXZWJQcm9jZXNzIGRpZERlbGV0ZVJhbmdl IHJlcXVlc3QgSUQgJWxsdSIsIHJlcXVlc3RJRCk7CisgICAgTE9HKElEQiwgIldlYlByb2Nlc3Mg ZGlkRGVsZXRlUmFuZ2UgcmVxdWVzdCBJRCAlIiBQUkl1NjQsIHJlcXVlc3RJRCk7CiAKICAgICBS ZWZQdHI8QXN5bmNSZXF1ZXN0PiBzZXJ2ZXJSZXF1ZXN0ID0gbV9zZXJ2ZXJSZXF1ZXN0cy50YWtl KHJlcXVlc3RJRCk7CiAKQEAgLTU3OCwxNCArNTc4LDE0IEBAIHZvaWQgV2ViSURCU2VydmVyQ29u bmVjdGlvbjo6Y2xlYXJPYmplY3RTdG9yZShJREJUcmFuc2FjdGlvbkJhY2tlbmQmLCBjb25zdCBD bGVhCiAgICAgQVNTRVJUKCFtX3NlcnZlclJlcXVlc3RzLmNvbnRhaW5zKHJlcXVlc3RJRCkpOwog ICAgIG1fc2VydmVyUmVxdWVzdHMuYWRkKHJlcXVlc3RJRCwgc2VydmVyUmVxdWVzdC5yZWxlYXNl KCkpOwogCi0gICAgTE9HKElEQiwgIldlYlByb2Nlc3MgY2xlYXJPYmplY3RTdG9yZSByZXF1ZXN0 IElEICVsbHUiLCByZXF1ZXN0SUQpOworICAgIExPRyhJREIsICJXZWJQcm9jZXNzIGNsZWFyT2Jq ZWN0U3RvcmUgcmVxdWVzdCBJRCAlIiBQUkl1NjQsIHJlcXVlc3RJRCk7CiAKICAgICBzZW5kKE1l c3NhZ2VzOjpEYXRhYmFzZVByb2Nlc3NJREJDb25uZWN0aW9uOjpDbGVhck9iamVjdFN0b3JlKHJl cXVlc3RJRCwgb3BlcmF0aW9uLnRyYW5zYWN0aW9uKCktPmlkKCksIG9wZXJhdGlvbi5vYmplY3RT dG9yZUlEKCkpKTsKIH0KIAogdm9pZCBXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpkaWRDbGVhck9i amVjdFN0b3JlKHVpbnQ2NF90IHJlcXVlc3RJRCwgYm9vbCBzdWNjZXNzKQogewotICAgIExPRyhJ REIsICJXZWJQcm9jZXNzIGRpZENsZWFyT2JqZWN0U3RvcmUgcmVxdWVzdCBJRCAlbGx1IiwgcmVx dWVzdElEKTsKKyAgICBMT0coSURCLCAiV2ViUHJvY2VzcyBkaWRDbGVhck9iamVjdFN0b3JlIHJl cXVlc3QgSUQgJSIgUFJJdTY0LCByZXF1ZXN0SUQpOwogCiAgICAgUmVmUHRyPEFzeW5jUmVxdWVz dD4gc2VydmVyUmVxdWVzdCA9IG1fc2VydmVyUmVxdWVzdHMudGFrZShyZXF1ZXN0SUQpOwogCkBA IC02MDcsMTQgKzYwNywxNCBAQCB2b2lkIFdlYklEQlNlcnZlckNvbm5lY3Rpb246OmRlbGV0ZU9i amVjdFN0b3JlKElEQlRyYW5zYWN0aW9uQmFja2VuZCYsIGNvbnN0IERlbAogICAgIEFTU0VSVCgh bV9zZXJ2ZXJSZXF1ZXN0cy5jb250YWlucyhyZXF1ZXN0SUQpKTsKICAgICBtX3NlcnZlclJlcXVl c3RzLmFkZChyZXF1ZXN0SUQsIHNlcnZlclJlcXVlc3QucmVsZWFzZSgpKTsKIAotICAgIExPRyhJ REIsICJXZWJQcm9jZXNzIGRlbGV0ZU9iamVjdFN0b3JlIHJlcXVlc3QgSUQgJWxsdSIsIHJlcXVl c3RJRCk7CisgICAgTE9HKElEQiwgIldlYlByb2Nlc3MgZGVsZXRlT2JqZWN0U3RvcmUgcmVxdWVz dCBJRCAlIiBQUkl1NjQsIHJlcXVlc3RJRCk7CiAKICAgICBzZW5kKE1lc3NhZ2VzOjpEYXRhYmFz ZVByb2Nlc3NJREJDb25uZWN0aW9uOjpEZWxldGVPYmplY3RTdG9yZShyZXF1ZXN0SUQsIG9wZXJh dGlvbi50cmFuc2FjdGlvbigpLT5pZCgpLCBvcGVyYXRpb24ub2JqZWN0U3RvcmVNZXRhZGF0YSgp LmlkKSk7CiB9CiAKIHZvaWQgV2ViSURCU2VydmVyQ29ubmVjdGlvbjo6ZGlkRGVsZXRlT2JqZWN0 U3RvcmUodWludDY0X3QgcmVxdWVzdElELCBib29sIHN1Y2Nlc3MpCiB7Ci0gICAgTE9HKElEQiwg IldlYlByb2Nlc3MgZGlkRGVsZXRlT2JqZWN0U3RvcmUgcmVxdWVzdCBJRCAlbGx1IiwgcmVxdWVz dElEKTsKKyAgICBMT0coSURCLCAiV2ViUHJvY2VzcyBkaWREZWxldGVPYmplY3RTdG9yZSByZXF1 ZXN0IElEICUiIFBSSXU2NCwgcmVxdWVzdElEKTsKIAogICAgIFJlZlB0cjxBc3luY1JlcXVlc3Q+ IHNlcnZlclJlcXVlc3QgPSBtX3NlcnZlclJlcXVlc3RzLnRha2UocmVxdWVzdElEKTsKIApAQCAt NjM2LDE0ICs2MzYsMTQgQEAgdm9pZCBXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpjaGFuZ2VEYXRh YmFzZVZlcnNpb24oSURCVHJhbnNhY3Rpb25CYWNrZW5kJiwgY29uc3QKICAgICBBU1NFUlQoIW1f c2VydmVyUmVxdWVzdHMuY29udGFpbnMocmVxdWVzdElEKSk7CiAgICAgbV9zZXJ2ZXJSZXF1ZXN0 cy5hZGQocmVxdWVzdElELCBzZXJ2ZXJSZXF1ZXN0LnJlbGVhc2UoKSk7CiAKLSAgICBMT0coSURC LCAiV2ViUHJvY2VzcyBjaGFuZ2VEYXRhYmFzZVZlcnNpb24gcmVxdWVzdCBJRCAlbGx1IiwgcmVx dWVzdElEKTsKKyAgICBMT0coSURCLCAiV2ViUHJvY2VzcyBjaGFuZ2VEYXRhYmFzZVZlcnNpb24g cmVxdWVzdCBJRCAlIiBQUkl1NjQsIHJlcXVlc3RJRCk7CiAKICAgICBzZW5kKE1lc3NhZ2VzOjpE YXRhYmFzZVByb2Nlc3NJREJDb25uZWN0aW9uOjpDaGFuZ2VEYXRhYmFzZVZlcnNpb24ocmVxdWVz dElELCBvcGVyYXRpb24udHJhbnNhY3Rpb24oKS0+aWQoKSwgc3RhdGljX2Nhc3Q8dWludDY0X3Q+ KG9wZXJhdGlvbi52ZXJzaW9uKCkpKSk7CiB9CiAKIHZvaWQgV2ViSURCU2VydmVyQ29ubmVjdGlv bjo6ZGlkQ2hhbmdlRGF0YWJhc2VWZXJzaW9uKHVpbnQ2NF90IHJlcXVlc3RJRCwgYm9vbCBzdWNj ZXNzKQogewotICAgIExPRyhJREIsICJXZWJQcm9jZXNzIGRpZENoYW5nZURhdGFiYXNlVmVyc2lv biByZXF1ZXN0IElEICVsbHUiLCByZXF1ZXN0SUQpOworICAgIExPRyhJREIsICJXZWJQcm9jZXNz IGRpZENoYW5nZURhdGFiYXNlVmVyc2lvbiByZXF1ZXN0IElEICUiIFBSSXU2NCwgcmVxdWVzdElE KTsKIAogICAgIFJlZlB0cjxBc3luY1JlcXVlc3Q+IHNlcnZlclJlcXVlc3QgPSBtX3NlcnZlclJl cXVlc3RzLnRha2UocmVxdWVzdElEKTsKIApAQCAtNjY1LDcgKzY2NSw3IEBAIHZvaWQgV2ViSURC U2VydmVyQ29ubmVjdGlvbjo6b3BlbkN1cnNvcihJREJUcmFuc2FjdGlvbkJhY2tlbmQmLCBjb25z dCBPcGVuQ3Vyc29yCiAgICAgQVNTRVJUKCFtX3NlcnZlclJlcXVlc3RzLmNvbnRhaW5zKHJlcXVl c3RJRCkpOwogICAgIG1fc2VydmVyUmVxdWVzdHMuYWRkKHJlcXVlc3RJRCwgc2VydmVyUmVxdWVz dC5yZWxlYXNlKCkpOwogCi0gICAgTE9HKElEQiwgIldlYlByb2Nlc3Mgb3BlbkN1cnNvciByZXF1 ZXN0IElEICVsbHUiLCByZXF1ZXN0SUQpOworICAgIExPRyhJREIsICJXZWJQcm9jZXNzIG9wZW5D dXJzb3IgcmVxdWVzdCBJRCAlIiBQUkl1NjQsIHJlcXVlc3RJRCk7CiAKICAgICBzZW5kKE1lc3Nh Z2VzOjpEYXRhYmFzZVByb2Nlc3NJREJDb25uZWN0aW9uOjpPcGVuQ3Vyc29yKHJlcXVlc3RJRCwg b3BlcmF0aW9uLnRyYW5zYWN0aW9uSUQoKSwgb3BlcmF0aW9uLm9iamVjdFN0b3JlSUQoKSwgb3Bl cmF0aW9uLmluZGV4SUQoKSwgc3RhdGljX2Nhc3Q8aW50NjRfdD4ob3BlcmF0aW9uLmRpcmVjdGlv bigpKSwgc3RhdGljX2Nhc3Q8aW50NjRfdD4ob3BlcmF0aW9uLmN1cnNvclR5cGUoKSksIHN0YXRp Y19jYXN0PGludDY0X3Q+KG9wZXJhdGlvbi50YXNrVHlwZSgpKSwgb3BlcmF0aW9uLmtleVJhbmdl KCkpKTsKIH0KQEAgLTY4Miw3ICs2ODIsNyBAQCB2b2lkIFdlYklEQlNlcnZlckNvbm5lY3Rpb246 OmN1cnNvckFkdmFuY2UoSURCQ3Vyc29yQmFja2VuZCYsIGNvbnN0IEN1cnNvckFkdmFuYwogICAg IEFTU0VSVCghbV9zZXJ2ZXJSZXF1ZXN0cy5jb250YWlucyhyZXF1ZXN0SUQpKTsKICAgICBtX3Nl cnZlclJlcXVlc3RzLmFkZChyZXF1ZXN0SUQsIHNlcnZlclJlcXVlc3QucmVsZWFzZSgpKTsKIAot ICAgIExPRyhJREIsICJXZWJQcm9jZXNzIGN1cnNvckFkdmFuY2UgcmVxdWVzdCBJRCAlbGx1Iiwg cmVxdWVzdElEKTsKKyAgICBMT0coSURCLCAiV2ViUHJvY2VzcyBjdXJzb3JBZHZhbmNlIHJlcXVl c3QgSUQgJSIgUFJJdTY0LCByZXF1ZXN0SUQpOwogCiAgICAgc2VuZChNZXNzYWdlczo6RGF0YWJh c2VQcm9jZXNzSURCQ29ubmVjdGlvbjo6Q3Vyc29yQWR2YW5jZShyZXF1ZXN0SUQsIG9wZXJhdGlv bi5jdXJzb3JJRCgpLCBvcGVyYXRpb24uY291bnQoKSkpOwogfQpAQCAtNjk5LDcgKzY5OSw3IEBA IHZvaWQgV2ViSURCU2VydmVyQ29ubmVjdGlvbjo6Y3Vyc29ySXRlcmF0ZShJREJDdXJzb3JCYWNr ZW5kJiwgY29uc3QgQ3Vyc29ySXRlcmF0CiAgICAgQVNTRVJUKCFtX3NlcnZlclJlcXVlc3RzLmNv bnRhaW5zKHJlcXVlc3RJRCkpOwogICAgIG1fc2VydmVyUmVxdWVzdHMuYWRkKHJlcXVlc3RJRCwg c2VydmVyUmVxdWVzdC5yZWxlYXNlKCkpOwogCi0gICAgTE9HKElEQiwgIldlYlByb2Nlc3MgY3Vy c29ySXRlcmF0ZSByZXF1ZXN0IElEICVsbHUiLCByZXF1ZXN0SUQpOworICAgIExPRyhJREIsICJX ZWJQcm9jZXNzIGN1cnNvckl0ZXJhdGUgcmVxdWVzdCBJRCAlIiBQUkl1NjQsIHJlcXVlc3RJRCk7 CiAKICAgICBzZW5kKE1lc3NhZ2VzOjpEYXRhYmFzZVByb2Nlc3NJREJDb25uZWN0aW9uOjpDdXJz b3JJdGVyYXRlKHJlcXVlc3RJRCwgb3BlcmF0aW9uLmN1cnNvcklEKCksIG9wZXJhdGlvbi5rZXko KSkpOwogfQo=