179428 2017-11-08 09:36:39 -0800 [Service Workers] Make sure SWServerRegistration update functions always message back the connection that scheduled the job 2017-11-15 09:40:35 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 179523 1 cdumez cdumez beidson commit-queue ggaren webkit-bug-importer youennf oldest_to_newest 1369456 0 cdumez 2017-11-08 09:36:39 -0800 [Service Workers] Make sure SWServerRegistration update functions always message back the connection that scheduled the job. 1369462 1 326335 cdumez 2017-11-08 09:42:45 -0800 Created attachment 326335 Patch 1369466 2 326336 cdumez 2017-11-08 09:49:11 -0800 Created attachment 326336 Patch 1369470 3 326337 cdumez 2017-11-08 10:02:32 -0800 Created attachment 326337 Patch 1369512 4 326337 cdumez 2017-11-08 12:02:29 -0800 Comment on attachment 326337 Patch Clearing flags on attachment: 326337 Committed r224590: <https://trac.webkit.org/changeset/224590> 1369513 5 cdumez 2017-11-08 12:02:31 -0800 All reviewed patches have been landed. Closing bug. 1371955 6 webkit-bug-importer 2017-11-15 09:40:35 -0800 <rdar://problem/35562209> 326335 2017-11-08 09:42:45 -0800 2017-11-08 09:49:10 -0800 Patch bug-179428-20171108094245.patch text/plain 10779 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0NTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmI5NzQwODg5OGZmZTk4 YmZhN2I0MWRmNDIwZDQwODVjZjQxYzFhZC4uNTFjZTdiMDViMTYwZDkyZjg2NjY3MDMzZTdhODMy MTlkNmJhZTE3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE3LTExLTA4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgW1NlcnZpY2UgV29ya2Vyc10g TWFrZSBzdXJlIFNXU2VydmVyUmVnaXN0cmF0aW9uIHVwZGF0ZSBmdW5jdGlvbnMgYWx3YXlzIG1l c3NhZ2UgYmFjayB0aGUgY29ubmVjdGlvbiB0aGF0IHNjaGVkdWxlZCB0aGUgam9iCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzk0MjgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHdvcmtlcnMvc2Vydmlj ZS9zZXJ2ZXIvU1dTZXJ2ZXJKb2JRdWV1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTV1NlcnZl ckpvYlF1ZXVlOjppbnN0YWxsKToKKyAgICAgICAgKFdlYkNvcmU6OlNXU2VydmVySm9iUXVldWU6 OmRpZEZpbmlzaEluc3RhbGwpOgorICAgICAgICAqIHdvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dT ZXJ2ZXJSZWdpc3RyYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1dTZXJ2ZXJSZWdpc3Ry YXRpb246OnVwZGF0ZVJlZ2lzdHJhdGlvblN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlNXU2Vy dmVyUmVnaXN0cmF0aW9uOjp1cGRhdGVXb3JrZXJTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpT V1NlcnZlclJlZ2lzdHJhdGlvbjo6ZmlyZVVwZGF0ZUZvdW5kRXZlbnQpOgorICAgICAgICAoV2Vi Q29yZTo6U1dTZXJ2ZXJSZWdpc3RyYXRpb246OmZpcmVQb3N0SW5zdGFsbEV2ZW50cyk6CisgICAg ICAgIChXZWJDb3JlOjpTV1NlcnZlclJlZ2lzdHJhdGlvbjo6Zm9yRWFjaENvbm5lY3Rpb24pOgor ICAgICAgICAqIHdvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJSZWdpc3RyYXRpb24uaDoK KworMjAxNy0xMS0wOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCiAgICAgICAg IFtTZXJ2aWNlIFdvcmtlcnNdIFN1cHBvcnQgd2FpdFVudGlsKCkgb24gdGhlICdpbnN0YWxsJyBl dmVudAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5 Mzk2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIv U1dTZXJ2ZXJKb2JRdWV1ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2Vy dmVyL1NXU2VydmVySm9iUXVldWUuY3BwCmluZGV4IDEwNTBhYTgxNjM5YjlhYmYzZGY4YjVjMjhj Y2IxYzYwOTJjNWJhMGQuLmFhZmI3MjBmZGY4NmU0YmQ5ZGI2NjFiZGVhY2MxMWQ1Yzg3MjAyMTgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2 ZXJKb2JRdWV1ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZl ci9TV1NlcnZlckpvYlF1ZXVlLmNwcApAQCAtMTE1LDE2ICsxMTUsMTggQEAgdm9pZCBTV1NlcnZl ckpvYlF1ZXVlOjppbnN0YWxsKFNXU2VydmVyUmVnaXN0cmF0aW9uJiByZWdpc3RyYXRpb24sIFNX U2VydmVyOjpDb24KICAgICBhdXRvKiB3b3JrZXIgPSBtX3NlcnZlci53b3JrZXJCeUlEKGluc3Rh bGxpbmdXb3JrZXIpOwogICAgIFJFTEVBU0VfQVNTRVJUKHdvcmtlcik7CiAKLSAgICByZWdpc3Ry YXRpb24udXBkYXRlUmVnaXN0cmF0aW9uU3RhdGUoU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvblN0 YXRlOjpJbnN0YWxsaW5nLCB3b3JrZXIpOwotICAgIHJlZ2lzdHJhdGlvbi51cGRhdGVXb3JrZXJT dGF0ZSgqd29ya2VyLCBTZXJ2aWNlV29ya2VyU3RhdGU6Okluc3RhbGxpbmcpOworICAgIGF1dG8m IGpvYiA9IGZpcnN0Sm9iKCk7CisKKyAgICByZWdpc3RyYXRpb24udXBkYXRlUmVnaXN0cmF0aW9u U3RhdGUoam9iLCBmaXJzdEpTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uU3RhdGU6Okluc3RhbGxp bmcsIHdvcmtlcik7CisgICAgcmVnaXN0cmF0aW9uLnVwZGF0ZVdvcmtlclN0YXRlKGpvYiwgKndv cmtlciwgU2VydmljZVdvcmtlclN0YXRlOjpJbnN0YWxsaW5nKTsKIAogICAgIC8vIEludm9rZSBS ZXNvbHZlIEpvYiBQcm9taXNlIHdpdGggam9iIGFuZCByZWdpc3RyYXRpb24uCi0gICAgbV9zZXJ2 ZXIucmVzb2x2ZVJlZ2lzdHJhdGlvbkpvYihmaXJzdEpvYigpLCByZWdpc3RyYXRpb24uZGF0YSgp KTsKKyAgICBtX3NlcnZlci5yZXNvbHZlUmVnaXN0cmF0aW9uSm9iKGpvYiwgcmVnaXN0cmF0aW9u LmRhdGEoKSk7CiAKICAgICAvLyBRdWV1ZSBhIHRhc2sgdG8gZmlyZSBhbiBldmVudCBuYW1lZCB1 cGRhdGVmb3VuZCBhdCBhbGwgdGhlIFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb24gb2JqZWN0cwog ICAgIC8vIGZvciBhbGwgdGhlIHNlcnZpY2Ugd29ya2VyIGNsaWVudHMgd2hvc2UgY3JlYXRpb24g VVJMIG1hdGNoZXMgcmVnaXN0cmF0aW9uJ3Mgc2NvcGUgdXJsIGFuZAogICAgIC8vIGFsbCB0aGUg c2VydmljZSB3b3JrZXJzIHdob3NlIGNvbnRhaW5pbmcgc2VydmljZSB3b3JrZXIgcmVnaXN0cmF0 aW9uIGlzIHJlZ2lzdHJhdGlvbi4KLSAgICByZWdpc3RyYXRpb24uZmlyZVVwZGF0ZUZvdW5kRXZl bnQoZmlyc3RKb2IoKS5jb25uZWN0aW9uSWRlbnRpZmllcigpKTsKKyAgICByZWdpc3RyYXRpb24u ZmlyZVVwZGF0ZUZvdW5kRXZlbnQoam9iKTsKIAogICAgIC8vIFF1ZXVlIGEgdGFzayB0byBmaXJl IHRoZSBJbnN0YWxsRXZlbnQuCiAgICAgbV9zZXJ2ZXIuZmlyZUluc3RhbGxFdmVudChjb25uZWN0 aW9uLCBpbnN0YWxsaW5nV29ya2VyKTsKQEAgLTEzNiwxNCArMTM4LDE2IEBAIHZvaWQgU1dTZXJ2 ZXJKb2JRdWV1ZTo6ZGlkRmluaXNoSW5zdGFsbChTV1NlcnZlcjo6Q29ubmVjdGlvbiYsIFNlcnZp Y2VXb3JrZXJJZGVuCiAgICAgYXV0byogcmVnaXN0cmF0aW9uID0gbV9zZXJ2ZXIuZ2V0UmVnaXN0 cmF0aW9uKG1fcmVnaXN0cmF0aW9uS2V5KTsKICAgICBBU1NFUlQocmVnaXN0cmF0aW9uKTsKIAor ICAgIGF1dG8mIGpvYiA9IGZpcnN0Sm9iKCk7CisKICAgICBpZiAoIXdhc1N1Y2Nlc3NmdWwpIHsK ICAgICAgICAgYXV0byogd29ya2VyID0gbV9zZXJ2ZXIud29ya2VyQnlJRChpZGVudGlmaWVyKTsK ICAgICAgICAgUkVMRUFTRV9BU1NFUlQod29ya2VyKTsKIAogICAgICAgICAvLyBSdW4gdGhlIFVw ZGF0ZSBXb3JrZXIgU3RhdGUgYWxnb3JpdGhtIHBhc3NpbmcgcmVnaXN0cmF0aW9uJ3MgaW5zdGFs bGluZyB3b3JrZXIgYW5kIHJlZHVuZGFudCBhcyB0aGUgYXJndW1lbnRzLgotICAgICAgICByZWdp c3RyYXRpb24tPnVwZGF0ZVdvcmtlclN0YXRlKCp3b3JrZXIsIFNlcnZpY2VXb3JrZXJTdGF0ZTo6 UmVkdW5kYW50KTsKKyAgICAgICAgcmVnaXN0cmF0aW9uLT51cGRhdGVXb3JrZXJTdGF0ZShqb2Is ICp3b3JrZXIsIFNlcnZpY2VXb3JrZXJTdGF0ZTo6UmVkdW5kYW50KTsKICAgICAgICAgLy8gUnVu IHRoZSBVcGRhdGUgUmVnaXN0cmF0aW9uIFN0YXRlIGFsZ29yaXRobSBwYXNzaW5nIHJlZ2lzdHJh dGlvbiwgImluc3RhbGxpbmciIGFuZCBudWxsIGFzIHRoZSBhcmd1bWVudHMuCi0gICAgICAgIHJl Z2lzdHJhdGlvbi0+dXBkYXRlUmVnaXN0cmF0aW9uU3RhdGUoU2VydmljZVdvcmtlclJlZ2lzdHJh dGlvblN0YXRlOjpJbnN0YWxsaW5nLCBudWxscHRyKTsKKyAgICAgICAgcmVnaXN0cmF0aW9uLT51 cGRhdGVSZWdpc3RyYXRpb25TdGF0ZShqb2IsIFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25TdGF0 ZTo6SW5zdGFsbGluZywgbnVsbHB0cik7CiAKICAgICAgICAgLy8gSWYgbmV3ZXN0V29ya2VyIGlz IG51bGwsIGludm9rZSBDbGVhciBSZWdpc3RyYXRpb24gYWxnb3JpdGhtIHBhc3NpbmcgcmVnaXN0 cmF0aW9uIGFzIGl0cyBhcmd1bWVudC4KICAgICAgICAgaWYgKCFyZWdpc3RyYXRpb24tPmdldE5l d2VzdFdvcmtlcigpKQpAQCAtMTU0LDcgKzE1OCw3IEBAIHZvaWQgU1dTZXJ2ZXJKb2JRdWV1ZTo6 ZGlkRmluaXNoSW5zdGFsbChTV1NlcnZlcjo6Q29ubmVjdGlvbiYsIFNlcnZpY2VXb3JrZXJJZGVu CiAgICAgfQogCiAgICAgLy8gRklYTUU6IEltcGxlbWVudCByZWFsIHBvc3QgJ2luc3RhbGwnIGV2 ZW50IHN0ZXBzIG9mIHRoZSBJbnN0YWxsIGFsZ29yaXRobSAoc3RlcHMgMTQrKS4KLSAgICByZWdp c3RyYXRpb24tPmZpcmVQb3N0SW5zdGFsbEV2ZW50cyhmaXJzdEpvYigpLmNvbm5lY3Rpb25JZGVu dGlmaWVyKCkpOworICAgIHJlZ2lzdHJhdGlvbi0+ZmlyZVBvc3RJbnN0YWxsRXZlbnRzKGpvYik7 CiAKICAgICBmaW5pc2hDdXJyZW50Sm9iKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyUmVnaXN0cmF0aW9uLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJSZWdpc3RyYXRpb24uY3Bw CmluZGV4IGJmYjQ3YmZmYmJlYmY0YjQ1MTkxMTlkZTc0OTgzMjdiYmI0MmQ1YzcuLjEwMGIyMTU4 MTY0N2M0NTQyOTBhYTlhOTRiZTAwYWI4YWYwZjkwODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJSZWdpc3RyYXRpb24uY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJSZWdpc3RyYXRp b24uY3BwCkBAIC01OSw3ICs1OSw3IEBAIFNXU2VydmVyV29ya2VyKiBTV1NlcnZlclJlZ2lzdHJh dGlvbjo6Z2V0TmV3ZXN0V29ya2VyKCkKICAgICByZXR1cm4gbV9hY3RpdmVXb3JrZXIuZ2V0KCk7 CiB9CiAKLXZvaWQgU1dTZXJ2ZXJSZWdpc3RyYXRpb246OnVwZGF0ZVJlZ2lzdHJhdGlvblN0YXRl KFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25TdGF0ZSBzdGF0ZSwgU1dTZXJ2ZXJXb3JrZXIqIHdv cmtlcikKK3ZvaWQgU1dTZXJ2ZXJSZWdpc3RyYXRpb246OnVwZGF0ZVJlZ2lzdHJhdGlvblN0YXRl KGNvbnN0IFNlcnZpY2VXb3JrZXJKb2JEYXRhJiBqb2IsIFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRp b25TdGF0ZSBzdGF0ZSwgU1dTZXJ2ZXJXb3JrZXIqIHdvcmtlcikKIHsKICAgICBMT0coU2Vydmlj ZVdvcmtlciwgIiglcCkgVXBkYXRpbmcgcmVnaXN0cmF0aW9uIHN0YXRlIHRvICVpIHdpdGggd29y a2VyICVwIiwgdGhpcywgKGludClzdGF0ZSwgd29ya2VyKTsKICAgICAKQEAgLTc5LDU0ICs3OSw0 OSBAQCB2b2lkIFNXU2VydmVyUmVnaXN0cmF0aW9uOjp1cGRhdGVSZWdpc3RyYXRpb25TdGF0ZShT ZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uU3RhdAogICAgIGlmICh3b3JrZXIpCiAgICAgICAgIHNl cnZpY2VXb3JrZXJJZGVudGlmaWVyID0gd29ya2VyLT5pZGVudGlmaWVyKCk7CiAKLSAgICBmb3Ig KGF1dG8mIGNvbm5lY3Rpb25JZGVudGlmaWVyV2l0aENsaWVudHMgOiBtX2NsaWVudFJlZ2lzdHJh dGlvbnNCeUNvbm5lY3Rpb24ua2V5cygpKSB7Ci0gICAgICAgIGlmIChhdXRvKiBjb25uZWN0aW9u ID0gbV9zZXJ2ZXIuZ2V0Q29ubmVjdGlvbihjb25uZWN0aW9uSWRlbnRpZmllcldpdGhDbGllbnRz KSkKLSAgICAgICAgICAgIGNvbm5lY3Rpb24tPnVwZGF0ZVJlZ2lzdHJhdGlvblN0YXRlSW5DbGll bnQobV9yZWdpc3RyYXRpb25LZXksIHN0YXRlLCBzZXJ2aWNlV29ya2VySWRlbnRpZmllcik7Ci0g ICAgfQorICAgIGZvckVhY2hDb25uZWN0aW9uKGpvYiwgWyZdKGF1dG8mIGNvbm5lY3Rpb24pIHsK KyAgICAgICAgY29ubmVjdGlvbi51cGRhdGVSZWdpc3RyYXRpb25TdGF0ZUluQ2xpZW50KG1fcmVn aXN0cmF0aW9uS2V5LCBzdGF0ZSwgc2VydmljZVdvcmtlcklkZW50aWZpZXIpOworICAgIH0pOwog fQogCi12b2lkIFNXU2VydmVyUmVnaXN0cmF0aW9uOjp1cGRhdGVXb3JrZXJTdGF0ZShTV1NlcnZl cldvcmtlciYgd29ya2VyLCBTZXJ2aWNlV29ya2VyU3RhdGUgc3RhdGUpCit2b2lkIFNXU2VydmVy UmVnaXN0cmF0aW9uOjp1cGRhdGVXb3JrZXJTdGF0ZShjb25zdCBTZXJ2aWNlV29ya2VySm9iRGF0 YSYgam9iLCBTV1NlcnZlcldvcmtlciYgd29ya2VyLCBTZXJ2aWNlV29ya2VyU3RhdGUgc3RhdGUp CiB7CiAgICAgTE9HKFNlcnZpY2VXb3JrZXIsICJVcGRhdGluZyB3b3JrZXIgJXAgc3RhdGUgdG8g JWkgKCVwKSIsICZ3b3JrZXIsIChpbnQpc3RhdGUsIHRoaXMpOwogCiAgICAgd29ya2VyLnNldFN0 YXRlKHN0YXRlKTsKIAotICAgIGZvciAoYXV0byYgY29ubmVjdGlvbklkZW50aWZpZXJXaXRoQ2xp ZW50cyA6IG1fY2xpZW50UmVnaXN0cmF0aW9uc0J5Q29ubmVjdGlvbi5rZXlzKCkpIHsKLSAgICAg ICAgaWYgKGF1dG8qIGNvbm5lY3Rpb24gPSBtX3NlcnZlci5nZXRDb25uZWN0aW9uKGNvbm5lY3Rp b25JZGVudGlmaWVyV2l0aENsaWVudHMpKQotICAgICAgICAgICAgY29ubmVjdGlvbi0+dXBkYXRl V29ya2VyU3RhdGVJbkNsaWVudCh3b3JrZXIuaWRlbnRpZmllcigpLCBzdGF0ZSk7Ci0gICAgfQor ICAgIGZvckVhY2hDb25uZWN0aW9uKGpvYiwgWyZdKGF1dG8mIGNvbm5lY3Rpb24pIHsKKyAgICAg ICAgY29ubmVjdGlvbi51cGRhdGVXb3JrZXJTdGF0ZUluQ2xpZW50KHdvcmtlci5pZGVudGlmaWVy KCksIHN0YXRlKTsKKyAgICB9KTsKIH0KIAotdm9pZCBTV1NlcnZlclJlZ2lzdHJhdGlvbjo6Zmly ZVVwZGF0ZUZvdW5kRXZlbnQodWludDY0X3QgY29ubmVjdGlvbklkZW50aWZpZXIpCit2b2lkIFNX U2VydmVyUmVnaXN0cmF0aW9uOjpmaXJlVXBkYXRlRm91bmRFdmVudChjb25zdCBTZXJ2aWNlV29y a2VySm9iRGF0YSYgam9iKQogewotICAgIC8vIE5vIG1hdHRlciB3aGF0LCB3ZSBzZW5kIHRoZSBl dmVudCB0byB0aGUgY29ubmVjdGlvbiB0aGF0IHNjaGVkdWxlZCB0aGUgam9iLiBUaGUgY2xpZW50 IHJlZ2lzdHJhdGlvbgotICAgIC8vIG1heSBub3QgaGF2ZSBnb3R0ZW4gYSBjaGFuY2UgdG8gcmVn aXN0ZXIgaXRzZWxmIHlldC4KLSAgICBpZiAoYXV0byogY29ubmVjdGlvbiA9IG1fc2VydmVyLmdl dENvbm5lY3Rpb24oY29ubmVjdGlvbklkZW50aWZpZXIpKQotICAgICAgICBjb25uZWN0aW9uLT5m aXJlVXBkYXRlRm91bmRFdmVudChtX3JlZ2lzdHJhdGlvbktleSk7Ci0KLSAgICBmb3IgKGF1dG8m IGNvbm5lY3Rpb25JZGVudGlmaWVyV2l0aENsaWVudHMgOiBtX2NsaWVudFJlZ2lzdHJhdGlvbnNC eUNvbm5lY3Rpb24ua2V5cygpKSB7Ci0gICAgICAgIGlmIChjb25uZWN0aW9uSWRlbnRpZmllcldp dGhDbGllbnRzID09IGNvbm5lY3Rpb25JZGVudGlmaWVyKQotICAgICAgICAgICAgY29udGludWU7 Ci0KLSAgICAgICAgaWYgKGF1dG8qIGNvbm5lY3Rpb24gPSBtX3NlcnZlci5nZXRDb25uZWN0aW9u KGNvbm5lY3Rpb25JZGVudGlmaWVyV2l0aENsaWVudHMpKQotICAgICAgICAgICAgY29ubmVjdGlv bi0+ZmlyZVVwZGF0ZUZvdW5kRXZlbnQobV9yZWdpc3RyYXRpb25LZXkpOwotICAgIH0KKyAgICBm b3JFYWNoQ29ubmVjdGlvbihqb2IsIFsmXShhdXRvJiBjb25uZWN0aW9uKSB7CisgICAgICAgIGNv bm5lY3Rpb24uZmlyZVVwZGF0ZUZvdW5kRXZlbnQobV9yZWdpc3RyYXRpb25LZXkpOworICAgIH0p OwogfQogCiAvLyBGSVhNRTogVGhpcyB3aWxsIGRvIGF3YXkgb25jZSB3ZSBjb3JyZWN0bHkgdXBk YXRlIHRoZSByZWdpc3RyYXRpb24gc3RhdGUgYWZ0ZXIgaW5zdGFsbC4KLXZvaWQgU1dTZXJ2ZXJS ZWdpc3RyYXRpb246OmZpcmVQb3N0SW5zdGFsbEV2ZW50cyh1aW50NjRfdCBjb25uZWN0aW9uSWRl bnRpZmllcikKK3ZvaWQgU1dTZXJ2ZXJSZWdpc3RyYXRpb246OmZpcmVQb3N0SW5zdGFsbEV2ZW50 cyhjb25zdCBTZXJ2aWNlV29ya2VySm9iRGF0YSYgam9iKQoreworICAgIGZvckVhY2hDb25uZWN0 aW9uKGpvYiwgWyZdKGF1dG8mIGNvbm5lY3Rpb24pIHsKKyAgICAgICAgY29ubmVjdGlvbi5maXJl UG9zdEluc3RhbGxFdmVudHMobV9yZWdpc3RyYXRpb25LZXkpOworICAgIH0pOworfQorCit2b2lk IFNXU2VydmVyUmVnaXN0cmF0aW9uOjpmb3JFYWNoQ29ubmVjdGlvbihjb25zdCBTZXJ2aWNlV29y a2VySm9iRGF0YSYgam9iLCBjb25zdCBXVEY6OkZ1bmN0aW9uPHZvaWQoU1dTZXJ2ZXI6OkNvbm5l Y3Rpb24mKT4mIGFwcGx5KQogewogICAgIC8vIE5vIG1hdHRlciB3aGF0LCB3ZSBzZW5kIHRoZSBl dmVudCB0byB0aGUgY29ubmVjdGlvbiB0aGF0IHNjaGVkdWxlZCB0aGUgam9iLiBUaGUgY2xpZW50 IHJlZ2lzdHJhdGlvbgogICAgIC8vIG1heSBub3QgaGF2ZSBnb3R0ZW4gYSBjaGFuY2UgdG8gcmVn aXN0ZXIgaXRzZWxmIHlldC4KLSAgICBpZiAoYXV0byogY29ubmVjdGlvbiA9IG1fc2VydmVyLmdl dENvbm5lY3Rpb24oY29ubmVjdGlvbklkZW50aWZpZXIpKQotICAgICAgICBjb25uZWN0aW9uLT5m aXJlUG9zdEluc3RhbGxFdmVudHMobV9yZWdpc3RyYXRpb25LZXkpOworICAgIGlmICghbV9jbGll bnRSZWdpc3RyYXRpb25zQnlDb25uZWN0aW9uLmNvbnRhaW5zKGpvYi5jb25uZWN0aW9uSWRlbnRp ZmllcigpKSkgeworICAgICAgICBpZiAoYXV0byogY29ubmVjdGlvbiA9IG1fc2VydmVyLmdldENv bm5lY3Rpb24oam9iLmNvbm5lY3Rpb25JZGVudGlmaWVyKCkpKQorICAgICAgICAgICAgYXBwbHko KmNvbm5lY3Rpb24pOworICAgIH0KIAogICAgIGZvciAoYXV0byYgY29ubmVjdGlvbklkZW50aWZp ZXJXaXRoQ2xpZW50cyA6IG1fY2xpZW50UmVnaXN0cmF0aW9uc0J5Q29ubmVjdGlvbi5rZXlzKCkp IHsKLSAgICAgICAgaWYgKGNvbm5lY3Rpb25JZGVudGlmaWVyV2l0aENsaWVudHMgPT0gY29ubmVj dGlvbklkZW50aWZpZXIpCi0gICAgICAgICAgICBjb250aW51ZTsKLQogICAgICAgICBpZiAoYXV0 byogY29ubmVjdGlvbiA9IG1fc2VydmVyLmdldENvbm5lY3Rpb24oY29ubmVjdGlvbklkZW50aWZp ZXJXaXRoQ2xpZW50cykpCi0gICAgICAgICAgICBjb25uZWN0aW9uLT5maXJlUG9zdEluc3RhbGxF dmVudHMobV9yZWdpc3RyYXRpb25LZXkpOworICAgICAgICAgICAgYXBwbHkoKmNvbm5lY3Rpb24p OwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNl L3NlcnZlci9TV1NlcnZlclJlZ2lzdHJhdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9z ZXJ2aWNlL3NlcnZlci9TV1NlcnZlclJlZ2lzdHJhdGlvbi5oCmluZGV4IGQ5MmY0M2UwMmZlMzll OWY1ZTcwZTEwN2MzYzc2NDc1N2IwMDA1NjUuLjJiMzdiYTRhZDNhYjcxZTkyMzJkZTJlNjkxODkx OWE0NzljZThlZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9z ZXJ2ZXIvU1dTZXJ2ZXJSZWdpc3RyYXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJz L3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyUmVnaXN0cmF0aW9uLmgKQEAgLTU2LDE1ICs1NiwxNyBA QCBwdWJsaWM6CiAgICAgdm9pZCBzZXRMYXN0VXBkYXRlVGltZShkb3VibGUgdGltZSkgeyBtX2xh c3RVcGRhdGVUaW1lID0gdGltZTsgfQogICAgIFNlcnZpY2VXb3JrZXJVcGRhdGVWaWFDYWNoZSB1 cGRhdGVWaWFDYWNoZSgpIGNvbnN0IHsgcmV0dXJuIG1fdXBkYXRlVmlhQ2FjaGU7IH0KIAotICAg IHZvaWQgdXBkYXRlUmVnaXN0cmF0aW9uU3RhdGUoU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvblN0 YXRlLCBTV1NlcnZlcldvcmtlciopOwotICAgIHZvaWQgdXBkYXRlV29ya2VyU3RhdGUoU1dTZXJ2 ZXJXb3JrZXImLCBTZXJ2aWNlV29ya2VyU3RhdGUpOwotICAgIHZvaWQgZmlyZVVwZGF0ZUZvdW5k RXZlbnQodWludDY0X3QgY29ubmVjdGlvbklkZW50aWZpZXIpOwotICAgIHZvaWQgZmlyZVBvc3RJ bnN0YWxsRXZlbnRzKHVpbnQ2NF90IGNvbm5lY3Rpb25JZGVudGlmaWVyKTsKKyAgICB2b2lkIHVw ZGF0ZVJlZ2lzdHJhdGlvblN0YXRlKGNvbnN0IFNlcnZpY2VXb3JrZXJKb2JEYXRhJiwgU2Vydmlj ZVdvcmtlclJlZ2lzdHJhdGlvblN0YXRlLCBTV1NlcnZlcldvcmtlciopOworICAgIHZvaWQgdXBk YXRlV29ya2VyU3RhdGUoY29uc3QgU2VydmljZVdvcmtlckpvYkRhdGEmLCBTV1NlcnZlcldvcmtl ciYsIFNlcnZpY2VXb3JrZXJTdGF0ZSk7CisgICAgdm9pZCBmaXJlVXBkYXRlRm91bmRFdmVudChj b25zdCBTZXJ2aWNlV29ya2VySm9iRGF0YSYpOworICAgIHZvaWQgZmlyZVBvc3RJbnN0YWxsRXZl bnRzKGNvbnN0IFNlcnZpY2VXb3JrZXJKb2JEYXRhJik7CiAKICAgICB2b2lkIGFkZENsaWVudFNl cnZpY2VXb3JrZXJSZWdpc3RyYXRpb24odWludDY0X3QgY29ubmVjdGlvbklkZW50aWZpZXIsIHVp bnQ2NF90IGNsaWVudFJlZ2lzdHJhdGlvbklkZW50aWZpZXIpOwogICAgIHZvaWQgcmVtb3ZlQ2xp ZW50U2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbih1aW50NjRfdCBjb25uZWN0aW9uSWRlbnRpZmll ciwgdWludDY0X3QgY2xpZW50UmVnaXN0cmF0aW9uSWRlbnRpZmllcik7CiAKIHByaXZhdGU6Cisg ICAgdm9pZCBmb3JFYWNoQ29ubmVjdGlvbihjb25zdCBTZXJ2aWNlV29ya2VySm9iRGF0YSYsIGNv bnN0IFdURjo6RnVuY3Rpb248dm9pZChTV1NlcnZlcjo6Q29ubmVjdGlvbiYpPiYpOworCiAgICAg U2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbktleSBtX3JlZ2lzdHJhdGlvbktleTsKICAgICBTZXJ2 aWNlV29ya2VyVXBkYXRlVmlhQ2FjaGUgbV91cGRhdGVWaWFDYWNoZTsKICAgICBVUkwgbV9zY29w ZVVSTDsK 326336 2017-11-08 09:49:11 -0800 2017-11-08 10:02:31 -0800 Patch bug-179428-20171108094911.patch text/plain 10773 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0NTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmI5NzQwODg5OGZmZTk4 YmZhN2I0MWRmNDIwZDQwODVjZjQxYzFhZC4uNTFjZTdiMDViMTYwZDkyZjg2NjY3MDMzZTdhODMy MTlkNmJhZTE3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE3LTExLTA4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgW1NlcnZpY2UgV29ya2Vyc10g TWFrZSBzdXJlIFNXU2VydmVyUmVnaXN0cmF0aW9uIHVwZGF0ZSBmdW5jdGlvbnMgYWx3YXlzIG1l c3NhZ2UgYmFjayB0aGUgY29ubmVjdGlvbiB0aGF0IHNjaGVkdWxlZCB0aGUgam9iCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzk0MjgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHdvcmtlcnMvc2Vydmlj ZS9zZXJ2ZXIvU1dTZXJ2ZXJKb2JRdWV1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTV1NlcnZl ckpvYlF1ZXVlOjppbnN0YWxsKToKKyAgICAgICAgKFdlYkNvcmU6OlNXU2VydmVySm9iUXVldWU6 OmRpZEZpbmlzaEluc3RhbGwpOgorICAgICAgICAqIHdvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dT ZXJ2ZXJSZWdpc3RyYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1dTZXJ2ZXJSZWdpc3Ry YXRpb246OnVwZGF0ZVJlZ2lzdHJhdGlvblN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlNXU2Vy dmVyUmVnaXN0cmF0aW9uOjp1cGRhdGVXb3JrZXJTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpT V1NlcnZlclJlZ2lzdHJhdGlvbjo6ZmlyZVVwZGF0ZUZvdW5kRXZlbnQpOgorICAgICAgICAoV2Vi Q29yZTo6U1dTZXJ2ZXJSZWdpc3RyYXRpb246OmZpcmVQb3N0SW5zdGFsbEV2ZW50cyk6CisgICAg ICAgIChXZWJDb3JlOjpTV1NlcnZlclJlZ2lzdHJhdGlvbjo6Zm9yRWFjaENvbm5lY3Rpb24pOgor ICAgICAgICAqIHdvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJSZWdpc3RyYXRpb24uaDoK KworMjAxNy0xMS0wOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCiAgICAgICAg IFtTZXJ2aWNlIFdvcmtlcnNdIFN1cHBvcnQgd2FpdFVudGlsKCkgb24gdGhlICdpbnN0YWxsJyBl dmVudAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5 Mzk2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIv U1dTZXJ2ZXJKb2JRdWV1ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2Vy dmVyL1NXU2VydmVySm9iUXVldWUuY3BwCmluZGV4IDEwNTBhYTgxNjM5YjlhYmYzZGY4YjVjMjhj Y2IxYzYwOTJjNWJhMGQuLmEyZjk1NTYxOGVjNGE3ZDIxOWNjYzc3MWEzYmUxN2I4MGYxMjg5MDgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2 ZXJKb2JRdWV1ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZl ci9TV1NlcnZlckpvYlF1ZXVlLmNwcApAQCAtMTE1LDE2ICsxMTUsMTggQEAgdm9pZCBTV1NlcnZl ckpvYlF1ZXVlOjppbnN0YWxsKFNXU2VydmVyUmVnaXN0cmF0aW9uJiByZWdpc3RyYXRpb24sIFNX U2VydmVyOjpDb24KICAgICBhdXRvKiB3b3JrZXIgPSBtX3NlcnZlci53b3JrZXJCeUlEKGluc3Rh bGxpbmdXb3JrZXIpOwogICAgIFJFTEVBU0VfQVNTRVJUKHdvcmtlcik7CiAKLSAgICByZWdpc3Ry YXRpb24udXBkYXRlUmVnaXN0cmF0aW9uU3RhdGUoU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvblN0 YXRlOjpJbnN0YWxsaW5nLCB3b3JrZXIpOwotICAgIHJlZ2lzdHJhdGlvbi51cGRhdGVXb3JrZXJT dGF0ZSgqd29ya2VyLCBTZXJ2aWNlV29ya2VyU3RhdGU6Okluc3RhbGxpbmcpOworICAgIGF1dG8m IGpvYiA9IGZpcnN0Sm9iKCk7CisKKyAgICByZWdpc3RyYXRpb24udXBkYXRlUmVnaXN0cmF0aW9u U3RhdGUoam9iLCBTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uU3RhdGU6Okluc3RhbGxpbmcsIHdv cmtlcik7CisgICAgcmVnaXN0cmF0aW9uLnVwZGF0ZVdvcmtlclN0YXRlKGpvYiwgKndvcmtlciwg U2VydmljZVdvcmtlclN0YXRlOjpJbnN0YWxsaW5nKTsKIAogICAgIC8vIEludm9rZSBSZXNvbHZl IEpvYiBQcm9taXNlIHdpdGggam9iIGFuZCByZWdpc3RyYXRpb24uCi0gICAgbV9zZXJ2ZXIucmVz b2x2ZVJlZ2lzdHJhdGlvbkpvYihmaXJzdEpvYigpLCByZWdpc3RyYXRpb24uZGF0YSgpKTsKKyAg ICBtX3NlcnZlci5yZXNvbHZlUmVnaXN0cmF0aW9uSm9iKGpvYiwgcmVnaXN0cmF0aW9uLmRhdGEo KSk7CiAKICAgICAvLyBRdWV1ZSBhIHRhc2sgdG8gZmlyZSBhbiBldmVudCBuYW1lZCB1cGRhdGVm b3VuZCBhdCBhbGwgdGhlIFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb24gb2JqZWN0cwogICAgIC8v IGZvciBhbGwgdGhlIHNlcnZpY2Ugd29ya2VyIGNsaWVudHMgd2hvc2UgY3JlYXRpb24gVVJMIG1h dGNoZXMgcmVnaXN0cmF0aW9uJ3Mgc2NvcGUgdXJsIGFuZAogICAgIC8vIGFsbCB0aGUgc2Vydmlj ZSB3b3JrZXJzIHdob3NlIGNvbnRhaW5pbmcgc2VydmljZSB3b3JrZXIgcmVnaXN0cmF0aW9uIGlz IHJlZ2lzdHJhdGlvbi4KLSAgICByZWdpc3RyYXRpb24uZmlyZVVwZGF0ZUZvdW5kRXZlbnQoZmly c3RKb2IoKS5jb25uZWN0aW9uSWRlbnRpZmllcigpKTsKKyAgICByZWdpc3RyYXRpb24uZmlyZVVw ZGF0ZUZvdW5kRXZlbnQoam9iKTsKIAogICAgIC8vIFF1ZXVlIGEgdGFzayB0byBmaXJlIHRoZSBJ bnN0YWxsRXZlbnQuCiAgICAgbV9zZXJ2ZXIuZmlyZUluc3RhbGxFdmVudChjb25uZWN0aW9uLCBp bnN0YWxsaW5nV29ya2VyKTsKQEAgLTEzNiwxNCArMTM4LDE2IEBAIHZvaWQgU1dTZXJ2ZXJKb2JR dWV1ZTo6ZGlkRmluaXNoSW5zdGFsbChTV1NlcnZlcjo6Q29ubmVjdGlvbiYsIFNlcnZpY2VXb3Jr ZXJJZGVuCiAgICAgYXV0byogcmVnaXN0cmF0aW9uID0gbV9zZXJ2ZXIuZ2V0UmVnaXN0cmF0aW9u KG1fcmVnaXN0cmF0aW9uS2V5KTsKICAgICBBU1NFUlQocmVnaXN0cmF0aW9uKTsKIAorICAgIGF1 dG8mIGpvYiA9IGZpcnN0Sm9iKCk7CisKICAgICBpZiAoIXdhc1N1Y2Nlc3NmdWwpIHsKICAgICAg ICAgYXV0byogd29ya2VyID0gbV9zZXJ2ZXIud29ya2VyQnlJRChpZGVudGlmaWVyKTsKICAgICAg ICAgUkVMRUFTRV9BU1NFUlQod29ya2VyKTsKIAogICAgICAgICAvLyBSdW4gdGhlIFVwZGF0ZSBX b3JrZXIgU3RhdGUgYWxnb3JpdGhtIHBhc3NpbmcgcmVnaXN0cmF0aW9uJ3MgaW5zdGFsbGluZyB3 b3JrZXIgYW5kIHJlZHVuZGFudCBhcyB0aGUgYXJndW1lbnRzLgotICAgICAgICByZWdpc3RyYXRp b24tPnVwZGF0ZVdvcmtlclN0YXRlKCp3b3JrZXIsIFNlcnZpY2VXb3JrZXJTdGF0ZTo6UmVkdW5k YW50KTsKKyAgICAgICAgcmVnaXN0cmF0aW9uLT51cGRhdGVXb3JrZXJTdGF0ZShqb2IsICp3b3Jr ZXIsIFNlcnZpY2VXb3JrZXJTdGF0ZTo6UmVkdW5kYW50KTsKICAgICAgICAgLy8gUnVuIHRoZSBV cGRhdGUgUmVnaXN0cmF0aW9uIFN0YXRlIGFsZ29yaXRobSBwYXNzaW5nIHJlZ2lzdHJhdGlvbiwg Imluc3RhbGxpbmciIGFuZCBudWxsIGFzIHRoZSBhcmd1bWVudHMuCi0gICAgICAgIHJlZ2lzdHJh dGlvbi0+dXBkYXRlUmVnaXN0cmF0aW9uU3RhdGUoU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvblN0 YXRlOjpJbnN0YWxsaW5nLCBudWxscHRyKTsKKyAgICAgICAgcmVnaXN0cmF0aW9uLT51cGRhdGVS ZWdpc3RyYXRpb25TdGF0ZShqb2IsIFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25TdGF0ZTo6SW5z dGFsbGluZywgbnVsbHB0cik7CiAKICAgICAgICAgLy8gSWYgbmV3ZXN0V29ya2VyIGlzIG51bGws IGludm9rZSBDbGVhciBSZWdpc3RyYXRpb24gYWxnb3JpdGhtIHBhc3NpbmcgcmVnaXN0cmF0aW9u IGFzIGl0cyBhcmd1bWVudC4KICAgICAgICAgaWYgKCFyZWdpc3RyYXRpb24tPmdldE5ld2VzdFdv cmtlcigpKQpAQCAtMTU0LDcgKzE1OCw3IEBAIHZvaWQgU1dTZXJ2ZXJKb2JRdWV1ZTo6ZGlkRmlu aXNoSW5zdGFsbChTV1NlcnZlcjo6Q29ubmVjdGlvbiYsIFNlcnZpY2VXb3JrZXJJZGVuCiAgICAg fQogCiAgICAgLy8gRklYTUU6IEltcGxlbWVudCByZWFsIHBvc3QgJ2luc3RhbGwnIGV2ZW50IHN0 ZXBzIG9mIHRoZSBJbnN0YWxsIGFsZ29yaXRobSAoc3RlcHMgMTQrKS4KLSAgICByZWdpc3RyYXRp b24tPmZpcmVQb3N0SW5zdGFsbEV2ZW50cyhmaXJzdEpvYigpLmNvbm5lY3Rpb25JZGVudGlmaWVy KCkpOworICAgIHJlZ2lzdHJhdGlvbi0+ZmlyZVBvc3RJbnN0YWxsRXZlbnRzKGpvYik7CiAKICAg ICBmaW5pc2hDdXJyZW50Sm9iKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3Jr ZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyUmVnaXN0cmF0aW9uLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJSZWdpc3RyYXRpb24uY3BwCmluZGV4 IGJmYjQ3YmZmYmJlYmY0YjQ1MTkxMTlkZTc0OTgzMjdiYmI0MmQ1YzcuLjEwMGIyMTU4MTY0N2M0 NTQyOTBhYTlhOTRiZTAwYWI4YWYwZjkwODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dv cmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJSZWdpc3RyYXRpb24uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJSZWdpc3RyYXRpb24uY3Bw CkBAIC01OSw3ICs1OSw3IEBAIFNXU2VydmVyV29ya2VyKiBTV1NlcnZlclJlZ2lzdHJhdGlvbjo6 Z2V0TmV3ZXN0V29ya2VyKCkKICAgICByZXR1cm4gbV9hY3RpdmVXb3JrZXIuZ2V0KCk7CiB9CiAK LXZvaWQgU1dTZXJ2ZXJSZWdpc3RyYXRpb246OnVwZGF0ZVJlZ2lzdHJhdGlvblN0YXRlKFNlcnZp Y2VXb3JrZXJSZWdpc3RyYXRpb25TdGF0ZSBzdGF0ZSwgU1dTZXJ2ZXJXb3JrZXIqIHdvcmtlcikK K3ZvaWQgU1dTZXJ2ZXJSZWdpc3RyYXRpb246OnVwZGF0ZVJlZ2lzdHJhdGlvblN0YXRlKGNvbnN0 IFNlcnZpY2VXb3JrZXJKb2JEYXRhJiBqb2IsIFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25TdGF0 ZSBzdGF0ZSwgU1dTZXJ2ZXJXb3JrZXIqIHdvcmtlcikKIHsKICAgICBMT0coU2VydmljZVdvcmtl ciwgIiglcCkgVXBkYXRpbmcgcmVnaXN0cmF0aW9uIHN0YXRlIHRvICVpIHdpdGggd29ya2VyICVw IiwgdGhpcywgKGludClzdGF0ZSwgd29ya2VyKTsKICAgICAKQEAgLTc5LDU0ICs3OSw0OSBAQCB2 b2lkIFNXU2VydmVyUmVnaXN0cmF0aW9uOjp1cGRhdGVSZWdpc3RyYXRpb25TdGF0ZShTZXJ2aWNl V29ya2VyUmVnaXN0cmF0aW9uU3RhdAogICAgIGlmICh3b3JrZXIpCiAgICAgICAgIHNlcnZpY2VX b3JrZXJJZGVudGlmaWVyID0gd29ya2VyLT5pZGVudGlmaWVyKCk7CiAKLSAgICBmb3IgKGF1dG8m IGNvbm5lY3Rpb25JZGVudGlmaWVyV2l0aENsaWVudHMgOiBtX2NsaWVudFJlZ2lzdHJhdGlvbnNC eUNvbm5lY3Rpb24ua2V5cygpKSB7Ci0gICAgICAgIGlmIChhdXRvKiBjb25uZWN0aW9uID0gbV9z ZXJ2ZXIuZ2V0Q29ubmVjdGlvbihjb25uZWN0aW9uSWRlbnRpZmllcldpdGhDbGllbnRzKSkKLSAg ICAgICAgICAgIGNvbm5lY3Rpb24tPnVwZGF0ZVJlZ2lzdHJhdGlvblN0YXRlSW5DbGllbnQobV9y ZWdpc3RyYXRpb25LZXksIHN0YXRlLCBzZXJ2aWNlV29ya2VySWRlbnRpZmllcik7Ci0gICAgfQor ICAgIGZvckVhY2hDb25uZWN0aW9uKGpvYiwgWyZdKGF1dG8mIGNvbm5lY3Rpb24pIHsKKyAgICAg ICAgY29ubmVjdGlvbi51cGRhdGVSZWdpc3RyYXRpb25TdGF0ZUluQ2xpZW50KG1fcmVnaXN0cmF0 aW9uS2V5LCBzdGF0ZSwgc2VydmljZVdvcmtlcklkZW50aWZpZXIpOworICAgIH0pOwogfQogCi12 b2lkIFNXU2VydmVyUmVnaXN0cmF0aW9uOjp1cGRhdGVXb3JrZXJTdGF0ZShTV1NlcnZlcldvcmtl ciYgd29ya2VyLCBTZXJ2aWNlV29ya2VyU3RhdGUgc3RhdGUpCit2b2lkIFNXU2VydmVyUmVnaXN0 cmF0aW9uOjp1cGRhdGVXb3JrZXJTdGF0ZShjb25zdCBTZXJ2aWNlV29ya2VySm9iRGF0YSYgam9i LCBTV1NlcnZlcldvcmtlciYgd29ya2VyLCBTZXJ2aWNlV29ya2VyU3RhdGUgc3RhdGUpCiB7CiAg ICAgTE9HKFNlcnZpY2VXb3JrZXIsICJVcGRhdGluZyB3b3JrZXIgJXAgc3RhdGUgdG8gJWkgKCVw KSIsICZ3b3JrZXIsIChpbnQpc3RhdGUsIHRoaXMpOwogCiAgICAgd29ya2VyLnNldFN0YXRlKHN0 YXRlKTsKIAotICAgIGZvciAoYXV0byYgY29ubmVjdGlvbklkZW50aWZpZXJXaXRoQ2xpZW50cyA6 IG1fY2xpZW50UmVnaXN0cmF0aW9uc0J5Q29ubmVjdGlvbi5rZXlzKCkpIHsKLSAgICAgICAgaWYg KGF1dG8qIGNvbm5lY3Rpb24gPSBtX3NlcnZlci5nZXRDb25uZWN0aW9uKGNvbm5lY3Rpb25JZGVu dGlmaWVyV2l0aENsaWVudHMpKQotICAgICAgICAgICAgY29ubmVjdGlvbi0+dXBkYXRlV29ya2Vy U3RhdGVJbkNsaWVudCh3b3JrZXIuaWRlbnRpZmllcigpLCBzdGF0ZSk7Ci0gICAgfQorICAgIGZv ckVhY2hDb25uZWN0aW9uKGpvYiwgWyZdKGF1dG8mIGNvbm5lY3Rpb24pIHsKKyAgICAgICAgY29u bmVjdGlvbi51cGRhdGVXb3JrZXJTdGF0ZUluQ2xpZW50KHdvcmtlci5pZGVudGlmaWVyKCksIHN0 YXRlKTsKKyAgICB9KTsKIH0KIAotdm9pZCBTV1NlcnZlclJlZ2lzdHJhdGlvbjo6ZmlyZVVwZGF0 ZUZvdW5kRXZlbnQodWludDY0X3QgY29ubmVjdGlvbklkZW50aWZpZXIpCit2b2lkIFNXU2VydmVy UmVnaXN0cmF0aW9uOjpmaXJlVXBkYXRlRm91bmRFdmVudChjb25zdCBTZXJ2aWNlV29ya2VySm9i RGF0YSYgam9iKQogewotICAgIC8vIE5vIG1hdHRlciB3aGF0LCB3ZSBzZW5kIHRoZSBldmVudCB0 byB0aGUgY29ubmVjdGlvbiB0aGF0IHNjaGVkdWxlZCB0aGUgam9iLiBUaGUgY2xpZW50IHJlZ2lz dHJhdGlvbgotICAgIC8vIG1heSBub3QgaGF2ZSBnb3R0ZW4gYSBjaGFuY2UgdG8gcmVnaXN0ZXIg aXRzZWxmIHlldC4KLSAgICBpZiAoYXV0byogY29ubmVjdGlvbiA9IG1fc2VydmVyLmdldENvbm5l Y3Rpb24oY29ubmVjdGlvbklkZW50aWZpZXIpKQotICAgICAgICBjb25uZWN0aW9uLT5maXJlVXBk YXRlRm91bmRFdmVudChtX3JlZ2lzdHJhdGlvbktleSk7Ci0KLSAgICBmb3IgKGF1dG8mIGNvbm5l Y3Rpb25JZGVudGlmaWVyV2l0aENsaWVudHMgOiBtX2NsaWVudFJlZ2lzdHJhdGlvbnNCeUNvbm5l Y3Rpb24ua2V5cygpKSB7Ci0gICAgICAgIGlmIChjb25uZWN0aW9uSWRlbnRpZmllcldpdGhDbGll bnRzID09IGNvbm5lY3Rpb25JZGVudGlmaWVyKQotICAgICAgICAgICAgY29udGludWU7Ci0KLSAg ICAgICAgaWYgKGF1dG8qIGNvbm5lY3Rpb24gPSBtX3NlcnZlci5nZXRDb25uZWN0aW9uKGNvbm5l Y3Rpb25JZGVudGlmaWVyV2l0aENsaWVudHMpKQotICAgICAgICAgICAgY29ubmVjdGlvbi0+Zmly ZVVwZGF0ZUZvdW5kRXZlbnQobV9yZWdpc3RyYXRpb25LZXkpOwotICAgIH0KKyAgICBmb3JFYWNo Q29ubmVjdGlvbihqb2IsIFsmXShhdXRvJiBjb25uZWN0aW9uKSB7CisgICAgICAgIGNvbm5lY3Rp b24uZmlyZVVwZGF0ZUZvdW5kRXZlbnQobV9yZWdpc3RyYXRpb25LZXkpOworICAgIH0pOwogfQog CiAvLyBGSVhNRTogVGhpcyB3aWxsIGRvIGF3YXkgb25jZSB3ZSBjb3JyZWN0bHkgdXBkYXRlIHRo ZSByZWdpc3RyYXRpb24gc3RhdGUgYWZ0ZXIgaW5zdGFsbC4KLXZvaWQgU1dTZXJ2ZXJSZWdpc3Ry YXRpb246OmZpcmVQb3N0SW5zdGFsbEV2ZW50cyh1aW50NjRfdCBjb25uZWN0aW9uSWRlbnRpZmll cikKK3ZvaWQgU1dTZXJ2ZXJSZWdpc3RyYXRpb246OmZpcmVQb3N0SW5zdGFsbEV2ZW50cyhjb25z dCBTZXJ2aWNlV29ya2VySm9iRGF0YSYgam9iKQoreworICAgIGZvckVhY2hDb25uZWN0aW9uKGpv YiwgWyZdKGF1dG8mIGNvbm5lY3Rpb24pIHsKKyAgICAgICAgY29ubmVjdGlvbi5maXJlUG9zdElu c3RhbGxFdmVudHMobV9yZWdpc3RyYXRpb25LZXkpOworICAgIH0pOworfQorCit2b2lkIFNXU2Vy dmVyUmVnaXN0cmF0aW9uOjpmb3JFYWNoQ29ubmVjdGlvbihjb25zdCBTZXJ2aWNlV29ya2VySm9i RGF0YSYgam9iLCBjb25zdCBXVEY6OkZ1bmN0aW9uPHZvaWQoU1dTZXJ2ZXI6OkNvbm5lY3Rpb24m KT4mIGFwcGx5KQogewogICAgIC8vIE5vIG1hdHRlciB3aGF0LCB3ZSBzZW5kIHRoZSBldmVudCB0 byB0aGUgY29ubmVjdGlvbiB0aGF0IHNjaGVkdWxlZCB0aGUgam9iLiBUaGUgY2xpZW50IHJlZ2lz dHJhdGlvbgogICAgIC8vIG1heSBub3QgaGF2ZSBnb3R0ZW4gYSBjaGFuY2UgdG8gcmVnaXN0ZXIg aXRzZWxmIHlldC4KLSAgICBpZiAoYXV0byogY29ubmVjdGlvbiA9IG1fc2VydmVyLmdldENvbm5l Y3Rpb24oY29ubmVjdGlvbklkZW50aWZpZXIpKQotICAgICAgICBjb25uZWN0aW9uLT5maXJlUG9z dEluc3RhbGxFdmVudHMobV9yZWdpc3RyYXRpb25LZXkpOworICAgIGlmICghbV9jbGllbnRSZWdp c3RyYXRpb25zQnlDb25uZWN0aW9uLmNvbnRhaW5zKGpvYi5jb25uZWN0aW9uSWRlbnRpZmllcigp KSkgeworICAgICAgICBpZiAoYXV0byogY29ubmVjdGlvbiA9IG1fc2VydmVyLmdldENvbm5lY3Rp b24oam9iLmNvbm5lY3Rpb25JZGVudGlmaWVyKCkpKQorICAgICAgICAgICAgYXBwbHkoKmNvbm5l Y3Rpb24pOworICAgIH0KIAogICAgIGZvciAoYXV0byYgY29ubmVjdGlvbklkZW50aWZpZXJXaXRo Q2xpZW50cyA6IG1fY2xpZW50UmVnaXN0cmF0aW9uc0J5Q29ubmVjdGlvbi5rZXlzKCkpIHsKLSAg ICAgICAgaWYgKGNvbm5lY3Rpb25JZGVudGlmaWVyV2l0aENsaWVudHMgPT0gY29ubmVjdGlvbklk ZW50aWZpZXIpCi0gICAgICAgICAgICBjb250aW51ZTsKLQogICAgICAgICBpZiAoYXV0byogY29u bmVjdGlvbiA9IG1fc2VydmVyLmdldENvbm5lY3Rpb24oY29ubmVjdGlvbklkZW50aWZpZXJXaXRo Q2xpZW50cykpCi0gICAgICAgICAgICBjb25uZWN0aW9uLT5maXJlUG9zdEluc3RhbGxFdmVudHMo bV9yZWdpc3RyYXRpb25LZXkpOworICAgICAgICAgICAgYXBwbHkoKmNvbm5lY3Rpb24pOwogICAg IH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZl ci9TV1NlcnZlclJlZ2lzdHJhdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNl L3NlcnZlci9TV1NlcnZlclJlZ2lzdHJhdGlvbi5oCmluZGV4IGQ5MmY0M2UwMmZlMzllOWY1ZTcw ZTEwN2MzYzc2NDc1N2IwMDA1NjUuLjJiMzdiYTRhZDNhYjcxZTkyMzJkZTJlNjkxODkxOWE0Nzlj ZThlZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIv U1dTZXJ2ZXJSZWdpc3RyYXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZp Y2Uvc2VydmVyL1NXU2VydmVyUmVnaXN0cmF0aW9uLmgKQEAgLTU2LDE1ICs1NiwxNyBAQCBwdWJs aWM6CiAgICAgdm9pZCBzZXRMYXN0VXBkYXRlVGltZShkb3VibGUgdGltZSkgeyBtX2xhc3RVcGRh dGVUaW1lID0gdGltZTsgfQogICAgIFNlcnZpY2VXb3JrZXJVcGRhdGVWaWFDYWNoZSB1cGRhdGVW aWFDYWNoZSgpIGNvbnN0IHsgcmV0dXJuIG1fdXBkYXRlVmlhQ2FjaGU7IH0KIAotICAgIHZvaWQg dXBkYXRlUmVnaXN0cmF0aW9uU3RhdGUoU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvblN0YXRlLCBT V1NlcnZlcldvcmtlciopOwotICAgIHZvaWQgdXBkYXRlV29ya2VyU3RhdGUoU1dTZXJ2ZXJXb3Jr ZXImLCBTZXJ2aWNlV29ya2VyU3RhdGUpOwotICAgIHZvaWQgZmlyZVVwZGF0ZUZvdW5kRXZlbnQo dWludDY0X3QgY29ubmVjdGlvbklkZW50aWZpZXIpOwotICAgIHZvaWQgZmlyZVBvc3RJbnN0YWxs RXZlbnRzKHVpbnQ2NF90IGNvbm5lY3Rpb25JZGVudGlmaWVyKTsKKyAgICB2b2lkIHVwZGF0ZVJl Z2lzdHJhdGlvblN0YXRlKGNvbnN0IFNlcnZpY2VXb3JrZXJKb2JEYXRhJiwgU2VydmljZVdvcmtl clJlZ2lzdHJhdGlvblN0YXRlLCBTV1NlcnZlcldvcmtlciopOworICAgIHZvaWQgdXBkYXRlV29y a2VyU3RhdGUoY29uc3QgU2VydmljZVdvcmtlckpvYkRhdGEmLCBTV1NlcnZlcldvcmtlciYsIFNl cnZpY2VXb3JrZXJTdGF0ZSk7CisgICAgdm9pZCBmaXJlVXBkYXRlRm91bmRFdmVudChjb25zdCBT ZXJ2aWNlV29ya2VySm9iRGF0YSYpOworICAgIHZvaWQgZmlyZVBvc3RJbnN0YWxsRXZlbnRzKGNv bnN0IFNlcnZpY2VXb3JrZXJKb2JEYXRhJik7CiAKICAgICB2b2lkIGFkZENsaWVudFNlcnZpY2VX b3JrZXJSZWdpc3RyYXRpb24odWludDY0X3QgY29ubmVjdGlvbklkZW50aWZpZXIsIHVpbnQ2NF90 IGNsaWVudFJlZ2lzdHJhdGlvbklkZW50aWZpZXIpOwogICAgIHZvaWQgcmVtb3ZlQ2xpZW50U2Vy dmljZVdvcmtlclJlZ2lzdHJhdGlvbih1aW50NjRfdCBjb25uZWN0aW9uSWRlbnRpZmllciwgdWlu dDY0X3QgY2xpZW50UmVnaXN0cmF0aW9uSWRlbnRpZmllcik7CiAKIHByaXZhdGU6CisgICAgdm9p ZCBmb3JFYWNoQ29ubmVjdGlvbihjb25zdCBTZXJ2aWNlV29ya2VySm9iRGF0YSYsIGNvbnN0IFdU Rjo6RnVuY3Rpb248dm9pZChTV1NlcnZlcjo6Q29ubmVjdGlvbiYpPiYpOworCiAgICAgU2Vydmlj ZVdvcmtlclJlZ2lzdHJhdGlvbktleSBtX3JlZ2lzdHJhdGlvbktleTsKICAgICBTZXJ2aWNlV29y a2VyVXBkYXRlVmlhQ2FjaGUgbV91cGRhdGVWaWFDYWNoZTsKICAgICBVUkwgbV9zY29wZVVSTDsK 326337 2017-11-08 10:02:32 -0800 2017-11-08 12:02:29 -0800 Patch bug-179428-20171108100232.patch text/plain 12560 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0NTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmI5NzQwODg5OGZmZTk4 YmZhN2I0MWRmNDIwZDQwODVjZjQxYzFhZC4uNTFjZTdiMDViMTYwZDkyZjg2NjY3MDMzZTdhODMy MTlkNmJhZTE3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE3LTExLTA4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgW1NlcnZpY2UgV29ya2Vyc10g TWFrZSBzdXJlIFNXU2VydmVyUmVnaXN0cmF0aW9uIHVwZGF0ZSBmdW5jdGlvbnMgYWx3YXlzIG1l c3NhZ2UgYmFjayB0aGUgY29ubmVjdGlvbiB0aGF0IHNjaGVkdWxlZCB0aGUgam9iCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzk0MjgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHdvcmtlcnMvc2Vydmlj ZS9zZXJ2ZXIvU1dTZXJ2ZXJKb2JRdWV1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTV1NlcnZl ckpvYlF1ZXVlOjppbnN0YWxsKToKKyAgICAgICAgKFdlYkNvcmU6OlNXU2VydmVySm9iUXVldWU6 OmRpZEZpbmlzaEluc3RhbGwpOgorICAgICAgICAqIHdvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dT ZXJ2ZXJSZWdpc3RyYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1dTZXJ2ZXJSZWdpc3Ry YXRpb246OnVwZGF0ZVJlZ2lzdHJhdGlvblN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlNXU2Vy dmVyUmVnaXN0cmF0aW9uOjp1cGRhdGVXb3JrZXJTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpT V1NlcnZlclJlZ2lzdHJhdGlvbjo6ZmlyZVVwZGF0ZUZvdW5kRXZlbnQpOgorICAgICAgICAoV2Vi Q29yZTo6U1dTZXJ2ZXJSZWdpc3RyYXRpb246OmZpcmVQb3N0SW5zdGFsbEV2ZW50cyk6CisgICAg ICAgIChXZWJDb3JlOjpTV1NlcnZlclJlZ2lzdHJhdGlvbjo6Zm9yRWFjaENvbm5lY3Rpb24pOgor ICAgICAgICAqIHdvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJSZWdpc3RyYXRpb24uaDoK KworMjAxNy0xMS0wOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCiAgICAgICAg IFtTZXJ2aWNlIFdvcmtlcnNdIFN1cHBvcnQgd2FpdFVudGlsKCkgb24gdGhlICdpbnN0YWxsJyBl dmVudAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5 Mzk2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIv U1dTZXJ2ZXJKb2JRdWV1ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2Vy dmVyL1NXU2VydmVySm9iUXVldWUuY3BwCmluZGV4IDEwNTBhYTgxNjM5YjlhYmYzZGY4YjVjMjhj Y2IxYzYwOTJjNWJhMGQuLmEyZjk1NTYxOGVjNGE3ZDIxOWNjYzc3MWEzYmUxN2I4MGYxMjg5MDgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2 ZXJKb2JRdWV1ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZl ci9TV1NlcnZlckpvYlF1ZXVlLmNwcApAQCAtMTE1LDE2ICsxMTUsMTggQEAgdm9pZCBTV1NlcnZl ckpvYlF1ZXVlOjppbnN0YWxsKFNXU2VydmVyUmVnaXN0cmF0aW9uJiByZWdpc3RyYXRpb24sIFNX U2VydmVyOjpDb24KICAgICBhdXRvKiB3b3JrZXIgPSBtX3NlcnZlci53b3JrZXJCeUlEKGluc3Rh bGxpbmdXb3JrZXIpOwogICAgIFJFTEVBU0VfQVNTRVJUKHdvcmtlcik7CiAKLSAgICByZWdpc3Ry YXRpb24udXBkYXRlUmVnaXN0cmF0aW9uU3RhdGUoU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvblN0 YXRlOjpJbnN0YWxsaW5nLCB3b3JrZXIpOwotICAgIHJlZ2lzdHJhdGlvbi51cGRhdGVXb3JrZXJT dGF0ZSgqd29ya2VyLCBTZXJ2aWNlV29ya2VyU3RhdGU6Okluc3RhbGxpbmcpOworICAgIGF1dG8m IGpvYiA9IGZpcnN0Sm9iKCk7CisKKyAgICByZWdpc3RyYXRpb24udXBkYXRlUmVnaXN0cmF0aW9u U3RhdGUoam9iLCBTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uU3RhdGU6Okluc3RhbGxpbmcsIHdv cmtlcik7CisgICAgcmVnaXN0cmF0aW9uLnVwZGF0ZVdvcmtlclN0YXRlKGpvYiwgKndvcmtlciwg U2VydmljZVdvcmtlclN0YXRlOjpJbnN0YWxsaW5nKTsKIAogICAgIC8vIEludm9rZSBSZXNvbHZl IEpvYiBQcm9taXNlIHdpdGggam9iIGFuZCByZWdpc3RyYXRpb24uCi0gICAgbV9zZXJ2ZXIucmVz b2x2ZVJlZ2lzdHJhdGlvbkpvYihmaXJzdEpvYigpLCByZWdpc3RyYXRpb24uZGF0YSgpKTsKKyAg ICBtX3NlcnZlci5yZXNvbHZlUmVnaXN0cmF0aW9uSm9iKGpvYiwgcmVnaXN0cmF0aW9uLmRhdGEo KSk7CiAKICAgICAvLyBRdWV1ZSBhIHRhc2sgdG8gZmlyZSBhbiBldmVudCBuYW1lZCB1cGRhdGVm b3VuZCBhdCBhbGwgdGhlIFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb24gb2JqZWN0cwogICAgIC8v IGZvciBhbGwgdGhlIHNlcnZpY2Ugd29ya2VyIGNsaWVudHMgd2hvc2UgY3JlYXRpb24gVVJMIG1h dGNoZXMgcmVnaXN0cmF0aW9uJ3Mgc2NvcGUgdXJsIGFuZAogICAgIC8vIGFsbCB0aGUgc2Vydmlj ZSB3b3JrZXJzIHdob3NlIGNvbnRhaW5pbmcgc2VydmljZSB3b3JrZXIgcmVnaXN0cmF0aW9uIGlz IHJlZ2lzdHJhdGlvbi4KLSAgICByZWdpc3RyYXRpb24uZmlyZVVwZGF0ZUZvdW5kRXZlbnQoZmly c3RKb2IoKS5jb25uZWN0aW9uSWRlbnRpZmllcigpKTsKKyAgICByZWdpc3RyYXRpb24uZmlyZVVw ZGF0ZUZvdW5kRXZlbnQoam9iKTsKIAogICAgIC8vIFF1ZXVlIGEgdGFzayB0byBmaXJlIHRoZSBJ bnN0YWxsRXZlbnQuCiAgICAgbV9zZXJ2ZXIuZmlyZUluc3RhbGxFdmVudChjb25uZWN0aW9uLCBp bnN0YWxsaW5nV29ya2VyKTsKQEAgLTEzNiwxNCArMTM4LDE2IEBAIHZvaWQgU1dTZXJ2ZXJKb2JR dWV1ZTo6ZGlkRmluaXNoSW5zdGFsbChTV1NlcnZlcjo6Q29ubmVjdGlvbiYsIFNlcnZpY2VXb3Jr ZXJJZGVuCiAgICAgYXV0byogcmVnaXN0cmF0aW9uID0gbV9zZXJ2ZXIuZ2V0UmVnaXN0cmF0aW9u KG1fcmVnaXN0cmF0aW9uS2V5KTsKICAgICBBU1NFUlQocmVnaXN0cmF0aW9uKTsKIAorICAgIGF1 dG8mIGpvYiA9IGZpcnN0Sm9iKCk7CisKICAgICBpZiAoIXdhc1N1Y2Nlc3NmdWwpIHsKICAgICAg ICAgYXV0byogd29ya2VyID0gbV9zZXJ2ZXIud29ya2VyQnlJRChpZGVudGlmaWVyKTsKICAgICAg ICAgUkVMRUFTRV9BU1NFUlQod29ya2VyKTsKIAogICAgICAgICAvLyBSdW4gdGhlIFVwZGF0ZSBX b3JrZXIgU3RhdGUgYWxnb3JpdGhtIHBhc3NpbmcgcmVnaXN0cmF0aW9uJ3MgaW5zdGFsbGluZyB3 b3JrZXIgYW5kIHJlZHVuZGFudCBhcyB0aGUgYXJndW1lbnRzLgotICAgICAgICByZWdpc3RyYXRp b24tPnVwZGF0ZVdvcmtlclN0YXRlKCp3b3JrZXIsIFNlcnZpY2VXb3JrZXJTdGF0ZTo6UmVkdW5k YW50KTsKKyAgICAgICAgcmVnaXN0cmF0aW9uLT51cGRhdGVXb3JrZXJTdGF0ZShqb2IsICp3b3Jr ZXIsIFNlcnZpY2VXb3JrZXJTdGF0ZTo6UmVkdW5kYW50KTsKICAgICAgICAgLy8gUnVuIHRoZSBV cGRhdGUgUmVnaXN0cmF0aW9uIFN0YXRlIGFsZ29yaXRobSBwYXNzaW5nIHJlZ2lzdHJhdGlvbiwg Imluc3RhbGxpbmciIGFuZCBudWxsIGFzIHRoZSBhcmd1bWVudHMuCi0gICAgICAgIHJlZ2lzdHJh dGlvbi0+dXBkYXRlUmVnaXN0cmF0aW9uU3RhdGUoU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvblN0 YXRlOjpJbnN0YWxsaW5nLCBudWxscHRyKTsKKyAgICAgICAgcmVnaXN0cmF0aW9uLT51cGRhdGVS ZWdpc3RyYXRpb25TdGF0ZShqb2IsIFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25TdGF0ZTo6SW5z dGFsbGluZywgbnVsbHB0cik7CiAKICAgICAgICAgLy8gSWYgbmV3ZXN0V29ya2VyIGlzIG51bGws IGludm9rZSBDbGVhciBSZWdpc3RyYXRpb24gYWxnb3JpdGhtIHBhc3NpbmcgcmVnaXN0cmF0aW9u IGFzIGl0cyBhcmd1bWVudC4KICAgICAgICAgaWYgKCFyZWdpc3RyYXRpb24tPmdldE5ld2VzdFdv cmtlcigpKQpAQCAtMTU0LDcgKzE1OCw3IEBAIHZvaWQgU1dTZXJ2ZXJKb2JRdWV1ZTo6ZGlkRmlu aXNoSW5zdGFsbChTV1NlcnZlcjo6Q29ubmVjdGlvbiYsIFNlcnZpY2VXb3JrZXJJZGVuCiAgICAg fQogCiAgICAgLy8gRklYTUU6IEltcGxlbWVudCByZWFsIHBvc3QgJ2luc3RhbGwnIGV2ZW50IHN0 ZXBzIG9mIHRoZSBJbnN0YWxsIGFsZ29yaXRobSAoc3RlcHMgMTQrKS4KLSAgICByZWdpc3RyYXRp b24tPmZpcmVQb3N0SW5zdGFsbEV2ZW50cyhmaXJzdEpvYigpLmNvbm5lY3Rpb25JZGVudGlmaWVy KCkpOworICAgIHJlZ2lzdHJhdGlvbi0+ZmlyZVBvc3RJbnN0YWxsRXZlbnRzKGpvYik7CiAKICAg ICBmaW5pc2hDdXJyZW50Sm9iKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3Jr ZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyUmVnaXN0cmF0aW9uLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJSZWdpc3RyYXRpb24uY3BwCmluZGV4 IGJmYjQ3YmZmYmJlYmY0YjQ1MTkxMTlkZTc0OTgzMjdiYmI0MmQ1YzcuLjEwMGIyMTU4MTY0N2M0 NTQyOTBhYTlhOTRiZTAwYWI4YWYwZjkwODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dv cmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJSZWdpc3RyYXRpb24uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJSZWdpc3RyYXRpb24uY3Bw CkBAIC01OSw3ICs1OSw3IEBAIFNXU2VydmVyV29ya2VyKiBTV1NlcnZlclJlZ2lzdHJhdGlvbjo6 Z2V0TmV3ZXN0V29ya2VyKCkKICAgICByZXR1cm4gbV9hY3RpdmVXb3JrZXIuZ2V0KCk7CiB9CiAK LXZvaWQgU1dTZXJ2ZXJSZWdpc3RyYXRpb246OnVwZGF0ZVJlZ2lzdHJhdGlvblN0YXRlKFNlcnZp Y2VXb3JrZXJSZWdpc3RyYXRpb25TdGF0ZSBzdGF0ZSwgU1dTZXJ2ZXJXb3JrZXIqIHdvcmtlcikK K3ZvaWQgU1dTZXJ2ZXJSZWdpc3RyYXRpb246OnVwZGF0ZVJlZ2lzdHJhdGlvblN0YXRlKGNvbnN0 IFNlcnZpY2VXb3JrZXJKb2JEYXRhJiBqb2IsIFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25TdGF0 ZSBzdGF0ZSwgU1dTZXJ2ZXJXb3JrZXIqIHdvcmtlcikKIHsKICAgICBMT0coU2VydmljZVdvcmtl ciwgIiglcCkgVXBkYXRpbmcgcmVnaXN0cmF0aW9uIHN0YXRlIHRvICVpIHdpdGggd29ya2VyICVw IiwgdGhpcywgKGludClzdGF0ZSwgd29ya2VyKTsKICAgICAKQEAgLTc5LDU0ICs3OSw0OSBAQCB2 b2lkIFNXU2VydmVyUmVnaXN0cmF0aW9uOjp1cGRhdGVSZWdpc3RyYXRpb25TdGF0ZShTZXJ2aWNl V29ya2VyUmVnaXN0cmF0aW9uU3RhdAogICAgIGlmICh3b3JrZXIpCiAgICAgICAgIHNlcnZpY2VX b3JrZXJJZGVudGlmaWVyID0gd29ya2VyLT5pZGVudGlmaWVyKCk7CiAKLSAgICBmb3IgKGF1dG8m IGNvbm5lY3Rpb25JZGVudGlmaWVyV2l0aENsaWVudHMgOiBtX2NsaWVudFJlZ2lzdHJhdGlvbnNC eUNvbm5lY3Rpb24ua2V5cygpKSB7Ci0gICAgICAgIGlmIChhdXRvKiBjb25uZWN0aW9uID0gbV9z ZXJ2ZXIuZ2V0Q29ubmVjdGlvbihjb25uZWN0aW9uSWRlbnRpZmllcldpdGhDbGllbnRzKSkKLSAg ICAgICAgICAgIGNvbm5lY3Rpb24tPnVwZGF0ZVJlZ2lzdHJhdGlvblN0YXRlSW5DbGllbnQobV9y ZWdpc3RyYXRpb25LZXksIHN0YXRlLCBzZXJ2aWNlV29ya2VySWRlbnRpZmllcik7Ci0gICAgfQor ICAgIGZvckVhY2hDb25uZWN0aW9uKGpvYiwgWyZdKGF1dG8mIGNvbm5lY3Rpb24pIHsKKyAgICAg ICAgY29ubmVjdGlvbi51cGRhdGVSZWdpc3RyYXRpb25TdGF0ZUluQ2xpZW50KG1fcmVnaXN0cmF0 aW9uS2V5LCBzdGF0ZSwgc2VydmljZVdvcmtlcklkZW50aWZpZXIpOworICAgIH0pOwogfQogCi12 b2lkIFNXU2VydmVyUmVnaXN0cmF0aW9uOjp1cGRhdGVXb3JrZXJTdGF0ZShTV1NlcnZlcldvcmtl ciYgd29ya2VyLCBTZXJ2aWNlV29ya2VyU3RhdGUgc3RhdGUpCit2b2lkIFNXU2VydmVyUmVnaXN0 cmF0aW9uOjp1cGRhdGVXb3JrZXJTdGF0ZShjb25zdCBTZXJ2aWNlV29ya2VySm9iRGF0YSYgam9i LCBTV1NlcnZlcldvcmtlciYgd29ya2VyLCBTZXJ2aWNlV29ya2VyU3RhdGUgc3RhdGUpCiB7CiAg ICAgTE9HKFNlcnZpY2VXb3JrZXIsICJVcGRhdGluZyB3b3JrZXIgJXAgc3RhdGUgdG8gJWkgKCVw KSIsICZ3b3JrZXIsIChpbnQpc3RhdGUsIHRoaXMpOwogCiAgICAgd29ya2VyLnNldFN0YXRlKHN0 YXRlKTsKIAotICAgIGZvciAoYXV0byYgY29ubmVjdGlvbklkZW50aWZpZXJXaXRoQ2xpZW50cyA6 IG1fY2xpZW50UmVnaXN0cmF0aW9uc0J5Q29ubmVjdGlvbi5rZXlzKCkpIHsKLSAgICAgICAgaWYg KGF1dG8qIGNvbm5lY3Rpb24gPSBtX3NlcnZlci5nZXRDb25uZWN0aW9uKGNvbm5lY3Rpb25JZGVu dGlmaWVyV2l0aENsaWVudHMpKQotICAgICAgICAgICAgY29ubmVjdGlvbi0+dXBkYXRlV29ya2Vy U3RhdGVJbkNsaWVudCh3b3JrZXIuaWRlbnRpZmllcigpLCBzdGF0ZSk7Ci0gICAgfQorICAgIGZv ckVhY2hDb25uZWN0aW9uKGpvYiwgWyZdKGF1dG8mIGNvbm5lY3Rpb24pIHsKKyAgICAgICAgY29u bmVjdGlvbi51cGRhdGVXb3JrZXJTdGF0ZUluQ2xpZW50KHdvcmtlci5pZGVudGlmaWVyKCksIHN0 YXRlKTsKKyAgICB9KTsKIH0KIAotdm9pZCBTV1NlcnZlclJlZ2lzdHJhdGlvbjo6ZmlyZVVwZGF0 ZUZvdW5kRXZlbnQodWludDY0X3QgY29ubmVjdGlvbklkZW50aWZpZXIpCit2b2lkIFNXU2VydmVy UmVnaXN0cmF0aW9uOjpmaXJlVXBkYXRlRm91bmRFdmVudChjb25zdCBTZXJ2aWNlV29ya2VySm9i RGF0YSYgam9iKQogewotICAgIC8vIE5vIG1hdHRlciB3aGF0LCB3ZSBzZW5kIHRoZSBldmVudCB0 byB0aGUgY29ubmVjdGlvbiB0aGF0IHNjaGVkdWxlZCB0aGUgam9iLiBUaGUgY2xpZW50IHJlZ2lz dHJhdGlvbgotICAgIC8vIG1heSBub3QgaGF2ZSBnb3R0ZW4gYSBjaGFuY2UgdG8gcmVnaXN0ZXIg aXRzZWxmIHlldC4KLSAgICBpZiAoYXV0byogY29ubmVjdGlvbiA9IG1fc2VydmVyLmdldENvbm5l Y3Rpb24oY29ubmVjdGlvbklkZW50aWZpZXIpKQotICAgICAgICBjb25uZWN0aW9uLT5maXJlVXBk YXRlRm91bmRFdmVudChtX3JlZ2lzdHJhdGlvbktleSk7Ci0KLSAgICBmb3IgKGF1dG8mIGNvbm5l Y3Rpb25JZGVudGlmaWVyV2l0aENsaWVudHMgOiBtX2NsaWVudFJlZ2lzdHJhdGlvbnNCeUNvbm5l Y3Rpb24ua2V5cygpKSB7Ci0gICAgICAgIGlmIChjb25uZWN0aW9uSWRlbnRpZmllcldpdGhDbGll bnRzID09IGNvbm5lY3Rpb25JZGVudGlmaWVyKQotICAgICAgICAgICAgY29udGludWU7Ci0KLSAg ICAgICAgaWYgKGF1dG8qIGNvbm5lY3Rpb24gPSBtX3NlcnZlci5nZXRDb25uZWN0aW9uKGNvbm5l Y3Rpb25JZGVudGlmaWVyV2l0aENsaWVudHMpKQotICAgICAgICAgICAgY29ubmVjdGlvbi0+Zmly ZVVwZGF0ZUZvdW5kRXZlbnQobV9yZWdpc3RyYXRpb25LZXkpOwotICAgIH0KKyAgICBmb3JFYWNo Q29ubmVjdGlvbihqb2IsIFsmXShhdXRvJiBjb25uZWN0aW9uKSB7CisgICAgICAgIGNvbm5lY3Rp b24uZmlyZVVwZGF0ZUZvdW5kRXZlbnQobV9yZWdpc3RyYXRpb25LZXkpOworICAgIH0pOwogfQog CiAvLyBGSVhNRTogVGhpcyB3aWxsIGRvIGF3YXkgb25jZSB3ZSBjb3JyZWN0bHkgdXBkYXRlIHRo ZSByZWdpc3RyYXRpb24gc3RhdGUgYWZ0ZXIgaW5zdGFsbC4KLXZvaWQgU1dTZXJ2ZXJSZWdpc3Ry YXRpb246OmZpcmVQb3N0SW5zdGFsbEV2ZW50cyh1aW50NjRfdCBjb25uZWN0aW9uSWRlbnRpZmll cikKK3ZvaWQgU1dTZXJ2ZXJSZWdpc3RyYXRpb246OmZpcmVQb3N0SW5zdGFsbEV2ZW50cyhjb25z dCBTZXJ2aWNlV29ya2VySm9iRGF0YSYgam9iKQoreworICAgIGZvckVhY2hDb25uZWN0aW9uKGpv YiwgWyZdKGF1dG8mIGNvbm5lY3Rpb24pIHsKKyAgICAgICAgY29ubmVjdGlvbi5maXJlUG9zdElu c3RhbGxFdmVudHMobV9yZWdpc3RyYXRpb25LZXkpOworICAgIH0pOworfQorCit2b2lkIFNXU2Vy dmVyUmVnaXN0cmF0aW9uOjpmb3JFYWNoQ29ubmVjdGlvbihjb25zdCBTZXJ2aWNlV29ya2VySm9i RGF0YSYgam9iLCBjb25zdCBXVEY6OkZ1bmN0aW9uPHZvaWQoU1dTZXJ2ZXI6OkNvbm5lY3Rpb24m KT4mIGFwcGx5KQogewogICAgIC8vIE5vIG1hdHRlciB3aGF0LCB3ZSBzZW5kIHRoZSBldmVudCB0 byB0aGUgY29ubmVjdGlvbiB0aGF0IHNjaGVkdWxlZCB0aGUgam9iLiBUaGUgY2xpZW50IHJlZ2lz dHJhdGlvbgogICAgIC8vIG1heSBub3QgaGF2ZSBnb3R0ZW4gYSBjaGFuY2UgdG8gcmVnaXN0ZXIg aXRzZWxmIHlldC4KLSAgICBpZiAoYXV0byogY29ubmVjdGlvbiA9IG1fc2VydmVyLmdldENvbm5l Y3Rpb24oY29ubmVjdGlvbklkZW50aWZpZXIpKQotICAgICAgICBjb25uZWN0aW9uLT5maXJlUG9z dEluc3RhbGxFdmVudHMobV9yZWdpc3RyYXRpb25LZXkpOworICAgIGlmICghbV9jbGllbnRSZWdp c3RyYXRpb25zQnlDb25uZWN0aW9uLmNvbnRhaW5zKGpvYi5jb25uZWN0aW9uSWRlbnRpZmllcigp KSkgeworICAgICAgICBpZiAoYXV0byogY29ubmVjdGlvbiA9IG1fc2VydmVyLmdldENvbm5lY3Rp b24oam9iLmNvbm5lY3Rpb25JZGVudGlmaWVyKCkpKQorICAgICAgICAgICAgYXBwbHkoKmNvbm5l Y3Rpb24pOworICAgIH0KIAogICAgIGZvciAoYXV0byYgY29ubmVjdGlvbklkZW50aWZpZXJXaXRo Q2xpZW50cyA6IG1fY2xpZW50UmVnaXN0cmF0aW9uc0J5Q29ubmVjdGlvbi5rZXlzKCkpIHsKLSAg ICAgICAgaWYgKGNvbm5lY3Rpb25JZGVudGlmaWVyV2l0aENsaWVudHMgPT0gY29ubmVjdGlvbklk ZW50aWZpZXIpCi0gICAgICAgICAgICBjb250aW51ZTsKLQogICAgICAgICBpZiAoYXV0byogY29u bmVjdGlvbiA9IG1fc2VydmVyLmdldENvbm5lY3Rpb24oY29ubmVjdGlvbklkZW50aWZpZXJXaXRo Q2xpZW50cykpCi0gICAgICAgICAgICBjb25uZWN0aW9uLT5maXJlUG9zdEluc3RhbGxFdmVudHMo bV9yZWdpc3RyYXRpb25LZXkpOworICAgICAgICAgICAgYXBwbHkoKmNvbm5lY3Rpb24pOwogICAg IH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZl ci9TV1NlcnZlclJlZ2lzdHJhdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNl L3NlcnZlci9TV1NlcnZlclJlZ2lzdHJhdGlvbi5oCmluZGV4IGQ5MmY0M2UwMmZlMzllOWY1ZTcw ZTEwN2MzYzc2NDc1N2IwMDA1NjUuLjJiMzdiYTRhZDNhYjcxZTkyMzJkZTJlNjkxODkxOWE0Nzlj ZThlZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIv U1dTZXJ2ZXJSZWdpc3RyYXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZp Y2Uvc2VydmVyL1NXU2VydmVyUmVnaXN0cmF0aW9uLmgKQEAgLTU2LDE1ICs1NiwxNyBAQCBwdWJs aWM6CiAgICAgdm9pZCBzZXRMYXN0VXBkYXRlVGltZShkb3VibGUgdGltZSkgeyBtX2xhc3RVcGRh dGVUaW1lID0gdGltZTsgfQogICAgIFNlcnZpY2VXb3JrZXJVcGRhdGVWaWFDYWNoZSB1cGRhdGVW aWFDYWNoZSgpIGNvbnN0IHsgcmV0dXJuIG1fdXBkYXRlVmlhQ2FjaGU7IH0KIAotICAgIHZvaWQg dXBkYXRlUmVnaXN0cmF0aW9uU3RhdGUoU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvblN0YXRlLCBT V1NlcnZlcldvcmtlciopOwotICAgIHZvaWQgdXBkYXRlV29ya2VyU3RhdGUoU1dTZXJ2ZXJXb3Jr ZXImLCBTZXJ2aWNlV29ya2VyU3RhdGUpOwotICAgIHZvaWQgZmlyZVVwZGF0ZUZvdW5kRXZlbnQo dWludDY0X3QgY29ubmVjdGlvbklkZW50aWZpZXIpOwotICAgIHZvaWQgZmlyZVBvc3RJbnN0YWxs RXZlbnRzKHVpbnQ2NF90IGNvbm5lY3Rpb25JZGVudGlmaWVyKTsKKyAgICB2b2lkIHVwZGF0ZVJl Z2lzdHJhdGlvblN0YXRlKGNvbnN0IFNlcnZpY2VXb3JrZXJKb2JEYXRhJiwgU2VydmljZVdvcmtl clJlZ2lzdHJhdGlvblN0YXRlLCBTV1NlcnZlcldvcmtlciopOworICAgIHZvaWQgdXBkYXRlV29y a2VyU3RhdGUoY29uc3QgU2VydmljZVdvcmtlckpvYkRhdGEmLCBTV1NlcnZlcldvcmtlciYsIFNl cnZpY2VXb3JrZXJTdGF0ZSk7CisgICAgdm9pZCBmaXJlVXBkYXRlRm91bmRFdmVudChjb25zdCBT ZXJ2aWNlV29ya2VySm9iRGF0YSYpOworICAgIHZvaWQgZmlyZVBvc3RJbnN0YWxsRXZlbnRzKGNv bnN0IFNlcnZpY2VXb3JrZXJKb2JEYXRhJik7CiAKICAgICB2b2lkIGFkZENsaWVudFNlcnZpY2VX b3JrZXJSZWdpc3RyYXRpb24odWludDY0X3QgY29ubmVjdGlvbklkZW50aWZpZXIsIHVpbnQ2NF90 IGNsaWVudFJlZ2lzdHJhdGlvbklkZW50aWZpZXIpOwogICAgIHZvaWQgcmVtb3ZlQ2xpZW50U2Vy dmljZVdvcmtlclJlZ2lzdHJhdGlvbih1aW50NjRfdCBjb25uZWN0aW9uSWRlbnRpZmllciwgdWlu dDY0X3QgY2xpZW50UmVnaXN0cmF0aW9uSWRlbnRpZmllcik7CiAKIHByaXZhdGU6CisgICAgdm9p ZCBmb3JFYWNoQ29ubmVjdGlvbihjb25zdCBTZXJ2aWNlV29ya2VySm9iRGF0YSYsIGNvbnN0IFdU Rjo6RnVuY3Rpb248dm9pZChTV1NlcnZlcjo6Q29ubmVjdGlvbiYpPiYpOworCiAgICAgU2Vydmlj ZVdvcmtlclJlZ2lzdHJhdGlvbktleSBtX3JlZ2lzdHJhdGlvbktleTsKICAgICBTZXJ2aWNlV29y a2VyVXBkYXRlVmlhQ2FjaGUgbV91cGRhdGVWaWFDYWNoZTsKICAgICBVUkwgbV9zY29wZVVSTDsK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv c2VydmljZS13b3JrZXJzL3NlcnZpY2Utd29ya2VyL3dpbmRvd2NsaWVudC1uYXZpZ2F0ZS5odHRw cy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL3NlcnZpY2Utd29ya2Vycy9zZXJ2aWNlLXdvcmtlci93aW5kb3djbGllbnQtbmF2aWdhdGUu aHR0cHMtZXhwZWN0ZWQudHh0CmluZGV4IGI2NTg5NThmODk3YjFkMzg1NjAyMzkwM2I1NTY3NTM5 NDg1YWIzMDQuLjgyY2NlZjk1MDA1ZDc1M2Y3NThhN2NhZmRmMWFkYzMwZWM5ODNjNjAgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvc2Vydmlj ZS13b3JrZXJzL3NlcnZpY2Utd29ya2VyL3dpbmRvd2NsaWVudC1uYXZpZ2F0ZS5odHRwcy1leHBl Y3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9zZXJ2aWNlLXdvcmtlcnMvc2VydmljZS13b3JrZXIvd2luZG93Y2xpZW50LW5hdmlnYXRlLmh0 dHBzLWV4cGVjdGVkLnR4dApAQCAtMSw3ICsxLDcgQEAKIAogRkFJTCBub3JtYWwgcHJvbWlzZV90 ZXN0OiBVbmhhbmRsZWQgcmVqZWN0aW9uIHdpdGggdmFsdWU6IG9iamVjdCAiTm90U3VwcG9ydGVk RXJyb3I6IFBhc3NpbmcgTWVzc2FnZVBvcnQgb2JqZWN0cyB0byBwb3N0TWVzc2FnZSBpcyBub3Qg eWV0IHN1cHBvcnRlZCIKIEZBSUwgYmxhbmsgdXJsIHByb21pc2VfdGVzdDogVW5oYW5kbGVkIHJl amVjdGlvbiB3aXRoIHZhbHVlOiBvYmplY3QgIk5vdFN1cHBvcnRlZEVycm9yOiBQYXNzaW5nIE1l c3NhZ2VQb3J0IG9iamVjdHMgdG8gcG9zdE1lc3NhZ2UgaXMgbm90IHlldCBzdXBwb3J0ZWQiCi1G QUlMIGluIHNjb3BlIGJ1dCBub3QgY29udHJvbGxlZCB0ZXN0IG9uIGluc3RhbGxpbmcgd29ya2Vy IHByb21pc2VfdGVzdDogVW5oYW5kbGVkIHJlamVjdGlvbiB3aXRoIHZhbHVlOiBvYmplY3QgIk5v dFN1cHBvcnRlZEVycm9yOiBQYXNzaW5nIE1lc3NhZ2VQb3J0IG9iamVjdHMgdG8gcG9zdE1lc3Nh Z2UgaXMgbm90IHlldCBzdXBwb3J0ZWQiCitGQUlMIGluIHNjb3BlIGJ1dCBub3QgY29udHJvbGxl ZCB0ZXN0IG9uIGluc3RhbGxpbmcgd29ya2VyIHByb21pc2VfdGVzdDogVW5oYW5kbGVkIHJlamVj dGlvbiB3aXRoIHZhbHVlOiBvYmplY3QgIkludmFsaWRTdGF0ZUVycm9yOiBTZXJ2aWNlIFdvcmtl ciBzdGF0ZSBpcyByZWR1bmRhbnQiCiBGQUlMIGluIHNjb3BlIGJ1dCBub3QgY29udHJvbGxlZCB0 ZXN0IG9uIGFjdGl2ZSB3b3JrZXIgcHJvbWlzZV90ZXN0OiBVbmhhbmRsZWQgcmVqZWN0aW9uIHdp dGggdmFsdWU6IG9iamVjdCAiTm90U3VwcG9ydGVkRXJyb3I6IFBhc3NpbmcgTWVzc2FnZVBvcnQg b2JqZWN0cyB0byBwb3N0TWVzc2FnZSBpcyBub3QgeWV0IHN1cHBvcnRlZCIKIEZBSUwgb3V0IG9m IHNjb3BlIHByb21pc2VfdGVzdDogVW5oYW5kbGVkIHJlamVjdGlvbiB3aXRoIHZhbHVlOiBvYmpl Y3QgIk5vdFN1cHBvcnRlZEVycm9yOiBQYXNzaW5nIE1lc3NhZ2VQb3J0IG9iamVjdHMgdG8gcG9z dE1lc3NhZ2UgaXMgbm90IHlldCBzdXBwb3J0ZWQiCiBGQUlMIGNyb3NzIG9yZ2luIHVybCBwcm9t aXNlX3Rlc3Q6IFVuaGFuZGxlZCByZWplY3Rpb24gd2l0aCB2YWx1ZTogb2JqZWN0ICJOb3RTdXBw b3J0ZWRFcnJvcjogUGFzc2luZyBNZXNzYWdlUG9ydCBvYmplY3RzIHRvIHBvc3RNZXNzYWdlIGlz IG5vdCB5ZXQgc3VwcG9ydGVkIgo=