128008 2014-01-31 12:24:20 -0800 IDB: openCursor() needs to prime the cursor with first position values 2014-01-31 12:46:31 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 124521 1 beidson beidson alecflett commit-queue jsbell oldest_to_newest 974415 0 beidson 2014-01-31 12:24:20 -0800 IDB: openCursor() needs to prime the cursor with first position values This is blocking work on finishing up cursors 974418 1 222836 beidson 2014-01-31 12:30:06 -0800 Created attachment 222836 Patch v1 974420 2 commit-queue 2014-01-31 12:32:36 -0800 Attachment 222836 did not pass style-queue: ERROR: Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp:157: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 17 files If any of these errors are false positives, please file a bug against check-webkit-style. 974423 3 222836 ap 2014-01-31 12:43:13 -0800 Comment on attachment 222836 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=222836&action=review > Source/WebKit2/ChangeLog:38 > + > + > + Whitespace 974425 4 beidson 2014-01-31 12:46:31 -0800 http://trac.webkit.org/changeset/163187 222836 2014-01-31 12:30:06 -0800 2014-01-31 12:43:13 -0800 Patch v1 patch text/plain 38523 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxYjI1YzhmLi43MmI2OGU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTQtMDEtMzEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIElEQjogb3BlbkN1cnNvcigpIG5lZWRzIHRvIHByaW1lIHRoZSBjdXJzb3Igd2l0aCBmaXJz dCBwb3NpdGlvbiB2YWx1ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEyODAwOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURCVHJhbnNhY3Rpb25CYWNrZW5kT3BlcmF0 aW9ucy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpPcGVuQ3Vyc29yT3BlcmF0aW9uOjpwZXJmb3Jt KTogSWYgdGhlIHNlcnZlciBjb25uZWN0aW9uIHJldHVybnMgaW5pdGlhbCBrZXlzL3ZhbHVlcwor ICAgICAgICAgIGZvciB0aGUgY3Vyc29yLCBzdG9yZSB0aGVtLgorCisgICAgICAgICogTW9kdWxl cy9pbmRleGVkZGIvSURCU2VydmVyQ29ubmVjdGlvbi5oOgorCisgICAgICAgICogTW9kdWxlcy9p bmRleGVkZGIvbGV2ZWxkYi9JREJTZXJ2ZXJDb25uZWN0aW9uTGV2ZWxEQi5jcHA6CisgICAgICAg IChXZWJDb3JlOjpJREJTZXJ2ZXJDb25uZWN0aW9uTGV2ZWxEQjo6b3BlbkN1cnNvcik6CisgICAg ICAgICogTW9kdWxlcy9pbmRleGVkZGIvbGV2ZWxkYi9JREJTZXJ2ZXJDb25uZWN0aW9uTGV2ZWxE Qi5oOgorCiAyMDE0LTAxLTMxICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAg ICAgICAgU3VicGl4ZWwgcmVuZGVyaW5nOiBDaGFuZ2UgUmVuZGVyQm94TW9kZWxPYmplY3QncyBi b3JkZXIgZnVuY3Rpb25zJyBzaWduYXR1cmUgdG8gc3VwcG9ydCBzdWJwaXhlbCBib3JkZXIgcGFp bnRpbmcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJT ZXJ2ZXJDb25uZWN0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJT ZXJ2ZXJDb25uZWN0aW9uLmgKaW5kZXggMTA0YTIwNi4uOTMyM2EyYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCU2VydmVyQ29ubmVjdGlvbi5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlNlcnZlckNvbm5lY3Rpb24uaApA QCAtODEsNyArODEsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGRlbGV0ZUluZGV4KElE QlRyYW5zYWN0aW9uQmFja2VuZCYsIGNvbnN0IERlbGV0ZUluZGV4T3BlcmF0aW9uJiwgc3RkOjpm dW5jdGlvbjx2b2lkKFBhc3NSZWZQdHI8SURCRGF0YWJhc2VFcnJvcj4pPiBjb21wbGV0aW9uQ2Fs bGJhY2spID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZ2V0KElEQlRyYW5zYWN0aW9uQmFja2VuZCYs IGNvbnN0IEdldE9wZXJhdGlvbiYsIHN0ZDo6ZnVuY3Rpb248dm9pZChjb25zdCBJREJHZXRSZXN1 bHQmLCBQYXNzUmVmUHRyPElEQkRhdGFiYXNlRXJyb3I+KT4gY29tcGxldGlvbkNhbGxiYWNrKSA9 IDA7CiAgICAgdmlydHVhbCB2b2lkIHB1dChJREJUcmFuc2FjdGlvbkJhY2tlbmQmLCBjb25zdCBQ dXRPcGVyYXRpb24mLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoUGFzc1JlZlB0cjxJREJLZXk+LCBQYXNz UmVmUHRyPElEQkRhdGFiYXNlRXJyb3I+KT4gY29tcGxldGlvbkNhbGxiYWNrKSA9IDA7Ci0gICAg dmlydHVhbCB2b2lkIG9wZW5DdXJzb3IoSURCVHJhbnNhY3Rpb25CYWNrZW5kJiwgY29uc3QgT3Bl bkN1cnNvck9wZXJhdGlvbiYsIHN0ZDo6ZnVuY3Rpb248dm9pZChpbnQ2NF90LCBQYXNzUmVmUHRy PElEQkRhdGFiYXNlRXJyb3I+KT4gY29tcGxldGlvbkNhbGxiYWNrKSA9IDA7CisgICAgdmlydHVh bCB2b2lkIG9wZW5DdXJzb3IoSURCVHJhbnNhY3Rpb25CYWNrZW5kJiwgY29uc3QgT3BlbkN1cnNv ck9wZXJhdGlvbiYsIHN0ZDo6ZnVuY3Rpb248dm9pZChpbnQ2NF90LCBQYXNzUmVmUHRyPElEQktl eT4sIFBhc3NSZWZQdHI8SURCS2V5PiwgUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+LCBQYXNzUmVm UHRyPElEQkRhdGFiYXNlRXJyb3I+KT4gY29tcGxldGlvbkNhbGxiYWNrKSA9IDA7CiAgICAgdmly dHVhbCB2b2lkIGNvdW50KElEQlRyYW5zYWN0aW9uQmFja2VuZCYsIGNvbnN0IENvdW50T3BlcmF0 aW9uJiwgc3RkOjpmdW5jdGlvbjx2b2lkKGludDY0X3QsIFBhc3NSZWZQdHI8SURCRGF0YWJhc2VF cnJvcj4pPiBjb21wbGV0aW9uQ2FsbGJhY2spID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGVsZXRl UmFuZ2UoSURCVHJhbnNhY3Rpb25CYWNrZW5kJiwgY29uc3QgRGVsZXRlUmFuZ2VPcGVyYXRpb24m LCBzdGQ6OmZ1bmN0aW9uPHZvaWQoUGFzc1JlZlB0cjxJREJEYXRhYmFzZUVycm9yPik+IGNvbXBs ZXRpb25DYWxsYmFjaykgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBjbGVhck9iamVjdFN0b3JlKElE QlRyYW5zYWN0aW9uQmFja2VuZCYsIGNvbnN0IENsZWFyT2JqZWN0U3RvcmVPcGVyYXRpb24mLCBz dGQ6OmZ1bmN0aW9uPHZvaWQoUGFzc1JlZlB0cjxJREJEYXRhYmFzZUVycm9yPik+IGNvbXBsZXRp b25DYWxsYmFjaykgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRl eGVkZGIvSURCVHJhbnNhY3Rpb25CYWNrZW5kT3BlcmF0aW9ucy5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJUcmFuc2FjdGlvbkJhY2tlbmRPcGVyYXRpb25zLmNwcApp bmRleCA0YjZiMGZjLi40NTY4ZjE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2luZGV4ZWRkYi9JREJUcmFuc2FjdGlvbkJhY2tlbmRPcGVyYXRpb25zLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJUcmFuc2FjdGlvbkJhY2tlbmRPcGVyYXRp b25zLmNwcApAQCAtMTU0LDEzICsxNTQsMTYgQEAgdm9pZCBPcGVuQ3Vyc29yT3BlcmF0aW9uOjpw ZXJmb3JtKHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiBjb21wbGV0aW9uQ2FsbGJhY2spCiAgICAgTE9H KFN0b3JhZ2VBUEksICJPcGVuQ3Vyc29yT3BlcmF0aW9uIik7CiAKICAgICBSZWZQdHI8T3BlbkN1 cnNvck9wZXJhdGlvbj4gb3BlcmF0aW9uKHRoaXMpOwotICAgIGF1dG8gY2FsbGJhY2sgPSBbdGhp cywgb3BlcmF0aW9uLCBjb21wbGV0aW9uQ2FsbGJhY2tdKGludDY0X3QgY3Vyc29ySUQsIFBhc3NS ZWZQdHI8SURCRGF0YWJhc2VFcnJvcj4pIHsKKyAgICBhdXRvIGNhbGxiYWNrID0gW3RoaXMsIG9w ZXJhdGlvbiwgY29tcGxldGlvbkNhbGxiYWNrXShpbnQ2NF90IGN1cnNvcklELCBQYXNzUmVmUHRy PElEQktleT4ga2V5LCBQYXNzUmVmUHRyPElEQktleT4gcHJpbWFyeUtleSwgUGFzc1JlZlB0cjxT aGFyZWRCdWZmZXI+IHZhbHVlLCBQYXNzUmVmUHRyPElEQkRhdGFiYXNlRXJyb3I+KSB7CiAgICAg ICAgIC8vIEZJWE1FOiBXaGVuIHRoZSBMZXZlbERCIHBvcnQgZmFpbHMgdG8gb3BlbiBhIGJhY2tp bmcgc3RvcmUgY3Vyc29yIGl0IGNhbGxzIG9uU3VjY2VzcyhudWxscHRyKTsKICAgICAgICAgLy8g VGhpcyBzZWVtcyBub25zZW5zaWNhbCBhbmQgbWlnaHQgaGF2ZSB0byBjaGFuZ2Ugc29vbiwgYnJl YWtpbmcgdGhlbS4KICAgICAgICAgaWYgKCFjdXJzb3JJRCkKICAgICAgICAgICAgIG1fY2FsbGJh Y2tzLT5vblN1Y2Nlc3Moc3RhdGljX2Nhc3Q8U2hhcmVkQnVmZmVyKj4oMCkpOwogICAgICAgICBl bHNlIHsKICAgICAgICAgICAgIFJlZlB0cjxJREJDdXJzb3JCYWNrZW5kPiBjdXJzb3IgPSBJREJD dXJzb3JCYWNrZW5kOjpjcmVhdGUoY3Vyc29ySUQsIG1fY3Vyc29yVHlwZSwgbV90YXNrVHlwZSwg Km1fdHJhbnNhY3Rpb24sIG1fb2JqZWN0U3RvcmVJRCk7CisgICAgICAgICAgICBpZiAoa2V5IHx8 IHByaW1hcnlLZXkgfHwgdmFsdWUpCisgICAgICAgICAgICAgICAgY3Vyc29yLT51cGRhdGVDdXJz b3JEYXRhKGtleS5nZXQoKSwgcHJpbWFyeUtleS5nZXQoKSwgdmFsdWUuZ2V0KCkpOworCiAgICAg ICAgICAgICBtX2NhbGxiYWNrcy0+b25TdWNjZXNzKGN1cnNvciwgY3Vyc29yLT5rZXkoKSwgY3Vy c29yLT5wcmltYXJ5S2V5KCksIGN1cnNvci0+dmFsdWUoKSk7CiAgICAgICAgIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvbGV2ZWxkYi9JREJTZXJ2ZXJD b25uZWN0aW9uTGV2ZWxEQi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9s ZXZlbGRiL0lEQlNlcnZlckNvbm5lY3Rpb25MZXZlbERCLmNwcAppbmRleCBiNzMzM2Y5Li5kNGIw MDQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9sZXZlbGRi L0lEQlNlcnZlckNvbm5lY3Rpb25MZXZlbERCLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9sZXZlbGRiL0lEQlNlcnZlckNvbm5lY3Rpb25MZXZlbERCLmNwcApAQCAt NDI5LDcgKzQyOSw3IEBAIHZvaWQgSURCU2VydmVyQ29ubmVjdGlvbkxldmVsREI6OnB1dChJREJU cmFuc2FjdGlvbkJhY2tlbmQmIHRyYW5zYWN0aW9uLCBjb25zdCBQCiAgICAgfSk7CiB9CiAKLXZv aWQgSURCU2VydmVyQ29ubmVjdGlvbkxldmVsREI6Om9wZW5DdXJzb3IoSURCVHJhbnNhY3Rpb25C YWNrZW5kJiB0cmFuc2FjdGlvbiwgY29uc3QgT3BlbkN1cnNvck9wZXJhdGlvbiYgb3BlcmF0aW9u LCBzdGQ6OmZ1bmN0aW9uPHZvaWQoaW50NjRfdCwgUGFzc1JlZlB0cjxJREJEYXRhYmFzZUVycm9y Pik+IGNvbXBsZXRpb25DYWxsYmFjaykKK3ZvaWQgSURCU2VydmVyQ29ubmVjdGlvbkxldmVsREI6 Om9wZW5DdXJzb3IoSURCVHJhbnNhY3Rpb25CYWNrZW5kJiB0cmFuc2FjdGlvbiwgY29uc3QgT3Bl bkN1cnNvck9wZXJhdGlvbiYgb3BlcmF0aW9uLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoaW50NjRfdCwg UGFzc1JlZlB0cjxJREJLZXk+LCBQYXNzUmVmUHRyPElEQktleT4sIFBhc3NSZWZQdHI8U2hhcmVk QnVmZmVyPiwgUGFzc1JlZlB0cjxJREJEYXRhYmFzZUVycm9yPik+IGNvbXBsZXRpb25DYWxsYmFj aykKIHsKICAgICBJREJCYWNraW5nU3RvcmVUcmFuc2FjdGlvbkxldmVsREIqIGJhY2tpbmdTdG9y ZVRyYW5zYWN0aW9uID0gbV9iYWNraW5nU3RvcmVUcmFuc2FjdGlvbnMuZ2V0KHRyYW5zYWN0aW9u LmlkKCkpOwogICAgIEFTU0VSVChiYWNraW5nU3RvcmVUcmFuc2FjdGlvbik7CkBAIC00NjEsNyAr NDYxLDggQEAgdm9pZCBJREJTZXJ2ZXJDb25uZWN0aW9uTGV2ZWxEQjo6b3BlbkN1cnNvcihJREJU cmFuc2FjdGlvbkJhY2tlbmQmIHRyYW5zYWN0aW9uLAogICAgIH0KIAogICAgIGNhbGxPbk1haW5U aHJlYWQoW2NvbXBsZXRpb25DYWxsYmFjaywgY3Vyc29ySURdKCkgewotICAgICAgICBjb21wbGV0 aW9uQ2FsbGJhY2soY3Vyc29ySUQsIG51bGxwdHIpOworICAgICAgICAvLyBGSVhNRTogTmVlZCB0 byBhY3R1YWxseSBwYXNzIHRoZSBpbml0aWFsIGtleSwgcHJpbWFyeUtleSwgYW5kIHZhbHVlIHRv IHRoZSBjYWxsYmFjay4KKyAgICAgICAgY29tcGxldGlvbkNhbGxiYWNrKGN1cnNvcklELCBudWxs cHRyLCBudWxscHRyLCBudWxscHRyLCBudWxscHRyKTsKICAgICB9KTsKIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvbGV2ZWxkYi9JREJTZXJ2ZXJDb25u ZWN0aW9uTGV2ZWxEQi5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvbGV2ZWxk Yi9JREJTZXJ2ZXJDb25uZWN0aW9uTGV2ZWxEQi5oCmluZGV4IGU1NzRmMzguLjk3OGJjZDIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2xldmVsZGIvSURCU2Vy dmVyQ29ubmVjdGlvbkxldmVsREIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4 ZWRkYi9sZXZlbGRiL0lEQlNlcnZlckNvbm5lY3Rpb25MZXZlbERCLmgKQEAgLTY4LDcgKzY4LDcg QEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBkZWxldGVJbmRleChJREJUcmFuc2FjdGlvbkJh Y2tlbmQmLCBjb25zdCBEZWxldGVJbmRleE9wZXJhdGlvbiYsIHN0ZDo6ZnVuY3Rpb248dm9pZChQ YXNzUmVmUHRyPElEQkRhdGFiYXNlRXJyb3I+KT4gY29tcGxldGlvbkNhbGxiYWNrKSBvdmVycmlk ZTsKICAgICB2aXJ0dWFsIHZvaWQgZ2V0KElEQlRyYW5zYWN0aW9uQmFja2VuZCYsIGNvbnN0IEdl dE9wZXJhdGlvbiYsIHN0ZDo6ZnVuY3Rpb248dm9pZChjb25zdCBJREJHZXRSZXN1bHQmLCBQYXNz UmVmUHRyPElEQkRhdGFiYXNlRXJyb3I+KT4gY29tcGxldGlvbkNhbGxiYWNrKSBvdmVycmlkZTsK ICAgICB2aXJ0dWFsIHZvaWQgcHV0KElEQlRyYW5zYWN0aW9uQmFja2VuZCYsIGNvbnN0IFB1dE9w ZXJhdGlvbiYsIHN0ZDo6ZnVuY3Rpb248dm9pZChQYXNzUmVmUHRyPElEQktleT4sIFBhc3NSZWZQ dHI8SURCRGF0YWJhc2VFcnJvcj4pPiBjb21wbGV0aW9uQ2FsbGJhY2spICBvdmVycmlkZTsKLSAg ICB2aXJ0dWFsIHZvaWQgb3BlbkN1cnNvcihJREJUcmFuc2FjdGlvbkJhY2tlbmQmLCBjb25zdCBP cGVuQ3Vyc29yT3BlcmF0aW9uJiwgc3RkOjpmdW5jdGlvbjx2b2lkKGludDY0X3QsIFBhc3NSZWZQ dHI8SURCRGF0YWJhc2VFcnJvcj4pPiBjb21wbGV0aW9uQ2FsbGJhY2spIG92ZXJyaWRlOworICAg IHZpcnR1YWwgdm9pZCBvcGVuQ3Vyc29yKElEQlRyYW5zYWN0aW9uQmFja2VuZCYsIGNvbnN0IE9w ZW5DdXJzb3JPcGVyYXRpb24mLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoaW50NjRfdCwgUGFzc1JlZlB0 cjxJREJLZXk+LCBQYXNzUmVmUHRyPElEQktleT4sIFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiwg UGFzc1JlZlB0cjxJREJEYXRhYmFzZUVycm9yPik+IGNvbXBsZXRpb25DYWxsYmFjaykgb3ZlcnJp ZGU7CiAgICAgdmlydHVhbCB2b2lkIGNvdW50KElEQlRyYW5zYWN0aW9uQmFja2VuZCYsIGNvbnN0 IENvdW50T3BlcmF0aW9uJiwgc3RkOjpmdW5jdGlvbjx2b2lkKGludDY0X3QsIFBhc3NSZWZQdHI8 SURCRGF0YWJhc2VFcnJvcj4pPiBjb21wbGV0aW9uQ2FsbGJhY2spIG92ZXJyaWRlOwogICAgIHZp cnR1YWwgdm9pZCBkZWxldGVSYW5nZShJREJUcmFuc2FjdGlvbkJhY2tlbmQmLCBjb25zdCBEZWxl dGVSYW5nZU9wZXJhdGlvbiYsIHN0ZDo6ZnVuY3Rpb248dm9pZChQYXNzUmVmUHRyPElEQkRhdGFi YXNlRXJyb3I+KT4gY29tcGxldGlvbkNhbGxiYWNrKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZv aWQgY2xlYXJPYmplY3RTdG9yZShJREJUcmFuc2FjdGlvbkJhY2tlbmQmLCBjb25zdCBDbGVhck9i amVjdFN0b3JlT3BlcmF0aW9uJiwgc3RkOjpmdW5jdGlvbjx2b2lkKFBhc3NSZWZQdHI8SURCRGF0 YWJhc2VFcnJvcj4pPiBjb21wbGV0aW9uQ2FsbGJhY2spIG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4 IGU4ZDJiODcuLmE1YzllZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw0MyBAQAogMjAxNC0wMS0z MSAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKKyAgICAgICAgSURCOiBvcGVu Q3Vyc29yKCkgbmVlZHMgdG8gcHJpbWUgdGhlIGN1cnNvciB3aXRoIGZpcnN0IHBvc2l0aW9uIHZh bHVlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4 MDA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hh bmdlIG9wZW5DdXJzb3IoKSBtZXNzYWdpbmcgdG8gcGFzcyBiYWNrIHRoZSBpbml0aWFsIGtleXMv dmFsdWVzCisgICAgICAgICogV2ViUHJvY2Vzcy9EYXRhYmFzZXMvSW5kZXhlZERCL1dlYklEQlNl cnZlckNvbm5lY3Rpb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJTZXJ2ZXJDb25uZWN0 aW9uOjpkaWRPcGVuQ3Vyc29yKToKKyAgICAgICAgKFdlYktpdDo6V2ViSURCU2VydmVyQ29ubmVj dGlvbjo6b3BlbkN1cnNvcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9EYXRhYmFzZXMvSW5kZXhl ZERCL1dlYklEQlNlcnZlckNvbm5lY3Rpb24uaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL0RhdGFi YXNlcy9JbmRleGVkREIvV2ViSURCU2VydmVyQ29ubmVjdGlvbi5tZXNzYWdlcy5pbjoKKworICAg ICAgICAqIERhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvRGF0YWJhc2VQcm9jZXNzSURCQ29ubmVj dGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OkRhdGFiYXNlUHJvY2Vzc0lEQkNvbm5lY3Rpb246 Om9wZW5DdXJzb3IpOgorCisgICAgICAgICogRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9Vbmlx dWVJREJEYXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlVuaXF1ZUlEQkRhdGFiYXNlOjpv cGVuQ3Vyc29yKToKKyAgICAgICAgKFdlYktpdDo6VW5pcXVlSURCRGF0YWJhc2U6OmN1cnNvckFk dmFuY2UpOiBDb25zdCBhbmQgcmVmZXJlbmNlIHVwZGF0ZXMuCisgICAgICAgIChXZWJLaXQ6OlVu aXF1ZUlEQkRhdGFiYXNlOjpjdXJzb3JJdGVyYXRlKTogRGl0dG8uCisgICAgICAgIChXZWJLaXQ6 OlVuaXF1ZUlEQkRhdGFiYXNlOjpvcGVuQ3Vyc29ySW5CYWNraW5nU3RvcmUpOgorICAgICAgICAo V2ViS2l0OjpVbmlxdWVJREJEYXRhYmFzZTo6ZGlkT3BlbkN1cnNvckluQmFja2luZ1N0b3JlKToK KyAgICAgICAgKiBEYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL1VuaXF1ZUlEQkRhdGFiYXNlLmg6 CisKKyAgICAgICAgKiBEYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL1VuaXF1ZUlEQkRhdGFiYXNl QmFja2luZ1N0b3JlLmg6CisgICAgICAgICogRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9zcWxp dGUvVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGUuY3BwOgorICAgICAgICAoV2Vi S2l0OjpVbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdTdG9yZVNRTGl0ZTo6b3BlbkN1cnNvcik6Cisg ICAgICAgICogRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9zcWxpdGUvVW5pcXVlSURCRGF0YWJh c2VCYWNraW5nU3RvcmVTUUxpdGUuaDoKKworICAgICAgICAqIERhdGFiYXNlUHJvY2Vzcy9JbmRl eGVkREIvc3FsaXRlL1NRTGl0ZUlEQkN1cnNvci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlNRTGl0 ZUlEQkN1cnNvcjo6bWF5YmVDcmVhdGUpOiBBZnRlciBjcmVhdGluZyB0aGUgY3Vyc29yLCBhZHZh bmNlKDEpIGl0LgorCisgICAgICAgICogU2hhcmVkL0FzeW5jVGFzay5oOgorICAgICAgICAoV2Vi S2l0OjpjcmVhdGVBc3luY1Rhc2spOgorCisKKworMjAxNC0wMS0zMSAgQnJhZHkgRWlkc29uICA8 YmVpZHNvbkBhcHBsZS5jb20+CisKICAgICAgICAgSURCOiBXaGVuIGRlbGV0aW5nIG9iamVjdCBz dG9yZXMvaW5kZXhlcywgYWxzbyBkZWxldGUgYXNzb2NpYXRlZCByZWNvcmRzCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjc4NzIKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9EYXRhYmFzZVByb2Nl c3NJREJDb25uZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRl eGVkREIvRGF0YWJhc2VQcm9jZXNzSURCQ29ubmVjdGlvbi5jcHAKaW5kZXggMjYwZjE4Yy4uMmE2 NGUzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWRE Qi9EYXRhYmFzZVByb2Nlc3NJREJDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9E YXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL0RhdGFiYXNlUHJvY2Vzc0lEQkNvbm5lY3Rpb24uY3Bw CkBAIC0yNzIsOCArMjcyLDkgQEAgdm9pZCBEYXRhYmFzZVByb2Nlc3NJREJDb25uZWN0aW9uOjpv cGVuQ3Vyc29yKHVpbnQ2NF90IHJlcXVlc3RJRCwgaW50NjRfdCB0cmFuc2EKIAogICAgIExPRyhJ REIsICJEYXRhYmFzZVByb2Nlc3Mgb3BlbkN1cnNvciByZXF1ZXN0IElEICVsbHUsIG9iamVjdCBz dG9yZSBpZCAlbGxpIiwgcmVxdWVzdElELCBvYmplY3RTdG9yZUlEKTsKICAgICBSZWZQdHI8RGF0 YWJhc2VQcm9jZXNzSURCQ29ubmVjdGlvbj4gY29ubmVjdGlvbih0aGlzKTsKLSAgICBtX3VuaXF1 ZUlEQkRhdGFiYXNlLT5vcGVuQ3Vyc29yKElEQklkZW50aWZpZXIoKnRoaXMsIHRyYW5zYWN0aW9u SUQpLCBvYmplY3RTdG9yZUlELCBpbmRleElELCBzdGF0aWNfY2FzdDxJbmRleGVkREI6OkN1cnNv ckRpcmVjdGlvbj4oY3Vyc29yRGlyZWN0aW9uKSwgc3RhdGljX2Nhc3Q8SW5kZXhlZERCOjpDdXJz b3JUeXBlPihjdXJzb3JUeXBlKSwgc3RhdGljX2Nhc3Q8SURCRGF0YWJhc2VCYWNrZW5kOjpUYXNr VHlwZT4odGFza1R5cGUpLCBrZXlSYW5nZURhdGEsIFtjb25uZWN0aW9uLCByZXF1ZXN0SURdKGlu dDY0X3QgY3Vyc29ySUQsIHVpbnQzMl90IGVycm9yQ29kZSwgY29uc3QgU3RyaW5nJiBlcnJvck1l c3NhZ2UpIHsKLSAgICAgICAgY29ubmVjdGlvbi0+c2VuZChNZXNzYWdlczo6V2ViSURCU2VydmVy Q29ubmVjdGlvbjo6RGlkT3BlbkN1cnNvcihyZXF1ZXN0SUQsIGN1cnNvcklELCBlcnJvckNvZGUs IGVycm9yTWVzc2FnZSkpOworICAgIG1fdW5pcXVlSURCRGF0YWJhc2UtPm9wZW5DdXJzb3IoSURC SWRlbnRpZmllcigqdGhpcywgdHJhbnNhY3Rpb25JRCksIG9iamVjdFN0b3JlSUQsIGluZGV4SUQs IHN0YXRpY19jYXN0PEluZGV4ZWREQjo6Q3Vyc29yRGlyZWN0aW9uPihjdXJzb3JEaXJlY3Rpb24p LCBzdGF0aWNfY2FzdDxJbmRleGVkREI6OkN1cnNvclR5cGU+KGN1cnNvclR5cGUpLCBzdGF0aWNf Y2FzdDxJREJEYXRhYmFzZUJhY2tlbmQ6OlRhc2tUeXBlPih0YXNrVHlwZSksIGtleVJhbmdlRGF0 YSwgW2Nvbm5lY3Rpb24sIHJlcXVlc3RJRF0oaW50NjRfdCBjdXJzb3JJRCwgY29uc3QgSURCS2V5 RGF0YSYgcmVzdWx0S2V5LCBjb25zdCBJREJLZXlEYXRhJiBwcmltYXJ5S2V5LCBQYXNzUmVmUHRy PFNoYXJlZEJ1ZmZlcj4gdmFsdWUsIHVpbnQzMl90IGVycm9yQ29kZSwgY29uc3QgU3RyaW5nJiBl cnJvck1lc3NhZ2UpIHsKKyAgICAgICAgSVBDOjpEYXRhUmVmZXJlbmNlIGRhdGEgPSB2YWx1ZSA/ IElQQzo6RGF0YVJlZmVyZW5jZShyZWludGVycHJldF9jYXN0PGNvbnN0IHVpbnQ4X3QqPih2YWx1 ZS0+ZGF0YSgpKSwgdmFsdWUtPnNpemUoKSkgOiBJUEM6OkRhdGFSZWZlcmVuY2UoKTsKKyAgICAg ICAgY29ubmVjdGlvbi0+c2VuZChNZXNzYWdlczo6V2ViSURCU2VydmVyQ29ubmVjdGlvbjo6RGlk T3BlbkN1cnNvcihyZXF1ZXN0SUQsIGN1cnNvcklELCByZXN1bHRLZXksIHByaW1hcnlLZXksIGRh dGEsIGVycm9yQ29kZSwgZXJyb3JNZXNzYWdlKSk7CiAgICAgfSk7CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvVW5pcXVlSURCRGF0YWJh c2UuY3BwIGIvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9VbmlxdWVJ REJEYXRhYmFzZS5jcHAKaW5kZXggYzQ5NTc0ZS4uODVjM2YzYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9VbmlxdWVJREJEYXRhYmFzZS5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9VbmlxdWVJREJE YXRhYmFzZS5jcHAKQEAgLTU0OSwyMSArNTQ5LDIxIEBAIHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6 OmdldFJlY29yZChjb25zdCBJREJJZGVudGlmaWVyJiB0cmFuc2FjdGlvbklkZW50aWZpZXIsIGlu CiAgICAgcG9zdERhdGFiYXNlVGFzayhjcmVhdGVBc3luY1Rhc2soKnRoaXMsICZVbmlxdWVJREJE YXRhYmFzZTo6Z2V0UmVjb3JkRnJvbUJhY2tpbmdTdG9yZSwgcmVxdWVzdElELCB0cmFuc2FjdGlv bklkZW50aWZpZXIsIG1fbWV0YWRhdGEtPm9iamVjdFN0b3Jlcy5nZXQob2JqZWN0U3RvcmVJRCks IGluZGV4SUQsIGtleVJhbmdlRGF0YSwgY3Vyc29yVHlwZSkpOwogfQogCi12b2lkIFVuaXF1ZUlE QkRhdGFiYXNlOjpvcGVuQ3Vyc29yKGNvbnN0IElEQklkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRl bnRpZmllciwgaW50NjRfdCBvYmplY3RTdG9yZUlELCBpbnQ2NF90IGluZGV4SUQsIEluZGV4ZWRE Qjo6Q3Vyc29yRGlyZWN0aW9uIGN1cnNvckRpcmVjdGlvbiwgSW5kZXhlZERCOjpDdXJzb3JUeXBl IGN1cnNvclR5cGUsIElEQkRhdGFiYXNlQmFja2VuZDo6VGFza1R5cGUgdGFza1R5cGUsIGNvbnN0 IElEQktleVJhbmdlRGF0YSYga2V5UmFuZ2VEYXRhLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoaW50NjRf dCwgdWludDMyX3QsIGNvbnN0IFN0cmluZyYpPiBjYWxsYmFjaykKK3ZvaWQgVW5pcXVlSURCRGF0 YWJhc2U6Om9wZW5DdXJzb3IoY29uc3QgSURCSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlm aWVyLCBpbnQ2NF90IG9iamVjdFN0b3JlSUQsIGludDY0X3QgaW5kZXhJRCwgSW5kZXhlZERCOjpD dXJzb3JEaXJlY3Rpb24gY3Vyc29yRGlyZWN0aW9uLCBJbmRleGVkREI6OkN1cnNvclR5cGUgY3Vy c29yVHlwZSwgSURCRGF0YWJhc2VCYWNrZW5kOjpUYXNrVHlwZSB0YXNrVHlwZSwgY29uc3QgSURC S2V5UmFuZ2VEYXRhJiBrZXlSYW5nZURhdGEsIHN0ZDo6ZnVuY3Rpb248dm9pZChpbnQ2NF90LCBj b25zdCBJREJLZXlEYXRhJiwgY29uc3QgSURCS2V5RGF0YSYsIFBhc3NSZWZQdHI8U2hhcmVkQnVm ZmVyPiwgdWludDMyX3QsIGNvbnN0IFN0cmluZyYpPiBjYWxsYmFjaykKIHsKICAgICBBU1NFUlQo aXNNYWluVGhyZWFkKCkpOwogCiAgICAgaWYgKCFtX2FjY2VwdGluZ05ld1JlcXVlc3RzKSB7Ci0g ICAgICAgIGNhbGxiYWNrKDAsIElOVkFMSURfU1RBVEVfRVJSLCAiVW5hYmxlIHRvIG9wZW4gY3Vy c29yIGluIGRhdGFiYXNlIGJlY2F1c2UgaXQgaGFzIHNodXQgZG93biIpOworICAgICAgICBjYWxs YmFjaygwLCBudWxscHRyLCBudWxscHRyLCBudWxscHRyLCBJTlZBTElEX1NUQVRFX0VSUiwgIlVu YWJsZSB0byBvcGVuIGN1cnNvciBpbiBkYXRhYmFzZSBiZWNhdXNlIGl0IGhhcyBzaHV0IGRvd24i KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIEFTU0VSVChtX21ldGFkYXRhLT5vYmpl Y3RTdG9yZXMuY29udGFpbnMob2JqZWN0U3RvcmVJRCkpOwogCi0gICAgUmVmUHRyPEFzeW5jUmVx dWVzdD4gcmVxdWVzdCA9IEFzeW5jUmVxdWVzdEltcGw8aW50NjRfdCwgdWludDMyX3QsIGNvbnN0 IFN0cmluZyY+OjpjcmVhdGUoW3RoaXMsIGNhbGxiYWNrXShpbnQ2NF90IGN1cnNvcklELCB1aW50 MzJfdCBlcnJvckNvZGUsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKSB7Ci0gICAgICAgIGNh bGxiYWNrKGN1cnNvcklELCBlcnJvckNvZGUsIGVycm9yTWVzc2FnZSk7CisgICAgUmVmUHRyPEFz eW5jUmVxdWVzdD4gcmVxdWVzdCA9IEFzeW5jUmVxdWVzdEltcGw8aW50NjRfdCwgY29uc3QgSURC S2V5RGF0YSYsIGNvbnN0IElEQktleURhdGEmLCBQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4sIHVp bnQzMl90LCBjb25zdCBTdHJpbmcmPjo6Y3JlYXRlKFt0aGlzLCBjYWxsYmFja10oaW50NjRfdCBj dXJzb3JJRCwgY29uc3QgSURCS2V5RGF0YSYga2V5LCBjb25zdCBJREJLZXlEYXRhJiBwcmltYXJ5 S2V5LCBQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gdmFsdWUsIHVpbnQzMl90IGVycm9yQ29kZSwg Y29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpIHsKKyAgICAgICAgY2FsbGJhY2soY3Vyc29ySUQs IGtleSwgcHJpbWFyeUtleSwgdmFsdWUsIGVycm9yQ29kZSwgZXJyb3JNZXNzYWdlKTsKICAgICB9 LCBbdGhpcywgY2FsbGJhY2tdKCkgewotICAgICAgICBjYWxsYmFjaygwLCBJTlZBTElEX1NUQVRF X0VSUiwgIlVuYWJsZSB0byBnZXQgcmVjb3JkIGZyb20gZGF0YWJhc2UiKTsKKyAgICAgICAgY2Fs bGJhY2soMCwgbnVsbHB0ciwgbnVsbHB0ciwgbnVsbHB0ciwgSU5WQUxJRF9TVEFURV9FUlIsICJV bmFibGUgdG8gZ2V0IHJlY29yZCBmcm9tIGRhdGFiYXNlIik7CiAgICAgfSk7CiAKICAgICB1aW50 NjRfdCByZXF1ZXN0SUQgPSByZXF1ZXN0LT5yZXF1ZXN0SUQoKTsKQEAgLTU3Miw3ICs1NzIsNyBA QCB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpvcGVuQ3Vyc29yKGNvbnN0IElEQklkZW50aWZpZXIm IHRyYW5zYWN0aW9uSWRlbnRpZmllciwgaQogICAgIHBvc3REYXRhYmFzZVRhc2soY3JlYXRlQXN5 bmNUYXNrKCp0aGlzLCAmVW5pcXVlSURCRGF0YWJhc2U6Om9wZW5DdXJzb3JJbkJhY2tpbmdTdG9y ZSwgcmVxdWVzdElELCB0cmFuc2FjdGlvbklkZW50aWZpZXIsIG9iamVjdFN0b3JlSUQsIGluZGV4 SUQsIGN1cnNvckRpcmVjdGlvbiwgY3Vyc29yVHlwZSwgdGFza1R5cGUsIGtleVJhbmdlRGF0YSkp OwogfQogCi12b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpjdXJzb3JBZHZhbmNlKGNvbnN0IElEQklk ZW50aWZpZXImIGN1cnNvcklkZW50aWZpZXIsIHVpbnQ2NF90IGNvdW50LCBzdGQ6OmZ1bmN0aW9u PHZvaWQoSURCS2V5RGF0YSwgSURCS2V5RGF0YSwgUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+LCB1 aW50MzJfdCwgY29uc3QgU3RyaW5nJik+IGNhbGxiYWNrKQordm9pZCBVbmlxdWVJREJEYXRhYmFz ZTo6Y3Vyc29yQWR2YW5jZShjb25zdCBJREJJZGVudGlmaWVyJiBjdXJzb3JJZGVudGlmaWVyLCB1 aW50NjRfdCBjb3VudCwgc3RkOjpmdW5jdGlvbjx2b2lkKGNvbnN0IElEQktleURhdGEmLCBjb25z dCBJREJLZXlEYXRhJiwgUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+LCB1aW50MzJfdCwgY29uc3Qg U3RyaW5nJik+IGNhbGxiYWNrKQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAKQEAg LTU4MSw3ICs1ODEsNyBAQCB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpjdXJzb3JBZHZhbmNlKGNv bnN0IElEQklkZW50aWZpZXImIGN1cnNvcklkZW50aWZpZXIsIHVpbgogICAgICAgICByZXR1cm47 CiAgICAgfQogCi0gICAgUmVmUHRyPEFzeW5jUmVxdWVzdD4gcmVxdWVzdCA9IEFzeW5jUmVxdWVz dEltcGw8SURCS2V5RGF0YSwgSURCS2V5RGF0YSwgUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+LCB1 aW50MzJfdCwgY29uc3QgU3RyaW5nJj46OmNyZWF0ZShbdGhpcywgY2FsbGJhY2tdKElEQktleURh dGEga2V5LCBJREJLZXlEYXRhIHByaW1hcnlLZXksIFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiB2 YWx1ZSwgdWludDMyX3QgZXJyb3JDb2RlLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSkgewor ICAgIFJlZlB0cjxBc3luY1JlcXVlc3Q+IHJlcXVlc3QgPSBBc3luY1JlcXVlc3RJbXBsPGNvbnN0 IElEQktleURhdGEmLCBjb25zdCBJREJLZXlEYXRhJiwgUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+ LCB1aW50MzJfdCwgY29uc3QgU3RyaW5nJj46OmNyZWF0ZShbdGhpcywgY2FsbGJhY2tdKGNvbnN0 IElEQktleURhdGEmIGtleSwgY29uc3QgSURCS2V5RGF0YSYgcHJpbWFyeUtleSwgUGFzc1JlZlB0 cjxTaGFyZWRCdWZmZXI+IHZhbHVlLCB1aW50MzJfdCBlcnJvckNvZGUsIGNvbnN0IFN0cmluZyYg ZXJyb3JNZXNzYWdlKSB7CiAgICAgICAgIGNhbGxiYWNrKGtleSwgcHJpbWFyeUtleSwgdmFsdWUs IGVycm9yQ29kZSwgZXJyb3JNZXNzYWdlKTsKICAgICB9LCBbdGhpcywgY2FsbGJhY2tdKCkgewog ICAgICAgICBjYWxsYmFjayhudWxscHRyLCBudWxscHRyLCBudWxscHRyLCBJTlZBTElEX1NUQVRF X0VSUiwgIlVuYWJsZSB0byBhZHZhbmNlIGN1cnNvciBpbiBkYXRhYmFzZSIpOwpAQCAtNTkzLDcg KzU5Myw3IEBAIHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OmN1cnNvckFkdmFuY2UoY29uc3QgSURC SWRlbnRpZmllciYgY3Vyc29ySWRlbnRpZmllciwgdWluCiAgICAgcG9zdERhdGFiYXNlVGFzayhj cmVhdGVBc3luY1Rhc2soKnRoaXMsICZVbmlxdWVJREJEYXRhYmFzZTo6YWR2YW5jZUN1cnNvcklu QmFja2luZ1N0b3JlLCByZXF1ZXN0SUQsIGN1cnNvcklkZW50aWZpZXIsIGNvdW50KSk7CiB9CiAK LXZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OmN1cnNvckl0ZXJhdGUoY29uc3QgSURCSWRlbnRpZmll ciYgY3Vyc29ySWRlbnRpZmllciwgY29uc3QgSURCS2V5RGF0YSYga2V5LCBzdGQ6OmZ1bmN0aW9u PHZvaWQoSURCS2V5RGF0YSwgSURCS2V5RGF0YSwgUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+LCB1 aW50MzJfdCwgY29uc3QgU3RyaW5nJik+IGNhbGxiYWNrKQordm9pZCBVbmlxdWVJREJEYXRhYmFz ZTo6Y3Vyc29ySXRlcmF0ZShjb25zdCBJREJJZGVudGlmaWVyJiBjdXJzb3JJZGVudGlmaWVyLCBj b25zdCBJREJLZXlEYXRhJiBrZXksIHN0ZDo6ZnVuY3Rpb248dm9pZChjb25zdCBJREJLZXlEYXRh JiwgY29uc3QgSURCS2V5RGF0YSYsIFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiwgdWludDMyX3Qs IGNvbnN0IFN0cmluZyYpPiBjYWxsYmFjaykKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkp OwogCkBAIC02MDIsNyArNjAyLDcgQEAgdm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6Y3Vyc29ySXRl cmF0ZShjb25zdCBJREJJZGVudGlmaWVyJiBjdXJzb3JJZGVudGlmaWVyLCBjb24KICAgICAgICAg cmV0dXJuOwogICAgIH0KIAotICAgIFJlZlB0cjxBc3luY1JlcXVlc3Q+IHJlcXVlc3QgPSBBc3lu Y1JlcXVlc3RJbXBsPElEQktleURhdGEsIElEQktleURhdGEsIFBhc3NSZWZQdHI8U2hhcmVkQnVm ZmVyPiwgdWludDMyX3QsIGNvbnN0IFN0cmluZyY+OjpjcmVhdGUoW3RoaXMsIGNhbGxiYWNrXShJ REJLZXlEYXRhIGtleSwgSURCS2V5RGF0YSBwcmltYXJ5S2V5LCBQYXNzUmVmUHRyPFNoYXJlZEJ1 ZmZlcj4gdmFsdWUsIHVpbnQzMl90IGVycm9yQ29kZSwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3Nh Z2UpIHsKKyAgICBSZWZQdHI8QXN5bmNSZXF1ZXN0PiByZXF1ZXN0ID0gQXN5bmNSZXF1ZXN0SW1w bDxjb25zdCBJREJLZXlEYXRhJiwgY29uc3QgSURCS2V5RGF0YSYsIFBhc3NSZWZQdHI8U2hhcmVk QnVmZmVyPiwgdWludDMyX3QsIGNvbnN0IFN0cmluZyY+OjpjcmVhdGUoW3RoaXMsIGNhbGxiYWNr XShjb25zdCBJREJLZXlEYXRhJiBrZXksIGNvbnN0IElEQktleURhdGEmIHByaW1hcnlLZXksIFBh c3NSZWZQdHI8U2hhcmVkQnVmZmVyPiB2YWx1ZSwgdWludDMyX3QgZXJyb3JDb2RlLCBjb25zdCBT dHJpbmcmIGVycm9yTWVzc2FnZSkgewogICAgICAgICBjYWxsYmFjayhrZXksIHByaW1hcnlLZXks IHZhbHVlLCBlcnJvckNvZGUsIGVycm9yTWVzc2FnZSk7CiAgICAgfSwgW3RoaXMsIGNhbGxiYWNr XSgpIHsKICAgICAgICAgY2FsbGJhY2sobnVsbHB0ciwgbnVsbHB0ciwgbnVsbHB0ciwgSU5WQUxJ RF9TVEFURV9FUlIsICJVbmFibGUgdG8gaXRlcmF0ZSBjdXJzb3IgaW4gZGF0YWJhc2UiKTsKQEAg LTg4OCwyNCArODg4LDI3IEBAIHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6Om9wZW5DdXJzb3JJbkJh Y2tpbmdTdG9yZSh1aW50NjRfdCByZXF1ZXN0SUQsIGNvbnN0IElEQklkCiAgICAgQVNTRVJUKG1f YmFja2luZ1N0b3JlKTsKIAogICAgIGludDY0X3QgY3Vyc29ySUQgPSAwOworICAgIElEQktleURh dGEga2V5OworICAgIElEQktleURhdGEgcHJpbWFyeUtleTsKKyAgICBWZWN0b3I8Y2hhcj4gdmFs dWU7CiAgICAgaW50MzJfdCBlcnJvckNvZGUgPSAwOwogICAgIFN0cmluZyBlcnJvck1lc3NhZ2U7 Ci0gICAgYm9vbCBzdWNjZXNzID0gbV9iYWNraW5nU3RvcmUtPm9wZW5DdXJzb3IodHJhbnNhY3Rp b25JZGVudGlmaWVyLCBvYmplY3RTdG9yZUlELCBpbmRleElELCBjdXJzb3JEaXJlY3Rpb24sIGN1 cnNvclR5cGUsIHRhc2tUeXBlLCBrZXlSYW5nZSwgY3Vyc29ySUQpOworICAgIGJvb2wgc3VjY2Vz cyA9IG1fYmFja2luZ1N0b3JlLT5vcGVuQ3Vyc29yKHRyYW5zYWN0aW9uSWRlbnRpZmllciwgb2Jq ZWN0U3RvcmVJRCwgaW5kZXhJRCwgY3Vyc29yRGlyZWN0aW9uLCBjdXJzb3JUeXBlLCB0YXNrVHlw ZSwga2V5UmFuZ2UsIGN1cnNvcklELCBrZXksIHByaW1hcnlLZXksIHZhbHVlKTsKIAogICAgIGlm ICghc3VjY2VzcykgewogICAgICAgICBlcnJvckNvZGUgPSBJREJEYXRhYmFzZUV4Y2VwdGlvbjo6 VW5rbm93bkVycm9yOwogICAgICAgICBlcnJvck1lc3NhZ2UgPSBBU0NJSUxpdGVyYWwoIlVua25v d24gZXJyb3Igb3BlbmluZyBjdXJzb3IgaW4gYmFja2luZyBzdG9yZSIpOwogICAgIH0KIAotICAg IHBvc3RNYWluVGhyZWFkVGFzayhjcmVhdGVBc3luY1Rhc2soKnRoaXMsICZVbmlxdWVJREJEYXRh YmFzZTo6ZGlkT3BlbkN1cnNvckluQmFja2luZ1N0b3JlLCByZXF1ZXN0SUQsIGN1cnNvcklELCBl cnJvckNvZGUsIGVycm9yTWVzc2FnZSkpOworICAgIHBvc3RNYWluVGhyZWFkVGFzayhjcmVhdGVB c3luY1Rhc2soKnRoaXMsICZVbmlxdWVJREJEYXRhYmFzZTo6ZGlkT3BlbkN1cnNvckluQmFja2lu Z1N0b3JlLCByZXF1ZXN0SUQsIGN1cnNvcklELCBrZXksIHByaW1hcnlLZXksIHZhbHVlLCBlcnJv ckNvZGUsIGVycm9yTWVzc2FnZSkpOwogfQogCi12b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpkaWRP cGVuQ3Vyc29ySW5CYWNraW5nU3RvcmUodWludDY0X3QgcmVxdWVzdElELCBpbnQ2NF90IGN1cnNv cklELCB1aW50MzJfdCBlcnJvckNvZGUsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKQordm9p ZCBVbmlxdWVJREJEYXRhYmFzZTo6ZGlkT3BlbkN1cnNvckluQmFja2luZ1N0b3JlKHVpbnQ2NF90 IHJlcXVlc3RJRCwgaW50NjRfdCBjdXJzb3JJRCwgY29uc3QgSURCS2V5RGF0YSYga2V5LCBjb25z dCBJREJLZXlEYXRhJiBwcmltYXJ5S2V5LCBjb25zdCBWZWN0b3I8Y2hhcj4mIHZhbHVlLCB1aW50 MzJfdCBlcnJvckNvZGUsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKQogewogICAgIFJlZlB0 cjxBc3luY1JlcXVlc3Q+IHJlcXVlc3QgPSBtX3BlbmRpbmdEYXRhYmFzZVRhc2tzLnRha2UocmVx dWVzdElEKTsKICAgICBBU1NFUlQocmVxdWVzdCk7CiAKLSAgICByZXF1ZXN0LT5jb21wbGV0ZVJl cXVlc3QoY3Vyc29ySUQsIGVycm9yQ29kZSwgZXJyb3JNZXNzYWdlKTsKKyAgICByZXF1ZXN0LT5j b21wbGV0ZVJlcXVlc3QoY3Vyc29ySUQsIGtleSwgcHJpbWFyeUtleSwgU2hhcmVkQnVmZmVyOjpj cmVhdGUodmFsdWUuZGF0YSgpLCB2YWx1ZS5zaXplKCkpLCBlcnJvckNvZGUsIGVycm9yTWVzc2Fn ZSk7CiB9CiAKIHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OmFkdmFuY2VDdXJzb3JJbkJhY2tpbmdT dG9yZSh1aW50NjRfdCByZXF1ZXN0SUQsIGNvbnN0IElEQklkZW50aWZpZXImIGN1cnNvcklkZW50 aWZpZXIsIHVpbnQ2NF90IGNvdW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvRGF0YWJh c2VQcm9jZXNzL0luZGV4ZWREQi9VbmlxdWVJREJEYXRhYmFzZS5oIGIvU291cmNlL1dlYktpdDIv RGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9VbmlxdWVJREJEYXRhYmFzZS5oCmluZGV4IDFmM2Fh NGMuLmI1MzRjOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9J bmRleGVkREIvVW5pcXVlSURCRGF0YWJhc2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFz ZVByb2Nlc3MvSW5kZXhlZERCL1VuaXF1ZUlEQkRhdGFiYXNlLmgKQEAgLTg3LDkgKzg3LDkgQEAg cHVibGljOgogICAgIHZvaWQgcHV0UmVjb3JkKGNvbnN0IElEQklkZW50aWZpZXImIHRyYW5zYWN0 aW9uSWRlbnRpZmllciwgaW50NjRfdCBvYmplY3RTdG9yZUlELCBjb25zdCBXZWJDb3JlOjpJREJL ZXlEYXRhJiwgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiB2YWx1ZSwgaW50NjRfdCBwdXRNb2Rl LCBjb25zdCBWZWN0b3I8aW50NjRfdD4mIGluZGV4SURzLCBjb25zdCBWZWN0b3I8VmVjdG9yPFdl YkNvcmU6OklEQktleURhdGE+PiYgaW5kZXhLZXlzLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoY29uc3Qg V2ViQ29yZTo6SURCS2V5RGF0YSYsIHVpbnQzMl90LCBjb25zdCBTdHJpbmcmKT4gY2FsbGJhY2sp OwogICAgIHZvaWQgZ2V0UmVjb3JkKGNvbnN0IElEQklkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRl bnRpZmllciwgaW50NjRfdCBvYmplY3RTdG9yZUlELCBpbnQ2NF90IGluZGV4SUQsIGNvbnN0IFdl YkNvcmU6OklEQktleVJhbmdlRGF0YSYsIFdlYkNvcmU6OkluZGV4ZWREQjo6Q3Vyc29yVHlwZSwg c3RkOjpmdW5jdGlvbjx2b2lkKGNvbnN0IFdlYkNvcmU6OklEQkdldFJlc3VsdCYsIHVpbnQzMl90 LCBjb25zdCBTdHJpbmcmKT4gY2FsbGJhY2spOwogCi0gICAgdm9pZCBvcGVuQ3Vyc29yKGNvbnN0 IElEQklkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgaW50NjRfdCBvYmplY3RTdG9y ZUlELCBpbnQ2NF90IGluZGV4SUQsIFdlYkNvcmU6OkluZGV4ZWREQjo6Q3Vyc29yRGlyZWN0aW9u LCBXZWJDb3JlOjpJbmRleGVkREI6OkN1cnNvclR5cGUsIFdlYkNvcmU6OklEQkRhdGFiYXNlQmFj a2VuZDo6VGFza1R5cGUsIGNvbnN0IFdlYkNvcmU6OklEQktleVJhbmdlRGF0YSYsIHN0ZDo6ZnVu Y3Rpb248dm9pZChpbnQ2NF90LCB1aW50MzJfdCwgY29uc3QgU3RyaW5nJik+IGNhbGxiYWNrKTsK LSAgICB2b2lkIGN1cnNvckFkdmFuY2UoY29uc3QgSURCSWRlbnRpZmllciYgY3Vyc29ySWRlbnRp ZmllciwgdWludDY0X3QgY291bnQsIHN0ZDo6ZnVuY3Rpb248dm9pZChXZWJDb3JlOjpJREJLZXlE YXRhLCBXZWJDb3JlOjpJREJLZXlEYXRhLCBQYXNzUmVmUHRyPFdlYkNvcmU6OlNoYXJlZEJ1ZmZl cj4sIHVpbnQzMl90LCBjb25zdCBTdHJpbmcmKT4gY2FsbGJhY2spOwotICAgIHZvaWQgY3Vyc29y SXRlcmF0ZShjb25zdCBJREJJZGVudGlmaWVyJiBjdXJzb3JJZGVudGlmaWVyLCBjb25zdCBXZWJD b3JlOjpJREJLZXlEYXRhJiwgc3RkOjpmdW5jdGlvbjx2b2lkKFdlYkNvcmU6OklEQktleURhdGEs IFdlYkNvcmU6OklEQktleURhdGEsIFBhc3NSZWZQdHI8V2ViQ29yZTo6U2hhcmVkQnVmZmVyPiwg dWludDMyX3QsIGNvbnN0IFN0cmluZyYpPiBjYWxsYmFjayk7CisgICAgdm9pZCBvcGVuQ3Vyc29y KGNvbnN0IElEQklkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgaW50NjRfdCBvYmpl Y3RTdG9yZUlELCBpbnQ2NF90IGluZGV4SUQsIFdlYkNvcmU6OkluZGV4ZWREQjo6Q3Vyc29yRGly ZWN0aW9uLCBXZWJDb3JlOjpJbmRleGVkREI6OkN1cnNvclR5cGUsIFdlYkNvcmU6OklEQkRhdGFi YXNlQmFja2VuZDo6VGFza1R5cGUsIGNvbnN0IFdlYkNvcmU6OklEQktleVJhbmdlRGF0YSYsIHN0 ZDo6ZnVuY3Rpb248dm9pZChpbnQ2NF90LCBjb25zdCBXZWJDb3JlOjpJREJLZXlEYXRhJiwgY29u c3QgV2ViQ29yZTo6SURCS2V5RGF0YSYsIFBhc3NSZWZQdHI8V2ViQ29yZTo6U2hhcmVkQnVmZmVy PiwgdWludDMyX3QsIGNvbnN0IFN0cmluZyYpPiBjYWxsYmFjayk7CisgICAgdm9pZCBjdXJzb3JB ZHZhbmNlKGNvbnN0IElEQklkZW50aWZpZXImIGN1cnNvcklkZW50aWZpZXIsIHVpbnQ2NF90IGNv dW50LCBzdGQ6OmZ1bmN0aW9uPHZvaWQoY29uc3QgV2ViQ29yZTo6SURCS2V5RGF0YSYsIGNvbnN0 IFdlYkNvcmU6OklEQktleURhdGEmLCBQYXNzUmVmUHRyPFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4s IHVpbnQzMl90LCBjb25zdCBTdHJpbmcmKT4gY2FsbGJhY2spOworICAgIHZvaWQgY3Vyc29ySXRl cmF0ZShjb25zdCBJREJJZGVudGlmaWVyJiBjdXJzb3JJZGVudGlmaWVyLCBjb25zdCBXZWJDb3Jl OjpJREJLZXlEYXRhJiwgc3RkOjpmdW5jdGlvbjx2b2lkKGNvbnN0IFdlYkNvcmU6OklEQktleURh dGEmLCBjb25zdCBXZWJDb3JlOjpJREJLZXlEYXRhJiwgUGFzc1JlZlB0cjxXZWJDb3JlOjpTaGFy ZWRCdWZmZXI+LCB1aW50MzJfdCwgY29uc3QgU3RyaW5nJik+IGNhbGxiYWNrKTsKIAogICAgIHZv aWQgY291bnQoY29uc3QgSURCSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCBpbnQ2 NF90IG9iamVjdFN0b3JlSUQsIGludDY0X3QgaW5kZXhJRCwgY29uc3QgV2ViQ29yZTo6SURCS2V5 UmFuZ2VEYXRhJiwgc3RkOjpmdW5jdGlvbjx2b2lkKGludDY0X3QsIHVpbnQzMl90LCBjb25zdCBT dHJpbmcmKT4gY2FsbGJhY2spOwogICAgIHZvaWQgZGVsZXRlUmFuZ2UoY29uc3QgSURCSWRlbnRp ZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCBpbnQ2NF90IG9iamVjdFN0b3JlSUQsIGNvbnN0 IFdlYkNvcmU6OklEQktleVJhbmdlRGF0YSYsIHN0ZDo6ZnVuY3Rpb248dm9pZCh1aW50MzJfdCwg Y29uc3QgU3RyaW5nJik+IGNhbGxiYWNrKTsKQEAgLTE1OSw3ICsxNTksNyBAQCBwcml2YXRlOgog ICAgIHZvaWQgZGlkRGVsZXRlSW5kZXgodWludDY0X3QgcmVxdWVzdElELCBib29sIHN1Y2Nlc3Mp OwogICAgIHZvaWQgZGlkUHV0UmVjb3JkSW5CYWNraW5nU3RvcmUodWludDY0X3QgcmVxdWVzdElE LCBjb25zdCBXZWJDb3JlOjpJREJLZXlEYXRhJiwgdWludDMyX3QgZXJyb3JDb2RlLCBjb25zdCBT dHJpbmcmIGVycm9yTWVzc2FnZSk7CiAgICAgdm9pZCBkaWRHZXRSZWNvcmRGcm9tQmFja2luZ1N0 b3JlKHVpbnQ2NF90IHJlcXVlc3RJRCwgY29uc3QgV2ViQ29yZTo6SURCR2V0UmVzdWx0JiwgdWlu dDMyX3QgZXJyb3JDb2RlLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSk7Ci0gICAgdm9pZCBk aWRPcGVuQ3Vyc29ySW5CYWNraW5nU3RvcmUodWludDY0X3QgcmVxdWVzdElELCBpbnQ2NF90IGN1 cnNvcklELCB1aW50MzJfdCBlcnJvckNvZGUsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKTsK KyAgICB2b2lkIGRpZE9wZW5DdXJzb3JJbkJhY2tpbmdTdG9yZSh1aW50NjRfdCByZXF1ZXN0SUQs IGludDY0X3QgY3Vyc29ySUQsIGNvbnN0IFdlYkNvcmU6OklEQktleURhdGEmLCBjb25zdCBXZWJD b3JlOjpJREJLZXlEYXRhJiwgY29uc3QgVmVjdG9yPGNoYXI+JiwgdWludDMyX3QgZXJyb3JDb2Rl LCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSk7CiAgICAgdm9pZCBkaWRBZHZhbmNlQ3Vyc29y SW5CYWNraW5nU3RvcmUodWludDY0X3QgcmVxdWVzdElELCBjb25zdCBXZWJDb3JlOjpJREJLZXlE YXRhJiwgY29uc3QgV2ViQ29yZTo6SURCS2V5RGF0YSYsIGNvbnN0IFZlY3RvcjxjaGFyPiYsIHVp bnQzMl90IGVycm9yQ29kZSwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpOwogICAgIHZvaWQg ZGlkSXRlcmF0ZUN1cnNvckluQmFja2luZ1N0b3JlKHVpbnQ2NF90IHJlcXVlc3RJRCwgY29uc3Qg V2ViQ29yZTo6SURCS2V5RGF0YSYsIGNvbnN0IFdlYkNvcmU6OklEQktleURhdGEmLCBjb25zdCBW ZWN0b3I8Y2hhcj4mLCB1aW50MzJfdCBlcnJvckNvZGUsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNz YWdlKTsKICAgICB2b2lkIGRpZENvdW50SW5CYWNraW5nU3RvcmUodWludDY0X3QgcmVxdWVzdElE LCBpbnQ2NF90IGNvdW50LCB1aW50MzJfdCBlcnJvckNvZGUsIGNvbnN0IFN0cmluZyYgZXJyb3JN ZXNzYWdlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRl eGVkREIvVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQyL0Rh dGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmUuaApp bmRleCBhNWM5YWY5Li40YTBiOGM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFz ZVByb2Nlc3MvSW5kZXhlZERCL1VuaXF1ZUlEQkRhdGFiYXNlQmFja2luZ1N0b3JlLmgKKysrIGIv U291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9VbmlxdWVJREJEYXRhYmFz ZUJhY2tpbmdTdG9yZS5oCkBAIC03NCw3ICs3NCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJv b2wgZ2V0S2V5UmFuZ2VSZWNvcmRGcm9tT2JqZWN0U3RvcmUoY29uc3QgSURCSWRlbnRpZmllciYg dHJhbnNhY3Rpb25JZGVudGlmaWVyLCBpbnQ2NF90IG9iamVjdFN0b3JlSUQsIGNvbnN0IFdlYkNv cmU6OklEQktleVJhbmdlJiwgUmVmUHRyPFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4mIHJlc3VsdCwg UmVmUHRyPFdlYkNvcmU6OklEQktleT4mIHJlc3VsdEtleSkgPSAwOwogICAgIHZpcnR1YWwgYm9v bCBjb3VudChjb25zdCBJREJJZGVudGlmaWVyJiB0cmFuc2FjdGlvbklkZW50aWZpZXIsIGludDY0 X3Qgb2JqZWN0U3RvcmVJRCwgaW50NjRfdCBpbmRleElELCBjb25zdCBXZWJDb3JlOjpJREJLZXlS YW5nZURhdGEmLCBpbnQ2NF90JiBjb3VudCkgPSAwOwogCi0gICAgdmlydHVhbCBib29sIG9wZW5D dXJzb3IoY29uc3QgSURCSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCBpbnQ2NF90 IG9iamVjdFN0b3JlSUQsIGludDY0X3QgaW5kZXhJRCwgV2ViQ29yZTo6SW5kZXhlZERCOjpDdXJz b3JEaXJlY3Rpb24sIFdlYkNvcmU6OkluZGV4ZWREQjo6Q3Vyc29yVHlwZSwgV2ViQ29yZTo6SURC RGF0YWJhc2VCYWNrZW5kOjpUYXNrVHlwZSwgY29uc3QgV2ViQ29yZTo6SURCS2V5UmFuZ2VEYXRh JiwgaW50NjRfdCYgY3Vyc29ySUQpID0gMDsKKyAgICB2aXJ0dWFsIGJvb2wgb3BlbkN1cnNvcihj b25zdCBJREJJZGVudGlmaWVyJiB0cmFuc2FjdGlvbklkZW50aWZpZXIsIGludDY0X3Qgb2JqZWN0 U3RvcmVJRCwgaW50NjRfdCBpbmRleElELCBXZWJDb3JlOjpJbmRleGVkREI6OkN1cnNvckRpcmVj dGlvbiwgV2ViQ29yZTo6SW5kZXhlZERCOjpDdXJzb3JUeXBlLCBXZWJDb3JlOjpJREJEYXRhYmFz ZUJhY2tlbmQ6OlRhc2tUeXBlLCBjb25zdCBXZWJDb3JlOjpJREJLZXlSYW5nZURhdGEmLCBpbnQ2 NF90JiBjdXJzb3JJRCwgV2ViQ29yZTo6SURCS2V5RGF0YSYsIFdlYkNvcmU6OklEQktleURhdGEm LCBWZWN0b3I8Y2hhcj4mKSA9IDA7CiAgICAgdmlydHVhbCBib29sIGFkdmFuY2VDdXJzb3IoY29u c3QgSURCSWRlbnRpZmllciYgY3Vyc29ySWRlbnRpZmllciwgdWludDY0X3QgY291bnQsIFdlYkNv cmU6OklEQktleURhdGEmLCBXZWJDb3JlOjpJREJLZXlEYXRhJiwgVmVjdG9yPGNoYXI+JikgPSAw OwogICAgIHZpcnR1YWwgYm9vbCBpdGVyYXRlQ3Vyc29yKGNvbnN0IElEQklkZW50aWZpZXImIGN1 cnNvcklkZW50aWZpZXIsIGNvbnN0IFdlYkNvcmU6OklEQktleURhdGEmLCBXZWJDb3JlOjpJREJL ZXlEYXRhJiwgV2ViQ29yZTo6SURCS2V5RGF0YSYsIFZlY3RvcjxjaGFyPiYpID0gMDsKIH07CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL3NxbGl0 ZS9TUUxpdGVJREJDdXJzb3IuY3BwIGIvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0lu ZGV4ZWREQi9zcWxpdGUvU1FMaXRlSURCQ3Vyc29yLmNwcAppbmRleCBkNjk5ZGE4Li4yMTA0ODIx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL3Nx bGl0ZS9TUUxpdGVJREJDdXJzb3IuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJv Y2Vzcy9JbmRleGVkREIvc3FsaXRlL1NRTGl0ZUlEQkN1cnNvci5jcHAKQEAgLTQ1LDYgKzQ1LDkg QEAgc3RkOjp1bmlxdWVfcHRyPFNRTGl0ZUlEQkN1cnNvcj4gU1FMaXRlSURCQ3Vyc29yOjptYXli ZUNyZWF0ZShTUUxpdGVJREJUcmFuc2FjdGkKICAgICBpZiAoIWN1cnNvci0+ZXN0YWJsaXNoU3Rh dGVtZW50KCkpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCisgICAgaWYgKCFjdXJzb3ItPmFk dmFuY2UoMSkpCisgICAgICAgIHJldHVybiBudWxscHRyOworCiAgICAgcmV0dXJuIGN1cnNvcjsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWRE Qi9zcWxpdGUvVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGUuY3BwIGIvU291cmNl L1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9zcWxpdGUvVW5pcXVlSURCRGF0YWJh c2VCYWNraW5nU3RvcmVTUUxpdGUuY3BwCmluZGV4IDNhZTliMDMuLjM0ZDliYWEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvc3FsaXRlL1VuaXF1 ZUlEQkRhdGFiYXNlQmFja2luZ1N0b3JlU1FMaXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9E YXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL3NxbGl0ZS9VbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdT dG9yZVNRTGl0ZS5jcHAKQEAgLTkzOCw3ICs5MzgsNyBAQCBib29sIFVuaXF1ZUlEQkRhdGFiYXNl QmFja2luZ1N0b3JlU1FMaXRlOjpjb3VudChjb25zdCBJREJJZGVudGlmaWVyJiB0cmFuc2FjdGlv bgogICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIFVuaXF1ZUlEQkRhdGFiYXNlQmFja2luZ1N0 b3JlU1FMaXRlOjpvcGVuQ3Vyc29yKGNvbnN0IElEQklkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRl bnRpZmllciwgaW50NjRfdCBvYmplY3RTdG9yZUlELCBpbnQ2NF90IGluZGV4SUQsIEluZGV4ZWRE Qjo6Q3Vyc29yRGlyZWN0aW9uIGN1cnNvckRpcmVjdGlvbiwgSW5kZXhlZERCOjpDdXJzb3JUeXBl IGN1cnNvclR5cGUsIElEQkRhdGFiYXNlQmFja2VuZDo6VGFza1R5cGUgdGFza1R5cGUsIGNvbnN0 IElEQktleVJhbmdlRGF0YSYga2V5UmFuZ2UsIGludDY0X3QmIGN1cnNvcklEKQorYm9vbCBVbmlx dWVJREJEYXRhYmFzZUJhY2tpbmdTdG9yZVNRTGl0ZTo6b3BlbkN1cnNvcihjb25zdCBJREJJZGVu dGlmaWVyJiB0cmFuc2FjdGlvbklkZW50aWZpZXIsIGludDY0X3Qgb2JqZWN0U3RvcmVJRCwgaW50 NjRfdCBpbmRleElELCBJbmRleGVkREI6OkN1cnNvckRpcmVjdGlvbiBjdXJzb3JEaXJlY3Rpb24s IEluZGV4ZWREQjo6Q3Vyc29yVHlwZSBjdXJzb3JUeXBlLCBJREJEYXRhYmFzZUJhY2tlbmQ6OlRh c2tUeXBlIHRhc2tUeXBlLCBjb25zdCBJREJLZXlSYW5nZURhdGEmIGtleVJhbmdlLCBpbnQ2NF90 JiBjdXJzb3JJRCwgSURCS2V5RGF0YSYga2V5LCBJREJLZXlEYXRhJiBwcmltYXJ5S2V5LCBWZWN0 b3I8Y2hhcj4mIHZhbHVlKQogewogICAgIEFTU0VSVCghaXNNYWluVGhyZWFkKCkpOwogICAgIEFT U0VSVChtX3NxbGl0ZURCKTsKQEAgLTk1Niw2ICs5NTYsOSBAQCBib29sIFVuaXF1ZUlEQkRhdGFi YXNlQmFja2luZ1N0b3JlU1FMaXRlOjpvcGVuQ3Vyc29yKGNvbnN0IElEQklkZW50aWZpZXImIHRy YW5zYQogCiAgICAgbV9jdXJzb3JzLnNldChjdXJzb3ItPmlkZW50aWZpZXIoKSwgY3Vyc29yKTsK ICAgICBjdXJzb3JJRCA9IGN1cnNvci0+aWRlbnRpZmllcigpLmlkKCk7CisgICAga2V5ID0gY3Vy c29yLT5jdXJyZW50S2V5KCk7CisgICAgcHJpbWFyeUtleSA9IGN1cnNvci0+Y3VycmVudFByaW1h cnlLZXkoKTsKKyAgICB2YWx1ZSA9IGN1cnNvci0+Y3VycmVudFZhbHVlKCk7CiAKICAgICByZXR1 cm4gdHJ1ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9J bmRleGVkREIvc3FsaXRlL1VuaXF1ZUlEQkRhdGFiYXNlQmFja2luZ1N0b3JlU1FMaXRlLmggYi9T b3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL3NxbGl0ZS9VbmlxdWVJREJE YXRhYmFzZUJhY2tpbmdTdG9yZVNRTGl0ZS5oCmluZGV4IDc0MmUwYTcuLjdjMjdiOTQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvc3FsaXRlL1Vu aXF1ZUlEQkRhdGFiYXNlQmFja2luZ1N0b3JlU1FMaXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIv RGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9zcWxpdGUvVW5pcXVlSURCRGF0YWJhc2VCYWNraW5n U3RvcmVTUUxpdGUuaApAQCAtODAsNyArODAsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29s IGdldEtleVJhbmdlUmVjb3JkRnJvbU9iamVjdFN0b3JlKGNvbnN0IElEQklkZW50aWZpZXImIHRy YW5zYWN0aW9uSWRlbnRpZmllciwgaW50NjRfdCBvYmplY3RTdG9yZUlELCBjb25zdCBXZWJDb3Jl OjpJREJLZXlSYW5nZSYsIFJlZlB0cjxXZWJDb3JlOjpTaGFyZWRCdWZmZXI+JiByZXN1bHQsIFJl ZlB0cjxXZWJDb3JlOjpJREJLZXk+JiByZXN1bHRLZXkpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwg Ym9vbCBjb3VudChjb25zdCBJREJJZGVudGlmaWVyJiB0cmFuc2FjdGlvbklkZW50aWZpZXIsIGlu dDY0X3Qgb2JqZWN0U3RvcmVJRCwgaW50NjRfdCBpbmRleElELCBjb25zdCBXZWJDb3JlOjpJREJL ZXlSYW5nZURhdGEmLCBpbnQ2NF90JiBjb3VudCkgb3ZlcnJpZGU7CiAKLSAgICB2aXJ0dWFsIGJv b2wgb3BlbkN1cnNvcihjb25zdCBJREJJZGVudGlmaWVyJiB0cmFuc2FjdGlvbklkZW50aWZpZXIs IGludDY0X3Qgb2JqZWN0U3RvcmVJRCwgaW50NjRfdCBpbmRleElELCBXZWJDb3JlOjpJbmRleGVk REI6OkN1cnNvckRpcmVjdGlvbiwgV2ViQ29yZTo6SW5kZXhlZERCOjpDdXJzb3JUeXBlLCBXZWJD b3JlOjpJREJEYXRhYmFzZUJhY2tlbmQ6OlRhc2tUeXBlLCBjb25zdCBXZWJDb3JlOjpJREJLZXlS YW5nZURhdGEmLCBpbnQ2NF90JiBjdXJzb3JJRCkgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBib29s IG9wZW5DdXJzb3IoY29uc3QgSURCSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCBp bnQ2NF90IG9iamVjdFN0b3JlSUQsIGludDY0X3QgaW5kZXhJRCwgV2ViQ29yZTo6SW5kZXhlZERC OjpDdXJzb3JEaXJlY3Rpb24sIFdlYkNvcmU6OkluZGV4ZWREQjo6Q3Vyc29yVHlwZSwgV2ViQ29y ZTo6SURCRGF0YWJhc2VCYWNrZW5kOjpUYXNrVHlwZSwgY29uc3QgV2ViQ29yZTo6SURCS2V5UmFu Z2VEYXRhJiwgaW50NjRfdCYgY3Vyc29ySUQsIFdlYkNvcmU6OklEQktleURhdGEmLCBXZWJDb3Jl OjpJREJLZXlEYXRhJiwgVmVjdG9yPGNoYXI+Jikgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBib29s IGFkdmFuY2VDdXJzb3IoY29uc3QgSURCSWRlbnRpZmllciYgY3Vyc29ySWRlbnRpZmllciwgdWlu dDY0X3QgY291bnQsIFdlYkNvcmU6OklEQktleURhdGEmLCBXZWJDb3JlOjpJREJLZXlEYXRhJiwg VmVjdG9yPGNoYXI+Jikgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBib29sIGl0ZXJhdGVDdXJzb3Io Y29uc3QgSURCSWRlbnRpZmllciYgY3Vyc29ySWRlbnRpZmllciwgY29uc3QgV2ViQ29yZTo6SURC S2V5RGF0YSYsIFdlYkNvcmU6OklEQktleURhdGEmLCBXZWJDb3JlOjpJREJLZXlEYXRhJiwgVmVj dG9yPGNoYXI+Jikgb3ZlcnJpZGU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9Bc3luY1Rhc2suaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Bc3luY1Rhc2suaAppbmRleCAx NDQ5Y2VkLi5hMDI4MDkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQXN5bmNU YXNrLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0FzeW5jVGFzay5oCkBAIC0xNzYsNiAr MTc2LDMwIEBAIHN0ZDo6dW5pcXVlX3B0cjxBc3luY1Rhc2s+IGNyZWF0ZUFzeW5jVGFzaygKICAg ICAgICAgV2ViQ29yZTo6Q3Jvc3NUaHJlYWRDb3BpZXI8UDY+Ojpjb3B5KHBhcmFtZXRlcjYpKTsK IH0KIAordGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUgUDEsIHR5cGVuYW1lIE1QMSwgdHlw ZW5hbWUgUDIsIHR5cGVuYW1lIE1QMiwgdHlwZW5hbWUgUDMsIHR5cGVuYW1lIE1QMywgdHlwZW5h bWUgUDQsIHR5cGVuYW1lIE1QNCwgdHlwZW5hbWUgUDUsIHR5cGVuYW1lIE1QNSwgdHlwZW5hbWUg UDYsIHR5cGVuYW1lIE1QNiwgdHlwZW5hbWUgUDcsIHR5cGVuYW1lIE1QNz4KK3N0ZDo6dW5pcXVl X3B0cjxBc3luY1Rhc2s+IGNyZWF0ZUFzeW5jVGFzaygKKyAgICBUJiBjYWxsZWUsCisgICAgdm9p ZCAoVDo6Km1ldGhvZCkoTVAxLCBNUDIsIE1QMywgTVA0LCBNUDUsIE1QNiwgTVA3KSwKKyAgICBj b25zdCBQMSYgcGFyYW1ldGVyMSwKKyAgICBjb25zdCBQMiYgcGFyYW1ldGVyMiwKKyAgICBjb25z dCBQMyYgcGFyYW1ldGVyMywKKyAgICBjb25zdCBQNCYgcGFyYW1ldGVyNCwKKyAgICBjb25zdCBQ NSYgcGFyYW1ldGVyNSwKKyAgICBjb25zdCBQNiYgcGFyYW1ldGVyNiwKKyAgICBjb25zdCBQNyYg cGFyYW1ldGVyNykKK3sKKyAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxBc3luY1Rhc2tJbXBs PFQsIE1QMSwgTVAyLCBNUDMsIE1QNCwgTVA1LCBNUDYsIE1QNz4+KAorICAgICAgICAmY2FsbGVl LAorICAgICAgICBtZXRob2QsCisgICAgICAgIFdlYkNvcmU6OkNyb3NzVGhyZWFkQ29waWVyPFAx Pjo6Y29weShwYXJhbWV0ZXIxKSwKKyAgICAgICAgV2ViQ29yZTo6Q3Jvc3NUaHJlYWRDb3BpZXI8 UDI+Ojpjb3B5KHBhcmFtZXRlcjIpLAorICAgICAgICBXZWJDb3JlOjpDcm9zc1RocmVhZENvcGll cjxQMz46OmNvcHkocGFyYW1ldGVyMyksCisgICAgICAgIFdlYkNvcmU6OkNyb3NzVGhyZWFkQ29w aWVyPFA0Pjo6Y29weShwYXJhbWV0ZXI0KSwKKyAgICAgICAgV2ViQ29yZTo6Q3Jvc3NUaHJlYWRD b3BpZXI8UDU+Ojpjb3B5KHBhcmFtZXRlcjUpLAorICAgICAgICBXZWJDb3JlOjpDcm9zc1RocmVh ZENvcGllcjxQNj46OmNvcHkocGFyYW1ldGVyNiksCisgICAgICAgIFdlYkNvcmU6OkNyb3NzVGhy ZWFkQ29waWVyPFA3Pjo6Y29weShwYXJhbWV0ZXI3KSk7Cit9CisKIHRlbXBsYXRlPHR5cGVuYW1l IFQsIHR5cGVuYW1lIFAxLCB0eXBlbmFtZSBNUDEsIHR5cGVuYW1lIFAyLCB0eXBlbmFtZSBNUDIs IHR5cGVuYW1lIFAzLCB0eXBlbmFtZSBNUDMsIHR5cGVuYW1lIFA0LCB0eXBlbmFtZSBNUDQsIHR5 cGVuYW1lIFA1LCB0eXBlbmFtZSBNUDUsIHR5cGVuYW1lIFA2LCB0eXBlbmFtZSBNUDYsIHR5cGVu YW1lIFA3LCB0eXBlbmFtZSBNUDcsIHR5cGVuYW1lIFA4LCB0eXBlbmFtZSBNUDg+CiBzdGQ6OnVu aXF1ZV9wdHI8QXN5bmNUYXNrPiBjcmVhdGVBc3luY1Rhc2soCiAgICAgVCYgY2FsbGVlLApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9EYXRhYmFzZXMvSW5kZXhlZERCL1dl YklEQlNlcnZlckNvbm5lY3Rpb24uY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9EYXRh YmFzZXMvSW5kZXhlZERCL1dlYklEQlNlcnZlckNvbm5lY3Rpb24uY3BwCmluZGV4IGFlZGQ2OTAu LjhmMTI5OGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvRGF0YWJhc2Vz L0luZGV4ZWREQi9XZWJJREJTZXJ2ZXJDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL0RhdGFiYXNlcy9JbmRleGVkREIvV2ViSURCU2VydmVyQ29ubmVjdGlvbi5j cHAKQEAgLTQ0NCw3ICs0NDQsNyBAQCB2b2lkIFdlYklEQlNlcnZlckNvbm5lY3Rpb246OmRpZEdl dFJlY29yZCh1aW50NjRfdCByZXF1ZXN0SUQsIGNvbnN0IFdlYkNvcmU6OklEQgogICAgIHNlcnZl clJlcXVlc3QtPmNvbXBsZXRlUmVxdWVzdChnZXRSZXN1bHQsIGVycm9yQ29kZSA/IElEQkRhdGFi YXNlRXJyb3I6OmNyZWF0ZShlcnJvckNvZGUsIGVycm9yTWVzc2FnZSkgOiBudWxscHRyKTsKIH0K IAotdm9pZCBXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpkaWRPcGVuQ3Vyc29yKHVpbnQ2NF90IHJl cXVlc3RJRCwgaW50NjRfdCBjdXJzb3JJRCwgdWludDMyX3QgZXJyb3JDb2RlLCBjb25zdCBTdHJp bmcmIGVycm9yTWVzc2FnZSkKK3ZvaWQgV2ViSURCU2VydmVyQ29ubmVjdGlvbjo6ZGlkT3BlbkN1 cnNvcih1aW50NjRfdCByZXF1ZXN0SUQsIGludDY0X3QgY3Vyc29ySUQsIFdlYkNvcmU6OklEQktl eURhdGEmIGtleSwgV2ViQ29yZTo6SURCS2V5RGF0YSYgcHJpbWFyeUtleSwgY29uc3QgSVBDOjpE YXRhUmVmZXJlbmNlJiB2YWx1ZURhdGEsIHVpbnQzMl90IGVycm9yQ29kZSwgY29uc3QgU3RyaW5n JiBlcnJvck1lc3NhZ2UpCiB7CiAgICAgTE9HKElEQiwgIldlYlByb2Nlc3MgZGlkT3BlbkN1cnNv ciByZXF1ZXN0IElEICVsbHUgKGVycm9yIC0gJXMpIiwgcmVxdWVzdElELCBlcnJvck1lc3NhZ2Uu dXRmOCgpLmRhdGEoKSk7CiAKQEAgLTQ1Myw3ICs0NTMsOCBAQCB2b2lkIFdlYklEQlNlcnZlckNv bm5lY3Rpb246OmRpZE9wZW5DdXJzb3IodWludDY0X3QgcmVxdWVzdElELCBpbnQ2NF90IGN1cnNv cklELAogICAgIGlmICghc2VydmVyUmVxdWVzdCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgc2Vy dmVyUmVxdWVzdC0+Y29tcGxldGVSZXF1ZXN0KGN1cnNvcklELCBlcnJvckNvZGUgPyBJREJEYXRh YmFzZUVycm9yOjpjcmVhdGUoZXJyb3JDb2RlLCBlcnJvck1lc3NhZ2UpIDogbnVsbHB0cik7Cisg ICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gdmFsdWUgPSBTaGFyZWRCdWZmZXI6OmNyZWF0ZSh2YWx1 ZURhdGEuZGF0YSgpLCB2YWx1ZURhdGEuc2l6ZSgpKTsKKyAgICBzZXJ2ZXJSZXF1ZXN0LT5jb21w bGV0ZVJlcXVlc3QoY3Vyc29ySUQsIGtleS5tYXliZUNyZWF0ZUlEQktleSgpLCBwcmltYXJ5S2V5 Lm1heWJlQ3JlYXRlSURCS2V5KCksIHZhbHVlLnJlbGVhc2UoKSwgZXJyb3JDb2RlID8gSURCRGF0 YWJhc2VFcnJvcjo6Y3JlYXRlKGVycm9yQ29kZSwgZXJyb3JNZXNzYWdlKSA6IG51bGxwdHIpOwog fQogCiB2b2lkIFdlYklEQlNlcnZlckNvbm5lY3Rpb246OmRpZEFkdmFuY2VDdXJzb3IodWludDY0 X3QgcmVxdWVzdElELCBXZWJDb3JlOjpJREJLZXlEYXRhJiBrZXksIFdlYkNvcmU6OklEQktleURh dGEmIHByaW1hcnlLZXksIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYgdmFsdWVEYXRhLCB1aW50 MzJfdCBlcnJvckNvZGUsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKQpAQCAtNjI3LDEyICs2 MjgsMTIgQEAgdm9pZCBXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpkaWRDaGFuZ2VEYXRhYmFzZVZl cnNpb24odWludDY0X3QgcmVxdWVzdElELCBib29sIHMKICAgICBzZXJ2ZXJSZXF1ZXN0LT5jb21w bGV0ZVJlcXVlc3Qoc3VjY2VzcyA/IG51bGxwdHIgOiBJREJEYXRhYmFzZUVycm9yOjpjcmVhdGUo SURCRGF0YWJhc2VFeGNlcHRpb246OlVua25vd25FcnJvciwgIlVua25vd24gZXJyb3Igb2NjdXJl ZCBjaGFuZ2luZyBkYXRhYmFzZSB2ZXJzaW9uIikpOwogfQogCi12b2lkIFdlYklEQlNlcnZlckNv bm5lY3Rpb246Om9wZW5DdXJzb3IoSURCVHJhbnNhY3Rpb25CYWNrZW5kJiwgY29uc3QgT3BlbkN1 cnNvck9wZXJhdGlvbiYgb3BlcmF0aW9uLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoaW50NjRfdCwgUGFz c1JlZlB0cjxJREJEYXRhYmFzZUVycm9yPik+IGNvbXBsZXRpb25DYWxsYmFjaykKK3ZvaWQgV2Vi SURCU2VydmVyQ29ubmVjdGlvbjo6b3BlbkN1cnNvcihJREJUcmFuc2FjdGlvbkJhY2tlbmQmLCBj b25zdCBPcGVuQ3Vyc29yT3BlcmF0aW9uJiBvcGVyYXRpb24sIHN0ZDo6ZnVuY3Rpb248dm9pZChp bnQ2NF90LCBQYXNzUmVmUHRyPElEQktleT4sIFBhc3NSZWZQdHI8SURCS2V5PiwgUGFzc1JlZlB0 cjxTaGFyZWRCdWZmZXI+LCBQYXNzUmVmUHRyPElEQkRhdGFiYXNlRXJyb3I+KT4gY29tcGxldGlv bkNhbGxiYWNrKQogewotICAgIFJlZlB0cjxBc3luY1JlcXVlc3Q+IHNlcnZlclJlcXVlc3QgPSBB c3luY1JlcXVlc3RJbXBsPGludDY0X3QsIFBhc3NSZWZQdHI8SURCRGF0YWJhc2VFcnJvcj4+Ojpj cmVhdGUoY29tcGxldGlvbkNhbGxiYWNrKTsKKyAgICBSZWZQdHI8QXN5bmNSZXF1ZXN0PiBzZXJ2 ZXJSZXF1ZXN0ID0gQXN5bmNSZXF1ZXN0SW1wbDxpbnQ2NF90LCBQYXNzUmVmUHRyPElEQktleT4s IFBhc3NSZWZQdHI8SURCS2V5PiwgUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+LCBQYXNzUmVmUHRy PElEQkRhdGFiYXNlRXJyb3I+Pjo6Y3JlYXRlKGNvbXBsZXRpb25DYWxsYmFjayk7CiAKICAgICBz ZXJ2ZXJSZXF1ZXN0LT5zZXRBYm9ydEhhbmRsZXIoW2NvbXBsZXRpb25DYWxsYmFja10oKSB7Ci0g ICAgICAgIGNvbXBsZXRpb25DYWxsYmFjaygwLCBJREJEYXRhYmFzZUVycm9yOjpjcmVhdGUoSURC RGF0YWJhc2VFeGNlcHRpb246OlVua25vd25FcnJvciwgIlVua25vd24gZXJyb3Igb2NjdXJlZCBv cGVuaW5nIGRhdGFiYXNlIGN1cnNvciIpKTsKKyAgICAgICAgY29tcGxldGlvbkNhbGxiYWNrKDAs IG51bGxwdHIsIG51bGxwdHIsIG51bGxwdHIsIElEQkRhdGFiYXNlRXJyb3I6OmNyZWF0ZShJREJE YXRhYmFzZUV4Y2VwdGlvbjo6VW5rbm93bkVycm9yLCAiVW5rbm93biBlcnJvciBvY2N1cmVkIG9w ZW5pbmcgZGF0YWJhc2UgY3Vyc29yIikpOwogICAgIH0pOwogCiAgICAgdWludDY0X3QgcmVxdWVz dElEID0gc2VydmVyUmVxdWVzdC0+cmVxdWVzdElEKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL0RhdGFiYXNlcy9JbmRleGVkREIvV2ViSURCU2VydmVyQ29ubmVjdGlv bi5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9EYXRhYmFzZXMvSW5kZXhlZERCL1dlYklE QlNlcnZlckNvbm5lY3Rpb24uaAppbmRleCBmNWUyMDk2Li4wZDUwMzYwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0RhdGFiYXNlcy9JbmRleGVkREIvV2ViSURCU2VydmVy Q29ubmVjdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvRGF0YWJhc2VzL0lu ZGV4ZWREQi9XZWJJREJTZXJ2ZXJDb25uZWN0aW9uLmgKQEAgLTcyLDcgKzcyLDcgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgdm9pZCBkZWxldGVJbmRleChXZWJDb3JlOjpJREJUcmFuc2FjdGlvbkJh Y2tlbmQmLCBjb25zdCBXZWJDb3JlOjpEZWxldGVJbmRleE9wZXJhdGlvbiYsIHN0ZDo6ZnVuY3Rp b248dm9pZChQYXNzUmVmUHRyPFdlYkNvcmU6OklEQkRhdGFiYXNlRXJyb3I+KT4gY29tcGxldGlv bkNhbGxiYWNrKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgZ2V0KFdlYkNvcmU6OklEQlRy YW5zYWN0aW9uQmFja2VuZCYsIGNvbnN0IFdlYkNvcmU6OkdldE9wZXJhdGlvbiYsIHN0ZDo6ZnVu Y3Rpb248dm9pZChjb25zdCBXZWJDb3JlOjpJREJHZXRSZXN1bHQmLCBQYXNzUmVmUHRyPFdlYkNv cmU6OklEQkRhdGFiYXNlRXJyb3I+KT4gY29tcGxldGlvbkNhbGxiYWNrKSBvdmVycmlkZTsKICAg ICB2aXJ0dWFsIHZvaWQgcHV0KFdlYkNvcmU6OklEQlRyYW5zYWN0aW9uQmFja2VuZCYsIGNvbnN0 IFdlYkNvcmU6OlB1dE9wZXJhdGlvbiYsIHN0ZDo6ZnVuY3Rpb248dm9pZChQYXNzUmVmUHRyPFdl YkNvcmU6OklEQktleT4sIFBhc3NSZWZQdHI8V2ViQ29yZTo6SURCRGF0YWJhc2VFcnJvcj4pPiBj b21wbGV0aW9uQ2FsbGJhY2spIG92ZXJyaWRlOwotICAgIHZpcnR1YWwgdm9pZCBvcGVuQ3Vyc29y KFdlYkNvcmU6OklEQlRyYW5zYWN0aW9uQmFja2VuZCYsIGNvbnN0IFdlYkNvcmU6Ok9wZW5DdXJz b3JPcGVyYXRpb24mLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoaW50NjRfdCwgUGFzc1JlZlB0cjxXZWJD b3JlOjpJREJEYXRhYmFzZUVycm9yPik+IGNvbXBsZXRpb25DYWxsYmFjaykgb3ZlcnJpZGU7Cisg ICAgdmlydHVhbCB2b2lkIG9wZW5DdXJzb3IoV2ViQ29yZTo6SURCVHJhbnNhY3Rpb25CYWNrZW5k JiwgY29uc3QgV2ViQ29yZTo6T3BlbkN1cnNvck9wZXJhdGlvbiYsIHN0ZDo6ZnVuY3Rpb248dm9p ZChpbnQ2NF90LCBQYXNzUmVmUHRyPFdlYkNvcmU6OklEQktleT4sIFBhc3NSZWZQdHI8V2ViQ29y ZTo6SURCS2V5PiwgUGFzc1JlZlB0cjxXZWJDb3JlOjpTaGFyZWRCdWZmZXI+LCBQYXNzUmVmUHRy PFdlYkNvcmU6OklEQkRhdGFiYXNlRXJyb3I+KT4gY29tcGxldGlvbkNhbGxiYWNrKSBvdmVycmlk ZTsKICAgICB2aXJ0dWFsIHZvaWQgY291bnQoV2ViQ29yZTo6SURCVHJhbnNhY3Rpb25CYWNrZW5k JiwgY29uc3QgV2ViQ29yZTo6Q291bnRPcGVyYXRpb24mLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoaW50 NjRfdCwgUGFzc1JlZlB0cjxXZWJDb3JlOjpJREJEYXRhYmFzZUVycm9yPik+IGNvbXBsZXRpb25D YWxsYmFjaykgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGRlbGV0ZVJhbmdlKFdlYkNvcmU6 OklEQlRyYW5zYWN0aW9uQmFja2VuZCYsIGNvbnN0IFdlYkNvcmU6OkRlbGV0ZVJhbmdlT3BlcmF0 aW9uJiwgc3RkOjpmdW5jdGlvbjx2b2lkKFBhc3NSZWZQdHI8V2ViQ29yZTo6SURCRGF0YWJhc2VF cnJvcj4pPiBjb21wbGV0aW9uQ2FsbGJhY2spIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBj bGVhck9iamVjdFN0b3JlKFdlYkNvcmU6OklEQlRyYW5zYWN0aW9uQmFja2VuZCYsIGNvbnN0IFdl YkNvcmU6OkNsZWFyT2JqZWN0U3RvcmVPcGVyYXRpb24mLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoUGFz c1JlZlB0cjxXZWJDb3JlOjpJREJEYXRhYmFzZUVycm9yPik+IGNvbXBsZXRpb25DYWxsYmFjaykg b3ZlcnJpZGU7CkBAIC0xMTAsNyArMTEwLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpZERlbGV0 ZUluZGV4KHVpbnQ2NF90IHJlcXVlc3RJRCwgYm9vbCBzdWNjZXNzKTsKICAgICB2b2lkIGRpZFB1 dFJlY29yZCh1aW50NjRfdCByZXF1ZXN0SUQsIGNvbnN0IFdlYkNvcmU6OklEQktleURhdGEmLCB1 aW50MzJfdCBlcnJvckNvZGUsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKTsKICAgICB2b2lk IGRpZEdldFJlY29yZCh1aW50NjRfdCByZXF1ZXN0SUQsIGNvbnN0IFdlYkNvcmU6OklEQkdldFJl c3VsdCYsIHVpbnQzMl90IGVycm9yQ29kZSwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpOwot ICAgIHZvaWQgZGlkT3BlbkN1cnNvcih1aW50NjRfdCByZXF1ZXN0SUQsIGludDY0X3QgY3Vyc29y SUQsIHVpbnQzMl90IGVycm9yQ29kZSwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpOworICAg IHZvaWQgZGlkT3BlbkN1cnNvcih1aW50NjRfdCByZXF1ZXN0SUQsIGludDY0X3QgY3Vyc29ySUQs IFdlYkNvcmU6OklEQktleURhdGEmLCBXZWJDb3JlOjpJREJLZXlEYXRhJiwgY29uc3QgSVBDOjpE YXRhUmVmZXJlbmNlJiwgdWludDMyX3QgZXJyb3JDb2RlLCBjb25zdCBTdHJpbmcmIGVycm9yTWVz c2FnZSk7CiAgICAgdm9pZCBkaWRBZHZhbmNlQ3Vyc29yKHVpbnQ2NF90IHJlcXVlc3RJRCwgV2Vi Q29yZTo6SURCS2V5RGF0YSYsIFdlYkNvcmU6OklEQktleURhdGEmLCBjb25zdCBJUEM6OkRhdGFS ZWZlcmVuY2UmLCB1aW50MzJfdCBlcnJvckNvZGUsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdl KTsKICAgICB2b2lkIGRpZEl0ZXJhdGVDdXJzb3IodWludDY0X3QgcmVxdWVzdElELCBXZWJDb3Jl OjpJREJLZXlEYXRhJiwgV2ViQ29yZTo6SURCS2V5RGF0YSYsIGNvbnN0IElQQzo6RGF0YVJlZmVy ZW5jZSYsIHVpbnQzMl90IGVycm9yQ29kZSwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpOwog ICAgIHZvaWQgZGlkQ291bnQodWludDY0X3QgcmVxdWVzdElELCBpbnQ2NF90IGNvdW50LCB1aW50 MzJfdCBlcnJvckNvZGUsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvRGF0YWJhc2VzL0luZGV4ZWREQi9XZWJJREJTZXJ2 ZXJDb25uZWN0aW9uLm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9EYXRh YmFzZXMvSW5kZXhlZERCL1dlYklEQlNlcnZlckNvbm5lY3Rpb24ubWVzc2FnZXMuaW4KaW5kZXgg OWZmM2Q4Yi4uY2JhODUwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9E YXRhYmFzZXMvSW5kZXhlZERCL1dlYklEQlNlcnZlckNvbm5lY3Rpb24ubWVzc2FnZXMuaW4KKysr IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9EYXRhYmFzZXMvSW5kZXhlZERCL1dlYklEQlNl cnZlckNvbm5lY3Rpb24ubWVzc2FnZXMuaW4KQEAgLTQwLDcgKzQwLDcgQEAgbWVzc2FnZXMgLT4g V2ViSURCU2VydmVyQ29ubmVjdGlvbiBMZWdhY3lSZWNlaXZlciB7CiAgICAgRGlkRGVsZXRlSW5k ZXgodWludDY0X3QgcmVxdWVzdElELCBib29sIHN1Y2Nlc3MpCiAgICAgRGlkUHV0UmVjb3JkKHVp bnQ2NF90IHJlcXVlc3RJRCwgV2ViQ29yZTo6SURCS2V5RGF0YSByZXN1bHRLZXksIHVpbnQzMl90 IGVycm9yQ29kZSwgU3RyaW5nIGVycm9yTWVzc2FnZSkKICAgICBEaWRHZXRSZWNvcmQodWludDY0 X3QgcmVxdWVzdElELCBXZWJDb3JlOjpJREJHZXRSZXN1bHQgZ2V0UmVzdWx0LCB1aW50MzJfdCBl cnJvckNvZGUsIFN0cmluZyBlcnJvck1lc3NhZ2UpCi0gICAgRGlkT3BlbkN1cnNvcih1aW50NjRf dCByZXF1ZXN0SUQsIGludDY0X3QgY3Vyc29ySUQsIHVpbnQzMl90IGVycm9yQ29kZSwgU3RyaW5n IGVycm9yTWVzc2FnZSkKKyAgICBEaWRPcGVuQ3Vyc29yKHVpbnQ2NF90IHJlcXVlc3RJRCwgaW50 NjRfdCBjdXJzb3JJRCwgV2ViQ29yZTo6SURCS2V5RGF0YSBrZXksIFdlYkNvcmU6OklEQktleURh dGEgcHJpbWFyeUtleSwgSVBDOjpEYXRhUmVmZXJlbmNlIHZhbHVlLCB1aW50MzJfdCBlcnJvckNv ZGUsIFN0cmluZyBlcnJvck1lc3NhZ2UpCiAgICAgRGlkQWR2YW5jZUN1cnNvcih1aW50NjRfdCBy ZXF1ZXN0SUQsIFdlYkNvcmU6OklEQktleURhdGEga2V5LCBXZWJDb3JlOjpJREJLZXlEYXRhIHBy aW1hcnlLZXksIElQQzo6RGF0YVJlZmVyZW5jZSB2YWx1ZSwgdWludDMyX3QgZXJyb3JDb2RlLCBT dHJpbmcgZXJyb3JNZXNzYWdlKQogICAgIERpZEl0ZXJhdGVDdXJzb3IodWludDY0X3QgcmVxdWVz dElELCBXZWJDb3JlOjpJREJLZXlEYXRhIGtleSwgV2ViQ29yZTo6SURCS2V5RGF0YSBwcmltYXJ5 S2V5LCBJUEM6OkRhdGFSZWZlcmVuY2UgdmFsdWUsIHVpbnQzMl90IGVycm9yQ29kZSwgU3RyaW5n IGVycm9yTWVzc2FnZSkKICAgICBEaWRDb3VudCh1aW50NjRfdCByZXF1ZXN0SUQsIGludDY0X3Qg Y291bnQsIHVpbnQzMl90IGVycm9yQ29kZSwgU3RyaW5nIGVycm9yTWVzc2FnZSkK