128423 2014-02-07 17:23:29 -0800 IDB: storage/indexeddb/mozilla/cursors.html fails 2014-02-08 15:57:19 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson alecflett commit-queue jsbell webkit-bug-importer oldest_to_newest 978194 0 beidson 2014-02-07 17:23:29 -0800 IDB: storage/indexeddb/mozilla/cursors.html fails -For object store cursors, we forgot to set the primary key. -For openCursor() with no results, we incorrectly return a cursor with undefined values when we're supposed to return a null cursor. 978195 1 webkit-bug-importer 2014-02-07 17:24:22 -0800 <rdar://problem/16017998> 978280 2 beidson 2014-02-07 21:54:37 -0800 (In reply to comment #0) > -For object store cursors, we forgot to set the primary key. > -For openCursor() with no results, we incorrectly return a cursor with undefined values when we're supposed to return a null cursor. Also, for iterating to a targetKey, we only tested for exact matches to the target key, instead of the "next key passed the target" 978281 3 223547 beidson 2014-02-07 22:00:31 -0800 Created attachment 223547 Patch v1 978282 4 commit-queue 2014-02-07 22:01:47 -0800 Attachment 223547 did not pass style-queue: ERROR: Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp:154: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 978454 5 223547 mitz 2014-02-08 15:39:54 -0800 Comment on attachment 223547 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=223547&action=review > Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp:159 > m_callbacks->onSuccess(static_cast<SharedBuffer*>(0)); Why do we need this cast? Can’t we just say nullptr? Is there some weird overloading issue? 978457 6 beidson 2014-02-08 15:47:46 -0800 (In reply to comment #5) > (From update of attachment 223547 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=223547&action=review > > > Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp:159 > > m_callbacks->onSuccess(static_cast<SharedBuffer*>(0)); > > Why do we need this cast? Can’t we just say nullptr? Is there some weird overloading issue? Sadly, yes - A massive overloading issue, in fact. If you want to cringe, take a look at IDBCallbacks.h Thanks for the review! 978458 7 beidson 2014-02-08 15:57:19 -0800 http://trac.webkit.org/changeset/163728 223547 2014-02-07 22:00:31 -0800 2014-02-08 15:39:53 -0800 Patch v1 patch text/plain 9356 beidson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2MzQwZmJmLi4yZjQzOGQwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkgQEAKIDIwMTQtMDIt MDcgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAgICAgIElEQjogc3Rv cmFnZS9pbmRleGVkZGIvbW96aWxsYS9jdXJzb3JzLmh0bWwgZmFpbHMKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzE2MDE3OTk4PiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEyODQyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogcGxhdGZvcm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRpb25zOiBVbnNraXAgc3RvcmFn ZS9pbmRleGVkZGIvbW96aWxsYS9jdXJzb3JzLmh0bWwuCisKKyAgICAgICAgUmV2ZXJ0IHRoZSBj aGFuZ2UgdG8gc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9jbGVhci5odG1sIGFzIGl0IGlzIG5v dyBjbGVhciBob3cgYSAKKyAgICAgICAgbnVsbCBjdXJzb3IgbWlnaHQgYmUgcmV0dXJuZWQgZnJv bSBvcGVuQ3Vyc29yOiAKKyAgICAgICAgKiBzdG9yYWdlL2luZGV4ZWRkYi9tb3ppbGxhL2NsZWFy LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBzdG9yYWdlL2luZGV4ZWRkYi9tb3ppbGxhL3Jlc291 cmNlcy9jbGVhci5qczoKKworMjAxNC0wMi0wNyAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBs ZS5jb20+CisKICAgICAgICAgSURCOiBTb21lIE1vemlsbGEgY3Vyc29yIG11dGF0aW9uIHRlc3Rz IGZhaWwKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2MDExNjgwPiBhbmQgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODM3NAogCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggNDY3NTc3Yi4uZDBiMGFlZSAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRpb25zCisr KyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDc3 LDcgKzQ3Nyw3IEBAIHN0b3JhZ2UvaW5kZXhlZGRiL21vemlsbGEvY2xlYXIuaHRtbCBbIFBhc3Mg XQogc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9jcmVhdGUtaW5kZXgtd2l0aC1pbnRlZ2VyLWtl eXMuaHRtbCBbIFBhc3MgXQogc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9jdXJzb3ItbXV0YXRp b24tb2JqZWN0c3RvcmUtb25seS5odG1sIFsgUGFzcyBdCiBzdG9yYWdlL2luZGV4ZWRkYi9tb3pp bGxhL2N1cnNvci1tdXRhdGlvbi5odG1sIFsgUGFzcyBdCi0KK3N0b3JhZ2UvaW5kZXhlZGRiL21v emlsbGEvY3Vyc29ycy5odG1sIFsgUGFzcyBdCiAKICMjIyBFTkQgT0YgKDUpIEZlYXR1cmVzIHRo YXQgYXJlIG5vdCBzdXBwb3J0ZWQgaW4gV2ViS2l0MSwgc28gc2tpcHBlZCBpbiBtYWMvVGVzdEV4 cGVjdGF0aW9ucyB0aGVuIHJlLWVuYWJsZWQgaGVyZQogIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVk ZGIvbW96aWxsYS9jbGVhci1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4 ZWRkYi9tb3ppbGxhL2NsZWFyLWV4cGVjdGVkLnR4dAppbmRleCA0OTI0NjIwLi41MDVmZTc1IDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9tb3ppbGxhL2NsZWFyLWV4 cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9tb3ppbGxhL2Ns ZWFyLWV4cGVjdGVkLnR4dApAQCAtMTgsOCArMTgsNyBAQCBkYi50cmFuc2FjdGlvbignZm9vJywg J3JlYWR3cml0ZScpCiB0cmFuc2FjdGlvbi5vYmplY3RTdG9yZSgnZm9vJykuY2xlYXIoKTsKIHJl cXVlc3QgPSBkYi50cmFuc2FjdGlvbignZm9vJykub2JqZWN0U3RvcmUoJ2ZvbycpLm9wZW5DdXJz b3IoKTsKIGN1cnNvciA9IHJlcXVlc3QucmVzdWx0OwotUEFTUyBjdXJzb3Iua2V5IGlzIHVuZGVm aW5lZAotUEFTUyBjdXJzb3IudmFsdWUgaXMgdW5kZWZpbmVkCitQQVNTIGN1cnNvciBpcyBudWxs CiBQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCiAKIFRFU1QgQ09NUExFVEUKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL21vemlsbGEvcmVzb3VyY2VzL2Ns ZWFyLmpzIGIvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9yZXNvdXJjZXMv Y2xlYXIuanMKaW5kZXggMmYwOWMyNi4uYzVhMGM2MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv c3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9yZXNvdXJjZXMvY2xlYXIuanMKKysrIGIvTGF5b3V0 VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9yZXNvdXJjZXMvY2xlYXIuanMKQEAgLTM3 LDI4ICszNyw5IEBAIGZ1bmN0aW9uIGNsZWFyZWQoKQogICAgIHJlcXVlc3Qub25lcnJvciA9IHVu ZXhwZWN0ZWRFcnJvckNhbGxiYWNrOwogfQogCi0vLyBUaGUgdmVyc2lvbiBvZiB0aGlzIHRlc3Qg dGhhdCBleGlzdGVkIHVwIHVudGlsIHJldmlzaW9uIH4xNjM1MDAgaGFkIHRoZSBmb2xsb3dpbmcg YXJlV2VDbGVhcllldCBoYW5kbGVyLgotLy8gVGhlIGludGVudGlvbiB3YXMgYXBwYXJlbnRseSB0 byB2ZXJpZnkgdGhhdCBjYWxsaW5nIG9wZW5DdXJzb3IoKSBvbiBhbiBlbXB0eSBvYmplY3Qgc3Rv cmUgcmV0dXJuZWQgYSBudWxsIGN1cnNvci4KLS8qCiBmdW5jdGlvbiBhcmVXZUNsZWFyWWV0KCkK IHsKICAgICBjdXJzb3IgPSBldmFsQW5kTG9nKCJjdXJzb3IgPSByZXF1ZXN0LnJlc3VsdDsiKTsK ICAgICBzaG91bGRCZSgiY3Vyc29yIiwgIm51bGwiKTsKICAgICBmaW5pc2hKU1Rlc3QoKTsKIH0K LSovCi0KLS8vIFRoZSBzcGVjJ3MgY3VycmVudCBkZXNjcmlwdGlvbiBvZiBJREJPYmplY3RTdG9y ZS5vcGVuQ3Vyc29yKCksIGFzIGZvdW5kIGhlcmU6Ci0vLyBodHRwOi8vd3d3LnczLm9yZy9UUi9J bmRleGVkREIvI3dpZGwtSURCT2JqZWN0U3RvcmUtb3BlbkN1cnNvci1JREJSZXF1ZXN0LWFueS1y YW5nZS1JREJDdXJzb3JEaXJlY3Rpb24tZGlyZWN0aW9uCi0vLyBkb2VzIG5vdCBhbGxvdyBmb3Ig YSBudWxsIGN1cnNvciB0byBiZSByZXR1cm5lZC4gSXQgc3RhdGVzOgotLy8gIi4uLnRoaXMgbWV0 aG9kIGNyZWF0ZXMgYSBjdXJzb3IuIFRoZSBjdXJzb3IgbXVzdCBpbXBsZW1lbnQgdGhlIElEQkN1 cnNvcldpdGhWYWx1ZSBpbnRlcmZhY2UuIgotLy8gYW5kIHRoZW4gZ2l2ZXMgbm8gYWxsb3dhbmNl IGZvciBub3QgcmV0dXJuaW5nIHRoYXQgY3JlYXRlZCBjdXJzb3IuCi0vLyAtLS0KLS8vIFNvIG91 ciBjdXJyZW50IHJlYWRpbmcgb2YgdGhlIHNwZWMgaXMgdGhhdCBhIGN1cnNvciBtdXN0IGJlIHJl dHVybmVkLCBidXQgaXQgbXVzdCBiZSBwb2ludGluZyB0byBhbiB1bmRlZmluZWQga2V5L3ZhbHVl IHJlY29yZC4KLWZ1bmN0aW9uIGFyZVdlQ2xlYXJZZXQoKQotewotICAgIGN1cnNvciA9IGV2YWxB bmRMb2coImN1cnNvciA9IHJlcXVlc3QucmVzdWx0OyIpOwotICAgIHNob3VsZEJlKCJjdXJzb3Iu a2V5IiwgInVuZGVmaW5lZCIpOwotICAgIHNob3VsZEJlKCJjdXJzb3IudmFsdWUiLCAidW5kZWZp bmVkIik7Ci0gICAgZmluaXNoSlNUZXN0KCk7Ci19CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGVmMDg2MC4uM2Rj NzdjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4IEBACiAyMDE0LTAyLTA3ICBCcmFkeSBFaWRz b24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAorICAgICAgICBJREI6IHN0b3JhZ2UvaW5kZXhlZGRi L21vemlsbGEvY3Vyc29ycy5odG1sIGZhaWxzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjAx Nzk5OD4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg0MjMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0ZWQg Ynkgc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9jdXJzb3JzLmh0bWwgKEFuZCBwcm9iYWJseSBv dGhlcnMpCisKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJUcmFuc2FjdGlvbkJhY2tl bmRPcGVyYXRpb25zLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok9wZW5DdXJzb3JPcGVyYXRpb246 OnBlcmZvcm0pOiBEaXN0aW5ndWlzaCBiZXR3ZWVuIGFuIGVycm9yIHdoaWxlIG9wZW5pbmcgdGhl IGN1cnNvcgorICAgICAgICAgIGFuZCBvcGVuaW5nIGEgY3Vyc29yIHRoYXQgcG9pbnRzIHRvIG5v IHJlY29yZHMuCisKKzIwMTQtMDItMDcgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29t PgorCiAgICAgICAgIElEQjogU29tZSBNb3ppbGxhIGN1cnNvciBtdXRhdGlvbiB0ZXN0cyBmYWls CiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjAxMTY4MD4gYW5kIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjgzNzQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9pbmRleGVkZGIvSURCVHJhbnNhY3Rpb25CYWNrZW5kT3BlcmF0aW9ucy5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJUcmFuc2FjdGlvbkJhY2tlbmRP cGVyYXRpb25zLmNwcAppbmRleCBmNThmNmFiLi44MWYzM2MxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJUcmFuc2FjdGlvbkJhY2tlbmRPcGVyYXRpb25z LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJUcmFuc2FjdGlv bkJhY2tlbmRPcGVyYXRpb25zLmNwcApAQCAtMTUxLDE2ICsxNTEsMTUgQEAgdm9pZCBPcGVuQ3Vy c29yT3BlcmF0aW9uOjpwZXJmb3JtKHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiBjb21wbGV0aW9uQ2Fs bGJhY2spCiAgICAgTE9HKFN0b3JhZ2VBUEksICJPcGVuQ3Vyc29yT3BlcmF0aW9uIik7CiAKICAg ICBSZWZQdHI8T3BlbkN1cnNvck9wZXJhdGlvbj4gb3BlcmF0aW9uKHRoaXMpOwotICAgIGF1dG8g Y2FsbGJhY2sgPSBbdGhpcywgb3BlcmF0aW9uLCBjb21wbGV0aW9uQ2FsbGJhY2tdKGludDY0X3Qg Y3Vyc29ySUQsIFBhc3NSZWZQdHI8SURCS2V5PiBrZXksIFBhc3NSZWZQdHI8SURCS2V5PiBwcmlt YXJ5S2V5LCBQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gdmFsdWVCdWZmZXIsIFBhc3NSZWZQdHI8 SURCRGF0YWJhc2VFcnJvcj4pIHsKLSAgICAgICAgLy8gRklYTUU6IFdoZW4gdGhlIExldmVsREIg cG9ydCBmYWlscyB0byBvcGVuIGEgYmFja2luZyBzdG9yZSBjdXJzb3IgaXQgY2FsbHMgb25TdWNj ZXNzKG51bGxwdHIpOwotICAgICAgICAvLyBUaGlzIHNlZW1zIG5vbnNlbnNpY2FsIGFuZCBtaWdo dCBoYXZlIHRvIGNoYW5nZSBzb29uLCBicmVha2luZyB0aGVtLgotICAgICAgICBpZiAoIWN1cnNv cklEKQorICAgIGF1dG8gY2FsbGJhY2sgPSBbdGhpcywgb3BlcmF0aW9uLCBjb21wbGV0aW9uQ2Fs bGJhY2tdKGludDY0X3QgY3Vyc29ySUQsIFBhc3NSZWZQdHI8SURCS2V5PiBrZXksIFBhc3NSZWZQ dHI8SURCS2V5PiBwcmltYXJ5S2V5LCBQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gdmFsdWVCdWZm ZXIsIFBhc3NSZWZQdHI8SURCRGF0YWJhc2VFcnJvcj4gZXJyb3IpIHsKKyAgICAgICAgaWYgKGVy cm9yKSB7CisgICAgICAgICAgICBtX2NhbGxiYWNrcy0+b25FcnJvcihlcnJvcik7CisgICAgICAg IH0gZWxzZSBpZiAoIWtleSkgeworICAgICAgICAgICAgLy8gSWYgdGhlcmUncyBubyBlcnJvciBi dXQgYWxzbyBubyBrZXksIHRoZW4gdGhlIGN1cnNvciBoYWQgbm8gcmVjb3Jkcy4KICAgICAgICAg ICAgIG1fY2FsbGJhY2tzLT5vblN1Y2Nlc3Moc3RhdGljX2Nhc3Q8U2hhcmVkQnVmZmVyKj4oMCkp OwotICAgICAgICBlbHNlIHsKKyAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIFJlZlB0cjxJ REJDdXJzb3JCYWNrZW5kPiBjdXJzb3IgPSBJREJDdXJzb3JCYWNrZW5kOjpjcmVhdGUoY3Vyc29y SUQsIG1fY3Vyc29yVHlwZSwgbV90YXNrVHlwZSwgKm1fdHJhbnNhY3Rpb24sIG1fb2JqZWN0U3Rv cmVJRCk7Ci0gICAgICAgICAgICBpZiAoa2V5IHx8IHByaW1hcnlLZXkgfHwgdmFsdWVCdWZmZXIp Ci0gICAgICAgICAgICAgICAgY3Vyc29yLT51cGRhdGVDdXJzb3JEYXRhKGtleS5nZXQoKSwgcHJp bWFyeUtleS5nZXQoKSwgdmFsdWVCdWZmZXIuZ2V0KCkpOwotCisgICAgICAgICAgICBjdXJzb3It PnVwZGF0ZUN1cnNvckRhdGEoa2V5LmdldCgpLCBwcmltYXJ5S2V5LmdldCgpLCB2YWx1ZUJ1ZmZl ci5nZXQoKSk7CiAgICAgICAgICAgICBtX2NhbGxiYWNrcy0+b25TdWNjZXNzKGN1cnNvci5yZWxl YXNlKCkpOwogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA5NDNiYTRlLi43MjRmMGE0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMTQtMDItMDcgIEJyYWR5IEVpZHNvbiAgPGJlaWRz b25AYXBwbGUuY29tPgogCisgICAgICAgIElEQjogc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9j dXJzb3JzLmh0bWwgZmFpbHMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2MDE3OTk4PiBhbmQg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODQyMworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRGF0YWJhc2VQcm9jZXNz L0luZGV4ZWREQi9zcWxpdGUvU1FMaXRlSURCQ3Vyc29yLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 U1FMaXRlSURCQ3Vyc29yOjppbnRlcm5hbEFkdmFuY2VPbmNlKTogU3RvcmUgdGhlIHByaW1hcnkg a2V5IGZvciBvYmplY3Qgc3RvcmUgY3Vyc29ycy4KKyAgICAgICAgKFdlYktpdDo6U1FMaXRlSURC Q3Vyc29yOjppdGVyYXRlKTogV2XigJlyZSBub3Qgc3VwcG9zZWQgdG8gY2hlY2sgZm9yIGVxdWFs aXR5IHRvIHRoZSB0YXJnZXQga2V5LgorICAgICAgICAgIERlcGVuZGluZyBvbiB0aGUgZGlyZWN0 aW9uIG9mIHRoZSBjdXJzb3Igd2Ugc2hvdWxkIGNoZWNrIGZvciB0aGUgbmV4dCBoaWdoZXN0IG9y IG5leHQgbG93ZXN0IGtleS4KKworMjAxNC0wMi0wNyAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBh cHBsZS5jb20+CisKICAgICAgICAgSURCOiBTb21lIE1vemlsbGEgY3Vyc29yIG11dGF0aW9uIHRl c3RzIGZhaWwKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2MDExNjgwPiBhbmQgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODM3NAogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL3NxbGl0ZS9TUUxpdGVJREJDdXJz b3IuY3BwIGIvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9zcWxpdGUv U1FMaXRlSURCQ3Vyc29yLmNwcAppbmRleCBjN2E4YTJlLi42MzI5MTgxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL3NxbGl0ZS9TUUxpdGVJREJD dXJzb3IuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIv c3FsaXRlL1NRTGl0ZUlEQkN1cnNvci5jcHAKQEAgLTMzNyw3ICszMzcsMTAgQEAgU1FMaXRlSURC Q3Vyc29yOjpBZHZhbmNlUmVzdWx0IFNRTGl0ZUlEQkN1cnNvcjo6aW50ZXJuYWxBZHZhbmNlT25j ZSgpCiAgICAgbV9zdGF0ZW1lbnQtPmdldENvbHVtbkJsb2JBc1ZlY3RvcigyLCBrZXlEYXRhKTsK ICAgICBtX2N1cnJlbnRWYWx1ZUJ1ZmZlciA9IGtleURhdGE7CiAKLSAgICBpZiAobV9pbmRleElE ICE9IElEQkluZGV4TWV0YWRhdGE6OkludmFsaWRJZCkgeworICAgIC8vIFRoZSBwcmltYXJ5S2V5 IG9mIGFuIE9iamVjdFN0b3JlIGN1cnNvciBpcyB0aGUgc2FtZSBhcyBpdHMga2V5LgorICAgIGlm IChtX2luZGV4SUQgPT0gSURCSW5kZXhNZXRhZGF0YTo6SW52YWxpZElkKQorICAgICAgICBtX2N1 cnJlbnRQcmltYXJ5S2V5ID0gbV9jdXJyZW50S2V5OworICAgIGVsc2UgewogICAgICAgICBpZiAo IWRlc2VyaWFsaXplSURCS2V5RGF0YShrZXlEYXRhLmRhdGEoKSwga2V5RGF0YS5zaXplKCksIG1f Y3VycmVudFByaW1hcnlLZXkpKSB7CiAgICAgICAgICAgICBMT0dfRVJST1IoIlVuYWJsZSB0byBk ZXNlcmlhbGl6ZSB2YWx1ZSBkYXRhIGZyb20gZGF0YWJhc2Ugd2hpbGUgYWR2YW5jaW5nIGluZGV4 IGN1cnNvciIpOwogICAgICAgICAgICAgbV9jb21wbGV0ZWQgPSB0cnVlOwpAQCAtMzg3LDEwICsz OTAsMTggQEAgYm9vbCBTUUxpdGVJREJDdXJzb3I6Oml0ZXJhdGUoY29uc3QgV2ViQ29yZTo6SURC S2V5RGF0YSYgdGFyZ2V0S2V5KQogICAgIGlmICh0YXJnZXRLZXkuaXNOdWxsIHx8ICFyZXN1bHQp CiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAKLSAgICB3aGlsZSAoIW1fY29tcGxldGVkICYmIG1f Y3VycmVudEtleS5jb21wYXJlKHRhcmdldEtleSkpIHsKLSAgICAgICAgcmVzdWx0ID0gYWR2YW5j ZSgxKTsKKyAgICB3aGlsZSAoIW1fY29tcGxldGVkKSB7CiAgICAgICAgIGlmICghcmVzdWx0KQog ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgICAgIC8vIFNlYXJjaCBmb3IgdGhlIG5l eHQga2V5ID49IHRoZSB0YXJnZXQgaWYgdGhlIGN1cnNvciBpcyBhIE5leHQgY3Vyc29yLCBvciB0 aGUgbmV4dCBrZXkgPD0gaWYgdGhlIGN1cnNvciBpcyBhIFByZXZpb3VzIGN1cnNvci4KKyAgICAg ICAgaWYgKG1fY3Vyc29yRGlyZWN0aW9uID09IEluZGV4ZWREQjo6Q3Vyc29yRGlyZWN0aW9uOjpO ZXh0IHx8IG1fY3Vyc29yRGlyZWN0aW9uID09IEluZGV4ZWREQjo6Q3Vyc29yRGlyZWN0aW9uOjpO ZXh0Tm9EdXBsaWNhdGUpIHsKKyAgICAgICAgICAgIGlmIChtX2N1cnJlbnRLZXkuY29tcGFyZSh0 YXJnZXRLZXkpID49IDApCisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0gZWxzZSBp ZiAobV9jdXJyZW50S2V5LmNvbXBhcmUodGFyZ2V0S2V5KSA8PSAwKQorICAgICAgICAgICAgYnJl YWs7CisKKyAgICAgICAgcmVzdWx0ID0gYWR2YW5jZSgxKTsKICAgICB9CiAKICAgICByZXR1cm4g cmVzdWx0Owo=