100973 2012-11-01 11:23:01 -0700 [V8] Generalize NodeWrapperMap to be able to handle other sorts of keys 2012-11-02 12:22:50 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 abarth abarth eric haraken japhet noel.gordon ojan senorblanco tony webkit.review.bot oldest_to_newest 756472 0 abarth 2012-11-01 11:23:01 -0700 [V8] Generalize NodeWrapperMap to be able to handle other sorts of keys 756479 1 171900 abarth 2012-11-01 11:30:56 -0700 Created attachment 171900 Patch 756485 2 171900 haraken 2012-11-01 11:35:25 -0700 Comment on attachment 171900 Patch Looks good. (We might want to invent a better name than IntrusiveDOMWrapperMap. When at first I looked at the implementation, I couldn't figure out what Intrusive implies.) 756490 3 abarth 2012-11-01 11:37:10 -0700 Actually, I plan to eventually remove this class to avoid the virtual function call, but that's a bit further down this path. 756524 4 171900 webkit.review.bot 2012-11-01 12:04:58 -0700 Comment on attachment 171900 Patch Rejecting attachment 171900 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: ts/ChangeLog CONFLICT (content): Merge conflict in LayoutTests/ChangeLog Failed to merge in the changes. Patch failed at 0001 Unreviewed, marking tests as failing preemptively. When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 154. Full output: http://queues.webkit.org/results/14691058 756749 5 171900 webkit.review.bot 2012-11-01 17:24:29 -0700 Comment on attachment 171900 Patch Clearing flags on attachment: 171900 Committed r133244: <http://trac.webkit.org/changeset/133244> 756750 6 webkit.review.bot 2012-11-01 17:24:33 -0700 All reviewed patches have been landed. Closing bug. 756813 7 senorblanco 2012-11-01 18:59:42 -0700 Reverted r133244 for reason: Broke Chromium Mac (clang) builds. Committed r133256: <http://trac.webkit.org/changeset/133256> 756816 8 senorblanco 2012-11-01 19:02:00 -0700 Sorry if this revert was a misfire -- there was a warning-treated-as-error in clang that I couldn't figure out how to suppress (or if it was a true bug). 756829 9 noel.gordon 2012-11-01 19:21:03 -0700 The specific clang warning-treated-as-error for reference ... d-bad-constructs -Xclang -plugin-arg-find-bad-constructs -Xclang skip-virtuals-in-implementations -fcolor-diagnostics -fno-strict-aliasing -include obj/third_party/WebKit/Source/WebCore/webcore_remaining.WebCorePrefix.h-cc -c ../../third_party/WebKit/Source/WebCore/bindings/v8/V8GCController.cpp -o obj/third_party/webkit/source/webcore/bindings/v8/webcore_remaining.v8gccontroller.o In file included from ../../third_party/WebKit/Source/WebCore/bindings/v8/V8GCController.cpp:40: ../../third_party/WebKit/Source/WebCore/bindings/v8/IntrusiveDOMWrapperMap.h:60:25: error: unused variable 'info' [-Werror,-Wunused-variable] MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Binding); ^ 1 error generated. 757359 10 172090 abarth 2012-11-02 11:14:48 -0700 Created attachment 172090 Patch for landing 757361 11 abarth 2012-11-02 11:15:49 -0700 > The specific clang warning-treated-as-error for reference Thanks. This patch didn't actually touch that line of code, but I can fix it anyway. :) 757363 12 172090 webkit.review.bot 2012-11-02 11:17:26 -0700 Comment on attachment 172090 Patch for landing Rejecting attachment 172090 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 ERROR: /mnt/git/webkit-commit-queue/Source/WebCore/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://queues.webkit.org/results/14712086 757365 13 senorblanco 2012-11-02 11:20:07 -0700 r=me. Thanks for the fix (don't know why this line didn't fail earlier -- maybe a new version of clang since this file was last compiled?) 757379 14 tony 2012-11-02 11:29:48 -0700 (In reply to comment #13) > r=me. Thanks for the fix (don't know why this line didn't fail earlier -- maybe a new version of clang since this file was last compiled?) The cr-linux bots use gcc, so you won't see clang warnings on the ews cr-linux or cq bots. 757386 15 senorblanco 2012-11-02 11:31:00 -0700 (In reply to comment #14) > (In reply to comment #13) > > r=me. Thanks for the fix (don't know why this line didn't fail earlier -- maybe a new version of clang since this file was last compiled?) > > The cr-linux bots use gcc, so you won't see clang warnings on the ews cr-linux or cq bots. Right, what I meant was why Adam's change triggered a clang compile failure, since that line existed before. 757456 16 172090 webkit.review.bot 2012-11-02 12:22:46 -0700 Comment on attachment 172090 Patch for landing Clearing flags on attachment: 172090 Committed r133331: <http://trac.webkit.org/changeset/133331> 757457 17 webkit.review.bot 2012-11-02 12:22:50 -0700 All reviewed patches have been landed. Closing bug. 171900 2012-11-01 11:30:56 -0700 2012-11-02 11:14:43 -0700 Patch bug-100973-20121101112918.patch text/plain 3622 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzMTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjk3OTZmN2ZlZDMzN2Iz MjQ4MTc1Zjc0NjJhOTA0MDUwMDhjNmFhZi4uZjRiYWE2YzhiNTYyMzEyZWE4NDJhMzIyZDJlZTJh ODgzMThlOWIwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDEyLTExLTAxICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKKyAgICAgICAgW1Y4XSBHZW5lcmFsaXplIE5v ZGVXcmFwcGVyTWFwIHRvIGJlIGFibGUgdG8gaGFuZGxlIG90aGVyIHNvcnRzIG9mIGtleXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDk3MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgdGhl IGZpcnN0IHN0ZXAgdG93YXJkcyB1c2luZyBpbnRydXNpdmUgRE9NIHdyYXBwZXIgbWFwcyBtb3Jl CisgICAgICAgIHdpZGVseSBpbiBXZWJDb3JlIChzZWUKKyAgICAgICAgaHR0cDovL2xpc3RzLndl YmtpdC5vcmcvcGlwZXJtYWlsL3dlYmtpdC1kZXYvMjAxMi1Ob3ZlbWJlci8wMjI2ODYuaHRtbAor ICAgICAgICBmb3IgbW9yZSBjb250ZXh0KS4KKworICAgICAgICAqIGJpbmRpbmdzL3Y4L0RPTURh dGFTdG9yZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01EYXRhU3RvcmU6OkRPTURhdGFTdG9y ZSk6CisgICAgICAgICogYmluZGluZ3MvdjgvSW50cnVzaXZlRE9NV3JhcHBlck1hcC5oOgorICAg ICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnRydXNpdmVET01XcmFwcGVyTWFw Ojp3ZWFrQ2FsbGJhY2spOgorCisyMDEyLTExLTAxICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtp dC5vcmc+CisKICAgICAgICAgW1Y4XSBUaGUgRE9NV3JhcHBlclZpc2l0b3IgYWJzdHJhY3Rpb24g aXMgbm8gbG9uZ2VyIG5lZWRlZAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTAwOTY1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3Y4L0RPTURhdGFTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9ET01EYXRh U3RvcmUuY3BwCmluZGV4IGEyMjU5YjBkYzEyYmM1OTQ3YzE3M2NmMTczMTE2Y2QxNzViODNlODAu LmI0ZjlkYWY3ZGI3MmE4Mzc2MzAwZjI4NjJkMDU1NzRkM2U4OTRlNzAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RPTURhdGFTdG9yZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvRE9NRGF0YVN0b3JlLmNwcApAQCAtNDMsNyArNDMsNyBAQCBET01E YXRhU3RvcmU6OkRPTURhdGFTdG9yZShUeXBlIHR5cGUpCiAgICAgOiBtX3R5cGUodHlwZSkKIHsK ICAgICBpZiAodHlwZSA9PSBNYWluV29ybGQpCi0gICAgICAgIG1fZG9tTm9kZU1hcCA9IGFkb3B0 UHRyKG5ldyBET01Ob2RlV3JhcHBlck1hcCk7CisgICAgICAgIG1fZG9tTm9kZU1hcCA9IGFkb3B0 UHRyKG5ldyBJbnRydXNpdmVET01XcmFwcGVyTWFwPE5vZGU+KTsKICAgICBlbHNlIHsKICAgICAg ICAgQVNTRVJUKHR5cGUgPT0gSXNvbGF0ZWRXb3JsZCB8fCB0eXBlID09IFdvcmtlcik7CiAgICAg ICAgIC8vIEZJWE1FOiBJbiBwcmluY2lwbGUsIHdlIHNob3VsZG4ndCBuZWVkIHRvIGNyZWF0ZSB0 aGlzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9JbnRydXNpdmVET01X cmFwcGVyTWFwLmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9JbnRydXNpdmVET01XcmFw cGVyTWFwLmgKaW5kZXggMjAyODliM2JjMDFhZTcwNGE0ZDliM2QxODUwZGY2ODE5Mzk2MzBlNC4u Mzk2ZmYzZTBlMGM3NDU3NTA4ZTZjYWI2ZjUxMGI5YzQ0ZWUyNmQ1NyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvSW50cnVzaXZlRE9NV3JhcHBlck1hcC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0ludHJ1c2l2ZURPTVdyYXBwZXJNYXAuaApAQCAtMzUs MTkgKzM1LDE5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotY2xhc3MgRE9NTm9kZVdyYXBw ZXJNYXAgOiBwdWJsaWMgRE9NV3JhcHBlck1hcDxOb2RlPiB7Cit0ZW1wbGF0ZTxjbGFzcyBLZXlU eXBlPgorY2xhc3MgSW50cnVzaXZlRE9NV3JhcHBlck1hcCA6IHB1YmxpYyBET01XcmFwcGVyTWFw PEtleVR5cGU+IHsKIHB1YmxpYzoKLSAgICB2aXJ0dWFsIHY4OjpQZXJzaXN0ZW50PHY4OjpPYmpl Y3Q+IGdldChOb2RlKiBub2RlKSBPVkVSUklERQorICAgIHZpcnR1YWwgdjg6OlBlcnNpc3RlbnQ8 djg6Ok9iamVjdD4gZ2V0KEtleVR5cGUqIGtleSkgT1ZFUlJJREUKICAgICB7Ci0gICAgICAgIHJl dHVybiBub2RlLT53cmFwcGVyKCk7CisgICAgICAgIHJldHVybiBrZXktPndyYXBwZXIoKTsKICAg ICB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgc2V0KE5vZGUqIG5vZGUsIHY4OjpQZXJzaXN0ZW50PHY4 OjpPYmplY3Q+IHdyYXBwZXIpIE9WRVJSSURFCisgICAgdmlydHVhbCB2b2lkIHNldChLZXlUeXBl KiBrZXksIHY4OjpQZXJzaXN0ZW50PHY4OjpPYmplY3Q+IHdyYXBwZXIpIE9WRVJSSURFCiAgICAg ewotICAgICAgICBBU1NFUlQobm9kZSAmJiBub2RlLT53cmFwcGVyKCkuSXNFbXB0eSgpKTsKLSAg ICAgICAgQVNTRVJUKHdyYXBwZXIuV3JhcHBlckNsYXNzSWQoKSA9PSB2OERPTU5vZGVDbGFzc0lk KTsKLSAgICAgICAgbm9kZS0+c2V0V3JhcHBlcih3cmFwcGVyKTsKLSAgICAgICAgd3JhcHBlci5N YWtlV2Vhayhub2RlLCB3ZWFrQ2FsbGJhY2spOworICAgICAgICBBU1NFUlQoa2V5ICYmIGtleS0+ d3JhcHBlcigpLklzRW1wdHkoKSk7CisgICAgICAgIGtleS0+c2V0V3JhcHBlcih3cmFwcGVyKTsK KyAgICAgICAgd3JhcHBlci5NYWtlV2VhayhrZXksIHdlYWtDYWxsYmFjayk7CiAgICAgfQogCiAg ICAgdmlydHVhbCB2b2lkIGNsZWFyKCkgT1ZFUlJJREUKQEAgLTYzLDEzICs2MywxMyBAQCBwdWJs aWM6CiBwcml2YXRlOgogICAgIHN0YXRpYyB2b2lkIHdlYWtDYWxsYmFjayh2ODo6UGVyc2lzdGVu dDx2ODo6VmFsdWU+IHZhbHVlLCB2b2lkKiBjb250ZXh0KQogICAgIHsKLSAgICAgICAgTm9kZSog bm9kZSA9IHN0YXRpY19jYXN0PE5vZGUqPihjb250ZXh0KTsKKyAgICAgICAgS2V5VHlwZSoga2V5 ID0gc3RhdGljX2Nhc3Q8S2V5VHlwZSo+KGNvbnRleHQpOwogICAgICAgICBBU1NFUlQodmFsdWUt PklzT2JqZWN0KCkpOwotICAgICAgICBBU1NFUlQobm9kZS0+d3JhcHBlcigpID09IHY4OjpQZXJz aXN0ZW50PHY4OjpPYmplY3Q+OjpDYXN0KHZhbHVlKSk7CisgICAgICAgIEFTU0VSVChrZXktPndy YXBwZXIoKSA9PSB2ODo6UGVyc2lzdGVudDx2ODo6T2JqZWN0Pjo6Q2FzdCh2YWx1ZSkpOwogCi0g ICAgICAgIG5vZGUtPmNsZWFyV3JhcHBlcigpOworICAgICAgICBrZXktPmNsZWFyV3JhcHBlcigp OwogICAgICAgICB2YWx1ZS5EaXNwb3NlKCk7Ci0gICAgICAgIG5vZGUtPmRlcmVmKCk7CisgICAg ICAgIGtleS0+ZGVyZWYoKTsKICAgICB9CiB9OwogCg== 172090 2012-11-02 11:14:48 -0700 2012-11-02 12:22:46 -0700 Patch for landing bug-100973-20121102111352.patch text/plain 3804 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzMzE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmU5MjQ5ZmZkYWVkMTZk OTBkZGYxYzZlZjNhZGVkMDc4OTFlMWE4OC4uOGI1MWQ0MTU4YzAyZmM1YTM2MGY1MGU3Zjg3NDZm YWMyYzhjN2FlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTExLTAyICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1Y4XSBHZW5lcmFsaXplIE5v ZGVXcmFwcGVyTWFwIHRvIGJlIGFibGUgdG8gaGFuZGxlIG90aGVyIHNvcnRzIG9mIGtleXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDk3MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgdGhl IGZpcnN0IHN0ZXAgdG93YXJkcyB1c2luZyBpbnRydXNpdmUgRE9NIHdyYXBwZXIgbWFwcyBtb3Jl CisgICAgICAgIHdpZGVseSBpbiBXZWJDb3JlIChzZWUKKyAgICAgICAgaHR0cDovL2xpc3RzLndl YmtpdC5vcmcvcGlwZXJtYWlsL3dlYmtpdC1kZXYvMjAxMi1Ob3ZlbWJlci8wMjI2ODYuaHRtbAor ICAgICAgICBmb3IgbW9yZSBjb250ZXh0KS4KKworICAgICAgICAqIGJpbmRpbmdzL3Y4L0RPTURh dGFTdG9yZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01EYXRhU3RvcmU6OkRPTURhdGFTdG9y ZSk6CisgICAgICAgICogYmluZGluZ3MvdjgvSW50cnVzaXZlRE9NV3JhcHBlck1hcC5oOgorICAg ICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnRydXNpdmVET01XcmFwcGVyTWFw Ojp3ZWFrQ2FsbGJhY2spOgorCiAyMDEyLTExLTAyICBKaW53b28gU29uZyAgPGppbndvbzcuc29u Z0BzYW1zdW5nLmNvbT4KIAogICAgICAgICBGaXggYnVpbGQgd2FybmluZyBbLVdzd2l0Y2hdCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9ET01EYXRhU3RvcmUuY3BwIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvRE9NRGF0YVN0b3JlLmNwcAppbmRleCBhMjI1OWIw ZGMxMmJjNTk0N2MxNzNjZjE3MzExNmNkMTc1YjgzZTgwLi5iNGY5ZGFmN2RiNzJhODM3NjMwMGYy ODYyZDA1NTc0ZDNlODk0ZTcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92 OC9ET01EYXRhU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RPTURh dGFTdG9yZS5jcHAKQEAgLTQzLDcgKzQzLDcgQEAgRE9NRGF0YVN0b3JlOjpET01EYXRhU3RvcmUo VHlwZSB0eXBlKQogICAgIDogbV90eXBlKHR5cGUpCiB7CiAgICAgaWYgKHR5cGUgPT0gTWFpbldv cmxkKQotICAgICAgICBtX2RvbU5vZGVNYXAgPSBhZG9wdFB0cihuZXcgRE9NTm9kZVdyYXBwZXJN YXApOworICAgICAgICBtX2RvbU5vZGVNYXAgPSBhZG9wdFB0cihuZXcgSW50cnVzaXZlRE9NV3Jh cHBlck1hcDxOb2RlPik7CiAgICAgZWxzZSB7CiAgICAgICAgIEFTU0VSVCh0eXBlID09IElzb2xh dGVkV29ybGQgfHwgdHlwZSA9PSBXb3JrZXIpOwogICAgICAgICAvLyBGSVhNRTogSW4gcHJpbmNp cGxlLCB3ZSBzaG91bGRuJ3QgbmVlZCB0byBjcmVhdGUgdGhpcwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvSW50cnVzaXZlRE9NV3JhcHBlck1hcC5oIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvSW50cnVzaXZlRE9NV3JhcHBlck1hcC5oCmluZGV4IDIwMjg5YjNi YzAxYWU3MDRhNGQ5YjNkMTg1MGRmNjgxOTM5NjMwZTQuLmY2NTEyNDM0YjMxNWI5YzJhZTI3N2U5 NzBmZGYxYTkxZmY0MGQyNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L0ludHJ1c2l2ZURPTVdyYXBwZXJNYXAuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92 OC9JbnRydXNpdmVET01XcmFwcGVyTWFwLmgKQEAgLTM1LDE5ICszNSwxOSBAQAogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKLWNsYXNzIERPTU5vZGVXcmFwcGVyTWFwIDogcHVibGljIERPTVdyYXBw ZXJNYXA8Tm9kZT4gewordGVtcGxhdGU8Y2xhc3MgS2V5VHlwZT4KK2NsYXNzIEludHJ1c2l2ZURP TVdyYXBwZXJNYXAgOiBwdWJsaWMgRE9NV3JhcHBlck1hcDxLZXlUeXBlPiB7CiBwdWJsaWM6Ci0g ICAgdmlydHVhbCB2ODo6UGVyc2lzdGVudDx2ODo6T2JqZWN0PiBnZXQoTm9kZSogbm9kZSkgT1ZF UlJJREUKKyAgICB2aXJ0dWFsIHY4OjpQZXJzaXN0ZW50PHY4OjpPYmplY3Q+IGdldChLZXlUeXBl KiBrZXkpIE9WRVJSSURFCiAgICAgewotICAgICAgICByZXR1cm4gbm9kZS0+d3JhcHBlcigpOwor ICAgICAgICByZXR1cm4ga2V5LT53cmFwcGVyKCk7CiAgICAgfQogCi0gICAgdmlydHVhbCB2b2lk IHNldChOb2RlKiBub2RlLCB2ODo6UGVyc2lzdGVudDx2ODo6T2JqZWN0PiB3cmFwcGVyKSBPVkVS UklERQorICAgIHZpcnR1YWwgdm9pZCBzZXQoS2V5VHlwZSoga2V5LCB2ODo6UGVyc2lzdGVudDx2 ODo6T2JqZWN0PiB3cmFwcGVyKSBPVkVSUklERQogICAgIHsKLSAgICAgICAgQVNTRVJUKG5vZGUg JiYgbm9kZS0+d3JhcHBlcigpLklzRW1wdHkoKSk7Ci0gICAgICAgIEFTU0VSVCh3cmFwcGVyLldy YXBwZXJDbGFzc0lkKCkgPT0gdjhET01Ob2RlQ2xhc3NJZCk7Ci0gICAgICAgIG5vZGUtPnNldFdy YXBwZXIod3JhcHBlcik7Ci0gICAgICAgIHdyYXBwZXIuTWFrZVdlYWsobm9kZSwgd2Vha0NhbGxi YWNrKTsKKyAgICAgICAgQVNTRVJUKGtleSAmJiBrZXktPndyYXBwZXIoKS5Jc0VtcHR5KCkpOwor ICAgICAgICBrZXktPnNldFdyYXBwZXIod3JhcHBlcik7CisgICAgICAgIHdyYXBwZXIuTWFrZVdl YWsoa2V5LCB3ZWFrQ2FsbGJhY2spOwogICAgIH0KIAogICAgIHZpcnR1YWwgdm9pZCBjbGVhcigp IE9WRVJSSURFCkBAIC01NywxOSArNTcsMTkgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB2b2lk IHJlcG9ydE1lbW9yeVVzYWdlKE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pIGNv bnN0IE9WRVJSSURFCiAgICAgewotICAgICAgICBNZW1vcnlDbGFzc0luZm8gaW5mbyhtZW1vcnlP YmplY3RJbmZvLCB0aGlzLCBXZWJDb3JlTWVtb3J5VHlwZXM6OkJpbmRpbmcpOworICAgICAgICAv LyBUaGlzIHR5cGUgb2Ygd3JhcHBlciBtYXAgZG9lcyBub3QgdXNlIGFueSBhZGRpdGlvbmFsIG1l bW9yeS4KICAgICB9CiAKIHByaXZhdGU6CiAgICAgc3RhdGljIHZvaWQgd2Vha0NhbGxiYWNrKHY4 OjpQZXJzaXN0ZW50PHY4OjpWYWx1ZT4gdmFsdWUsIHZvaWQqIGNvbnRleHQpCiAgICAgewotICAg ICAgICBOb2RlKiBub2RlID0gc3RhdGljX2Nhc3Q8Tm9kZSo+KGNvbnRleHQpOworICAgICAgICBL ZXlUeXBlKiBrZXkgPSBzdGF0aWNfY2FzdDxLZXlUeXBlKj4oY29udGV4dCk7CiAgICAgICAgIEFT U0VSVCh2YWx1ZS0+SXNPYmplY3QoKSk7Ci0gICAgICAgIEFTU0VSVChub2RlLT53cmFwcGVyKCkg PT0gdjg6OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD46OkNhc3QodmFsdWUpKTsKKyAgICAgICAgQVNT RVJUKGtleS0+d3JhcHBlcigpID09IHY4OjpQZXJzaXN0ZW50PHY4OjpPYmplY3Q+OjpDYXN0KHZh bHVlKSk7CiAKLSAgICAgICAgbm9kZS0+Y2xlYXJXcmFwcGVyKCk7CisgICAgICAgIGtleS0+Y2xl YXJXcmFwcGVyKCk7CiAgICAgICAgIHZhbHVlLkRpc3Bvc2UoKTsKLSAgICAgICAgbm9kZS0+ZGVy ZWYoKTsKKyAgICAgICAga2V5LT5kZXJlZigpOwogICAgIH0KIH07CiAK