84285 2012-04-18 14:54:03 -0700 IndexedDB: remove IDB(Index|ObjectStore)BackendImpl::get/getKey for IDBKey 2012-04-23 18:50:36 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 83638 1 alecflett alecflett abarth dglazkov fishd jamesr jsbell tkent+wkapi webkit.review.bot oldest_to_newest 605124 0 alecflett 2012-04-18 14:54:03 -0700 once bug 83638 is fixed, we'll be able to remove the backend support for get/getKey with just an IDBKey, since everything is now implemented in terms of an IDBKeyRange 608013 1 138425 alecflett 2012-04-23 14:18:26 -0700 Created attachment 138425 Patch 608015 2 alecflett 2012-04-23 14:20:17 -0700 This is purely code removal... ojan@ - r? cq? 608017 3 webkit.review.bot 2012-04-23 14:21:31 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 608020 4 138425 dglazkov 2012-04-23 14:28:52 -0700 Comment on attachment 138425 Patch delete code? delicious! Are you sure this won't bomb? :) 608289 5 138425 webkit.review.bot 2012-04-23 18:50:24 -0700 Comment on attachment 138425 Patch Clearing flags on attachment: 138425 Committed r114981: <http://trac.webkit.org/changeset/114981> 608290 6 webkit.review.bot 2012-04-23 18:50:36 -0700 All reviewed patches have been landed. Closing bug. 138425 2012-04-23 14:18:26 -0700 2012-04-23 18:50:23 -0700 Patch bug-84285-20120423141825.patch text/plain 17395 alecflett U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0OTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjBmODYxNzdiNWM3N2Qy NzIwNDMyODI0ZTVjNjljM2RlMjY2ODg1OS4uMGI0YjljYTIxZWFlMjRiM2I5MzQ3YTVjMWNhNjJk ZWZhZDE0MTE1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA0LTIzICBBbGVj IEZsZXR0ICA8YWxlY2ZsZXR0QGNocm9taXVtLm9yZz4KKworICAgICAgICBJbmRleGVkREI6IHJl bW92ZSBJREIoSW5kZXh8T2JqZWN0U3RvcmUpQmFja2VuZEltcGw6OmdldC9nZXRLZXkgZm9yIElE QktleQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQy ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBu ZXcgdGVzdHMgcmVxdWlyZWQsIHRoaXMgY29kZSBpcyBubyBsb25nZXIgY2FsbGVkLgorCisgICAg ICAgIFRoaXMgaXMgb2xkIGNvZGUgc3VwcG9ydGluZyBJREJLZXktYmFzZWQgbG9va3VwLCBzdXBw bGFudGVkIGJ5CisgICAgICAgIElEQktleVJhbmdlLiBOb3cgdGhhdCBjaHJvbWl1bSBJUEMvcHJv eHkgY29kZSBoYXMgbGFuZGVkLAorICAgICAgICB0aGVzZSBmdW5jdGlvbnMgY2FuIGJlIHJlbW92 ZWQuCisKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJJbmRleEJhY2tlbmRJbnRlcmZh Y2UuaDoKKyAgICAgICAgKElEQkluZGV4QmFja2VuZEludGVyZmFjZSk6CisgICAgICAgICogTW9k dWxlcy9pbmRleGVkZGIvSURCT2JqZWN0U3RvcmVCYWNrZW5kSW50ZXJmYWNlLmg6CisgICAgICAg IChJREJPYmplY3RTdG9yZUJhY2tlbmRJbnRlcmZhY2UpOgorCiAyMDEyLTA0LTIzICBNaWNoYcWC IFBha3XFgmEgdmVsIFJ1dGthICA8bS5wYWt1bGFAc2Ftc3VuZy5jb20+CiAgICAgICAgIFtFRkxd W1dLMl0gRml4IGJ1aWxkIGJyZWFrIHdoZW4gbm9uLWNyb3NzIHBsYXRmb3JtIENPTlRFWFRfTUVO VVMgYXJlIGVuYWJsZWQuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04NDEzNgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA1M2Y3OGZjNGQxOWFj ZGQzMzE0Y2VhNWM2MDA1NDM0Nzk2MjA5ZWRkLi5mOGViZTQ4N2FlMmEzMDlhMWQ1ZmI5MmZlMGIx MWU4MjhkODYwNzc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBA CisyMDEyLTA0LTIzICBBbGVjIEZsZXR0ICA8YWxlY2ZsZXR0QGNocm9taXVtLm9yZz4KKworICAg ICAgICBJbmRleGVkREI6IHJlbW92ZSBJREIoSW5kZXh8T2JqZWN0U3RvcmUpQmFja2VuZEltcGw6 OmdldC9nZXRLZXkgZm9yIElEQktleQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODQyODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGlzIGlzIG9sZCBjb2RlIHN1cHBvcnRpbmcgSURCS2V5LWJhc2VkIGxv b2t1cCwgc3VwcGxhbnRlZCBieQorICAgICAgICBJREJLZXlSYW5nZS4gTm93IHRoYXQgY2hyb21p dW0gSVBDL3Byb3h5IGNvZGUgaGFzIGxhbmRlZCwKKyAgICAgICAgdGhlc2UgZnVuY3Rpb25zIGNh biBiZSByZW1vdmVkLgorCisgICAgICAgICogcHVibGljL1dlYklEQkluZGV4Lmg6CisgICAgICAg ICogcHVibGljL1dlYklEQk9iamVjdFN0b3JlLmg6CisgICAgICAgICogc3JjL0lEQkluZGV4QmFj a2VuZFByb3h5LmNwcDoKKyAgICAgICAgKiBzcmMvSURCSW5kZXhCYWNrZW5kUHJveHkuaDoKKyAg ICAgICAgKElEQkluZGV4QmFja2VuZFByb3h5KToKKyAgICAgICAgKiBzcmMvSURCT2JqZWN0U3Rv cmVCYWNrZW5kUHJveHkuY3BwOgorICAgICAgICAqIHNyYy9JREJPYmplY3RTdG9yZUJhY2tlbmRQ cm94eS5oOgorICAgICAgICAoSURCT2JqZWN0U3RvcmVCYWNrZW5kUHJveHkpOgorICAgICAgICAq IHNyYy9XZWJJREJJbmRleEltcGwuY3BwOgorICAgICAgICAqIHNyYy9XZWJJREJJbmRleEltcGwu aDoKKyAgICAgICAgKFdlYklEQkluZGV4SW1wbCk6CisgICAgICAgICogc3JjL1dlYklEQk9iamVj dFN0b3JlSW1wbC5jcHA6CisgICAgICAgICogc3JjL1dlYklEQk9iamVjdFN0b3JlSW1wbC5oOgor ICAgICAgICAoV2ViSURCT2JqZWN0U3RvcmVJbXBsKToKKwogMjAxMi0wNC0yMyAgSWFuIFZvbGxp Y2sgIDx2b2xsaWNrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIFdoZW4gcHJl cGFyZVRvRHJhdyBmYWlscyBkdWUgdG8gYW5pbWF0aW9uIGNoZWNrZXJib2FyZCwgd2UgbmVlZCB0 byBjYWxsIHNldE5lZWRzQ29tbWl0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2luZGV4ZWRkYi9JREJJbmRleEJhY2tlbmRJbnRlcmZhY2UuaCBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvaW5kZXhlZGRiL0lEQkluZGV4QmFja2VuZEludGVyZmFjZS5oCmluZGV4IDcwYTM3MTEy ZmI3MDE3N2NiMjQ4YmQxN2M0ZDM2Y2ViYjc4NTk4ZWYuLjgxMjcwYWU0YTk4YTlkNmIwYjU2OGFj MGQ5MDY2ZDhhNDY0NmFiNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL0lEQkluZGV4QmFja2VuZEludGVyZmFjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvaW5kZXhlZGRiL0lEQkluZGV4QmFja2VuZEludGVyZmFjZS5oCkBAIC01NSw5ICs1NSw3 IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgY291bnQoUGFzc1JlZlB0cjxJREJLZXlSYW5n ZT4sIFBhc3NSZWZQdHI8SURCQ2FsbGJhY2tzPiwgSURCVHJhbnNhY3Rpb25CYWNrZW5kSW50ZXJm YWNlKiwgRXhjZXB0aW9uQ29kZSYpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgb3BlbktleUN1cnNv cihQYXNzUmVmUHRyPElEQktleVJhbmdlPiwgdW5zaWduZWQgc2hvcnQgZGlyZWN0aW9uLCBQYXNz UmVmUHRyPElEQkNhbGxiYWNrcz4sIElEQlRyYW5zYWN0aW9uQmFja2VuZEludGVyZmFjZSosIEV4 Y2VwdGlvbkNvZGUmKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGdldChQYXNzUmVmUHRyPElEQktl eVJhbmdlPiwgUGFzc1JlZlB0cjxJREJDYWxsYmFja3M+LCBJREJUcmFuc2FjdGlvbkJhY2tlbmRJ bnRlcmZhY2UqLCBFeGNlcHRpb25Db2RlJikgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBnZXQoUGFz c1JlZlB0cjxJREJLZXk+LCBQYXNzUmVmUHRyPElEQkNhbGxiYWNrcz4sIElEQlRyYW5zYWN0aW9u QmFja2VuZEludGVyZmFjZSosIEV4Y2VwdGlvbkNvZGUmKSA9IDA7CiAgICAgdmlydHVhbCB2b2lk IGdldEtleShQYXNzUmVmUHRyPElEQktleVJhbmdlPiwgUGFzc1JlZlB0cjxJREJDYWxsYmFja3M+ LCBJREJUcmFuc2FjdGlvbkJhY2tlbmRJbnRlcmZhY2UqLCBFeGNlcHRpb25Db2RlJikgPSAwOwot ICAgIHZpcnR1YWwgdm9pZCBnZXRLZXkoUGFzc1JlZlB0cjxJREJLZXk+LCBQYXNzUmVmUHRyPElE QkNhbGxiYWNrcz4sIElEQlRyYW5zYWN0aW9uQmFja2VuZEludGVyZmFjZSosIEV4Y2VwdGlvbkNv ZGUmKSA9IDA7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZUJhY2tlbmRJbnRlcmZh Y2UuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQk9iamVjdFN0b3JlQmFj a2VuZEludGVyZmFjZS5oCmluZGV4IDhkZGE2YmE2NmEwNjAxZGMyODk4NWM5MmZiMzYzZjkxOTVk M2I5ZTQuLmFlNjRhNWVmNmVlMGE1MTQ2YTRlMTRiZWVmNjMyMmQ1NTg1NjAwZTAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQk9iamVjdFN0b3JlQmFja2Vu ZEludGVyZmFjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQk9i amVjdFN0b3JlQmFja2VuZEludGVyZmFjZS5oCkBAIC01Miw3ICs1Miw2IEBAIHB1YmxpYzoKICAg ICB2aXJ0dWFsIFBhc3NSZWZQdHI8RE9NU3RyaW5nTGlzdD4gaW5kZXhOYW1lcygpIGNvbnN0ID0g MDsKIAogICAgIHZpcnR1YWwgdm9pZCBnZXQoUGFzc1JlZlB0cjxJREJLZXlSYW5nZT4sIFBhc3NS ZWZQdHI8SURCQ2FsbGJhY2tzPiwgSURCVHJhbnNhY3Rpb25CYWNrZW5kSW50ZXJmYWNlKiwgRXhj ZXB0aW9uQ29kZSYpID0gMDsKLSAgICB2aXJ0dWFsIHZvaWQgZ2V0KFBhc3NSZWZQdHI8SURCS2V5 PiwgUGFzc1JlZlB0cjxJREJDYWxsYmFja3M+LCBJREJUcmFuc2FjdGlvbkJhY2tlbmRJbnRlcmZh Y2UqLCBFeGNlcHRpb25Db2RlJikgPSAwOwogCiAgICAgZW51bSBQdXRNb2RlIHsKICAgICAgICAg QWRkT3JVcGRhdGUsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJJREJJbmRleC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSURCSW5kZXgu aAppbmRleCA1ZmU4YjdmMDhmNmY0NTcyNTAyNGIyODY4ZGY0NTAzOWMwM2M5MTg1Li5kNTcyNDNl OWRmOTNhNWMxYWZlNmIwMDVkZDk4NGZiZjZkMzA5YWZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJREJJbmRleC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYklEQkluZGV4LmgKQEAgLTc3LDkgKzc3LDcgQEAgcHVibGljOgogICAg IHZpcnR1YWwgdm9pZCBvcGVuS2V5Q3Vyc29yKGNvbnN0IFdlYklEQktleVJhbmdlJiwgdW5zaWdu ZWQgc2hvcnQgZGlyZWN0aW9uLCBXZWJJREJDYWxsYmFja3MqLCBjb25zdCBXZWJJREJUcmFuc2Fj dGlvbiYsIFdlYkV4Y2VwdGlvbkNvZGUmKSB7IFdFQktJVF9BU1NFUlRfTk9UX1JFQUNIRUQoKTsg fQogICAgIHZpcnR1YWwgdm9pZCBjb3VudChjb25zdCBXZWJJREJLZXlSYW5nZSYsIFdlYklEQkNh bGxiYWNrcyosIGNvbnN0IFdlYklEQlRyYW5zYWN0aW9uJiwgV2ViRXhjZXB0aW9uQ29kZSYpIHsg V0VCS0lUX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOyB9CiAgICAgdmlydHVhbCB2b2lkIGdldE9iamVj dChjb25zdCBXZWJJREJLZXlSYW5nZSYsIFdlYklEQkNhbGxiYWNrcyosIGNvbnN0IFdlYklEQlRy YW5zYWN0aW9uJiwgV2ViRXhjZXB0aW9uQ29kZSYpIHsgV0VCS0lUX0FTU0VSVF9OT1RfUkVBQ0hF RCgpOyB9Ci0gICAgdmlydHVhbCB2b2lkIGdldE9iamVjdChjb25zdCBXZWJJREJLZXkmLCBXZWJJ REJDYWxsYmFja3MqLCBjb25zdCBXZWJJREJUcmFuc2FjdGlvbiYsIFdlYkV4Y2VwdGlvbkNvZGUm KSB7IFdFQktJVF9BU1NFUlRfTk9UX1JFQUNIRUQoKTsgfQogICAgIHZpcnR1YWwgdm9pZCBnZXRL ZXkoY29uc3QgV2ViSURCS2V5UmFuZ2UmLCBXZWJJREJDYWxsYmFja3MqLCBjb25zdCBXZWJJREJU cmFuc2FjdGlvbiYsIFdlYkV4Y2VwdGlvbkNvZGUmKSB7IFdFQktJVF9BU1NFUlRfTk9UX1JFQUNI RUQoKTsgfQotICAgIHZpcnR1YWwgdm9pZCBnZXRLZXkoY29uc3QgV2ViSURCS2V5JiwgV2ViSURC Q2FsbGJhY2tzKiwgY29uc3QgV2ViSURCVHJhbnNhY3Rpb24mLCBXZWJFeGNlcHRpb25Db2RlJikg eyBXRUJLSVRfQVNTRVJUX05PVF9SRUFDSEVEKCk7IH0KIAogcHJvdGVjdGVkOgogICAgIFdlYklE QkluZGV4KCkge30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl YklEQk9iamVjdFN0b3JlLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJREJP YmplY3RTdG9yZS5oCmluZGV4IGUyNmRmNTY3YmUxODkyYTM5ZjQyMmU1NDg0MGQwNzZjMzQ5YTVi YzAuLmQwNWFiNDk1ODE5ODllMzYyODNhMjYyM2E1MzYzNDAwNTRhM2I0ZTkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYklEQk9iamVjdFN0b3JlLmgKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSURCT2JqZWN0U3RvcmUuaApAQCAtNjUs OCArNjUsNiBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBXZWJET01TdHJpbmdMaXN0KCk7CiAg ICAgfQogCi0gICAgdmlydHVhbCB2b2lkIGdldChjb25zdCBXZWJJREJLZXkmLCBXZWJJREJDYWxs YmFja3MqLCBjb25zdCBXZWJJREJUcmFuc2FjdGlvbiYsIFdlYkV4Y2VwdGlvbkNvZGUmKSB7IFdF QktJVF9BU1NFUlRfTk9UX1JFQUNIRUQoKTsgfQotCiAgICAgdmlydHVhbCB2b2lkIGdldChjb25z dCBXZWJJREJLZXlSYW5nZSYsIFdlYklEQkNhbGxiYWNrcyosIGNvbnN0IFdlYklEQlRyYW5zYWN0 aW9uJiwgV2ViRXhjZXB0aW9uQ29kZSYpIHsgV0VCS0lUX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOyB9 CiAKICAgICBlbnVtIFB1dE1vZGUgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvSURCSW5kZXhCYWNrZW5kUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvSURCSW5kZXhCYWNrZW5kUHJveHkuY3BwCmluZGV4IGJmMGFjNzM3NzFjZGJhZTAzMWNkODU4 NjhkY2VlZDY0MDc0M2UxNWUuLjE3MTQ2YTVjYWQ2YjRkNWYxNGM0Zjg3YWMxMjVlYjlkYzMwMjQx NGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0lEQkluZGV4QmFja2Vu ZFByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9JREJJbmRleEJhY2tl bmRQcm94eS5jcHAKQEAgLTExMiwxNCArMTEyLDYgQEAgdm9pZCBJREJJbmRleEJhY2tlbmRQcm94 eTo6Z2V0KFBhc3NSZWZQdHI8SURCS2V5UmFuZ2U+IGtleVJhbmdlLCBQYXNzUmVmUHRyPElEQkMK ICAgICBtX3dlYklEQkluZGV4LT5nZXRPYmplY3Qoa2V5UmFuZ2UsIG5ldyBXZWJJREJDYWxsYmFj a3NJbXBsKGNhbGxiYWNrcyksICp0cmFuc2FjdGlvblByb3h5LT5nZXRXZWJJREJUcmFuc2FjdGlv bigpLCBlYyk7CiB9CiAKLXZvaWQgSURCSW5kZXhCYWNrZW5kUHJveHk6OmdldChQYXNzUmVmUHRy PElEQktleT4ga2V5LCBQYXNzUmVmUHRyPElEQkNhbGxiYWNrcz4gY2FsbGJhY2tzLCBJREJUcmFu c2FjdGlvbkJhY2tlbmRJbnRlcmZhY2UqIHRyYW5zYWN0aW9uLCBFeGNlcHRpb25Db2RlJiBlYykK LXsKLSAgICAvLyBUaGUgdHJhbnNhY3Rpb24gcG9pbnRlciBpcyBndWFyYW50ZWVkIHRvIGJlIGEg cG9pbnRlciB0byBhIHByb3h5IG9iamVjdCBhcywgaW4gdGhlIHJlbmRlcmVyLAotICAgIC8vIGFs bCBpbXBsZW1lbnRhdGlvbnMgb2YgSURCIGludGVyZmFjZXMgYXJlIHByb3h5IG9iamVjdHMuCi0g ICAgSURCVHJhbnNhY3Rpb25CYWNrZW5kUHJveHkqIHRyYW5zYWN0aW9uUHJveHkgPSBzdGF0aWNf Y2FzdDxJREJUcmFuc2FjdGlvbkJhY2tlbmRQcm94eSo+KHRyYW5zYWN0aW9uKTsKLSAgICBtX3dl YklEQkluZGV4LT5nZXRPYmplY3Qoa2V5LCBuZXcgV2ViSURCQ2FsbGJhY2tzSW1wbChjYWxsYmFj a3MpLCAqdHJhbnNhY3Rpb25Qcm94eS0+Z2V0V2ViSURCVHJhbnNhY3Rpb24oKSwgZWMpOwotfQot CiB2b2lkIElEQkluZGV4QmFja2VuZFByb3h5OjpnZXRLZXkoUGFzc1JlZlB0cjxJREJLZXlSYW5n ZT4ga2V5UmFuZ2UsIFBhc3NSZWZQdHI8SURCQ2FsbGJhY2tzPiBjYWxsYmFja3MsIElEQlRyYW5z YWN0aW9uQmFja2VuZEludGVyZmFjZSogdHJhbnNhY3Rpb24sIEV4Y2VwdGlvbkNvZGUmIGVjKQog ewogICAgIC8vIFRoZSB0cmFuc2FjdGlvbiBwb2ludGVyIGlzIGd1YXJhbnRlZWQgdG8gYmUgYSBw b2ludGVyIHRvIGEgcHJveHkgb2JqZWN0IGFzLCBpbiB0aGUgcmVuZGVyZXIsCkBAIC0xMjgsMTQg KzEyMCw2IEBAIHZvaWQgSURCSW5kZXhCYWNrZW5kUHJveHk6OmdldEtleShQYXNzUmVmUHRyPElE QktleVJhbmdlPiBrZXlSYW5nZSwgUGFzc1JlZlB0cjxJCiAgICAgbV93ZWJJREJJbmRleC0+Z2V0 S2V5KGtleVJhbmdlLCBuZXcgV2ViSURCQ2FsbGJhY2tzSW1wbChjYWxsYmFja3MpLCAqdHJhbnNh Y3Rpb25Qcm94eS0+Z2V0V2ViSURCVHJhbnNhY3Rpb24oKSwgZWMpOwogfQogCi12b2lkIElEQklu ZGV4QmFja2VuZFByb3h5OjpnZXRLZXkoUGFzc1JlZlB0cjxJREJLZXk+IGtleSwgUGFzc1JlZlB0 cjxJREJDYWxsYmFja3M+IGNhbGxiYWNrcywgSURCVHJhbnNhY3Rpb25CYWNrZW5kSW50ZXJmYWNl KiB0cmFuc2FjdGlvbiwgRXhjZXB0aW9uQ29kZSYgZWMpCi17Ci0gICAgLy8gVGhlIHRyYW5zYWN0 aW9uIHBvaW50ZXIgaXMgZ3VhcmFudGVlZCB0byBiZSBhIHBvaW50ZXIgdG8gYSBwcm94eSBvYmpl Y3QgYXMsIGluIHRoZSByZW5kZXJlciwKLSAgICAvLyBhbGwgaW1wbGVtZW50YXRpb25zIG9mIElE QiBpbnRlcmZhY2VzIGFyZSBwcm94eSBvYmplY3RzLgotICAgIElEQlRyYW5zYWN0aW9uQmFja2Vu ZFByb3h5KiB0cmFuc2FjdGlvblByb3h5ID0gc3RhdGljX2Nhc3Q8SURCVHJhbnNhY3Rpb25CYWNr ZW5kUHJveHkqPih0cmFuc2FjdGlvbik7Ci0gICAgbV93ZWJJREJJbmRleC0+Z2V0S2V5KGtleSwg bmV3IFdlYklEQkNhbGxiYWNrc0ltcGwoY2FsbGJhY2tzKSwgKnRyYW5zYWN0aW9uUHJveHktPmdl dFdlYklEQlRyYW5zYWN0aW9uKCksIGVjKTsKLX0KLQogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAK ICNlbmRpZiAvLyBFTkFCTEUoSU5ERVhFRF9EQVRBQkFTRSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL0lEQkluZGV4QmFja2VuZFByb3h5LmggYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9JREJJbmRleEJhY2tlbmRQcm94eS5oCmluZGV4IDhlOTVhYWY2NTA2OWFl Y2U1OTAxYzcxNWNiYTJiYzY3OWE2OGExYmEuLjQyZTBlYWJiZWUxN2ExNjcwODc4ZjcwMDViMzA5 ZTViZDEyMDhjZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0lEQklu ZGV4QmFja2VuZFByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvSURCSW5k ZXhCYWNrZW5kUHJveHkuaApAQCAtNTEsOSArNTEsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2 b2lkIG9wZW5LZXlDdXJzb3IoUGFzc1JlZlB0cjxXZWJDb3JlOjpJREJLZXlSYW5nZT4sIHVuc2ln bmVkIHNob3J0IGRpcmVjdGlvbiwgUGFzc1JlZlB0cjxXZWJDb3JlOjpJREJDYWxsYmFja3M+LCBX ZWJDb3JlOjpJREJUcmFuc2FjdGlvbkJhY2tlbmRJbnRlcmZhY2UqLCBXZWJDb3JlOjpFeGNlcHRp b25Db2RlJik7CiAgICAgdmlydHVhbCB2b2lkIGNvdW50KFBhc3NSZWZQdHI8V2ViQ29yZTo6SURC S2V5UmFuZ2U+LCBQYXNzUmVmUHRyPFdlYkNvcmU6OklEQkNhbGxiYWNrcz4sIFdlYkNvcmU6OklE QlRyYW5zYWN0aW9uQmFja2VuZEludGVyZmFjZSosIFdlYkNvcmU6OkV4Y2VwdGlvbkNvZGUmKTsK ICAgICB2aXJ0dWFsIHZvaWQgZ2V0KFBhc3NSZWZQdHI8V2ViQ29yZTo6SURCS2V5UmFuZ2U+LCBQ YXNzUmVmUHRyPFdlYkNvcmU6OklEQkNhbGxiYWNrcz4sIFdlYkNvcmU6OklEQlRyYW5zYWN0aW9u QmFja2VuZEludGVyZmFjZSosIFdlYkNvcmU6OkV4Y2VwdGlvbkNvZGUmKTsKLSAgICB2aXJ0dWFs IHZvaWQgZ2V0KFBhc3NSZWZQdHI8V2ViQ29yZTo6SURCS2V5PiwgUGFzc1JlZlB0cjxXZWJDb3Jl OjpJREJDYWxsYmFja3M+LCBXZWJDb3JlOjpJREJUcmFuc2FjdGlvbkJhY2tlbmRJbnRlcmZhY2Uq LCBXZWJDb3JlOjpFeGNlcHRpb25Db2RlJik7CiAgICAgdmlydHVhbCB2b2lkIGdldEtleShQYXNz UmVmUHRyPFdlYkNvcmU6OklEQktleVJhbmdlPiwgUGFzc1JlZlB0cjxXZWJDb3JlOjpJREJDYWxs YmFja3M+LCBXZWJDb3JlOjpJREJUcmFuc2FjdGlvbkJhY2tlbmRJbnRlcmZhY2UqLCBXZWJDb3Jl OjpFeGNlcHRpb25Db2RlJik7Ci0gICAgdmlydHVhbCB2b2lkIGdldEtleShQYXNzUmVmUHRyPFdl YkNvcmU6OklEQktleT4sIFBhc3NSZWZQdHI8V2ViQ29yZTo6SURCQ2FsbGJhY2tzPiwgV2ViQ29y ZTo6SURCVHJhbnNhY3Rpb25CYWNrZW5kSW50ZXJmYWNlKiwgV2ViQ29yZTo6RXhjZXB0aW9uQ29k ZSYpOwogCiBwcml2YXRlOgogICAgIElEQkluZGV4QmFja2VuZFByb3h5KFBhc3NPd25QdHI8V2Vi SURCSW5kZXg+KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0lEQk9i amVjdFN0b3JlQmFja2VuZFByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0lE Qk9iamVjdFN0b3JlQmFja2VuZFByb3h5LmNwcAppbmRleCAwZDRlYjAwZDFlNDc4ZDYxZmIxMjJh ZTcxNjQ4YWYzMmVlOTQwY2RiLi45N2I2NGY0NmMzZDBmMmQ2MTAwZTNiNWM5YjY2NjVlNjlkMTBl YmQyIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9JREJPYmplY3RTdG9y ZUJhY2tlbmRQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvSURCT2Jq ZWN0U3RvcmVCYWNrZW5kUHJveHkuY3BwCkBAIC03NCwxNCArNzQsNiBAQCBQYXNzUmVmUHRyPERP TVN0cmluZ0xpc3Q+IElEQk9iamVjdFN0b3JlQmFja2VuZFByb3h5OjppbmRleE5hbWVzKCkgY29u c3QKICAgICByZXR1cm4gbV93ZWJJREJPYmplY3RTdG9yZS0+aW5kZXhOYW1lcygpOwogfQogCi12 b2lkIElEQk9iamVjdFN0b3JlQmFja2VuZFByb3h5OjpnZXQoUGFzc1JlZlB0cjxJREJLZXk+IGtl eSwgUGFzc1JlZlB0cjxJREJDYWxsYmFja3M+IGNhbGxiYWNrcywgSURCVHJhbnNhY3Rpb25CYWNr ZW5kSW50ZXJmYWNlKiB0cmFuc2FjdGlvbiwgRXhjZXB0aW9uQ29kZSYgZWMpCi17Ci0gICAgLy8g VGhlIHRyYW5zYWN0aW9uIHBvaW50ZXIgaXMgZ3VhcmFudGVlZCB0byBiZSBhIHBvaW50ZXIgdG8g YSBwcm94eSBvYmplY3QgYXMsIGluIHRoZSByZW5kZXJlciwKLSAgICAvLyBhbGwgaW1wbGVtZW50 YXRpb25zIG9mIElEQiBpbnRlcmZhY2VzIGFyZSBwcm94eSBvYmplY3RzLgotICAgIElEQlRyYW5z YWN0aW9uQmFja2VuZFByb3h5KiB0cmFuc2FjdGlvblByb3h5ID0gc3RhdGljX2Nhc3Q8SURCVHJh bnNhY3Rpb25CYWNrZW5kUHJveHkqPih0cmFuc2FjdGlvbik7Ci0gICAgbV93ZWJJREJPYmplY3RT dG9yZS0+Z2V0KGtleSwgbmV3IFdlYklEQkNhbGxiYWNrc0ltcGwoY2FsbGJhY2tzKSwgKnRyYW5z YWN0aW9uUHJveHktPmdldFdlYklEQlRyYW5zYWN0aW9uKCksIGVjKTsKLX0KLQogdm9pZCBJREJP YmplY3RTdG9yZUJhY2tlbmRQcm94eTo6Z2V0KFBhc3NSZWZQdHI8SURCS2V5UmFuZ2U+IGtleVJh bmdlLCBQYXNzUmVmUHRyPElEQkNhbGxiYWNrcz4gY2FsbGJhY2tzLCBJREJUcmFuc2FjdGlvbkJh Y2tlbmRJbnRlcmZhY2UqIHRyYW5zYWN0aW9uLCBFeGNlcHRpb25Db2RlJiBlYykKIHsKICAgICAv LyBUaGUgdHJhbnNhY3Rpb24gcG9pbnRlciBpcyBndWFyYW50ZWVkIHRvIGJlIGEgcG9pbnRlciB0 byBhIHByb3h5IG9iamVjdCBhcywgaW4gdGhlIHJlbmRlcmVyLApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvSURCT2JqZWN0U3RvcmVCYWNrZW5kUHJveHkuaCBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL0lEQk9iamVjdFN0b3JlQmFja2VuZFByb3h5LmgKaW5kZXgg NDk4MWQ5MDMzN2NhNmI0NjA2NjZlYWU3ZTczY2QyZWJlMGYyMzNkYy4uNWUxMTg5MTg2YWExZGEy YzE0YzU5OGQ4NjQyNDYyZWU3ZGQ0ZWNkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvSURCT2JqZWN0U3RvcmVCYWNrZW5kUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9JREJPYmplY3RTdG9yZUJhY2tlbmRQcm94eS5oCkBAIC00Niw3ICs0Niw2 IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIFN0cmluZyBrZXlQYXRoKCkgY29uc3Q7CiAgICAgdmly dHVhbCBQYXNzUmVmUHRyPFdlYkNvcmU6OkRPTVN0cmluZ0xpc3Q+IGluZGV4TmFtZXMoKSBjb25z dDsKIAotICAgIHZpcnR1YWwgdm9pZCBnZXQoUGFzc1JlZlB0cjxXZWJDb3JlOjpJREJLZXk+LCBQ YXNzUmVmUHRyPFdlYkNvcmU6OklEQkNhbGxiYWNrcz4sIFdlYkNvcmU6OklEQlRyYW5zYWN0aW9u QmFja2VuZEludGVyZmFjZSosIFdlYkNvcmU6OkV4Y2VwdGlvbkNvZGUmKTsKICAgICB2aXJ0dWFs IHZvaWQgZ2V0KFBhc3NSZWZQdHI8V2ViQ29yZTo6SURCS2V5UmFuZ2U+LCBQYXNzUmVmUHRyPFdl YkNvcmU6OklEQkNhbGxiYWNrcz4sIFdlYkNvcmU6OklEQlRyYW5zYWN0aW9uQmFja2VuZEludGVy ZmFjZSosIFdlYkNvcmU6OkV4Y2VwdGlvbkNvZGUmKTsKICAgICB2aXJ0dWFsIHZvaWQgcHV0KFBh c3NSZWZQdHI8V2ViQ29yZTo6U2VyaWFsaXplZFNjcmlwdFZhbHVlPiwgUGFzc1JlZlB0cjxXZWJD b3JlOjpJREJLZXk+LCBQdXRNb2RlLCBQYXNzUmVmUHRyPFdlYkNvcmU6OklEQkNhbGxiYWNrcz4s IFdlYkNvcmU6OklEQlRyYW5zYWN0aW9uQmFja2VuZEludGVyZmFjZSosIFdlYkNvcmU6OkV4Y2Vw dGlvbkNvZGUmKTsKICAgICB2aXJ0dWFsIHZvaWQgZGVsZXRlRnVuY3Rpb24oUGFzc1JlZlB0cjxX ZWJDb3JlOjpJREJLZXk+LCBQYXNzUmVmUHRyPFdlYkNvcmU6OklEQkNhbGxiYWNrcz4sIFdlYkNv cmU6OklEQlRyYW5zYWN0aW9uQmFja2VuZEludGVyZmFjZSosIFdlYkNvcmU6OkV4Y2VwdGlvbkNv ZGUmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklEQkluZGV4 SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJJbmRleEltcGwuY3Bw CmluZGV4IDA1NGI3MGE0M2ExZjU3YjBiMmUxY2RjMDAzNDVmNWNlMGFkOTQ1OGMuLjc1OTcwYTU3 NGNjOTg1ZmVhMzFjOGNmNWMyMDNjYTNiMzI3ZTk2N2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYklEQkluZGV4SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViSURCSW5kZXhJbXBsLmNwcApAQCAtODgsMjEgKzg4LDExIEBAIHZvaWQg V2ViSURCSW5kZXhJbXBsOjpjb3VudChjb25zdCBXZWJJREJLZXlSYW5nZSYga2V5UmFuZ2UsICBX ZWJJREJDYWxsYmFja3MqIGNhCiAgICAgbV9iYWNrZW5kLT5jb3VudChrZXlSYW5nZSwgSURCQ2Fs bGJhY2tzUHJveHk6OmNyZWF0ZShhZG9wdFB0cihjYWxsYmFja3MpKSwgdHJhbnNhY3Rpb24uZ2V0 SURCVHJhbnNhY3Rpb25CYWNrZW5kSW50ZXJmYWNlKCksIGVjKTsKIH0KIAotdm9pZCBXZWJJREJJ bmRleEltcGw6OmdldE9iamVjdChjb25zdCBXZWJJREJLZXkmIGtleSwgV2ViSURCQ2FsbGJhY2tz KiBjYWxsYmFja3MsIGNvbnN0IFdlYklEQlRyYW5zYWN0aW9uJiB0cmFuc2FjdGlvbiwgV2ViRXhj ZXB0aW9uQ29kZSYgZWMpCi17Ci0gICAgbV9iYWNrZW5kLT5nZXQoa2V5LCBJREJDYWxsYmFja3NQ cm94eTo6Y3JlYXRlKGFkb3B0UHRyKGNhbGxiYWNrcykpLCB0cmFuc2FjdGlvbi5nZXRJREJUcmFu c2FjdGlvbkJhY2tlbmRJbnRlcmZhY2UoKSwgZWMpOwotfQotCiB2b2lkIFdlYklEQkluZGV4SW1w bDo6Z2V0T2JqZWN0KGNvbnN0IFdlYklEQktleVJhbmdlJiBrZXlSYW5nZSwgV2ViSURCQ2FsbGJh Y2tzKiBjYWxsYmFja3MsIGNvbnN0IFdlYklEQlRyYW5zYWN0aW9uJiB0cmFuc2FjdGlvbiwgV2Vi RXhjZXB0aW9uQ29kZSYgZWMpCiB7CiAgICAgbV9iYWNrZW5kLT5nZXQoa2V5UmFuZ2UsIElEQkNh bGxiYWNrc1Byb3h5OjpjcmVhdGUoYWRvcHRQdHIoY2FsbGJhY2tzKSksIHRyYW5zYWN0aW9uLmdl dElEQlRyYW5zYWN0aW9uQmFja2VuZEludGVyZmFjZSgpLCBlYyk7CiB9CiAKLXZvaWQgV2ViSURC SW5kZXhJbXBsOjpnZXRLZXkoY29uc3QgV2ViSURCS2V5JiBrZXksIFdlYklEQkNhbGxiYWNrcyog Y2FsbGJhY2tzLCBjb25zdCBXZWJJREJUcmFuc2FjdGlvbiYgdHJhbnNhY3Rpb24sIFdlYkV4Y2Vw dGlvbkNvZGUmIGVjKQotewotICAgIG1fYmFja2VuZC0+Z2V0S2V5KGtleSwgSURCQ2FsbGJhY2tz UHJveHk6OmNyZWF0ZShhZG9wdFB0cihjYWxsYmFja3MpKSwgdHJhbnNhY3Rpb24uZ2V0SURCVHJh bnNhY3Rpb25CYWNrZW5kSW50ZXJmYWNlKCksIGVjKTsKLX0KLQogdm9pZCBXZWJJREJJbmRleElt cGw6OmdldEtleShjb25zdCBXZWJJREJLZXlSYW5nZSYga2V5UmFuZ2UsIFdlYklEQkNhbGxiYWNr cyogY2FsbGJhY2tzLCBjb25zdCBXZWJJREJUcmFuc2FjdGlvbiYgdHJhbnNhY3Rpb24sIFdlYkV4 Y2VwdGlvbkNvZGUmIGVjKQogewogICAgIG1fYmFja2VuZC0+Z2V0S2V5KGtleVJhbmdlLCBJREJD YWxsYmFja3NQcm94eTo6Y3JlYXRlKGFkb3B0UHRyKGNhbGxiYWNrcykpLCB0cmFuc2FjdGlvbi5n ZXRJREJUcmFuc2FjdGlvbkJhY2tlbmRJbnRlcmZhY2UoKSwgZWMpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSURCSW5kZXhJbXBsLmggYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJJREJJbmRleEltcGwuaAppbmRleCBmMzUzNmFhNTUxNGE5OWEzMjBj MDQ3M2RkNDUzMmI0YjkxM2E0N2I4Li5hMWQ0YWYzODk3MzBjYzMyMjEyMmE3M2NkY2VlYjU2MTky MWYyMmU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJJbmRl eEltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJJbmRleEltcGwu aApAQCAtNTIsOSArNTIsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIG9wZW5PYmplY3RD dXJzb3IoY29uc3QgV2ViSURCS2V5UmFuZ2UmLCB1bnNpZ25lZCBzaG9ydCBkaXJlY3Rpb24sIFdl YklEQkNhbGxiYWNrcyosIGNvbnN0IFdlYklEQlRyYW5zYWN0aW9uJiwgV2ViRXhjZXB0aW9uQ29k ZSYpOyAKICAgICB2aXJ0dWFsIHZvaWQgb3BlbktleUN1cnNvcihjb25zdCBXZWJJREJLZXlSYW5n ZSYsIHVuc2lnbmVkIHNob3J0IGRpcmVjdGlvbiwgV2ViSURCQ2FsbGJhY2tzKiwgY29uc3QgV2Vi SURCVHJhbnNhY3Rpb24mLCBXZWJFeGNlcHRpb25Db2RlJik7CiAgICAgdmlydHVhbCB2b2lkIGNv dW50KGNvbnN0IFdlYklEQktleVJhbmdlJiwgV2ViSURCQ2FsbGJhY2tzKiwgY29uc3QgV2ViSURC VHJhbnNhY3Rpb24mLCBXZWJFeGNlcHRpb25Db2RlJik7Ci0gICAgdmlydHVhbCB2b2lkIGdldE9i amVjdChjb25zdCBXZWJJREJLZXkmLCBXZWJJREJDYWxsYmFja3MqLCBjb25zdCBXZWJJREJUcmFu c2FjdGlvbiYsIFdlYkV4Y2VwdGlvbkNvZGUmKTsKICAgICB2aXJ0dWFsIHZvaWQgZ2V0T2JqZWN0 KGNvbnN0IFdlYklEQktleVJhbmdlJiwgV2ViSURCQ2FsbGJhY2tzKiwgY29uc3QgV2ViSURCVHJh bnNhY3Rpb24mLCBXZWJFeGNlcHRpb25Db2RlJik7Ci0gICAgdmlydHVhbCB2b2lkIGdldEtleShj b25zdCBXZWJJREJLZXkmLCBXZWJJREJDYWxsYmFja3MqLCBjb25zdCBXZWJJREJUcmFuc2FjdGlv biYsIFdlYkV4Y2VwdGlvbkNvZGUmKTsKICAgICB2aXJ0dWFsIHZvaWQgZ2V0S2V5KGNvbnN0IFdl YklEQktleVJhbmdlJiwgV2ViSURCQ2FsbGJhY2tzKiwgY29uc3QgV2ViSURCVHJhbnNhY3Rpb24m LCBXZWJFeGNlcHRpb25Db2RlJik7CiAKIHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJJREJPYmplY3RTdG9yZUltcGwuY3BwIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViSURCT2JqZWN0U3RvcmVJbXBsLmNwcAppbmRleCBiMzdlMmY1ZDVi ZjFkYTRkMjNjOTdhZGI0NDk5ZTQ1N2ZmZDRjOWFjLi45ZWQ3Mzk3ZjY5NmIxMThhOGY4NmZlNTk0 ZDFkMzU1NTllMWE5ZDIwIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJJREJPYmplY3RTdG9yZUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYklEQk9iamVjdFN0b3JlSW1wbC5jcHAKQEAgLTY3LDExICs2Nyw2IEBAIFdlYkRPTVN0cmlu Z0xpc3QgV2ViSURCT2JqZWN0U3RvcmVJbXBsOjppbmRleE5hbWVzKCkgY29uc3QKICAgICByZXR1 cm4gbV9vYmplY3RTdG9yZS0+aW5kZXhOYW1lcygpOwogfQogCi12b2lkIFdlYklEQk9iamVjdFN0 b3JlSW1wbDo6Z2V0KGNvbnN0IFdlYklEQktleSYga2V5LCBXZWJJREJDYWxsYmFja3MqIGNhbGxi YWNrcywgY29uc3QgV2ViSURCVHJhbnNhY3Rpb24mIHRyYW5zYWN0aW9uLCBXZWJFeGNlcHRpb25D b2RlJiBlYykKLXsKLSAgICBtX29iamVjdFN0b3JlLT5nZXQoa2V5LCBJREJDYWxsYmFja3NQcm94 eTo6Y3JlYXRlKGFkb3B0UHRyKGNhbGxiYWNrcykpLCB0cmFuc2FjdGlvbi5nZXRJREJUcmFuc2Fj dGlvbkJhY2tlbmRJbnRlcmZhY2UoKSwgZWMpOwotfQotCiB2b2lkIFdlYklEQk9iamVjdFN0b3Jl SW1wbDo6Z2V0KGNvbnN0IFdlYklEQktleVJhbmdlJiBrZXlSYW5nZSwgV2ViSURCQ2FsbGJhY2tz KiBjYWxsYmFja3MsIGNvbnN0IFdlYklEQlRyYW5zYWN0aW9uJiB0cmFuc2FjdGlvbiwgV2ViRXhj ZXB0aW9uQ29kZSYgZWMpCiB7CiAgICAgbV9vYmplY3RTdG9yZS0+Z2V0KGtleVJhbmdlLCBJREJD YWxsYmFja3NQcm94eTo6Y3JlYXRlKGFkb3B0UHRyKGNhbGxiYWNrcykpLCB0cmFuc2FjdGlvbi5n ZXRJREJUcmFuc2FjdGlvbkJhY2tlbmRJbnRlcmZhY2UoKSwgZWMpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSURCT2JqZWN0U3RvcmVJbXBsLmggYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJPYmplY3RTdG9yZUltcGwuaAppbmRleCAxODNiZGI0 ZDIyNTZjZmNlNjNjMzU2N2ExMGFkZjlmNzgxY2E3NjdiLi44YjMyZjQxM2Y5ZTJlMTY2Y2Q3ZTVl MjA3ZGZjOGJlOTA5ZWVkNDJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJJREJPYmplY3RTdG9yZUltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJJREJPYmplY3RTdG9yZUltcGwuaApAQCAtNDksNyArNDksNiBAQCBwdWJsaWM6CiAgICAg V2ViU3RyaW5nIGtleVBhdGhTdHJpbmcoKSBjb25zdDsKICAgICBXZWJET01TdHJpbmdMaXN0IGlu ZGV4TmFtZXMoKSBjb25zdDsKIAotICAgIHZvaWQgZ2V0KGNvbnN0IFdlYklEQktleSYga2V5LCBX ZWJJREJDYWxsYmFja3MqLCBjb25zdCBXZWJJREJUcmFuc2FjdGlvbiYsIFdlYkV4Y2VwdGlvbkNv ZGUmKTsKICAgICB2b2lkIGdldChjb25zdCBXZWJJREJLZXlSYW5nZSYsIFdlYklEQkNhbGxiYWNr cyosIGNvbnN0IFdlYklEQlRyYW5zYWN0aW9uJiwgV2ViRXhjZXB0aW9uQ29kZSYpOwogICAgIHZv aWQgcHV0KGNvbnN0IFdlYlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSYsIGNvbnN0IFdlYklEQktleSYs IFB1dE1vZGUsIFdlYklEQkNhbGxiYWNrcyosIGNvbnN0IFdlYklEQlRyYW5zYWN0aW9uJiwgV2Vi RXhjZXB0aW9uQ29kZSYpOwogICAgIHZvaWQgZGVsZXRlRnVuY3Rpb24oY29uc3QgV2ViSURCS2V5 JiwgV2ViSURCQ2FsbGJhY2tzKiwgY29uc3QgV2ViSURCVHJhbnNhY3Rpb24mLCBXZWJFeGNlcHRp b25Db2RlJik7Cg==