70743 2011-10-24 11:00:57 -0700 IndexedDB: Replace bool args in IDBKeyRange private methods with enum 2011-12-07 17:33:49 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jsbell jsbell dglazkov dgrogan hans tony webkit.review.bot oldest_to_newest 489447 0 jsbell 2011-10-24 11:00:57 -0700 Per tony@chromium.org's comment in https://bugs.webkit.org/show_bug.cgi?id=70065: WebKit style prefers using enums rather than bools for arguments. It makes it more clear at the caller what the second param is. Since the code was already using bools, this is just a suggestion for a future cleanup. This would only apply to the private methods, not the idl methods. 508269 1 116389 jsbell 2011-11-23 11:56:17 -0800 Created attachment 116389 Patch 508271 2 jsbell 2011-11-23 11:57:47 -0800 Trivial change to better align with WebKit style, at tony@'s suggestion. 508294 3 116389 webkit.review.bot 2011-11-23 12:22:35 -0800 Comment on attachment 116389 Patch Attachment 116389 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10636028 New failing tests: storage/indexeddb/keyrange.html storage/indexeddb/objectstore-cursor.html storage/indexeddb/index-cursor.html storage/indexeddb/mozilla/indexes.html storage/indexeddb/mozilla/cursors.html 508295 4 jsbell 2011-11-23 12:23:36 -0800 Oops, that was embarrassing. 508369 5 116418 jsbell 2011-11-23 13:52:38 -0800 Created attachment 116418 Patch 508370 6 116418 jsbell 2011-11-23 13:53:04 -0800 Comment on attachment 116418 Patch This time for real. 508812 7 116418 tony 2011-11-24 09:01:56 -0800 Comment on attachment 116418 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116418&action=review > Source/WebCore/storage/IDBKeyRange.cpp:52 > - return IDBKeyRange::create(key, key, false, false); > + return IDBKeyRange::create(key, key, Closed, Closed); This isn't much better than bools and doesn't really improve the readability of the code. Values like MinBoundOpen, MinBoundClosed might be better (you could have separate enums for min and max). What is meant by Open and Closed in this context? Do you mean inclusive/exclusive or bounded/unbounded? 509937 8 jsbell 2011-11-28 10:33:20 -0800 (In reply to comment #7) > > This isn't much better than bools and doesn't really improve the readability of the code. Yeah, I didn't think so either. > Values like MinBoundOpen, MinBoundClosed might be better (you could have separate enums for min and max). I'll consider that. > What is meant by Open and Closed in this context? Do you mean inclusive/exclusive or bounded/unbounded? It's inclusive/exclusive, which would be better names except the spec uses Open/Closed in reference to interval terminology and I thought spec alignment was preferable. 516769 9 118237 jsbell 2011-12-07 11:19:44 -0800 Created attachment 118237 Patch 516770 10 jsbell 2011-12-07 11:20:49 -0800 Still only a minimal readability improvement over the bools. 516782 11 118237 tony 2011-12-07 11:38:08 -0800 Comment on attachment 118237 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=118237&action=review The ternaries aren't great, but it seems like we just have to push the enum usage further out and they will go away. > Source/WebCore/storage/IDBKeyRange.cpp:52 > - return IDBKeyRange::create(key, key, false, false); > + return IDBKeyRange::create(key, key, LowerBoundClosed, UpperBoundClosed); This is definitely easier to read. > Source/WebCore/storage/IDBKeyRange.cpp:55 > PassRefPtr<IDBKeyRange> IDBKeyRange::lowerBound(PassRefPtr<IDBKey> bound, bool open, ExceptionCode& ec) Using LowerBoundType here would be nice. Could be a follow up change. > Source/WebCore/storage/IDBKeyRange.cpp:65 > PassRefPtr<IDBKeyRange> IDBKeyRange::upperBound(PassRefPtr<IDBKey> bound, bool open, ExceptionCode& ec) And UpperBoundType here. 516786 12 jsbell 2011-12-07 11:42:45 -0800 (In reply to comment #11) > (From update of attachment 118237 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=118237&action=review > > The ternaries aren't great, but it seems like we just have to push the enum usage further out and they will go away. Let me pull them out into separate lines, which should improve things... > > Source/WebCore/storage/IDBKeyRange.cpp:52 > > - return IDBKeyRange::create(key, key, false, false); > > + return IDBKeyRange::create(key, key, LowerBoundClosed, UpperBoundClosed); > > This is definitely easier to read. > > > Source/WebCore/storage/IDBKeyRange.cpp:55 > > PassRefPtr<IDBKeyRange> IDBKeyRange::lowerBound(PassRefPtr<IDBKey> bound, bool open, ExceptionCode& ec) > > Using LowerBoundType here would be nice. Could be a follow up change. Unfortunately, that's a public method exposed in the IDL, with bool in the signature, so we can't change that. > > Source/WebCore/storage/IDBKeyRange.cpp:65 > > PassRefPtr<IDBKeyRange> IDBKeyRange::upperBound(PassRefPtr<IDBKey> bound, bool open, ExceptionCode& ec) > > And UpperBoundType here. Ditto. 516789 13 tony 2011-12-07 11:44:15 -0800 (In reply to comment #12) > (In reply to comment #11) > > (From update of attachment 118237 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=118237&action=review > > > > The ternaries aren't great, but it seems like we just have to push the enum usage further out and they will go away. > > Let me pull them out into separate lines, which should improve things... Oh, I would still keep them inline. It's just verbose, not a big deal. 516792 14 118237 jsbell 2011-12-07 11:45:30 -0800 Comment on attachment 118237 Patch Okay then. cq? 517013 15 118237 webkit.review.bot 2011-12-07 17:33:44 -0800 Comment on attachment 118237 Patch Clearing flags on attachment: 118237 Committed r102289: <http://trac.webkit.org/changeset/102289> 517015 16 webkit.review.bot 2011-12-07 17:33:49 -0800 All reviewed patches have been landed. Closing bug. 116389 2011-11-23 11:56:17 -0800 2011-11-23 13:52:35 -0800 Patch bug-70743-20111123115616.patch text/plain 3795 jsbell U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxMDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2I4MDMyZTk3ZWIxZGQw NWQ5Mjg1ZjQxYzBkZTZjMzFiYzg2MDU4My4uNGM4ZGIyNTRkMjc3ZGQ2MWQ3OWQxZTI5MGY2MjU5 NjhlMThiMmMxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDExLTExLTIzICBKb3No dWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5kZXhlZERCOiBSZXBs YWNlIGJvb2wgYXJncyBpbiBJREJLZXlSYW5nZSBwcml2YXRlIG1ldGhvZHMgd2l0aCBlbnVtCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDc0MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0 cyAtIG5vIGZ1bmN0aW9uYWwgY2hhbmdlcy4KKworICAgICAgICAqIHN0b3JhZ2UvSURCS2V5UmFu Z2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCS2V5UmFuZ2U6OklEQktleVJhbmdlKToKKyAg ICAgICAgKFdlYkNvcmU6OklEQktleVJhbmdlOjpib3VuZCk6CisgICAgICAgICogc3RvcmFnZS9J REJLZXlSYW5nZS5oOgorICAgICAgICAoV2ViQ29yZTo6SURCS2V5UmFuZ2U6OmNyZWF0ZSk6Cisg ICAgICAgIChXZWJDb3JlOjpJREJLZXlSYW5nZTo6bG93ZXJPcGVuKToKKyAgICAgICAgKFdlYkNv cmU6OklEQktleVJhbmdlOjp1cHBlck9wZW4pOgorCiAyMDExLTExLTIyICBLZW5uZXRoIFJ1c3Nl bGwgIDxrYnJAZ29vZ2xlLmNvbT4KIAogICAgICAgICBbY2hyb21pdW1dIFN1cHBvcnQgQ29yZSBB bmltYXRpb24gcGx1Z2lucyBpbiBjb21wb3NpdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9zdG9yYWdlL0lEQktleVJhbmdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCS2V5 UmFuZ2UuY3BwCmluZGV4IDc1MWY5Y2JiZWY0NmUzMjNkMTc5YzU5OTgxMGUyNmE4Nzc5NjBlZTAu LjJjMmUxM2Y5NjdhYmRlZDdiMzgyN2MzNTEyYjc1ZTNiOWZjOGIzZDAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCS2V5UmFuZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3N0b3JhZ2UvSURCS2V5UmFuZ2UuY3BwCkBAIC0zMywxMSArMzMsMTEgQEAKIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCi1JREJLZXlSYW5nZTo6SURCS2V5UmFuZ2UoUGFzc1JlZlB0cjxJREJLZXk+ IGxvd2VyLCBQYXNzUmVmUHRyPElEQktleT4gdXBwZXIsIGJvb2wgbG93ZXJPcGVuLCBib29sIHVw cGVyT3BlbikKK0lEQktleVJhbmdlOjpJREJLZXlSYW5nZShQYXNzUmVmUHRyPElEQktleT4gbG93 ZXIsIFBhc3NSZWZQdHI8SURCS2V5PiB1cHBlciwgQm91bmRUeXBlIGxvd2VyVHlwZSwgQm91bmRU eXBlIHVwcGVyVHlwZSkKICAgICA6IG1fbG93ZXIobG93ZXIpCiAgICAgLCBtX3VwcGVyKHVwcGVy KQotICAgICwgbV9sb3dlck9wZW4obG93ZXJPcGVuKQotICAgICwgbV91cHBlck9wZW4odXBwZXJP cGVuKQorICAgICwgbV9sb3dlclR5cGUobG93ZXJUeXBlKQorICAgICwgbV91cHBlclR5cGUodXBw ZXJUeXBlKQogewogfQogCkBAIC03OSw3ICs3OSw3IEBAIFBhc3NSZWZQdHI8SURCS2V5UmFuZ2U+ IElEQktleVJhbmdlOjpib3VuZChQYXNzUmVmUHRyPElEQktleT4gbG93ZXIsIFBhc3NSZWZQdHI8 CiAgICAgICAgIHJldHVybiAwOwogICAgIH0KIAotICAgIHJldHVybiBJREJLZXlSYW5nZTo6Y3Jl YXRlKGxvd2VyLCB1cHBlciwgbG93ZXJPcGVuLCB1cHBlck9wZW4pOworICAgIHJldHVybiBJREJL ZXlSYW5nZTo6Y3JlYXRlKGxvd2VyLCB1cHBlciwgbG93ZXJPcGVuID8gT3BlbiA6IENsb3NlZCwg dXBwZXJPcGVuID8gT3BlbiA6IENsb3NlZCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCS2V5UmFuZ2UuaCBiL1NvdXJj ZS9XZWJDb3JlL3N0b3JhZ2UvSURCS2V5UmFuZ2UuaAppbmRleCA0YzA2YzdiNjA0OGNlODk3YmNl OWYxMzI3Zjk5M2NkMDNlNWVmMTY0Li45YWU1MmVmOTNhZjg0YzNlYjU5YjlhNGRjOTBkOTg1NzQ2 YmJiZWMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL0lEQktleVJhbmdlLmgK KysrIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9JREJLZXlSYW5nZS5oCkBAIC00MSwxNCArNDEs MTQgQEAgY2xhc3MgSURCS2V5UmFuZ2UgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50ZWQ8SURC S2V5UmFuZ2U+IHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxJREJLZXlSYW5nZT4g Y3JlYXRlKFBhc3NSZWZQdHI8SURCS2V5PiBsb3dlciwgUGFzc1JlZlB0cjxJREJLZXk+IHVwcGVy LCBib29sIGxvd2VyT3BlbiwgYm9vbCB1cHBlck9wZW4pCiAgICAgewotICAgICAgICByZXR1cm4g YWRvcHRSZWYobmV3IElEQktleVJhbmdlKGxvd2VyLCB1cHBlciwgbG93ZXJPcGVuLCB1cHBlck9w ZW4pKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBJREJLZXlSYW5nZShsb3dlciwgdXBw ZXIsIGxvd2VyT3BlbiA/IE9wZW4gOiBDbG9zZWQsIHVwcGVyT3BlbiA/IE9wZW4gOiBDbG9zZWQp KTsKICAgICB9CiAgICAgfklEQktleVJhbmdlKCkgeyB9CiAKICAgICBQYXNzUmVmUHRyPElEQktl eT4gbG93ZXIoKSBjb25zdCB7IHJldHVybiBtX2xvd2VyOyB9CiAgICAgUGFzc1JlZlB0cjxJREJL ZXk+IHVwcGVyKCkgY29uc3QgeyByZXR1cm4gbV91cHBlcjsgfQotICAgIGJvb2wgbG93ZXJPcGVu KCkgY29uc3QgeyByZXR1cm4gbV9sb3dlck9wZW47IH0KLSAgICBib29sIHVwcGVyT3BlbigpIGNv bnN0IHsgcmV0dXJuIG1fdXBwZXJPcGVuOyB9CisgICAgYm9vbCBsb3dlck9wZW4oKSBjb25zdCB7 IHJldHVybiBtX2xvd2VyVHlwZSA9PSBPcGVuOyB9CisgICAgYm9vbCB1cHBlck9wZW4oKSBjb25z dCB7IHJldHVybiBtX3VwcGVyVHlwZSA9PSBPcGVuOyB9CiAKICAgICBzdGF0aWMgUGFzc1JlZlB0 cjxJREJLZXlSYW5nZT4gb25seShQYXNzUmVmUHRyPElEQktleT4gdmFsdWUsIEV4Y2VwdGlvbkNv ZGUmKTsKIApAQCAtNzUsMTIgKzc1LDE3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1JlZlB0 cjxJREJLZXlSYW5nZT4gYm91bmQoUGFzc1JlZlB0cjxJREJLZXk+IGxvd2VyLCBQYXNzUmVmUHRy PElEQktleT4gdXBwZXIsIGJvb2wgbG93ZXJPcGVuLCBib29sIHVwcGVyT3BlbiwgRXhjZXB0aW9u Q29kZSYpOwogCiBwcml2YXRlOgotICAgIElEQktleVJhbmdlKFBhc3NSZWZQdHI8SURCS2V5PiBs b3dlciwgUGFzc1JlZlB0cjxJREJLZXk+IHVwcGVyLCBib29sIGxvd2VyT3BlbiwgYm9vbCB1cHBl ck9wZW4pOworICAgIGVudW0gQm91bmRUeXBlIHsKKyAgICAgICAgT3BlbiwKKyAgICAgICAgQ2xv c2VkCisgICAgfTsKKworICAgIElEQktleVJhbmdlKFBhc3NSZWZQdHI8SURCS2V5PiBsb3dlciwg UGFzc1JlZlB0cjxJREJLZXk+IHVwcGVyLCBCb3VuZFR5cGUgbG93ZXJUeXBlLCBCb3VuZFR5cGUg dXBwZXJUeXBlKTsKIAogICAgIFJlZlB0cjxJREJLZXk+IG1fbG93ZXI7CiAgICAgUmVmUHRyPElE QktleT4gbV91cHBlcjsKLSAgICBib29sIG1fbG93ZXJPcGVuOwotICAgIGJvb2wgbV91cHBlck9w ZW47CisgICAgQm91bmRUeXBlIG1fbG93ZXJUeXBlOworICAgIEJvdW5kVHlwZSBtX3VwcGVyVHlw ZTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 116418 2011-11-23 13:52:38 -0800 2011-12-07 11:19:40 -0800 Patch bug-70743-20111123135237.patch text/plain 5863 jsbell U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxMDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2I4MDMyZTk3ZWIxZGQw NWQ5Mjg1ZjQxYzBkZTZjMzFiYzg2MDU4My4uNGM4ZGIyNTRkMjc3ZGQ2MWQ3OWQxZTI5MGY2MjU5 NjhlMThiMmMxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDExLTExLTIzICBKb3No dWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5kZXhlZERCOiBSZXBs YWNlIGJvb2wgYXJncyBpbiBJREJLZXlSYW5nZSBwcml2YXRlIG1ldGhvZHMgd2l0aCBlbnVtCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDc0MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0 cyAtIG5vIGZ1bmN0aW9uYWwgY2hhbmdlcy4KKworICAgICAgICAqIHN0b3JhZ2UvSURCS2V5UmFu Z2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCS2V5UmFuZ2U6OklEQktleVJhbmdlKToKKyAg ICAgICAgKFdlYkNvcmU6OklEQktleVJhbmdlOjpib3VuZCk6CisgICAgICAgICogc3RvcmFnZS9J REJLZXlSYW5nZS5oOgorICAgICAgICAoV2ViQ29yZTo6SURCS2V5UmFuZ2U6OmNyZWF0ZSk6Cisg ICAgICAgIChXZWJDb3JlOjpJREJLZXlSYW5nZTo6bG93ZXJPcGVuKToKKyAgICAgICAgKFdlYkNv cmU6OklEQktleVJhbmdlOjp1cHBlck9wZW4pOgorCiAyMDExLTExLTIyICBLZW5uZXRoIFJ1c3Nl bGwgIDxrYnJAZ29vZ2xlLmNvbT4KIAogICAgICAgICBbY2hyb21pdW1dIFN1cHBvcnQgQ29yZSBB bmltYXRpb24gcGx1Z2lucyBpbiBjb21wb3NpdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9zdG9yYWdlL0lEQktleVJhbmdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCS2V5 UmFuZ2UuY3BwCmluZGV4IDc1MWY5Y2JiZWY0NmUzMjNkMTc5YzU5OTgxMGUyNmE4Nzc5NjBlZTAu LjgyYjBiMmMwODNmMmRjMDRmZGZmYWNjNTNhMTIyNjMyMGNkNmYyODMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCS2V5UmFuZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3N0b3JhZ2UvSURCS2V5UmFuZ2UuY3BwCkBAIC0zMywxMSArMzMsMTEgQEAKIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCi1JREJLZXlSYW5nZTo6SURCS2V5UmFuZ2UoUGFzc1JlZlB0cjxJREJLZXk+ IGxvd2VyLCBQYXNzUmVmUHRyPElEQktleT4gdXBwZXIsIGJvb2wgbG93ZXJPcGVuLCBib29sIHVw cGVyT3BlbikKK0lEQktleVJhbmdlOjpJREJLZXlSYW5nZShQYXNzUmVmUHRyPElEQktleT4gbG93 ZXIsIFBhc3NSZWZQdHI8SURCS2V5PiB1cHBlciwgQm91bmRUeXBlIGxvd2VyVHlwZSwgQm91bmRU eXBlIHVwcGVyVHlwZSkKICAgICA6IG1fbG93ZXIobG93ZXIpCiAgICAgLCBtX3VwcGVyKHVwcGVy KQotICAgICwgbV9sb3dlck9wZW4obG93ZXJPcGVuKQotICAgICwgbV91cHBlck9wZW4odXBwZXJP cGVuKQorICAgICwgbV9sb3dlclR5cGUobG93ZXJUeXBlKQorICAgICwgbV91cHBlclR5cGUodXBw ZXJUeXBlKQogewogfQogCkBAIC00OSw3ICs0OSw3IEBAIFBhc3NSZWZQdHI8SURCS2V5UmFuZ2U+ IElEQktleVJhbmdlOjpvbmx5KFBhc3NSZWZQdHI8SURCS2V5PiBwcnBLZXksIEV4Y2VwdGlvbkNv CiAgICAgICAgIHJldHVybiAwOwogICAgIH0KIAotICAgIHJldHVybiBJREJLZXlSYW5nZTo6Y3Jl YXRlKGtleSwga2V5LCBmYWxzZSwgZmFsc2UpOworICAgIHJldHVybiBJREJLZXlSYW5nZTo6Y3Jl YXRlKGtleSwga2V5LCBDbG9zZWQsIENsb3NlZCk7CiB9CiAKIFBhc3NSZWZQdHI8SURCS2V5UmFu Z2U+IElEQktleVJhbmdlOjpsb3dlckJvdW5kKFBhc3NSZWZQdHI8SURCS2V5PiBib3VuZCwgYm9v bCBvcGVuLCBFeGNlcHRpb25Db2RlJiBlYykKQEAgLTU5LDcgKzU5LDcgQEAgUGFzc1JlZlB0cjxJ REJLZXlSYW5nZT4gSURCS2V5UmFuZ2U6Omxvd2VyQm91bmQoUGFzc1JlZlB0cjxJREJLZXk+IGJv dW5kLCBib29sIG8KICAgICAgICAgcmV0dXJuIDA7CiAgICAgfQogCi0gICAgcmV0dXJuIElEQktl eVJhbmdlOjpjcmVhdGUoYm91bmQsIDAsIG9wZW4sIGZhbHNlKTsKKyAgICByZXR1cm4gSURCS2V5 UmFuZ2U6OmNyZWF0ZShib3VuZCwgMCwgb3BlbiA/IE9wZW4gOiBDbG9zZWQsIENsb3NlZCk7CiB9 CiAKIFBhc3NSZWZQdHI8SURCS2V5UmFuZ2U+IElEQktleVJhbmdlOjp1cHBlckJvdW5kKFBhc3NS ZWZQdHI8SURCS2V5PiBib3VuZCwgYm9vbCBvcGVuLCBFeGNlcHRpb25Db2RlJiBlYykKQEAgLTY5 LDcgKzY5LDcgQEAgUGFzc1JlZlB0cjxJREJLZXlSYW5nZT4gSURCS2V5UmFuZ2U6OnVwcGVyQm91 bmQoUGFzc1JlZlB0cjxJREJLZXk+IGJvdW5kLCBib29sIG8KICAgICAgICAgcmV0dXJuIDA7CiAg ICAgfQogCi0gICAgcmV0dXJuIElEQktleVJhbmdlOjpjcmVhdGUoMCwgYm91bmQsIGZhbHNlLCBv cGVuKTsKKyAgICByZXR1cm4gSURCS2V5UmFuZ2U6OmNyZWF0ZSgwLCBib3VuZCwgQ2xvc2VkLCBv cGVuID8gT3BlbiA6IENsb3NlZCk7CiB9CiAKIFBhc3NSZWZQdHI8SURCS2V5UmFuZ2U+IElEQktl eVJhbmdlOjpib3VuZChQYXNzUmVmUHRyPElEQktleT4gbG93ZXIsIFBhc3NSZWZQdHI8SURCS2V5 PiB1cHBlciwgYm9vbCBsb3dlck9wZW4sIGJvb2wgdXBwZXJPcGVuLCBFeGNlcHRpb25Db2RlJiBl YykKQEAgLTc5LDcgKzc5LDcgQEAgUGFzc1JlZlB0cjxJREJLZXlSYW5nZT4gSURCS2V5UmFuZ2U6 OmJvdW5kKFBhc3NSZWZQdHI8SURCS2V5PiBsb3dlciwgUGFzc1JlZlB0cjwKICAgICAgICAgcmV0 dXJuIDA7CiAgICAgfQogCi0gICAgcmV0dXJuIElEQktleVJhbmdlOjpjcmVhdGUobG93ZXIsIHVw cGVyLCBsb3dlck9wZW4sIHVwcGVyT3Blbik7CisgICAgcmV0dXJuIElEQktleVJhbmdlOjpjcmVh dGUobG93ZXIsIHVwcGVyLCBsb3dlck9wZW4gPyBPcGVuIDogQ2xvc2VkLCB1cHBlck9wZW4gPyBP cGVuIDogQ2xvc2VkKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvc3RvcmFnZS9JREJLZXlSYW5nZS5oIGIvU291cmNlL1dlYkNvcmUvc3Rv cmFnZS9JREJLZXlSYW5nZS5oCmluZGV4IDRjMDZjN2I2MDQ4Y2U4OTdiY2U5ZjEzMjdmOTkzY2Qw M2U1ZWYxNjQuLmUxYTRlOWUyY2U0NmU5OTYzZmE4YWM1YTUwZjBhYWQ0MmQ5ODhmYTkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCS2V5UmFuZ2UuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9zdG9yYWdlL0lEQktleVJhbmdlLmgKQEAgLTM5LDE2ICszOSwyMSBAQCB0eXBlZGVm IGludCBFeGNlcHRpb25Db2RlOwogCiBjbGFzcyBJREJLZXlSYW5nZSA6IHB1YmxpYyBUaHJlYWRT YWZlUmVmQ291bnRlZDxJREJLZXlSYW5nZT4gewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzUmVm UHRyPElEQktleVJhbmdlPiBjcmVhdGUoUGFzc1JlZlB0cjxJREJLZXk+IGxvd2VyLCBQYXNzUmVm UHRyPElEQktleT4gdXBwZXIsIGJvb2wgbG93ZXJPcGVuLCBib29sIHVwcGVyT3BlbikKKyAgICBl bnVtIEJvdW5kVHlwZSB7CisgICAgICAgIE9wZW4sCisgICAgICAgIENsb3NlZAorICAgIH07CisK KyAgICBzdGF0aWMgUGFzc1JlZlB0cjxJREJLZXlSYW5nZT4gY3JlYXRlKFBhc3NSZWZQdHI8SURC S2V5PiBsb3dlciwgUGFzc1JlZlB0cjxJREJLZXk+IHVwcGVyLCBCb3VuZFR5cGUgbG93ZXJUeXBl LCBCb3VuZFR5cGUgdXBwZXJUeXBlKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5l dyBJREJLZXlSYW5nZShsb3dlciwgdXBwZXIsIGxvd2VyT3BlbiwgdXBwZXJPcGVuKSk7CisgICAg ICAgIHJldHVybiBhZG9wdFJlZihuZXcgSURCS2V5UmFuZ2UobG93ZXIsIHVwcGVyLCBsb3dlclR5 cGUsIHVwcGVyVHlwZSkpOwogICAgIH0KICAgICB+SURCS2V5UmFuZ2UoKSB7IH0KIAogICAgIFBh c3NSZWZQdHI8SURCS2V5PiBsb3dlcigpIGNvbnN0IHsgcmV0dXJuIG1fbG93ZXI7IH0KICAgICBQ YXNzUmVmUHRyPElEQktleT4gdXBwZXIoKSBjb25zdCB7IHJldHVybiBtX3VwcGVyOyB9Ci0gICAg Ym9vbCBsb3dlck9wZW4oKSBjb25zdCB7IHJldHVybiBtX2xvd2VyT3BlbjsgfQotICAgIGJvb2wg dXBwZXJPcGVuKCkgY29uc3QgeyByZXR1cm4gbV91cHBlck9wZW47IH0KKyAgICBib29sIGxvd2Vy T3BlbigpIGNvbnN0IHsgcmV0dXJuIG1fbG93ZXJUeXBlID09IE9wZW47IH0KKyAgICBib29sIHVw cGVyT3BlbigpIGNvbnN0IHsgcmV0dXJuIG1fdXBwZXJUeXBlID09IE9wZW47IH0KIAogICAgIHN0 YXRpYyBQYXNzUmVmUHRyPElEQktleVJhbmdlPiBvbmx5KFBhc3NSZWZQdHI8SURCS2V5PiB2YWx1 ZSwgRXhjZXB0aW9uQ29kZSYpOwogCkBAIC03NSwxMiArODAsMTIgQEAgcHVibGljOgogICAgIHN0 YXRpYyBQYXNzUmVmUHRyPElEQktleVJhbmdlPiBib3VuZChQYXNzUmVmUHRyPElEQktleT4gbG93 ZXIsIFBhc3NSZWZQdHI8SURCS2V5PiB1cHBlciwgYm9vbCBsb3dlck9wZW4sIGJvb2wgdXBwZXJP cGVuLCBFeGNlcHRpb25Db2RlJik7CiAKIHByaXZhdGU6Ci0gICAgSURCS2V5UmFuZ2UoUGFzc1Jl ZlB0cjxJREJLZXk+IGxvd2VyLCBQYXNzUmVmUHRyPElEQktleT4gdXBwZXIsIGJvb2wgbG93ZXJP cGVuLCBib29sIHVwcGVyT3Blbik7CisgICAgSURCS2V5UmFuZ2UoUGFzc1JlZlB0cjxJREJLZXk+ IGxvd2VyLCBQYXNzUmVmUHRyPElEQktleT4gdXBwZXIsIEJvdW5kVHlwZSBsb3dlclR5cGUsIEJv dW5kVHlwZSB1cHBlclR5cGUpOwogCiAgICAgUmVmUHRyPElEQktleT4gbV9sb3dlcjsKICAgICBS ZWZQdHI8SURCS2V5PiBtX3VwcGVyOwotICAgIGJvb2wgbV9sb3dlck9wZW47Ci0gICAgYm9vbCBt X3VwcGVyT3BlbjsKKyAgICBCb3VuZFR5cGUgbV9sb3dlclR5cGU7CisgICAgQm91bmRUeXBlIG1f dXBwZXJUeXBlOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSURCS2V5UmFuZ2UuY3BwIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViSURCS2V5UmFuZ2UuY3BwCmluZGV4IGVhNjQxZTk2MDQ5NmVhNDFl MTdjYWRhZDg4MzIzMmEzMThkYTMwMmMuLmVmMmEwZTQzYjE0NTNkZGU3NjRiZDZkYmEwZTk5YTE2 NTgzMTBkNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklEQktl eVJhbmdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJLZXlSYW5n ZS5jcHAKQEAgLTQ2LDcgKzQ2LDcgQEAgdm9pZCBXZWJJREJLZXlSYW5nZTo6YXNzaWduKGNvbnN0 IFdlYklEQktleSYgbG93ZXIsIGNvbnN0IFdlYklEQktleSYgdXBwZXIsIGJvb2wKICAgICBpZiAo bG93ZXIudHlwZSgpID09IFdlYklEQktleTo6SW52YWxpZFR5cGUgJiYgdXBwZXIudHlwZSgpID09 IFdlYklEQktleTo6SW52YWxpZFR5cGUpCiAgICAgICAgIG1fcHJpdmF0ZSA9IDA7CiAgICAgZWxz ZQotICAgICAgICBtX3ByaXZhdGUgPSBJREJLZXlSYW5nZTo6Y3JlYXRlKGxvd2VyLCB1cHBlciwg bG93ZXJPcGVuLCB1cHBlck9wZW4pOworICAgICAgICBtX3ByaXZhdGUgPSBJREJLZXlSYW5nZTo6 Y3JlYXRlKGxvd2VyLCB1cHBlciwgbG93ZXJPcGVuID8gSURCS2V5UmFuZ2U6Ok9wZW4gOiBJREJL ZXlSYW5nZTo6Q2xvc2VkLCB1cHBlck9wZW4gPyBJREJLZXlSYW5nZTo6T3BlbiA6IElEQktleVJh bmdlOjpDbG9zZWQpOwogfQogCiB2b2lkIFdlYklEQktleVJhbmdlOjpyZXNldCgpCg== 118237 2011-12-07 11:19:44 -0800 2011-12-07 17:33:44 -0800 Patch bug-70743-20111207111943.patch text/plain 6168 jsbell U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyMjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDc1YzlhZDk5NDcwNGE4 NzljYzA2MDVkM2MwNWYwMjQ0OWZmNWE0Ny4uNzIyYmJlMmIxMDdiNGNlYWE1ZTliOGQwMmIzZDg2 MmJmNjViODAyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDExLTEyLTA3ICBKb3No dWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5kZXhlZERCOiBSZXBs YWNlIGJvb2wgYXJncyBpbiBJREJLZXlSYW5nZSBwcml2YXRlIG1ldGhvZHMgd2l0aCBlbnVtCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDc0MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0 cyAtIG5vIGZ1bmN0aW9uYWwgY2hhbmdlcy4KKworICAgICAgICAqIHN0b3JhZ2UvSURCS2V5UmFu Z2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCS2V5UmFuZ2U6OklEQktleVJhbmdlKToKKyAg ICAgICAgKFdlYkNvcmU6OklEQktleVJhbmdlOjpib3VuZCk6CisgICAgICAgICogc3RvcmFnZS9J REJLZXlSYW5nZS5oOgorICAgICAgICAoV2ViQ29yZTo6SURCS2V5UmFuZ2U6OmNyZWF0ZSk6Cisg ICAgICAgIChXZWJDb3JlOjpJREJLZXlSYW5nZTo6bG93ZXJPcGVuKToKKyAgICAgICAgKFdlYkNv cmU6OklEQktleVJhbmdlOjp1cHBlck9wZW4pOgorCiAyMDExLTExLTMwICBTaW1vbiBIYXVzbWFu biAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdIFY4IGJ1aWxkIGZp eGVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9JREJLZXlSYW5nZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL0lEQktleVJhbmdlLmNwcAppbmRleCA3NTFmOWNiYmVm NDZlMzIzZDE3OWM1OTk4MTBlMjZhODc3OTYwZWUwLi45N2NhNTM4ZGNjNmEyNDljOWYyNGFmYjk3 MWNlMWFiZDgzMGQ1YzBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL0lEQktl eVJhbmdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL0lEQktleVJhbmdlLmNwcApA QCAtMzMsMTEgKzMzLDExIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotSURCS2V5UmFuZ2U6 OklEQktleVJhbmdlKFBhc3NSZWZQdHI8SURCS2V5PiBsb3dlciwgUGFzc1JlZlB0cjxJREJLZXk+ IHVwcGVyLCBib29sIGxvd2VyT3BlbiwgYm9vbCB1cHBlck9wZW4pCitJREJLZXlSYW5nZTo6SURC S2V5UmFuZ2UoUGFzc1JlZlB0cjxJREJLZXk+IGxvd2VyLCBQYXNzUmVmUHRyPElEQktleT4gdXBw ZXIsIExvd2VyQm91bmRUeXBlIGxvd2VyVHlwZSwgVXBwZXJCb3VuZFR5cGUgdXBwZXJUeXBlKQog ICAgIDogbV9sb3dlcihsb3dlcikKICAgICAsIG1fdXBwZXIodXBwZXIpCi0gICAgLCBtX2xvd2Vy T3Blbihsb3dlck9wZW4pCi0gICAgLCBtX3VwcGVyT3Blbih1cHBlck9wZW4pCisgICAgLCBtX2xv d2VyVHlwZShsb3dlclR5cGUpCisgICAgLCBtX3VwcGVyVHlwZSh1cHBlclR5cGUpCiB7CiB9CiAK QEAgLTQ5LDcgKzQ5LDcgQEAgUGFzc1JlZlB0cjxJREJLZXlSYW5nZT4gSURCS2V5UmFuZ2U6Om9u bHkoUGFzc1JlZlB0cjxJREJLZXk+IHBycEtleSwgRXhjZXB0aW9uQ28KICAgICAgICAgcmV0dXJu IDA7CiAgICAgfQogCi0gICAgcmV0dXJuIElEQktleVJhbmdlOjpjcmVhdGUoa2V5LCBrZXksIGZh bHNlLCBmYWxzZSk7CisgICAgcmV0dXJuIElEQktleVJhbmdlOjpjcmVhdGUoa2V5LCBrZXksIExv d2VyQm91bmRDbG9zZWQsIFVwcGVyQm91bmRDbG9zZWQpOwogfQogCiBQYXNzUmVmUHRyPElEQktl eVJhbmdlPiBJREJLZXlSYW5nZTo6bG93ZXJCb3VuZChQYXNzUmVmUHRyPElEQktleT4gYm91bmQs IGJvb2wgb3BlbiwgRXhjZXB0aW9uQ29kZSYgZWMpCkBAIC01OSw3ICs1OSw3IEBAIFBhc3NSZWZQ dHI8SURCS2V5UmFuZ2U+IElEQktleVJhbmdlOjpsb3dlckJvdW5kKFBhc3NSZWZQdHI8SURCS2V5 PiBib3VuZCwgYm9vbCBvCiAgICAgICAgIHJldHVybiAwOwogICAgIH0KIAotICAgIHJldHVybiBJ REJLZXlSYW5nZTo6Y3JlYXRlKGJvdW5kLCAwLCBvcGVuLCBmYWxzZSk7CisgICAgcmV0dXJuIElE QktleVJhbmdlOjpjcmVhdGUoYm91bmQsIDAsIG9wZW4gPyBMb3dlckJvdW5kT3BlbiA6IExvd2Vy Qm91bmRDbG9zZWQsIFVwcGVyQm91bmRDbG9zZWQpOwogfQogCiBQYXNzUmVmUHRyPElEQktleVJh bmdlPiBJREJLZXlSYW5nZTo6dXBwZXJCb3VuZChQYXNzUmVmUHRyPElEQktleT4gYm91bmQsIGJv b2wgb3BlbiwgRXhjZXB0aW9uQ29kZSYgZWMpCkBAIC02OSw3ICs2OSw3IEBAIFBhc3NSZWZQdHI8 SURCS2V5UmFuZ2U+IElEQktleVJhbmdlOjp1cHBlckJvdW5kKFBhc3NSZWZQdHI8SURCS2V5PiBi b3VuZCwgYm9vbCBvCiAgICAgICAgIHJldHVybiAwOwogICAgIH0KIAotICAgIHJldHVybiBJREJL ZXlSYW5nZTo6Y3JlYXRlKDAsIGJvdW5kLCBmYWxzZSwgb3Blbik7CisgICAgcmV0dXJuIElEQktl eVJhbmdlOjpjcmVhdGUoMCwgYm91bmQsIExvd2VyQm91bmRDbG9zZWQsIG9wZW4gPyBVcHBlckJv dW5kT3BlbiA6IFVwcGVyQm91bmRDbG9zZWQpOwogfQogCiBQYXNzUmVmUHRyPElEQktleVJhbmdl PiBJREJLZXlSYW5nZTo6Ym91bmQoUGFzc1JlZlB0cjxJREJLZXk+IGxvd2VyLCBQYXNzUmVmUHRy PElEQktleT4gdXBwZXIsIGJvb2wgbG93ZXJPcGVuLCBib29sIHVwcGVyT3BlbiwgRXhjZXB0aW9u Q29kZSYgZWMpCkBAIC03OSw3ICs3OSw3IEBAIFBhc3NSZWZQdHI8SURCS2V5UmFuZ2U+IElEQktl eVJhbmdlOjpib3VuZChQYXNzUmVmUHRyPElEQktleT4gbG93ZXIsIFBhc3NSZWZQdHI8CiAgICAg ICAgIHJldHVybiAwOwogICAgIH0KIAotICAgIHJldHVybiBJREJLZXlSYW5nZTo6Y3JlYXRlKGxv d2VyLCB1cHBlciwgbG93ZXJPcGVuLCB1cHBlck9wZW4pOworICAgIHJldHVybiBJREJLZXlSYW5n ZTo6Y3JlYXRlKGxvd2VyLCB1cHBlciwgbG93ZXJPcGVuID8gTG93ZXJCb3VuZE9wZW4gOiBMb3dl ckJvdW5kQ2xvc2VkLCB1cHBlck9wZW4gPyBVcHBlckJvdW5kT3BlbiA6IFVwcGVyQm91bmRDbG9z ZWQpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9zdG9yYWdlL0lEQktleVJhbmdlLmggYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL0lEQktl eVJhbmdlLmgKaW5kZXggNGMwNmM3YjYwNDhjZTg5N2JjZTlmMTMyN2Y5OTNjZDAzZTVlZjE2NC4u YjlhOThkYWViM2RmMDdiZDVhM2ZjMzY0YjY4YTdmMmViMmM5YzQ0MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvc3RvcmFnZS9JREJLZXlSYW5nZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0 b3JhZ2UvSURCS2V5UmFuZ2UuaApAQCAtMzksMTYgKzM5LDI1IEBAIHR5cGVkZWYgaW50IEV4Y2Vw dGlvbkNvZGU7CiAKIGNsYXNzIElEQktleVJhbmdlIDogcHVibGljIFRocmVhZFNhZmVSZWZDb3Vu dGVkPElEQktleVJhbmdlPiB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NSZWZQdHI8SURCS2V5 UmFuZ2U+IGNyZWF0ZShQYXNzUmVmUHRyPElEQktleT4gbG93ZXIsIFBhc3NSZWZQdHI8SURCS2V5 PiB1cHBlciwgYm9vbCBsb3dlck9wZW4sIGJvb2wgdXBwZXJPcGVuKQorICAgIGVudW0gTG93ZXJC b3VuZFR5cGUgeworICAgICAgICBMb3dlckJvdW5kT3BlbiwKKyAgICAgICAgTG93ZXJCb3VuZENs b3NlZAorICAgIH07CisgICAgZW51bSBVcHBlckJvdW5kVHlwZSB7CisgICAgICAgIFVwcGVyQm91 bmRPcGVuLAorICAgICAgICBVcHBlckJvdW5kQ2xvc2VkCisgICAgfTsKKworICAgIHN0YXRpYyBQ YXNzUmVmUHRyPElEQktleVJhbmdlPiBjcmVhdGUoUGFzc1JlZlB0cjxJREJLZXk+IGxvd2VyLCBQ YXNzUmVmUHRyPElEQktleT4gdXBwZXIsIExvd2VyQm91bmRUeXBlIGxvd2VyVHlwZSwgVXBwZXJC b3VuZFR5cGUgdXBwZXJUeXBlKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBJ REJLZXlSYW5nZShsb3dlciwgdXBwZXIsIGxvd2VyT3BlbiwgdXBwZXJPcGVuKSk7CisgICAgICAg IHJldHVybiBhZG9wdFJlZihuZXcgSURCS2V5UmFuZ2UobG93ZXIsIHVwcGVyLCBsb3dlclR5cGUs IHVwcGVyVHlwZSkpOwogICAgIH0KICAgICB+SURCS2V5UmFuZ2UoKSB7IH0KIAogICAgIFBhc3NS ZWZQdHI8SURCS2V5PiBsb3dlcigpIGNvbnN0IHsgcmV0dXJuIG1fbG93ZXI7IH0KICAgICBQYXNz UmVmUHRyPElEQktleT4gdXBwZXIoKSBjb25zdCB7IHJldHVybiBtX3VwcGVyOyB9Ci0gICAgYm9v bCBsb3dlck9wZW4oKSBjb25zdCB7IHJldHVybiBtX2xvd2VyT3BlbjsgfQotICAgIGJvb2wgdXBw ZXJPcGVuKCkgY29uc3QgeyByZXR1cm4gbV91cHBlck9wZW47IH0KKyAgICBib29sIGxvd2VyT3Bl bigpIGNvbnN0IHsgcmV0dXJuIG1fbG93ZXJUeXBlID09IExvd2VyQm91bmRPcGVuOyB9CisgICAg Ym9vbCB1cHBlck9wZW4oKSBjb25zdCB7IHJldHVybiBtX3VwcGVyVHlwZSA9PSBVcHBlckJvdW5k T3BlbjsgfQogCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8SURCS2V5UmFuZ2U+IG9ubHkoUGFzc1Jl ZlB0cjxJREJLZXk+IHZhbHVlLCBFeGNlcHRpb25Db2RlJik7CiAKQEAgLTc1LDEyICs4NCwxMiBA QCBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8SURCS2V5UmFuZ2U+IGJvdW5kKFBhc3NS ZWZQdHI8SURCS2V5PiBsb3dlciwgUGFzc1JlZlB0cjxJREJLZXk+IHVwcGVyLCBib29sIGxvd2Vy T3BlbiwgYm9vbCB1cHBlck9wZW4sIEV4Y2VwdGlvbkNvZGUmKTsKIAogcHJpdmF0ZToKLSAgICBJ REJLZXlSYW5nZShQYXNzUmVmUHRyPElEQktleT4gbG93ZXIsIFBhc3NSZWZQdHI8SURCS2V5PiB1 cHBlciwgYm9vbCBsb3dlck9wZW4sIGJvb2wgdXBwZXJPcGVuKTsKKyAgICBJREJLZXlSYW5nZShQ YXNzUmVmUHRyPElEQktleT4gbG93ZXIsIFBhc3NSZWZQdHI8SURCS2V5PiB1cHBlciwgTG93ZXJC b3VuZFR5cGUgbG93ZXJUeXBlLCBVcHBlckJvdW5kVHlwZSB1cHBlclR5cGUpOwogCiAgICAgUmVm UHRyPElEQktleT4gbV9sb3dlcjsKICAgICBSZWZQdHI8SURCS2V5PiBtX3VwcGVyOwotICAgIGJv b2wgbV9sb3dlck9wZW47Ci0gICAgYm9vbCBtX3VwcGVyT3BlbjsKKyAgICBMb3dlckJvdW5kVHlw ZSBtX2xvd2VyVHlwZTsKKyAgICBVcHBlckJvdW5kVHlwZSBtX3VwcGVyVHlwZTsKIH07CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYklEQktleVJhbmdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklE QktleVJhbmdlLmNwcAppbmRleCBlYTY0MWU5NjA0OTZlYTQxZTE3Y2FkYWQ4ODMyMzJhMzE4ZGEz MDJjLi5mZWYwZDNjM2RhZWFhNTQwYmFiNzM4M2I1YjM3MDQzMmFkNjJmOGZjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJLZXlSYW5nZS5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSURCS2V5UmFuZ2UuY3BwCkBAIC00Niw3ICs0Niw3 IEBAIHZvaWQgV2ViSURCS2V5UmFuZ2U6OmFzc2lnbihjb25zdCBXZWJJREJLZXkmIGxvd2VyLCBj b25zdCBXZWJJREJLZXkmIHVwcGVyLCBib29sCiAgICAgaWYgKGxvd2VyLnR5cGUoKSA9PSBXZWJJ REJLZXk6OkludmFsaWRUeXBlICYmIHVwcGVyLnR5cGUoKSA9PSBXZWJJREJLZXk6OkludmFsaWRU eXBlKQogICAgICAgICBtX3ByaXZhdGUgPSAwOwogICAgIGVsc2UKLSAgICAgICAgbV9wcml2YXRl ID0gSURCS2V5UmFuZ2U6OmNyZWF0ZShsb3dlciwgdXBwZXIsIGxvd2VyT3BlbiwgdXBwZXJPcGVu KTsKKyAgICAgICAgbV9wcml2YXRlID0gSURCS2V5UmFuZ2U6OmNyZWF0ZShsb3dlciwgdXBwZXIs IGxvd2VyT3BlbiA/IElEQktleVJhbmdlOjpMb3dlckJvdW5kT3BlbiA6IElEQktleVJhbmdlOjpM b3dlckJvdW5kQ2xvc2VkLCB1cHBlck9wZW4gPyBJREJLZXlSYW5nZTo6VXBwZXJCb3VuZE9wZW4g OiBJREJLZXlSYW5nZTo6VXBwZXJCb3VuZENsb3NlZCk7CiB9CiAKIHZvaWQgV2ViSURCS2V5UmFu Z2U6OnJlc2V0KCkK