127912 2014-01-30 09:31:39 -0800 IDB: Add no-op plumbing for deleteDatabase and deleteRange 2014-01-30 09:45:31 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 124521 1 beidson beidson commit-queue oldest_to_newest 973759 0 beidson 2014-01-30 09:31:39 -0800 IDB: Add no-op plumbing for deleteDatabase and deleteRange To get rid of future busywork... 973761 1 222676 beidson 2014-01-30 09:34:18 -0800 Created attachment 222676 Patch v1 973762 2 commit-queue 2014-01-30 09:35:56 -0800 Attachment 222676 did not pass style-queue: ERROR: Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h:91: The parameter name "keyRange" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:650: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 2 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 973763 3 222676 ap 2014-01-30 09:42:21 -0800 Comment on attachment 222676 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=222676&action=review > Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:639 > +void UniqueIDBDatabase::deleteRange(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const WebCore::IDBKeyRangeData& keyRangeData, std::function<void(uint32_t, const String&)> callback) Please check all cpp files for WebCore namespace prefixes, and remove them. 973765 4 beidson 2014-01-30 09:44:42 -0800 (In reply to comment #3) > (From update of attachment 222676 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=222676&action=review > > > Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:639 > > +void UniqueIDBDatabase::deleteRange(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const WebCore::IDBKeyRangeData& keyRangeData, std::function<void(uint32_t, const String&)> callback) > > Please check all cpp files for WebCore namespace prefixes, and remove them. Whoops, thanks! 973767 5 beidson 2014-01-30 09:45:31 -0800 http://trac.webkit.org/changeset/163087 222676 2014-01-30 09:34:18 -0800 2014-01-30 09:42:20 -0800 Patch v1 patch text/plain 18037 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmMjRhNTJkLi45Njk4NTY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTQtMDEtMzAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIElEQjogQWRkIG5vLW9wIHBsdW1iaW5nIGZvciBkZWxldGVEYXRhYmFzZSBhbmQgZGVsZXRl UmFuZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEy NzkxMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZv cndhcmQgdGhlIGNhbGxzIHRvIHRoZSBEYXRhYmFzZVByb2Nlc3MsIGFuZCBoYW5kbGUgY29tcGxl dGlvbiBmcm9tIHRoZSBEYXRhYmFzZVByb2Nlc3M6CisgICAgICAgICogV2ViUHJvY2Vzcy9EYXRh YmFzZXMvSW5kZXhlZERCL1dlYklEQlNlcnZlckNvbm5lY3Rpb24uY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpkZWxldGVEYXRhYmFzZSk6CisgICAgICAgIChX ZWJLaXQ6OldlYklEQlNlcnZlckNvbm5lY3Rpb246OmRpZERlbGV0ZURhdGFiYXNlKToKKyAgICAg ICAgKFdlYktpdDo6V2ViSURCU2VydmVyQ29ubmVjdGlvbjo6ZGVsZXRlUmFuZ2UpOgorICAgICAg ICAoV2ViS2l0OjpXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpkaWREZWxldGVSYW5nZSk6CisgICAg ICAgICogV2ViUHJvY2Vzcy9EYXRhYmFzZXMvSW5kZXhlZERCL1dlYklEQlNlcnZlckNvbm5lY3Rp b24uaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL0RhdGFiYXNlcy9JbmRleGVkREIvV2ViSURCU2Vy dmVyQ29ubmVjdGlvbi5tZXNzYWdlcy5pbjoKKworICAgICAgICBTdHViIG91dCBkZWxldGVEYXRh YmFzZSwgYW5kIGZvcndhcmQgZGVsZXRlUmFuZ2UgdG8gdGhlIGFwcHJvcHJpYXRlIFVuaXF1ZUlE QkRhdGFiYXNlOgorICAgICAgICAqIERhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvRGF0YWJhc2VQ cm9jZXNzSURCQ29ubmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OkRhdGFiYXNlUHJvY2Vz c0lEQkNvbm5lY3Rpb246OmRlbGV0ZURhdGFiYXNlKToKKyAgICAgICAgKFdlYktpdDo6RGF0YWJh c2VQcm9jZXNzSURCQ29ubmVjdGlvbjo6ZGVsZXRlUmFuZ2UpOgorICAgICAgICAqIERhdGFiYXNl UHJvY2Vzcy9JbmRleGVkREIvRGF0YWJhc2VQcm9jZXNzSURCQ29ubmVjdGlvbi5oOgorICAgICAg ICAqIERhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvRGF0YWJhc2VQcm9jZXNzSURCQ29ubmVjdGlv bi5tZXNzYWdlcy5pbjoKKworICAgICAgICBGb3J3YXJkIHRoZSByZXF1ZXN0IHRvIHRoZSBiYWNr aW5nIHN0b3JlIHRocmVhZCwgYW5kIGhhbmRsZSB0aGUgcmVzcG9uc2UgZnJvbSB0aGF0IHRocmVh ZDoKKyAgICAgICAgKiBEYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL1VuaXF1ZUlEQkRhdGFiYXNl LmNwcDoKKyAgICAgICAgKFdlYktpdDo6VW5pcXVlSURCRGF0YWJhc2U6OmRlbGV0ZVJhbmdlKToK KyAgICAgICAgKFdlYktpdDo6VW5pcXVlSURCRGF0YWJhc2U6OmRlbGV0ZVJhbmdlSW5CYWNraW5n U3RvcmUpOgorICAgICAgICAoV2ViS2l0OjpVbmlxdWVJREJEYXRhYmFzZTo6ZGlkRGVsZXRlUmFu Z2VJbkJhY2tpbmdTdG9yZSk6CisgICAgICAgICogRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9V bmlxdWVJREJEYXRhYmFzZS5oOgorCiAyMDE0LTAxLTMwICBBbmRyZWkgQnVjdXIgIDxhYnVjdXJA YWRvYmUuY29tPgogCiAgICAgICAgIFJlbW92ZSB0aGUgQUNDRUxFUkFURURfQ09NUE9TSVRJTkcg ZmxhZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWRE Qi9EYXRhYmFzZVByb2Nlc3NJREJDb25uZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQyL0RhdGFi YXNlUHJvY2Vzcy9JbmRleGVkREIvRGF0YWJhc2VQcm9jZXNzSURCQ29ubmVjdGlvbi5jcHAKaW5k ZXggYzBkZWY1OC4uZjEwMWE4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQ cm9jZXNzL0luZGV4ZWREQi9EYXRhYmFzZVByb2Nlc3NJREJDb25uZWN0aW9uLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL0RhdGFiYXNlUHJvY2Vzc0lE QkNvbm5lY3Rpb24uY3BwCkBAIC03OSw2ICs3OSwxNCBAQCB2b2lkIERhdGFiYXNlUHJvY2Vzc0lE QkNvbm5lY3Rpb246OmdldE9yRXN0YWJsaXNoSURCRGF0YWJhc2VNZXRhZGF0YSh1aW50NjRfdCBy ZQogICAgIH0pOwogfQogCit2b2lkIERhdGFiYXNlUHJvY2Vzc0lEQkNvbm5lY3Rpb246OmRlbGV0 ZURhdGFiYXNlKHVpbnQ2NF90IHJlcXVlc3RJRCwgY29uc3QgU3RyaW5nJiBkYXRhYmFzZU5hbWUp Cit7CisgICAgTE9HKElEQiwgIkRhdGFiYXNlUHJvY2VzcyBkZWxldGVEYXRhYmFzZSByZXF1ZXN0 IElEICVsbHUiLCByZXF1ZXN0SUQpOworCisgICAgLy8gRklYTUU6IEltcGxlbWVudAorICAgIHNl bmQoTWVzc2FnZXM6OldlYklEQlNlcnZlckNvbm5lY3Rpb246OkRpZERlbGV0ZURhdGFiYXNlKHJl cXVlc3RJRCwgZmFsc2UpKTsKK30KKwogdm9pZCBEYXRhYmFzZVByb2Nlc3NJREJDb25uZWN0aW9u OjpvcGVuVHJhbnNhY3Rpb24odWludDY0X3QgcmVxdWVzdElELCBpbnQ2NF90IHRyYW5zYWN0aW9u SUQsIGNvbnN0IFZlY3RvcjxpbnQ2NF90PiYgb2JqZWN0U3RvcmVJRHMsIHVpbnQ2NF90IGludE1v ZGUpCiB7CiAgICAgQVNTRVJUKG1fdW5pcXVlSURCRGF0YWJhc2UpOwpAQCAtMjQ2LDYgKzI1NCwx OCBAQCB2b2lkIERhdGFiYXNlUHJvY2Vzc0lEQkNvbm5lY3Rpb246OmNvdW50KHVpbnQ2NF90IHJl cXVlc3RJRCwgaW50NjRfdCB0cmFuc2FjdGlvbgogICAgIH0pOwogfQogCit2b2lkIERhdGFiYXNl UHJvY2Vzc0lEQkNvbm5lY3Rpb246OmRlbGV0ZVJhbmdlKHVpbnQ2NF90IHJlcXVlc3RJRCwgaW50 NjRfdCB0cmFuc2FjdGlvbklELCBpbnQ2NF90IG9iamVjdFN0b3JlSUQsIGNvbnN0IFdlYkNvcmU6 OklEQktleVJhbmdlRGF0YSYga2V5UmFuZ2VEYXRhKQoreworICAgIEFTU0VSVChtX3VuaXF1ZUlE QkRhdGFiYXNlKTsKKworICAgIExPRyhJREIsICJEYXRhYmFzZVByb2Nlc3MgZGVsZXRlUmFuZ2Ug cmVxdWVzdCBJRCAlbGx1LCBvYmplY3Qgc3RvcmUgaWQgJWxsaSIsIHJlcXVlc3RJRCwgb2JqZWN0 U3RvcmVJRCk7CisKKyAgICBSZWZQdHI8RGF0YWJhc2VQcm9jZXNzSURCQ29ubmVjdGlvbj4gY29u bmVjdGlvbih0aGlzKTsKKyAgICBtX3VuaXF1ZUlEQkRhdGFiYXNlLT5kZWxldGVSYW5nZShJREJJ ZGVudGlmaWVyKCp0aGlzLCB0cmFuc2FjdGlvbklEKSwgb2JqZWN0U3RvcmVJRCwga2V5UmFuZ2VE YXRhLCBbY29ubmVjdGlvbiwgcmVxdWVzdElEXSh1aW50MzJfdCBlcnJvckNvZGUsIGNvbnN0IFN0 cmluZyYgZXJyb3JNZXNzYWdlKSB7CisgICAgICAgIGNvbm5lY3Rpb24tPnNlbmQoTWVzc2FnZXM6 OldlYklEQlNlcnZlckNvbm5lY3Rpb246OkRpZERlbGV0ZVJhbmdlKHJlcXVlc3RJRCwgZXJyb3JD b2RlLCBlcnJvck1lc3NhZ2UpKTsKKyAgICB9KTsKK30KKwogdm9pZCBEYXRhYmFzZVByb2Nlc3NJ REJDb25uZWN0aW9uOjpvcGVuQ3Vyc29yKHVpbnQ2NF90IHJlcXVlc3RJRCwgaW50NjRfdCB0cmFu c2FjdGlvbklELCBpbnQ2NF90IG9iamVjdFN0b3JlSUQsIGludDY0X3QgaW5kZXhJRCwgaW50NjRf dCBjdXJzb3JEaXJlY3Rpb24sIGludDY0X3QgY3Vyc29yVHlwZSwgaW50NjRfdCB0YXNrVHlwZSwg Y29uc3QgV2ViQ29yZTo6SURCS2V5UmFuZ2VEYXRhJiBrZXlSYW5nZURhdGEpCiB7CiAgICAgQVNT RVJUKG1fdW5pcXVlSURCRGF0YWJhc2UpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvRGF0 YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9EYXRhYmFzZVByb2Nlc3NJREJDb25uZWN0aW9uLmggYi9T b3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL0RhdGFiYXNlUHJvY2Vzc0lE QkNvbm5lY3Rpb24uaAppbmRleCA1MTliOGQ0Li42N2E2MDc4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL0RhdGFiYXNlUHJvY2Vzc0lEQkNvbm5l Y3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL0Rh dGFiYXNlUHJvY2Vzc0lEQkNvbm5lY3Rpb24uaApAQCAtNjgsNiArNjgsNyBAQCBwcml2YXRlOgog ICAgIC8vIE1lc3NhZ2UgaGFuZGxlcnMuCiAgICAgdm9pZCBlc3RhYmxpc2hDb25uZWN0aW9uKGNv bnN0IFN0cmluZyYgZGF0YWJhc2VOYW1lLCBjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEmIG9wZW5p bmdPcmlnaW4sIGNvbnN0IFNlY3VyaXR5T3JpZ2luRGF0YSYgbWFpbkZyYW1lT3JpZ2luKTsKICAg ICB2b2lkIGdldE9yRXN0YWJsaXNoSURCRGF0YWJhc2VNZXRhZGF0YSh1aW50NjRfdCByZXF1ZXN0 SUQpOworICAgIHZvaWQgZGVsZXRlRGF0YWJhc2UodWludDY0X3QgcmVxdWVzdElELCBjb25zdCBT dHJpbmcmIGRhdGFiYXNlTmFtZSk7CiAgICAgdm9pZCBvcGVuVHJhbnNhY3Rpb24odWludDY0X3Qg cmVxdWVzdElELCBpbnQ2NF90IHRyYW5zYWN0aW9uSUQsIGNvbnN0IFZlY3RvcjxpbnQ2NF90PiYg b2JqZWN0U3RvcmVJRHMsIHVpbnQ2NF90IHRyYW5zYWN0aW9uTW9kZSk7CiAgICAgdm9pZCBiZWdp blRyYW5zYWN0aW9uKHVpbnQ2NF90IHJlcXVlc3RJRCwgaW50NjRfdCB0cmFuc2FjdGlvbklEKTsK ICAgICB2b2lkIGNvbW1pdFRyYW5zYWN0aW9uKHVpbnQ2NF90IHJlcXVlc3RJRCwgaW50NjRfdCB0 cmFuc2FjdGlvbklEKTsKQEAgLTg3LDYgKzg4LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGN1cnNv ckl0ZXJhdGUodWludDY0X3QgcmVxdWVzdElELCBpbnQ2NF90IGN1cnNvcklELCBjb25zdCBXZWJD b3JlOjpJREJLZXlEYXRhJik7CiAKICAgICB2b2lkIGNvdW50KHVpbnQ2NF90IHJlcXVlc3RJRCwg aW50NjRfdCB0cmFuc2FjdGlvbklELCBpbnQ2NF90IG9iamVjdFN0b3JlSUQsIGludDY0X3QgaW5k ZXhJRCwgY29uc3QgV2ViQ29yZTo6SURCS2V5UmFuZ2VEYXRhJik7CisgICAgdm9pZCBkZWxldGVS YW5nZSh1aW50NjRfdCByZXF1ZXN0SUQsIGludDY0X3QgdHJhbnNhY3Rpb25JRCwgaW50NjRfdCBv YmplY3RTdG9yZUlELCBjb25zdCBXZWJDb3JlOjpJREJLZXlSYW5nZURhdGEmIGtleVJhbmdlKTsK IAogICAgIFJlZjxEYXRhYmFzZVRvV2ViUHJvY2Vzc0Nvbm5lY3Rpb24+IG1fY29ubmVjdGlvbjsK ICAgICB1aW50NjRfdCBtX3NlcnZlckNvbm5lY3Rpb25JZGVudGlmaWVyOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9EYXRhYmFzZVByb2Nlc3NJ REJDb25uZWN0aW9uLm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNz L0luZGV4ZWREQi9EYXRhYmFzZVByb2Nlc3NJREJDb25uZWN0aW9uLm1lc3NhZ2VzLmluCmluZGV4 IGM1Mjc5YTcuLmI1YTVhYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJv Y2Vzcy9JbmRleGVkREIvRGF0YWJhc2VQcm9jZXNzSURCQ29ubmVjdGlvbi5tZXNzYWdlcy5pbgor KysgYi9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL0RhdGFiYXNlUHJv Y2Vzc0lEQkNvbm5lY3Rpb24ubWVzc2FnZXMuaW4KQEAgLTI1LDYgKzI1LDcgQEAKIG1lc3NhZ2Vz IC0+IERhdGFiYXNlUHJvY2Vzc0lEQkNvbm5lY3Rpb24gTGVnYWN5UmVjZWl2ZXIgewogICAgIEVz dGFibGlzaENvbm5lY3Rpb24oU3RyaW5nIGRhdGFiYXNlTmFtZSwgV2ViS2l0OjpTZWN1cml0eU9y aWdpbkRhdGEgb3BlbmluZ09yaWdpbiwgV2ViS2l0OjpTZWN1cml0eU9yaWdpbkRhdGEgbWFpbkZy YW1lT3JpZ2luKQogICAgIEdldE9yRXN0YWJsaXNoSURCRGF0YWJhc2VNZXRhZGF0YSh1aW50NjRf dCByZXF1ZXN0SUQpCisgICAgRGVsZXRlRGF0YWJhc2UodWludDY0X3QgcmVxdWVzdElELCBTdHJp bmcgZGF0YWJhc2VOYW1lKQogCiAgICAgT3BlblRyYW5zYWN0aW9uKHVpbnQ2NF90IHJlcXVlc3RJ RCwgaW50NjRfdCB0cmFuc2FjdGlvbklELCBWZWN0b3I8aW50NjRfdD4gb2JqZWN0U3RvcmVJRHMs IHVpbnQ2NF90IHRyYW5zYWN0aW9uTW9kZSkKICAgICBCZWdpblRyYW5zYWN0aW9uKHVpbnQ2NF90 IHJlcXVlc3RJRCwgaW50NjRfdCB0cmFuc2FjdGlvbklEKQpAQCAtNDcsNiArNDgsNyBAQCBtZXNz YWdlcyAtPiBEYXRhYmFzZVByb2Nlc3NJREJDb25uZWN0aW9uIExlZ2FjeVJlY2VpdmVyIHsKICAg ICBDdXJzb3JJdGVyYXRlKHVpbnQ2NF90IHJlcXVlc3RJRCwgaW50NjRfdCBjdXJzb3JJRCwgV2Vi Q29yZTo6SURCS2V5RGF0YSBrZXkpCiAgICAgCiAgICAgQ291bnQodWludDY0X3QgcmVxdWVzdElE LCBpbnQ2NF90IHRyYW5zYWN0aW9uSUQsIGludDY0X3Qgb2JqZWN0U3RvcmVJRCwgaW50NjRfdCBp bmRleElELCBXZWJDb3JlOjpJREJLZXlSYW5nZURhdGEga2V5UmFuZ2UpCisgICAgRGVsZXRlUmFu Z2UodWludDY0X3QgcmVxdWVzdElELCBpbnQ2NF90IHRyYW5zYWN0aW9uSUQsIGludDY0X3Qgb2Jq ZWN0U3RvcmVJRCwgV2ViQ29yZTo6SURCS2V5UmFuZ2VEYXRhIGtleVJhbmdlKQogfQogCiAjZW5k aWYgLy8gRU5BQkxFKElOREVYRURfREFUQUJBU0UpICYmIEVOQUJMRShEQVRBQkFTRV9QUk9DRVNT KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9V bmlxdWVJREJEYXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5k ZXhlZERCL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcAppbmRleCA1NzkwYTdmLi5iMmM0ZTMzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL1VuaXF1ZUlE QkRhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhl ZERCL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcApAQCAtNjM2LDYgKzYzNiwyNyBAQCB2b2lkIFVuaXF1 ZUlEQkRhdGFiYXNlOjpjb3VudChjb25zdCBJREJJZGVudGlmaWVyJiB0cmFuc2FjdGlvbklkZW50 aWZpZXIsIGludDY0XwogICAgIHBvc3REYXRhYmFzZVRhc2soY3JlYXRlQXN5bmNUYXNrKCp0aGlz LCAmVW5pcXVlSURCRGF0YWJhc2U6OmNvdW50SW5CYWNraW5nU3RvcmUsIHJlcXVlc3RJRCwgdHJh bnNhY3Rpb25JZGVudGlmaWVyLCBvYmplY3RTdG9yZUlELCBpbmRleElELCBrZXlSYW5nZURhdGEp KTsKIH0KIAordm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6ZGVsZXRlUmFuZ2UoY29uc3QgSURCSWRl bnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCBpbnQ2NF90IG9iamVjdFN0b3JlSUQsIGNv bnN0IFdlYkNvcmU6OklEQktleVJhbmdlRGF0YSYga2V5UmFuZ2VEYXRhLCBzdGQ6OmZ1bmN0aW9u PHZvaWQodWludDMyX3QsIGNvbnN0IFN0cmluZyYpPiBjYWxsYmFjaykKK3sKKyAgICBBU1NFUlQo aXNNYWluVGhyZWFkKCkpOworCisgICAgaWYgKCFtX2FjY2VwdGluZ05ld1JlcXVlc3RzKSB7Cisg ICAgICAgIGNhbGxiYWNrKElOVkFMSURfU1RBVEVfRVJSLCAiVW5hYmxlIHRvIGRlbGV0ZVJhbmdl IGZyb20gZGF0YWJhc2UgYmVjYXVzZSBpdCBoYXMgc2h1dCBkb3duIik7CisgICAgICAgIHJldHVy bjsKKyAgICB9CisKKyAgICBSZWZQdHI8QXN5bmNSZXF1ZXN0PiByZXF1ZXN0ID0gQXN5bmNSZXF1 ZXN0SW1wbDx1aW50MzJfdCwgY29uc3QgU3RyaW5nJj46OmNyZWF0ZShbY2FsbGJhY2tdKHVpbnQz Ml90IGVycm9yQ29kZSwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpIHsKKyAgICAgICAgY2Fs bGJhY2soZXJyb3JDb2RlLCBlcnJvck1lc3NhZ2UpOworICAgIH0sIFtjYWxsYmFja10oKSB7Cisg ICAgICAgIGNhbGxiYWNrKElOVkFMSURfU1RBVEVfRVJSLCAiVW5hYmxlIHRvIGRlbGV0ZVJhbmdl IGZyb20gZGF0YWJhc2UiKTsKKyAgICB9KTsKKworICAgIHVpbnQ2NF90IHJlcXVlc3RJRCA9IHJl cXVlc3QtPnJlcXVlc3RJRCgpOworICAgIG1fcGVuZGluZ0RhdGFiYXNlVGFza3MuYWRkKHJlcXVl c3RJRCwgcmVxdWVzdC5yZWxlYXNlKCkpOworCisgICAgcG9zdERhdGFiYXNlVGFzayhjcmVhdGVB c3luY1Rhc2soKnRoaXMsICZVbmlxdWVJREJEYXRhYmFzZTo6ZGVsZXRlUmFuZ2VJbkJhY2tpbmdT dG9yZSwgcmVxdWVzdElELCB0cmFuc2FjdGlvbklkZW50aWZpZXIsIG9iamVjdFN0b3JlSUQsIGtl eVJhbmdlRGF0YSkpOworfQorCiB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpvcGVuQmFja2luZ1N0 b3JlVHJhbnNhY3Rpb24oY29uc3QgSURCSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVy LCBjb25zdCBWZWN0b3I8aW50NjRfdD4mIG9iamVjdFN0b3JlSURzLCBJbmRleGVkREI6OlRyYW5z YWN0aW9uTW9kZSBtb2RlKQogewogICAgIEFTU0VSVCghaXNNYWluVGhyZWFkKCkpOwpAQCAtOTE2 LDYgKzkzNywyMSBAQCB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpkaWRDb3VudEluQmFja2luZ1N0 b3JlKHVpbnQ2NF90IHJlcXVlc3RJRCwgaW50NjRfdCBjb3VudAogICAgIHJlcXVlc3QtPmNvbXBs ZXRlUmVxdWVzdChjb3VudCwgZXJyb3JDb2RlLCBlcnJvck1lc3NhZ2UpOwogfQogCit2b2lkIFVu aXF1ZUlEQkRhdGFiYXNlOjpkZWxldGVSYW5nZUluQmFja2luZ1N0b3JlKHVpbnQ2NF90IHJlcXVl c3RJRCwgY29uc3QgSURCSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCBpbnQ2NF90 IG9iamVjdFN0b3JlSUQsIGNvbnN0IFdlYkNvcmU6OklEQktleVJhbmdlRGF0YSYpCit7CisgICAg Ly8gRklYTUU6IEltcGxlbWVudAorCisgICAgcG9zdE1haW5UaHJlYWRUYXNrKGNyZWF0ZUFzeW5j VGFzaygqdGhpcywgJlVuaXF1ZUlEQkRhdGFiYXNlOjpkaWREZWxldGVSYW5nZUluQmFja2luZ1N0 b3JlLCByZXF1ZXN0SUQsIElEQkRhdGFiYXNlRXhjZXB0aW9uOjpVbmtub3duRXJyb3IsIEFTQ0lJ TGl0ZXJhbCgiZGVsZXRlUmFuZ2UgaW4gYmFja2luZyBzdG9yZSBub3Qgc3VwcG9ydGVkIHlldCIp KSk7Cit9CisKK3ZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OmRpZERlbGV0ZVJhbmdlSW5CYWNraW5n U3RvcmUodWludDY0X3QgcmVxdWVzdElELCB1aW50MzJfdCBlcnJvckNvZGUsIGNvbnN0IFN0cmlu ZyYgZXJyb3JNZXNzYWdlKQoreworICAgIFJlZlB0cjxBc3luY1JlcXVlc3Q+IHJlcXVlc3QgPSBt X3BlbmRpbmdEYXRhYmFzZVRhc2tzLnRha2UocmVxdWVzdElEKTsKKyAgICBBU1NFUlQocmVxdWVz dCk7CisKKyAgICByZXF1ZXN0LT5jb21wbGV0ZVJlcXVlc3QoZXJyb3JDb2RlLCBlcnJvck1lc3Nh Z2UpOworfQorCiBTdHJpbmcgVW5pcXVlSURCRGF0YWJhc2U6OmFic29sdXRlRGF0YWJhc2VEaXJl Y3RvcnkoKSBjb25zdAogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL1VuaXF1ZUlEQkRhdGFi YXNlLmggYi9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL1VuaXF1ZUlE QkRhdGFiYXNlLmgKaW5kZXggN2RiOTk1Yy4uMWYzYWE0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9VbmlxdWVJREJEYXRhYmFzZS5oCisrKyBi L1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvVW5pcXVlSURCRGF0YWJh c2UuaApAQCAtOTIsNiArOTIsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBjdXJzb3JJdGVyYXRlKGNv bnN0IElEQklkZW50aWZpZXImIGN1cnNvcklkZW50aWZpZXIsIGNvbnN0IFdlYkNvcmU6OklEQktl eURhdGEmLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoV2ViQ29yZTo6SURCS2V5RGF0YSwgV2ViQ29yZTo6 SURCS2V5RGF0YSwgUGFzc1JlZlB0cjxXZWJDb3JlOjpTaGFyZWRCdWZmZXI+LCB1aW50MzJfdCwg Y29uc3QgU3RyaW5nJik+IGNhbGxiYWNrKTsKIAogICAgIHZvaWQgY291bnQoY29uc3QgSURCSWRl bnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCBpbnQ2NF90IG9iamVjdFN0b3JlSUQsIGlu dDY0X3QgaW5kZXhJRCwgY29uc3QgV2ViQ29yZTo6SURCS2V5UmFuZ2VEYXRhJiwgc3RkOjpmdW5j dGlvbjx2b2lkKGludDY0X3QsIHVpbnQzMl90LCBjb25zdCBTdHJpbmcmKT4gY2FsbGJhY2spOwor ICAgIHZvaWQgZGVsZXRlUmFuZ2UoY29uc3QgSURCSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVu dGlmaWVyLCBpbnQ2NF90IG9iamVjdFN0b3JlSUQsIGNvbnN0IFdlYkNvcmU6OklEQktleVJhbmdl RGF0YSYsIHN0ZDo6ZnVuY3Rpb248dm9pZCh1aW50MzJfdCwgY29uc3QgU3RyaW5nJik+IGNhbGxi YWNrKTsKIAogcHJpdmF0ZToKICAgICBVbmlxdWVJREJEYXRhYmFzZShjb25zdCBVbmlxdWVJREJE YXRhYmFzZUlkZW50aWZpZXImKTsKQEAgLTE0Miw2ICsxNDMsNyBAQCBwcml2YXRlOgogICAgIHZv aWQgYWR2YW5jZUN1cnNvckluQmFja2luZ1N0b3JlKHVpbnQ2NF90IHJlcXVlc3RJRCwgY29uc3Qg SURCSWRlbnRpZmllciYgY3Vyc29ySWRlbnRpZmllciwgdWludDY0X3QgY291bnQpOwogICAgIHZv aWQgaXRlcmF0ZUN1cnNvckluQmFja2luZ1N0b3JlKHVpbnQ2NF90IHJlcXVlc3RJRCwgY29uc3Qg SURCSWRlbnRpZmllciYgY3Vyc29ySWRlbnRpZmllciwgY29uc3QgV2ViQ29yZTo6SURCS2V5RGF0 YSYpOwogICAgIHZvaWQgY291bnRJbkJhY2tpbmdTdG9yZSh1aW50NjRfdCByZXF1ZXN0SUQsIGNv bnN0IElEQklkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgaW50NjRfdCBvYmplY3RT dG9yZUlELCBpbnQ2NF90IGluZGV4SUQsIGNvbnN0IFdlYkNvcmU6OklEQktleVJhbmdlRGF0YSYp OworICAgIHZvaWQgZGVsZXRlUmFuZ2VJbkJhY2tpbmdTdG9yZSh1aW50NjRfdCByZXF1ZXN0SUQs IGNvbnN0IElEQklkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgaW50NjRfdCBvYmpl Y3RTdG9yZUlELCBjb25zdCBXZWJDb3JlOjpJREJLZXlSYW5nZURhdGEmKTsKIAogICAgIHZvaWQg c2h1dGRvd25CYWNraW5nU3RvcmUoKTsKIApAQCAtMTYxLDYgKzE2Myw3IEBAIHByaXZhdGU6CiAg ICAgdm9pZCBkaWRBZHZhbmNlQ3Vyc29ySW5CYWNraW5nU3RvcmUodWludDY0X3QgcmVxdWVzdElE LCBjb25zdCBXZWJDb3JlOjpJREJLZXlEYXRhJiwgY29uc3QgV2ViQ29yZTo6SURCS2V5RGF0YSYs IGNvbnN0IFZlY3RvcjxjaGFyPiYsIHVpbnQzMl90IGVycm9yQ29kZSwgY29uc3QgU3RyaW5nJiBl cnJvck1lc3NhZ2UpOwogICAgIHZvaWQgZGlkSXRlcmF0ZUN1cnNvckluQmFja2luZ1N0b3JlKHVp bnQ2NF90IHJlcXVlc3RJRCwgY29uc3QgV2ViQ29yZTo6SURCS2V5RGF0YSYsIGNvbnN0IFdlYkNv cmU6OklEQktleURhdGEmLCBjb25zdCBWZWN0b3I8Y2hhcj4mLCB1aW50MzJfdCBlcnJvckNvZGUs IGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKTsKICAgICB2b2lkIGRpZENvdW50SW5CYWNraW5n U3RvcmUodWludDY0X3QgcmVxdWVzdElELCBpbnQ2NF90IGNvdW50LCB1aW50MzJfdCBlcnJvckNv ZGUsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKTsKKyAgICB2b2lkIGRpZERlbGV0ZVJhbmdl SW5CYWNraW5nU3RvcmUodWludDY0X3QgcmVxdWVzdElELCB1aW50MzJfdCBlcnJvckNvZGUsIGNv bnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKTsKIAogICAgIHZvaWQgZGlkU2h1dGRvd25CYWNraW5n U3RvcmUoKTsKICAgICB2b2lkIGRpZENvbXBsZXRlQm9vbFJlcXVlc3QodWludDY0X3QgcmVxdWVz dElELCBib29sIHN1Y2Nlc3MpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9EYXRhYmFzZXMvSW5kZXhlZERCL1dlYklEQlNlcnZlckNvbm5lY3Rpb24uY3BwIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9EYXRhYmFzZXMvSW5kZXhlZERCL1dlYklEQlNlcnZlckNvbm5l Y3Rpb24uY3BwCmluZGV4IGFkYTgwNWEuLjg5YzU0NjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvRGF0YWJhc2VzL0luZGV4ZWREQi9XZWJJREJTZXJ2ZXJDb25uZWN0aW9u LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0RhdGFiYXNlcy9JbmRleGVkREIv V2ViSURCU2VydmVyQ29ubmVjdGlvbi5jcHAKQEAgLTg1LDYgKzg1LDMxIEBAIGJvb2wgV2ViSURC U2VydmVyQ29ubmVjdGlvbjo6aXNDbG9zZWQoKQogCiB2b2lkIFdlYklEQlNlcnZlckNvbm5lY3Rp b246OmRlbGV0ZURhdGFiYXNlKGNvbnN0IFN0cmluZyYgbmFtZSwgQm9vbENhbGxiYWNrRnVuY3Rp b24gc3VjY2Vzc0NhbGxiYWNrKQogeworICAgIFJlZlB0cjxBc3luY1JlcXVlc3Q+IHNlcnZlclJl cXVlc3QgPSBBc3luY1JlcXVlc3RJbXBsPGJvb2w+OjpjcmVhdGUoc3VjY2Vzc0NhbGxiYWNrKTsK KworICAgIHNlcnZlclJlcXVlc3QtPnNldEFib3J0SGFuZGxlcihbc3VjY2Vzc0NhbGxiYWNrXSgp IHsKKyAgICAgICAgc3VjY2Vzc0NhbGxiYWNrKGZhbHNlKTsKKyAgICB9KTsKKworICAgIHVpbnQ2 NF90IHJlcXVlc3RJRCA9IHNlcnZlclJlcXVlc3QtPnJlcXVlc3RJRCgpOworICAgIEFTU0VSVCgh bV9zZXJ2ZXJSZXF1ZXN0cy5jb250YWlucyhyZXF1ZXN0SUQpKTsKKyAgICBtX3NlcnZlclJlcXVl c3RzLmFkZChyZXF1ZXN0SUQsIHNlcnZlclJlcXVlc3QucmVsZWFzZSgpKTsKKworICAgIExPRyhJ REIsICJXZWJQcm9jZXNzIGRlbGV0ZURhdGFiYXNlIHJlcXVlc3QgSUQgJWxsdSIsIHJlcXVlc3RJ RCk7CisKKyAgICBzZW5kKE1lc3NhZ2VzOjpEYXRhYmFzZVByb2Nlc3NJREJDb25uZWN0aW9uOjpE ZWxldGVEYXRhYmFzZShyZXF1ZXN0SUQsIG5hbWUpKTsKK30KKwordm9pZCBXZWJJREJTZXJ2ZXJD b25uZWN0aW9uOjpkaWREZWxldGVEYXRhYmFzZSh1aW50NjRfdCByZXF1ZXN0SUQsIGJvb2wgc3Vj Y2VzcykKK3sKKyAgICBMT0coSURCLCAiV2ViUHJvY2VzcyBkaWREZWxldGVEYXRhYmFzZSByZXF1 ZXN0IElEICVsbHUiLCByZXF1ZXN0SUQpOworCisgICAgUmVmUHRyPEFzeW5jUmVxdWVzdD4gc2Vy dmVyUmVxdWVzdCA9IG1fc2VydmVyUmVxdWVzdHMudGFrZShyZXF1ZXN0SUQpOworCisgICAgaWYg KCFzZXJ2ZXJSZXF1ZXN0KQorICAgICAgICByZXR1cm47CisKKyAgICBzZXJ2ZXJSZXF1ZXN0LT5j b21wbGV0ZVJlcXVlc3Qoc3VjY2Vzcyk7CiB9CiAKIHZvaWQgV2ViSURCU2VydmVyQ29ubmVjdGlv bjo6Z2V0T3JFc3RhYmxpc2hJREJEYXRhYmFzZU1ldGFkYXRhKEdldElEQkRhdGFiYXNlTWV0YWRh dGFGdW5jdGlvbiBjb21wbGV0aW9uQ2FsbGJhY2spCkBAIC00ODYsOCArNTExLDMzIEBAIHZvaWQg V2ViSURCU2VydmVyQ29ubmVjdGlvbjo6ZGlkQ291bnQodWludDY0X3QgcmVxdWVzdElELCBpbnQ2 NF90IGNvdW50LCB1aW50MzJfCiAgICAgc2VydmVyUmVxdWVzdC0+Y29tcGxldGVSZXF1ZXN0KGNv dW50LCBlcnJvckNvZGUgPyBJREJEYXRhYmFzZUVycm9yOjpjcmVhdGUoZXJyb3JDb2RlLCBlcnJv ck1lc3NhZ2UpIDogbnVsbHB0cik7CiB9CiAKLXZvaWQgV2ViSURCU2VydmVyQ29ubmVjdGlvbjo6 ZGVsZXRlUmFuZ2UoSURCVHJhbnNhY3Rpb25CYWNrZW5kJiwgY29uc3QgRGVsZXRlUmFuZ2VPcGVy YXRpb24mLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoUGFzc1JlZlB0cjxJREJEYXRhYmFzZUVycm9yPik+ IGNvbXBsZXRpb25DYWxsYmFjaykKK3ZvaWQgV2ViSURCU2VydmVyQ29ubmVjdGlvbjo6ZGVsZXRl UmFuZ2UoSURCVHJhbnNhY3Rpb25CYWNrZW5kJiB0cmFuc2FjdGlvbiwgY29uc3QgRGVsZXRlUmFu Z2VPcGVyYXRpb24mIG9wZXJhdGlvbiwgc3RkOjpmdW5jdGlvbjx2b2lkKFBhc3NSZWZQdHI8SURC RGF0YWJhc2VFcnJvcj4pPiBjb21wbGV0aW9uQ2FsbGJhY2spCit7CisgICAgUmVmUHRyPEFzeW5j UmVxdWVzdD4gc2VydmVyUmVxdWVzdCA9IEFzeW5jUmVxdWVzdEltcGw8UGFzc1JlZlB0cjxJREJE YXRhYmFzZUVycm9yPj46OmNyZWF0ZShjb21wbGV0aW9uQ2FsbGJhY2spOworCisgICAgc2VydmVy UmVxdWVzdC0+c2V0QWJvcnRIYW5kbGVyKFtjb21wbGV0aW9uQ2FsbGJhY2tdKCkgeworICAgICAg ICBjb21wbGV0aW9uQ2FsbGJhY2soSURCRGF0YWJhc2VFcnJvcjo6Y3JlYXRlKElEQkRhdGFiYXNl RXhjZXB0aW9uOjpVbmtub3duRXJyb3IsICJVbmtub3duIGVycm9yIG9jY3VyZWQgZ2V0dGluZyBj b3VudCIpKTsKKyAgICB9KTsKKworICAgIHVpbnQ2NF90IHJlcXVlc3RJRCA9IHNlcnZlclJlcXVl c3QtPnJlcXVlc3RJRCgpOworICAgIEFTU0VSVCghbV9zZXJ2ZXJSZXF1ZXN0cy5jb250YWlucyhy ZXF1ZXN0SUQpKTsKKyAgICBtX3NlcnZlclJlcXVlc3RzLmFkZChyZXF1ZXN0SUQsIHNlcnZlclJl cXVlc3QucmVsZWFzZSgpKTsKKworICAgIExPRyhJREIsICJXZWJQcm9jZXNzIGRlbGV0ZVJhbmdl IHJlcXVlc3QgSUQgJWxsdSIsIHJlcXVlc3RJRCk7CisKKyAgICBzZW5kKE1lc3NhZ2VzOjpEYXRh YmFzZVByb2Nlc3NJREJDb25uZWN0aW9uOjpEZWxldGVSYW5nZShyZXF1ZXN0SUQsIHRyYW5zYWN0 aW9uLmlkKCksIG9wZXJhdGlvbi5vYmplY3RTdG9yZUlEKCksIElEQktleVJhbmdlRGF0YShvcGVy YXRpb24ua2V5UmFuZ2UoKSkpKTsKK30KKwordm9pZCBXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpk aWREZWxldGVSYW5nZSh1aW50NjRfdCByZXF1ZXN0SUQsIHVpbnQzMl90IGVycm9yQ29kZSwgY29u c3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpCiB7CisgICAgTE9HKElEQiwgIldlYlByb2Nlc3MgZGlk RGVsZXRlUmFuZ2UgcmVxdWVzdCBJRCAlbGx1IiwgcmVxdWVzdElEKTsKKworICAgIFJlZlB0cjxB c3luY1JlcXVlc3Q+IHNlcnZlclJlcXVlc3QgPSBtX3NlcnZlclJlcXVlc3RzLnRha2UocmVxdWVz dElEKTsKKworICAgIGlmICghc2VydmVyUmVxdWVzdCkKKyAgICAgICAgcmV0dXJuOworCisgICAg c2VydmVyUmVxdWVzdC0+Y29tcGxldGVSZXF1ZXN0KGVycm9yQ29kZSA/IElEQkRhdGFiYXNlRXJy b3I6OmNyZWF0ZShlcnJvckNvZGUsIGVycm9yTWVzc2FnZSkgOiBudWxscHRyKTsKIH0KIAogdm9p ZCBXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpjbGVhck9iamVjdFN0b3JlKElEQlRyYW5zYWN0aW9u QmFja2VuZCYsIGNvbnN0IENsZWFyT2JqZWN0U3RvcmVPcGVyYXRpb24mIG9wZXJhdGlvbiwgc3Rk OjpmdW5jdGlvbjx2b2lkKFBhc3NSZWZQdHI8SURCRGF0YWJhc2VFcnJvcj4pPiBjb21wbGV0aW9u Q2FsbGJhY2spCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0RhdGFiYXNl cy9JbmRleGVkREIvV2ViSURCU2VydmVyQ29ubmVjdGlvbi5oIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9EYXRhYmFzZXMvSW5kZXhlZERCL1dlYklEQlNlcnZlckNvbm5lY3Rpb24uaAppbmRl eCA2YmZhZGZiLi5mNWUyMDk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L0RhdGFiYXNlcy9JbmRleGVkREIvV2ViSURCU2VydmVyQ29ubmVjdGlvbi5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvRGF0YWJhc2VzL0luZGV4ZWREQi9XZWJJREJTZXJ2ZXJDb25u ZWN0aW9uLmgKQEAgLTk2LDYgKzk2LDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIElQQzo6Q29u bmVjdGlvbiogbWVzc2FnZVNlbmRlckNvbm5lY3Rpb24oKSBvdmVycmlkZTsKIAogICAgIHZvaWQg ZGlkR2V0T3JFc3RhYmxpc2hJREJEYXRhYmFzZU1ldGFkYXRhKHVpbnQ2NF90IHJlcXVlc3RJRCwg Ym9vbCBzdWNjZXNzLCBjb25zdCBXZWJDb3JlOjpJREJEYXRhYmFzZU1ldGFkYXRhJik7CisgICAg dm9pZCBkaWREZWxldGVEYXRhYmFzZSh1aW50NjRfdCByZXF1ZXN0SUQsIGJvb2wgc3VjY2Vzcyk7 CiAgICAgdm9pZCBkaWRPcGVuVHJhbnNhY3Rpb24odWludDY0X3QgcmVxdWVzdElELCBib29sIHN1 Y2Nlc3MpOwogICAgIHZvaWQgZGlkQmVnaW5UcmFuc2FjdGlvbih1aW50NjRfdCByZXF1ZXN0SUQs IGJvb2wgc3VjY2Vzcyk7CiAgICAgdm9pZCBkaWRDb21taXRUcmFuc2FjdGlvbih1aW50NjRfdCBy ZXF1ZXN0SUQsIGJvb2wgc3VjY2Vzcyk7CkBAIC0xMTMsNiArMTE0LDcgQEAgcHJpdmF0ZToKICAg ICB2b2lkIGRpZEFkdmFuY2VDdXJzb3IodWludDY0X3QgcmVxdWVzdElELCBXZWJDb3JlOjpJREJL ZXlEYXRhJiwgV2ViQ29yZTo6SURCS2V5RGF0YSYsIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYs IHVpbnQzMl90IGVycm9yQ29kZSwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpOwogICAgIHZv aWQgZGlkSXRlcmF0ZUN1cnNvcih1aW50NjRfdCByZXF1ZXN0SUQsIFdlYkNvcmU6OklEQktleURh dGEmLCBXZWJDb3JlOjpJREJLZXlEYXRhJiwgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiwgdWlu dDMyX3QgZXJyb3JDb2RlLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSk7CiAgICAgdm9pZCBk aWRDb3VudCh1aW50NjRfdCByZXF1ZXN0SUQsIGludDY0X3QgY291bnQsIHVpbnQzMl90IGVycm9y Q29kZSwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpOworICAgIHZvaWQgZGlkRGVsZXRlUmFu Z2UodWludDY0X3QgcmVxdWVzdElELCB1aW50MzJfdCBlcnJvckNvZGUsIGNvbnN0IFN0cmluZyYg ZXJyb3JNZXNzYWdlKTsKIAogICAgIHVpbnQ2NF90IG1fc2VydmVyQ29ubmVjdGlvbklkZW50aWZp ZXI7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvRGF0YWJhc2VzL0lu ZGV4ZWREQi9XZWJJREJTZXJ2ZXJDb25uZWN0aW9uLm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9EYXRhYmFzZXMvSW5kZXhlZERCL1dlYklEQlNlcnZlckNvbm5lY3Rpb24u bWVzc2FnZXMuaW4KaW5kZXggMTBhNjQ2Yi4uOWZmM2Q4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9EYXRhYmFzZXMvSW5kZXhlZERCL1dlYklEQlNlcnZlckNvbm5lY3Rp b24ubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9EYXRhYmFzZXMv SW5kZXhlZERCL1dlYklEQlNlcnZlckNvbm5lY3Rpb24ubWVzc2FnZXMuaW4KQEAgLTI0LDYgKzI0 LDcgQEAKIAogbWVzc2FnZXMgLT4gV2ViSURCU2VydmVyQ29ubmVjdGlvbiBMZWdhY3lSZWNlaXZl ciB7CiAgICAgRGlkR2V0T3JFc3RhYmxpc2hJREJEYXRhYmFzZU1ldGFkYXRhKHVpbnQ2NF90IHJl cXVlc3RJRCwgYm9vbCBzdWNjZXNzLCBXZWJDb3JlOjpJREJEYXRhYmFzZU1ldGFkYXRhIG1ldGFk YXRhKQorICAgIERpZERlbGV0ZURhdGFiYXNlKHVpbnQ2NF90IHJlcXVlc3RJRCwgYm9vbCBzdWNj ZXNzKQogCiAgICAgRGlkT3BlblRyYW5zYWN0aW9uKHVpbnQ2NF90IHJlcXVlc3RJRCwgYm9vbCBz dWNjZXNzKQogICAgIERpZEJlZ2luVHJhbnNhY3Rpb24odWludDY0X3QgcmVxdWVzdElELCBib29s IHN1Y2Nlc3MpCkBAIC00Myw2ICs0NCw3IEBAIG1lc3NhZ2VzIC0+IFdlYklEQlNlcnZlckNvbm5l Y3Rpb24gTGVnYWN5UmVjZWl2ZXIgewogICAgIERpZEFkdmFuY2VDdXJzb3IodWludDY0X3QgcmVx dWVzdElELCBXZWJDb3JlOjpJREJLZXlEYXRhIGtleSwgV2ViQ29yZTo6SURCS2V5RGF0YSBwcmlt YXJ5S2V5LCBJUEM6OkRhdGFSZWZlcmVuY2UgdmFsdWUsIHVpbnQzMl90IGVycm9yQ29kZSwgU3Ry aW5nIGVycm9yTWVzc2FnZSkKICAgICBEaWRJdGVyYXRlQ3Vyc29yKHVpbnQ2NF90IHJlcXVlc3RJ RCwgV2ViQ29yZTo6SURCS2V5RGF0YSBrZXksIFdlYkNvcmU6OklEQktleURhdGEgcHJpbWFyeUtl eSwgSVBDOjpEYXRhUmVmZXJlbmNlIHZhbHVlLCB1aW50MzJfdCBlcnJvckNvZGUsIFN0cmluZyBl cnJvck1lc3NhZ2UpCiAgICAgRGlkQ291bnQodWludDY0X3QgcmVxdWVzdElELCBpbnQ2NF90IGNv dW50LCB1aW50MzJfdCBlcnJvckNvZGUsIFN0cmluZyBlcnJvck1lc3NhZ2UpCisgICAgRGlkRGVs ZXRlUmFuZ2UodWludDY0X3QgcmVxdWVzdElELCB1aW50MzJfdCBlcnJvckNvZGUsIFN0cmluZyBl cnJvck1lc3NhZ2UpCiB9CiAKICNlbmRpZiAvLyBFTkFCTEUoSU5ERVhFRF9EQVRBQkFTRSkgJiYg RU5BQkxFKERBVEFCQVNFX1BST0NFU1MpCg==