86838 2012-05-18 03:22:39 -0700 [EFL][DRT] Key modifier bit flags have enum type. 2012-05-22 11:11:18 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 85369 0 mikhail.pozdnyakov mikhail.pozdnyakov gyuyoung.kim lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 627536 0 mikhail.pozdnyakov 2012-05-18 03:22:39 -0700 Key modifier bit flags have enum type. It causes problems as a key can have several modifiers at the same time and the union of modifiers (i.e. EvasKeyModifierControl | EvasKeyModifierShift) will be out of EvasKeyModifier enum, so refactoring is needed here. 627566 1 142686 mikhail.pozdnyakov 2012-05-18 04:47:45 -0700 Created attachment 142686 patch 627698 2 142686 rakuco 2012-05-18 08:00:19 -0700 Comment on attachment 142686 patch View in context: https://bugs.webkit.org/attachment.cgi?id=142686&action=review I'd rather change the type of KeyEventInfo::modifiers to unsigned (as is already done in places such as PlatformEvent.h in WebCore) and keep the enum an enum. > Tools/ChangeLog:8 > + Refactoring. EvasKeyModifier is unsigned int. Your explanation in the original bug comment is much more helpful, please consider adding it here. 629060 3 143025 mikhail.pozdnyakov 2012-05-21 07:01:49 -0700 Created attachment 143025 patch v2 (review comments are met) 629111 4 143025 rakuco 2012-05-21 08:21:29 -0700 Comment on attachment 143025 patch v2 (review comments are met) Looks good to me. 630555 5 143025 webkit.review.bot 2012-05-22 11:11:13 -0700 Comment on attachment 143025 patch v2 (review comments are met) Clearing flags on attachment: 143025 Committed r118006: <http://trac.webkit.org/changeset/118006> 630556 6 webkit.review.bot 2012-05-22 11:11:18 -0700 All reviewed patches have been landed. Closing bug. 142686 2012-05-18 04:47:45 -0700 2012-05-21 07:01:49 -0700 patch bug86838 text/plain 2710 mikhail.pozdnyakov Y29tbWl0IGEzN2I1Y2I0NTU3MGJjODk0ZWZmZTM0NTI5MzRlMWYxYmMwZDZjYTYKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPHBvemRueWFrb3YubWlraGFpbEBnbWFpbC5jb20+CkRhdGU6ICAg RnJpIE1heSAxOCAxNDo0NToxOCAyMDEyICswMzAwCgogICAgYnVnODY4MzgKCmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTVmNzFkOS4uZjc1Y2Y0 MiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE1IEBACisyMDEyLTA1LTE4ICBNaWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBv emRueWFrb3ZAaW50ZWwuY29tPgorCisgICAgICAgIFtFRkxdW0RSVF0gS2V5IG1vZGlmaWVyIGJp dCBmbGFncyBoYXZlIGVudW0gdHlwZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTg2ODM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUmVmYWN0b3JpbmcuIEV2YXNLZXlNb2RpZmllciBpcyB1bnNpZ25lZCBp bnQuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9lZmwvRXZlbnRTZW5kZXIuY3BwOgorICAg ICAgICAobW9kaWZpZXJzRnJvbUpTVmFsdWUpOgorCiAyMDEyLTA1LTE4ICBTdWRhcnNhbmEgTmFn aW5lbmkgIDxzdWRhcnNhbmEubmFnaW5lbmlAbGludXguaW50ZWwuY29tPgogCiAgICAgICAgIFtF RkxdIERSVCBuZWVkcyBhbiBpbXBsZW1lbnRhdGlvbiBvZiBsYXlvdXRUZXN0Q29udHJvbGxlci5z ZXRTZXJpYWxpemVIVFRQTG9hZHMKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Vm bC9FdmVudFNlbmRlci5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvRXZlbnRTZW5kZXIu Y3BwCmluZGV4IDE2ZDkxMTguLmUwMTJjNjEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL2VmbC9FdmVudFNlbmRlci5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0V2 ZW50U2VuZGVyLmNwcApAQCAtNzEsMTMgKzcxLDEyIEBAIGVudW0gS2V5TG9jYXRpb25Db2RlIHsK ICAgICBEb21LZXlMb2NhdGlvbk51bXBhZAogfTsKIAotZW51bSBFdmFzS2V5TW9kaWZpZXIgewot ICAgIEV2YXNLZXlNb2RpZmllck5vbmUgICAgPSAwLAotICAgIEV2YXNLZXlNb2RpZmllckNvbnRy b2wgPSAxIDw8IDAsCi0gICAgRXZhc0tleU1vZGlmaWVyU2hpZnQgICA9IDEgPDwgMSwKLSAgICBF dmFzS2V5TW9kaWZpZXJBbHQgICAgID0gMSA8PCAyLAotICAgIEV2YXNLZXlNb2RpZmllck1ldGEg ICAgPSAxIDw8IDMKLX07Cit0eXBlZGVmIHVuc2lnbmVkIGludCBFdmFzS2V5TW9kaWZpZXI7Citj b25zdCBFdmFzS2V5TW9kaWZpZXIgRXZhc0tleU1vZGlmaWVyTm9uZSAgICA9IDA7Citjb25zdCBF dmFzS2V5TW9kaWZpZXIgRXZhc0tleU1vZGlmaWVyQ29udHJvbCA9IDEgPDwgMDsKK2NvbnN0IEV2 YXNLZXlNb2RpZmllciBFdmFzS2V5TW9kaWZpZXJTaGlmdCAgID0gMSA8PCAxOworY29uc3QgRXZh c0tleU1vZGlmaWVyIEV2YXNLZXlNb2RpZmllckFsdCAgICAgPSAxIDw8IDI7Citjb25zdCBFdmFz S2V5TW9kaWZpZXIgRXZhc0tleU1vZGlmaWVyTWV0YSAgICA9IDEgPDwgMzsKIAogZW51bSBFdmFz TW91c2VCdXR0b24gewogICAgIEV2YXNNb3VzZUJ1dHRvbk5vbmUsCkBAIC0yMzcsMTIgKzIzNiwx MiBAQCBzdGF0aWMgRXZhc0tleU1vZGlmaWVyIG1vZGlmaWVyc0Zyb21KU1ZhbHVlKEpTQ29udGV4 dFJlZiBjb250ZXh0LCBjb25zdCBKU1ZhbHVlUgogICAgIGlmICghbW9kaWZpZXJzQXJyYXkpCiAg ICAgICAgIHJldHVybiBFdmFzS2V5TW9kaWZpZXJOb25lOwogCi0gICAgdW5zaWduZWQgbW9kaWZp ZXIgPSAwOworICAgIEV2YXNLZXlNb2RpZmllciBtb2RpZmllciA9IEV2YXNLZXlNb2RpZmllck5v bmU7CiAgICAgSlNSZXRhaW5QdHI8SlNTdHJpbmdSZWY+IGxlbmd0aFByb3BlcnR5KEFkb3B0LCBK U1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZygibGVuZ3RoIikpOwogICAgIGludCBtb2RpZmll cnNDb3VudCA9IEpTVmFsdWVUb051bWJlcihjb250ZXh0LCBKU09iamVjdEdldFByb3BlcnR5KGNv bnRleHQsIG1vZGlmaWVyc0FycmF5LCBsZW5ndGhQcm9wZXJ0eS5nZXQoKSwgMCksIDApOwogICAg IGZvciAoaW50IGkgPSAwOyBpIDwgbW9kaWZpZXJzQ291bnQ7ICsraSkKLSAgICAgICAgbW9kaWZp ZXIgfD0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KG1vZGlmaWVyRnJvbUpTVmFsdWUoY29udGV4dCwg SlNPYmplY3RHZXRQcm9wZXJ0eUF0SW5kZXgoY29udGV4dCwgbW9kaWZpZXJzQXJyYXksIGksIDAp KSk7Ci0gICAgcmV0dXJuIHN0YXRpY19jYXN0PEV2YXNLZXlNb2RpZmllcj4obW9kaWZpZXIpOwor ICAgICAgICBtb2RpZmllciB8PSBtb2RpZmllckZyb21KU1ZhbHVlKGNvbnRleHQsIEpTT2JqZWN0 R2V0UHJvcGVydHlBdEluZGV4KGNvbnRleHQsIG1vZGlmaWVyc0FycmF5LCBpLCAwKSk7CisgICAg cmV0dXJuIG1vZGlmaWVyOwogfQogCiBzdGF0aWMgSlNWYWx1ZVJlZiBtb3VzZURvd25DYWxsYmFj ayhKU0NvbnRleHRSZWYgY29udGV4dCwgSlNPYmplY3RSZWYgZnVuY3Rpb24sIEpTT2JqZWN0UmVm IHRoaXNPYmplY3QsIHNpemVfdCBhcmd1bWVudENvdW50LCBjb25zdCBKU1ZhbHVlUmVmIGFyZ3Vt ZW50c1tdLCBKU1ZhbHVlUmVmKiBleGNlcHRpb24pCg== 143025 2012-05-21 07:01:49 -0700 2012-05-22 11:11:12 -0700 patch v2 (review comments are met) bug86838_v2 text/plain 7646 mikhail.pozdnyakov Y29tbWl0IDdhM2QzN2UyZWFlYjQzMzRhZTg2NDk4ZTllMzY2NzhkZjRiMzIwNzEKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPHBvemRueWFrb3YubWlraGFpbEBnbWFpbC5jb20+CkRhdGU6ICAg TW9uIE1heSAyMSAxNzowMDowNSAyMDEyICswMzAwCgogICAgYnVnODY4MzgKCmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTUyODc5MS4uMDMzNzNj NyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI5IEBACisyMDEyLTA1LTE4ICBNaWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBv emRueWFrb3ZAaW50ZWwuY29tPgorCisgICAgICAgIFtFRkxdW0RSVF0gS2V5IG1vZGlmaWVyIGJp dCBmbGFncyBoYXZlIGVudW0gdHlwZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTg2ODM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUmVmYWN0b3JpbmcuIEtleSBtb2RpZmllciBmbGFncyBhcmUgdW5zaWdu ZWQgaW50LgorICAgICAgICBLZXkgbW9kaWZpZXIgYml0IGZsYWdzIHVzZWQgaGF2ZSBlbnVtIHR5 cGUuIEl0IGNhdXNlZCBwcm9ibGVtcyBhcyBhIGtleSBjYW4gaGF2ZSBzZXZlcmFsIG1vZGlmaWVy cyAKKyAgICAgICAgYXQgdGhlIHNhbWUgdGltZSBhbmQgdGhlIHVuaW9uIG9mIG1vZGlmaWVycyAo aS5lLiBFdmFzS2V5TW9kaWZpZXJDb250cm9sIHwgRXZhc0tleU1vZGlmaWVyU2hpZnQpIAorICAg ICAgICB3b3VsZCBoYXZlIGJlZW4gb3V0IG9mIEV2YXNLZXlNb2RpZmllciBlbnVtLgorCisgICAg ICAgICogRHVtcFJlbmRlclRyZWUvZWZsL0V2ZW50U2VuZGVyLmNwcDoKKyAgICAgICAgKEtleUV2 ZW50SW5mbzo6S2V5RXZlbnRJbmZvKToKKyAgICAgICAgKEtleUV2ZW50SW5mbyk6CisgICAgICAg IChNb3VzZUV2ZW50SW5mbzo6TW91c2VFdmVudEluZm8pOgorICAgICAgICAoTW91c2VFdmVudElu Zm8pOgorICAgICAgICAoc2V0RXZhc01vZGlmaWVycyk6CisgICAgICAgIChtb2RpZmllcnNGcm9t SlNWYWx1ZSk6CisgICAgICAgIChtb3VzZURvd25DYWxsYmFjayk6CisgICAgICAgIChtb3VzZVVw Q2FsbGJhY2spOgorICAgICAgICAoa2V5UGFkTmFtZUZyb21KU1ZhbHVlKToKKyAgICAgICAgKGtl eU5hbWVGcm9tSlNWYWx1ZSk6CisgICAgICAgIChjcmVhdGVLZXlFdmVudEluZm8pOgorICAgICAg ICAoc2VuZEtleURvd24pOgorCiAyMDEyLTA1LTIxICBDYWlvIE1hcmNlbG8gZGUgT2xpdmVpcmEg RmlsaG8gIDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgTW92ZSBzZXRF ZGl0aW5nQmVoYXZpb3IoKSBmcm9tIGxheW91dFRlc3RDb250cm9sbGVyIHRvIHdpbmRvdy5pbnRl cm5hbHMKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9FdmVudFNlbmRlci5j cHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvRXZlbnRTZW5kZXIuY3BwCmluZGV4IDYxYTFm YjYuLmVlMGNmNGEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9FdmVudFNl bmRlci5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0V2ZW50U2VuZGVyLmNwcApA QCAtMTA5LDcgKzEwOSw3IEBAIGVudW0gRXZlbnRRdWV1ZVN0cmF0ZWd5IHsKIH07CiAKIHN0cnVj dCBLZXlFdmVudEluZm8gewotICAgIEtleUV2ZW50SW5mbyhjb25zdCBDU3RyaW5nJiBrZXlOYW1l LCBjb25zdCBDU3RyaW5nJiBrZXlTdHJpbmcsIEV2YXNLZXlNb2RpZmllciBtb2RpZmllcnMpCisg ICAgS2V5RXZlbnRJbmZvKGNvbnN0IENTdHJpbmcmIGtleU5hbWUsIGNvbnN0IENTdHJpbmcmIGtl eVN0cmluZywgdW5zaWduZWQgbW9kaWZpZXJzKQogICAgICAgICA6IGtleU5hbWUoa2V5TmFtZSkK ICAgICAgICAgLCBrZXlTdHJpbmcoa2V5U3RyaW5nKQogICAgICAgICAsIG1vZGlmaWVycyhtb2Rp ZmllcnMpCkBAIC0xMTgsMTEgKzExOCwxMSBAQCBzdHJ1Y3QgS2V5RXZlbnRJbmZvIHsKIAogICAg IGNvbnN0IENTdHJpbmcga2V5TmFtZTsKICAgICBjb25zdCBDU3RyaW5nIGtleVN0cmluZzsKLSAg ICBFdmFzS2V5TW9kaWZpZXIgbW9kaWZpZXJzOworICAgIHVuc2lnbmVkIG1vZGlmaWVyczsKIH07 CiAKIHN0cnVjdCBNb3VzZUV2ZW50SW5mbyB7Ci0gICAgTW91c2VFdmVudEluZm8oRXZhc01vdXNl RXZlbnQgZXZlbnQsIEV2YXNLZXlNb2RpZmllciBtb2RpZmllcnMgPSBFdmFzS2V5TW9kaWZpZXJO b25lLCBFdmFzTW91c2VCdXR0b24gYnV0dG9uID0gRXZhc01vdXNlQnV0dG9uTm9uZSwgaW50IGhv cml6b250YWxEZWx0YSA9IDAsIGludCB2ZXJ0aWNhbERlbHRhID0gMCkKKyAgICBNb3VzZUV2ZW50 SW5mbyhFdmFzTW91c2VFdmVudCBldmVudCwgdW5zaWduZWQgbW9kaWZpZXJzID0gRXZhc0tleU1v ZGlmaWVyTm9uZSwgRXZhc01vdXNlQnV0dG9uIGJ1dHRvbiA9IEV2YXNNb3VzZUJ1dHRvbk5vbmUs IGludCBob3Jpem9udGFsRGVsdGEgPSAwLCBpbnQgdmVydGljYWxEZWx0YSA9IDApCiAgICAgICAg IDogZXZlbnQoZXZlbnQpCiAgICAgICAgICwgbW9kaWZpZXJzKG1vZGlmaWVycykKICAgICAgICAg LCBidXR0b24oYnV0dG9uKQpAQCAtMTMyLDcgKzEzMiw3IEBAIHN0cnVjdCBNb3VzZUV2ZW50SW5m byB7CiAgICAgfQogCiAgICAgRXZhc01vdXNlRXZlbnQgZXZlbnQ7Ci0gICAgRXZhc0tleU1vZGlm aWVyIG1vZGlmaWVyczsKKyAgICB1bnNpZ25lZCBtb2RpZmllcnM7CiAgICAgRXZhc01vdXNlQnV0 dG9uIGJ1dHRvbjsKICAgICBpbnQgaG9yaXpvbnRhbERlbHRhOwogICAgIGludCB2ZXJ0aWNhbERl bHRhOwpAQCAtMTYwLDcgKzE2MCw3IEBAIHN0YXRpYyB2b2lkIGZlZWRPclF1ZXVlTW91c2VFdmVu dChNb3VzZUV2ZW50SW5mbyosIEV2ZW50UXVldWVTdHJhdGVneSk7CiBzdGF0aWMgdm9pZCBmZWVk TW91c2VFdmVudChNb3VzZUV2ZW50SW5mbyopOwogc3RhdGljIHZvaWQgZmVlZFF1ZXVlZE1vdXNl RXZlbnRzKCk7CiAKLXN0YXRpYyB2b2lkIHNldEV2YXNNb2RpZmllcnMoRXZhcyogZXZhcywgRXZh c0tleU1vZGlmaWVyIG1vZGlmaWVycykKK3N0YXRpYyB2b2lkIHNldEV2YXNNb2RpZmllcnMoRXZh cyogZXZhcywgdW5zaWduZWQgbW9kaWZpZXJzKQogewogICAgIHN0YXRpYyBjb25zdCBjaGFyKiBt b2RpZmllck5hbWVzW10gPSB7ICJDb250cm9sIiwgIlNoaWZ0IiwgIkFsdCIsICJTdXBlciIgfTsK ICAgICBmb3IgKHVuc2lnbmVkIG1vZGlmaWVyID0gMDsgbW9kaWZpZXIgPCA0OyArK21vZGlmaWVy KSB7CkBAIC0yMjcsNyArMjI3LDcgQEAgc3RhdGljIEV2YXNLZXlNb2RpZmllciBtb2RpZmllckZy b21KU1ZhbHVlKEpTQ29udGV4dFJlZiBjb250ZXh0LCBjb25zdCBKU1ZhbHVlUmUKICAgICByZXR1 cm4gRXZhc0tleU1vZGlmaWVyTm9uZTsKIH0KIAotc3RhdGljIEV2YXNLZXlNb2RpZmllciBtb2Rp ZmllcnNGcm9tSlNWYWx1ZShKU0NvbnRleHRSZWYgY29udGV4dCwgY29uc3QgSlNWYWx1ZVJlZiBt b2RpZmllcnMpCitzdGF0aWMgdW5zaWduZWQgbW9kaWZpZXJzRnJvbUpTVmFsdWUoSlNDb250ZXh0 UmVmIGNvbnRleHQsIGNvbnN0IEpTVmFsdWVSZWYgbW9kaWZpZXJzKQogewogICAgIC8vIFRoZSB2 YWx1ZSBtYXkgZWl0aGVyIGJlIGEgc3RyaW5nIHdpdGggYSBzaW5nbGUgbW9kaWZpZXIgb3IgYW4g YXJyYXkgb2YgbW9kaWZpZXJzLgogICAgIGlmIChKU1ZhbHVlSXNTdHJpbmcoY29udGV4dCwgbW9k aWZpZXJzKSkKQEAgLTIzNywxMiArMjM3LDEyIEBAIHN0YXRpYyBFdmFzS2V5TW9kaWZpZXIgbW9k aWZpZXJzRnJvbUpTVmFsdWUoSlNDb250ZXh0UmVmIGNvbnRleHQsIGNvbnN0IEpTVmFsdWVSCiAg ICAgaWYgKCFtb2RpZmllcnNBcnJheSkKICAgICAgICAgcmV0dXJuIEV2YXNLZXlNb2RpZmllck5v bmU7CiAKLSAgICB1bnNpZ25lZCBtb2RpZmllciA9IDA7CisgICAgdW5zaWduZWQgbW9kaWZpZXIg PSBFdmFzS2V5TW9kaWZpZXJOb25lOwogICAgIEpTUmV0YWluUHRyPEpTU3RyaW5nUmVmPiBsZW5n dGhQcm9wZXJ0eShBZG9wdCwgSlNTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoImxlbmd0aCIp KTsKICAgICBpbnQgbW9kaWZpZXJzQ291bnQgPSBKU1ZhbHVlVG9OdW1iZXIoY29udGV4dCwgSlNP YmplY3RHZXRQcm9wZXJ0eShjb250ZXh0LCBtb2RpZmllcnNBcnJheSwgbGVuZ3RoUHJvcGVydHku Z2V0KCksIDApLCAwKTsKICAgICBmb3IgKGludCBpID0gMDsgaSA8IG1vZGlmaWVyc0NvdW50OyAr K2kpCi0gICAgICAgIG1vZGlmaWVyIHw9IHN0YXRpY19jYXN0PHVuc2lnbmVkPihtb2RpZmllckZy b21KU1ZhbHVlKGNvbnRleHQsIEpTT2JqZWN0R2V0UHJvcGVydHlBdEluZGV4KGNvbnRleHQsIG1v ZGlmaWVyc0FycmF5LCBpLCAwKSkpOwotICAgIHJldHVybiBzdGF0aWNfY2FzdDxFdmFzS2V5TW9k aWZpZXI+KG1vZGlmaWVyKTsKKyAgICAgICAgbW9kaWZpZXIgfD0gbW9kaWZpZXJGcm9tSlNWYWx1 ZShjb250ZXh0LCBKU09iamVjdEdldFByb3BlcnR5QXRJbmRleChjb250ZXh0LCBtb2RpZmllcnNB cnJheSwgaSwgMCkpOworICAgIHJldHVybiBtb2RpZmllcjsKIH0KIAogc3RhdGljIEpTVmFsdWVS ZWYgbW91c2VEb3duQ2FsbGJhY2soSlNDb250ZXh0UmVmIGNvbnRleHQsIEpTT2JqZWN0UmVmIGZ1 bmN0aW9uLCBKU09iamVjdFJlZiB0aGlzT2JqZWN0LCBzaXplX3QgYXJndW1lbnRDb3VudCwgY29u c3QgSlNWYWx1ZVJlZiBhcmd1bWVudHNbXSwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKQpAQCAtMjYy LDcgKzI2Miw3IEBAIHN0YXRpYyBKU1ZhbHVlUmVmIG1vdXNlRG93bkNhbGxiYWNrKEpTQ29udGV4 dFJlZiBjb250ZXh0LCBKU09iamVjdFJlZiBmdW5jdGlvbiwKIAogICAgIHVwZGF0ZUNsaWNrQ291 bnQoYnV0dG9uKTsKIAotICAgIEV2YXNLZXlNb2RpZmllciBtb2RpZmllcnMgPSBhcmd1bWVudENv dW50ID49IDIgPyBtb2RpZmllcnNGcm9tSlNWYWx1ZShjb250ZXh0LCBhcmd1bWVudHNbMV0pIDog RXZhc0tleU1vZGlmaWVyTm9uZTsKKyAgICB1bnNpZ25lZCBtb2RpZmllcnMgPSBhcmd1bWVudENv dW50ID49IDIgPyBtb2RpZmllcnNGcm9tSlNWYWx1ZShjb250ZXh0LCBhcmd1bWVudHNbMV0pIDog RXZhc0tleU1vZGlmaWVyTm9uZTsKICAgICBNb3VzZUV2ZW50SW5mbyogZXZlbnRJbmZvID0gbmV3 IE1vdXNlRXZlbnRJbmZvKEV2YXNNb3VzZUV2ZW50RG93biwgbW9kaWZpZXJzLCBzdGF0aWNfY2Fz dDxFdmFzTW91c2VCdXR0b24+KGJ1dHRvbikpOwogICAgIGZlZWRPclF1ZXVlTW91c2VFdmVudChl dmVudEluZm8sIEZlZWRRdWV1ZWRFdmVudHMpOwogICAgIGdCdXR0b25DdXJyZW50bHlEb3duID0g YnV0dG9uOwpAQCAtMjg0LDcgKzI4NCw3IEBAIHN0YXRpYyBKU1ZhbHVlUmVmIG1vdXNlVXBDYWxs YmFjayhKU0NvbnRleHRSZWYgY29udGV4dCwgSlNPYmplY3RSZWYgZnVuY3Rpb24sIEpTCiAgICAg Z0xhc3RDbGlja1RpbWVPZmZzZXQgPSBnVGltZU9mZnNldDsKICAgICBnQnV0dG9uQ3VycmVudGx5 RG93biA9IDA7CiAKLSAgICBFdmFzS2V5TW9kaWZpZXIgbW9kaWZpZXJzID0gYXJndW1lbnRDb3Vu dCA+PSAyID8gbW9kaWZpZXJzRnJvbUpTVmFsdWUoY29udGV4dCwgYXJndW1lbnRzWzFdKSA6IEV2 YXNLZXlNb2RpZmllck5vbmU7CisgICAgdW5zaWduZWQgbW9kaWZpZXJzID0gYXJndW1lbnRDb3Vu dCA+PSAyID8gbW9kaWZpZXJzRnJvbUpTVmFsdWUoY29udGV4dCwgYXJndW1lbnRzWzFdKSA6IEV2 YXNLZXlNb2RpZmllck5vbmU7CiAgICAgTW91c2VFdmVudEluZm8qIGV2ZW50SW5mbyA9IG5ldyBN b3VzZUV2ZW50SW5mbyhFdmFzTW91c2VFdmVudFVwLCBtb2RpZmllcnMsIHRyYW5zbGF0ZU1vdXNl QnV0dG9uTnVtYmVyKGJ1dHRvbikpOwogICAgIGZlZWRPclF1ZXVlTW91c2VFdmVudChldmVudElu Zm8sIEZlZWRRdWV1ZWRFdmVudHMpOwogICAgIHJldHVybiBKU1ZhbHVlTWFrZVVuZGVmaW5lZChj b250ZXh0KTsKQEAgLTM2Miw3ICszNjIsNyBAQCBzdGF0aWMgSlNWYWx1ZVJlZiBjb250aW51b3Vz TW91c2VTY3JvbGxCeUNhbGxiYWNrKEpTQ29udGV4dFJlZiBjb250ZXh0LCBKU09iamVjdAogICAg IHJldHVybiBKU1ZhbHVlTWFrZVVuZGVmaW5lZChjb250ZXh0KTsKIH0KIAotc3RhdGljIEtleUV2 ZW50SW5mbyoga2V5UGFkTmFtZUZyb21KU1ZhbHVlKEpTU3RyaW5nUmVmIGNoYXJhY3RlciwgRXZh c0tleU1vZGlmaWVyIG1vZGlmaWVycykKK3N0YXRpYyBLZXlFdmVudEluZm8qIGtleVBhZE5hbWVG cm9tSlNWYWx1ZShKU1N0cmluZ1JlZiBjaGFyYWN0ZXIsIHVuc2lnbmVkIG1vZGlmaWVycykKIHsK ICAgICBpZiAoZXF1YWxzKGNoYXJhY3RlciwgImxlZnRBcnJvdyIpKQogICAgICAgICByZXR1cm4g bmV3IEtleUV2ZW50SW5mbygiS1BfTGVmdCIsICIiLCBtb2RpZmllcnMpOwpAQCAtMzg4LDcgKzM4 OCw3IEBAIHN0YXRpYyBLZXlFdmVudEluZm8qIGtleVBhZE5hbWVGcm9tSlNWYWx1ZShKU1N0cmlu Z1JlZiBjaGFyYWN0ZXIsIEV2YXNLZXlNb2RpZmllCiAgICAgcmV0dXJuIG5ldyBLZXlFdmVudElu Zm8oY2hhcmFjdGVyLT51c3RyaW5nKCkudXRmOCgpLCBjaGFyYWN0ZXItPnVzdHJpbmcoKS51dGY4 KCksIG1vZGlmaWVycyk7CiB9CiAKLXN0YXRpYyBLZXlFdmVudEluZm8qIGtleU5hbWVGcm9tSlNW YWx1ZShKU1N0cmluZ1JlZiBjaGFyYWN0ZXIsIEV2YXNLZXlNb2RpZmllciBtb2RpZmllcnMpCitz dGF0aWMgS2V5RXZlbnRJbmZvKiBrZXlOYW1lRnJvbUpTVmFsdWUoSlNTdHJpbmdSZWYgY2hhcmFj dGVyLCB1bnNpZ25lZCBtb2RpZmllcnMpCiB7CiAgICAgaWYgKGVxdWFscyhjaGFyYWN0ZXIsICJs ZWZ0QXJyb3ciKSkKICAgICAgICAgcmV0dXJuIG5ldyBLZXlFdmVudEluZm8oIkxlZnQiLCAiIiwg bW9kaWZpZXJzKTsKQEAgLTQ3MSw3ICs0NzEsNyBAQCBzdGF0aWMgS2V5RXZlbnRJbmZvKiBjcmVh dGVLZXlFdmVudEluZm8oSlNDb250ZXh0UmVmIGNvbnRleHQsIHNpemVfdCBhcmd1bWVudENvdQog ICAgIGlmIChleGNlcHRpb24gJiYgKmV4Y2VwdGlvbikKICAgICAgICAgcmV0dXJuIDA7CiAKLSAg ICBFdmFzS2V5TW9kaWZpZXIgbW9kaWZpZXJzID0gRXZhc0tleU1vZGlmaWVyTm9uZTsKKyAgICB1 bnNpZ25lZCBtb2RpZmllcnMgPSBFdmFzS2V5TW9kaWZpZXJOb25lOwogICAgIGlmIChhcmd1bWVu dENvdW50ID49IDIpCiAgICAgICAgIG1vZGlmaWVycyA9IG1vZGlmaWVyc0Zyb21KU1ZhbHVlKGNv bnRleHQsIGFyZ3VtZW50c1sxXSk7CiAKQEAgLTQ4NSw3ICs0ODUsNyBAQCBzdGF0aWMgdm9pZCBz ZW5kS2V5RG93bihFdmFzKiBldmFzLCBLZXlFdmVudEluZm8qIGtleUV2ZW50SW5mbykKIAogICAg IGNvbnN0IGNoYXIqIGtleU5hbWUgPSBrZXlFdmVudEluZm8tPmtleU5hbWUuZGF0YSgpOwogICAg IGNvbnN0IGNoYXIqIGtleVN0cmluZyA9IGtleUV2ZW50SW5mby0+a2V5U3RyaW5nLmRhdGEoKTsK LSAgICBFdmFzS2V5TW9kaWZpZXIgbW9kaWZpZXJzID0ga2V5RXZlbnRJbmZvLT5tb2RpZmllcnM7 CisgICAgdW5zaWduZWQgbW9kaWZpZXJzID0ga2V5RXZlbnRJbmZvLT5tb2RpZmllcnM7CiAKICAg ICBEdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmw6OmxheW91dEZyYW1lKGJyb3dzZXItPm1haW5GcmFt ZSgpKTsKIAo=