87654 2012-05-28 06:10:33 -0700 [EFL] Refactoring. Get rid of unnecessary singleCharacterString() function 2012-05-29 05:13:22 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mikhail.pozdnyakov mikhail.pozdnyakov gyuyoung.kim lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 635158 0 mikhail.pozdnyakov 2012-05-28 06:10:33 -0700 Evas key events already provide key string, for instance if the User presses 'Return' key the generated Evas_Event_Key_Down(_Up) events will contain following fields: keyname = "Return", key = "Return", string = "\r", compose = "\r" So no practical need for singleCharacterString() evaluating the event string from event keyname. The only place where this function is currently used is DRT, however DRT EventSender also can provide event string itself. 635168 1 144345 mikhail.pozdnyakov 2012-05-28 06:25:25 -0700 Created attachment 144345 patch 635173 2 144345 rakuco 2012-05-28 06:34:30 -0700 Comment on attachment 144345 patch View in context: https://bugs.webkit.org/attachment.cgi?id=144345&action=review > Tools/DumpRenderTree/efl/EventSender.cpp:124 > + KeyEventInfo(const CString& keyName, unsigned modifiers) > + : keyName(keyName) > + , modifiers(modifiers) Instead of adding a new constructor, I'd change the order of parameters in the other one and make keyString an optional last parameter whose default value is an empty string. 635192 3 144353 mikhail.pozdnyakov 2012-05-28 07:05:29 -0700 Created attachment 144353 patch v2 (Review remarks are met) 635194 4 mikhail.pozdnyakov 2012-05-28 07:06:40 -0700 (In reply to comment #2) > (From update of attachment 144345 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=144345&action=review > > > Tools/DumpRenderTree/efl/EventSender.cpp:124 > > + KeyEventInfo(const CString& keyName, unsigned modifiers) > > + : keyName(keyName) > > + , modifiers(modifiers) > > Instead of adding a new constructor, I'd change the order of parameters in the other one and make keyString an optional last parameter whose default value is an empty string. done. 635201 5 144353 rakuco 2012-05-28 07:19:52 -0700 Comment on attachment 144353 patch v2 (Review remarks are met) Looks good, thanks. 635486 6 144353 gyuyoung.kim 2012-05-28 18:14:30 -0700 Comment on attachment 144353 patch v2 (Review remarks are met) Looks good to me too. 635886 7 144353 ossy 2012-05-29 04:48:34 -0700 Comment on attachment 144353 patch v2 (Review remarks are met) rs=me 635906 8 144353 webkit.review.bot 2012-05-29 05:13:18 -0700 Comment on attachment 144353 patch v2 (Review remarks are met) Clearing flags on attachment: 144353 Committed r118760: <http://trac.webkit.org/changeset/118760> 635907 9 webkit.review.bot 2012-05-29 05:13:22 -0700 All reviewed patches have been landed. Closing bug. 144345 2012-05-28 06:25:25 -0700 2012-05-28 07:05:29 -0700 patch bug87654 text/plain 12703 mikhail.pozdnyakov Y29tbWl0IGUyODIyMTIwMDYxMzI1NzY3NzNlNWJiYTg4ZjFjNjQxZGQzODM4NWUKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPHBvemRueWFrb3YubWlraGFpbEBnbWFpbC5jb20+CkRhdGU6ICAg TW9uIE1heSAyOCAxNjoyNDoyMyAyMDEyICswMzAwCgogICAgYnVnODc2NTQKCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5k ZXggMTYzNDMwMi4uNmY0ZTA4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA1 LTI4ICBNaWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgor CisgICAgICAgIFtFRkxdIFJlZmFjdG9yaW5nLiBHZXQgcmlkIG9mIHVubmVjZXNzYXJ5IHNpbmds ZUNoYXJhY3RlclN0cmluZygpIGZ1bmN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD04NzY1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEV2YXMga2V5IGV2ZW50cyBhbHJlYWR5IHByb3ZpZGUga2V5IHN0 cmluZywgc28gbm8gcHJhY3RpY2FsIG5lZWQgZm9yIHNpbmdsZUNoYXJhY3RlclN0cmluZygpIAor ICAgICAgICBldmFsdWF0aW5nIHRoZSBldmVudCBzdHJpbmcgZnJvbSBrZXluYW1lLgorICAgICAg ICBNb2RpZmllZCBjb2RlIHJlbGF0ZWQgZnVuY3Rpb25hbGl0eSBpcyBhbHJlYWR5IGNvdmVyZWQg d2l0aCBmYXN0L2V2ZW50cyBhbmQgZmFzdC9mb3JtcyB0ZXN0cy4KKworICAgICAgICAqIHBsYXRm b3JtL2VmbC9FZmxLZXlib2FyZFV0aWxpdGllcy5jcHA6CisgICAgICAgICogcGxhdGZvcm0vZWZs L1BsYXRmb3JtS2V5Ym9hcmRFdmVudEVmbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9y bUtleWJvYXJkRXZlbnQ6OlBsYXRmb3JtS2V5Ym9hcmRFdmVudCk6CisKIDIwMTItMDUtMjggIFNo ZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2 aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMTg2NTAuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9lZmwvRWZsS2V5Ym9hcmRVdGlsaXRpZXMuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZWZsL0VmbEtleWJvYXJkVXRpbGl0aWVzLmNwcAppbmRleCAxNmIyYzZhLi42NWM3YjQ5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvRWZsS2V5Ym9hcmRVdGls aXRpZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9FZmxLZXlib2FyZFV0 aWxpdGllcy5jcHAKQEAgLTIxNSwyMiArMjE1LDYgQEAgU3RyaW5nIGtleUlkZW50aWZpZXJGb3JF dmFzS2V5TmFtZShjb25zdCBTdHJpbmcmIGtleU5hbWUpCiAgICAgcmV0dXJuIGtleU5hbWU7CiB9 CiAKLVN0cmluZyBzaW5nbGVDaGFyYWN0ZXJTdHJpbmcoY29uc3QgU3RyaW5nJiBrZXlOYW1lKQot ewotICAgIGlmIChrZXlOYW1lID09ICJSZXR1cm4iKQotICAgICAgICByZXR1cm4gU3RyaW5nKCJc ciIpOwotICAgIGlmIChrZXlOYW1lID09ICJCYWNrU3BhY2UiKQotICAgICAgICByZXR1cm4gU3Ry aW5nKCJceDgiKTsKLSAgICBpZiAoa2V5TmFtZSA9PSAiVGFiIikKLSAgICAgICAgcmV0dXJuIFN0 cmluZygiXHQiKTsKLSAgICBpZiAoa2V5TmFtZSA9PSAiUHJpbnQiKQotICAgICAgICByZXR1cm4g U3RyaW5nKCIiKTsKLSAgICBpZiAoa2V5TmFtZSA9PSAiRXNjYXBlIikKLSAgICAgICAgcmV0dXJu IFN0cmluZygiXHgxYiIpOwotCi0gICAgcmV0dXJuIGtleU5hbWU7Ci19Ci0KIGludCB3aW5kb3dz S2V5Q29kZUZvckV2YXNLZXlOYW1lKGNvbnN0IFN0cmluZyYga2V5TmFtZSkKIHsKICAgICBpZiAo d2luZG93c0tleU1hcCgpLmlzRW1wdHkoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2VmbC9QbGF0Zm9ybUtleWJvYXJkRXZlbnRFZmwuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZWZsL1BsYXRmb3JtS2V5Ym9hcmRFdmVudEVmbC5jcHAKaW5kZXggNzQ4Nzk0OC4u ZGM3OTY5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1BsYXRmb3Jt S2V5Ym9hcmRFdmVudEVmbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1Bs YXRmb3JtS2V5Ym9hcmRFdmVudEVmbC5jcHAKQEAgLTQyLDggKzQyLDggQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogCiBQbGF0Zm9ybUtleWJvYXJkRXZlbnQ6OlBsYXRmb3JtS2V5Ym9hcmRFdmVudChj b25zdCBFdmFzX0V2ZW50X0tleV9Eb3duKiBldmVudCkKICAgICA6IFBsYXRmb3JtRXZlbnQoUGxh dGZvcm1FdmVudDo6S2V5RG93biwgZXZhc19rZXlfbW9kaWZpZXJfaXNfc2V0KGV2ZW50LT5tb2Rp ZmllcnMsICJTaGlmdCIpLCBldmFzX2tleV9tb2RpZmllcl9pc19zZXQoZXZlbnQtPm1vZGlmaWVy cywgIkNvbnRyb2wiKSwgZXZhc19rZXlfbW9kaWZpZXJfaXNfc2V0KGV2ZW50LT5tb2RpZmllcnMs ICJBbHQiKSwgZXZhc19rZXlfbW9kaWZpZXJfaXNfc2V0KGV2ZW50LT5tb2RpZmllcnMsICJNZXRh IiksIGN1cnJlbnRUaW1lKCkpCi0gICAgLCBtX3RleHQoc2luZ2xlQ2hhcmFjdGVyU3RyaW5nKFN0 cmluZzo6ZnJvbVVURjgoZXZlbnQtPnN0cmluZykpKQotICAgICwgbV91bm1vZGlmaWVkVGV4dChz aW5nbGVDaGFyYWN0ZXJTdHJpbmcoU3RyaW5nOjpmcm9tVVRGOChldmVudC0+c3RyaW5nKSkpCisg ICAgLCBtX3RleHQoU3RyaW5nOjpmcm9tVVRGOChldmVudC0+c3RyaW5nKSkKKyAgICAsIG1fdW5t b2RpZmllZFRleHQoU3RyaW5nOjpmcm9tVVRGOChldmVudC0+c3RyaW5nKSkKICAgICAsIG1fa2V5 SWRlbnRpZmllcihrZXlJZGVudGlmaWVyRm9yRXZhc0tleU5hbWUoU3RyaW5nKGV2ZW50LT5rZXkp KSkKICAgICAsIG1fd2luZG93c1ZpcnR1YWxLZXlDb2RlKHdpbmRvd3NLZXlDb2RlRm9yRXZhc0tl eU5hbWUoU3RyaW5nKGV2ZW50LT5rZXkpKSkKICAgICAsIG1fbmF0aXZlVmlydHVhbEtleUNvZGUo MCkKQEAgLTU2LDggKzU2LDggQEAgUGxhdGZvcm1LZXlib2FyZEV2ZW50OjpQbGF0Zm9ybUtleWJv YXJkRXZlbnQoY29uc3QgRXZhc19FdmVudF9LZXlfRG93biogZXZlbnQpCiAKIFBsYXRmb3JtS2V5 Ym9hcmRFdmVudDo6UGxhdGZvcm1LZXlib2FyZEV2ZW50KGNvbnN0IEV2YXNfRXZlbnRfS2V5X1Vw KiBldmVudCkKICAgICA6IFBsYXRmb3JtRXZlbnQoUGxhdGZvcm1FdmVudDo6S2V5VXAsIGV2YXNf a2V5X21vZGlmaWVyX2lzX3NldChldmVudC0+bW9kaWZpZXJzLCAiU2hpZnQiKSwgZXZhc19rZXlf bW9kaWZpZXJfaXNfc2V0KGV2ZW50LT5tb2RpZmllcnMsICJDb250cm9sIiksIGV2YXNfa2V5X21v ZGlmaWVyX2lzX3NldChldmVudC0+bW9kaWZpZXJzLCAiQWx0IiksIGV2YXNfa2V5X21vZGlmaWVy X2lzX3NldChldmVudC0+bW9kaWZpZXJzLCAiTWV0YSIpLCBjdXJyZW50VGltZSgpKQotICAgICwg bV90ZXh0KHNpbmdsZUNoYXJhY3RlclN0cmluZyhTdHJpbmc6OmZyb21VVEY4KGV2ZW50LT5zdHJp bmcpKSkKLSAgICAsIG1fdW5tb2RpZmllZFRleHQoc2luZ2xlQ2hhcmFjdGVyU3RyaW5nKFN0cmlu Zzo6ZnJvbVVURjgoZXZlbnQtPnN0cmluZykpKQorICAgICwgbV90ZXh0KFN0cmluZzo6ZnJvbVVU RjgoZXZlbnQtPnN0cmluZykpCisgICAgLCBtX3VubW9kaWZpZWRUZXh0KFN0cmluZzo6ZnJvbVVU RjgoZXZlbnQtPnN0cmluZykpCiAgICAgLCBtX2tleUlkZW50aWZpZXIoa2V5SWRlbnRpZmllckZv ckV2YXNLZXlOYW1lKFN0cmluZyhldmVudC0+a2V5KSkpCiAgICAgLCBtX3dpbmRvd3NWaXJ0dWFs S2V5Q29kZSh3aW5kb3dzS2V5Q29kZUZvckV2YXNLZXlOYW1lKFN0cmluZyhldmVudC0+a2V5KSkp CiAgICAgLCBtX25hdGl2ZVZpcnR1YWxLZXlDb2RlKDApCmRpZmYgLS1naXQgYS9Ub29scy9DaGFu Z2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjdhYzZhMi4uZjM4OGM5ZSAxMDA2NDQKLS0t IGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBA CisyMDEyLTA1LTI4ICBNaWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50 ZWwuY29tPgorCisgICAgICAgIFtFRkxdIFJlZmFjdG9yaW5nLiBHZXQgcmlkIG9mIHVubmVjZXNz YXJ5IHNpbmdsZUNoYXJhY3RlclN0cmluZygpIGZ1bmN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NzY1NAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEV2ZW50IHNlbmRlciBwcm92aWRlcyBzdHJpbmdz IGZvciBhbGwgdGhlIGtleSBldmVudHMuCisgICAgICAgIEFsc28gbmV3IEtleUV2ZW50SW5mbyBj b25zdHJ1Y3RvciB3YXMgYWRkZWQgdG8gc2ltcGxpZnkgdGhlIGNhc2Ugd2hlbgorICAgICAgICBh IGtleSBldmVudCBoYXMgZW1wdHkgc3RyaW5nLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUv ZWZsL0V2ZW50U2VuZGVyLmNwcDoKKyAgICAgICAgKEtleUV2ZW50SW5mbzo6S2V5RXZlbnRJbmZv KToKKyAgICAgICAgKEtleUV2ZW50SW5mbyk6CisgICAgICAgIChrZXlQYWROYW1lRnJvbUpTVmFs dWUpOgorICAgICAgICAoa2V5TmFtZUZyb21KU1ZhbHVlKToKKwogMjAxMi0wNS0yOCAgR3l1eW91 bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgogCiAgICAgICAgIE1vdmUgYWxsb3dS b3VuZGluZ0hhY2tzIHRvIEludGVybmFscyBpbnRlcmZhY2UKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1 bXBSZW5kZXJUcmVlL2VmbC9FdmVudFNlbmRlci5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9l ZmwvRXZlbnRTZW5kZXIuY3BwCmluZGV4IDgzMzg1YzQuLjMzZTI1MDQgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9FdmVudFNlbmRlci5jcHAKKysrIGIvVG9vbHMvRHVtcFJl bmRlclRyZWUvZWZsL0V2ZW50U2VuZGVyLmNwcApAQCAtMTE5LDYgKzExOSwxMiBAQCBzdHJ1Y3Qg S2V5RXZlbnRJbmZvIHsKICAgICB7CiAgICAgfQogCisgICAgS2V5RXZlbnRJbmZvKGNvbnN0IENT dHJpbmcmIGtleU5hbWUsIHVuc2lnbmVkIG1vZGlmaWVycykKKyAgICAgICAgOiBrZXlOYW1lKGtl eU5hbWUpCisgICAgICAgICwgbW9kaWZpZXJzKG1vZGlmaWVycykKKyAgICB7CisgICAgfQorCiAg ICAgY29uc3QgQ1N0cmluZyBrZXlOYW1lOwogICAgIGNvbnN0IENTdHJpbmcga2V5U3RyaW5nOwog ICAgIHVuc2lnbmVkIG1vZGlmaWVyczsKQEAgLTM4OSwyNSArMzk1LDI1IEBAIHN0YXRpYyBKU1Zh bHVlUmVmIGNvbnRpbnVvdXNNb3VzZVNjcm9sbEJ5Q2FsbGJhY2soSlNDb250ZXh0UmVmIGNvbnRl eHQsIEpTT2JqZWN0CiBzdGF0aWMgS2V5RXZlbnRJbmZvKiBrZXlQYWROYW1lRnJvbUpTVmFsdWUo SlNTdHJpbmdSZWYgY2hhcmFjdGVyLCB1bnNpZ25lZCBtb2RpZmllcnMpCiB7CiAgICAgaWYgKGVx dWFscyhjaGFyYWN0ZXIsICJsZWZ0QXJyb3ciKSkKLSAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVu dEluZm8oIktQX0xlZnQiLCAiIiwgbW9kaWZpZXJzKTsKKyAgICAgICAgcmV0dXJuIG5ldyBLZXlF dmVudEluZm8oIktQX0xlZnQiLCBtb2RpZmllcnMpOwogICAgIGlmIChlcXVhbHMoY2hhcmFjdGVy LCAicmlnaHRBcnJvdyIpKQotICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiS1BfUmln aHQiLCAiIiwgbW9kaWZpZXJzKTsKKyAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIktQ X1JpZ2h0IiwgbW9kaWZpZXJzKTsKICAgICBpZiAoZXF1YWxzKGNoYXJhY3RlciwgInVwQXJyb3ci KSkKLSAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIktQX1VwIiwgIiIsIG1vZGlmaWVy cyk7CisgICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJLUF9VcCIsIG1vZGlmaWVycyk7 CiAgICAgaWYgKGVxdWFscyhjaGFyYWN0ZXIsICJkb3duQXJyb3ciKSkKLSAgICAgICAgcmV0dXJu IG5ldyBLZXlFdmVudEluZm8oIktQX0Rvd24iLCAiIiwgbW9kaWZpZXJzKTsKKyAgICAgICAgcmV0 dXJuIG5ldyBLZXlFdmVudEluZm8oIktQX0Rvd24iLCBtb2RpZmllcnMpOwogICAgIGlmIChlcXVh bHMoY2hhcmFjdGVyLCAicGFnZVVwIikpCi0gICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZv KCJLUF9QcmlvciIsICIiLCBtb2RpZmllcnMpOworICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50 SW5mbygiS1BfUHJpb3IiLCBtb2RpZmllcnMpOwogICAgIGlmIChlcXVhbHMoY2hhcmFjdGVyLCAi cGFnZURvd24iKSkKLSAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIktQX05leHQiLCAi IiwgbW9kaWZpZXJzKTsKKyAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIktQX05leHQi LCBtb2RpZmllcnMpOwogICAgIGlmIChlcXVhbHMoY2hhcmFjdGVyLCAiaG9tZSIpKQotICAgICAg ICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiS1BfSG9tZSIsICIiLCBtb2RpZmllcnMpOworICAg ICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiS1BfSG9tZSIsIG1vZGlmaWVycyk7CiAgICAg aWYgKGVxdWFscyhjaGFyYWN0ZXIsICJlbmQiKSkKLSAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVu dEluZm8oIktQX0VuZCIsICIiLCBtb2RpZmllcnMpOworICAgICAgICByZXR1cm4gbmV3IEtleUV2 ZW50SW5mbygiS1BfRW5kIiwgbW9kaWZpZXJzKTsKICAgICBpZiAoZXF1YWxzKGNoYXJhY3Rlciwg Imluc2VydCIpKQotICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiS1BfSW5zZXJ0Iiwg IiIsIG1vZGlmaWVycyk7CisgICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJLUF9JbnNl cnQiLCBtb2RpZmllcnMpOwogICAgIGlmIChlcXVhbHMoY2hhcmFjdGVyLCAiZGVsZXRlIikpCi0g ICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJLUF9EZWxldGUiLCAiIiwgbW9kaWZpZXJz KTsKKyAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIktQX0RlbGV0ZSIsIG1vZGlmaWVy cyk7CiAKICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbyhjaGFyYWN0ZXItPnVzdHJpbmcoKS51 dGY4KCksIGNoYXJhY3Rlci0+dXN0cmluZygpLnV0ZjgoKSwgbW9kaWZpZXJzKTsKIH0KQEAgLTQx NSw3NyArNDIxLDc3IEBAIHN0YXRpYyBLZXlFdmVudEluZm8qIGtleVBhZE5hbWVGcm9tSlNWYWx1 ZShKU1N0cmluZ1JlZiBjaGFyYWN0ZXIsIHVuc2lnbmVkIG1vZGlmCiBzdGF0aWMgS2V5RXZlbnRJ bmZvKiBrZXlOYW1lRnJvbUpTVmFsdWUoSlNTdHJpbmdSZWYgY2hhcmFjdGVyLCB1bnNpZ25lZCBt b2RpZmllcnMpCiB7CiAgICAgaWYgKGVxdWFscyhjaGFyYWN0ZXIsICJsZWZ0QXJyb3ciKSkKLSAg ICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIkxlZnQiLCAiIiwgbW9kaWZpZXJzKTsKKyAg ICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIkxlZnQiLCBtb2RpZmllcnMpOwogICAgIGlm IChlcXVhbHMoY2hhcmFjdGVyLCAicmlnaHRBcnJvdyIpKQotICAgICAgICByZXR1cm4gbmV3IEtl eUV2ZW50SW5mbygiUmlnaHQiLCAiIiwgbW9kaWZpZXJzKTsKKyAgICAgICAgcmV0dXJuIG5ldyBL ZXlFdmVudEluZm8oIlJpZ2h0IiwgbW9kaWZpZXJzKTsKICAgICBpZiAoZXF1YWxzKGNoYXJhY3Rl ciwgInVwQXJyb3ciKSkKLSAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIlVwIiwgIiIs IG1vZGlmaWVycyk7CisgICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJVcCIsIG1vZGlm aWVycyk7CiAgICAgaWYgKGVxdWFscyhjaGFyYWN0ZXIsICJkb3duQXJyb3ciKSkKLSAgICAgICAg cmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIkRvd24iLCAiIiwgbW9kaWZpZXJzKTsKKyAgICAgICAg cmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIkRvd24iLCBtb2RpZmllcnMpOwogICAgIGlmIChlcXVh bHMoY2hhcmFjdGVyLCAicGFnZVVwIikpCi0gICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZv KCJQcmlvciIsICIiLCBtb2RpZmllcnMpOworICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5m bygiUHJpb3IiLCBtb2RpZmllcnMpOwogICAgIGlmIChlcXVhbHMoY2hhcmFjdGVyLCAicGFnZURv d24iKSkKLSAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIk5leHQiLCAiIiwgbW9kaWZp ZXJzKTsKKyAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIk5leHQiLCBtb2RpZmllcnMp OwogICAgIGlmIChlcXVhbHMoY2hhcmFjdGVyLCAiaG9tZSIpKQotICAgICAgICByZXR1cm4gbmV3 IEtleUV2ZW50SW5mbygiSG9tZSIsICIiLCBtb2RpZmllcnMpOworICAgICAgICByZXR1cm4gbmV3 IEtleUV2ZW50SW5mbygiSG9tZSIsIG1vZGlmaWVycyk7CiAgICAgaWYgKGVxdWFscyhjaGFyYWN0 ZXIsICJlbmQiKSkKLSAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIkVuZCIsICIiLCBt b2RpZmllcnMpOworICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiRW5kIiwgbW9kaWZp ZXJzKTsKICAgICBpZiAoZXF1YWxzKGNoYXJhY3RlciwgImluc2VydCIpKQotICAgICAgICByZXR1 cm4gbmV3IEtleUV2ZW50SW5mbygiSW5zZXJ0IiwgIiIsIG1vZGlmaWVycyk7CisgICAgICAgIHJl dHVybiBuZXcgS2V5RXZlbnRJbmZvKCJJbnNlcnQiLCBtb2RpZmllcnMpOwogICAgIGlmIChlcXVh bHMoY2hhcmFjdGVyLCAiZGVsZXRlIikpCi0gICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZv KCJEZWxldGUiLCAiIiwgbW9kaWZpZXJzKTsKKyAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudElu Zm8oIkRlbGV0ZSIsIG1vZGlmaWVycyk7CiAgICAgaWYgKGVxdWFscyhjaGFyYWN0ZXIsICJwcmlu dFNjcmVlbiIpKQotICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiUHJpbnQiLCAiIiwg bW9kaWZpZXJzKTsKKyAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIlByaW50IiwgbW9k aWZpZXJzKTsKICAgICBpZiAoZXF1YWxzKGNoYXJhY3RlciwgIm1lbnUiKSkKLSAgICAgICAgcmV0 dXJuIG5ldyBLZXlFdmVudEluZm8oIk1lbnUiLCAiIiwgbW9kaWZpZXJzKTsKKyAgICAgICAgcmV0 dXJuIG5ldyBLZXlFdmVudEluZm8oIk1lbnUiLCBtb2RpZmllcnMpOwogICAgIGlmIChlcXVhbHMo Y2hhcmFjdGVyLCAibGVmdENvbnRyb2wiKSkKLSAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudElu Zm8oIkNvbnRyb2xfTCIsICIiLCBtb2RpZmllcnMpOworICAgICAgICByZXR1cm4gbmV3IEtleUV2 ZW50SW5mbygiQ29udHJvbF9MIiwgbW9kaWZpZXJzKTsKICAgICBpZiAoZXF1YWxzKGNoYXJhY3Rl ciwgInJpZ2h0Q29udHJvbCIpKQotICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiQ29u dHJvbF9SIiwgIiIsIG1vZGlmaWVycyk7CisgICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZv KCJDb250cm9sX1IiLCBtb2RpZmllcnMpOwogICAgIGlmIChlcXVhbHMoY2hhcmFjdGVyLCAibGVm dFNoaWZ0IikpCi0gICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJTaGlmdF9MIiwgIiIs IG1vZGlmaWVycyk7CisgICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJTaGlmdF9MIiwg bW9kaWZpZXJzKTsKICAgICBpZiAoZXF1YWxzKGNoYXJhY3RlciwgInJpZ2h0U2hpZnQiKSkKLSAg ICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIlNoaWZ0X1IiLCAiIiwgbW9kaWZpZXJzKTsK KyAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIlNoaWZ0X1IiLCBtb2RpZmllcnMpOwog ICAgIGlmIChlcXVhbHMoY2hhcmFjdGVyLCAibGVmdEFsdCIpKQotICAgICAgICByZXR1cm4gbmV3 IEtleUV2ZW50SW5mbygiQWx0X0wiLCAiIiwgbW9kaWZpZXJzKTsKKyAgICAgICAgcmV0dXJuIG5l dyBLZXlFdmVudEluZm8oIkFsdF9MIiwgbW9kaWZpZXJzKTsKICAgICBpZiAoZXF1YWxzKGNoYXJh Y3RlciwgInJpZ2h0QWx0IikpCi0gICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJBbHRf UiIsICIiLCBtb2RpZmllcnMpOworICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiQWx0 X1IiLCBtb2RpZmllcnMpOwogICAgIGlmIChlcXVhbHMoY2hhcmFjdGVyLCAiRjEiKSkKLSAgICAg ICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIkYxIiwgIiIsIG1vZGlmaWVycyk7CisgICAgICAg IHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJGMSIsIG1vZGlmaWVycyk7CiAgICAgaWYgKGVxdWFs cyhjaGFyYWN0ZXIsICJGMiIpKQotICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiRjIi LCAiIiwgbW9kaWZpZXJzKTsKKyAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIkYyIiwg bW9kaWZpZXJzKTsKICAgICBpZiAoZXF1YWxzKGNoYXJhY3RlciwgIkYzIikpCi0gICAgICAgIHJl dHVybiBuZXcgS2V5RXZlbnRJbmZvKCJGMyIsICIiLCBtb2RpZmllcnMpOworICAgICAgICByZXR1 cm4gbmV3IEtleUV2ZW50SW5mbygiRjMiLCBtb2RpZmllcnMpOwogICAgIGlmIChlcXVhbHMoY2hh cmFjdGVyLCAiRjQiKSkKLSAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIkY0IiwgIiIs IG1vZGlmaWVycyk7CisgICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJGNCIsIG1vZGlm aWVycyk7CiAgICAgaWYgKGVxdWFscyhjaGFyYWN0ZXIsICJGNSIpKQotICAgICAgICByZXR1cm4g bmV3IEtleUV2ZW50SW5mbygiRjUiLCAiIiwgbW9kaWZpZXJzKTsKKyAgICAgICAgcmV0dXJuIG5l dyBLZXlFdmVudEluZm8oIkY1IiwgbW9kaWZpZXJzKTsKICAgICBpZiAoZXF1YWxzKGNoYXJhY3Rl ciwgIkY2IikpCi0gICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJGNiIsICIiLCBtb2Rp ZmllcnMpOworICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiRjYiLCBtb2RpZmllcnMp OwogICAgIGlmIChlcXVhbHMoY2hhcmFjdGVyLCAiRjciKSkKLSAgICAgICAgcmV0dXJuIG5ldyBL ZXlFdmVudEluZm8oIkY3IiwgIiIsIG1vZGlmaWVycyk7CisgICAgICAgIHJldHVybiBuZXcgS2V5 RXZlbnRJbmZvKCJGNyIsIG1vZGlmaWVycyk7CiAgICAgaWYgKGVxdWFscyhjaGFyYWN0ZXIsICJG OCIpKQotICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiRjgiLCAiIiwgbW9kaWZpZXJz KTsKKyAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIkY4IiwgbW9kaWZpZXJzKTsKICAg ICBpZiAoZXF1YWxzKGNoYXJhY3RlciwgIkY5IikpCi0gICAgICAgIHJldHVybiBuZXcgS2V5RXZl bnRJbmZvKCJGOSIsICIiLCBtb2RpZmllcnMpOworICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50 SW5mbygiRjkiLCBtb2RpZmllcnMpOwogICAgIGlmIChlcXVhbHMoY2hhcmFjdGVyLCAiRjEwIikp Ci0gICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJGMTAiLCAiIiwgbW9kaWZpZXJzKTsK KyAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIkYxMCIsIG1vZGlmaWVycyk7CiAgICAg aWYgKGVxdWFscyhjaGFyYWN0ZXIsICJGMTEiKSkKLSAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVu dEluZm8oIkYxMSIsICIiLCBtb2RpZmllcnMpOworICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50 SW5mbygiRjExIiwgbW9kaWZpZXJzKTsKICAgICBpZiAoZXF1YWxzKGNoYXJhY3RlciwgIkYxMiIp KQotICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiRjEyIiwgIiIsIG1vZGlmaWVycyk7 CisgICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJGMTIiLCBtb2RpZmllcnMpOwogCiAg ICAgaW50IGNoYXJDb2RlID0gSlNTdHJpbmdHZXRDaGFyYWN0ZXJzUHRyKGNoYXJhY3RlcilbMF07 CiAgICAgaWYgKGNoYXJDb2RlID09ICdcbicgfHwgY2hhckNvZGUgPT0gJ1xyJykKLSAgICAgICAg cmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIlJldHVybiIsICJSZXR1cm4iLCBtb2RpZmllcnMpOwor ICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiUmV0dXJuIiwgIlxyIiwgbW9kaWZpZXJz KTsKICAgICBpZiAoY2hhckNvZGUgPT0gJ1x0JykKLSAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVu dEluZm8oIlRhYiIsICJUYWIiLCBtb2RpZmllcnMpOworICAgICAgICByZXR1cm4gbmV3IEtleUV2 ZW50SW5mbygiVGFiIiwgIlx0IiwgbW9kaWZpZXJzKTsKICAgICBpZiAoY2hhckNvZGUgPT0gJ1x4 OCcpCi0gICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJCYWNrU3BhY2UiLCAiQmFja1Nw YWNlIiwgbW9kaWZpZXJzKTsKKyAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIkJhY2tT cGFjZSIsICJceDgiLCBtb2RpZmllcnMpOwogICAgIGlmIChjaGFyQ29kZSA9PSAnICcpCiAgICAg ICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJzcGFjZSIsICIgIiwgbW9kaWZpZXJzKTsKICAg ICBpZiAoY2hhckNvZGUgPT0gJ1x4MUInKQotICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5m bygiRXNjYXBlIiwgIkVzY2FwZSIsIG1vZGlmaWVycyk7CisgICAgICAgIHJldHVybiBuZXcgS2V5 RXZlbnRJbmZvKCJFc2NhcGUiLCAiXHgxQiIsIG1vZGlmaWVycyk7CiAKICAgICBpZiAoKGNoYXJh Y3Rlci0+bGVuZ3RoKCkgPT0gMSkgJiYgKGNoYXJDb2RlID49ICdBJyAmJiBjaGFyQ29kZSA8PSAn WicpKQogICAgICAgICBtb2RpZmllcnMgfD0gRXZhc0tleU1vZGlmaWVyU2hpZnQ7Cg== 144353 2012-05-28 07:05:29 -0700 2012-05-29 05:13:18 -0700 patch v2 (Review remarks are met) bug87654_v2 text/plain 13170 mikhail.pozdnyakov Y29tbWl0IDMxNmY4OTJjOWIyMGNhMmQ1Y2FmYTFhN2YxYTk5NGIxN2VhYWJlMDcKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPHBvemRueWFrb3YubWlraGFpbEBnbWFpbC5jb20+CkRhdGU6ICAg TW9uIE1heSAyOCAxNzowNDoxNSAyMDEyICswMzAwCgogICAgYnVnODc2NTQKCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5k ZXggMTYzNDMwMi4uNmY0ZTA4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA1 LTI4ICBNaWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgor CisgICAgICAgIFtFRkxdIFJlZmFjdG9yaW5nLiBHZXQgcmlkIG9mIHVubmVjZXNzYXJ5IHNpbmds ZUNoYXJhY3RlclN0cmluZygpIGZ1bmN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD04NzY1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEV2YXMga2V5IGV2ZW50cyBhbHJlYWR5IHByb3ZpZGUga2V5IHN0 cmluZywgc28gbm8gcHJhY3RpY2FsIG5lZWQgZm9yIHNpbmdsZUNoYXJhY3RlclN0cmluZygpIAor ICAgICAgICBldmFsdWF0aW5nIHRoZSBldmVudCBzdHJpbmcgZnJvbSBrZXluYW1lLgorICAgICAg ICBNb2RpZmllZCBjb2RlIHJlbGF0ZWQgZnVuY3Rpb25hbGl0eSBpcyBhbHJlYWR5IGNvdmVyZWQg d2l0aCBmYXN0L2V2ZW50cyBhbmQgZmFzdC9mb3JtcyB0ZXN0cy4KKworICAgICAgICAqIHBsYXRm b3JtL2VmbC9FZmxLZXlib2FyZFV0aWxpdGllcy5jcHA6CisgICAgICAgICogcGxhdGZvcm0vZWZs L1BsYXRmb3JtS2V5Ym9hcmRFdmVudEVmbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9y bUtleWJvYXJkRXZlbnQ6OlBsYXRmb3JtS2V5Ym9hcmRFdmVudCk6CisKIDIwMTItMDUtMjggIFNo ZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2 aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMTg2NTAuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9lZmwvRWZsS2V5Ym9hcmRVdGlsaXRpZXMuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZWZsL0VmbEtleWJvYXJkVXRpbGl0aWVzLmNwcAppbmRleCAxNmIyYzZhLi42NWM3YjQ5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvRWZsS2V5Ym9hcmRVdGls aXRpZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9FZmxLZXlib2FyZFV0 aWxpdGllcy5jcHAKQEAgLTIxNSwyMiArMjE1LDYgQEAgU3RyaW5nIGtleUlkZW50aWZpZXJGb3JF dmFzS2V5TmFtZShjb25zdCBTdHJpbmcmIGtleU5hbWUpCiAgICAgcmV0dXJuIGtleU5hbWU7CiB9 CiAKLVN0cmluZyBzaW5nbGVDaGFyYWN0ZXJTdHJpbmcoY29uc3QgU3RyaW5nJiBrZXlOYW1lKQot ewotICAgIGlmIChrZXlOYW1lID09ICJSZXR1cm4iKQotICAgICAgICByZXR1cm4gU3RyaW5nKCJc ciIpOwotICAgIGlmIChrZXlOYW1lID09ICJCYWNrU3BhY2UiKQotICAgICAgICByZXR1cm4gU3Ry aW5nKCJceDgiKTsKLSAgICBpZiAoa2V5TmFtZSA9PSAiVGFiIikKLSAgICAgICAgcmV0dXJuIFN0 cmluZygiXHQiKTsKLSAgICBpZiAoa2V5TmFtZSA9PSAiUHJpbnQiKQotICAgICAgICByZXR1cm4g U3RyaW5nKCIiKTsKLSAgICBpZiAoa2V5TmFtZSA9PSAiRXNjYXBlIikKLSAgICAgICAgcmV0dXJu IFN0cmluZygiXHgxYiIpOwotCi0gICAgcmV0dXJuIGtleU5hbWU7Ci19Ci0KIGludCB3aW5kb3dz S2V5Q29kZUZvckV2YXNLZXlOYW1lKGNvbnN0IFN0cmluZyYga2V5TmFtZSkKIHsKICAgICBpZiAo d2luZG93c0tleU1hcCgpLmlzRW1wdHkoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2VmbC9QbGF0Zm9ybUtleWJvYXJkRXZlbnRFZmwuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZWZsL1BsYXRmb3JtS2V5Ym9hcmRFdmVudEVmbC5jcHAKaW5kZXggNzQ4Nzk0OC4u ZGM3OTY5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1BsYXRmb3Jt S2V5Ym9hcmRFdmVudEVmbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1Bs YXRmb3JtS2V5Ym9hcmRFdmVudEVmbC5jcHAKQEAgLTQyLDggKzQyLDggQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogCiBQbGF0Zm9ybUtleWJvYXJkRXZlbnQ6OlBsYXRmb3JtS2V5Ym9hcmRFdmVudChj b25zdCBFdmFzX0V2ZW50X0tleV9Eb3duKiBldmVudCkKICAgICA6IFBsYXRmb3JtRXZlbnQoUGxh dGZvcm1FdmVudDo6S2V5RG93biwgZXZhc19rZXlfbW9kaWZpZXJfaXNfc2V0KGV2ZW50LT5tb2Rp ZmllcnMsICJTaGlmdCIpLCBldmFzX2tleV9tb2RpZmllcl9pc19zZXQoZXZlbnQtPm1vZGlmaWVy cywgIkNvbnRyb2wiKSwgZXZhc19rZXlfbW9kaWZpZXJfaXNfc2V0KGV2ZW50LT5tb2RpZmllcnMs ICJBbHQiKSwgZXZhc19rZXlfbW9kaWZpZXJfaXNfc2V0KGV2ZW50LT5tb2RpZmllcnMsICJNZXRh IiksIGN1cnJlbnRUaW1lKCkpCi0gICAgLCBtX3RleHQoc2luZ2xlQ2hhcmFjdGVyU3RyaW5nKFN0 cmluZzo6ZnJvbVVURjgoZXZlbnQtPnN0cmluZykpKQotICAgICwgbV91bm1vZGlmaWVkVGV4dChz aW5nbGVDaGFyYWN0ZXJTdHJpbmcoU3RyaW5nOjpmcm9tVVRGOChldmVudC0+c3RyaW5nKSkpCisg ICAgLCBtX3RleHQoU3RyaW5nOjpmcm9tVVRGOChldmVudC0+c3RyaW5nKSkKKyAgICAsIG1fdW5t b2RpZmllZFRleHQoU3RyaW5nOjpmcm9tVVRGOChldmVudC0+c3RyaW5nKSkKICAgICAsIG1fa2V5 SWRlbnRpZmllcihrZXlJZGVudGlmaWVyRm9yRXZhc0tleU5hbWUoU3RyaW5nKGV2ZW50LT5rZXkp KSkKICAgICAsIG1fd2luZG93c1ZpcnR1YWxLZXlDb2RlKHdpbmRvd3NLZXlDb2RlRm9yRXZhc0tl eU5hbWUoU3RyaW5nKGV2ZW50LT5rZXkpKSkKICAgICAsIG1fbmF0aXZlVmlydHVhbEtleUNvZGUo MCkKQEAgLTU2LDggKzU2LDggQEAgUGxhdGZvcm1LZXlib2FyZEV2ZW50OjpQbGF0Zm9ybUtleWJv YXJkRXZlbnQoY29uc3QgRXZhc19FdmVudF9LZXlfRG93biogZXZlbnQpCiAKIFBsYXRmb3JtS2V5 Ym9hcmRFdmVudDo6UGxhdGZvcm1LZXlib2FyZEV2ZW50KGNvbnN0IEV2YXNfRXZlbnRfS2V5X1Vw KiBldmVudCkKICAgICA6IFBsYXRmb3JtRXZlbnQoUGxhdGZvcm1FdmVudDo6S2V5VXAsIGV2YXNf a2V5X21vZGlmaWVyX2lzX3NldChldmVudC0+bW9kaWZpZXJzLCAiU2hpZnQiKSwgZXZhc19rZXlf bW9kaWZpZXJfaXNfc2V0KGV2ZW50LT5tb2RpZmllcnMsICJDb250cm9sIiksIGV2YXNfa2V5X21v ZGlmaWVyX2lzX3NldChldmVudC0+bW9kaWZpZXJzLCAiQWx0IiksIGV2YXNfa2V5X21vZGlmaWVy X2lzX3NldChldmVudC0+bW9kaWZpZXJzLCAiTWV0YSIpLCBjdXJyZW50VGltZSgpKQotICAgICwg bV90ZXh0KHNpbmdsZUNoYXJhY3RlclN0cmluZyhTdHJpbmc6OmZyb21VVEY4KGV2ZW50LT5zdHJp bmcpKSkKLSAgICAsIG1fdW5tb2RpZmllZFRleHQoc2luZ2xlQ2hhcmFjdGVyU3RyaW5nKFN0cmlu Zzo6ZnJvbVVURjgoZXZlbnQtPnN0cmluZykpKQorICAgICwgbV90ZXh0KFN0cmluZzo6ZnJvbVVU RjgoZXZlbnQtPnN0cmluZykpCisgICAgLCBtX3VubW9kaWZpZWRUZXh0KFN0cmluZzo6ZnJvbVVU RjgoZXZlbnQtPnN0cmluZykpCiAgICAgLCBtX2tleUlkZW50aWZpZXIoa2V5SWRlbnRpZmllckZv ckV2YXNLZXlOYW1lKFN0cmluZyhldmVudC0+a2V5KSkpCiAgICAgLCBtX3dpbmRvd3NWaXJ0dWFs S2V5Q29kZSh3aW5kb3dzS2V5Q29kZUZvckV2YXNLZXlOYW1lKFN0cmluZyhldmVudC0+a2V5KSkp CiAgICAgLCBtX25hdGl2ZVZpcnR1YWxLZXlDb2RlKDApCmRpZmYgLS1naXQgYS9Ub29scy9DaGFu Z2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjdhYzZhMi4uMGNjMTkyNyAxMDA2NDQKLS0t IGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBA CisyMDEyLTA1LTI4ICBNaWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50 ZWwuY29tPgorCisgICAgICAgIFtFRkxdIFJlZmFjdG9yaW5nLiBHZXQgcmlkIG9mIHVubmVjZXNz YXJ5IHNpbmdsZUNoYXJhY3RlclN0cmluZygpIGZ1bmN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NzY1NAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEV2ZW50IHNlbmRlciBwcm92aWRlcyBzdHJpbmdz IGZvciBhbGwgdGhlIGtleSBldmVudHMuCisgICAgICAgIEFsc28gS2V5RXZlbnRJbmZvIGNvbnN0 cnVjdG9yIHBhcmFtZXRlcnMgb3JkZXIgd2FzIGNoYW5nZWQgdG8gc2ltcGxpZnkgdGhlIGNhc2Ug d2hlbgorICAgICAgICBhIGtleSBldmVudCBoYXMgZW1wdHkgc3RyaW5nLgorCisgICAgICAgICog RHVtcFJlbmRlclRyZWUvZWZsL0V2ZW50U2VuZGVyLmNwcDoKKyAgICAgICAgKEtleUV2ZW50SW5m bzo6S2V5RXZlbnRJbmZvKToKKyAgICAgICAgKGtleVBhZE5hbWVGcm9tSlNWYWx1ZSk6CisgICAg ICAgIChrZXlOYW1lRnJvbUpTVmFsdWUpOgorCiAyMDEyLTA1LTI4ICBHeXV5b3VuZyBLaW0gIDxn eXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CiAKICAgICAgICAgTW92ZSBhbGxvd1JvdW5kaW5nSGFj a3MgdG8gSW50ZXJuYWxzIGludGVyZmFjZQpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRy ZWUvZWZsL0V2ZW50U2VuZGVyLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9FdmVudFNl bmRlci5jcHAKaW5kZXggODMzODVjNC4uZDYwNmIzNyAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJl bmRlclRyZWUvZWZsL0V2ZW50U2VuZGVyLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9l ZmwvRXZlbnRTZW5kZXIuY3BwCkBAIC0xMTIsNyArMTEyLDcgQEAgZW51bSBFdmVudFF1ZXVlU3Ry YXRlZ3kgewogfTsKIAogc3RydWN0IEtleUV2ZW50SW5mbyB7Ci0gICAgS2V5RXZlbnRJbmZvKGNv bnN0IENTdHJpbmcmIGtleU5hbWUsIGNvbnN0IENTdHJpbmcmIGtleVN0cmluZywgdW5zaWduZWQg bW9kaWZpZXJzKQorICAgIEtleUV2ZW50SW5mbyhjb25zdCBDU3RyaW5nJiBrZXlOYW1lLCB1bnNp Z25lZCBtb2RpZmllcnMsIGNvbnN0IENTdHJpbmcmIGtleVN0cmluZyA9IENTdHJpbmcoKSkKICAg ICAgICAgOiBrZXlOYW1lKGtleU5hbWUpCiAgICAgICAgICwga2V5U3RyaW5nKGtleVN0cmluZykK ICAgICAgICAgLCBtb2RpZmllcnMobW9kaWZpZXJzKQpAQCAtMzg5LDEwOCArMzg5LDEwOCBAQCBz dGF0aWMgSlNWYWx1ZVJlZiBjb250aW51b3VzTW91c2VTY3JvbGxCeUNhbGxiYWNrKEpTQ29udGV4 dFJlZiBjb250ZXh0LCBKU09iamVjdAogc3RhdGljIEtleUV2ZW50SW5mbyoga2V5UGFkTmFtZUZy b21KU1ZhbHVlKEpTU3RyaW5nUmVmIGNoYXJhY3RlciwgdW5zaWduZWQgbW9kaWZpZXJzKQogewog ICAgIGlmIChlcXVhbHMoY2hhcmFjdGVyLCAibGVmdEFycm93IikpCi0gICAgICAgIHJldHVybiBu ZXcgS2V5RXZlbnRJbmZvKCJLUF9MZWZ0IiwgIiIsIG1vZGlmaWVycyk7CisgICAgICAgIHJldHVy biBuZXcgS2V5RXZlbnRJbmZvKCJLUF9MZWZ0IiwgbW9kaWZpZXJzKTsKICAgICBpZiAoZXF1YWxz KGNoYXJhY3RlciwgInJpZ2h0QXJyb3ciKSkKLSAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudElu Zm8oIktQX1JpZ2h0IiwgIiIsIG1vZGlmaWVycyk7CisgICAgICAgIHJldHVybiBuZXcgS2V5RXZl bnRJbmZvKCJLUF9SaWdodCIsIG1vZGlmaWVycyk7CiAgICAgaWYgKGVxdWFscyhjaGFyYWN0ZXIs ICJ1cEFycm93IikpCi0gICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJLUF9VcCIsICIi LCBtb2RpZmllcnMpOworICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiS1BfVXAiLCBt b2RpZmllcnMpOwogICAgIGlmIChlcXVhbHMoY2hhcmFjdGVyLCAiZG93bkFycm93IikpCi0gICAg ICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJLUF9Eb3duIiwgIiIsIG1vZGlmaWVycyk7Cisg ICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJLUF9Eb3duIiwgbW9kaWZpZXJzKTsKICAg ICBpZiAoZXF1YWxzKGNoYXJhY3RlciwgInBhZ2VVcCIpKQotICAgICAgICByZXR1cm4gbmV3IEtl eUV2ZW50SW5mbygiS1BfUHJpb3IiLCAiIiwgbW9kaWZpZXJzKTsKKyAgICAgICAgcmV0dXJuIG5l dyBLZXlFdmVudEluZm8oIktQX1ByaW9yIiwgbW9kaWZpZXJzKTsKICAgICBpZiAoZXF1YWxzKGNo YXJhY3RlciwgInBhZ2VEb3duIikpCi0gICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJL UF9OZXh0IiwgIiIsIG1vZGlmaWVycyk7CisgICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZv KCJLUF9OZXh0IiwgbW9kaWZpZXJzKTsKICAgICBpZiAoZXF1YWxzKGNoYXJhY3RlciwgImhvbWUi KSkKLSAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIktQX0hvbWUiLCAiIiwgbW9kaWZp ZXJzKTsKKyAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIktQX0hvbWUiLCBtb2RpZmll cnMpOwogICAgIGlmIChlcXVhbHMoY2hhcmFjdGVyLCAiZW5kIikpCi0gICAgICAgIHJldHVybiBu ZXcgS2V5RXZlbnRJbmZvKCJLUF9FbmQiLCAiIiwgbW9kaWZpZXJzKTsKKyAgICAgICAgcmV0dXJu IG5ldyBLZXlFdmVudEluZm8oIktQX0VuZCIsIG1vZGlmaWVycyk7CiAgICAgaWYgKGVxdWFscyhj aGFyYWN0ZXIsICJpbnNlcnQiKSkKLSAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIktQ X0luc2VydCIsICIiLCBtb2RpZmllcnMpOworICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5m bygiS1BfSW5zZXJ0IiwgbW9kaWZpZXJzKTsKICAgICBpZiAoZXF1YWxzKGNoYXJhY3RlciwgImRl bGV0ZSIpKQotICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiS1BfRGVsZXRlIiwgIiIs IG1vZGlmaWVycyk7CisgICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJLUF9EZWxldGUi LCBtb2RpZmllcnMpOwogCi0gICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oY2hhcmFjdGVyLT51 c3RyaW5nKCkudXRmOCgpLCBjaGFyYWN0ZXItPnVzdHJpbmcoKS51dGY4KCksIG1vZGlmaWVycyk7 CisgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oY2hhcmFjdGVyLT51c3RyaW5nKCkudXRmOCgp LCBtb2RpZmllcnMsIGNoYXJhY3Rlci0+dXN0cmluZygpLnV0ZjgoKSk7CiB9CiAKIHN0YXRpYyBL ZXlFdmVudEluZm8qIGtleU5hbWVGcm9tSlNWYWx1ZShKU1N0cmluZ1JlZiBjaGFyYWN0ZXIsIHVu c2lnbmVkIG1vZGlmaWVycykKIHsKICAgICBpZiAoZXF1YWxzKGNoYXJhY3RlciwgImxlZnRBcnJv dyIpKQotICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiTGVmdCIsICIiLCBtb2RpZmll cnMpOworICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiTGVmdCIsIG1vZGlmaWVycyk7 CiAgICAgaWYgKGVxdWFscyhjaGFyYWN0ZXIsICJyaWdodEFycm93IikpCi0gICAgICAgIHJldHVy biBuZXcgS2V5RXZlbnRJbmZvKCJSaWdodCIsICIiLCBtb2RpZmllcnMpOworICAgICAgICByZXR1 cm4gbmV3IEtleUV2ZW50SW5mbygiUmlnaHQiLCBtb2RpZmllcnMpOwogICAgIGlmIChlcXVhbHMo Y2hhcmFjdGVyLCAidXBBcnJvdyIpKQotICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygi VXAiLCAiIiwgbW9kaWZpZXJzKTsKKyAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIlVw IiwgbW9kaWZpZXJzKTsKICAgICBpZiAoZXF1YWxzKGNoYXJhY3RlciwgImRvd25BcnJvdyIpKQot ICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiRG93biIsICIiLCBtb2RpZmllcnMpOwor ICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiRG93biIsIG1vZGlmaWVycyk7CiAgICAg aWYgKGVxdWFscyhjaGFyYWN0ZXIsICJwYWdlVXAiKSkKLSAgICAgICAgcmV0dXJuIG5ldyBLZXlF dmVudEluZm8oIlByaW9yIiwgIiIsIG1vZGlmaWVycyk7CisgICAgICAgIHJldHVybiBuZXcgS2V5 RXZlbnRJbmZvKCJQcmlvciIsIG1vZGlmaWVycyk7CiAgICAgaWYgKGVxdWFscyhjaGFyYWN0ZXIs ICJwYWdlRG93biIpKQotICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiTmV4dCIsICIi LCBtb2RpZmllcnMpOworICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiTmV4dCIsIG1v ZGlmaWVycyk7CiAgICAgaWYgKGVxdWFscyhjaGFyYWN0ZXIsICJob21lIikpCi0gICAgICAgIHJl dHVybiBuZXcgS2V5RXZlbnRJbmZvKCJIb21lIiwgIiIsIG1vZGlmaWVycyk7CisgICAgICAgIHJl dHVybiBuZXcgS2V5RXZlbnRJbmZvKCJIb21lIiwgbW9kaWZpZXJzKTsKICAgICBpZiAoZXF1YWxz KGNoYXJhY3RlciwgImVuZCIpKQotICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiRW5k IiwgIiIsIG1vZGlmaWVycyk7CisgICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJFbmQi LCBtb2RpZmllcnMpOwogICAgIGlmIChlcXVhbHMoY2hhcmFjdGVyLCAiaW5zZXJ0IikpCi0gICAg ICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJJbnNlcnQiLCAiIiwgbW9kaWZpZXJzKTsKKyAg ICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIkluc2VydCIsIG1vZGlmaWVycyk7CiAgICAg aWYgKGVxdWFscyhjaGFyYWN0ZXIsICJkZWxldGUiKSkKLSAgICAgICAgcmV0dXJuIG5ldyBLZXlF dmVudEluZm8oIkRlbGV0ZSIsICIiLCBtb2RpZmllcnMpOworICAgICAgICByZXR1cm4gbmV3IEtl eUV2ZW50SW5mbygiRGVsZXRlIiwgbW9kaWZpZXJzKTsKICAgICBpZiAoZXF1YWxzKGNoYXJhY3Rl ciwgInByaW50U2NyZWVuIikpCi0gICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJQcmlu dCIsICIiLCBtb2RpZmllcnMpOworICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiUHJp bnQiLCBtb2RpZmllcnMpOwogICAgIGlmIChlcXVhbHMoY2hhcmFjdGVyLCAibWVudSIpKQotICAg ICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiTWVudSIsICIiLCBtb2RpZmllcnMpOworICAg ICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiTWVudSIsIG1vZGlmaWVycyk7CiAgICAgaWYg KGVxdWFscyhjaGFyYWN0ZXIsICJsZWZ0Q29udHJvbCIpKQotICAgICAgICByZXR1cm4gbmV3IEtl eUV2ZW50SW5mbygiQ29udHJvbF9MIiwgIiIsIG1vZGlmaWVycyk7CisgICAgICAgIHJldHVybiBu ZXcgS2V5RXZlbnRJbmZvKCJDb250cm9sX0wiLCBtb2RpZmllcnMpOwogICAgIGlmIChlcXVhbHMo Y2hhcmFjdGVyLCAicmlnaHRDb250cm9sIikpCi0gICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJ bmZvKCJDb250cm9sX1IiLCAiIiwgbW9kaWZpZXJzKTsKKyAgICAgICAgcmV0dXJuIG5ldyBLZXlF dmVudEluZm8oIkNvbnRyb2xfUiIsIG1vZGlmaWVycyk7CiAgICAgaWYgKGVxdWFscyhjaGFyYWN0 ZXIsICJsZWZ0U2hpZnQiKSkKLSAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIlNoaWZ0 X0wiLCAiIiwgbW9kaWZpZXJzKTsKKyAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIlNo aWZ0X0wiLCBtb2RpZmllcnMpOwogICAgIGlmIChlcXVhbHMoY2hhcmFjdGVyLCAicmlnaHRTaGlm dCIpKQotICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiU2hpZnRfUiIsICIiLCBtb2Rp ZmllcnMpOworICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiU2hpZnRfUiIsIG1vZGlm aWVycyk7CiAgICAgaWYgKGVxdWFscyhjaGFyYWN0ZXIsICJsZWZ0QWx0IikpCi0gICAgICAgIHJl dHVybiBuZXcgS2V5RXZlbnRJbmZvKCJBbHRfTCIsICIiLCBtb2RpZmllcnMpOworICAgICAgICBy ZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiQWx0X0wiLCBtb2RpZmllcnMpOwogICAgIGlmIChlcXVh bHMoY2hhcmFjdGVyLCAicmlnaHRBbHQiKSkKLSAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudElu Zm8oIkFsdF9SIiwgIiIsIG1vZGlmaWVycyk7CisgICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJ bmZvKCJBbHRfUiIsIG1vZGlmaWVycyk7CiAgICAgaWYgKGVxdWFscyhjaGFyYWN0ZXIsICJGMSIp KQotICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiRjEiLCAiIiwgbW9kaWZpZXJzKTsK KyAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIkYxIiwgbW9kaWZpZXJzKTsKICAgICBp ZiAoZXF1YWxzKGNoYXJhY3RlciwgIkYyIikpCi0gICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJ bmZvKCJGMiIsICIiLCBtb2RpZmllcnMpOworICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5m bygiRjIiLCBtb2RpZmllcnMpOwogICAgIGlmIChlcXVhbHMoY2hhcmFjdGVyLCAiRjMiKSkKLSAg ICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIkYzIiwgIiIsIG1vZGlmaWVycyk7CisgICAg ICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJGMyIsIG1vZGlmaWVycyk7CiAgICAgaWYgKGVx dWFscyhjaGFyYWN0ZXIsICJGNCIpKQotICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygi RjQiLCAiIiwgbW9kaWZpZXJzKTsKKyAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIkY0 IiwgbW9kaWZpZXJzKTsKICAgICBpZiAoZXF1YWxzKGNoYXJhY3RlciwgIkY1IikpCi0gICAgICAg IHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJGNSIsICIiLCBtb2RpZmllcnMpOworICAgICAgICBy ZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiRjUiLCBtb2RpZmllcnMpOwogICAgIGlmIChlcXVhbHMo Y2hhcmFjdGVyLCAiRjYiKSkKLSAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIkY2Iiwg IiIsIG1vZGlmaWVycyk7CisgICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJGNiIsIG1v ZGlmaWVycyk7CiAgICAgaWYgKGVxdWFscyhjaGFyYWN0ZXIsICJGNyIpKQotICAgICAgICByZXR1 cm4gbmV3IEtleUV2ZW50SW5mbygiRjciLCAiIiwgbW9kaWZpZXJzKTsKKyAgICAgICAgcmV0dXJu IG5ldyBLZXlFdmVudEluZm8oIkY3IiwgbW9kaWZpZXJzKTsKICAgICBpZiAoZXF1YWxzKGNoYXJh Y3RlciwgIkY4IikpCi0gICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJGOCIsICIiLCBt b2RpZmllcnMpOworICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiRjgiLCBtb2RpZmll cnMpOwogICAgIGlmIChlcXVhbHMoY2hhcmFjdGVyLCAiRjkiKSkKLSAgICAgICAgcmV0dXJuIG5l dyBLZXlFdmVudEluZm8oIkY5IiwgIiIsIG1vZGlmaWVycyk7CisgICAgICAgIHJldHVybiBuZXcg S2V5RXZlbnRJbmZvKCJGOSIsIG1vZGlmaWVycyk7CiAgICAgaWYgKGVxdWFscyhjaGFyYWN0ZXIs ICJGMTAiKSkKLSAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIkYxMCIsICIiLCBtb2Rp ZmllcnMpOworICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiRjEwIiwgbW9kaWZpZXJz KTsKICAgICBpZiAoZXF1YWxzKGNoYXJhY3RlciwgIkYxMSIpKQotICAgICAgICByZXR1cm4gbmV3 IEtleUV2ZW50SW5mbygiRjExIiwgIiIsIG1vZGlmaWVycyk7CisgICAgICAgIHJldHVybiBuZXcg S2V5RXZlbnRJbmZvKCJGMTEiLCBtb2RpZmllcnMpOwogICAgIGlmIChlcXVhbHMoY2hhcmFjdGVy LCAiRjEyIikpCi0gICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJGMTIiLCAiIiwgbW9k aWZpZXJzKTsKKyAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIkYxMiIsIG1vZGlmaWVy cyk7CiAKICAgICBpbnQgY2hhckNvZGUgPSBKU1N0cmluZ0dldENoYXJhY3RlcnNQdHIoY2hhcmFj dGVyKVswXTsKICAgICBpZiAoY2hhckNvZGUgPT0gJ1xuJyB8fCBjaGFyQ29kZSA9PSAnXHInKQot ICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygiUmV0dXJuIiwgIlJldHVybiIsIG1vZGlm aWVycyk7CisgICAgICAgIHJldHVybiBuZXcgS2V5RXZlbnRJbmZvKCJSZXR1cm4iLCBtb2RpZmll cnMsICJcciIpOwogICAgIGlmIChjaGFyQ29kZSA9PSAnXHQnKQotICAgICAgICByZXR1cm4gbmV3 IEtleUV2ZW50SW5mbygiVGFiIiwgIlRhYiIsIG1vZGlmaWVycyk7CisgICAgICAgIHJldHVybiBu ZXcgS2V5RXZlbnRJbmZvKCJUYWIiLCBtb2RpZmllcnMsICJcdCIpOwogICAgIGlmIChjaGFyQ29k ZSA9PSAnXHg4JykKLSAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIkJhY2tTcGFjZSIs ICJCYWNrU3BhY2UiLCBtb2RpZmllcnMpOworICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5m bygiQmFja1NwYWNlIiwgbW9kaWZpZXJzLCAiXHg4Iik7CiAgICAgaWYgKGNoYXJDb2RlID09ICcg JykKLSAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oInNwYWNlIiwgIiAiLCBtb2RpZmll cnMpOworICAgICAgICByZXR1cm4gbmV3IEtleUV2ZW50SW5mbygic3BhY2UiLCBtb2RpZmllcnMs ICIgIik7CiAgICAgaWYgKGNoYXJDb2RlID09ICdceDFCJykKLSAgICAgICAgcmV0dXJuIG5ldyBL ZXlFdmVudEluZm8oIkVzY2FwZSIsICJFc2NhcGUiLCBtb2RpZmllcnMpOworICAgICAgICByZXR1 cm4gbmV3IEtleUV2ZW50SW5mbygiRXNjYXBlIiwgbW9kaWZpZXJzLCAiXHgxQiIpOwogCiAgICAg aWYgKChjaGFyYWN0ZXItPmxlbmd0aCgpID09IDEpICYmIChjaGFyQ29kZSA+PSAnQScgJiYgY2hh ckNvZGUgPD0gJ1onKSkKICAgICAgICAgbW9kaWZpZXJzIHw9IEV2YXNLZXlNb2RpZmllclNoaWZ0 OwogCi0gICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oY2hhcmFjdGVyLT51c3RyaW5nKCkudXRm OCgpLCBjaGFyYWN0ZXItPnVzdHJpbmcoKS51dGY4KCksIG1vZGlmaWVycyk7CisgICAgcmV0dXJu IG5ldyBLZXlFdmVudEluZm8oY2hhcmFjdGVyLT51c3RyaW5nKCkudXRmOCgpLCBtb2RpZmllcnMs IGNoYXJhY3Rlci0+dXN0cmluZygpLnV0ZjgoKSk7CiB9CiAKIHN0YXRpYyBLZXlFdmVudEluZm8q IGNyZWF0ZUtleUV2ZW50SW5mbyhKU0NvbnRleHRSZWYgY29udGV4dCwgc2l6ZV90IGFyZ3VtZW50 Q291bnQsIGNvbnN0IEpTVmFsdWVSZWYgYXJndW1lbnRzW10sIEpTVmFsdWVSZWYqIGV4Y2VwdGlv bikK