158359 2016-06-03 14:42:58 -0700 More miscellaneous IDBBindingUtilities cleanup 2016-06-03 15:31:30 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 beidson beidson alecflett commit-queue jsbell oldest_to_newest 1199049 0 beidson 2016-06-03 14:42:58 -0700 More miscellaneous IDBBindingUtilities cleanup 1199051 1 280469 beidson 2016-06-03 14:45:48 -0700 Created attachment 280469 Patch 1199081 2 beidson 2016-06-03 15:31:30 -0700 http://trac.webkit.org/changeset/201665 280469 2016-06-03 14:45:48 -0700 2016-06-03 14:46:55 -0700 Patch bug-158359-20160603144709.patch text/plain 11932 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxNjYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmRkYzc0MmQ4NWRkMmY4 OWExOTVhNWM5N2YzYzg4NWU4YTliOWEwMy4uOTY3MjkwMDRlYzAzZjYzMzc4OGQwN2I0YzNlZjg4 MTNhYjBkYzk2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQyIEBACiAyMDE2LTA2LTAzICBCcmFk eSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAorICAgICAgICBNb3JlIG1pc2NlbGxhbmVv dXMgSURCQmluZGluZ1V0aWxpdGllcyBjbGVhbnVwLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU4MzU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChTdHJhaWdodCByZWZhY3Rvciwg eW8pLgorCisgICAgICAgIFJlcGxhY2UgbW9yZSBTY3JpcHRFeGVjdXRpb25Db250ZXh0JnMgd2l0 aCBFeGVjU3RhdGUmcy4KKyAgICAgICAgQ29tYmluZSBtb3JlIHVubmVjZXNzYXJpbHkgc2VwYXJh dGUgZnVuY3Rpb25zLgorICAgICAgICBSZW1vdmUgc29tZSBjcnVmdC4KKyAgICAgICAgCisgICAg ICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURCQ3Vyc29yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OklEQkN1cnNvcjo6c2V0R2V0UmVzdWx0KToKKyAgICAgICAgCisgICAgICAgICogTW9kdWxlcy9p bmRleGVkZGIvSURCUmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJSZXF1ZXN0Ojpz ZXRSZXN1bHQpOgorICAgICAgICAoV2ViQ29yZTo6SURCUmVxdWVzdDo6c2V0UmVzdWx0VG9TdHJ1 Y3R1cmVkQ2xvbmUpOgorICAgICAgICAKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9zZXJ2 ZXIvTWVtb3J5T2JqZWN0U3RvcmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpN ZW1vcnlPYmplY3RTdG9yZTo6dXBkYXRlSW5kZXhlc0ZvclB1dFJlY29yZCk6CisgICAgICAgIChX ZWJDb3JlOjpJREJTZXJ2ZXI6Ok1lbW9yeU9iamVjdFN0b3JlOjpwb3B1bGF0ZUluZGV4V2l0aEV4 aXN0aW5nUmVjb3Jkcyk6CisgICAgICAgIAorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3Nl cnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCU2Vy dmVyOjpTUUxpdGVJREJCYWNraW5nU3RvcmU6OnVwZGF0ZU9uZUluZGV4Rm9yQWRkUmVjb3JkKToK KyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6U1FMaXRlSURCQmFja2luZ1N0b3JlOjp1cGRh dGVBbGxJbmRleGVzRm9yQWRkUmVjb3JkKToKKyAgICAgICAgCisgICAgICAgICogTW9kdWxlcy9p bmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OklEQlNlcnZlcjo6VW5pcXVlSURCRGF0YWJhc2U6OnBlcmZvcm1QdXRPckFkZCk6CisgICAgICAg IAorICAgICAgICAqIGJpbmRpbmdzL2pzL0lEQkJpbmRpbmdVdGlsaXRpZXMuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6ZGVzZXJpYWxpemVJREJWYWx1ZVRvSlNWYWx1ZSk6CisgICAgICAgIChXZWJD b3JlOjppZGJLZXlEYXRhVG9TY3JpcHRWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpkZXNlcmlh bGl6ZUlEQlZhbHVlRGF0YVRvSlNWYWx1ZSk6IERlbGV0ZWQuCisgICAgICAgICogYmluZGluZ3Mv anMvSURCQmluZGluZ1V0aWxpdGllcy5oOgorCisyMDE2LTA2LTAzICBCcmFkeSBFaWRzb24gIDxi ZWlkc29uQGFwcGxlLmNvbT4KKwogICAgICAgICBNaXNjZWxsYW5lb3VzIElEQkJpbmRpbmdVdGls aXRpZXMgY2xlYW51cC4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE1ODM1MwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4 ZWRkYi9JREJDdXJzb3IuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURC Q3Vyc29yLmNwcAppbmRleCAwMTg4YzY2NTdhYWY5ZTBiNDhhNTM0YzAxNWFkNWJlOTI4ZTQ2Mzhi Li4xMmI0YTc4ZmZmMDRhODgyMjYwNDhhZWUwZGMzYzgxZWEzMDcyYjA2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJDdXJzb3IuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkN1cnNvci5jcHAKQEAgLTM5OSw2ICszOTks MTAgQEAgdm9pZCBJREJDdXJzb3I6OnNldEdldFJlc3VsdChJREJSZXF1ZXN0JiByZXF1ZXN0LCBj b25zdCBJREJHZXRSZXN1bHQmIGdldFJlc3VsdCkKICAgICBpZiAoIWNvbnRleHQpCiAgICAgICAg IHJldHVybjsKIAorICAgIGF1dG8qIGV4ZWMgPSBjb250ZXh0LT5leGVjU3RhdGUoKTsKKyAgICBp ZiAoIWV4ZWMpCisgICAgICAgIHJldHVybjsKKwogICAgIGlmICghZ2V0UmVzdWx0LmlzRGVmaW5l ZCgpKSB7CiAgICAgICAgIG1fY3VycmVudEtleSA9IHsgfTsKICAgICAgICAgbV9jdXJyZW50S2V5 RGF0YSA9IHsgfTsKQEAgLTQxMiwxMyArNDE2LDEzIEBAIHZvaWQgSURCQ3Vyc29yOjpzZXRHZXRS ZXN1bHQoSURCUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgSURCR2V0UmVzdWx0JiBnZXRSZXN1bHQp CiAKICAgICBhdXRvJiB2bSA9IGNvbnRleHQtPnZtKCk7CiAKLSAgICBtX2N1cnJlbnRLZXkgPSB7 IHZtLCBpZGJLZXlEYXRhVG9TY3JpcHRWYWx1ZSgqY29udGV4dCwgZ2V0UmVzdWx0LmtleURhdGEo KSkgfTsKKyAgICBtX2N1cnJlbnRLZXkgPSB7IHZtLCBpZGJLZXlEYXRhVG9TY3JpcHRWYWx1ZSgq ZXhlYywgZ2V0UmVzdWx0LmtleURhdGEoKSkgfTsKICAgICBtX2N1cnJlbnRLZXlEYXRhID0gZ2V0 UmVzdWx0LmtleURhdGEoKTsKLSAgICBtX2N1cnJlbnRQcmltYXJ5S2V5ID0geyB2bSwgaWRiS2V5 RGF0YVRvU2NyaXB0VmFsdWUoKmNvbnRleHQsIGdldFJlc3VsdC5wcmltYXJ5S2V5RGF0YSgpKSB9 OworICAgIG1fY3VycmVudFByaW1hcnlLZXkgPSB7IHZtLCBpZGJLZXlEYXRhVG9TY3JpcHRWYWx1 ZSgqZXhlYywgZ2V0UmVzdWx0LnByaW1hcnlLZXlEYXRhKCkpIH07CiAgICAgbV9jdXJyZW50UHJp bWFyeUtleURhdGEgPSBnZXRSZXN1bHQucHJpbWFyeUtleURhdGEoKTsKIAogICAgIGlmIChpc0tl eUN1cnNvcldpdGhWYWx1ZSgpKQotICAgICAgICBtX2N1cnJlbnRWYWx1ZSA9IHsgdm0sIGRlc2Vy aWFsaXplSURCVmFsdWVUb0pTVmFsdWUoKmNvbnRleHQsIGdldFJlc3VsdC52YWx1ZSgpKSB9Owor ICAgICAgICBtX2N1cnJlbnRWYWx1ZSA9IHsgdm0sIGRlc2VyaWFsaXplSURCVmFsdWVUb0pTVmFs dWUoKmV4ZWMsIGdldFJlc3VsdC52YWx1ZSgpKSB9OwogICAgIGVsc2UKICAgICAgICAgbV9jdXJy ZW50VmFsdWUgPSB7IH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL0lEQlJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIv SURCUmVxdWVzdC5jcHAKaW5kZXggOWYwYzAxZTBkNjAyYjk5N2NmMGI3ZmFjMjVhYjU0ZGUwMWMx MDQ0My4uZGUwODU3NTBmMDE3MzZlZTNhMTgxZWFiMGU0YWEyYzA2Y2JmNmQ2NCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCUmVxdWVzdC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCUmVxdWVzdC5jcHAKQEAgLTMzMCw4 ICszMzAsMTIgQEAgdm9pZCBJREJSZXF1ZXN0OjpzZXRSZXN1bHQoY29uc3QgSURCS2V5RGF0YSYg a2V5RGF0YSkKICAgICBpZiAoIWNvbnRleHQpCiAgICAgICAgIHJldHVybjsKIAorICAgIGF1dG8q IGV4ZWMgPSBjb250ZXh0LT5leGVjU3RhdGUoKTsKKyAgICBpZiAoIWV4ZWMpCisgICAgICAgIHJl dHVybjsKKwogICAgIGNsZWFyUmVzdWx0KCk7Ci0gICAgbV9zY3JpcHRSZXN1bHQgPSB7IGNvbnRl eHQtPnZtKCksIGlkYktleURhdGFUb1NjcmlwdFZhbHVlKCpjb250ZXh0LCBrZXlEYXRhKSB9Owor ICAgIG1fc2NyaXB0UmVzdWx0ID0geyBjb250ZXh0LT52bSgpLCBpZGJLZXlEYXRhVG9TY3JpcHRW YWx1ZSgqZXhlYywga2V5RGF0YSkgfTsKIH0KIAogdm9pZCBJREJSZXF1ZXN0OjpzZXRSZXN1bHQo dWludDY0X3QgbnVtYmVyKQpAQCAtMzU2LDggKzM2MCwxMiBAQCB2b2lkIElEQlJlcXVlc3Q6OnNl dFJlc3VsdFRvU3RydWN0dXJlZENsb25lKGNvbnN0IElEQlZhbHVlJiB2YWx1ZSkKICAgICBpZiAo IWNvbnRleHQpCiAgICAgICAgIHJldHVybjsKIAorICAgIGF1dG8qIGV4ZWMgPSBjb250ZXh0LT5l eGVjU3RhdGUoKTsKKyAgICBpZiAoIWV4ZWMpCisgICAgICAgIHJldHVybjsKKwogICAgIGNsZWFy UmVzdWx0KCk7Ci0gICAgbV9zY3JpcHRSZXN1bHQgPSB7IGNvbnRleHQtPnZtKCksIGRlc2VyaWFs aXplSURCVmFsdWVUb0pTVmFsdWUoKmNvbnRleHQsIHZhbHVlKSB9OworICAgIG1fc2NyaXB0UmVz dWx0ID0geyBjb250ZXh0LT52bSgpLCBkZXNlcmlhbGl6ZUlEQlZhbHVlVG9KU1ZhbHVlKCpleGVj LCB2YWx1ZSkgfTsKIH0KIAogdm9pZCBJREJSZXF1ZXN0OjpjbGVhclJlc3VsdCgpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5T2JqZWN0 U3RvcmUuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL01lbW9y eU9iamVjdFN0b3JlLmNwcAppbmRleCAyNGY5MjEyNTQ5ODQzYzQ4Y2JmZjJjMzZjMzI2OWRkYjY0 NWMzYjgzLi5mYzUxNWYyOTFmNzlhOGZhYjM4MDIwZGFlZjY1MTA4ODYxZDhlZWNmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5T2JqZWN0 U3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9N ZW1vcnlPYmplY3RTdG9yZS5jcHAKQEAgLTMwMyw3ICszMDMsNyBAQCBJREJFcnJvciBNZW1vcnlP YmplY3RTdG9yZTo6dXBkYXRlSW5kZXhlc0ZvclB1dFJlY29yZChjb25zdCBJREJLZXlEYXRhJiBr ZXksIGNvbgogewogICAgIEpTTG9ja0hvbGRlciBsb2NrZXIoVW5pcXVlSURCRGF0YWJhc2U6OmRh dGFiYXNlVGhyZWFkVk0oKSk7CiAKLSAgICBhdXRvIGpzVmFsdWUgPSBkZXNlcmlhbGl6ZUlEQlZh bHVlRGF0YVRvSlNWYWx1ZShVbmlxdWVJREJEYXRhYmFzZTo6ZGF0YWJhc2VUaHJlYWRFeGVjU3Rh dGUoKSwgdmFsdWUpOworICAgIGF1dG8ganNWYWx1ZSA9IGRlc2VyaWFsaXplSURCVmFsdWVUb0pT VmFsdWUoVW5pcXVlSURCRGF0YWJhc2U6OmRhdGFiYXNlVGhyZWFkRXhlY1N0YXRlKCksIHZhbHVl KTsKICAgICBpZiAoanNWYWx1ZS5pc1VuZGVmaW5lZE9yTnVsbCgpKQogICAgICAgICByZXR1cm4g eyB9OwogCkBAIC0zNDEsNyArMzQxLDcgQEAgSURCRXJyb3IgTWVtb3J5T2JqZWN0U3RvcmU6OnBv cHVsYXRlSW5kZXhXaXRoRXhpc3RpbmdSZWNvcmRzKE1lbW9yeUluZGV4JiBpbmRleCkKICAgICBK U0xvY2tIb2xkZXIgbG9ja2VyKFVuaXF1ZUlEQkRhdGFiYXNlOjpkYXRhYmFzZVRocmVhZFZNKCkp OwogCiAgICAgZm9yIChhdXRvIGl0ZXJhdG9yIDogKm1fa2V5VmFsdWVTdG9yZSkgewotICAgICAg ICBhdXRvIGpzVmFsdWUgPSBkZXNlcmlhbGl6ZUlEQlZhbHVlRGF0YVRvSlNWYWx1ZShVbmlxdWVJ REJEYXRhYmFzZTo6ZGF0YWJhc2VUaHJlYWRFeGVjU3RhdGUoKSwgaXRlcmF0b3IudmFsdWUpOwor ICAgICAgICBhdXRvIGpzVmFsdWUgPSBkZXNlcmlhbGl6ZUlEQlZhbHVlVG9KU1ZhbHVlKFVuaXF1 ZUlEQkRhdGFiYXNlOjpkYXRhYmFzZVRocmVhZEV4ZWNTdGF0ZSgpLCBpdGVyYXRvci52YWx1ZSk7 CiAgICAgICAgIGlmIChqc1ZhbHVlLmlzVW5kZWZpbmVkT3JOdWxsKCkpCiAgICAgICAgICAgICBy ZXR1cm4geyB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwCmluZGV4IDIzZDkz NjM0YzdkMTA0YTdjYWJkNWJkZDcyMmQ2ODM1ZGUyODljOWQuLmU2ZTZhMWI5NTI0NjIyOGU5YTdk MmZmZWFlMjIyOTMzZDhhNTI4ZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3Bw CkBAIC0xNDgwLDcgKzE0ODAsNyBAQCBJREJFcnJvciBTUUxpdGVJREJCYWNraW5nU3RvcmU6OnVw ZGF0ZU9uZUluZGV4Rm9yQWRkUmVjb3JkKGNvbnN0IElEQkluZGV4SW5mbyYgaQogewogICAgIEpT TG9ja0hvbGRlciBsb2NrZXIodm0oKSk7CiAKLSAgICBhdXRvIGpzVmFsdWUgPSBkZXNlcmlhbGl6 ZUlEQlZhbHVlRGF0YVRvSlNWYWx1ZSgqZ2xvYmFsT2JqZWN0KCkuZ2xvYmFsRXhlYygpLCB2YWx1 ZSk7CisgICAgYXV0byBqc1ZhbHVlID0gZGVzZXJpYWxpemVJREJWYWx1ZVRvSlNWYWx1ZSgqZ2xv YmFsT2JqZWN0KCkuZ2xvYmFsRXhlYygpLCB2YWx1ZSk7CiAgICAgaWYgKGpzVmFsdWUuaXNVbmRl ZmluZWRPck51bGwoKSkKICAgICAgICAgcmV0dXJuIHsgfTsKIApAQCAtMTQ5Nyw3ICsxNDk3LDcg QEAgSURCRXJyb3IgU1FMaXRlSURCQmFja2luZ1N0b3JlOjp1cGRhdGVBbGxJbmRleGVzRm9yQWRk UmVjb3JkKGNvbnN0IElEQk9iamVjdFN0b3IKIHsKICAgICBKU0xvY2tIb2xkZXIgbG9ja2VyKHZt KCkpOwogCi0gICAgYXV0byBqc1ZhbHVlID0gZGVzZXJpYWxpemVJREJWYWx1ZURhdGFUb0pTVmFs dWUoKmdsb2JhbE9iamVjdCgpLmdsb2JhbEV4ZWMoKSwgdmFsdWUpOworICAgIGF1dG8ganNWYWx1 ZSA9IGRlc2VyaWFsaXplSURCVmFsdWVUb0pTVmFsdWUoKmdsb2JhbE9iamVjdCgpLmdsb2JhbEV4 ZWMoKSwgdmFsdWUpOwogICAgIGlmIChqc1ZhbHVlLmlzVW5kZWZpbmVkT3JOdWxsKCkpCiAgICAg ICAgIHJldHVybiB7IH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuY3BwCmluZGV4IDUwMjMzMTFm NGZjYjVkYTQzMmM2ZWVlMmIzZjM2OTM1NWJlNTkxMWIuLjkwYTdmYTdhOWE4Nzc4MjBjYWUzNmQ3 YjIxYWFkM2ZhYWZlMmM1MWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcApAQCAtODUxLDcg Kzg1MSw3IEBAIHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OnBlcmZvcm1QdXRPckFkZCh1aW50NjRf dCBjYWxsYmFja0lkZW50aWZpZXIsIGNvbnN0IElEQlJlCiAgICAgaWYgKHVzZWRLZXlJc0dlbmVy YXRlZCAmJiAhb2JqZWN0U3RvcmVJbmZvLT5rZXlQYXRoKCkuaXNOdWxsKCkpIHsKICAgICAgICAg SlNMb2NrSG9sZGVyIGxvY2tlcihkYXRhYmFzZVRocmVhZFZNKCkpOwogCi0gICAgICAgIGF1dG8g dmFsdWUgPSBkZXNlcmlhbGl6ZUlEQlZhbHVlRGF0YVRvSlNWYWx1ZShkYXRhYmFzZVRocmVhZEV4 ZWNTdGF0ZSgpLCBvcmlnaW5hbFJlY29yZFZhbHVlLmRhdGEoKSk7CisgICAgICAgIGF1dG8gdmFs dWUgPSBkZXNlcmlhbGl6ZUlEQlZhbHVlVG9KU1ZhbHVlKGRhdGFiYXNlVGhyZWFkRXhlY1N0YXRl KCksIG9yaWdpbmFsUmVjb3JkVmFsdWUuZGF0YSgpKTsKICAgICAgICAgaWYgKHZhbHVlLmlzVW5k ZWZpbmVkKCkpIHsKICAgICAgICAgICAgIHBvc3REYXRhYmFzZVRhc2tSZXBseShjcmVhdGVDcm9z c1RocmVhZFRhc2soKnRoaXMsICZVbmlxdWVJREJEYXRhYmFzZTo6ZGlkUGVyZm9ybVB1dE9yQWRk LCBjYWxsYmFja0lkZW50aWZpZXIsIElEQkVycm9yKElEQkRhdGFiYXNlRXhjZXB0aW9uOjpDb25z dHJhaW50RXJyb3IsIEFTQ0lJTGl0ZXJhbCgiVW5hYmxlIHRvIGRlc2VyaWFsaXplIHJlY29yZCB2 YWx1ZSBmb3IgcmVjb3JkIGtleSBpbmplY3Rpb24iKSksIHVzZWRLZXkpKTsKICAgICAgICAgICAg IHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0lEQkJpbmRp bmdVdGlsaXRpZXMuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSURCQmluZGluZ1V0 aWxpdGllcy5jcHAKaW5kZXggMTE2ZTkxY2M5OGZiYjYwMmNiYmFjYjJmYmQ0ZWI2N2NmYWFhZTcx OS4uOTEyNTM3YzBjMDdhNjdkYjQyNDZjMmY0YmZjYWQxZDE1NzgxYmMyNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSURCQmluZGluZ1V0aWxpdGllcy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSURCQmluZGluZ1V0aWxpdGllcy5jcHAKQEAgLTMw Nyw4ICszMDcsNyBAQCBib29sIGNhbkluamVjdElEQktleUludG9TY3JpcHRWYWx1ZShFeGVjU3Rh dGUmIGV4ZWMsIGNvbnN0IEpTVmFsdWUmIHNjcmlwdFZhbHVlLAogICAgIHJldHVybiBjYW5Jbmpl Y3ROdGhWYWx1ZU9uS2V5UGF0aChleGVjLCBzY3JpcHRWYWx1ZSwga2V5UGF0aEVsZW1lbnRzLCBr ZXlQYXRoRWxlbWVudHMuc2l6ZSgpIC0gMSk7CiB9CiAKLQotc3RhdGljIEpTVmFsdWUgZGVzZXJp YWxpemVJREJWYWx1ZVRvSlNWYWx1ZShFeGVjU3RhdGUmIGV4ZWMsIGNvbnN0IElEQlZhbHVlJiB2 YWx1ZSkKK0pTVmFsdWUgZGVzZXJpYWxpemVJREJWYWx1ZVRvSlNWYWx1ZShFeGVjU3RhdGUmIGV4 ZWMsIGNvbnN0IElEQlZhbHVlJiB2YWx1ZSkKIHsKICAgICAvLyBGSVhNRTogSSB0aGluayBpdCdz IHBlY3VsaWFyIHRvIHVzZSB1bmRlZmluZWQgdG8gbWVhbiAibnVsbCBkYXRhIiBhbmQgbnVsbCB0 byBtZWFuICJlbXB0eSBkYXRhIi4KICAgICAvLyBCdXQgSSBhbSBub3QgY2hhbmdpbmcgdGhpcyBh dCB0aGUgbW9tZW50IGJlY2F1c2UgYXQgbGVhc3Qgc29tZSBjYWxsZXJzIGFyZSBzcGVjaWZpY2Fs bHkgY2hlY2tpbmcgaXNVbmRlZmluZWQuCkBAIC0zMjksMzYgKzMyOCwxNSBAQCBzdGF0aWMgSlNW YWx1ZSBkZXNlcmlhbGl6ZUlEQlZhbHVlVG9KU1ZhbHVlKEV4ZWNTdGF0ZSYgZXhlYywgY29uc3Qg SURCVmFsdWUmIHZhbAogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKLUpTVmFsdWUgZGVzZXJpYWxp emVJREJWYWx1ZVRvSlNWYWx1ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0LCBjb25z dCBJREJWYWx1ZSYgdmFsdWUpCi17Ci0gICAgLy8gRklYTUU6IEkgdGhpbmsgaXQncyBwZWN1bGlh ciB0byByZXR1cm4gYW4gZW1wdHkgSlNWYWx1ZSwgdW5kZWZpbmVkLCBhbmQgbnVsbCBmb3IgdGhy ZWUgZGlmZmVyZW50IGVycm9yIGNhc2VzLgotCi0gICAgYXV0byogZXhlYyA9IGNvbnRleHQuZXhl Y1N0YXRlKCk7Ci0gICAgaWYgKCFleGVjKQotICAgICAgICByZXR1cm4geyB9OwotCi0gICAgcmV0 dXJuIGRlc2VyaWFsaXplSURCVmFsdWVUb0pTVmFsdWUoKmV4ZWMsIHZhbHVlKTsKLX0KLQotSlNW YWx1ZSBkZXNlcmlhbGl6ZUlEQlZhbHVlRGF0YVRvSlNWYWx1ZShFeGVjU3RhdGUmIGV4ZWMsIGNv bnN0IFRocmVhZFNhZmVEYXRhQnVmZmVyJiB2YWx1ZURhdGEpCi17Ci0gICAgcmV0dXJuIGRlc2Vy aWFsaXplSURCVmFsdWVUb0pTVmFsdWUoZXhlYywgSURCVmFsdWUodmFsdWVEYXRhKSk7Ci19Ci0K IFJlZjxJREJLZXk+IHNjcmlwdFZhbHVlVG9JREJLZXkoRXhlY1N0YXRlJiBleGVjLCBjb25zdCBK U1ZhbHVlJiBzY3JpcHRWYWx1ZSkKIHsKICAgICByZXR1cm4gY3JlYXRlSURCS2V5RnJvbVZhbHVl KGV4ZWMsIHNjcmlwdFZhbHVlKTsKIH0KIAotSlNDOjpKU1ZhbHVlIGlkYktleURhdGFUb1Njcmlw dFZhbHVlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQsIGNvbnN0IElEQktleURhdGEm IGtleURhdGEpCitKU0M6OkpTVmFsdWUgaWRiS2V5RGF0YVRvU2NyaXB0VmFsdWUoSlNDOjpFeGVj U3RhdGUmIGV4ZWMsIGNvbnN0IElEQktleURhdGEmIGtleURhdGEpCiB7CiAgICAgUmVmUHRyPElE QktleT4ga2V5ID0ga2V5RGF0YS5tYXliZUNyZWF0ZUlEQktleSgpOwotCi0gICAgRXhlY1N0YXRl KiBleGVjID0gY29udGV4dC5leGVjU3RhdGUoKTsKLSAgICBpZiAoIWV4ZWMpCi0gICAgICAgIHJl dHVybiB7IH07Ci0KLSAgICByZXR1cm4gdG9KUygqZXhlYywgKmV4ZWMtPmxleGljYWxHbG9iYWxP YmplY3QoKSwga2V5LmdldCgpKTsKKyAgICByZXR1cm4gdG9KUyhleGVjLCAqZXhlYy5sZXhpY2Fs R2xvYmFsT2JqZWN0KCksIGtleS5nZXQoKSk7CiB9CiAKIHN0YXRpYyBWZWN0b3I8SURCS2V5RGF0 YT4gY3JlYXRlS2V5UGF0aEFycmF5KEV4ZWNTdGF0ZSYgZXhlYywgSlNWYWx1ZSB2YWx1ZSwgY29u c3QgSURCSW5kZXhJbmZvJiBpbmZvKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvSURCQmluZGluZ1V0aWxpdGllcy5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMv SURCQmluZGluZ1V0aWxpdGllcy5oCmluZGV4IDAyNjc2OWM1ZTBiNjkyZWU5Njg5ZmM4MWE0NTk1 ZWQ3YjM4MGRjZTUuLjMxY2U4ZTBkYTg0ODYwNzhhNzNmZWQzODQ0YWY5Y2IyZTViNTkwNWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0lEQkJpbmRpbmdVdGlsaXRpZXMu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9JREJCaW5kaW5nVXRpbGl0aWVzLmgK QEAgLTQ1LDcgKzQ1LDYgQEAgY2xhc3MgSURCS2V5UGF0aDsKIGNsYXNzIElEQlZhbHVlOwogY2xh c3MgSW5kZXhLZXk7CiBjbGFzcyBKU0RPTUdsb2JhbE9iamVjdDsKLWNsYXNzIFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQ7CiBjbGFzcyBUaHJlYWRTYWZlRGF0YUJ1ZmZlcjsKIAogSURCS2V5UGF0aCBp ZGJLZXlQYXRoRnJvbVZhbHVlKEpTQzo6RXhlY1N0YXRlJiwgSlNDOjpKU1ZhbHVlKTsKQEAgLTU2 LDExICs1NSwxMCBAQCBib29sIGNhbkluamVjdElEQktleUludG9TY3JpcHRWYWx1ZShKU0M6OkV4 ZWNTdGF0ZSYsIGNvbnN0IEpTQzo6SlNWYWx1ZSYsIGNvbnN0CiBib29sIGluamVjdElEQktleUlu dG9TY3JpcHRWYWx1ZShKU0M6OkV4ZWNTdGF0ZSYsIGNvbnN0IElEQktleURhdGEmLCBKU0M6OkpT VmFsdWUsIGNvbnN0IElEQktleVBhdGgmKTsKIAogSlNDOjpKU1ZhbHVlIHRvSlMoSlNDOjpFeGVj U3RhdGUmLCBKU0M6OkpTR2xvYmFsT2JqZWN0JiwgSURCS2V5Kik7Ci1KU0M6OkpTVmFsdWUgaWRi S2V5RGF0YVRvU2NyaXB0VmFsdWUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYsIGNvbnN0IElEQktl eURhdGEmKTsKK0pTQzo6SlNWYWx1ZSBpZGJLZXlEYXRhVG9TY3JpcHRWYWx1ZShKU0M6OkV4ZWNT dGF0ZSYsIGNvbnN0IElEQktleURhdGEmKTsKIHZvaWQgZ2VuZXJhdGVJbmRleEtleUZvclZhbHVl KEpTQzo6RXhlY1N0YXRlJiwgY29uc3QgSURCSW5kZXhJbmZvJiwgSlNDOjpKU1ZhbHVlLCBJbmRl eEtleSYgb3V0S2V5KTsKIAotSlNDOjpKU1ZhbHVlIGRlc2VyaWFsaXplSURCVmFsdWVUb0pTVmFs dWUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYsIGNvbnN0IElEQlZhbHVlJik7Ci1KU0M6OkpTVmFs dWUgZGVzZXJpYWxpemVJREJWYWx1ZURhdGFUb0pTVmFsdWUoSlNDOjpFeGVjU3RhdGUmLCBjb25z dCBUaHJlYWRTYWZlRGF0YUJ1ZmZlciYgdmFsdWVEYXRhKTsKK0pTQzo6SlNWYWx1ZSBkZXNlcmlh bGl6ZUlEQlZhbHVlVG9KU1ZhbHVlKEpTQzo6RXhlY1N0YXRlJiwgY29uc3QgSURCVmFsdWUmKTsK IAogUmVmPElEQktleT4gc2NyaXB0VmFsdWVUb0lEQktleShKU0M6OkV4ZWNTdGF0ZSYsIGNvbnN0 IEpTQzo6SlNWYWx1ZSYpOwogCg==