33783 2010-01-17 22:55:23 -0800 [DRT][Mac] Add modifiers parameter to mouseDown() and mouseUp() 2010-01-19 14:51:04 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 24161 1 tkent webkit-unassigned commit-queue eric sky oldest_to_newest 181740 0 tkent 2010-01-17 22:55:23 -0800 Add support for mouse events with key modifiers like: eventSender.mouseDown(0, ["addSelectionKey"]) eventSender.mouseUp(0, ["shiftKey", "ctrlKey"]) 181744 1 46790 tkent 2010-01-17 23:15:31 -0800 Created attachment 46790 Patch 181925 2 46790 darin 2010-01-18 10:49:08 -0800 Comment on attachment 46790 Patch > - [self performSelector:@selector(mouseDown:) withObject:nil afterDelay:0]; > - [self performSelector:@selector(mouseUp:) withObject:nil afterDelay:0]; > + [self performSelector:@selector(mouseDown:withModifiers:) withObject:nil afterDelay:0]; > + [self performSelector:@selector(mouseUp:withModifiers:) withObject:nil afterDelay:0]; This isn't reliable. The argument to "withModifiers" will be random data on the stack. The object "nil" is passed as the first argument, but no second argument is passed. The simplest way I can think of to make this work is to keep a method with the old name and have it call the new method. There may be other alternatives. review- because of this 182089 3 46876 tkent 2010-01-18 18:37:23 -0800 Created attachment 46876 Proposed patch (rev.2) 182091 4 tkent 2010-01-18 18:38:34 -0800 (In reply to comment #2) > This isn't reliable. The argument to "withModifiers" will be random data on the > stack. The object "nil" is passed as the first argument, but no second argument > is passed. The simplest way I can think of to make this work is to keep a > method with the old name and have it call the new method. There may be other > alternatives. Thank you for the advice. I did so in the updated patch. 182249 5 46876 darin 2010-01-19 08:26:35 -0800 Comment on attachment 46876 Proposed patch (rev.2) Looks fine. r=me Not directly related to this patch: I realize now that the use of performSelector:withObject: is already wrong for mouseDown: and mouseUp: since they have an argument that is not an object. Someone should clean this up in the future. I think we can just replace mouseDown: and mouseUp: with mouseDownButton0 and mouseUpButton0 methods that don't take arguments at all. 182475 6 46876 commit-queue 2010-01-19 14:50:57 -0800 Comment on attachment 46876 Proposed patch (rev.2) Clearing flags on attachment: 46876 Committed r53498: <http://trac.webkit.org/changeset/53498> 182476 7 commit-queue 2010-01-19 14:51:04 -0800 All reviewed patches have been landed. Closing bug. 46790 2010-01-17 23:15:31 -0800 2010-01-18 18:37:17 -0800 Patch bug-33783-20100118161529.patch text/plain 8058 tkent ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAyMzBkNzliLi45NjhmNWVlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTAtMDEt MTcgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtEUlRdW01hY10gQWRkIG1vZGlmaWVycyBw YXJhbWV0ZXIgdG8gZXZlbnRTZW5kZXIubW91c2VEb3duKCkgYW5kIGV2ZW50U2VuZGVyLm1vdXNl VXAoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzM3 ODMKKworICAgICAgICBTb21lIGxpc3Rib3ggdGVzdHMgY2hlY2sgc2VsZWN0aW9uIGJlaGF2aW9y IGJ5IGNsaWNrIGV2ZW50cyB3aXRoCisgICAgICAgICJtZXRhIiBvciAic2hpZnQiIGtleXMuIEJl aGF2aW9ycyBmb3Igc3VjaCBtb2RpZmllciBrZXlzIGFyZQorICAgICAgICBwbGF0Zm9ybS1kZXBl bmRlbnQuIFRoZSBuZXcgcGFyYW1ldGVyIG9mIG1vdXNlRG93bigpIGFuZCBtb3VzZVVwKCkKKyAg ICAgICAgYWxsb3dzIHRvIHNwZWNpZnkgbm90IG9ubHkgY29uY3JldGUgbW9kaWZpZXIga2V5cyBz dWNoIGFzCisgICAgICAgICJzaGlmdEtleSIgIm1ldGFLZXkiLCBidXQgYWxzbyBmdW5jdGlvbmFs IG5hbWVzIGxpa2UKKyAgICAgICAgImFkZFNlbGVjdGlvbktleSIgInJhbmdlU2VsZWN0aW9uS2V5 Ii4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL21hYy9FdmVudFNlbmRpbmdDb250cm9sbGVy Lm1tOgorICAgICAgICAoK1tFdmVudFNlbmRpbmdDb250cm9sbGVyIGlzU2VsZWN0b3JFeGNsdWRl ZEZyb21XZWJTY3JpcHQ6XSk6CisgICAgICAgICgrW0V2ZW50U2VuZGluZ0NvbnRyb2xsZXIgd2Vi U2NyaXB0TmFtZUZvclNlbGVjdG9yOl0pOgorICAgICAgICAoYnVpbGRNb2RpZmllckZsYWdzKToK KyAgICAgICAgKC1bRXZlbnRTZW5kaW5nQ29udHJvbGxlciBtb3VzZURvd246d2l0aE1vZGlmaWVy czpdKToKKyAgICAgICAgKC1bRXZlbnRTZW5kaW5nQ29udHJvbGxlciBtb3VzZVVwOndpdGhNb2Rp ZmllcnM6XSk6CisgICAgICAgICgtW0V2ZW50U2VuZGluZ0NvbnRyb2xsZXIgc2NoZWR1bGVBc3lu Y2hyb25vdXNDbGlja10pOgorICAgICAgICAoLVtFdmVudFNlbmRpbmdDb250cm9sbGVyIGtleURv d246d2l0aE1vZGlmaWVyczp3aXRoTG9jYXRpb246XSk6CisKIDIwMTAtMDEtMTcgIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaGluaWNoaXJv IEhhbWFqaS4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9FdmVu dFNlbmRpbmdDb250cm9sbGVyLm1tIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0V2 ZW50U2VuZGluZ0NvbnRyb2xsZXIubW0KaW5kZXggMzNhMDRmNC4uNjA0MTc5ZCAxMDA2NDQKLS0t IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0V2ZW50U2VuZGluZ0NvbnRyb2xsZXIu bW0KKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0V2ZW50U2VuZGluZ0NvbnRy b2xsZXIubW0KQEAgLTEyNyw5ICsxMjcsOSBAQCBCT09MIHJlcGxheWluZ1NhdmVkRXZlbnRzOwog ICAgICAgICAgICAgfHwgYVNlbGVjdG9yID09IEBzZWxlY3RvcihmaXJlS2V5Ym9hcmRFdmVudHNU b0VsZW1lbnQ6KQogICAgICAgICAgICAgfHwgYVNlbGVjdG9yID09IEBzZWxlY3RvcihrZXlEb3du OndpdGhNb2RpZmllcnM6d2l0aExvY2F0aW9uOikKICAgICAgICAgICAgIHx8IGFTZWxlY3RvciA9 PSBAc2VsZWN0b3IobGVhcEZvcndhcmQ6KQotICAgICAgICAgICAgfHwgYVNlbGVjdG9yID09IEBz ZWxlY3Rvcihtb3VzZURvd246KQorICAgICAgICAgICAgfHwgYVNlbGVjdG9yID09IEBzZWxlY3Rv cihtb3VzZURvd246d2l0aE1vZGlmaWVyczopCiAgICAgICAgICAgICB8fCBhU2VsZWN0b3IgPT0g QHNlbGVjdG9yKG1vdXNlTW92ZVRvWDpZOikKLSAgICAgICAgICAgIHx8IGFTZWxlY3RvciA9PSBA c2VsZWN0b3IobW91c2VVcDopCisgICAgICAgICAgICB8fCBhU2VsZWN0b3IgPT0gQHNlbGVjdG9y KG1vdXNlVXA6d2l0aE1vZGlmaWVyczopCiAgICAgICAgICAgICB8fCBhU2VsZWN0b3IgPT0gQHNl bGVjdG9yKHNjaGVkdWxlQXN5bmNocm9ub3VzQ2xpY2spCiAgICAgICAgICAgICB8fCBhU2VsZWN0 b3IgPT0gQHNlbGVjdG9yKHRleHRab29tSW4pCiAgICAgICAgICAgICB8fCBhU2VsZWN0b3IgPT0g QHNlbGVjdG9yKHRleHRab29tT3V0KQpAQCAtMTU4LDkgKzE1OCw5IEBAIEJPT0wgcmVwbGF5aW5n U2F2ZWRFdmVudHM7CiAgICAgICAgIHJldHVybiBAImtleURvd24iOwogICAgIGlmIChhU2VsZWN0 b3IgPT0gQHNlbGVjdG9yKGxlYXBGb3J3YXJkOikpCiAgICAgICAgIHJldHVybiBAImxlYXBGb3J3 YXJkIjsKLSAgICBpZiAoYVNlbGVjdG9yID09IEBzZWxlY3Rvcihtb3VzZURvd246KSkKKyAgICBp ZiAoYVNlbGVjdG9yID09IEBzZWxlY3Rvcihtb3VzZURvd246d2l0aE1vZGlmaWVyczopKQogICAg ICAgICByZXR1cm4gQCJtb3VzZURvd24iOwotICAgIGlmIChhU2VsZWN0b3IgPT0gQHNlbGVjdG9y KG1vdXNlVXA6KSkKKyAgICBpZiAoYVNlbGVjdG9yID09IEBzZWxlY3Rvcihtb3VzZVVwOndpdGhN b2RpZmllcnM6KSkKICAgICAgICAgcmV0dXJuIEAibW91c2VVcCI7CiAgICAgaWYgKGFTZWxlY3Rv ciA9PSBAc2VsZWN0b3IobW91c2VNb3ZlVG9YOlk6KSkKICAgICAgICAgcmV0dXJuIEAibW91c2VN b3ZlVG8iOwpAQCAtMjg1LDcgKzI4NSwyNiBAQCBzdGF0aWMgTlNFdmVudFR5cGUgZXZlbnRUeXBl Rm9yTW91c2VCdXR0b25BbmRBY3Rpb24oaW50IGJ1dHRvbiwgTW91c2VBY3Rpb24gYWN0aQogICAg ICAgICBjbGlja0NvdW50Kys7CiB9CiAKLS0gKHZvaWQpbW91c2VEb3duOihpbnQpYnV0dG9uTnVt YmVyCitzdGF0aWMgaW50IGJ1aWxkTW9kaWZpZXJGbGFncyhjb25zdCBXZWJTY3JpcHRPYmplY3Qq IG1vZGlmaWVycykKK3sKKyAgICBpbnQgZmxhZ3MgPSAwOworICAgIGlmICghW21vZGlmaWVycyBp c0tpbmRPZkNsYXNzOltXZWJTY3JpcHRPYmplY3QgY2xhc3NdXSkKKyAgICAgICAgcmV0dXJuIGZs YWdzOworICAgIGZvciAodW5zaWduZWQgaSA9IDA7IFtbbW9kaWZpZXJzIHdlYlNjcmlwdFZhbHVl QXRJbmRleDppXSBpc0tpbmRPZkNsYXNzOltOU1N0cmluZyBjbGFzc11dOyBpKyspIHsKKyAgICAg ICAgTlNTdHJpbmcqIG1vZGlmaWVyTmFtZSA9IChOU1N0cmluZyopW21vZGlmaWVycyB3ZWJTY3Jp cHRWYWx1ZUF0SW5kZXg6aV07CisgICAgICAgIGlmIChbbW9kaWZpZXJOYW1lIGlzRXF1YWw6QCJj dHJsS2V5Il0pCisgICAgICAgICAgICBmbGFncyB8PSBOU0NvbnRyb2xLZXlNYXNrOworICAgICAg ICBlbHNlIGlmIChbbW9kaWZpZXJOYW1lIGlzRXF1YWw6QCJzaGlmdEtleSJdIHx8IFttb2RpZmll ck5hbWUgaXNFcXVhbDpAInJhbmdlU2VsZWN0aW9uS2V5Il0pCisgICAgICAgICAgICBmbGFncyB8 PSBOU1NoaWZ0S2V5TWFzazsKKyAgICAgICAgZWxzZSBpZiAoW21vZGlmaWVyTmFtZSBpc0VxdWFs OkAiYWx0S2V5Il0pCisgICAgICAgICAgICBmbGFncyB8PSBOU0FsdGVybmF0ZUtleU1hc2s7Cisg ICAgICAgIGVsc2UgaWYgKFttb2RpZmllck5hbWUgaXNFcXVhbDpAIm1ldGFLZXkiXSB8fCBbbW9k aWZpZXJOYW1lIGlzRXF1YWw6QCJhZGRTZWxlY3Rpb25LZXkiXSkKKyAgICAgICAgICAgIGZsYWdz IHw9IE5TQ29tbWFuZEtleU1hc2s7CisgICAgfQorICAgIHJldHVybiBmbGFnczsKK30KKworLSAo dm9pZCltb3VzZURvd246KGludClidXR0b25OdW1iZXIgd2l0aE1vZGlmaWVyczooV2ViU2NyaXB0 T2JqZWN0Kiltb2RpZmllcnMKIHsKICAgICBbW1ttYWluRnJhbWUgZnJhbWVWaWV3XSBkb2N1bWVu dFZpZXddIGxheW91dF07CiAgICAgW3NlbGYgdXBkYXRlQ2xpY2tDb3VudEZvckJ1dHRvbjpidXR0 b25OdW1iZXJdOwpAQCAtMjkzLDcgKzMxMiw3IEBAIHN0YXRpYyBOU0V2ZW50VHlwZSBldmVudFR5 cGVGb3JNb3VzZUJ1dHRvbkFuZEFjdGlvbihpbnQgYnV0dG9uLCBNb3VzZUFjdGlvbiBhY3RpCiAg ICAgTlNFdmVudFR5cGUgZXZlbnRUeXBlID0gZXZlbnRUeXBlRm9yTW91c2VCdXR0b25BbmRBY3Rp b24oYnV0dG9uTnVtYmVyLCBNb3VzZURvd24pOwogICAgIE5TRXZlbnQgKmV2ZW50ID0gW05TRXZl bnQgbW91c2VFdmVudFdpdGhUeXBlOmV2ZW50VHlwZQogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGxvY2F0aW9uOmxhc3RNb3VzZVBvc2l0aW9uIAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBtb2RpZmllckZsYWdzOjAgCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIG1vZGlmaWVyRmxhZ3M6YnVpbGRNb2RpZmllckZsYWdzKG1vZGlm aWVycykKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVzdGFtcDpb c2VsZiBjdXJyZW50RXZlbnRUaW1lXQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgd2luZG93TnVtYmVyOltbW21haW5GcmFtZSB3ZWJWaWV3XSB3aW5kb3ddIHdpbmRvd051bWJl cl0gCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRleHQ6W05T R3JhcGhpY3NDb250ZXh0IGN1cnJlbnRDb250ZXh0XSAKQEAgLTMyOSwxMyArMzQ4LDE0IEBAIHN0 YXRpYyBOU0V2ZW50VHlwZSBldmVudFR5cGVGb3JNb3VzZUJ1dHRvbkFuZEFjdGlvbihpbnQgYnV0 dG9uLCBNb3VzZUFjdGlvbiBhY3RpCiAgICAgW1ttYWluRnJhbWUgd2ViVmlld10gem9vbVBhZ2VP dXQ6c2VsZl07CiB9CiAKLS0gKHZvaWQpbW91c2VVcDooaW50KWJ1dHRvbk51bWJlcgorLSAodm9p ZCltb3VzZVVwOihpbnQpYnV0dG9uTnVtYmVyIHdpdGhNb2RpZmllcnM6KFdlYlNjcmlwdE9iamVj dCopbW9kaWZpZXJzCiB7CiAgICAgaWYgKGRyYWdNb2RlICYmICFyZXBsYXlpbmdTYXZlZEV2ZW50 cykgewotICAgICAgICBOU0ludm9jYXRpb24gKmludm9jYXRpb24gPSBbTlNJbnZvY2F0aW9uIGlu dm9jYXRpb25XaXRoTWV0aG9kU2lnbmF0dXJlOltFdmVudFNlbmRpbmdDb250cm9sbGVyIGluc3Rh bmNlTWV0aG9kU2lnbmF0dXJlRm9yU2VsZWN0b3I6QHNlbGVjdG9yKG1vdXNlVXA6KV1dOworICAg ICAgICBOU0ludm9jYXRpb24gKmludm9jYXRpb24gPSBbTlNJbnZvY2F0aW9uIGludm9jYXRpb25X aXRoTWV0aG9kU2lnbmF0dXJlOltFdmVudFNlbmRpbmdDb250cm9sbGVyIGluc3RhbmNlTWV0aG9k U2lnbmF0dXJlRm9yU2VsZWN0b3I6QHNlbGVjdG9yKG1vdXNlVXA6d2l0aE1vZGlmaWVyczopXV07 CiAgICAgICAgIFtpbnZvY2F0aW9uIHNldFRhcmdldDpzZWxmXTsKLSAgICAgICAgW2ludm9jYXRp b24gc2V0U2VsZWN0b3I6QHNlbGVjdG9yKG1vdXNlVXA6KV07CisgICAgICAgIFtpbnZvY2F0aW9u IHNldFNlbGVjdG9yOkBzZWxlY3Rvcihtb3VzZVVwOndpdGhNb2RpZmllcnM6KV07CiAgICAgICAg IFtpbnZvY2F0aW9uIHNldEFyZ3VtZW50OiZidXR0b25OdW1iZXIgYXRJbmRleDoyXTsKKyAgICAg ICAgW2ludm9jYXRpb24gc2V0QXJndW1lbnQ6Jm1vZGlmaWVycyBhdEluZGV4OjNdOwogICAgICAg ICAKICAgICAgICAgW0V2ZW50U2VuZGluZ0NvbnRyb2xsZXIgc2F2ZUV2ZW50Omludm9jYXRpb25d OwogICAgICAgICBbRXZlbnRTZW5kaW5nQ29udHJvbGxlciByZXBsYXlTYXZlZEV2ZW50c107CkBA IC0zNDcsNyArMzY3LDcgQEAgc3RhdGljIE5TRXZlbnRUeXBlIGV2ZW50VHlwZUZvck1vdXNlQnV0 dG9uQW5kQWN0aW9uKGludCBidXR0b24sIE1vdXNlQWN0aW9uIGFjdGkKICAgICBOU0V2ZW50VHlw ZSBldmVudFR5cGUgPSBldmVudFR5cGVGb3JNb3VzZUJ1dHRvbkFuZEFjdGlvbihidXR0b25OdW1i ZXIsIE1vdXNlVXApOwogICAgIE5TRXZlbnQgKmV2ZW50ID0gW05TRXZlbnQgbW91c2VFdmVudFdp dGhUeXBlOmV2ZW50VHlwZQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGxvY2F0aW9uOmxhc3RNb3VzZVBvc2l0aW9uIAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBtb2RpZmllckZsYWdzOjAgCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIG1vZGlmaWVyRmxhZ3M6YnVpbGRNb2RpZmllckZsYWdzKG1vZGlmaWVycykKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVzdGFtcDpbc2VsZiBjdXJyZW50RXZl bnRUaW1lXQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgd2luZG93TnVtYmVy OltbW21haW5GcmFtZSB3ZWJWaWV3XSB3aW5kb3ddIHdpbmRvd051bWJlcl0gCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRleHQ6W05TR3JhcGhpY3NDb250ZXh0 IGN1cnJlbnRDb250ZXh0XSAKQEAgLTQ0NSw4ICs0NjUsOCBAQCBzdGF0aWMgTlNFdmVudFR5cGUg ZXZlbnRUeXBlRm9yTW91c2VCdXR0b25BbmRBY3Rpb24oaW50IGJ1dHRvbiwgTW91c2VBY3Rpb24g YWN0aQogCiAtICh2b2lkKXNjaGVkdWxlQXN5bmNocm9ub3VzQ2xpY2sKIHsKLSAgICBbc2VsZiBw ZXJmb3JtU2VsZWN0b3I6QHNlbGVjdG9yKG1vdXNlRG93bjopIHdpdGhPYmplY3Q6bmlsIGFmdGVy RGVsYXk6MF07Ci0gICAgW3NlbGYgcGVyZm9ybVNlbGVjdG9yOkBzZWxlY3Rvcihtb3VzZVVwOikg d2l0aE9iamVjdDpuaWwgYWZ0ZXJEZWxheTowXTsKKyAgICBbc2VsZiBwZXJmb3JtU2VsZWN0b3I6 QHNlbGVjdG9yKG1vdXNlRG93bjp3aXRoTW9kaWZpZXJzOikgd2l0aE9iamVjdDpuaWwgYWZ0ZXJE ZWxheTowXTsKKyAgICBbc2VsZiBwZXJmb3JtU2VsZWN0b3I6QHNlbGVjdG9yKG1vdXNlVXA6d2l0 aE1vZGlmaWVyczopIHdpdGhPYmplY3Q6bmlsIGFmdGVyRGVsYXk6MF07CiB9CiAKICsgKHZvaWQp c2F2ZUV2ZW50OihOU0ludm9jYXRpb24gKilldmVudApAQCAtNTI0LDE5ICs1NDQsNyBAQCBzdGF0 aWMgTlNFdmVudFR5cGUgZXZlbnRUeXBlRm9yTW91c2VCdXR0b25BbmRBY3Rpb24oaW50IGJ1dHRv biwgTW91c2VBY3Rpb24gYWN0aQogICAgICAgICBjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnMg PSBbY2hhcmFjdGVyIGxvd2VyY2FzZVN0cmluZ107CiAgICAgfQogCi0gICAgaWYgKFttb2RpZmll cnMgaXNLaW5kT2ZDbGFzczpbV2ViU2NyaXB0T2JqZWN0IGNsYXNzXV0pIHsKLSAgICAgICAgZm9y ICh1bnNpZ25lZCBpID0gMDsgW1ttb2RpZmllcnMgd2ViU2NyaXB0VmFsdWVBdEluZGV4OmldIGlz S2luZE9mQ2xhc3M6W05TU3RyaW5nIGNsYXNzXV07IGkrKykgewotICAgICAgICAgICAgTlNTdHJp bmcgKm1vZGlmaWVyID0gKE5TU3RyaW5nICopW21vZGlmaWVycyB3ZWJTY3JpcHRWYWx1ZUF0SW5k ZXg6aV07Ci0gICAgICAgICAgICBpZiAoW21vZGlmaWVyIGlzRXF1YWw6QCJjdHJsS2V5Il0pCi0g ICAgICAgICAgICAgICAgbW9kaWZpZXJGbGFncyB8PSBOU0NvbnRyb2xLZXlNYXNrOwotICAgICAg ICAgICAgZWxzZSBpZiAoW21vZGlmaWVyIGlzRXF1YWw6QCJzaGlmdEtleSJdKQotICAgICAgICAg ICAgICAgIG1vZGlmaWVyRmxhZ3MgfD0gTlNTaGlmdEtleU1hc2s7Ci0gICAgICAgICAgICBlbHNl IGlmIChbbW9kaWZpZXIgaXNFcXVhbDpAImFsdEtleSJdKQotICAgICAgICAgICAgICAgIG1vZGlm aWVyRmxhZ3MgfD0gTlNBbHRlcm5hdGVLZXlNYXNrOwotICAgICAgICAgICAgZWxzZSBpZiAoW21v ZGlmaWVyIGlzRXF1YWw6QCJtZXRhS2V5Il0pCi0gICAgICAgICAgICAgICAgbW9kaWZpZXJGbGFn cyB8PSBOU0NvbW1hbmRLZXlNYXNrOwotICAgICAgICB9Ci0gICAgfQorICAgIG1vZGlmaWVyRmxh Z3MgfD0gYnVpbGRNb2RpZmllckZsYWdzKG1vZGlmaWVycyk7CiAKICAgICBpZiAoa2V5TG9jYXRp b24gPT0gRE9NX0tFWV9MT0NBVElPTl9OVU1QQUQpCiAgICAgICAgIG1vZGlmaWVyRmxhZ3MgfD0g TlNOdW1lcmljUGFkS2V5TWFzazsK 46876 2010-01-18 18:37:23 -0800 2010-01-19 14:50:57 -0800 Proposed patch (rev.2) bug-33783-20100119113722.patch text/plain 8203 tkent ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBmMTBlNzQ1Li40ZDc3MmU2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTAtMDEt MTggIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtEUlRdW01hY10gQWRkIG1vZGlmaWVycyBw YXJhbWV0ZXIgdG8gZXZlbnRTZW5kZXIubW91c2VEb3duKCkgYW5kIGV2ZW50U2VuZGVyLm1vdXNl VXAoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzM3 ODMKKworICAgICAgICBTb21lIGxpc3Rib3ggdGVzdHMgY2hlY2sgc2VsZWN0aW9uIGJlaGF2aW9y IGJ5IGNsaWNrIGV2ZW50cyB3aXRoCisgICAgICAgICJtZXRhIiBvciAic2hpZnQiIGtleXMuIEJl aGF2aW9ycyBmb3Igc3VjaCBtb2RpZmllciBrZXlzIGFyZQorICAgICAgICBwbGF0Zm9ybS1kZXBl bmRlbnQuIFRoZSBuZXcgcGFyYW1ldGVyIG9mIG1vdXNlRG93bigpIGFuZCBtb3VzZVVwKCkKKyAg ICAgICAgYWxsb3dzIHRvIHNwZWNpZnkgbm90IG9ubHkgY29uY3JldGUgbW9kaWZpZXIga2V5cyBz dWNoIGFzCisgICAgICAgICJzaGlmdEtleSIgIm1ldGFLZXkiLCBidXQgYWxzbyBmdW5jdGlvbmFs IG5hbWVzIGxpa2UKKyAgICAgICAgImFkZFNlbGVjdGlvbktleSIgInJhbmdlU2VsZWN0aW9uS2V5 Ii4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL21hYy9FdmVudFNlbmRpbmdDb250cm9sbGVy Lm1tOgorICAgICAgICAoK1tFdmVudFNlbmRpbmdDb250cm9sbGVyIGlzU2VsZWN0b3JFeGNsdWRl ZEZyb21XZWJTY3JpcHQ6XSk6CisgICAgICAgICgrW0V2ZW50U2VuZGluZ0NvbnRyb2xsZXIgd2Vi U2NyaXB0TmFtZUZvclNlbGVjdG9yOl0pOgorICAgICAgICAoYnVpbGRNb2RpZmllckZsYWdzKToK KyAgICAgICAgKC1bRXZlbnRTZW5kaW5nQ29udHJvbGxlciBtb3VzZURvd246d2l0aE1vZGlmaWVy czpdKToKKyAgICAgICAgKC1bRXZlbnRTZW5kaW5nQ29udHJvbGxlciBtb3VzZURvd246XSk6Cisg ICAgICAgICgtW0V2ZW50U2VuZGluZ0NvbnRyb2xsZXIgbW91c2VVcDp3aXRoTW9kaWZpZXJzOl0p OgorICAgICAgICAoLVtFdmVudFNlbmRpbmdDb250cm9sbGVyIG1vdXNlVXA6XSk6CisgICAgICAg ICgtW0V2ZW50U2VuZGluZ0NvbnRyb2xsZXIga2V5RG93bjp3aXRoTW9kaWZpZXJzOndpdGhMb2Nh dGlvbjpdKToKKwogMjAxMC0wMS0xOCAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAK ICAgICAgICAgQWRkIExheW91dFRlc3RDb250cm9sbGVyIHN1cHBvcnQgZm9yIGNhbGxpbmcgbmV3 IFdlYktpdCBTUEkgdG8KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL21h Yy9FdmVudFNlbmRpbmdDb250cm9sbGVyLm1tIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUv bWFjL0V2ZW50U2VuZGluZ0NvbnRyb2xsZXIubW0KaW5kZXggMzNhMDRmNC4uNWQ5MjBjNiAxMDA2 NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0V2ZW50U2VuZGluZ0NvbnRy b2xsZXIubW0KKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0V2ZW50U2VuZGlu Z0NvbnRyb2xsZXIubW0KQEAgLTEyOCw4ICsxMjgsMTAgQEAgQk9PTCByZXBsYXlpbmdTYXZlZEV2 ZW50czsKICAgICAgICAgICAgIHx8IGFTZWxlY3RvciA9PSBAc2VsZWN0b3Ioa2V5RG93bjp3aXRo TW9kaWZpZXJzOndpdGhMb2NhdGlvbjopCiAgICAgICAgICAgICB8fCBhU2VsZWN0b3IgPT0gQHNl bGVjdG9yKGxlYXBGb3J3YXJkOikKICAgICAgICAgICAgIHx8IGFTZWxlY3RvciA9PSBAc2VsZWN0 b3IobW91c2VEb3duOikKKyAgICAgICAgICAgIHx8IGFTZWxlY3RvciA9PSBAc2VsZWN0b3IobW91 c2VEb3duOndpdGhNb2RpZmllcnM6KQogICAgICAgICAgICAgfHwgYVNlbGVjdG9yID09IEBzZWxl Y3Rvcihtb3VzZU1vdmVUb1g6WTopCiAgICAgICAgICAgICB8fCBhU2VsZWN0b3IgPT0gQHNlbGVj dG9yKG1vdXNlVXA6KQorICAgICAgICAgICAgfHwgYVNlbGVjdG9yID09IEBzZWxlY3Rvcihtb3Vz ZVVwOndpdGhNb2RpZmllcnM6KQogICAgICAgICAgICAgfHwgYVNlbGVjdG9yID09IEBzZWxlY3Rv cihzY2hlZHVsZUFzeW5jaHJvbm91c0NsaWNrKQogICAgICAgICAgICAgfHwgYVNlbGVjdG9yID09 IEBzZWxlY3Rvcih0ZXh0Wm9vbUluKQogICAgICAgICAgICAgfHwgYVNlbGVjdG9yID09IEBzZWxl Y3Rvcih0ZXh0Wm9vbU91dCkKQEAgLTE1OCw5ICsxNjAsOSBAQCBCT09MIHJlcGxheWluZ1NhdmVk RXZlbnRzOwogICAgICAgICByZXR1cm4gQCJrZXlEb3duIjsKICAgICBpZiAoYVNlbGVjdG9yID09 IEBzZWxlY3RvcihsZWFwRm9yd2FyZDopKQogICAgICAgICByZXR1cm4gQCJsZWFwRm9yd2FyZCI7 Ci0gICAgaWYgKGFTZWxlY3RvciA9PSBAc2VsZWN0b3IobW91c2VEb3duOikpCisgICAgaWYgKGFT ZWxlY3RvciA9PSBAc2VsZWN0b3IobW91c2VEb3duOikgfHwgYVNlbGVjdG9yID09IEBzZWxlY3Rv cihtb3VzZURvd246d2l0aE1vZGlmaWVyczopKQogICAgICAgICByZXR1cm4gQCJtb3VzZURvd24i OwotICAgIGlmIChhU2VsZWN0b3IgPT0gQHNlbGVjdG9yKG1vdXNlVXA6KSkKKyAgICBpZiAoYVNl bGVjdG9yID09IEBzZWxlY3Rvcihtb3VzZVVwOikgfHwgYVNlbGVjdG9yID09IEBzZWxlY3Rvciht b3VzZVVwOndpdGhNb2RpZmllcnM6KSkKICAgICAgICAgcmV0dXJuIEAibW91c2VVcCI7CiAgICAg aWYgKGFTZWxlY3RvciA9PSBAc2VsZWN0b3IobW91c2VNb3ZlVG9YOlk6KSkKICAgICAgICAgcmV0 dXJuIEAibW91c2VNb3ZlVG8iOwpAQCAtMjg1LDcgKzI4NywyNiBAQCBzdGF0aWMgTlNFdmVudFR5 cGUgZXZlbnRUeXBlRm9yTW91c2VCdXR0b25BbmRBY3Rpb24oaW50IGJ1dHRvbiwgTW91c2VBY3Rp b24gYWN0aQogICAgICAgICBjbGlja0NvdW50Kys7CiB9CiAKLS0gKHZvaWQpbW91c2VEb3duOihp bnQpYnV0dG9uTnVtYmVyCitzdGF0aWMgaW50IGJ1aWxkTW9kaWZpZXJGbGFncyhjb25zdCBXZWJT Y3JpcHRPYmplY3QqIG1vZGlmaWVycykKK3sKKyAgICBpbnQgZmxhZ3MgPSAwOworICAgIGlmICgh W21vZGlmaWVycyBpc0tpbmRPZkNsYXNzOltXZWJTY3JpcHRPYmplY3QgY2xhc3NdXSkKKyAgICAg ICAgcmV0dXJuIGZsYWdzOworICAgIGZvciAodW5zaWduZWQgaSA9IDA7IFtbbW9kaWZpZXJzIHdl YlNjcmlwdFZhbHVlQXRJbmRleDppXSBpc0tpbmRPZkNsYXNzOltOU1N0cmluZyBjbGFzc11dOyBp KyspIHsKKyAgICAgICAgTlNTdHJpbmcqIG1vZGlmaWVyTmFtZSA9IChOU1N0cmluZyopW21vZGlm aWVycyB3ZWJTY3JpcHRWYWx1ZUF0SW5kZXg6aV07CisgICAgICAgIGlmIChbbW9kaWZpZXJOYW1l IGlzRXF1YWw6QCJjdHJsS2V5Il0pCisgICAgICAgICAgICBmbGFncyB8PSBOU0NvbnRyb2xLZXlN YXNrOworICAgICAgICBlbHNlIGlmIChbbW9kaWZpZXJOYW1lIGlzRXF1YWw6QCJzaGlmdEtleSJd IHx8IFttb2RpZmllck5hbWUgaXNFcXVhbDpAInJhbmdlU2VsZWN0aW9uS2V5Il0pCisgICAgICAg ICAgICBmbGFncyB8PSBOU1NoaWZ0S2V5TWFzazsKKyAgICAgICAgZWxzZSBpZiAoW21vZGlmaWVy TmFtZSBpc0VxdWFsOkAiYWx0S2V5Il0pCisgICAgICAgICAgICBmbGFncyB8PSBOU0FsdGVybmF0 ZUtleU1hc2s7CisgICAgICAgIGVsc2UgaWYgKFttb2RpZmllck5hbWUgaXNFcXVhbDpAIm1ldGFL ZXkiXSB8fCBbbW9kaWZpZXJOYW1lIGlzRXF1YWw6QCJhZGRTZWxlY3Rpb25LZXkiXSkKKyAgICAg ICAgICAgIGZsYWdzIHw9IE5TQ29tbWFuZEtleU1hc2s7CisgICAgfQorICAgIHJldHVybiBmbGFn czsKK30KKworLSAodm9pZCltb3VzZURvd246KGludClidXR0b25OdW1iZXIgd2l0aE1vZGlmaWVy czooV2ViU2NyaXB0T2JqZWN0Kiltb2RpZmllcnMKIHsKICAgICBbW1ttYWluRnJhbWUgZnJhbWVW aWV3XSBkb2N1bWVudFZpZXddIGxheW91dF07CiAgICAgW3NlbGYgdXBkYXRlQ2xpY2tDb3VudEZv ckJ1dHRvbjpidXR0b25OdW1iZXJdOwpAQCAtMjkzLDcgKzMxNCw3IEBAIHN0YXRpYyBOU0V2ZW50 VHlwZSBldmVudFR5cGVGb3JNb3VzZUJ1dHRvbkFuZEFjdGlvbihpbnQgYnV0dG9uLCBNb3VzZUFj dGlvbiBhY3RpCiAgICAgTlNFdmVudFR5cGUgZXZlbnRUeXBlID0gZXZlbnRUeXBlRm9yTW91c2VC dXR0b25BbmRBY3Rpb24oYnV0dG9uTnVtYmVyLCBNb3VzZURvd24pOwogICAgIE5TRXZlbnQgKmV2 ZW50ID0gW05TRXZlbnQgbW91c2VFdmVudFdpdGhUeXBlOmV2ZW50VHlwZQogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxvY2F0aW9uOmxhc3RNb3VzZVBvc2l0aW9uIAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtb2RpZmllckZsYWdzOjAgCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1vZGlmaWVyRmxhZ3M6YnVpbGRNb2RpZmll ckZsYWdzKG1vZGlmaWVycykKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHRpbWVzdGFtcDpbc2VsZiBjdXJyZW50RXZlbnRUaW1lXQogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgd2luZG93TnVtYmVyOltbW21haW5GcmFtZSB3ZWJWaWV3XSB3aW5kb3dd IHdpbmRvd051bWJlcl0gCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnRleHQ6W05TR3JhcGhpY3NDb250ZXh0IGN1cnJlbnRDb250ZXh0XSAKQEAgLTMwOSw2ICsz MzAsMTEgQEAgc3RhdGljIE5TRXZlbnRUeXBlIGV2ZW50VHlwZUZvck1vdXNlQnV0dG9uQW5kQWN0 aW9uKGludCBidXR0b24sIE1vdXNlQWN0aW9uIGFjdGkKICAgICB9CiB9CiAKKy0gKHZvaWQpbW91 c2VEb3duOihpbnQpYnV0dG9uTnVtYmVyCit7CisgICAgW3NlbGYgbW91c2VEb3duOmJ1dHRvbk51 bWJlciB3aXRoTW9kaWZpZXJzOm5pbF07Cit9CisKIC0gKHZvaWQpdGV4dFpvb21JbgogewogICAg IFtbbWFpbkZyYW1lIHdlYlZpZXddIG1ha2VUZXh0TGFyZ2VyOnNlbGZdOwpAQCAtMzI5LDEzICsz NTUsMTQgQEAgc3RhdGljIE5TRXZlbnRUeXBlIGV2ZW50VHlwZUZvck1vdXNlQnV0dG9uQW5kQWN0 aW9uKGludCBidXR0b24sIE1vdXNlQWN0aW9uIGFjdGkKICAgICBbW21haW5GcmFtZSB3ZWJWaWV3 XSB6b29tUGFnZU91dDpzZWxmXTsKIH0KIAotLSAodm9pZCltb3VzZVVwOihpbnQpYnV0dG9uTnVt YmVyCistICh2b2lkKW1vdXNlVXA6KGludClidXR0b25OdW1iZXIgd2l0aE1vZGlmaWVyczooV2Vi U2NyaXB0T2JqZWN0Kiltb2RpZmllcnMKIHsKICAgICBpZiAoZHJhZ01vZGUgJiYgIXJlcGxheWlu Z1NhdmVkRXZlbnRzKSB7Ci0gICAgICAgIE5TSW52b2NhdGlvbiAqaW52b2NhdGlvbiA9IFtOU0lu dm9jYXRpb24gaW52b2NhdGlvbldpdGhNZXRob2RTaWduYXR1cmU6W0V2ZW50U2VuZGluZ0NvbnRy b2xsZXIgaW5zdGFuY2VNZXRob2RTaWduYXR1cmVGb3JTZWxlY3RvcjpAc2VsZWN0b3IobW91c2VV cDopXV07CisgICAgICAgIE5TSW52b2NhdGlvbiAqaW52b2NhdGlvbiA9IFtOU0ludm9jYXRpb24g aW52b2NhdGlvbldpdGhNZXRob2RTaWduYXR1cmU6W0V2ZW50U2VuZGluZ0NvbnRyb2xsZXIgaW5z dGFuY2VNZXRob2RTaWduYXR1cmVGb3JTZWxlY3RvcjpAc2VsZWN0b3IobW91c2VVcDp3aXRoTW9k aWZpZXJzOildXTsKICAgICAgICAgW2ludm9jYXRpb24gc2V0VGFyZ2V0OnNlbGZdOwotICAgICAg ICBbaW52b2NhdGlvbiBzZXRTZWxlY3RvcjpAc2VsZWN0b3IobW91c2VVcDopXTsKKyAgICAgICAg W2ludm9jYXRpb24gc2V0U2VsZWN0b3I6QHNlbGVjdG9yKG1vdXNlVXA6d2l0aE1vZGlmaWVyczop XTsKICAgICAgICAgW2ludm9jYXRpb24gc2V0QXJndW1lbnQ6JmJ1dHRvbk51bWJlciBhdEluZGV4 OjJdOworICAgICAgICBbaW52b2NhdGlvbiBzZXRBcmd1bWVudDombW9kaWZpZXJzIGF0SW5kZXg6 M107CiAgICAgICAgIAogICAgICAgICBbRXZlbnRTZW5kaW5nQ29udHJvbGxlciBzYXZlRXZlbnQ6 aW52b2NhdGlvbl07CiAgICAgICAgIFtFdmVudFNlbmRpbmdDb250cm9sbGVyIHJlcGxheVNhdmVk RXZlbnRzXTsKQEAgLTM0Nyw3ICszNzQsNyBAQCBzdGF0aWMgTlNFdmVudFR5cGUgZXZlbnRUeXBl Rm9yTW91c2VCdXR0b25BbmRBY3Rpb24oaW50IGJ1dHRvbiwgTW91c2VBY3Rpb24gYWN0aQogICAg IE5TRXZlbnRUeXBlIGV2ZW50VHlwZSA9IGV2ZW50VHlwZUZvck1vdXNlQnV0dG9uQW5kQWN0aW9u KGJ1dHRvbk51bWJlciwgTW91c2VVcCk7CiAgICAgTlNFdmVudCAqZXZlbnQgPSBbTlNFdmVudCBt b3VzZUV2ZW50V2l0aFR5cGU6ZXZlbnRUeXBlCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgbG9jYXRpb246bGFzdE1vdXNlUG9zaXRpb24gCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIG1vZGlmaWVyRmxhZ3M6MCAKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgbW9kaWZpZXJGbGFnczpidWlsZE1vZGlmaWVyRmxhZ3MobW9kaWZpZXJz KQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGltZXN0YW1wOltzZWxm IGN1cnJlbnRFdmVudFRpbWVdCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB3 aW5kb3dOdW1iZXI6W1tbbWFpbkZyYW1lIHdlYlZpZXddIHdpbmRvd10gd2luZG93TnVtYmVyXSAK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29udGV4dDpbTlNHcmFw aGljc0NvbnRleHQgY3VycmVudENvbnRleHRdIApAQCAtMzgzLDYgKzQxMCwxMSBAQCBzdGF0aWMg TlNFdmVudFR5cGUgZXZlbnRUeXBlRm9yTW91c2VCdXR0b25BbmRBY3Rpb24oaW50IGJ1dHRvbiwg TW91c2VBY3Rpb24gYWN0aQogICAgIH0KIH0KIAorLSAodm9pZCltb3VzZVVwOihpbnQpYnV0dG9u TnVtYmVyCit7CisgICAgW3NlbGYgbW91c2VVcDpidXR0b25OdW1iZXIgd2l0aE1vZGlmaWVyczpu aWxdOworfQorCiAtICh2b2lkKW1vdXNlTW92ZVRvWDooaW50KXggWTooaW50KXkKIHsKICAgICBp ZiAoZHJhZ01vZGUgJiYgbGVmdE1vdXNlQnV0dG9uRG93biAmJiAhcmVwbGF5aW5nU2F2ZWRFdmVu dHMpIHsKQEAgLTUyNCwxOSArNTU2LDcgQEAgc3RhdGljIE5TRXZlbnRUeXBlIGV2ZW50VHlwZUZv ck1vdXNlQnV0dG9uQW5kQWN0aW9uKGludCBidXR0b24sIE1vdXNlQWN0aW9uIGFjdGkKICAgICAg ICAgY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzID0gW2NoYXJhY3RlciBsb3dlcmNhc2VTdHJp bmddOwogICAgIH0KIAotICAgIGlmIChbbW9kaWZpZXJzIGlzS2luZE9mQ2xhc3M6W1dlYlNjcmlw dE9iamVjdCBjbGFzc11dKSB7Ci0gICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IFtbbW9kaWZp ZXJzIHdlYlNjcmlwdFZhbHVlQXRJbmRleDppXSBpc0tpbmRPZkNsYXNzOltOU1N0cmluZyBjbGFz c11dOyBpKyspIHsKLSAgICAgICAgICAgIE5TU3RyaW5nICptb2RpZmllciA9IChOU1N0cmluZyAq KVttb2RpZmllcnMgd2ViU2NyaXB0VmFsdWVBdEluZGV4OmldOwotICAgICAgICAgICAgaWYgKFtt b2RpZmllciBpc0VxdWFsOkAiY3RybEtleSJdKQotICAgICAgICAgICAgICAgIG1vZGlmaWVyRmxh Z3MgfD0gTlNDb250cm9sS2V5TWFzazsKLSAgICAgICAgICAgIGVsc2UgaWYgKFttb2RpZmllciBp c0VxdWFsOkAic2hpZnRLZXkiXSkKLSAgICAgICAgICAgICAgICBtb2RpZmllckZsYWdzIHw9IE5T U2hpZnRLZXlNYXNrOwotICAgICAgICAgICAgZWxzZSBpZiAoW21vZGlmaWVyIGlzRXF1YWw6QCJh bHRLZXkiXSkKLSAgICAgICAgICAgICAgICBtb2RpZmllckZsYWdzIHw9IE5TQWx0ZXJuYXRlS2V5 TWFzazsKLSAgICAgICAgICAgIGVsc2UgaWYgKFttb2RpZmllciBpc0VxdWFsOkAibWV0YUtleSJd KQotICAgICAgICAgICAgICAgIG1vZGlmaWVyRmxhZ3MgfD0gTlNDb21tYW5kS2V5TWFzazsKLSAg ICAgICAgfQotICAgIH0KKyAgICBtb2RpZmllckZsYWdzIHw9IGJ1aWxkTW9kaWZpZXJGbGFncyht b2RpZmllcnMpOwogCiAgICAgaWYgKGtleUxvY2F0aW9uID09IERPTV9LRVlfTE9DQVRJT05fTlVN UEFEKQogICAgICAgICBtb2RpZmllckZsYWdzIHw9IE5TTnVtZXJpY1BhZEtleU1hc2s7Cg==