94861 2012-08-23 14:54:27 -0700 IndexedDB: Surface IO errors when deleting an object store 2012-11-30 11:01:58 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 100700 1 dgrogan dgrogan alecflett jsbell webkit.review.bot oldest_to_newest 703421 0 dgrogan 2012-08-23 14:54:27 -0700 IndexedDB: Surface IO errors when deleting an object store 703422 1 160256 dgrogan 2012-08-23 14:55:16 -0700 Created attachment 160256 Patch 703424 2 160256 dgrogan 2012-08-23 14:57:03 -0700 Comment on attachment 160256 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160256&action=review > Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp:230 > + transaction->abort(); There is still is no way to give the frontend an informative error, correct? 703428 3 webkit.review.bot 2012-08-23 14:57:59 -0700 Attachment 160256 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/Modules/indexeddb/IDBBackin..." exit_code: 1 Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp:228: One line control clauses should not use braces. [whitespace/braces] [4] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 703432 4 dgrogan 2012-08-23 15:01:04 -0700 This is the patch I'm trying to come up with a browser test for. Is it still true that there's no way to give the frontend an informative error message when the backend decides to abort a transaction? 780240 5 dgrogan 2012-11-30 11:01:58 -0800 bug 100700 obviated this. 160256 2012-08-23 14:55:16 -0700 2012-08-23 14:57:02 -0700 Patch bug-94861-20120823145512.patch text/plain 9726 dgrogan U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2MjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2luZGV4ZWRkYi9JREJCYWNraW5nU3RvcmUuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL0lEQkJhY2tpbmdTdG9yZS5oCmluZGV4IDkwYzg1YzE4MGExMDRhN2Q5N2I4 NTMwYTgwOTA5NTkzOGI2NGU0ZTQuLjNlZTNkNDA4ZGEyNDUwMmE1ZjY5MmQ4ZTk5ZjIyZjIwZWVl OTE5ZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkJh Y2tpbmdTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkJh Y2tpbmdTdG9yZS5oCkBAIC01NSw3ICs1NSw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9p ZCBnZXRPYmplY3RTdG9yZXMoaW50NjRfdCBkYXRhYmFzZUlkLCBWZWN0b3I8aW50NjRfdD4mIGZv dW5kSWRzLCBWZWN0b3I8U3RyaW5nPiYgZm91bmROYW1lcywgVmVjdG9yPElEQktleVBhdGg+JiBm b3VuZEtleVBhdGhzLCBWZWN0b3I8Ym9vbD4mIGZvdW5kQXV0b0luY3JlbWVudEZsYWdzKSA9IDA7 CiAgICAgdmlydHVhbCBib29sIGNyZWF0ZU9iamVjdFN0b3JlKGludDY0X3QgZGF0YWJhc2VJZCwg Y29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBJREJLZXlQYXRoJiwgYm9vbCBhdXRvSW5jcmVtZW50 LCBpbnQ2NF90JiBhc3NpZ25lZE9iamVjdFN0b3JlSWQpID0gMDsKLSAgICB2aXJ0dWFsIHZvaWQg ZGVsZXRlT2JqZWN0U3RvcmUoaW50NjRfdCBkYXRhYmFzZUlkLCBpbnQ2NF90IG9iamVjdFN0b3Jl SWQpID0gMDsKKyAgICB2aXJ0dWFsIGJvb2wgZGVsZXRlT2JqZWN0U3RvcmUoaW50NjRfdCBkYXRh YmFzZUlkLCBpbnQ2NF90IG9iamVjdFN0b3JlSWQpID0gMDsKIAogICAgIGNsYXNzIE9iamVjdFN0 b3JlUmVjb3JkSWRlbnRpZmllciA6IHB1YmxpYyBSZWZDb3VudGVkPE9iamVjdFN0b3JlUmVjb3Jk SWRlbnRpZmllcj4gewogICAgIHB1YmxpYzoKQEAgLTY2LDcgKzY2LDcgQEAgcHVibGljOgogCiAg ICAgdmlydHVhbCBTdHJpbmcgZ2V0T2JqZWN0U3RvcmVSZWNvcmQoaW50NjRfdCBkYXRhYmFzZUlk LCBpbnQ2NF90IG9iamVjdFN0b3JlSWQsIGNvbnN0IElEQktleSYpID0gMDsKICAgICB2aXJ0dWFs IGJvb2wgcHV0T2JqZWN0U3RvcmVSZWNvcmQoaW50NjRfdCBkYXRhYmFzZUlkLCBpbnQ2NF90IG9i amVjdFN0b3JlSWQsIGNvbnN0IElEQktleSYsIGNvbnN0IFN0cmluZyYgdmFsdWUsIE9iamVjdFN0 b3JlUmVjb3JkSWRlbnRpZmllciopID0gMDsKLSAgICB2aXJ0dWFsIHZvaWQgY2xlYXJPYmplY3RT dG9yZShpbnQ2NF90IGRhdGFiYXNlSWQsIGludDY0X3Qgb2JqZWN0U3RvcmVJZCkgPSAwOworICAg IHZpcnR1YWwgYm9vbCBjbGVhck9iamVjdFN0b3JlKGludDY0X3QgZGF0YWJhc2VJZCwgaW50NjRf dCBvYmplY3RTdG9yZUlkKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRlbGV0ZU9iamVjdFN0b3Jl UmVjb3JkKGludDY0X3QgZGF0YWJhc2VJZCwgaW50NjRfdCBvYmplY3RTdG9yZUlkLCBjb25zdCBP YmplY3RTdG9yZVJlY29yZElkZW50aWZpZXIqKSA9IDA7CiAgICAgdmlydHVhbCBpbnQ2NF90IGdl dEtleUdlbmVyYXRvckN1cnJlbnROdW1iZXIoaW50NjRfdCBkYXRhYmFzZUlkLCBpbnQ2NF90IG9i amVjdFN0b3JlSWQpID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgbWF5YmVVcGRhdGVLZXlHZW5lcmF0 b3JDdXJyZW50TnVtYmVyKGludDY0X3QgZGF0YWJhc2VJZCwgaW50NjRfdCBvYmplY3RTdG9yZUlk LCBpbnQ2NF90IG5ld051bWJlciwgYm9vbCBjaGVja0N1cnJlbnQpID0gMDsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkRhdGFiYXNlQmFja2VuZEltcGwu Y3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCRGF0YWJhc2VCYWNrZW5k SW1wbC5jcHAKaW5kZXggYzlkOWYwMWZhY2Y0NDI1ZTZjODIzNTA4NWY2MGNhNzcyYjk0ZTIwYS4u ZWIyNjBiZTFlZTk2MzAzODAxZTAxYzg0MWYzYjQ5NTkwMjMwOGJjYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCRGF0YWJhc2VCYWNrZW5kSW1wbC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCRGF0YWJhc2VCYWNrZW5k SW1wbC5jcHAKQEAgLTIyMyw4ICsyMjMsMTIgQEAgdm9pZCBJREJEYXRhYmFzZUJhY2tlbmRJbXBs OjpkZWxldGVPYmplY3RTdG9yZShjb25zdCBTdHJpbmcmIG5hbWUsIElEQlRyYW5zYWN0aW8KIAog dm9pZCBJREJEYXRhYmFzZUJhY2tlbmRJbXBsOjpkZWxldGVPYmplY3RTdG9yZUludGVybmFsKFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBQYXNzUmVmUHRyPElEQkRhdGFiYXNlQmFja2VuZEltcGw+ IGRhdGFiYXNlLCBQYXNzUmVmUHRyPElEQk9iamVjdFN0b3JlQmFja2VuZEltcGw+IG9iamVjdFN0 b3JlLCBQYXNzUmVmUHRyPElEQlRyYW5zYWN0aW9uQmFja2VuZEltcGw+IHRyYW5zYWN0aW9uKQog ewotICAgIGRhdGFiYXNlLT5tX2JhY2tpbmdTdG9yZS0+ZGVsZXRlT2JqZWN0U3RvcmUoZGF0YWJh c2UtPmlkKCksIG9iamVjdFN0b3JlLT5pZCgpKTsKLSAgICB0cmFuc2FjdGlvbi0+ZGlkQ29tcGxl dGVUYXNrRXZlbnRzKCk7CisgICAgaWYgKGRhdGFiYXNlLT5tX2JhY2tpbmdTdG9yZS0+ZGVsZXRl T2JqZWN0U3RvcmUoZGF0YWJhc2UtPmlkKCksIG9iamVjdFN0b3JlLT5pZCgpKSkgeworICAgICAg ICB0cmFuc2FjdGlvbi0+ZGlkQ29tcGxldGVUYXNrRXZlbnRzKCk7CisgICAgfSBlbHNlIHsKKyAg ICAgICAgTE9HX0VSUk9SKCJDYWxsaW5nIHRyYW5zYWN0aW9uLT5hYm9ydCgpIGJlY2F1c2Ugb2Yg c29tZSBsZXZlbGRiIGVycm9yIGRlbGV0aW5nIHRoZSBvYmplY3Qgc3RvcmUuIik7CisgICAgICAg IHRyYW5zYWN0aW9uLT5hYm9ydCgpOworICAgIH0KIH0KIAogdm9pZCBJREJEYXRhYmFzZUJhY2tl bmRJbXBsOjpzZXRWZXJzaW9uKGNvbnN0IFN0cmluZyYgdmVyc2lvbiwgUGFzc1JlZlB0cjxJREJD YWxsYmFja3M+IHBycENhbGxiYWNrcywgUGFzc1JlZlB0cjxJREJEYXRhYmFzZUNhbGxiYWNrcz4g cHJwRGF0YWJhc2VDYWxsYmFja3MsIEV4Y2VwdGlvbkNvZGUmIGVjKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJMZXZlbERCQmFja2luZ1N0b3Jl LmNwcAppbmRleCAwNGE0ZmJiYTI1MDMwN2FlYzQ1YmZhNzkzOTQ1MmE2ZWVjNWRhM2EwLi40ODU4 MWRiYmEyYmI5MTczMjJiMGQyZTRkM2JmODkxYTU1ZWRlYjI4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJMZXZlbERCQmFja2luZ1N0b3JlLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJMZXZlbERCQmFja2luZ1N0b3Jl LmNwcApAQCAtNTg3LDcgKzU4Nyw3IEBAIGJvb2wgSURCTGV2ZWxEQkJhY2tpbmdTdG9yZTo6Y3Jl YXRlT2JqZWN0U3RvcmUoaW50NjRfdCBkYXRhYmFzZUlkLCBjb25zdCBTdHJpbmcmCiAgICAgcmV0 dXJuIHRydWU7CiB9CiAKLXZvaWQgSURCTGV2ZWxEQkJhY2tpbmdTdG9yZTo6ZGVsZXRlT2JqZWN0 U3RvcmUoaW50NjRfdCBkYXRhYmFzZUlkLCBpbnQ2NF90IG9iamVjdFN0b3JlSWQpCitib29sIElE QkxldmVsREJCYWNraW5nU3RvcmU6OmRlbGV0ZU9iamVjdFN0b3JlKGludDY0X3QgZGF0YWJhc2VJ ZCwgaW50NjRfdCBvYmplY3RTdG9yZUlkKQogewogICAgIElEQl9UUkFDRSgiSURCTGV2ZWxEQkJh Y2tpbmdTdG9yZTo6ZGVsZXRlT2JqZWN0U3RvcmUiKTsKICAgICBBU1NFUlQobV9jdXJyZW50VHJh bnNhY3Rpb24pOwpAQCAtNTk2LDE2ICs1OTYsMTYgQEAgdm9pZCBJREJMZXZlbERCQmFja2luZ1N0 b3JlOjpkZWxldGVPYmplY3RTdG9yZShpbnQ2NF90IGRhdGFiYXNlSWQsIGludDY0X3Qgb2JqZWMK ICAgICBnZXRTdHJpbmcobV9jdXJyZW50VHJhbnNhY3Rpb24uZ2V0KCksIE9iamVjdFN0b3JlTWV0 YURhdGFLZXk6OmVuY29kZShkYXRhYmFzZUlkLCBvYmplY3RTdG9yZUlkLCBPYmplY3RTdG9yZU1l dGFEYXRhS2V5OjpOYW1lKSwgb2JqZWN0U3RvcmVOYW1lKTsKIAogICAgIGlmICghZGVsZXRlUmFu Z2UobV9jdXJyZW50VHJhbnNhY3Rpb24uZ2V0KCksIE9iamVjdFN0b3JlTWV0YURhdGFLZXk6OmVu Y29kZShkYXRhYmFzZUlkLCBvYmplY3RTdG9yZUlkLCAwKSwgT2JqZWN0U3RvcmVNZXRhRGF0YUtl eTo6ZW5jb2RlTWF4S2V5KGRhdGFiYXNlSWQsIG9iamVjdFN0b3JlSWQpKSkKLSAgICAgICAgcmV0 dXJuOyAvLyBGSVhNRTogUmVwb3J0IGVycm9yLgorICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAg ICBtX2N1cnJlbnRUcmFuc2FjdGlvbi0+cmVtb3ZlKE9iamVjdFN0b3JlTmFtZXNLZXk6OmVuY29k ZShkYXRhYmFzZUlkLCBvYmplY3RTdG9yZU5hbWUpKTsKIAogICAgIGlmICghZGVsZXRlUmFuZ2Uo bV9jdXJyZW50VHJhbnNhY3Rpb24uZ2V0KCksIEluZGV4RnJlZUxpc3RLZXk6OmVuY29kZShkYXRh YmFzZUlkLCBvYmplY3RTdG9yZUlkLCAwKSwgSW5kZXhGcmVlTGlzdEtleTo6ZW5jb2RlTWF4S2V5 KGRhdGFiYXNlSWQsIG9iamVjdFN0b3JlSWQpKSkKLSAgICAgICAgcmV0dXJuOyAvLyBGSVhNRTog UmVwb3J0IGVycm9yLgorICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKCFkZWxldGVSYW5n ZShtX2N1cnJlbnRUcmFuc2FjdGlvbi5nZXQoKSwgSW5kZXhNZXRhRGF0YUtleTo6ZW5jb2RlKGRh dGFiYXNlSWQsIG9iamVjdFN0b3JlSWQsIDAsIDApLCBJbmRleE1ldGFEYXRhS2V5OjplbmNvZGVN YXhLZXkoZGF0YWJhc2VJZCwgb2JqZWN0U3RvcmVJZCkpKQotICAgICAgICByZXR1cm47IC8vIEZJ WE1FOiBSZXBvcnQgZXJyb3IuCisgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGNsZWFyT2Jq ZWN0U3RvcmUoZGF0YWJhc2VJZCwgb2JqZWN0U3RvcmVJZCk7CisgICAgcmV0dXJuIGNsZWFyT2Jq ZWN0U3RvcmUoZGF0YWJhc2VJZCwgb2JqZWN0U3RvcmVJZCk7CiB9CiAKIFN0cmluZyBJREJMZXZl bERCQmFja2luZ1N0b3JlOjpnZXRPYmplY3RTdG9yZVJlY29yZChpbnQ2NF90IGRhdGFiYXNlSWQs IGludDY0X3Qgb2JqZWN0U3RvcmVJZCwgY29uc3QgSURCS2V5JiBrZXkpCkBAIC02OTIsMTQgKzY5 MiwxNCBAQCBib29sIElEQkxldmVsREJCYWNraW5nU3RvcmU6OnB1dE9iamVjdFN0b3JlUmVjb3Jk KGludDY0X3QgZGF0YWJhc2VJZCwgaW50NjRfdCBvYgogICAgIHJldHVybiB0cnVlOwogfQogCi12 b2lkIElEQkxldmVsREJCYWNraW5nU3RvcmU6OmNsZWFyT2JqZWN0U3RvcmUoaW50NjRfdCBkYXRh YmFzZUlkLCBpbnQ2NF90IG9iamVjdFN0b3JlSWQpCitib29sIElEQkxldmVsREJCYWNraW5nU3Rv cmU6OmNsZWFyT2JqZWN0U3RvcmUoaW50NjRfdCBkYXRhYmFzZUlkLCBpbnQ2NF90IG9iamVjdFN0 b3JlSWQpCiB7CiAgICAgSURCX1RSQUNFKCJJREJMZXZlbERCQmFja2luZ1N0b3JlOjpjbGVhck9i amVjdFN0b3JlIik7CiAgICAgQVNTRVJUKG1fY3VycmVudFRyYW5zYWN0aW9uKTsKICAgICBjb25z dCBWZWN0b3I8Y2hhcj4gc3RhcnRLZXkgPSBLZXlQcmVmaXgoZGF0YWJhc2VJZCwgb2JqZWN0U3Rv cmVJZCwgMCkuZW5jb2RlKCk7CiAgICAgY29uc3QgVmVjdG9yPGNoYXI+IHN0b3BLZXkgPSBLZXlQ cmVmaXgoZGF0YWJhc2VJZCwgb2JqZWN0U3RvcmVJZCArIDEsIDApLmVuY29kZSgpOwogCi0gICAg ZGVsZXRlUmFuZ2UobV9jdXJyZW50VHJhbnNhY3Rpb24uZ2V0KCksIHN0YXJ0S2V5LCBzdG9wS2V5 KTsKKyAgICByZXR1cm4gZGVsZXRlUmFuZ2UobV9jdXJyZW50VHJhbnNhY3Rpb24uZ2V0KCksIHN0 YXJ0S2V5LCBzdG9wS2V5KTsKIH0KIAogUGFzc1JlZlB0cjxJREJCYWNraW5nU3RvcmU6Ok9iamVj dFN0b3JlUmVjb3JkSWRlbnRpZmllcj4gSURCTGV2ZWxEQkJhY2tpbmdTdG9yZTo6Y3JlYXRlSW52 YWxpZFJlY29yZElkZW50aWZpZXIoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9pbmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5oIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9pbmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5oCmluZGV4IGMzNzU5Y2Y3ZTBk MzUyYzIxNWU2NzcyOWZlYWVjMWI0OTkxZWQyNjMuLmRiMzI3ZWE1Yzc4MWZkNTgyODg5N2NjZmM3 OGY4ZDY1MmY4MzlmZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL0lEQkxldmVsREJCYWNraW5nU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2luZGV4ZWRkYi9JREJMZXZlbERCQmFja2luZ1N0b3JlLmgKQEAgLTUzLDExICs1MywxMSBAQCBw dWJsaWM6CiAKICAgICB2aXJ0dWFsIHZvaWQgZ2V0T2JqZWN0U3RvcmVzKGludDY0X3QgZGF0YWJh c2VJZCwgVmVjdG9yPGludDY0X3Q+JiBmb3VuZElkcywgVmVjdG9yPFN0cmluZz4mIGZvdW5kTmFt ZXMsIFZlY3RvcjxJREJLZXlQYXRoPiYgZm91bmRLZXlQYXRocywgVmVjdG9yPGJvb2w+JiBmb3Vu ZEF1dG9JbmNyZW1lbnRGbGFncyk7CiAgICAgdmlydHVhbCBib29sIGNyZWF0ZU9iamVjdFN0b3Jl KGludDY0X3QgZGF0YWJhc2VJZCwgY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBJREJLZXlQYXRo JiwgYm9vbCBhdXRvSW5jcmVtZW50LCBpbnQ2NF90JiBhc3NpZ25lZE9iamVjdFN0b3JlSWQpOwot ICAgIHZpcnR1YWwgdm9pZCBkZWxldGVPYmplY3RTdG9yZShpbnQ2NF90IGRhdGFiYXNlSWQsIGlu dDY0X3Qgb2JqZWN0U3RvcmVJZCk7CisgICAgdmlydHVhbCBib29sIGRlbGV0ZU9iamVjdFN0b3Jl KGludDY0X3QgZGF0YWJhc2VJZCwgaW50NjRfdCBvYmplY3RTdG9yZUlkKTsKICAgICB2aXJ0dWFs IFBhc3NSZWZQdHI8T2JqZWN0U3RvcmVSZWNvcmRJZGVudGlmaWVyPiBjcmVhdGVJbnZhbGlkUmVj b3JkSWRlbnRpZmllcigpOwogICAgIHZpcnR1YWwgU3RyaW5nIGdldE9iamVjdFN0b3JlUmVjb3Jk KGludDY0X3QgZGF0YWJhc2VJZCwgaW50NjRfdCBvYmplY3RTdG9yZUlkLCBjb25zdCBJREJLZXkm KTsKICAgICB2aXJ0dWFsIGJvb2wgcHV0T2JqZWN0U3RvcmVSZWNvcmQoaW50NjRfdCBkYXRhYmFz ZUlkLCBpbnQ2NF90IG9iamVjdFN0b3JlSWQsIGNvbnN0IElEQktleSYsIGNvbnN0IFN0cmluZyYg dmFsdWUsIE9iamVjdFN0b3JlUmVjb3JkSWRlbnRpZmllciopOwotICAgIHZpcnR1YWwgdm9pZCBj bGVhck9iamVjdFN0b3JlKGludDY0X3QgZGF0YWJhc2VJZCwgaW50NjRfdCBvYmplY3RTdG9yZUlk KTsKKyAgICB2aXJ0dWFsIGJvb2wgY2xlYXJPYmplY3RTdG9yZShpbnQ2NF90IGRhdGFiYXNlSWQs IGludDY0X3Qgb2JqZWN0U3RvcmVJZCk7CiAgICAgdmlydHVhbCB2b2lkIGRlbGV0ZU9iamVjdFN0 b3JlUmVjb3JkKGludDY0X3QgZGF0YWJhc2VJZCwgaW50NjRfdCBvYmplY3RTdG9yZUlkLCBjb25z dCBPYmplY3RTdG9yZVJlY29yZElkZW50aWZpZXIqKTsKICAgICB2aXJ0dWFsIGludDY0X3QgZ2V0 S2V5R2VuZXJhdG9yQ3VycmVudE51bWJlcihpbnQ2NF90IGRhdGFiYXNlSWQsIGludDY0X3Qgb2Jq ZWN0U3RvcmVJZCk7CiAgICAgdmlydHVhbCBib29sIG1heWJlVXBkYXRlS2V5R2VuZXJhdG9yQ3Vy cmVudE51bWJlcihpbnQ2NF90IGRhdGFiYXNlSWQsIGludDY0X3Qgb2JqZWN0U3RvcmVJZCwgaW50 NjRfdCBuZXdTdGF0ZSwgYm9vbCBjaGVja0N1cnJlbnQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS90ZXN0cy9JREJGYWtlQmFja2luZ1N0b3JlLmggYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3Rlc3RzL0lEQkZha2VCYWNraW5nU3RvcmUuaAppbmRleCA4ODYyYjU4ZDRmMTY3 MjBjY2FiMWNiZTk1ZDBmN2NjN2IxYTNmNzk2Li44MmNmYTNjODhjNDQ3YjJlYmUxZGMzZWM3MmY3 ZDUyMTcyOThjN2I2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0lE QkZha2VCYWNraW5nU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0lE QkZha2VCYWNraW5nU3RvcmUuaApAQCAtNDEsMTMgKzQxLDEzIEBAIHB1YmxpYzoKIAogICAgIHZp cnR1YWwgdm9pZCBnZXRPYmplY3RTdG9yZXMoaW50NjRfdCBkYXRhYmFzZUlkLCBWZWN0b3I8aW50 NjRfdD4mIGZvdW5kSWRzLCBWZWN0b3I8U3RyaW5nPiYgZm91bmROYW1lcywgVmVjdG9yPElEQktl eVBhdGg+JiBmb3VuZEtleVBhdGhzLCBWZWN0b3I8Ym9vbD4mIGZvdW5kQXV0b0luY3JlbWVudEZs YWdzKSBPVkVSUklERSB7IH0KICAgICB2aXJ0dWFsIGJvb2wgY3JlYXRlT2JqZWN0U3RvcmUoaW50 NjRfdCBkYXRhYmFzZUlkLCBjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IElEQktleVBhdGgmIGtl eVBhdGgsIGJvb2wgYXV0b0luY3JlbWVudCwgaW50NjRfdCYgYXNzaWduZWRPYmplY3RTdG9yZUlk KSBPVkVSUklERSB7IHJldHVybiBmYWxzZTsgfQotICAgIHZpcnR1YWwgdm9pZCBkZWxldGVPYmpl Y3RTdG9yZShpbnQ2NF90IGRhdGFiYXNlSWQsIGludDY0X3Qgb2JqZWN0U3RvcmVJZCkgT1ZFUlJJ REUgeyB9CisgICAgdmlydHVhbCBib29sIGRlbGV0ZU9iamVjdFN0b3JlKGludDY0X3QgZGF0YWJh c2VJZCwgaW50NjRfdCBvYmplY3RTdG9yZUlkKSBPVkVSUklERSB7IHJldHVybiB0cnVlOyB9CiAK ICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8T2JqZWN0U3RvcmVSZWNvcmRJZGVudGlmaWVyPiBjcmVh dGVJbnZhbGlkUmVjb3JkSWRlbnRpZmllcigpIE9WRVJSSURFIHsgcmV0dXJuIFBhc3NSZWZQdHI8 T2JqZWN0U3RvcmVSZWNvcmRJZGVudGlmaWVyPigpOyB9CiAKICAgICB2aXJ0dWFsIFN0cmluZyBn ZXRPYmplY3RTdG9yZVJlY29yZChpbnQ2NF90IGRhdGFiYXNlSWQsIGludDY0X3Qgb2JqZWN0U3Rv cmVJZCwgY29uc3QgSURCS2V5JikgT1ZFUlJJREUgeyByZXR1cm4gU3RyaW5nKCk7IH0KICAgICB2 aXJ0dWFsIGJvb2wgcHV0T2JqZWN0U3RvcmVSZWNvcmQoaW50NjRfdCBkYXRhYmFzZUlkLCBpbnQ2 NF90IG9iamVjdFN0b3JlSWQsIGNvbnN0IElEQktleSYsIGNvbnN0IFN0cmluZyYgdmFsdWUsIE9i amVjdFN0b3JlUmVjb3JkSWRlbnRpZmllciopIE9WRVJSSURFIHsgcmV0dXJuIGZhbHNlOyB9Ci0g ICAgdmlydHVhbCB2b2lkIGNsZWFyT2JqZWN0U3RvcmUoaW50NjRfdCBkYXRhYmFzZUlkLCBpbnQ2 NF90IG9iamVjdFN0b3JlSWQpIE9WRVJSSURFIHsgfQorICAgIHZpcnR1YWwgYm9vbCBjbGVhck9i amVjdFN0b3JlKGludDY0X3QgZGF0YWJhc2VJZCwgaW50NjRfdCBvYmplY3RTdG9yZUlkKSBPVkVS UklERSB7IHJldHVybiB0cnVlOyB9CiAgICAgdmlydHVhbCB2b2lkIGRlbGV0ZU9iamVjdFN0b3Jl UmVjb3JkKGludDY0X3QgZGF0YWJhc2VJZCwgaW50NjRfdCBvYmplY3RTdG9yZUlkLCBjb25zdCBP YmplY3RTdG9yZVJlY29yZElkZW50aWZpZXIqKSBPVkVSUklERSB7IH0KICAgICB2aXJ0dWFsIGlu dDY0X3QgZ2V0S2V5R2VuZXJhdG9yQ3VycmVudE51bWJlcihpbnQ2NF90IGRhdGFiYXNlSWQsIGlu dDY0X3Qgb2JqZWN0U3RvcmVJZCkgT1ZFUlJJREUgeyByZXR1cm4gMDsgfQogICAgIHZpcnR1YWwg Ym9vbCBtYXliZVVwZGF0ZUtleUdlbmVyYXRvckN1cnJlbnROdW1iZXIoaW50NjRfdCBkYXRhYmFz ZUlkLCBpbnQ2NF90IG9iamVjdFN0b3JlSWQsIGludDY0X3QgbmV3TnVtYmVyLCBib29sIGNoZWNr Q3VycmVudCkgT1ZFUlJJREUgeyByZXR1cm4gZmFsc2U7IH0K