154531 2016-02-22 02:28:32 -0800 Refactor DOM Iterator next signature 2016-02-23 01:39:31 -0800 1 1 1 Unclassified WebKit WebCore JavaScript WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 youennf youennf commit-queue darin mmaxfield oldest_to_newest 1166976 0 youennf 2016-02-22 02:28:32 -0800 As suggested in bug 154413, Iterator::next could be simplified to Optional<...> next() instead of bool next(...) 1166977 1 271913 youennf 2016-02-22 02:36:27 -0800 Created attachment 271913 Patch 1167042 2 271913 mmaxfield 2016-02-22 09:26:32 -0800 Comment on attachment 271913 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=271913&action=review > Source/WebCore/bindings/js/JSKeyValueIterator.h:152 > + auto iteratorValue = m_iterator.next(); Maybe it is worth taking the same approach in the return of this function. 1167060 3 youennf 2016-02-22 09:56:47 -0800 (In reply to comment #2) > Comment on attachment 271913 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=271913&action=review > > > Source/WebCore/bindings/js/JSKeyValueIterator.h:152 > > + auto iteratorValue = m_iterator.next(); > > Maybe it is worth taking the same approach in the return of this function. Let's JSKeyValueIterator<JSWrapper>::next return the iterator object directly. This way, no need for boolean/JSValue or Optional for that method. 1167329 4 271993 youennf 2016-02-23 00:38:34 -0800 Created attachment 271993 Patch for landing 1167333 5 271993 commit-queue 2016-02-23 01:39:28 -0800 Comment on attachment 271993 Patch for landing Clearing flags on attachment: 271993 Committed r196973: <http://trac.webkit.org/changeset/196973> 1167334 6 commit-queue 2016-02-23 01:39:31 -0800 All reviewed patches have been landed. Closing bug. 271913 2016-02-22 02:36:27 -0800 2016-02-23 00:38:29 -0800 Patch bug-154531-20160222113608.patch text/plain 6963 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2OTA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzZhNjM2OTJmNjhjZDJh NmI0ZWI3MTY2YWNkNDIzNjNmMjM4MzQ0OC4uZGRlNjQ4OTUyZDJhNTAxZGYzZTI4MmVhZDNkN2Nm ZjcwY2IxZjYxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE2LTAyLTIyICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24uZnI+CisKKyAgICAgICAgUmVmYWN0 b3IgRE9NIEl0ZXJhdG9yIG5leHQgc2lnbmF0dXJlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTQ1MzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAg ICAgICogTW9kdWxlcy9mZXRjaC9GZXRjaEhlYWRlcnMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RmV0Y2hIZWFkZXJzOjpJdGVyYXRvcjo6bmV4dCk6IFVzaW5nIE9wdGlvbmFsPEtleVZhbHVlUGFp cj4gdG8gcmV0dXJuIGl0ZXJhdG9yIHZhbHVlLgorICAgICAgICAqIE1vZHVsZXMvZmV0Y2gvRmV0 Y2hIZWFkZXJzLmg6CisgICAgICAgICogYmluZGluZ3MvanMvSlNLZXlWYWx1ZUl0ZXJhdG9yLmg6 IFVzaW5nIE9wdGlvbmFsPEtleVZhbHVlUGFpcj4gYXMgcmV0dXJuZWQgaXRlcmF0b3IgdmFsdWUu CisgICAgICAgIChXZWJDb3JlOjprZXlWYWx1ZUl0ZXJhdG9yRm9yRWFjaCk6CisgICAgICAgIChX ZWJDb3JlOjpKU0tleVZhbHVlSXRlcmF0b3I8SlNXcmFwcGVyPjo6bmV4dCk6CisgICAgICAgICog Y3NzL0ZvbnRGYWNlU2V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRGYWNlU2V0OjpJdGVy YXRvcjo6bmV4dCk6IFVzaW5nIE9wdGlvbmFsPEtleVZhbHVlUGFpcj4gdG8gcmV0dXJuIGl0ZXJh dG9yIHZhbHVlLgorICAgICAgICAqIGNzcy9Gb250RmFjZVNldC5oOgorCiAyMDE2LTAyLTIyICBN YW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtjc3Mt Z3JpZF0gU3dhcCBjb2x1bW5zIGFuZCByb3dzIGluIGdyaWQgc2hvcnRoYW5kCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZldGNoL0ZldGNoSGVhZGVycy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2ZldGNoL0ZldGNoSGVhZGVycy5jcHAKaW5kZXggODEyM2U4NmI5MjI3 MDM5ZDBjYTIwY2Q5M2NjOTNhNGMwMzI3NWY3Yy4uNGIxNzcwZmRjMDRlNTVmMmM1ZWJjNmMxODY2 ZmViMzVjMTQzNzFkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRjaC9G ZXRjaEhlYWRlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZmV0Y2gvRmV0Y2hI ZWFkZXJzLmNwcApAQCAtMTc5LDE5ICsxNzksMTUgQEAgdm9pZCBGZXRjaEhlYWRlcnM6OmZpbGwo Y29uc3QgRmV0Y2hIZWFkZXJzKiBoZWFkZXJzKQogICAgIH0KIH0KIAotYm9vbCBGZXRjaEhlYWRl cnM6Okl0ZXJhdG9yOjpuZXh0KFN0cmluZyYgbmV4dEtleSwgU3RyaW5nJiBuZXh0VmFsdWUpCitP cHRpb25hbDxXVEY6OktleVZhbHVlUGFpcjxTdHJpbmcsIFN0cmluZz4+IEZldGNoSGVhZGVyczo6 SXRlcmF0b3I6Om5leHQoKQogewogICAgIHdoaWxlIChtX2N1cnJlbnRJbmRleCA8IG1fa2V5cy5z aXplKCkpIHsKLSAgICAgICAgYXV0byYga2V5ID0gbV9rZXlzW21fY3VycmVudEluZGV4KytdOwor ICAgICAgICBTdHJpbmcga2V5ID0gbV9rZXlzW21fY3VycmVudEluZGV4KytdOwogICAgICAgICBT dHJpbmcgdmFsdWUgPSBtX2hlYWRlcnMtPm1faGVhZGVycy5nZXQoa2V5KTsKLSAgICAgICAgaWYg KCF2YWx1ZS5pc051bGwoKSkgewotICAgICAgICAgICAgbmV4dEtleSA9IGtleTsKLSAgICAgICAg ICAgIG5leHRWYWx1ZSA9IFdURk1vdmUodmFsdWUpOwotICAgICAgICAgICAgcmV0dXJuIGZhbHNl OwotICAgICAgICB9CisgICAgICAgIGlmICghdmFsdWUuaXNOdWxsKCkpCisgICAgICAgICAgICBy ZXR1cm4gV1RGOjpLZXlWYWx1ZVBhaXI8U3RyaW5nLCBTdHJpbmc+KFdURk1vdmUoa2V5KSwgV1RG TW92ZSh2YWx1ZSkpOwogICAgIH0KLSAgICBtX2tleXMuY2xlYXIoKTsKLSAgICByZXR1cm4gdHJ1 ZTsKKyAgICByZXR1cm4gTnVsbG9wdDsKIH0KIAogRmV0Y2hIZWFkZXJzOjpJdGVyYXRvcjo6SXRl cmF0b3IoRmV0Y2hIZWFkZXJzJiBoZWFkZXJzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9mZXRjaC9GZXRjaEhlYWRlcnMuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZmV0 Y2gvRmV0Y2hIZWFkZXJzLmgKaW5kZXggNTdmZjczZmY3NjJjZTg4ZDAwYjNiZjY1MjcyMjk2NzJh MzVlOTljZC4uMjMzNTk0MWJlYzk5M2Q4NGVhODQzNTRlMDNlNWRlN2YyNGFkZjI2MSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRjaC9GZXRjaEhlYWRlcnMuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZldGNoL0ZldGNoSGVhZGVycy5oCkBAIC0zMiw2ICszMiw4 IEBACiAjaWYgRU5BQkxFKEZFVENIX0FQSSkKIAogI2luY2x1ZGUgIkhUVFBIZWFkZXJNYXAuaCIK KyNpbmNsdWRlIDx3dGYvSGFzaFRyYWl0cy5oPgorI2luY2x1ZGUgPHd0Zi9PcHRpb25hbC5oPgog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTY1LDcgKzY3LDcgQEAgcHVibGljOgogICAgIGNs YXNzIEl0ZXJhdG9yIHsKICAgICBwdWJsaWM6CiAgICAgICAgIGV4cGxpY2l0IEl0ZXJhdG9yKEZl dGNoSGVhZGVycyYpOwotICAgICAgICBib29sIG5leHQoU3RyaW5nJiBuZXh0S2V5LCBTdHJpbmcm IG5leHRWYWx1ZSk7CisgICAgICAgIE9wdGlvbmFsPFdURjo6S2V5VmFsdWVQYWlyPFN0cmluZywg U3RyaW5nPj4gbmV4dCgpOwogCiAgICAgcHJpdmF0ZToKICAgICAgICAgUmVmPEZldGNoSGVhZGVy cz4gbV9oZWFkZXJzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNL ZXlWYWx1ZUl0ZXJhdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0tleVZhbHVl SXRlcmF0b3IuaAppbmRleCAwNjdiYjk2YjU3ODkxM2NiMmMzY2M1ZTBlYzE1YTEwMmRhZmU5MWZm Li4wNTk2N2VkZThiNWY3ZDJjNDYyZjRkYmJlZDc3Y2M0YmMyZTc3OWZkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0tleVZhbHVlSXRlcmF0b3IuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0tleVZhbHVlSXRlcmF0b3IuaApAQCAtMTI2LDEzICsx MjYsMTEgQEAgSlNDOjpFbmNvZGVkSlNWYWx1ZSBrZXlWYWx1ZUl0ZXJhdG9yRm9yRWFjaChKU0M6 OkV4ZWNTdGF0ZSYgc3RhdGUsIGNvbnN0IGNoYXIqIHAKICAgICBpZiAoY2FsbFR5cGUgPT0gSlND OjpDYWxsVHlwZU5vbmUpCiAgICAgICAgIHJldHVybiB0aHJvd1ZNVHlwZUVycm9yKCZzdGF0ZSk7 CiAKLSAgICB0eXBlbmFtZSBKU1dyYXBwZXI6Okl0ZXJhdG9yS2V5IG5leHRLZXk7Ci0gICAgdHlw ZW5hbWUgSlNXcmFwcGVyOjpJdGVyYXRvclZhbHVlIG5leHRWYWx1ZTsKICAgICBhdXRvIGl0ZXJh dG9yID0gd3JhcHBlci0+d3JhcHBlZCgpLmNyZWF0ZUl0ZXJhdG9yKCk7Ci0gICAgd2hpbGUgKCFp dGVyYXRvci5uZXh0KG5leHRLZXksIG5leHRWYWx1ZSkpIHsKKyAgICB3aGlsZSAoYXV0byB2YWx1 ZSA9IGl0ZXJhdG9yLm5leHQoKSkgewogICAgICAgICBKU0M6Ok1hcmtlZEFyZ3VtZW50QnVmZmVy IGFyZ3VtZW50czsKLSAgICAgICAgYXJndW1lbnRzLmFwcGVuZCh0b0pTKCZzdGF0ZSwgd3JhcHBl ci0+Z2xvYmFsT2JqZWN0KCksIG5leHRWYWx1ZSkpOwotICAgICAgICBhcmd1bWVudHMuYXBwZW5k KHRvSlMoJnN0YXRlLCB3cmFwcGVyLT5nbG9iYWxPYmplY3QoKSwgbmV4dEtleSkpOworICAgICAg ICBhcmd1bWVudHMuYXBwZW5kKHRvSlMoJnN0YXRlLCB3cmFwcGVyLT5nbG9iYWxPYmplY3QoKSwg dmFsdWUudmFsdWUoKS52YWx1ZSkpOworICAgICAgICBhcmd1bWVudHMuYXBwZW5kKHRvSlMoJnN0 YXRlLCB3cmFwcGVyLT5nbG9iYWxPYmplY3QoKSwgdmFsdWUudmFsdWUoKS5rZXkpKTsKICAgICAg ICAgYXJndW1lbnRzLmFwcGVuZCh3cmFwcGVyKTsKICAgICAgICAgSlNDOjpjYWxsKCZzdGF0ZSwg c3RhdGUuYXJndW1lbnQoMCksIGNhbGxUeXBlLCBjYWxsRGF0YSwgd3JhcHBlciwgYXJndW1lbnRz KTsKICAgICAgICAgaWYgKHN0YXRlLmhhZEV4Y2VwdGlvbigpKQpAQCAtMTUxLDE4ICsxNDksMTcg QEAgdm9pZCBKU0tleVZhbHVlSXRlcmF0b3I8SlNXcmFwcGVyPjo6ZGVzdHJveShKU0NlbGwqIGNl bGwpCiB0ZW1wbGF0ZTx0eXBlbmFtZSBKU1dyYXBwZXI+CiBib29sIEpTS2V5VmFsdWVJdGVyYXRv cjxKU1dyYXBwZXI+OjpuZXh0KEpTQzo6RXhlY1N0YXRlJiBzdGF0ZSwgSlNDOjpKU1ZhbHVlJiB2 YWx1ZSkKIHsKLSAgICB0eXBlbmFtZSBKU1dyYXBwZXI6Okl0ZXJhdG9yS2V5IG5leHRLZXk7Ci0g ICAgdHlwZW5hbWUgSlNXcmFwcGVyOjpJdGVyYXRvclZhbHVlIG5leHRWYWx1ZTsKLSAgICBpZiAo bV9pdGVyYXRvci5uZXh0KG5leHRLZXksIG5leHRWYWx1ZSkpIHsKKyAgICBhdXRvIGl0ZXJhdG9y VmFsdWUgPSBtX2l0ZXJhdG9yLm5leHQoKTsKKyAgICBpZiAoIWl0ZXJhdG9yVmFsdWUpIHsKICAg ICAgICAgdmFsdWUgPSBKU0M6OmpzVW5kZWZpbmVkKCk7CiAgICAgICAgIHJldHVybiB0cnVlOwog ICAgIH0KICAgICBpZiAobV9raW5kID09IEl0ZXJhdGlvbktpbmQ6OlZhbHVlKQotICAgICAgICB2 YWx1ZSA9IHRvSlMoJnN0YXRlLCBnbG9iYWxPYmplY3QoKSwgbmV4dFZhbHVlKTsKKyAgICAgICAg dmFsdWUgPSB0b0pTKCZzdGF0ZSwgZ2xvYmFsT2JqZWN0KCksIGl0ZXJhdG9yVmFsdWUudmFsdWUo KS52YWx1ZSk7CiAgICAgZWxzZSBpZiAobV9raW5kID09IEl0ZXJhdGlvbktpbmQ6OktleSkKLSAg ICAgICAgdmFsdWUgPSB0b0pTKCZzdGF0ZSwgZ2xvYmFsT2JqZWN0KCksIG5leHRLZXkpOworICAg ICAgICB2YWx1ZSA9IHRvSlMoJnN0YXRlLCBnbG9iYWxPYmplY3QoKSwgaXRlcmF0b3JWYWx1ZS52 YWx1ZSgpLmtleSk7CiAgICAgZWxzZQotICAgICAgICB2YWx1ZSA9IGpzUGFpcihzdGF0ZSwgZ2xv YmFsT2JqZWN0KCksIG5leHRLZXksIG5leHRWYWx1ZSk7CisgICAgICAgIHZhbHVlID0ganNQYWly KHN0YXRlLCBnbG9iYWxPYmplY3QoKSwgaXRlcmF0b3JWYWx1ZS52YWx1ZSgpLmtleSwgaXRlcmF0 b3JWYWx1ZS52YWx1ZSgpLnZhbHVlKTsKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFjZVNldC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9j c3MvRm9udEZhY2VTZXQuY3BwCmluZGV4IDhjNDZhZWUwNDlhNjZmYzQxYTViYTk5ZmVlNjFmMGVh NmUzOWI2ZTIuLjZmNjE1MmQ1MTNiYTE1ZjZmMTZjYjc5YjkxY2Y5YmE4OWIzZmNkZmIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFjZVNldC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvY3NzL0ZvbnRGYWNlU2V0LmNwcApAQCAtNjAsMTMgKzYwLDEyIEBAIEZvbnRGYWNlU2V0 OjpJdGVyYXRvcjo6SXRlcmF0b3IoRm9udEZhY2VTZXQmIHNldCkKIHsKIH0KIAotYm9vbCBGb250 RmFjZVNldDo6SXRlcmF0b3I6Om5leHQoRm9udEZhY2UqJiBrZXksIEZvbnRGYWNlKiYgdmFsdWUp CitPcHRpb25hbDxXVEY6OktleVZhbHVlUGFpcjxGb250RmFjZSosIEZvbnRGYWNlKj4+IEZvbnRG YWNlU2V0OjpJdGVyYXRvcjo6bmV4dCgpCiB7CiAgICAgaWYgKG1faW5kZXggPT0gbV90YXJnZXQt PnNpemUoKSkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAga2V5ID0gbV90YXJnZXQtPm1fYmFj a2luZ1ttX2luZGV4KytdLndyYXBwZXIoKTsKLSAgICB2YWx1ZSA9IGtleTsKLSAgICByZXR1cm4g ZmFsc2U7CisgICAgICAgIHJldHVybiBOdWxsb3B0OworICAgIEZvbnRGYWNlKiBpdGVtID0gbV90 YXJnZXQtPm1fYmFja2luZ1ttX2luZGV4KytdLndyYXBwZXIoKTsKKyAgICByZXR1cm4gV1RGOjpL ZXlWYWx1ZVBhaXI8Rm9udEZhY2UqLCBGb250RmFjZSo+KGl0ZW0sIGl0ZW0pOwogfQogCiBGb250 RmFjZVNldDo6UGVuZGluZ1Byb21pc2U6OlBlbmRpbmdQcm9taXNlKFByb21pc2UmJiBwcm9taXNl KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0ZvbnRGYWNlU2V0LmggYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvRm9udEZhY2VTZXQuaAppbmRleCAyOTA2ZTI3N2VhMTc0Y2ZjZTAyZjM1ODZi OGEyNjAzNDg0MTZjYzhkLi5mMTdhOGY5ZDBjY2FhNjg3YmY2OWNjNjAwZjk4ZmRiYmJiNWEzNGNi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvRm9udEZhY2VTZXQuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvRm9udEZhY2VTZXQuaApAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUg IkRPTUNvcmVFeGNlcHRpb24uaCIKICNpbmNsdWRlICJFdmVudFRhcmdldC5oIgogI2luY2x1ZGUg IkpTRE9NUHJvbWlzZS5oIgorI2luY2x1ZGUgPHd0Zi9IYXNoVHJhaXRzLmg+CiAjaW5jbHVkZSA8 d3RmL09wdGlvbmFsLmg+CiAjaW5jbHVkZSA8d3RmL1JlZi5oPgogI2luY2x1ZGUgPHd0Zi9SZWZD b3VudGVkLmg+CkBAIC03Miw3ICs3Myw3IEBAIHB1YmxpYzoKICAgICBjbGFzcyBJdGVyYXRvciB7 CiAgICAgcHVibGljOgogICAgICAgICBleHBsaWNpdCBJdGVyYXRvcihGb250RmFjZVNldCYpOwot ICAgICAgICBib29sIG5leHQoRm9udEZhY2UqJiBuZXh0S2V5LCBGb250RmFjZSomIG5leHRWYWx1 ZSk7CisgICAgICAgIE9wdGlvbmFsPFdURjo6S2V5VmFsdWVQYWlyPEZvbnRGYWNlKiwgRm9udEZh Y2UqPj4gbmV4dCgpOwogCiAgICAgcHJpdmF0ZToKICAgICAgICAgUmVmPEZvbnRGYWNlU2V0PiBt X3RhcmdldDsK 271993 2016-02-23 00:38:34 -0800 2016-02-23 01:39:28 -0800 Patch for landing bug-154531-20160223093815.patch text/plain 8610 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2OTcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzE5Y2MyMTMxNWIwNGJl ZjU4NTZiMjQwZTA2MmNlYzQ5ODNhM2FiNS4uMTlhMTJhYmNmODE1YjE5ZmJkZTFhYTU3NThlNzQ5 ZTY2MWIxZTNlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE2LTAyLTIyICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24uZnI+CisKKyAgICAgICAgUmVmYWN0 b3IgRE9NIEl0ZXJhdG9yIG5leHQgc2lnbmF0dXJlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTQ1MzEKKworICAgICAgICBSZXZpZXdlZCBieSBNeWxl cyBDLiBNYXhmaWVsZC4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisg ICAgICAgICogTW9kdWxlcy9mZXRjaC9GZXRjaEhlYWRlcnMuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RmV0Y2hIZWFkZXJzOjpJdGVyYXRvcjo6bmV4dCk6IFVzaW5nIE9wdGlvbmFsPEtleVZhbHVl UGFpcj4gdG8gcmV0dXJuIGl0ZXJhdG9yIHZhbHVlLgorICAgICAgICAqIE1vZHVsZXMvZmV0Y2gv RmV0Y2hIZWFkZXJzLmg6CisgICAgICAgICogYmluZGluZ3MvanMvSlNLZXlWYWx1ZUl0ZXJhdG9y Lmg6IFVzaW5nIE9wdGlvbmFsPEtleVZhbHVlUGFpcj4gYXMgcmV0dXJuZWQgaXRlcmF0b3IgdmFs dWUuCisgICAgICAgIChXZWJDb3JlOjprZXlWYWx1ZUl0ZXJhdG9yRm9yRWFjaCk6CisgICAgICAg IChXZWJDb3JlOjpKU0tleVZhbHVlSXRlcmF0b3I8SlNXcmFwcGVyPjo6bmV4dCk6CisgICAgICAg ICogY3NzL0ZvbnRGYWNlU2V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRGYWNlU2V0OjpJ dGVyYXRvcjo6bmV4dCk6IFVzaW5nIE9wdGlvbmFsPEtleVZhbHVlUGFpcj4gdG8gcmV0dXJuIGl0 ZXJhdG9yIHZhbHVlLgorICAgICAgICAqIGNzcy9Gb250RmFjZVNldC5oOgorCiAyMDE2LTAyLTIy ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgRm9u dCBmZWF0dXJlcyBzcGVjaWZpZWQgaW4gQGZvbnQtZmFjZSBibG9ja3MgZG9uJ3QgYXBwbHkgdG8g bG9jYWwoKSBmYW1pbGllcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRj aC9GZXRjaEhlYWRlcnMuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRjaC9GZXRjaEhl YWRlcnMuY3BwCmluZGV4IDEwOGZhN2IxZDU1YmI0NTNiZGQ2MzY0MGMxYzk5OGU5NzhiMzIxMGUu LmY0YmMxYTMyNTViNjdkZmVkMTFhNjIwY2NkMzQ5OTQ0N2U0YWQ2MjMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvZmV0Y2gvRmV0Y2hIZWFkZXJzLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2ZldGNoL0ZldGNoSGVhZGVycy5jcHAKQEAgLTE3OSwxOSArMTc5LDE2 IEBAIHZvaWQgRmV0Y2hIZWFkZXJzOjpmaWxsKGNvbnN0IEZldGNoSGVhZGVycyogaGVhZGVycykK ICAgICB9CiB9CiAKLWJvb2wgRmV0Y2hIZWFkZXJzOjpJdGVyYXRvcjo6bmV4dChKU0M6OkV4ZWNT dGF0ZSYsIFN0cmluZyYgbmV4dEtleSwgU3RyaW5nJiBuZXh0VmFsdWUpCitPcHRpb25hbDxXVEY6 OktleVZhbHVlUGFpcjxTdHJpbmcsIFN0cmluZz4+IEZldGNoSGVhZGVyczo6SXRlcmF0b3I6Om5l eHQoSlNDOjpFeGVjU3RhdGUmKQogewogICAgIHdoaWxlIChtX2N1cnJlbnRJbmRleCA8IG1fa2V5 cy5zaXplKCkpIHsKLSAgICAgICAgYXV0byYga2V5ID0gbV9rZXlzW21fY3VycmVudEluZGV4Kytd OworICAgICAgICBTdHJpbmcga2V5ID0gbV9rZXlzW21fY3VycmVudEluZGV4KytdOwogICAgICAg ICBTdHJpbmcgdmFsdWUgPSBtX2hlYWRlcnMtPm1faGVhZGVycy5nZXQoa2V5KTsKLSAgICAgICAg aWYgKCF2YWx1ZS5pc051bGwoKSkgewotICAgICAgICAgICAgbmV4dEtleSA9IGtleTsKLSAgICAg ICAgICAgIG5leHRWYWx1ZSA9IFdURk1vdmUodmFsdWUpOwotICAgICAgICAgICAgcmV0dXJuIGZh bHNlOwotICAgICAgICB9CisgICAgICAgIGlmICghdmFsdWUuaXNOdWxsKCkpCisgICAgICAgICAg ICByZXR1cm4gV1RGOjpLZXlWYWx1ZVBhaXI8U3RyaW5nLCBTdHJpbmc+KFdURk1vdmUoa2V5KSwg V1RGTW92ZSh2YWx1ZSkpOwogICAgIH0KICAgICBtX2tleXMuY2xlYXIoKTsKLSAgICByZXR1cm4g dHJ1ZTsKKyAgICByZXR1cm4gTnVsbG9wdDsKIH0KIAogRmV0Y2hIZWFkZXJzOjpJdGVyYXRvcjo6 SXRlcmF0b3IoRmV0Y2hIZWFkZXJzJiBoZWFkZXJzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9mZXRjaC9GZXRjaEhlYWRlcnMuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv ZmV0Y2gvRmV0Y2hIZWFkZXJzLmgKaW5kZXggODBkMTRlMzAzNjI1ZDQ4MzMxODUyZGU1NzBjMGQ3 MjY0YjEwMjY0OS4uMzExNjc4ZGI1MzhlOWE1ZTU2ODkzYzdkMjQ5ZTQyYTljODk4NGJiMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRjaC9GZXRjaEhlYWRlcnMuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZldGNoL0ZldGNoSGVhZGVycy5oCkBAIC0zMiw2ICsz Miw4IEBACiAjaWYgRU5BQkxFKEZFVENIX0FQSSkKIAogI2luY2x1ZGUgIkhUVFBIZWFkZXJNYXAu aCIKKyNpbmNsdWRlIDx3dGYvSGFzaFRyYWl0cy5oPgorI2luY2x1ZGUgPHd0Zi9PcHRpb25hbC5o PgogCiBuYW1lc3BhY2UgSlNDIHsKIGNsYXNzIEV4ZWNTdGF0ZTsKQEAgLTY5LDcgKzcxLDcgQEAg cHVibGljOgogICAgIGNsYXNzIEl0ZXJhdG9yIHsKICAgICBwdWJsaWM6CiAgICAgICAgIGV4cGxp Y2l0IEl0ZXJhdG9yKEZldGNoSGVhZGVycyYpOwotICAgICAgICBib29sIG5leHQoSlNDOjpFeGVj U3RhdGUmLCBTdHJpbmcmIG5leHRLZXksIFN0cmluZyYgbmV4dFZhbHVlKTsKKyAgICAgICAgT3B0 aW9uYWw8V1RGOjpLZXlWYWx1ZVBhaXI8U3RyaW5nLCBTdHJpbmc+PiBuZXh0KEpTQzo6RXhlY1N0 YXRlJik7CiAKICAgICBwcml2YXRlOgogICAgICAgICBSZWY8RmV0Y2hIZWFkZXJzPiBtX2hlYWRl cnM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0tleVZhbHVlSXRl cmF0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTS2V5VmFsdWVJdGVyYXRvci5o CmluZGV4IGM1Zjg0YWMyMmZjYWRjMDRlYzQxZTJjZDIxZTE2NjM5ZWQ3MzJmZDIuLjYyMjcyZjUx ZDU0Zjg1MGJmNjliMzI0OWVhYThkYjQ1MTc3OTVjYjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL0pTS2V5VmFsdWVJdGVyYXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL0pTS2V5VmFsdWVJdGVyYXRvci5oCkBAIC04OCw3ICs4OCw3IEBAIHB1Ymxp YzoKICAgICAgICAgICAgIEpTS2V5VmFsdWVJdGVyYXRvclByb3RvdHlwZTxKU1dyYXBwZXI+Ojpj cmVhdGVTdHJ1Y3R1cmUodm0sIGdsb2JhbE9iamVjdCwgZ2xvYmFsT2JqZWN0LT5vYmplY3RQcm90 b3R5cGUoKSkpOwogICAgIH0KIAotICAgIGJvb2wgbmV4dChKU0M6OkV4ZWNTdGF0ZSYsIEpTQzo6 SlNWYWx1ZSYpOworICAgIEpTQzo6SlNWYWx1ZSBuZXh0KEpTQzo6RXhlY1N0YXRlJik7CiAKIHBy aXZhdGU6CiAgICAgSlNLZXlWYWx1ZUl0ZXJhdG9yKEpTQzo6U3RydWN0dXJlKiBzdHJ1Y3R1cmUs IEpTV3JhcHBlciYgaXRlcmF0ZWRPYmplY3QsIEl0ZXJhdGlvbktpbmQga2luZCkKQEAgLTEyNiwx MyArMTI2LDExIEBAIEpTQzo6RW5jb2RlZEpTVmFsdWUga2V5VmFsdWVJdGVyYXRvckZvckVhY2go SlNDOjpFeGVjU3RhdGUmIHN0YXRlLCBjb25zdCBjaGFyKiBwCiAgICAgaWYgKGNhbGxUeXBlID09 IEpTQzo6Q2FsbFR5cGVOb25lKQogICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJvcigmc3Rh dGUpOwogCi0gICAgdHlwZW5hbWUgSlNXcmFwcGVyOjpJdGVyYXRvcktleSBuZXh0S2V5OwotICAg IHR5cGVuYW1lIEpTV3JhcHBlcjo6SXRlcmF0b3JWYWx1ZSBuZXh0VmFsdWU7CiAgICAgYXV0byBp dGVyYXRvciA9IHdyYXBwZXItPndyYXBwZWQoKS5jcmVhdGVJdGVyYXRvcigpOwotICAgIHdoaWxl ICghaXRlcmF0b3IubmV4dChzdGF0ZSwgbmV4dEtleSwgbmV4dFZhbHVlKSkgeworICAgIHdoaWxl IChhdXRvIHZhbHVlID0gaXRlcmF0b3IubmV4dChzdGF0ZSkpIHsKICAgICAgICAgSlNDOjpNYXJr ZWRBcmd1bWVudEJ1ZmZlciBhcmd1bWVudHM7Ci0gICAgICAgIGFyZ3VtZW50cy5hcHBlbmQodG9K Uygmc3RhdGUsIHdyYXBwZXItPmdsb2JhbE9iamVjdCgpLCBuZXh0VmFsdWUpKTsKLSAgICAgICAg YXJndW1lbnRzLmFwcGVuZCh0b0pTKCZzdGF0ZSwgd3JhcHBlci0+Z2xvYmFsT2JqZWN0KCksIG5l eHRLZXkpKTsKKyAgICAgICAgYXJndW1lbnRzLmFwcGVuZCh0b0pTKCZzdGF0ZSwgd3JhcHBlci0+ Z2xvYmFsT2JqZWN0KCksIHZhbHVlLnZhbHVlKCkudmFsdWUpKTsKKyAgICAgICAgYXJndW1lbnRz LmFwcGVuZCh0b0pTKCZzdGF0ZSwgd3JhcHBlci0+Z2xvYmFsT2JqZWN0KCksIHZhbHVlLnZhbHVl KCkua2V5KSk7CiAgICAgICAgIGFyZ3VtZW50cy5hcHBlbmQod3JhcHBlcik7CiAgICAgICAgIEpT Qzo6Y2FsbCgmc3RhdGUsIHN0YXRlLmFyZ3VtZW50KDApLCBjYWxsVHlwZSwgY2FsbERhdGEsIHdy YXBwZXIsIGFyZ3VtZW50cyk7CiAgICAgICAgIGlmIChzdGF0ZS5oYWRFeGNlcHRpb24oKSkKQEAg LTE0OSwzMyArMTQ3LDMxIEBAIHZvaWQgSlNLZXlWYWx1ZUl0ZXJhdG9yPEpTV3JhcHBlcj46OmRl c3Ryb3koSlNDZWxsKiBjZWxsKQogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBKU1dyYXBwZXI+Ci1i b29sIEpTS2V5VmFsdWVJdGVyYXRvcjxKU1dyYXBwZXI+OjpuZXh0KEpTQzo6RXhlY1N0YXRlJiBz dGF0ZSwgSlNDOjpKU1ZhbHVlJiB2YWx1ZSkKK0pTQzo6SlNWYWx1ZSBKU0tleVZhbHVlSXRlcmF0 b3I8SlNXcmFwcGVyPjo6bmV4dChKU0M6OkV4ZWNTdGF0ZSYgc3RhdGUpCiB7Ci0gICAgdHlwZW5h bWUgSlNXcmFwcGVyOjpJdGVyYXRvcktleSBuZXh0S2V5OwotICAgIHR5cGVuYW1lIEpTV3JhcHBl cjo6SXRlcmF0b3JWYWx1ZSBuZXh0VmFsdWU7Ci0gICAgaWYgKG1faXRlcmF0b3IubmV4dChzdGF0 ZSwgbmV4dEtleSwgbmV4dFZhbHVlKSkgewotICAgICAgICB2YWx1ZSA9IEpTQzo6anNVbmRlZmlu ZWQoKTsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQorICAgIGF1dG8gaXRlcmF0b3JWYWx1 ZSA9IG1faXRlcmF0b3IubmV4dChzdGF0ZSk7CisgICAgaWYgKCFpdGVyYXRvclZhbHVlKQorICAg ICAgICByZXR1cm4gY3JlYXRlSXRlcmF0b3JSZXN1bHRPYmplY3QoJnN0YXRlLCBKU0M6OmpzVW5k ZWZpbmVkKCksIHRydWUpOworCisgICAgSlNDOjpKU1ZhbHVlIHZhbHVlOwogICAgIGlmIChtX2tp bmQgPT0gSXRlcmF0aW9uS2luZDo6VmFsdWUpCi0gICAgICAgIHZhbHVlID0gdG9KUygmc3RhdGUs IGdsb2JhbE9iamVjdCgpLCBuZXh0VmFsdWUpOworICAgICAgICB2YWx1ZSA9IHRvSlMoJnN0YXRl LCBnbG9iYWxPYmplY3QoKSwgaXRlcmF0b3JWYWx1ZS52YWx1ZSgpLnZhbHVlKTsKICAgICBlbHNl IGlmIChtX2tpbmQgPT0gSXRlcmF0aW9uS2luZDo6S2V5KQotICAgICAgICB2YWx1ZSA9IHRvSlMo JnN0YXRlLCBnbG9iYWxPYmplY3QoKSwgbmV4dEtleSk7CisgICAgICAgIHZhbHVlID0gdG9KUygm c3RhdGUsIGdsb2JhbE9iamVjdCgpLCBpdGVyYXRvclZhbHVlLnZhbHVlKCkua2V5KTsKICAgICBl bHNlCi0gICAgICAgIHZhbHVlID0ganNQYWlyKHN0YXRlLCBnbG9iYWxPYmplY3QoKSwgbmV4dEtl eSwgbmV4dFZhbHVlKTsKLSAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHZhbHVlID0ganNQYWly KHN0YXRlLCBnbG9iYWxPYmplY3QoKSwgaXRlcmF0b3JWYWx1ZS52YWx1ZSgpLmtleSwgaXRlcmF0 b3JWYWx1ZS52YWx1ZSgpLnZhbHVlKTsKKworICAgIHJldHVybiBjcmVhdGVJdGVyYXRvclJlc3Vs dE9iamVjdCgmc3RhdGUsIHZhbHVlLCBmYWxzZSk7CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIEpT V3JhcHBlcj4KIEpTQzo6RW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBKU0tleVZhbHVlSXRl cmF0b3JQcm90b3R5cGU8SlNXcmFwcGVyPjo6bmV4dChKU0M6OkV4ZWNTdGF0ZSogc3RhdGUpCiB7 Ci0gICAgSlNLZXlWYWx1ZUl0ZXJhdG9yPEpTV3JhcHBlcj4qIGl0ZXJhdG9yID0gSlNDOjpqc0R5 bmFtaWNDYXN0PEpTS2V5VmFsdWVJdGVyYXRvcjxKU1dyYXBwZXI+Kj4oc3RhdGUtPnRoaXNWYWx1 ZSgpKTsKKyAgICBhdXRvIGl0ZXJhdG9yID0gSlNDOjpqc0R5bmFtaWNDYXN0PEpTS2V5VmFsdWVJ dGVyYXRvcjxKU1dyYXBwZXI+Kj4oc3RhdGUtPnRoaXNWYWx1ZSgpKTsKICAgICBpZiAoIWl0ZXJh dG9yKQogICAgICAgICByZXR1cm4gSlNDOjpKU1ZhbHVlOjplbmNvZGUodGhyb3dUeXBlRXJyb3Io c3RhdGUsIEFTQ0lJTGl0ZXJhbCgiQ2Fubm90IGNhbGwgbmV4dCgpIG9uIGEgbm9uLUl0ZXJhdG9y IG9iamVjdCIpKSk7CiAKLSAgICBKU0M6OkpTVmFsdWUgcmVzdWx0OwotICAgIGJvb2wgaXNEb25l ID0gaXRlcmF0b3ItPm5leHQoKnN0YXRlLCByZXN1bHQpOwotICAgIHJldHVybiBKU0M6OkpTVmFs dWU6OmVuY29kZShjcmVhdGVJdGVyYXRvclJlc3VsdE9iamVjdChzdGF0ZSwgcmVzdWx0LCBpc0Rv bmUpKTsKKyAgICByZXR1cm4gSlNDOjpKU1ZhbHVlOjplbmNvZGUoaXRlcmF0b3ItPm5leHQoKnN0 YXRlKSk7CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIEpTV3JhcHBlcj4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFjZVNldC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRm9u dEZhY2VTZXQuY3BwCmluZGV4IDQwOTRiMTlhOGYzNWZjMTI1N2Q4NGI2ZjEzMTQwMjZmMGIzMGRm ZjIuLmFkNWFhNDhhMTU4YTZiYjJiYjI3OGU1Y2YxNzM1ODU2YjI5NzgxNjQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFjZVNldC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv Y3NzL0ZvbnRGYWNlU2V0LmNwcApAQCAtODIsMTMgKzgyLDEyIEBAIEZvbnRGYWNlU2V0OjpJdGVy YXRvcjo6SXRlcmF0b3IoRm9udEZhY2VTZXQmIHNldCkKIHsKIH0KIAotYm9vbCBGb250RmFjZVNl dDo6SXRlcmF0b3I6Om5leHQoSlNDOjpFeGVjU3RhdGUmIGV4ZWNTdGF0ZSwgUmVmUHRyPEZvbnRG YWNlPiYga2V5LCBSZWZQdHI8Rm9udEZhY2U+JiB2YWx1ZSkKK09wdGlvbmFsPFdURjo6S2V5VmFs dWVQYWlyPFJlZlB0cjxGb250RmFjZT4sIFJlZlB0cjxGb250RmFjZT4+PiBGb250RmFjZVNldDo6 SXRlcmF0b3I6Om5leHQoSlNDOjpFeGVjU3RhdGUmIHN0YXRlKQogewogICAgIGlmIChtX2luZGV4 ID09IG1fdGFyZ2V0LT5zaXplKCkpCi0gICAgICAgIHJldHVybiB0cnVlOwotICAgIGtleSA9IG1f dGFyZ2V0LT5iYWNraW5nKClbbV9pbmRleCsrXS53cmFwcGVyKGV4ZWNTdGF0ZSk7Ci0gICAgdmFs dWUgPSBrZXk7Ci0gICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gTnVsbG9wdDsKKyAg ICBSZWZQdHI8Rm9udEZhY2U+IGl0ZW0gPSBtX3RhcmdldC0+YmFja2luZygpW21faW5kZXgrK10u d3JhcHBlcihzdGF0ZSk7CisgICAgcmV0dXJuIFdURjo6S2V5VmFsdWVQYWlyPFJlZlB0cjxGb250 RmFjZT4sIFJlZlB0cjxGb250RmFjZT4+KGl0ZW0sIGl0ZW0pOwogfQogCiBGb250RmFjZVNldDo6 UGVuZGluZ1Byb21pc2U6OlBlbmRpbmdQcm9taXNlKFByb21pc2UmJiBwcm9taXNlKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0ZvbnRGYWNlU2V0LmggYi9Tb3VyY2UvV2ViQ29yZS9j c3MvRm9udEZhY2VTZXQuaAppbmRleCAxZmRlY2I4ZmZjMmE2MzVlMzFiNWJhMmVkYmY5YWE1NTQ0 MGZiYjc5Li44NzFmM2JjZTNiZWQ5ZTk5MTliOGQyNTc3N2E2ZTk4NTc1MmU2YmQwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvRm9udEZhY2VTZXQuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9jc3MvRm9udEZhY2VTZXQuaApAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUgIkRPTUNvcmVF eGNlcHRpb24uaCIKICNpbmNsdWRlICJFdmVudFRhcmdldC5oIgogI2luY2x1ZGUgIkpTRE9NUHJv bWlzZS5oIgorI2luY2x1ZGUgPHd0Zi9IYXNoVHJhaXRzLmg+CiAjaW5jbHVkZSA8d3RmL09wdGlv bmFsLmg+CiAjaW5jbHVkZSA8d3RmL1JlZi5oPgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+ CkBAIC03NCw3ICs3NSw3IEBAIHB1YmxpYzoKICAgICBjbGFzcyBJdGVyYXRvciB7CiAgICAgcHVi bGljOgogICAgICAgICBleHBsaWNpdCBJdGVyYXRvcihGb250RmFjZVNldCYpOwotICAgICAgICBi b29sIG5leHQoSlNDOjpFeGVjU3RhdGUmLCBSZWZQdHI8Rm9udEZhY2U+JiBuZXh0S2V5LCBSZWZQ dHI8Rm9udEZhY2U+JiBuZXh0VmFsdWUpOworICAgICAgICBPcHRpb25hbDxXVEY6OktleVZhbHVl UGFpcjxSZWZQdHI8Rm9udEZhY2U+LCBSZWZQdHI8Rm9udEZhY2U+Pj4gbmV4dChKU0M6OkV4ZWNT dGF0ZSYpOwogCiAgICAgcHJpdmF0ZToKICAgICAgICAgUmVmPEZvbnRGYWNlU2V0PiBtX3Rhcmdl dDsK