67663 2011-09-06 12:20:36 -0700 Consolidate key, primary key, value cursor messages. 2011-12-19 11:09:09 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dgrogan dgrogan hans michaeln oldest_to_newest 462734 0 dgrogan 2011-09-06 12:20:36 -0700 Consolidate key, primary key, value cursor messages. 462735 1 106463 dgrogan 2011-09-06 12:21:39 -0700 Created attachment 106463 Patch 462772 2 dgrogan 2011-09-06 13:02:02 -0700 This patch has all the webkit changes needed for http://codereview.chromium.org/7834006/. It will eventually have to be broken up for landing. 463037 3 dgrogan 2011-09-06 18:20:00 -0700 Michael, could you take a look? This patch has all the webkit changes needed for http://codereview.chromium.org/7834006/. It will eventually have to be broken up for landing. 512948 4 michaeln 2011-12-01 11:39:31 -0800 is obsolete now? 512953 5 dgrogan 2011-12-01 11:45:51 -0800 Fixed in chromium http://src.chromium.org/viewvc/chrome?view=rev&revision=105019 524028 6 106463 eric 2011-12-19 11:09:09 -0800 Comment on attachment 106463 Patch Cleared review? from attachment 106463 so that this bug does not appear in http://webkit.org/pending-review. If you would like this patch reviewed, please attach it to a new bug (or re-open this bug before marking it for review again). 106463 2011-09-06 12:21:39 -0700 2011-12-19 11:09:09 -0800 Patch bug-67663-20110906122138.patch text/plain 19558 dgrogan U3VidmVyc2lvbiBSZXZpc2lvbjogOTQ1ODAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxYTg3MGRhNDVmYmYyN2Ix ZGQ0ZWVjYzAxOTA4NjlmN2Y4YjBhYzM0Li5lNDc1MDk0ODZjYTVlNzA3ZTIyYTI2MWUzN2IyYWI0 NmI1M2UyMjkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIwMTEtMDktMDYgIERhdmlk IEdyb2dhbiAgPGRncm9nYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIENvbnNvbGlkYXRlIGtl eSwgcHJpbWFyeSBrZXksIHZhbHVlIGN1cnNvciBtZXNzYWdlcy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY3NjYzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAg ICAgICAgKiBzdG9yYWdlL0lEQkNhbGxiYWNrcy5oOgorICAgICAgICAqIHN0b3JhZ2UvSURCQ3Vy c29yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQkN1cnNvcjo6Y3JlYXRlKToKKyAgICAgICAg KFdlYkNvcmU6OklEQkN1cnNvcjo6SURCQ3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6OklEQkN1 cnNvcjo6a2V5KToKKyAgICAgICAgKFdlYkNvcmU6OklEQkN1cnNvcjo6cHJpbWFyeUtleSk6Cisg ICAgICAgIChXZWJDb3JlOjpJREJDdXJzb3I6OnZhbHVlKToKKyAgICAgICAgKiBzdG9yYWdlL0lE QkN1cnNvci5oOgorICAgICAgICAqIHN0b3JhZ2UvSURCQ3Vyc29yQmFja2VuZEltcGwuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SURCQ3Vyc29yQmFja2VuZEltcGw6OmNvbnRpbnVlRnVuY3Rpb25J bnRlcm5hbCk6CisgICAgICAgICogc3RvcmFnZS9JREJDdXJzb3JXaXRoVmFsdWUuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SURCQ3Vyc29yV2l0aFZhbHVlOjpjcmVhdGUpOgorICAgICAgICAoV2Vi Q29yZTo6SURCQ3Vyc29yV2l0aFZhbHVlOjpJREJDdXJzb3JXaXRoVmFsdWUpOgorICAgICAgICAq IHN0b3JhZ2UvSURCQ3Vyc29yV2l0aFZhbHVlLmg6CisgICAgICAgICogc3RvcmFnZS9JREJJbmRl eEJhY2tlbmRJbXBsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQkluZGV4QmFja2VuZEltcGw6 Om9wZW5DdXJzb3JJbnRlcm5hbCk6CisgICAgICAgICogc3RvcmFnZS9JREJPYmplY3RTdG9yZUJh Y2tlbmRJbXBsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQk9iamVjdFN0b3JlQmFja2VuZElt cGw6Om9wZW5DdXJzb3JJbnRlcm5hbCk6CisgICAgICAgICogc3RvcmFnZS9JREJSZXF1ZXN0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OklEQlJlcXVlc3Q6Om9uU3VjY2Vzcyk6CisgICAgICAgICog c3RvcmFnZS9JREJSZXF1ZXN0Lmg6CisKIDIwMTEtMDktMDYgIFJhcGhhZWwgS3VibyBkYSBDb3N0 YSAgPGt1Ym9AcHJvZnVzaW9uLm1vYmk+CiAKICAgICAgICAgW0VGTF0gRG8gbm90IGFsbG9jYXRl IG1lbW9yeSBmb3IgZXh0cmVtZWx5IGxhcmdlIHN1cmZhY2VzLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvc3RvcmFnZS9JREJDYWxsYmFja3MuaCBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2Uv SURCQ2FsbGJhY2tzLmgKaW5kZXggZGRjNmU2MDk0NjlmZWI2Y2JhNjYwMDk4YzdiOThiMDJmNGQ3 MjhlYy4uYzAyNGM2ZDhiZmZlNjUzM2Y3MzVjODNlMDBlNmM4YzFkODFhODhmMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9JREJDYWxsYmFja3MuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9zdG9yYWdlL0lEQkNhbGxiYWNrcy5oCkBAIC00OCw3ICs0OCw3IEBAIHB1YmxpYzoKICAg ICB2aXJ0dWFsIH5JREJDYWxsYmFja3MoKSB7IH0KIAogICAgIHZpcnR1YWwgdm9pZCBvbkVycm9y KFBhc3NSZWZQdHI8SURCRGF0YWJhc2VFcnJvcj4pID0gMDsKLSAgICB2aXJ0dWFsIHZvaWQgb25T dWNjZXNzKFBhc3NSZWZQdHI8SURCQ3Vyc29yQmFja2VuZEludGVyZmFjZT4pID0gMDsKKyAgICB2 aXJ0dWFsIHZvaWQgb25TdWNjZXNzKFBhc3NSZWZQdHI8SURCQ3Vyc29yQmFja2VuZEludGVyZmFj ZT4sIFBhc3NSZWZQdHI8SURCS2V5PiwgUGFzc1JlZlB0cjxJREJLZXk+LCBQYXNzUmVmUHRyPFNl cmlhbGl6ZWRTY3JpcHRWYWx1ZT4pID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgb25TdWNjZXNzKFBh c3NSZWZQdHI8SURCRGF0YWJhc2VCYWNrZW5kSW50ZXJmYWNlPikgPSAwOwogICAgIHZpcnR1YWwg dm9pZCBvblN1Y2Nlc3MoUGFzc1JlZlB0cjxJREJLZXk+KSA9IDA7CiAgICAgdmlydHVhbCB2b2lk IG9uU3VjY2VzcyhQYXNzUmVmUHRyPElEQlRyYW5zYWN0aW9uQmFja2VuZEludGVyZmFjZT4pID0g MDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCQ3Vyc29yLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCQ3Vyc29yLmNwcAppbmRleCA5YjFlYmY2ZDk4ZmJmN2E0 YTE1YWJkZDQ2NDcyNzIwNTE5YzkyY2JjLi5kYzE1MmY3YTM1MmUyOThmOWVmNmIyN2FiYjhlNWZm ZGE2ZDk2ZGI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL0lEQkN1cnNvci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9JREJDdXJzb3IuY3BwCkBAIC0zOSwxNiAr MzksMTkgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1QYXNzUmVmUHRyPElEQkN1cnNvcj4g SURCQ3Vyc29yOjpjcmVhdGUoUGFzc1JlZlB0cjxJREJDdXJzb3JCYWNrZW5kSW50ZXJmYWNlPiBi YWNrZW5kLCBJREJSZXF1ZXN0KiByZXF1ZXN0LCBJREJBbnkqIHNvdXJjZSwgSURCVHJhbnNhY3Rp b24qIHRyYW5zYWN0aW9uKQorUGFzc1JlZlB0cjxJREJDdXJzb3I+IElEQkN1cnNvcjo6Y3JlYXRl KFBhc3NSZWZQdHI8SURCQ3Vyc29yQmFja2VuZEludGVyZmFjZT4gYmFja2VuZCwgSURCUmVxdWVz dCogcmVxdWVzdCwgSURCQW55KiBzb3VyY2UsIElEQlRyYW5zYWN0aW9uKiB0cmFuc2FjdGlvbiwg UGFzc1JlZlB0cjxJREJLZXk+IGtleSwgUGFzc1JlZlB0cjxJREJLZXk+IHByaW1hcnlLZXksIFBh c3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiB2YWx1ZSkKIHsKLSAgICByZXR1cm4gYWRv cHRSZWYobmV3IElEQkN1cnNvcihiYWNrZW5kLCByZXF1ZXN0LCBzb3VyY2UsIHRyYW5zYWN0aW9u KSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBJREJDdXJzb3IoYmFja2VuZCwgcmVxdWVzdCwg c291cmNlLCB0cmFuc2FjdGlvbiwga2V5LCBwcmltYXJ5S2V5LCB2YWx1ZSkpOwogfQogCi1JREJD dXJzb3I6OklEQkN1cnNvcihQYXNzUmVmUHRyPElEQkN1cnNvckJhY2tlbmRJbnRlcmZhY2U+IGJh Y2tlbmQsIElEQlJlcXVlc3QqIHJlcXVlc3QsIElEQkFueSogc291cmNlLCBJREJUcmFuc2FjdGlv biogdHJhbnNhY3Rpb24pCitJREJDdXJzb3I6OklEQkN1cnNvcihQYXNzUmVmUHRyPElEQkN1cnNv ckJhY2tlbmRJbnRlcmZhY2U+IGJhY2tlbmQsIElEQlJlcXVlc3QqIHJlcXVlc3QsIElEQkFueSog c291cmNlLCBJREJUcmFuc2FjdGlvbiogdHJhbnNhY3Rpb24sIFBhc3NSZWZQdHI8SURCS2V5PiBr ZXksIFBhc3NSZWZQdHI8SURCS2V5PiBwcmltYXJ5S2V5LCBQYXNzUmVmUHRyPFNlcmlhbGl6ZWRT Y3JpcHRWYWx1ZT4gdmFsdWUpCiAgICAgOiBtX2JhY2tlbmQoYmFja2VuZCkKICAgICAsIG1fcmVx dWVzdChyZXF1ZXN0KQogICAgICwgbV9zb3VyY2Uoc291cmNlKQogICAgICwgbV90cmFuc2FjdGlv bih0cmFuc2FjdGlvbikKKyAgICAsIG1fa2V5KGtleSkKKyAgICAsIG1fcHJpbWFyeUtleShwcmlt YXJ5S2V5KQorICAgICwgbV92YWx1ZSh2YWx1ZSkKIHsKICAgICBBU1NFUlQobV9iYWNrZW5kKTsK ICAgICBBU1NFUlQobV9yZXF1ZXN0KTsKQEAgLTY3LDE3ICs3MCwxNyBAQCB1bnNpZ25lZCBzaG9y dCBJREJDdXJzb3I6OmRpcmVjdGlvbigpIGNvbnN0CiAKIFBhc3NSZWZQdHI8SURCS2V5PiBJREJD dXJzb3I6OmtleSgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fYmFja2VuZC0+a2V5KCk7CisgICAg cmV0dXJuIG1fa2V5OwogfQogCiBQYXNzUmVmUHRyPElEQktleT4gSURCQ3Vyc29yOjpwcmltYXJ5 S2V5KCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV9iYWNrZW5kLT5wcmltYXJ5S2V5KCk7CisgICAg cmV0dXJuIG1fcHJpbWFyeUtleTsKIH0KIAogUGFzc1JlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFs dWU+IElEQkN1cnNvcjo6dmFsdWUoKSBjb25zdAogewotICAgIHJldHVybiBtX2JhY2tlbmQtPnZh bHVlKCk7CisgICAgcmV0dXJuIG1fdmFsdWU7CiB9CiAKIElEQkFueSogSURCQ3Vyc29yOjpzb3Vy Y2UoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9JREJDdXJzb3Iu aCBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCQ3Vyc29yLmgKaW5kZXggOWFkZTljOGJkNGRi MTdmMmRkYTAwN2FkYTVjMTQyNmVjZjZjZmZmMC4uZjMwNGZiNjEzMWY3ZmZiMGNhYjZkNTE1MWI1 MGExZDM1MDBhNWEyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9JREJDdXJz b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL0lEQkN1cnNvci5oCkBAIC0zMCw2ICsz MCw3IEBACiAKICNpbmNsdWRlICJFeGNlcHRpb25Db2RlLmgiCiAjaW5jbHVkZSAiSURCS2V5Lmgi CisjaW5jbHVkZSAiU2VyaWFsaXplZFNjcmlwdFZhbHVlLmgiCiAjaW5jbHVkZSA8d3RmL1Bhc3NS ZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZQ dHIuaD4KQEAgLTUyLDcgKzUzLDcgQEAgcHVibGljOgogICAgICAgICBQUkVWID0gMiwKICAgICAg ICAgUFJFVl9OT19EVVBMSUNBVEUgPSAzLAogICAgIH07Ci0gICAgc3RhdGljIFBhc3NSZWZQdHI8 SURCQ3Vyc29yPiBjcmVhdGUoUGFzc1JlZlB0cjxJREJDdXJzb3JCYWNrZW5kSW50ZXJmYWNlPiwg SURCUmVxdWVzdCosIElEQkFueSogc291cmNlLCBJREJUcmFuc2FjdGlvbiopOworICAgIHN0YXRp YyBQYXNzUmVmUHRyPElEQkN1cnNvcj4gY3JlYXRlKFBhc3NSZWZQdHI8SURCQ3Vyc29yQmFja2Vu ZEludGVyZmFjZT4sIElEQlJlcXVlc3QqLCBJREJBbnkqIHNvdXJjZSwgSURCVHJhbnNhY3Rpb24q LCBQYXNzUmVmUHRyPElEQktleT4sIFBhc3NSZWZQdHI8SURCS2V5PiBwcmltYXJ5S2V5LCBQYXNz UmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4pOwogICAgIHZpcnR1YWwgfklEQkN1cnNvcigp OwogCiAgICAgLy8gRklYTUU6IFRyeSB0byBtb2RpZnkgdGhlIGNvZGUgZ2VuZXJhdG9yIHNvIHRo aXMgaXMgdW5uZWVkZWQuCkBAIC03MCwxMyArNzEsMTcgQEAgcHVibGljOgogICAgIFBhc3NSZWZQ dHI8SURCUmVxdWVzdD4gZGVsZXRlRnVuY3Rpb24oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIEV4 Y2VwdGlvbkNvZGUmKTsKIAogcHJvdGVjdGVkOgotICAgIElEQkN1cnNvcihQYXNzUmVmUHRyPElE QkN1cnNvckJhY2tlbmRJbnRlcmZhY2U+LCBJREJSZXF1ZXN0KiwgSURCQW55KiBzb3VyY2UsIElE QlRyYW5zYWN0aW9uKik7CisgICAgSURCQ3Vyc29yKFBhc3NSZWZQdHI8SURCQ3Vyc29yQmFja2Vu ZEludGVyZmFjZT4sIElEQlJlcXVlc3QqLCBJREJBbnkqIHNvdXJjZSwgSURCVHJhbnNhY3Rpb24q LCBQYXNzUmVmUHRyPElEQktleT4sIFBhc3NSZWZQdHI8SURCS2V5PiBwcmltYXJ5S2V5LCBQYXNz UmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4pOwogCiBwcml2YXRlOgogICAgIFJlZlB0cjxJ REJDdXJzb3JCYWNrZW5kSW50ZXJmYWNlPiBtX2JhY2tlbmQ7CiAgICAgUmVmUHRyPElEQlJlcXVl c3Q+IG1fcmVxdWVzdDsKICAgICBSZWZQdHI8SURCQW55PiBtX3NvdXJjZTsKICAgICBSZWZQdHI8 SURCVHJhbnNhY3Rpb24+IG1fdHJhbnNhY3Rpb247CisKKyAgICBSZWZQdHI8SURCS2V5PiBtX2tl eTsKKyAgICBSZWZQdHI8SURCS2V5PiBtX3ByaW1hcnlLZXk7CisgICAgUmVmUHRyPFNlcmlhbGl6 ZWRTY3JpcHRWYWx1ZT4gbV92YWx1ZTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCQ3Vyc29yQmFja2VuZEltcGwuY3Bw IGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9JREJDdXJzb3JCYWNrZW5kSW1wbC5jcHAKaW5kZXgg YjhiYzFlMzI1MzkzNzlkYWE3ZDczYTJkMmEzOTAzMjkxOGM3NTUyYS4uZGJmOTc5NzdjZTZjZTM4 OGIzZGUxNjEyZmUxOWY5NzcxZTg4OGUwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3Rv cmFnZS9JREJDdXJzb3JCYWNrZW5kSW1wbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3RvcmFn ZS9JREJDdXJzb3JCYWNrZW5kSW1wbC5jcHAKQEAgLTEwOSw3ICsxMDksMTEgQEAgdm9pZCBJREJD dXJzb3JCYWNrZW5kSW1wbDo6Y29udGludWVGdW5jdGlvbkludGVybmFsKFNjcmlwdEV4ZWN1dGlv bkNvbnRleHQqLCBQYXMKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGNhbGxiYWNrcy0+ b25TdWNjZXNzKGN1cnNvci5nZXQoKSk7CisgICAgaWYgKGN1cnNvci0+bV9jdXJzb3JUeXBlID09 IEluZGV4S2V5Q3Vyc29yKQorICAgICAgY2FsbGJhY2tzLT5vblN1Y2Nlc3MoY3Vyc29yLmdldCgp LCBjdXJzb3ItPmtleSgpLCBjdXJzb3ItPnByaW1hcnlLZXkoKSwgU2VyaWFsaXplZFNjcmlwdFZh bHVlOjpudWxsVmFsdWUoKSk7CisgICAgZWxzZQorICAgICAgY2FsbGJhY2tzLT5vblN1Y2Nlc3Mo Y3Vyc29yLmdldCgpLCBjdXJzb3ItPmtleSgpLCBjdXJzb3ItPnByaW1hcnlLZXkoKSwgY3Vyc29y LT52YWx1ZSgpKTsKKwogfQogCiB2b2lkIElEQkN1cnNvckJhY2tlbmRJbXBsOjpkZWxldGVGdW5j dGlvbihQYXNzUmVmUHRyPElEQkNhbGxiYWNrcz4gcHJwQ2FsbGJhY2tzLCBFeGNlcHRpb25Db2Rl JiBlYykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCQ3Vyc29yV2l0aFZh bHVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCQ3Vyc29yV2l0aFZhbHVlLmNwcApp bmRleCBkM2MzYmQ4Y2E5YTY2NDc2ZGJkMjI0OTQ4ZDA3MDRjNTRkN2ZmNWYwLi4yZGMyMzYwNjIx YjFhM2U4YWQwODMxMTFiNjlmZjYzYjMzYWE0NmFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9zdG9yYWdlL0lEQkN1cnNvcldpdGhWYWx1ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3Rv cmFnZS9JREJDdXJzb3JXaXRoVmFsdWUuY3BwCkBAIC0zMywxMyArMzMsMTMgQEAKIAogbmFtZXNw YWNlIFdlYkNvcmUgewogCi1QYXNzUmVmUHRyPElEQkN1cnNvcldpdGhWYWx1ZT4gSURCQ3Vyc29y V2l0aFZhbHVlOjpjcmVhdGUoUGFzc1JlZlB0cjxJREJDdXJzb3JCYWNrZW5kSW50ZXJmYWNlPiBi YWNrZW5kLCBJREJSZXF1ZXN0KiByZXF1ZXN0LCBJREJBbnkqIHNvdXJjZSwgSURCVHJhbnNhY3Rp b24qIHRyYW5zYWN0aW9uKQorUGFzc1JlZlB0cjxJREJDdXJzb3JXaXRoVmFsdWU+IElEQkN1cnNv cldpdGhWYWx1ZTo6Y3JlYXRlKFBhc3NSZWZQdHI8SURCQ3Vyc29yQmFja2VuZEludGVyZmFjZT4g YmFja2VuZCwgSURCUmVxdWVzdCogcmVxdWVzdCwgSURCQW55KiBzb3VyY2UsIElEQlRyYW5zYWN0 aW9uKiB0cmFuc2FjdGlvbiwgUGFzc1JlZlB0cjxJREJLZXk+IGtleSwgUGFzc1JlZlB0cjxJREJL ZXk+IHByaW1hcnlLZXksIFBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiB2YWx1ZSkK IHsKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IElEQkN1cnNvcldpdGhWYWx1ZShiYWNrZW5kLCBy ZXF1ZXN0LCBzb3VyY2UsIHRyYW5zYWN0aW9uKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBJ REJDdXJzb3JXaXRoVmFsdWUoYmFja2VuZCwgcmVxdWVzdCwgc291cmNlLCB0cmFuc2FjdGlvbiwg a2V5LCBwcmltYXJ5S2V5LCB2YWx1ZSkpOwogfQogCi1JREJDdXJzb3JXaXRoVmFsdWU6OklEQkN1 cnNvcldpdGhWYWx1ZShQYXNzUmVmUHRyPElEQkN1cnNvckJhY2tlbmRJbnRlcmZhY2U+IGJhY2tl bmQsIElEQlJlcXVlc3QqIHJlcXVlc3QsIElEQkFueSogc291cmNlLCBJREJUcmFuc2FjdGlvbiog dHJhbnNhY3Rpb24pCi0gICAgOiBJREJDdXJzb3IoYmFja2VuZCwgcmVxdWVzdCwgc291cmNlLCB0 cmFuc2FjdGlvbikKK0lEQkN1cnNvcldpdGhWYWx1ZTo6SURCQ3Vyc29yV2l0aFZhbHVlKFBhc3NS ZWZQdHI8SURCQ3Vyc29yQmFja2VuZEludGVyZmFjZT4gYmFja2VuZCwgSURCUmVxdWVzdCogcmVx dWVzdCwgSURCQW55KiBzb3VyY2UsIElEQlRyYW5zYWN0aW9uKiB0cmFuc2FjdGlvbiwgUGFzc1Jl ZlB0cjxJREJLZXk+IGtleSwgUGFzc1JlZlB0cjxJREJLZXk+IHByaW1hcnlLZXksIFBhc3NSZWZQ dHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiB2YWx1ZSkKKyAgICA6IElEQkN1cnNvcihiYWNrZW5k LCByZXF1ZXN0LCBzb3VyY2UsIHRyYW5zYWN0aW9uLCBrZXksIHByaW1hcnlLZXksIHZhbHVlKQog ewogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL0lEQkN1cnNvcldpdGhW YWx1ZS5oIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9JREJDdXJzb3JXaXRoVmFsdWUuaAppbmRl eCBkMDYxMGJkOTllMzhkMDBjZGRhNjYyMjE0MWZjMDI2NWY0MDI2YmE2Li43MzRlYWFkMTRiZmZh OTNkODY0ZjM4NWI1MGFmNjA3NmU0NGEwYzJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9z dG9yYWdlL0lEQkN1cnNvcldpdGhWYWx1ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2Uv SURCQ3Vyc29yV2l0aFZhbHVlLmgKQEAgLTM0LDE0ICszNCwxNCBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKIGNsYXNzIElEQkN1cnNvcldpdGhWYWx1ZSA6IHB1YmxpYyBJREJDdXJzb3IgewogcHVi bGljOgotICAgIHN0YXRpYyBQYXNzUmVmUHRyPElEQkN1cnNvcldpdGhWYWx1ZT4gY3JlYXRlKFBh c3NSZWZQdHI8SURCQ3Vyc29yQmFja2VuZEludGVyZmFjZT4sIElEQlJlcXVlc3QqLCBJREJBbnkq IHNvdXJjZSwgSURCVHJhbnNhY3Rpb24qKTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxJREJDdXJz b3JXaXRoVmFsdWU+IGNyZWF0ZShQYXNzUmVmUHRyPElEQkN1cnNvckJhY2tlbmRJbnRlcmZhY2U+ LCBJREJSZXF1ZXN0KiwgSURCQW55KiBzb3VyY2UsIElEQlRyYW5zYWN0aW9uKiwgUGFzc1JlZlB0 cjxJREJLZXk+LCBQYXNzUmVmUHRyPElEQktleT4gcHJpbWFyeUtleSwgUGFzc1JlZlB0cjxTZXJp YWxpemVkU2NyaXB0VmFsdWU+KTsKICAgICB2aXJ0dWFsIH5JREJDdXJzb3JXaXRoVmFsdWUoKTsK IAogICAgIC8vIFRoZSB2YWx1ZSBhdHRyaWJ1dGUgZGVmaW5lZCBpbiB0aGUgSURMIGlzIHNpbXBs eSBpbXBsZW1lbnRlZCBpbiBJREJDdXJzb3IgKGJ1dCBub3QgZXhwb3NlZCB2aWEKICAgICAvLyBp dHMgSURMKS4gVGhpcyBpcyB0byBtYWtlIHRoZSBpbXBsZW1lbnRhdGlvbiBtb3JlIHNpbXBsZSB3 aGlsZSBtYXRjaGluZyB3aGF0IHRoZSBzcGVjIHNheXMuCiAKIHByaXZhdGU6Ci0gICAgSURCQ3Vy c29yV2l0aFZhbHVlKFBhc3NSZWZQdHI8SURCQ3Vyc29yQmFja2VuZEludGVyZmFjZT4sIElEQlJl cXVlc3QqLCBJREJBbnkqIHNvdXJjZSwgSURCVHJhbnNhY3Rpb24qKTsKKyAgICBJREJDdXJzb3JX aXRoVmFsdWUoUGFzc1JlZlB0cjxJREJDdXJzb3JCYWNrZW5kSW50ZXJmYWNlPiwgSURCUmVxdWVz dCosIElEQkFueSogc291cmNlLCBJREJUcmFuc2FjdGlvbiosIFBhc3NSZWZQdHI8SURCS2V5Piwg UGFzc1JlZlB0cjxJREJLZXk+IHByaW1hcnlLZXksIFBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlw dFZhbHVlPik7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9zdG9yYWdlL0lEQkluZGV4QmFja2VuZEltcGwuY3BwIGIvU291cmNlL1dlYkNv cmUvc3RvcmFnZS9JREJJbmRleEJhY2tlbmRJbXBsLmNwcAppbmRleCA1MTI1NjQzZDQ4MDYyMTJj ODFjMzYwNDIwZWNhYTNkZDBjNTNiOWU2Li5hZGYzYzZkNWExMjQyZTM4ZWRmMGExZDliNTcxMGU2 OGQ3ZjkzMTEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL0lEQkluZGV4QmFj a2VuZEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCSW5kZXhCYWNrZW5k SW1wbC5jcHAKQEAgLTk3LDcgKzk3LDEwIEBAIHZvaWQgSURCSW5kZXhCYWNrZW5kSW1wbDo6b3Bl bkN1cnNvckludGVybmFsKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBQYXNzUmVmUHRyCiAgICAg QVNTRVJUKG9iamVjdFN0b3JlICYmICFlYyk7CiAKICAgICBSZWZQdHI8SURCQ3Vyc29yQmFja2Vu ZEludGVyZmFjZT4gY3Vyc29yID0gSURCQ3Vyc29yQmFja2VuZEltcGw6OmNyZWF0ZShiYWNraW5n U3RvcmVDdXJzb3IuZ2V0KCksIGRpcmVjdGlvbiwgY3Vyc29yVHlwZSwgdHJhbnNhY3Rpb24uZ2V0 KCksIG9iamVjdFN0b3JlLmdldCgpKTsKLSAgICBjYWxsYmFja3MtPm9uU3VjY2VzcyhjdXJzb3Iu cmVsZWFzZSgpKTsKKyAgICBpZiAoY3Vyc29yVHlwZSA9PSBJREJDdXJzb3JCYWNrZW5kSW50ZXJm YWNlOjpJbmRleEtleUN1cnNvcikKKyAgICAgIGNhbGxiYWNrcy0+b25TdWNjZXNzKGN1cnNvciwg Y3Vyc29yLT5rZXkoKSwgY3Vyc29yLT5wcmltYXJ5S2V5KCksIDApOworICAgIGVsc2UKKyAgICAg IGNhbGxiYWNrcy0+b25TdWNjZXNzKGN1cnNvciwgY3Vyc29yLT5rZXkoKSwgY3Vyc29yLT5wcmlt YXJ5S2V5KCksIGN1cnNvci0+dmFsdWUoKSk7CiB9CiAKIHZvaWQgSURCSW5kZXhCYWNrZW5kSW1w bDo6b3BlbkN1cnNvcihQYXNzUmVmUHRyPElEQktleVJhbmdlPiBwcnBLZXlSYW5nZSwgdW5zaWdu ZWQgc2hvcnQgZGlyZWN0aW9uLCBQYXNzUmVmUHRyPElEQkNhbGxiYWNrcz4gcHJwQ2FsbGJhY2tz LCBJREJUcmFuc2FjdGlvbkJhY2tlbmRJbnRlcmZhY2UqIHRyYW5zYWN0aW9uUHRyLCBFeGNlcHRp b25Db2RlJiBlYykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCT2JqZWN0 U3RvcmVCYWNrZW5kSW1wbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL0lEQk9iamVjdFN0 b3JlQmFja2VuZEltcGwuY3BwCmluZGV4IGQzZmNhOWVjMDNmNzVmYjlhYTVkZjExYzY0ZjdiZWU1 NDRlNmY3NDcuLjNlM2M4M2FjN2IwOTM5OTE4NDEzNTU5ZDQ3ZjRhNDRkZmNhMzgyOTUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCT2JqZWN0U3RvcmVCYWNrZW5kSW1wbC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9JREJPYmplY3RTdG9yZUJhY2tlbmRJbXBs LmNwcApAQCAtNTA0LDcgKzUwNCw3IEBAIHZvaWQgSURCT2JqZWN0U3RvcmVCYWNrZW5kSW1wbDo6 b3BlbkN1cnNvckludGVybmFsKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBQYXNzCiAgICAgfQog CiAgICAgUmVmUHRyPElEQkN1cnNvckJhY2tlbmRJbnRlcmZhY2U+IGN1cnNvciA9IElEQkN1cnNv ckJhY2tlbmRJbXBsOjpjcmVhdGUoYmFja2luZ1N0b3JlQ3Vyc29yLnJlbGVhc2UoKSwgZGlyZWN0 aW9uLCBJREJDdXJzb3JCYWNrZW5kSW50ZXJmYWNlOjpPYmplY3RTdG9yZUN1cnNvciwgdHJhbnNh Y3Rpb24uZ2V0KCksIG9iamVjdFN0b3JlLmdldCgpKTsKLSAgICBjYWxsYmFja3MtPm9uU3VjY2Vz cyhjdXJzb3IucmVsZWFzZSgpKTsKKyAgICBjYWxsYmFja3MtPm9uU3VjY2VzcyhjdXJzb3IsIGN1 cnNvci0+a2V5KCksIGN1cnNvci0+cHJpbWFyeUtleSgpLCBjdXJzb3ItPnZhbHVlKCkpOwogfQog CiB2b2lkIElEQk9iamVjdFN0b3JlQmFja2VuZEltcGw6OmxvYWRJbmRleGVzKCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCUmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9zdG9yYWdlL0lEQlJlcXVlc3QuY3BwCmluZGV4IGZlZDMzMmQ3YzIyMDY4ZGVlYWZmYTRjYjM4 N2E2NTZmYzJkMWQ0MjYuLmU1Yjg3MjgwYTFlNzUwMmY3NzE1MzA1Mzk5ZjQ2NjA5NTg4ODE0ZmYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCUmVxdWVzdC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvc3RvcmFnZS9JREJSZXF1ZXN0LmNwcApAQCAtMTg2LDE0ICsxODYsMTQg QEAgc3RhdGljIFBhc3NSZWZQdHI8RXZlbnQ+IGNyZWF0ZVN1Y2Nlc3NFdmVudCgpCiAgICAgcmV0 dXJuIEV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLnN1Y2Nlc3NFdmVudCwgZmFsc2UsIGZhbHNl KTsKIH0KIAotdm9pZCBJREJSZXF1ZXN0OjpvblN1Y2Nlc3MoUGFzc1JlZlB0cjxJREJDdXJzb3JC YWNrZW5kSW50ZXJmYWNlPiBiYWNrZW5kKQordm9pZCBJREJSZXF1ZXN0OjpvblN1Y2Nlc3MoUGFz c1JlZlB0cjxJREJDdXJzb3JCYWNrZW5kSW50ZXJmYWNlPiBiYWNrZW5kLCBQYXNzUmVmUHRyPElE QktleT4ga2V5LCBQYXNzUmVmUHRyPElEQktleT4gcHJpbWFyeUtleSwgUGFzc1JlZlB0cjxTZXJp YWxpemVkU2NyaXB0VmFsdWU+IHZhbHVlKQogewogICAgIEFTU0VSVCghbV9lcnJvckNvZGUgJiYg bV9lcnJvck1lc3NhZ2UuaXNOdWxsKCkgJiYgIW1fcmVzdWx0KTsKICAgICBBU1NFUlQobV9jdXJz b3JUeXBlICE9IElEQkN1cnNvckJhY2tlbmRJbnRlcmZhY2U6OkludmFsaWRDdXJzb3JUeXBlKTsK ICAgICBpZiAobV9jdXJzb3JUeXBlID09IElEQkN1cnNvckJhY2tlbmRJbnRlcmZhY2U6OkluZGV4 S2V5Q3Vyc29yKQotICAgICAgICBtX3Jlc3VsdCA9IElEQkFueTo6Y3JlYXRlKElEQkN1cnNvcjo6 Y3JlYXRlKGJhY2tlbmQsIHRoaXMsIG1fc291cmNlLmdldCgpLCBtX3RyYW5zYWN0aW9uLmdldCgp KSk7CisgICAgICAgIG1fcmVzdWx0ID0gSURCQW55OjpjcmVhdGUoSURCQ3Vyc29yOjpjcmVhdGUo YmFja2VuZCwgdGhpcywgbV9zb3VyY2UuZ2V0KCksIG1fdHJhbnNhY3Rpb24uZ2V0KCksIGtleSwg cHJpbWFyeUtleSwgMCkpOwogICAgIGVsc2UKLSAgICAgICAgbV9yZXN1bHQgPSBJREJBbnk6OmNy ZWF0ZShJREJDdXJzb3JXaXRoVmFsdWU6OmNyZWF0ZShiYWNrZW5kLCB0aGlzLCBtX3NvdXJjZS5n ZXQoKSwgbV90cmFuc2FjdGlvbi5nZXQoKSkpOworICAgICAgICBtX3Jlc3VsdCA9IElEQkFueTo6 Y3JlYXRlKElEQkN1cnNvcldpdGhWYWx1ZTo6Y3JlYXRlKGJhY2tlbmQsIHRoaXMsIG1fc291cmNl LmdldCgpLCBtX3RyYW5zYWN0aW9uLmdldCgpLCBrZXksIHByaW1hcnlLZXksIHZhbHVlKSk7CiAg ICAgZW5xdWV1ZUV2ZW50KGNyZWF0ZVN1Y2Nlc3NFdmVudCgpKTsKIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvc3RvcmFnZS9JREJSZXF1ZXN0LmggYi9Tb3VyY2UvV2ViQ29yZS9zdG9y YWdlL0lEQlJlcXVlc3QuaAppbmRleCA5MDBkZjAxNzI5ZmU3OGY0NjRhYzI1NDMzMzQ0MzYyMGYw YWVlNTAzLi43YjJjZGJlNjc3NWVlZGMxYWIyOTEwZTJjMGY2NmI3YTJhM2ZhYWFlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL0lEQlJlcXVlc3QuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9zdG9yYWdlL0lEQlJlcXVlc3QuaApAQCAtNzUsNyArNzUsNyBAQCBwdWJsaWM6CiAgICAg Ly8gSURCQ2FsbGJhY2tzCiAgICAgdmlydHVhbCB2b2lkIG9uRXJyb3IoUGFzc1JlZlB0cjxJREJE YXRhYmFzZUVycm9yPik7CiAgICAgdmlydHVhbCB2b2lkIG9uU3VjY2VzcyhQYXNzUmVmUHRyPElE QkRhdGFiYXNlQmFja2VuZEludGVyZmFjZT4pOwotICAgIHZpcnR1YWwgdm9pZCBvblN1Y2Nlc3Mo UGFzc1JlZlB0cjxJREJDdXJzb3JCYWNrZW5kSW50ZXJmYWNlPik7CisgICAgdmlydHVhbCB2b2lk IG9uU3VjY2VzcyhQYXNzUmVmUHRyPElEQkN1cnNvckJhY2tlbmRJbnRlcmZhY2U+LCBQYXNzUmVm UHRyPElEQktleT4sIFBhc3NSZWZQdHI8SURCS2V5PiwgUGFzc1JlZlB0cjxTZXJpYWxpemVkU2Ny aXB0VmFsdWU+KTsKICAgICB2aXJ0dWFsIHZvaWQgb25TdWNjZXNzKFBhc3NSZWZQdHI8SURCS2V5 Pik7CiAgICAgdmlydHVhbCB2b2lkIG9uU3VjY2VzcyhQYXNzUmVmUHRyPElEQlRyYW5zYWN0aW9u QmFja2VuZEludGVyZmFjZT4pOwogICAgIHZpcnR1YWwgdm9pZCBvblN1Y2Nlc3MoUGFzc1JlZlB0 cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg NzNkM2VjM2RiYzA3ZWE1NTIyMDVhZjM0MDE2MWI1ZWE5NGE4NTVlNi4uMWVkYzZiMjY1YzdmZGE5 MWE5MDdiZGFkNTgzYTYxYmY4NGQ5MmUxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxOSBAQAorMjAxMS0wOS0wNiAgRGF2aWQgR3JvZ2FuICA8ZGdyb2dhbkBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgQ29uc29saWRhdGUga2V5LCBwcmltYXJ5IGtleSwgdmFsdWUgY3Vy c29yIG1lc3NhZ2VzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9Njc2NjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHB1YmxpYy9XZWJJREJDYWxsYmFja3MuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViSURC Q2FsbGJhY2tzOjpvblN1Y2Nlc3MpOgorICAgICAgICAqIHNyYy9JREJDYWxsYmFja3NQcm94eS5j cHA6CisgICAgICAgIChXZWJLaXQ6OklEQkNhbGxiYWNrc1Byb3h5OjpvblN1Y2Nlc3MpOgorICAg ICAgICAqIHNyYy9JREJDYWxsYmFja3NQcm94eS5oOgorICAgICAgICAqIHNyYy9XZWJJREJDYWxs YmFja3NJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViSURCQ2FsbGJhY2tzSW1wbDo6b25T dWNjZXNzKToKKyAgICAgICAgKiBzcmMvV2ViSURCQ2FsbGJhY2tzSW1wbC5oOgorCiAyMDExLTA5 LTA0ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0Nocm9taXVt XSBBZGQgbXV0bGlwbGUgdG8gV2ViUG9wdXBNZW51SW5mbyBmb3IgQW5kcm9pZApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSURCQ2FsbGJhY2tzLmggYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJREJDYWxsYmFja3MuaAppbmRleCBhNjQ0OGI0 ZjI3NmU4NzcxZDU3ZjU3OGY0Nzk0ZDA5OTdkODJiMGFlLi4xMDZmYTVhYmZmMDM0YWRkMGNhYjI3 YzgyZjI0NzM5Yjk5Yjc5Yzc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJJREJDYWxsYmFja3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJJREJDYWxsYmFja3MuaApAQCAtNDYsNyArNDYsNyBAQCBwdWJsaWM6CiAgICAgLy8gRm9y IGNsYXNzZXMgdGhhdCBmb2xsb3cgdGhlIFBJbXBsIHBhdHRlcm4sIHBhc3MgYSBjb25zdCByZWZl cmVuY2UuCiAgICAgLy8gRm9yIHRoZSByZXN0LCBwYXNzIG93bmVyc2hpcCB0byB0aGUgY2FsbGVl IHZpYSBhIHBvaW50ZXIuCiAgICAgdmlydHVhbCB2b2lkIG9uRXJyb3IoY29uc3QgV2ViSURCRGF0 YWJhc2VFcnJvciYpIHsgV0VCS0lUX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOyB9Ci0gICAgdmlydHVh bCB2b2lkIG9uU3VjY2VzcyhXZWJJREJDdXJzb3IqKSB7IFdFQktJVF9BU1NFUlRfTk9UX1JFQUNI RUQoKTsgfQorICAgIHZpcnR1YWwgdm9pZCBvblN1Y2Nlc3MoV2ViSURCQ3Vyc29yKiwgY29uc3Qg V2ViSURCS2V5JiwgY29uc3QgV2ViSURCS2V5JiwgY29uc3QgV2ViU2VyaWFsaXplZFNjcmlwdFZh bHVlJikgeyBXRUJLSVRfQVNTRVJUX05PVF9SRUFDSEVEKCk7IH0KICAgICB2aXJ0dWFsIHZvaWQg b25TdWNjZXNzKFdlYklEQkRhdGFiYXNlKikgeyBXRUJLSVRfQVNTRVJUX05PVF9SRUFDSEVEKCk7 IH0KICAgICB2aXJ0dWFsIHZvaWQgb25TdWNjZXNzKGNvbnN0IFdlYklEQktleSYpIHsgV0VCS0lU X0FTU0VSVF9OT1RfUkVBQ0hFRCgpOyB9CiAgICAgdmlydHVhbCB2b2lkIG9uU3VjY2VzcyhXZWJJ REJUcmFuc2FjdGlvbiopIHsgV0VCS0lUX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOyB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9JREJDYWxsYmFja3NQcm94eS5jcHAgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9JREJDYWxsYmFja3NQcm94eS5jcHAKaW5kZXggYzUz NmMzOGRhYzE1OWE2ZDU4ZTBhNjNkZDUyNWQzNjY1Y2QyM2IxZS4uMTlmZWNlNTg2NTQ1YjZlNWQ1 Yjc3ODkxMjhhM2U2YTIxOWI5MWIzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvSURCQ2FsbGJhY2tzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL0lEQkNhbGxiYWNrc1Byb3h5LmNwcApAQCAtNjQsOSArNjQsMTMgQEAgdm9pZCBJREJDYWxs YmFja3NQcm94eTo6b25FcnJvcihQYXNzUmVmUHRyPElEQkRhdGFiYXNlRXJyb3I+IGlkYkRhdGFi YXNlRXJyb3IpCiAgICAgbV9jYWxsYmFja3MtPm9uRXJyb3IoV2ViSURCRGF0YWJhc2VFcnJvcihp ZGJEYXRhYmFzZUVycm9yKSk7CiB9CiAKK3ZvaWQgSURCQ2FsbGJhY2tzUHJveHk6Om9uU3VjY2Vz cyhQYXNzUmVmUHRyPElEQkN1cnNvckJhY2tlbmRJbnRlcmZhY2U+IGlkYkN1cnNvckJhY2tlbmQs IFBhc3NSZWZQdHI8SURCS2V5PiBrZXksIFBhc3NSZWZQdHI8SURCS2V5PiBwcmltYXJ5S2V5LCBQ YXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gdmFsdWUpCit7CisgICAgbV9jYWxsYmFj a3MtPm9uU3VjY2VzcyhuZXcgV2ViSURCQ3Vyc29ySW1wbChpZGJDdXJzb3JCYWNrZW5kKSwga2V5 LCBwcmltYXJ5S2V5LCB2YWx1ZSk7Cit9CisKIHZvaWQgSURCQ2FsbGJhY2tzUHJveHk6Om9uU3Vj Y2VzcyhQYXNzUmVmUHRyPElEQkN1cnNvckJhY2tlbmRJbnRlcmZhY2U+IGlkYkN1cnNvckJhY2tl bmQpCiB7Ci0gICAgbV9jYWxsYmFja3MtPm9uU3VjY2VzcyhuZXcgV2ViSURCQ3Vyc29ySW1wbChp ZGJDdXJzb3JCYWNrZW5kKSk7CiB9CiAKIHZvaWQgSURCQ2FsbGJhY2tzUHJveHk6Om9uU3VjY2Vz cyhQYXNzUmVmUHRyPElEQkRhdGFiYXNlQmFja2VuZEludGVyZmFjZT4gYmFja2VuZCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0lEQkNhbGxiYWNrc1Byb3h5LmggYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9JREJDYWxsYmFja3NQcm94eS5oCmluZGV4IGU5ZjQ1 ZmY1Y2YxMjQ0ODEyMDVmN2ZmYTAxMmRiNDRjOTZiZTQ0MTIuLjM5MDI0ZTMwMzhjMmU1NmRjZDAx MmE3ZjVmMzc5ZmZjZWUxNjljYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL0lEQkNhbGxiYWNrc1Byb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv SURCQ2FsbGJhY2tzUHJveHkuaApAQCAtNDcsNiArNDcsNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0 dWFsIHZvaWQgb25FcnJvcihQYXNzUmVmUHRyPFdlYkNvcmU6OklEQkRhdGFiYXNlRXJyb3I+KTsK ICAgICB2aXJ0dWFsIHZvaWQgb25TdWNjZXNzKFBhc3NSZWZQdHI8V2ViQ29yZTo6SURCQ3Vyc29y QmFja2VuZEludGVyZmFjZT4pOworICAgIHZpcnR1YWwgdm9pZCBvblN1Y2Nlc3MoUGFzc1JlZlB0 cjxXZWJDb3JlOjpJREJDdXJzb3JCYWNrZW5kSW50ZXJmYWNlPiwgUGFzc1JlZlB0cjxXZWJDb3Jl OjpJREJLZXk+LCBQYXNzUmVmUHRyPFdlYkNvcmU6OklEQktleT4sIFBhc3NSZWZQdHI8V2ViQ29y ZTo6U2VyaWFsaXplZFNjcmlwdFZhbHVlPik7CiAgICAgdmlydHVhbCB2b2lkIG9uU3VjY2VzcyhQ YXNzUmVmUHRyPFdlYkNvcmU6OklEQkRhdGFiYXNlQmFja2VuZEludGVyZmFjZT4pOwogICAgIHZp cnR1YWwgdm9pZCBvblN1Y2Nlc3MoUGFzc1JlZlB0cjxXZWJDb3JlOjpJREJLZXk+KTsKICAgICB2 aXJ0dWFsIHZvaWQgb25TdWNjZXNzKFBhc3NSZWZQdHI8V2ViQ29yZTo6SURCVHJhbnNhY3Rpb25C YWNrZW5kSW50ZXJmYWNlPik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJJREJDYWxsYmFja3NJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YklEQkNhbGxiYWNrc0ltcGwuY3BwCmluZGV4IDNlNGFiNTBjMjc3OWM2ZWU0MjA4NTMxOTNmYjdk OGRiMzk3ZWJjN2MuLjZiZTU1YTA1ODFlYzM1ZTkyZTk0OTljMDRiYzE5ZDIxYmFiODcwNTEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklEQkNhbGxiYWNrc0ltcGwu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklEQkNhbGxiYWNrc0ltcGwu Y3BwCkBAIC01OSw5ICs1OSw5IEBAIHZvaWQgV2ViSURCQ2FsbGJhY2tzSW1wbDo6b25FcnJvcihj b25zdCBXZWJJREJEYXRhYmFzZUVycm9yJiBlcnJvcikKICAgICBtX2NhbGxiYWNrcy0+b25FcnJv cihlcnJvcik7CiB9CiAKLXZvaWQgV2ViSURCQ2FsbGJhY2tzSW1wbDo6b25TdWNjZXNzKFdlYklE QkN1cnNvciogY3Vyc29yKQordm9pZCBXZWJJREJDYWxsYmFja3NJbXBsOjpvblN1Y2Nlc3MoV2Vi SURCQ3Vyc29yKiBjdXJzb3IsIGNvbnN0IFdlYklEQktleSYga2V5LCBjb25zdCBXZWJJREJLZXkm IHByaW1hcnlLZXksIGNvbnN0IFdlYlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSYgc2VyaWFsaXplZFNj cmlwdFZhbHVlKQogewotICAgIG1fY2FsbGJhY2tzLT5vblN1Y2Nlc3MoSURCQ3Vyc29yQmFja2Vu ZFByb3h5OjpjcmVhdGUoYWRvcHRQdHIoY3Vyc29yKSkpOworICAgIG1fY2FsbGJhY2tzLT5vblN1 Y2Nlc3MoSURCQ3Vyc29yQmFja2VuZFByb3h5OjpjcmVhdGUoYWRvcHRQdHIoY3Vyc29yKSksIGtl eSwgcHJpbWFyeUtleSwgc2VyaWFsaXplZFNjcmlwdFZhbHVlKTsKIH0KIAogdm9pZCBXZWJJREJD YWxsYmFja3NJbXBsOjpvblN1Y2Nlc3MoV2ViSURCRGF0YWJhc2UqIHdlYktpdEluc3RhbmNlKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSURCQ2FsbGJhY2tzSW1w bC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSURCQ2FsbGJhY2tzSW1wbC5oCmlu ZGV4IGM0ODY2MDEyZGJjOTA5MjBiNjM2NzU4ZDI4YWViMWFhYzMxZGJlZWQuLmNhM2MwMGQxODcy MTFhMzYyZTFjZGJlNDc5MTg1NDMwZWFmMDFmYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYklEQkNhbGxiYWNrc0ltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJJREJDYWxsYmFja3NJbXBsLmgKQEAgLTQyLDcgKzQyLDcgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgfldlYklEQkNhbGxiYWNrc0ltcGwoKTsKIAogICAgIHZpcnR1YWwgdm9p ZCBvbkVycm9yKGNvbnN0IFdlYklEQkRhdGFiYXNlRXJyb3ImKTsKLSAgICB2aXJ0dWFsIHZvaWQg b25TdWNjZXNzKFdlYklEQkN1cnNvciopOworICAgIHZpcnR1YWwgdm9pZCBvblN1Y2Nlc3MoV2Vi SURCQ3Vyc29yKiwgY29uc3QgV2ViSURCS2V5JiwgY29uc3QgV2ViSURCS2V5JiBwcmltYXJ5S2V5 LCBjb25zdCBXZWJTZXJpYWxpemVkU2NyaXB0VmFsdWUmKTsKICAgICB2aXJ0dWFsIHZvaWQgb25T dWNjZXNzKFdlYklEQkRhdGFiYXNlKik7CiAgICAgdmlydHVhbCB2b2lkIG9uU3VjY2Vzcyhjb25z dCBXZWJJREJLZXkmKTsKICAgICB2aXJ0dWFsIHZvaWQgb25TdWNjZXNzKFdlYklEQlRyYW5zYWN0 aW9uKik7Cg==