83466 2012-04-09 05:52:39 -0700 [Part 5] We should use CSSPropertyID rather than integers when manipulating CSS property ids. 2012-04-09 06:43:38 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 menard menard haraken kling macpherson tony webkit.review.bot oldest_to_newest 598245 0 menard 2012-04-09 05:52:39 -0700 [Part 5] We should use CSSPropertyID rather than integers when manipulating CSS property ids. 598247 1 136216 menard 2012-04-09 05:55:09 -0700 Created attachment 136216 Patch 598257 2 136216 menard 2012-04-09 06:43:31 -0700 Comment on attachment 136216 Patch Clearing flags on attachment: 136216 Committed r113577: <http://trac.webkit.org/changeset/113577> 598258 3 menard 2012-04-09 06:43:38 -0700 All reviewed patches have been landed. Closing bug. 136216 2012-04-09 05:55:09 -0700 2012-04-09 06:43:31 -0700 Patch bug-83466-20120409095448.patch text/plain 17158 menard U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzNTcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTFhNWFlYmY3YjhmYzA3 YTYzNDhjZjY1NDEzNDQxMGNlYjIwMzE4Ny4uYzg1ZDQzMjEzOGI4YjZlYTE3MDVmOWIyYTRkZTVh ZjZmN2FkNTRiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ3IEBACisyMDEyLTA0LTA5ICBBbGV4 aXMgTWVuYXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIFtQYXJ0 IDVdIFdlIHNob3VsZCB1c2UgQ1NTUHJvcGVydHlJRCByYXRoZXIgdGhhbiBpbnRlZ2VycyB3aGVu IG1hbmlwdWxhdGluZyBDU1MgcHJvcGVydHkgaWRzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODM0NjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBDU1NQcm9wZXJ0eUlEIGVudW0gaG9sZHMgYWxsIHRoZSBD U1MgcHJvcGVydHkgaWRzIGJ1dCBtYW55IHBhcnRzIG9mIFdlYktpdCB0cmVhdCB0aGUgaWRzCisg ICAgICAgIGFzIGludGVnZXJzLCB0aGlzIHBhdGNoIHNob3VsZCBhZHJlc3MgdGhlIGxhc3QgcmVt YWluaW5nIG9jY3VyZW5jZXMgb2YgaW50cyByYXRoZXIgdGhhbiBDU1NQcm9wZXJ0eUlEcy4KKyAg ICAKKyAgICAgICAgTm8gbmV3IHRlc3RzIDogVGhlcmUgc2hvdWxkIGJlIG5vIGJlaGF2aW9yIGNo YW5nZSBpbiB0aGlzIHBhdGNoLgorCisgICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6Y29sbGVjdE1hdGNoaW5nUnVs ZXNGb3JMaXN0KToKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5oOgorICAgICAgICAo Q1NTU3R5bGVTZWxlY3Rvcik6CisgICAgICAgICogY3NzL1N0eWxlUHJvcGVydHlTZXQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6U3R5bGVQcm9wZXJ0eVNldDo6cmVtb3ZlUHJvcGVydGllc0luU2V0 KToKKyAgICAgICAgKiBwYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OmdhdGhlckVuY2xvc2luZ1Nob3J0aGFuZFByb3BlcnRpZXMpOgorICAgICAgICAo V2ViQ29yZTo6QW5pbWF0aW9uQmFzZTo6YW5pbWF0YWJsZVNob3J0aGFuZHNBZmZlY3RpbmdQcm9w ZXJ0eSk6CisgICAgICAgICogcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQmFzZS5oOgorICAgICAg ICAoQW5pbWF0aW9uQmFzZSk6CisgICAgICAgICogcGFnZS9hbmltYXRpb24vQ29tcG9zaXRlQW5p bWF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbXBvc2l0ZUFuaW1hdGlvbjo6cGF1c2VU cmFuc2l0aW9uQXRUaW1lKToKKyAgICAgICAgKiBwYWdlL2FuaW1hdGlvbi9LZXlmcmFtZUFuaW1h dGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpLZXlmcmFtZUFuaW1hdGlvbjo6YW5pbWF0ZSk6 CisgICAgICAgIChXZWJDb3JlOjpLZXlmcmFtZUFuaW1hdGlvbjo6Z2V0QW5pbWF0ZWRTdHlsZSk6 CisgICAgICAgIChXZWJDb3JlOjpLZXlmcmFtZUFuaW1hdGlvbjo6b3ZlcnJpZGVBbmltYXRpb25z KToKKyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1lQW5pbWF0aW9uOjpyZXN1bWVPdmVycmlkZGVu QW5pbWF0aW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpLZXlmcmFtZUFuaW1hdGlvbjo6dGltZVRv TmV4dFNlcnZpY2UpOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9LZXlmcmFtZUxpc3QuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6S2V5ZnJhbWVMaXN0OjppbnNlcnQpOgorICAgICAgICAqIHJl bmRlcmluZy9zdHlsZS9LZXlmcmFtZUxpc3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1l VmFsdWU6OmFkZFByb3BlcnR5KToKKyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1lVmFsdWU6OmNv bnRhaW5zUHJvcGVydHkpOgorICAgICAgICAoV2ViQ29yZTo6S2V5ZnJhbWVWYWx1ZTo6cHJvcGVy dGllcyk6CisgICAgICAgIChLZXlmcmFtZVZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OktleWZy YW1lTGlzdDo6YWRkUHJvcGVydHkpOgorICAgICAgICAoV2ViQ29yZTo6S2V5ZnJhbWVMaXN0Ojpj b250YWluc1Byb3BlcnR5KToKKyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1lTGlzdDo6YmVnaW5Q cm9wZXJ0aWVzKToKKyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1lTGlzdDo6ZW5kUHJvcGVydGll cyk6CisgICAgICAgIChLZXlmcmFtZUxpc3QpOgorCiAyMDEyLTA0LTA5ICBDaHJpcyBHdWFuICA8 Y2hyaXMuZ3VhbkB0b3JjaG1vYmlsZS5jb20uY24+CiAKICAgICAgICAgW0JsYWNrYmVycnldIG1f aXNSZXF1ZXN0ZWRCeVBsdWdpbiBzaG91bGQgYmUgY29waWVkIGluIFJlc291cmNlUmVxdWVzdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwIGIvU291 cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCmluZGV4IGM4OWFhODI5ZGZmNjk0 ZWFiNmZjYjQwYTdiYzQwMzFhOTVmYTY0MDEuLjNiNzNhMzJjMmQ2MmU1NTMwY2Q1Y2MxMjY0MTdk MDhhNTQ1ZGNhZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVj dG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKQEAg LTU3NTAsOSArNTc1MCw5IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6bG9hZFBlbmRpbmdJbWFn ZXMoKQogICAgIGlmIChtX3BlbmRpbmdJbWFnZVByb3BlcnRpZXMuaXNFbXB0eSgpKQogICAgICAg ICByZXR1cm47CiAKLSAgICBIYXNoU2V0PGludD46OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IG1fcGVu ZGluZ0ltYWdlUHJvcGVydGllcy5lbmQoKTsKLSAgICBmb3IgKEhhc2hTZXQ8aW50Pjo6Y29uc3Rf aXRlcmF0b3IgaXQgPSBtX3BlbmRpbmdJbWFnZVByb3BlcnRpZXMuYmVnaW4oKTsgaXQgIT0gZW5k OyArK2l0KSB7Ci0gICAgICAgIENTU1Byb3BlcnR5SUQgY3VycmVudFByb3BlcnR5ID0gc3RhdGlj X2Nhc3Q8Q1NTUHJvcGVydHlJRD4oKml0KTsKKyAgICBIYXNoU2V0PENTU1Byb3BlcnR5SUQ+Ojpj b25zdF9pdGVyYXRvciBlbmQgPSBtX3BlbmRpbmdJbWFnZVByb3BlcnRpZXMuZW5kKCk7CisgICAg Zm9yIChIYXNoU2V0PENTU1Byb3BlcnR5SUQ+Ojpjb25zdF9pdGVyYXRvciBpdCA9IG1fcGVuZGlu Z0ltYWdlUHJvcGVydGllcy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKKyAgICAgICAgQ1NT UHJvcGVydHlJRCBjdXJyZW50UHJvcGVydHkgPSAqaXQ7CiAKICAgICAgICAgc3dpdGNoIChjdXJy ZW50UHJvcGVydHkpIHsKICAgICAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCYWNrZ3JvdW5kSW1h Z2U6IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmgg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5oCmluZGV4IDA1ZDMxMDE4MmQy NGJmYjE0YWFjMDhkMGFlOWE0YjdlYzQ4NDgwNGUuLjQ2MWY0MTBiOThkZmRjYmI0NzY2MTY4MDFm OGM0MjFiMWJkMjU5NWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNl bGVjdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuaApAQCAt NDY2LDcgKzQ2Niw3IEBAIHByaXZhdGU6CiAKICAgICBSZWZQdHI8U3RhdGljQ1NTUnVsZUxpc3Q+ IG1fcnVsZUxpc3Q7CiAKLSAgICBIYXNoU2V0PGludD4gbV9wZW5kaW5nSW1hZ2VQcm9wZXJ0aWVz OyAvLyBIYXNoIG9mIENTU1Byb3BlcnR5SURzCisgICAgSGFzaFNldDxDU1NQcm9wZXJ0eUlEPiBt X3BlbmRpbmdJbWFnZVByb3BlcnRpZXM7CiAKICAgICBPd25QdHI8TWVkaWFRdWVyeUV2YWx1YXRv cj4gbV9tZWRpdW07CiAgICAgUmVmUHRyPFJlbmRlclN0eWxlPiBtX3Jvb3REZWZhdWx0U3R5bGU7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0eVNldC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0eVNldC5jcHAKaW5kZXggNTE0MDU1NTU2NjY3 NDA5N2Y3Njk1MmYyODQ1ZTE3M2M2OWI0MzAwZS4uOWRjYzcxMjY0ZGMxMjgzNDE0ODg5M2EwNDBk MTZmMmJkYTA0YzgxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVy dHlTZXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnR5U2V0LmNwcApA QCAtODUwLDcgKzg1MCw3IEBAIGJvb2wgU3R5bGVQcm9wZXJ0eVNldDo6cmVtb3ZlUHJvcGVydGll c0luU2V0KGNvbnN0IENTU1Byb3BlcnR5SUQqIHNldCwgdW5zaWduZWQKICAgICAgICAgcmV0dXJu IGZhbHNlOwogCiAgICAgLy8gRklYTUU6IFRoaXMgaXMgYWx3YXlzIHVzZWQgd2l0aCBzdGF0aWMg c2V0cyBhbmQgaW4gdGhhdCBjYXNlIGNvbnN0cnVjdGluZyB0aGUgaGFzaCByZXBlYXRlZGx5IGlz IHByZXR0eSBwb2ludGxlc3MuCi0gICAgSGFzaFNldDxpbnQ+IHRvUmVtb3ZlOworICAgIEhhc2hT ZXQ8Q1NTUHJvcGVydHlJRD4gdG9SZW1vdmU7CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8 IGxlbmd0aDsgKytpKQogICAgICAgICB0b1JlbW92ZS5hZGQoc2V0W2ldKTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQmFzZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcAppbmRleCBkOTM3NzU1 YTExYzQ4NDJlMzUwODU5MTk5MzZlYThmMTYzNmYwYjhmLi5hOTVlNGRlOTUzZjkxM2FjMGNhM2Nl MjQyZmViMjQzOWVkNWU3NmQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1h dGlvbi9BbmltYXRpb25CYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlv bi9BbmltYXRpb25CYXNlLmNwcApAQCAtMTI5MSw3ICsxMjkxLDcgQEAgYm9vbCBBbmltYXRpb25C YXNlOjphbmltYXRpb25PZlByb3BlcnR5SXNBY2NlbGVyYXRlZChDU1NQcm9wZXJ0eUlEIHByb3Ap CiB9CiAjZW5kaWYKIAotc3RhdGljIGJvb2wgZ2F0aGVyRW5jbG9zaW5nU2hvcnRoYW5kUHJvcGVy dGllcyhDU1NQcm9wZXJ0eUlEIHByb3BlcnR5LCBQcm9wZXJ0eVdyYXBwZXJCYXNlKiB3cmFwcGVy LCBIYXNoU2V0PGludD4mIHByb3BlcnR5U2V0KQorc3RhdGljIGJvb2wgZ2F0aGVyRW5jbG9zaW5n U2hvcnRoYW5kUHJvcGVydGllcyhDU1NQcm9wZXJ0eUlEIHByb3BlcnR5LCBQcm9wZXJ0eVdyYXBw ZXJCYXNlKiB3cmFwcGVyLCBIYXNoU2V0PENTU1Byb3BlcnR5SUQ+JiBwcm9wZXJ0eVNldCkKIHsK ICAgICBpZiAoIXdyYXBwZXItPmlzU2hvcnRoYW5kV3JhcHBlcigpKQogICAgICAgICByZXR1cm4g ZmFsc2U7CkBAIC0xMzEzLDExICsxMzEzLDExIEBAIHN0YXRpYyBib29sIGdhdGhlckVuY2xvc2lu Z1Nob3J0aGFuZFByb3BlcnRpZXMoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eSwgUHJvcGVydHlXCiB9 CiAKIC8vIE5vdGU6IHRoaXMgaXMgaW5lZmZpY2llbnQuIEl0J3Mgb25seSBjYWxsZWQgZnJvbSBw YXVzZVRyYW5zaXRpb25BdFRpbWUoKS4KLUhhc2hTZXQ8aW50PiBBbmltYXRpb25CYXNlOjphbmlt YXRhYmxlU2hvcnRoYW5kc0FmZmVjdGluZ1Byb3BlcnR5KENTU1Byb3BlcnR5SUQgcHJvcGVydHkp CitIYXNoU2V0PENTU1Byb3BlcnR5SUQ+IEFuaW1hdGlvbkJhc2U6OmFuaW1hdGFibGVTaG9ydGhh bmRzQWZmZWN0aW5nUHJvcGVydHkoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eSkKIHsKICAgICBlbnN1 cmVQcm9wZXJ0eU1hcCgpOwogCi0gICAgSGFzaFNldDxpbnQ+IGZvdW5kUHJvcGVydGllczsKKyAg ICBIYXNoU2V0PENTU1Byb3BlcnR5SUQ+IGZvdW5kUHJvcGVydGllczsKICAgICBmb3IgKGludCBp ID0gMDsgaSA8IGdldE51bVByb3BlcnRpZXMoKTsgKytpKQogICAgICAgICBnYXRoZXJFbmNsb3Np bmdTaG9ydGhhbmRQcm9wZXJ0aWVzKHByb3BlcnR5LCAoKmdQcm9wZXJ0eVdyYXBwZXJzKVtpXSwg Zm91bmRQcm9wZXJ0aWVzKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmlt YXRpb24vQW5pbWF0aW9uQmFzZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5p bWF0aW9uQmFzZS5oCmluZGV4IGMwMzg4MmJhNTk0MDY2ODEyNGI4NjM3ZGNlYTk4OWUxNzU1MWRi YzYuLmY3M2QwYmVlNTgzNDZlMTg2NTY0MDAxZGViZGNlZmNlMmUzMTBmNGYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmgKQEAgLTE5NSw3ICsxOTUs NyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIGJvb2wgYW5pbWF0aW9uT2ZQcm9wZXJ0eUlzQWNjZWxl cmF0ZWQoQ1NTUHJvcGVydHlJRCk7CiAjZW5kaWYKIAotICAgIHN0YXRpYyBIYXNoU2V0PGludD4g YW5pbWF0YWJsZVNob3J0aGFuZHNBZmZlY3RpbmdQcm9wZXJ0eShDU1NQcm9wZXJ0eUlEKTsKKyAg ICBzdGF0aWMgSGFzaFNldDxDU1NQcm9wZXJ0eUlEPiBhbmltYXRhYmxlU2hvcnRoYW5kc0FmZmVj dGluZ1Byb3BlcnR5KENTU1Byb3BlcnR5SUQpOwogCiAgICAgY29uc3QgQW5pbWF0aW9uKiBhbmlt YXRpb24oKSBjb25zdCB7IHJldHVybiBtX2FuaW1hdGlvbi5nZXQoKTsgfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9Db21wb3NpdGVBbmltYXRpb24uY3BwIGIv U291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQ29tcG9zaXRlQW5pbWF0aW9uLmNwcAppbmRl eCBmODMwMDY3ZTBhYzM1N2I5M2NmYzc1Mjg2YTM3YmY5ODAyNmJlNDMxLi5iZmFhOWJhYmRlOTQ1 MjA2MjczYmVjNGMxNWZhOTI2OWY5YTcxNjExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL2FuaW1hdGlvbi9Db21wb3NpdGVBbmltYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvYW5pbWF0aW9uL0NvbXBvc2l0ZUFuaW1hdGlvbi5jcHAKQEAgLTUyNiwxMSArNTI2LDEx IEBAIGJvb2wgQ29tcG9zaXRlQW5pbWF0aW9uOjpwYXVzZVRyYW5zaXRpb25BdFRpbWUoQ1NTUHJv cGVydHlJRCBwcm9wZXJ0eSwgZG91YmxlIHQpCiAgICAgaWYgKCFpbXBsQW5pbSkgewogICAgICAg ICAvLyBDaGVjayB0byBzZWUgaWYgdGhpcyBwcm9wZXJ0eSBpcyBiZWluZyBhbmltYXRlZCB2aWEg YSBzaG9ydGhhbmQuCiAgICAgICAgIC8vIFRoaXMgY29kZSBpcyBvbmx5IHVzZWQgZm9yIHRlc3Rp bmcsIHNvIHBlcmZvcm1hbmNlIGlzIG5vdCBjcml0aWNhbCBoZXJlLgotICAgICAgICBIYXNoU2V0 PGludD4gc2hvcnRoYW5kUHJvcGVydGllcyA9IEFuaW1hdGlvbkJhc2U6OmFuaW1hdGFibGVTaG9y dGhhbmRzQWZmZWN0aW5nUHJvcGVydHkocHJvcGVydHkpOworICAgICAgICBIYXNoU2V0PENTU1By b3BlcnR5SUQ+IHNob3J0aGFuZFByb3BlcnRpZXMgPSBBbmltYXRpb25CYXNlOjphbmltYXRhYmxl U2hvcnRoYW5kc0FmZmVjdGluZ1Byb3BlcnR5KHByb3BlcnR5KTsKICAgICAgICAgYm9vbCBhbnlQ YXVzZWQgPSBmYWxzZTsKLSAgICAgICAgSGFzaFNldDxpbnQ+Ojpjb25zdF9pdGVyYXRvciBlbmQg PSBzaG9ydGhhbmRQcm9wZXJ0aWVzLmVuZCgpOwotICAgICAgICBmb3IgKEhhc2hTZXQ8aW50Pjo6 Y29uc3RfaXRlcmF0b3IgaXQgPSBzaG9ydGhhbmRQcm9wZXJ0aWVzLmJlZ2luKCk7IGl0ICE9IGVu ZDsgKytpdCkgewotICAgICAgICAgICAgaWYgKHBhdXNlVHJhbnNpdGlvbkF0VGltZShzdGF0aWNf Y2FzdDxDU1NQcm9wZXJ0eUlEPigqaXQpLCB0KSkKKyAgICAgICAgSGFzaFNldDxDU1NQcm9wZXJ0 eUlEPjo6Y29uc3RfaXRlcmF0b3IgZW5kID0gc2hvcnRoYW5kUHJvcGVydGllcy5lbmQoKTsKKyAg ICAgICAgZm9yIChIYXNoU2V0PENTU1Byb3BlcnR5SUQ+Ojpjb25zdF9pdGVyYXRvciBpdCA9IHNo b3J0aGFuZFByb3BlcnRpZXMuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7CisgICAgICAgICAg ICBpZiAocGF1c2VUcmFuc2l0aW9uQXRUaW1lKCppdCwgdCkpCiAgICAgICAgICAgICAgICAgYW55 UGF1c2VkID0gdHJ1ZTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gYW55UGF1c2VkOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vS2V5ZnJhbWVBbmltYXRpb24u Y3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vS2V5ZnJhbWVBbmltYXRpb24uY3Bw CmluZGV4IDAyOWI3Yjg0NjA5NjFiOGNhZTg4YmFiY2ZmNTJjNjM4YzY2OTllNjkuLmZiOGIyMWQ1 NWVhZTRjM2ZmMWZhNTI5ZjgyYTYxYzZjNTcxODdmMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvYW5pbWF0aW9uL0tleWZyYW1lQW5pbWF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL2FuaW1hdGlvbi9LZXlmcmFtZUFuaW1hdGlvbi5jcHAKQEAgLTE3OCwxNyArMTc4 LDE1IEBAIHZvaWQgS2V5ZnJhbWVBbmltYXRpb246OmFuaW1hdGUoQ29tcG9zaXRlQW5pbWF0aW9u KiwgUmVuZGVyT2JqZWN0KiwgY29uc3QgUmVuZGVyCiAKICAgICAvLyBGSVhNRTogd2UgbmVlZCB0 byBiZSBtb3JlIGVmZmljaWVudCBhYm91dCBkZXRlcm1pbmluZyB3aGljaCBrZXlmcmFtZXMgd2Ug YXJlIGFuaW1hdGluZyBiZXR3ZWVuLgogICAgIC8vIFdlIHNob3VsZCBjYWNoZSB0aGUgbGFzdCBw YWlyIG9yIHNvbWV0aGluZy4KLSAgICBIYXNoU2V0PGludD46OmNvbnN0X2l0ZXJhdG9yIGVuZFBy b3BlcnRpZXMgPSBtX2tleWZyYW1lcy5lbmRQcm9wZXJ0aWVzKCk7Ci0gICAgZm9yIChIYXNoU2V0 PGludD46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9rZXlmcmFtZXMuYmVnaW5Qcm9wZXJ0aWVzKCk7 IGl0ICE9IGVuZFByb3BlcnRpZXM7ICsraXQpIHsKLSAgICAgICAgQ1NTUHJvcGVydHlJRCBwcm9w ZXJ0eSA9IHN0YXRpY19jYXN0PENTU1Byb3BlcnR5SUQ+KCppdCk7Ci0KKyAgICBIYXNoU2V0PENT U1Byb3BlcnR5SUQ+Ojpjb25zdF9pdGVyYXRvciBlbmRQcm9wZXJ0aWVzID0gbV9rZXlmcmFtZXMu ZW5kUHJvcGVydGllcygpOworICAgIGZvciAoSGFzaFNldDxDU1NQcm9wZXJ0eUlEPjo6Y29uc3Rf aXRlcmF0b3IgaXQgPSBtX2tleWZyYW1lcy5iZWdpblByb3BlcnRpZXMoKTsgaXQgIT0gZW5kUHJv cGVydGllczsgKytpdCkgewogICAgICAgICAvLyBHZXQgdGhlIGZyb20vdG8gc3R5bGVzIGFuZCBw cm9ncmVzcyBiZXR3ZWVuCiAgICAgICAgIGNvbnN0IFJlbmRlclN0eWxlKiBmcm9tU3R5bGUgPSAw OwogICAgICAgICBjb25zdCBSZW5kZXJTdHlsZSogdG9TdHlsZSA9IDA7CiAgICAgICAgIGRvdWJs ZSBwcm9ncmVzcyA9IDAuMDsKLSAgICAgICAgZmV0Y2hJbnRlcnZhbEVuZHBvaW50c0ZvclByb3Bl cnR5KHByb3BlcnR5LCBmcm9tU3R5bGUsIHRvU3R5bGUsIHByb2dyZXNzKTsKKyAgICAgICAgZmV0 Y2hJbnRlcnZhbEVuZHBvaW50c0ZvclByb3BlcnR5KCppdCwgZnJvbVN0eWxlLCB0b1N0eWxlLCBw cm9ncmVzcyk7CiAgICAgCi0gICAgICAgIGJvb2wgbmVlZHNBbmltID0gYmxlbmRQcm9wZXJ0aWVz KHRoaXMsIHByb3BlcnR5LCBhbmltYXRlZFN0eWxlLmdldCgpLCBmcm9tU3R5bGUsIHRvU3R5bGUs IHByb2dyZXNzKTsKKyAgICAgICAgYm9vbCBuZWVkc0FuaW0gPSBibGVuZFByb3BlcnRpZXModGhp cywgKml0LCBhbmltYXRlZFN0eWxlLmdldCgpLCBmcm9tU3R5bGUsIHRvU3R5bGUsIHByb2dyZXNz KTsKICAgICAgICAgaWYgKG5lZWRzQW5pbSkKICAgICAgICAgICAgIHNldEFuaW1hdGluZygpOwog ICAgICAgICBlbHNlIHsKQEAgLTIxNSwxNyArMjEzLDE1IEBAIHZvaWQgS2V5ZnJhbWVBbmltYXRp b246OmdldEFuaW1hdGVkU3R5bGUoUmVmUHRyPFJlbmRlclN0eWxlPiYgYW5pbWF0ZWRTdHlsZSkK ICAgICBpZiAoIWFuaW1hdGVkU3R5bGUpCiAgICAgICAgIGFuaW1hdGVkU3R5bGUgPSBSZW5kZXJT dHlsZTo6Y2xvbmUobV9vYmplY3QtPnN0eWxlKCkpOwogCi0gICAgSGFzaFNldDxpbnQ+Ojpjb25z dF9pdGVyYXRvciBlbmRQcm9wZXJ0aWVzID0gbV9rZXlmcmFtZXMuZW5kUHJvcGVydGllcygpOwot ICAgIGZvciAoSGFzaFNldDxpbnQ+Ojpjb25zdF9pdGVyYXRvciBpdCA9IG1fa2V5ZnJhbWVzLmJl Z2luUHJvcGVydGllcygpOyBpdCAhPSBlbmRQcm9wZXJ0aWVzOyArK2l0KSB7Ci0gICAgICAgIENT U1Byb3BlcnR5SUQgcHJvcGVydHkgPSBzdGF0aWNfY2FzdDxDU1NQcm9wZXJ0eUlEPigqaXQpOwot CisgICAgSGFzaFNldDxDU1NQcm9wZXJ0eUlEPjo6Y29uc3RfaXRlcmF0b3IgZW5kUHJvcGVydGll cyA9IG1fa2V5ZnJhbWVzLmVuZFByb3BlcnRpZXMoKTsKKyAgICBmb3IgKEhhc2hTZXQ8Q1NTUHJv cGVydHlJRD46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9rZXlmcmFtZXMuYmVnaW5Qcm9wZXJ0aWVz KCk7IGl0ICE9IGVuZFByb3BlcnRpZXM7ICsraXQpIHsKICAgICAgICAgLy8gR2V0IHRoZSBmcm9t L3RvIHN0eWxlcyBhbmQgcHJvZ3Jlc3MgYmV0d2VlbgogICAgICAgICBjb25zdCBSZW5kZXJTdHls ZSogZnJvbVN0eWxlID0gMDsKICAgICAgICAgY29uc3QgUmVuZGVyU3R5bGUqIHRvU3R5bGUgPSAw OwogICAgICAgICBkb3VibGUgcHJvZ3Jlc3MgPSAwLjA7Ci0gICAgICAgIGZldGNoSW50ZXJ2YWxF bmRwb2ludHNGb3JQcm9wZXJ0eShwcm9wZXJ0eSwgZnJvbVN0eWxlLCB0b1N0eWxlLCBwcm9ncmVz cyk7CisgICAgICAgIGZldGNoSW50ZXJ2YWxFbmRwb2ludHNGb3JQcm9wZXJ0eSgqaXQsIGZyb21T dHlsZSwgdG9TdHlsZSwgcHJvZ3Jlc3MpOwogCi0gICAgICAgIGJsZW5kUHJvcGVydGllcyh0aGlz LCBwcm9wZXJ0eSwgYW5pbWF0ZWRTdHlsZS5nZXQoKSwgZnJvbVN0eWxlLCB0b1N0eWxlLCBwcm9n cmVzcyk7CisgICAgICAgIGJsZW5kUHJvcGVydGllcyh0aGlzLCAqaXQsIGFuaW1hdGVkU3R5bGUu Z2V0KCksIGZyb21TdHlsZSwgdG9TdHlsZSwgcHJvZ3Jlc3MpOwogICAgIH0KIH0KIApAQCAtMzQ5 LDE3ICszNDUsMTcgQEAgYm9vbCBLZXlmcmFtZUFuaW1hdGlvbjo6c2VuZEFuaW1hdGlvbkV2ZW50 KGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLCBkb3VibGUKIHZvaWQgS2V5ZnJhbWVBbmlt YXRpb246Om92ZXJyaWRlQW5pbWF0aW9ucygpCiB7CiAgICAgLy8gVGhpcyB3aWxsIG92ZXJyaWRl IGltcGxpY2l0IGFuaW1hdGlvbnMgdGhhdCBtYXRjaCB0aGUgcHJvcGVydGllcyBpbiB0aGUga2V5 ZnJhbWUgYW5pbWF0aW9uCi0gICAgSGFzaFNldDxpbnQ+Ojpjb25zdF9pdGVyYXRvciBlbmQgPSBt X2tleWZyYW1lcy5lbmRQcm9wZXJ0aWVzKCk7Ci0gICAgZm9yIChIYXNoU2V0PGludD46OmNvbnN0 X2l0ZXJhdG9yIGl0ID0gbV9rZXlmcmFtZXMuYmVnaW5Qcm9wZXJ0aWVzKCk7IGl0ICE9IGVuZDsg KytpdCkKLSAgICAgICAgY29tcG9zaXRlQW5pbWF0aW9uKCktPm92ZXJyaWRlSW1wbGljaXRBbmlt YXRpb25zKHN0YXRpY19jYXN0PENTU1Byb3BlcnR5SUQ+KCppdCkpOworICAgIEhhc2hTZXQ8Q1NT UHJvcGVydHlJRD46OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IG1fa2V5ZnJhbWVzLmVuZFByb3BlcnRp ZXMoKTsKKyAgICBmb3IgKEhhc2hTZXQ8Q1NTUHJvcGVydHlJRD46OmNvbnN0X2l0ZXJhdG9yIGl0 ID0gbV9rZXlmcmFtZXMuYmVnaW5Qcm9wZXJ0aWVzKCk7IGl0ICE9IGVuZDsgKytpdCkKKyAgICAg ICAgY29tcG9zaXRlQW5pbWF0aW9uKCktPm92ZXJyaWRlSW1wbGljaXRBbmltYXRpb25zKCppdCk7 CiB9CiAKIHZvaWQgS2V5ZnJhbWVBbmltYXRpb246OnJlc3VtZU92ZXJyaWRkZW5BbmltYXRpb25z KCkKIHsKICAgICAvLyBUaGlzIHdpbGwgcmVzdW1lIG92ZXJyaWRkZW4gaW1wbGljaXQgYW5pbWF0 aW9ucwotICAgIEhhc2hTZXQ8aW50Pjo6Y29uc3RfaXRlcmF0b3IgZW5kID0gbV9rZXlmcmFtZXMu ZW5kUHJvcGVydGllcygpOwotICAgIGZvciAoSGFzaFNldDxpbnQ+Ojpjb25zdF9pdGVyYXRvciBp dCA9IG1fa2V5ZnJhbWVzLmJlZ2luUHJvcGVydGllcygpOyBpdCAhPSBlbmQ7ICsraXQpCi0gICAg ICAgIGNvbXBvc2l0ZUFuaW1hdGlvbigpLT5yZXN1bWVPdmVycmlkZGVuSW1wbGljaXRBbmltYXRp b25zKHN0YXRpY19jYXN0PENTU1Byb3BlcnR5SUQ+KCppdCkpOworICAgIEhhc2hTZXQ8Q1NTUHJv cGVydHlJRD46OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IG1fa2V5ZnJhbWVzLmVuZFByb3BlcnRpZXMo KTsKKyAgICBmb3IgKEhhc2hTZXQ8Q1NTUHJvcGVydHlJRD46OmNvbnN0X2l0ZXJhdG9yIGl0ID0g bV9rZXlmcmFtZXMuYmVnaW5Qcm9wZXJ0aWVzKCk7IGl0ICE9IGVuZDsgKytpdCkKKyAgICAgICAg Y29tcG9zaXRlQW5pbWF0aW9uKCktPnJlc3VtZU92ZXJyaWRkZW5JbXBsaWNpdEFuaW1hdGlvbnMo Kml0KTsKIH0KIAogYm9vbCBLZXlmcmFtZUFuaW1hdGlvbjo6YWZmZWN0c1Byb3BlcnR5KENTU1By b3BlcnR5SUQgcHJvcGVydHkpIGNvbnN0CkBAIC00NTgsMTEgKzQ1NCwxMSBAQCBkb3VibGUgS2V5 ZnJhbWVBbmltYXRpb246OnRpbWVUb05leHRTZXJ2aWNlKCkKICAgICAgICAgCiAgICAgLy8gQSBy ZXR1cm4gdmFsdWUgb2YgMCBtZWFucyB3ZSBuZWVkIHNlcnZpY2UuIEJ1dCBpZiB3ZSBvbmx5IGhh dmUgYWNjZWxlcmF0ZWQgYW5pbWF0aW9ucyB3ZSAKICAgICAvLyBvbmx5IG5lZWQgc2VydmljZSBh dCB0aGUgZW5kIG9mIHRoZSB0cmFuc2l0aW9uCi0gICAgSGFzaFNldDxpbnQ+Ojpjb25zdF9pdGVy YXRvciBlbmRQcm9wZXJ0aWVzID0gbV9rZXlmcmFtZXMuZW5kUHJvcGVydGllcygpOworICAgIEhh c2hTZXQ8Q1NTUHJvcGVydHlJRD46OmNvbnN0X2l0ZXJhdG9yIGVuZFByb3BlcnRpZXMgPSBtX2tl eWZyYW1lcy5lbmRQcm9wZXJ0aWVzKCk7CiAgICAgYm9vbCBhY2NlbGVyYXRlZFByb3BlcnRpZXNP bmx5ID0gdHJ1ZTsKICAgICAKLSAgICBmb3IgKEhhc2hTZXQ8aW50Pjo6Y29uc3RfaXRlcmF0b3Ig aXQgPSBtX2tleWZyYW1lcy5iZWdpblByb3BlcnRpZXMoKTsgaXQgIT0gZW5kUHJvcGVydGllczsg KytpdCkgewotICAgICAgICBpZiAoIWFuaW1hdGlvbk9mUHJvcGVydHlJc0FjY2VsZXJhdGVkKHN0 YXRpY19jYXN0PENTU1Byb3BlcnR5SUQ+KCppdCkpIHx8ICFpc0FjY2VsZXJhdGVkKCkpIHsKKyAg ICBmb3IgKEhhc2hTZXQ8Q1NTUHJvcGVydHlJRD46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9rZXlm cmFtZXMuYmVnaW5Qcm9wZXJ0aWVzKCk7IGl0ICE9IGVuZFByb3BlcnRpZXM7ICsraXQpIHsKKyAg ICAgICAgaWYgKCFhbmltYXRpb25PZlByb3BlcnR5SXNBY2NlbGVyYXRlZCgqaXQpIHx8ICFpc0Fj Y2VsZXJhdGVkKCkpIHsKICAgICAgICAgICAgIGFjY2VsZXJhdGVkUHJvcGVydGllc09ubHkgPSBm YWxzZTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvS2V5ZnJhbWVMaXN0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdHlsZS9LZXlmcmFtZUxpc3QuY3BwCmluZGV4IGJhZmE0MjY3YzI4NzEwOWM3 ZTVjYmZlZjYyMWVjNjY1ZDE3N2E5OTYuLmExMjdiNDY4YjkzNDJlOGU0ODRiODcyYmQxZmVmMzdi YjBlZjY4NzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9LZXlm cmFtZUxpc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9LZXlmcmFt ZUxpc3QuY3BwCkBAIC04NSwxMSArODUsMTEgQEAgdm9pZCBLZXlmcmFtZUxpc3Q6Omluc2VydChj b25zdCBLZXlmcmFtZVZhbHVlJiBrZXlmcmFtZSkKICAgICAgICAgbV9wcm9wZXJ0aWVzLmNsZWFy KCk7CiAgICAgICAgIGZvciAoVmVjdG9yPEtleWZyYW1lVmFsdWU+Ojpjb25zdF9pdGVyYXRvciBp dCA9IG1fa2V5ZnJhbWVzLmJlZ2luKCk7IGl0ICE9IG1fa2V5ZnJhbWVzLmVuZCgpOyArK2l0KSB7 CiAgICAgICAgICAgICBjb25zdCBLZXlmcmFtZVZhbHVlJiBjdXJyS2V5ZnJhbWUgPSAqaXQ7Ci0g ICAgICAgICAgICBmb3IgKEhhc2hTZXQ8aW50Pjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBjdXJyS2V5 ZnJhbWUucHJvcGVydGllcygpLmJlZ2luKCk7IGl0ICE9IGN1cnJLZXlmcmFtZS5wcm9wZXJ0aWVz KCkuZW5kKCk7ICsraXQpCisgICAgICAgICAgICBmb3IgKEhhc2hTZXQ8Q1NTUHJvcGVydHlJRD46 OmNvbnN0X2l0ZXJhdG9yIGl0ID0gY3VycktleWZyYW1lLnByb3BlcnRpZXMoKS5iZWdpbigpOyBp dCAhPSBjdXJyS2V5ZnJhbWUucHJvcGVydGllcygpLmVuZCgpOyArK2l0KQogICAgICAgICAgICAg ICAgIG1fcHJvcGVydGllcy5hZGQoKml0KTsKICAgICAgICAgfQogICAgIH0gZWxzZSB7Ci0gICAg ICAgIGZvciAoSGFzaFNldDxpbnQ+Ojpjb25zdF9pdGVyYXRvciBpdCA9IGtleWZyYW1lLnByb3Bl cnRpZXMoKS5iZWdpbigpOyBpdCAhPSBrZXlmcmFtZS5wcm9wZXJ0aWVzKCkuZW5kKCk7ICsraXQp CisgICAgICAgIGZvciAoSGFzaFNldDxDU1NQcm9wZXJ0eUlEPjo6Y29uc3RfaXRlcmF0b3IgaXQg PSBrZXlmcmFtZS5wcm9wZXJ0aWVzKCkuYmVnaW4oKTsgaXQgIT0ga2V5ZnJhbWUucHJvcGVydGll cygpLmVuZCgpOyArK2l0KQogICAgICAgICAgICAgbV9wcm9wZXJ0aWVzLmFkZCgqaXQpOwogICAg IH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9LZXlmcmFt ZUxpc3QuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9LZXlmcmFtZUxpc3QuaApp bmRleCA2NDE3MGNlMGNkYzA3ZmRkODZkNmQ0ZDA3MThkZTljNGM2NjliOTZhLi5mYjM1MmY5ZmRj MmIzMTMxNTUyMTlhNThiYzdmYzMxNzc5YzdlMzBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3R5bGUvS2V5ZnJhbWVMaXN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL0tleWZyYW1lTGlzdC5oCkBAIC0yNSw2ICsyNSw3IEBACiAjaWZuZGVmIEtl eWZyYW1lTGlzdF9oCiAjZGVmaW5lIEtleWZyYW1lTGlzdF9oCiAKKyNpbmNsdWRlICJDU1NQcm9w ZXJ0eU5hbWVzLmgiCiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogI2luY2x1ZGUgPHd0Zi9IYXNo U2V0Lmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgpAQCAtNDMsOSArNDQsOSBAQCBwdWJsaWM6 CiAgICAgewogICAgIH0KIAotICAgIHZvaWQgYWRkUHJvcGVydHkoaW50IHByb3ApIHsgbV9wcm9w ZXJ0aWVzLmFkZChwcm9wKTsgfQotICAgIGJvb2wgY29udGFpbnNQcm9wZXJ0eShpbnQgcHJvcCkg Y29uc3QgeyByZXR1cm4gbV9wcm9wZXJ0aWVzLmNvbnRhaW5zKHByb3ApOyB9Ci0gICAgY29uc3Qg SGFzaFNldDxpbnQ+JiBwcm9wZXJ0aWVzKCkgY29uc3QgeyByZXR1cm4gbV9wcm9wZXJ0aWVzOyB9 CisgICAgdm9pZCBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUlEIHByb3ApIHsgbV9wcm9wZXJ0aWVz LmFkZChwcm9wKTsgfQorICAgIGJvb2wgY29udGFpbnNQcm9wZXJ0eShDU1NQcm9wZXJ0eUlEIHBy b3ApIGNvbnN0IHsgcmV0dXJuIG1fcHJvcGVydGllcy5jb250YWlucyhwcm9wKTsgfQorICAgIGNv bnN0IEhhc2hTZXQ8Q1NTUHJvcGVydHlJRD4mIHByb3BlcnRpZXMoKSBjb25zdCB7IHJldHVybiBt X3Byb3BlcnRpZXM7IH0KIAogICAgIGZsb2F0IGtleSgpIGNvbnN0IHsgcmV0dXJuIG1fa2V5OyB9 CiAgICAgdm9pZCBzZXRLZXkoZmxvYXQga2V5KSB7IG1fa2V5ID0ga2V5OyB9CkBAIC01NSw3ICs1 Niw3IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBmbG9hdCBtX2tleTsKLSAgICBIYXNoU2V0 PGludD4gbV9wcm9wZXJ0aWVzOyAvLyBUaGUgcHJvcGVydGllcyBzcGVjaWZpZWQgaW4gdGhpcyBr ZXlmcmFtZS4KKyAgICBIYXNoU2V0PENTU1Byb3BlcnR5SUQ+IG1fcHJvcGVydGllczsgLy8gVGhl IHByb3BlcnRpZXMgc3BlY2lmaWVkIGluIHRoaXMga2V5ZnJhbWUuCiAgICAgUmVmUHRyPFJlbmRl clN0eWxlPiBtX3N0eWxlOwogfTsKIApAQCAtNzcsMTAgKzc4LDEwIEBAIHB1YmxpYzoKICAgICAK ICAgICB2b2lkIGluc2VydChjb25zdCBLZXlmcmFtZVZhbHVlJiBrZXlmcmFtZSk7CiAgICAgCi0g ICAgdm9pZCBhZGRQcm9wZXJ0eShpbnQgcHJvcCkgeyBtX3Byb3BlcnRpZXMuYWRkKHByb3ApOyB9 Ci0gICAgYm9vbCBjb250YWluc1Byb3BlcnR5KGludCBwcm9wKSBjb25zdCB7IHJldHVybiBtX3By b3BlcnRpZXMuY29udGFpbnMocHJvcCk7IH0KLSAgICBIYXNoU2V0PGludD46OmNvbnN0X2l0ZXJh dG9yIGJlZ2luUHJvcGVydGllcygpIGNvbnN0IHsgcmV0dXJuIG1fcHJvcGVydGllcy5iZWdpbigp OyB9Ci0gICAgSGFzaFNldDxpbnQ+Ojpjb25zdF9pdGVyYXRvciBlbmRQcm9wZXJ0aWVzKCkgY29u c3QgeyByZXR1cm4gbV9wcm9wZXJ0aWVzLmVuZCgpOyB9CisgICAgdm9pZCBhZGRQcm9wZXJ0eShD U1NQcm9wZXJ0eUlEIHByb3ApIHsgbV9wcm9wZXJ0aWVzLmFkZChwcm9wKTsgfQorICAgIGJvb2wg Y29udGFpbnNQcm9wZXJ0eShDU1NQcm9wZXJ0eUlEIHByb3ApIGNvbnN0IHsgcmV0dXJuIG1fcHJv cGVydGllcy5jb250YWlucyhwcm9wKTsgfQorICAgIEhhc2hTZXQ8Q1NTUHJvcGVydHlJRD46OmNv bnN0X2l0ZXJhdG9yIGJlZ2luUHJvcGVydGllcygpIGNvbnN0IHsgcmV0dXJuIG1fcHJvcGVydGll cy5iZWdpbigpOyB9CisgICAgSGFzaFNldDxDU1NQcm9wZXJ0eUlEPjo6Y29uc3RfaXRlcmF0b3Ig ZW5kUHJvcGVydGllcygpIGNvbnN0IHsgcmV0dXJuIG1fcHJvcGVydGllcy5lbmQoKTsgfQogICAg IAogICAgIHZvaWQgY2xlYXIoKTsKICAgICBib29sIGlzRW1wdHkoKSBjb25zdCB7IHJldHVybiBt X2tleWZyYW1lcy5pc0VtcHR5KCk7IH0KQEAgLTg5LDggKzkwLDggQEAgcHVibGljOgogCiBwcml2 YXRlOgogICAgIEF0b21pY1N0cmluZyBtX2FuaW1hdGlvbk5hbWU7Ci0gICAgVmVjdG9yPEtleWZy YW1lVmFsdWU+IG1fa2V5ZnJhbWVzOyAvLyBrZXB0IHNvcnRlZCBieSBrZXkKLSAgICBIYXNoU2V0 PGludD4gbV9wcm9wZXJ0aWVzOyAvLyB0aGUgcHJvcGVydGllcyBiZWluZyBhbmltYXRlZAorICAg IFZlY3RvcjxLZXlmcmFtZVZhbHVlPiBtX2tleWZyYW1lczsgLy8gS2VwdCBzb3J0ZWQgYnkga2V5 LgorICAgIEhhc2hTZXQ8Q1NTUHJvcGVydHlJRD4gbV9wcm9wZXJ0aWVzOyAvLyBUaGUgcHJvcGVy dGllcyBiZWluZyBhbmltYXRlZC4KICAgICBSZW5kZXJPYmplY3QqIG1fcmVuZGVyZXI7CiB9Owog Cg==