128559 2014-02-10 15:36:22 -0800 [EME][Mac] Move the implementation of CDMPrivateAVFoundation back into MediaPlayerPrivateAVFoundationObjC. 2014-02-11 13:46:01 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson glenn philipj sergio oldest_to_newest 979095 0 jer.noble 2014-02-10 15:36:22 -0800 [EME][Mac] Move the implementation of CDMPrivateAVFoundation back into MediaPlayerPrivateAVFoundationObjC. 979106 1 223758 jer.noble 2014-02-10 15:50:01 -0800 Created attachment 223758 Patch 979491 2 223758 dino 2014-02-11 10:12:00 -0800 Comment on attachment 223758 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=223758&action=review > Source/WebCore/ChangeLog:9 > + CDMPrivateAVFoundation back into it's media engine. its 979586 3 jer.noble 2014-02-11 13:46:01 -0800 Committed r163907: <http://trac.webkit.org/changeset/163907> 223758 2014-02-10 15:50:01 -0800 2014-02-11 10:12:00 -0800 Patch bug-128559-20140210155000.patch text/plain 16997 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzNjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzc5NDBiYjU2MWNlYTMz NzE1YTQ1NGZiNDEyMDhlODE5OWZlMGY0Ny4uYTU1YmFhMmFiMzUyMmRhNmE5OTVhODA1Y2MyN2Qw YzAzNWM1Y2Y1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE0LTAyLTEwICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtFTUVdW01hY10gTW92ZSB0 aGUgaW1wbGVtZW50YXRpb24gb2YgQ0RNUHJpdmF0ZUFWRm91bmRhdGlvbiBiYWNrIGludG8gTWVk aWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODU1OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRvIHByZXBhcmUgZm9yIG11bHRpcGxlIHNpbXVsdGFu ZW91cyBDRE1zIHdpdGggbXVsaXBsZSBNZWRpYVBsYXllciB0eXBlcywgbW92ZSB0aGUgaW1wbGVt ZW50YXRpb24gZm9yCisgICAgICAgIENETVByaXZhdGVBVkZvdW5kYXRpb24gYmFjayBpbnRvIGl0 J3MgbWVkaWEgZW5naW5lLgorCisgICAgICAgICogTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9DRE1Q cml2YXRlQVZGb3VuZGF0aW9uLm1tOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFLZXlFeGNlcHRp b25Ub0Vycm9yQ29kZSk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6Q0RNU2Vzc2lvbkFWRm91 bmRhdGlvbjo6Z2VuZXJhdGVLZXlSZXF1ZXN0KTogTW92ZWQgdG8gTWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uT2JqQy4KKyAgICAgICAgKFdlYkNvcmU6OkNETVNlc3Npb25BVkZvdW5kYXRp b246OnJlbGVhc2VLZXlzKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpDRE1TZXNzaW9uQVZG b3VuZGF0aW9uOjp1cGRhdGUpOiBEaXR0by4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9N ZWRpYVBsYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllcjo6Z2VuZXJhdGVL ZXlSZXF1ZXN0KTogQWRkZWQsIHBhc3MgdGhyb3VnaCB0byBNZWRpYVBsYXllclByaXZhdGUuCisg ICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllcjo6cmVsZWFzZUtleXMpOiBEaXR0by4KKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyOjp1cGRhdGUpOiBEaXR0by4KKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L01lZGlhUGxheWVyUHJpdmF0ZS5oOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2 YXRlSW50ZXJmYWNlOjpnZW5lcmF0ZUtleVJlcXVlc3QpOiBBZGRlZC4KKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUludGVyZmFjZTo6cmVsZWFzZUtleXMpOiBEaXR0by4KKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUludGVyZmFjZTo6dXBkYXRlKTogRGl0 dG8uCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQ bGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMu bW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpD OjpnZW5lcmF0ZUtleVJlcXVlc3QpOiBNb3ZlZCBmcm9tIENETVNlc3Npb25BVkZvdW5kYXRpb24u CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpy ZWxlYXNlS2V5cyk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uT2JqQzo6dXBkYXRlKTogRGl0dG8uCisKIDIwMTQtMDItMDcgIEplciBOb2Js ZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXgg Zm9yIDMyLWJpdCBpT1MuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5 cHRlZG1lZGlhL0NETVByaXZhdGVBVkZvdW5kYXRpb24ubW0gYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2VuY3J5cHRlZG1lZGlhL0NETVByaXZhdGVBVkZvdW5kYXRpb24ubW0KaW5kZXggNTlkYjVj ZDRmM2Y4MGI1ODdlMjI0ZmYyMTk2NDVkMWJhNGNlMTUzMy4uY2JmY2I4ZDExYzVmYTZkNGJhZWQ3 ZDBjN2NiYzk2ZWQzNDMxOWY4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9l bmNyeXB0ZWRtZWRpYS9DRE1Qcml2YXRlQVZGb3VuZGF0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvQ0RNUHJpdmF0ZUFWRm91bmRhdGlvbi5tbQpAQCAt OTAsNiArOTAsMjEgQEAgQ0RNU2Vzc2lvbkFWRm91bmRhdGlvbjo6Q0RNU2Vzc2lvbkFWRm91bmRh dGlvbihDRE1Qcml2YXRlQVZGb3VuZGF0aW9uKiBwYXJlbnQpCiB7CiB9CiAKK3N0YXRpYyB1bnNp Z25lZCBzaG9ydCBNZWRpYUtleUV4Y2VwdGlvblRvRXJyb3JDb2RlKE1lZGlhUGxheWVyOjpNZWRp YUtleUV4Y2VwdGlvbiBlcnJvcikKK3sKKyAgICBzd2l0Y2ggKGVycm9yKSB7CisgICAgY2FzZSBN ZWRpYVBsYXllcjo6Tm9FcnJvcjoKKyAgICAgICAgcmV0dXJuIDA7CisgICAgY2FzZSBNZWRpYVBs YXllcjo6SW52YWxpZFBsYXllclN0YXRlOgorICAgICAgICByZXR1cm4gSU5WQUxJRF9TVEFURV9F UlI7CisgICAgY2FzZSBNZWRpYVBsYXllcjo6S2V5U3lzdGVtTm90U3VwcG9ydGVkOgorICAgICAg ICByZXR1cm4gTk9UX1NVUFBPUlRFRF9FUlI7CisgICAgZGVmYXVsdDoKKyAgICAgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7CisgICAgICAgIHJldHVybiAwOworICAgIH0KK30KKwogUGFzc1JlZlB0 cjxVaW50OEFycmF5PiBDRE1TZXNzaW9uQVZGb3VuZGF0aW9uOjpnZW5lcmF0ZUtleVJlcXVlc3Qo Y29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgVWludDhBcnJheSogaW5pdERhdGEsIFN0cmluZyYgZGVz dGluYXRpb25VUkwsIHVuc2lnbmVkIHNob3J0JiBlcnJvckNvZGUsIHVuc2lnbmVkIGxvbmcmIHN5 c3RlbUNvZGUpCiB7CiAgICAgVU5VU0VEX1BBUkFNKG1pbWVUeXBlKTsKQEAgLTk3LDQ4ICsxMTIs MjQgQEAgUGFzc1JlZlB0cjxVaW50OEFycmF5PiBDRE1TZXNzaW9uQVZGb3VuZGF0aW9uOjpnZW5l cmF0ZUtleVJlcXVlc3QoY29uc3QgU3RyaW5nJgogICAgIE1lZGlhUGxheWVyKiBtZWRpYVBsYXll ciA9IG1fcGFyZW50LT5jZG0oKS0+bWVkaWFQbGF5ZXIoKTsKICAgICBpZiAoIW1lZGlhUGxheWVy KSB7CiAgICAgICAgIGVycm9yQ29kZSA9IE5PVF9TVVBQT1JURURfRVJSOwotICAgICAgICByZXR1 cm4gMDsKLSAgICB9Ci0KLSAgICBTdHJpbmcga2V5VVJJOwotICAgIFN0cmluZyBrZXlJRDsKLSAg ICBSZWZQdHI8VWludDhBcnJheT4gY2VydGlmaWNhdGU7Ci0gICAgaWYgKCFNZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25PYmpDOjpleHRyYWN0S2V5VVJJS2V5SURBbmRDZXJ0aWZpY2F0ZUZy b21Jbml0RGF0YShpbml0RGF0YSwga2V5VVJJLCBrZXlJRCwgY2VydGlmaWNhdGUpKSB7Ci0gICAg ICAgIGVycm9yQ29kZSA9IElOVkFMSURfU1RBVEVfRVJSOwotICAgICAgICByZXR1cm4gMDsKLSAg ICB9Ci0KLSAgICBtX3JlcXVlc3QgPSBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpD Ojp0YWtlUmVxdWVzdEZvclBsYXllckFuZEtleVVSSShtZWRpYVBsYXllciwga2V5VVJJKTsKLSAg ICBpZiAoIW1fcmVxdWVzdCkgewotICAgICAgICBlcnJvckNvZGUgPSBJTlZBTElEX1NUQVRFX0VS UjsKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIAog ICAgIG1fc2Vzc2lvbklkID0gY3JlYXRlQ2Fub25pY2FsVVVJRFN0cmluZygpOwogCi0gICAgUmV0 YWluUHRyPE5TRGF0YT4gY2VydGlmaWNhdGVEYXRhID0gYWRvcHROUyhbW05TRGF0YSBhbGxvY10g aW5pdFdpdGhCeXRlczpjZXJ0aWZpY2F0ZS0+YmFzZUFkZHJlc3MoKSBsZW5ndGg6Y2VydGlmaWNh dGUtPmJ5dGVMZW5ndGgoKV0pOwotICAgIE5TU3RyaW5nKiBhc3NldFN0ciA9IGtleUlEOwotICAg IFJldGFpblB0cjxOU0RhdGE+IGFzc2V0SUQgPSBbTlNEYXRhIGRhdGFXaXRoQnl0ZXM6IFthc3Nl dFN0ciBjU3RyaW5nVXNpbmdFbmNvZGluZzpOU1VURjhTdHJpbmdFbmNvZGluZ10gbGVuZ3RoOlth c3NldFN0ciBsZW5ndGhPZkJ5dGVzVXNpbmdFbmNvZGluZzpOU1VURjhTdHJpbmdFbmNvZGluZ11d OwotICAgIE5TRXJyb3IqIGVycm9yID0gMDsKLSAgICBSZXRhaW5QdHI8TlNEYXRhPiBrZXlSZXF1 ZXN0ID0gW21fcmVxdWVzdC5nZXQoKSBzdHJlYW1pbmdDb250ZW50S2V5UmVxdWVzdERhdGFGb3JB cHA6Y2VydGlmaWNhdGVEYXRhLmdldCgpIGNvbnRlbnRJZGVudGlmaWVyOmFzc2V0SUQuZ2V0KCkg b3B0aW9uczpuaWwgZXJyb3I6JmVycm9yXTsKLQotICAgIGlmICgha2V5UmVxdWVzdCkgewotICAg ICAgICBOU0Vycm9yKiB1bmRlcmx5aW5nRXJyb3IgPSBbW2Vycm9yIHVzZXJJbmZvXSBvYmplY3RG b3JLZXk6TlNVbmRlcmx5aW5nRXJyb3JLZXldOwotICAgICAgICBlcnJvckNvZGUgPSBDRE06OkRv bWFpbkVycm9yOwotICAgICAgICBzeXN0ZW1Db2RlID0gW3VuZGVybHlpbmdFcnJvciBjb2RlXTsK LSAgICAgICAgcmV0dXJuIDA7Ci0gICAgfQotCi0gICAgZXJyb3JDb2RlID0gMDsKLSAgICBzeXN0 ZW1Db2RlID0gMDsKLSAgICBkZXN0aW5hdGlvblVSTCA9IFN0cmluZygpOwotCi0gICAgUmVmUHRy PEFycmF5QnVmZmVyPiBrZXlSZXF1ZXN0QnVmZmVyID0gQXJyYXlCdWZmZXI6OmNyZWF0ZShba2V5 UmVxdWVzdC5nZXQoKSBieXRlc10sIFtrZXlSZXF1ZXN0LmdldCgpIGxlbmd0aF0pOwotICAgIHJl dHVybiBVaW50OEFycmF5OjpjcmVhdGUoa2V5UmVxdWVzdEJ1ZmZlciwgMCwga2V5UmVxdWVzdEJ1 ZmZlci0+Ynl0ZUxlbmd0aCgpKTsKKyAgICBNZWRpYVBsYXllcjo6TWVkaWFLZXlFeGNlcHRpb24g ZXJyb3I7CisgICAgUmVmUHRyPFVpbnQ4QXJyYXk+IHJlcXVlc3QgPSBtZWRpYVBsYXllci0+Z2Vu ZXJhdGVLZXlSZXF1ZXN0KG1fc2Vzc2lvbklkLCBtaW1lVHlwZSwgaW5pdERhdGEsIGRlc3RpbmF0 aW9uVVJMLCBlcnJvciwgc3lzdGVtQ29kZSk7CisgICAgZXJyb3JDb2RlID0gTWVkaWFLZXlFeGNl cHRpb25Ub0Vycm9yQ29kZShlcnJvcik7CisgICAgcmV0dXJuIHJlcXVlc3Q7CiB9CiAKIHZvaWQg Q0RNU2Vzc2lvbkFWRm91bmRhdGlvbjo6cmVsZWFzZUtleXMoKQogeworICAgIE1lZGlhUGxheWVy KiBtZWRpYVBsYXllciA9IG1fcGFyZW50LT5jZG0oKS0+bWVkaWFQbGF5ZXIoKTsKKyAgICBpZiAo IW1lZGlhUGxheWVyKQorICAgICAgICByZXR1cm47CisKKyAgICBtZWRpYVBsYXllci0+cmVsZWFz ZUtleXMobV9zZXNzaW9uSWQpOwogfQogCiBib29sIENETVNlc3Npb25BVkZvdW5kYXRpb246OnVw ZGF0ZShVaW50OEFycmF5KiBrZXksIFJlZlB0cjxVaW50OEFycmF5PiYgbmV4dE1lc3NhZ2UsIHVu c2lnbmVkIHNob3J0JiBlcnJvckNvZGUsIHVuc2lnbmVkIGxvbmcmIHN5c3RlbUNvZGUpCkBAIC0x NDYsMTUgKzEzNywxNiBAQCBib29sIENETVNlc3Npb25BVkZvdW5kYXRpb246OnVwZGF0ZShVaW50 OEFycmF5KiBrZXksIFJlZlB0cjxVaW50OEFycmF5PiYgbmV4dE1lcwogICAgIGlmICgha2V5KQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBSZXRhaW5QdHI8TlNEYXRhPiBrZXlEYXRhID0g YWRvcHROUyhbW05TRGF0YSBhbGxvY10gaW5pdFdpdGhCeXRlczprZXktPmJhc2VBZGRyZXNzKCkg bGVuZ3RoOmtleS0+Ynl0ZUxlbmd0aCgpXSk7Ci0gICAgW1ttX3JlcXVlc3QuZ2V0KCkgZGF0YVJl cXVlc3RdIHJlc3BvbmRXaXRoRGF0YTprZXlEYXRhLmdldCgpXTsKLSAgICBbbV9yZXF1ZXN0Lmdl dCgpIGZpbmlzaExvYWRpbmddOwotICAgIGVycm9yQ29kZSA9IDA7Ci0gICAgc3lzdGVtQ29kZSA9 IDA7Ci0gICAgbmV4dE1lc3NhZ2UgPSBudWxscHRyOwotICAgIG1fcmVxdWVzdCA9IG51bGxwdHI7 CisgICAgTWVkaWFQbGF5ZXIqIG1lZGlhUGxheWVyID0gbV9wYXJlbnQtPmNkbSgpLT5tZWRpYVBs YXllcigpOworICAgIGlmICghbWVkaWFQbGF5ZXIpIHsKKyAgICAgICAgZXJyb3JDb2RlID0gTk9U X1NVUFBPUlRFRF9FUlI7CisgICAgICAgIHJldHVybiBudWxscHRyOworICAgIH0KIAotICAgIHJl dHVybiB0cnVlOworICAgIE1lZGlhUGxheWVyOjpNZWRpYUtleUV4Y2VwdGlvbiBlcnJvcjsKKyAg ICBib29sIHN1Y2NlZWRlZCA9IG1lZGlhUGxheWVyLT51cGRhdGUobV9zZXNzaW9uSWQsIGtleSwg bmV4dE1lc3NhZ2UsIGVycm9yLCBzeXN0ZW1Db2RlKTsKKyAgICBlcnJvckNvZGUgPSBNZWRpYUtl eUV4Y2VwdGlvblRvRXJyb3JDb2RlKGVycm9yKTsKKyAgICByZXR1cm4gc3VjY2VlZGVkOwogfQog CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBs YXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5j cHAKaW5kZXggZTNmNzcyNDdlNGJjZTJkODQ0MTQ1NzE5MzI1MmU1ODc2MDM0ZmZiMC4uMmNhOWM2 ZjY5OGQ1ZmQyZTAzY2VmY2YwNzE1ODY4OGI1Y2FmMDI5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcApAQCAtNTIyLDYgKzUyMiwyMyBA QCBNZWRpYVBsYXllcjo6TWVkaWFLZXlFeGNlcHRpb24gTWVkaWFQbGF5ZXI6OmNhbmNlbEtleVJl cXVlc3QoY29uc3QgU3RyaW5nJiBrZXlTeQogfQogI2VuZGlmCiAKKyNpZiBFTkFCTEUoRU5DUllQ VEVEX01FRElBX1YyKQorUGFzc1JlZlB0cjxVaW50OEFycmF5PiBNZWRpYVBsYXllcjo6Z2VuZXJh dGVLZXlSZXF1ZXN0KGNvbnN0IFN0cmluZyYgc2Vzc2lvbklELCBjb25zdCBTdHJpbmcmIG1pbWVU eXBlLCBVaW50OEFycmF5KiBpbml0RGF0YSwgU3RyaW5nJiBkZXN0aW5hdGlvblVSTCwgTWVkaWFL ZXlFeGNlcHRpb24mIGVycm9yLCB1bnNpZ25lZCBsb25nJiBzeXN0ZW1Db2RlKQoreworICAgIHJl dHVybiBtX3ByaXZhdGUtPmdlbmVyYXRlS2V5UmVxdWVzdChzZXNzaW9uSUQsIG1pbWVUeXBlLCBp bml0RGF0YSwgZGVzdGluYXRpb25VUkwsIGVycm9yLCBzeXN0ZW1Db2RlKTsKK30KKwordm9pZCBN ZWRpYVBsYXllcjo6cmVsZWFzZUtleXMoY29uc3QgU3RyaW5nJiBzZXNzaW9uSUQpCit7CisgICAg bV9wcml2YXRlLT5yZWxlYXNlS2V5cyhzZXNzaW9uSUQpOworfQorCitib29sIE1lZGlhUGxheWVy Ojp1cGRhdGUoY29uc3QgU3RyaW5nJiBzZXNzaW9uSUQsIFVpbnQ4QXJyYXkqIGtleSwgUmVmUHRy PFVpbnQ4QXJyYXk+JiBuZXh0TWVzc2FnZSwgTWVkaWFLZXlFeGNlcHRpb24mIGVycm9yLCB1bnNp Z25lZCBsb25nJiBzeXN0ZW1Db2RlKQoreworICAgIHJldHVybiBtX3ByaXZhdGUtPnVwZGF0ZShz ZXNzaW9uSUQsIGtleSwgbmV4dE1lc3NhZ2UsIGVycm9yLCBzeXN0ZW1Db2RlKTsKK30KKyNlbmRp ZgorICAgIAogZG91YmxlIE1lZGlhUGxheWVyOjpkdXJhdGlvbigpIGNvbnN0CiB7CiAgICAgcmV0 dXJuIG1fcHJpdmF0ZS0+ZHVyYXRpb25Eb3VibGUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oCmluZGV4IDQ3MTg5MWNkZjdhZjZiMjhjMmJmYmJm ZWZlZTQ5N2E2OGY5ZDgxNzkuLjM3NmFmMTU0YjQxZGNjMzkyZGQ1YjEyN2ZlMDFkZWEyMzc1Nzll ZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxh eWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIu aApAQCAtMzE1LDE2ICszMTUsMjQgQEAgcHVibGljOgogICAgIHZvaWQgcGxheSgpOwogICAgIHZv aWQgcGF1c2UoKTsKIAotI2lmIEVOQUJMRShFTkNSWVBURURfTUVESUEpCisjaWYgRU5BQkxFKEVO Q1JZUFRFRF9NRURJQSkgfHwgRU5BQkxFKEVOQ1JZUFRFRF9NRURJQV9WMikKICAgICAvLyBSZXBy ZXNlbnRzIHN5bmNocm9ub3VzIGV4Y2VwdGlvbnMgdGhhdCBjYW4gYmUgdGhyb3duIGZyb20gdGhl IEVuY3J5cHRlZCBNZWRpYSBtZXRob2RzLgogICAgIC8vIFRoaXMgaXMgZGlmZmVyZW50IGZyb20g dGhlIGFzeW5jaHJvbm91cyBNZWRpYUtleUVycm9yLgogICAgIGVudW0gTWVkaWFLZXlFeGNlcHRp b24geyBOb0Vycm9yLCBJbnZhbGlkUGxheWVyU3RhdGUsIEtleVN5c3RlbU5vdFN1cHBvcnRlZCB9 OworI2VuZGlmCiAKKyNpZiBFTkFCTEUoRU5DUllQVEVEX01FRElBKQogICAgIE1lZGlhS2V5RXhj ZXB0aW9uIGdlbmVyYXRlS2V5UmVxdWVzdChjb25zdCBTdHJpbmcmIGtleVN5c3RlbSwgY29uc3Qg dW5zaWduZWQgY2hhciogaW5pdERhdGEsIHVuc2lnbmVkIGluaXREYXRhTGVuZ3RoKTsKICAgICBN ZWRpYUtleUV4Y2VwdGlvbiBhZGRLZXkoY29uc3QgU3RyaW5nJiBrZXlTeXN0ZW0sIGNvbnN0IHVu c2lnbmVkIGNoYXIqIGtleSwgdW5zaWduZWQga2V5TGVuZ3RoLCBjb25zdCB1bnNpZ25lZCBjaGFy KiBpbml0RGF0YSwgdW5zaWduZWQgaW5pdERhdGFMZW5ndGgsIGNvbnN0IFN0cmluZyYgc2Vzc2lv bklkKTsKICAgICBNZWRpYUtleUV4Y2VwdGlvbiBjYW5jZWxLZXlSZXF1ZXN0KGNvbnN0IFN0cmlu ZyYga2V5U3lzdGVtLCBjb25zdCBTdHJpbmcmIHNlc3Npb25JZCk7CiAjZW5kaWYKIAorI2lmIEVO QUJMRShFTkNSWVBURURfTUVESUFfVjIpCisgICAgUGFzc1JlZlB0cjxVaW50OEFycmF5PiBnZW5l cmF0ZUtleVJlcXVlc3QoY29uc3QgU3RyaW5nJiBzZXNzaW9uSUQsIGNvbnN0IFN0cmluZyYgbWlt ZVR5cGUsIFVpbnQ4QXJyYXkqIGluaXREYXRhLCBTdHJpbmcmIGRlc3RpbmF0aW9uVVJMLCBNZWRp YUtleUV4Y2VwdGlvbiYgZXJyb3IsIHVuc2lnbmVkIGxvbmcmIHN5c3RlbUNvZGUpOworICAgIHZv aWQgcmVsZWFzZUtleXMoY29uc3QgU3RyaW5nJiBzZXNzaW9uSUQpOworICAgIGJvb2wgdXBkYXRl KGNvbnN0IFN0cmluZyYgc2Vzc2lvbklELCBVaW50OEFycmF5KiBrZXksIFJlZlB0cjxVaW50OEFy cmF5PiYgbmV4dE1lc3NhZ2UsIE1lZGlhS2V5RXhjZXB0aW9uJiBlcnJvciwgdW5zaWduZWQgbG9u ZyYgc3lzdGVtQ29kZSk7CisjZW5kaWYKKwogICAgIGJvb2wgcGF1c2VkKCkgY29uc3Q7CiAgICAg Ym9vbCBzZWVraW5nKCkgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL01lZGlhUGxheWVyUHJpdmF0ZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXJQcml2YXRlLmgKaW5kZXggNTUzNzg4YzM4NTI1MWE1YmEy ODcyMDE5OTk2YTE2YTA4ZjY1MTY0NS4uMTRjMWE3N2Q4ZWNhMzBlNzIwZTA0YzM4NWEwZTg0N2Y1 YTlhNmFlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVk aWFQbGF5ZXJQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv TWVkaWFQbGF5ZXJQcml2YXRlLmgKQEAgLTIwNyw2ICsyMDcsMTIgQEAgcHVibGljOgogICAgIHZp cnR1YWwgTWVkaWFQbGF5ZXI6Ok1lZGlhS2V5RXhjZXB0aW9uIGNhbmNlbEtleVJlcXVlc3QoY29u c3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJikgeyByZXR1cm4gTWVkaWFQbGF5ZXI6OktleVN5c3Rl bU5vdFN1cHBvcnRlZDsgfQogI2VuZGlmCiAKKyNpZiBFTkFCTEUoRU5DUllQVEVEX01FRElBX1Yy KQorICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxVaW50OEFycmF5PiBnZW5lcmF0ZUtleVJlcXVlc3Qo Y29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJiwgVWludDhBcnJheSosIFN0cmluZyYsIE1lZGlh UGxheWVyOjpNZWRpYUtleUV4Y2VwdGlvbiYsIHVuc2lnbmVkIGxvbmcmKSB7IHJldHVybiBudWxs cHRyOyB9CisgICAgdmlydHVhbCB2b2lkIHJlbGVhc2VLZXlzKGNvbnN0IFN0cmluZyYpIHsgfQor ICAgIHZpcnR1YWwgYm9vbCB1cGRhdGUoY29uc3QgU3RyaW5nJiwgVWludDhBcnJheSosIFJlZlB0 cjxVaW50OEFycmF5PiYsIE1lZGlhUGxheWVyOjpNZWRpYUtleUV4Y2VwdGlvbiYsIHVuc2lnbmVk IGxvbmcmKSB7IHJldHVybiBmYWxzZTsgfQorI2VuZGlmCisKICNpZiBFTkFCTEUoVklERU9fVFJB Q0spCiAgICAgdmlydHVhbCBib29sIHJlcXVpcmVzVGV4dFRyYWNrUmVwcmVzZW50YXRpb24oKSBj b25zdCB7IHJldHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgdm9pZCBzZXRUZXh0VHJhY2tSZXBy ZXNlbnRhdGlvbihUZXh0VHJhY2tSZXByZXNlbnRhdGlvbiopIHsgfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2Jq Qy5oCmluZGV4IDE4ZWQ5ZjJkZjg1ZDE4YjQ5NGMyNDgyYTMxYTIxNTg2YzJlOWY4NzcuLmM5Nzdh MDM1ZWVhYTFiZmQ1ODhkZWIyYTE1ZTVjYzI0NjM0N2Y1MmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJp dmF0ZUFWRm91bmRhdGlvbk9iakMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpD LmgKQEAgLTE5OCw2ICsxOTgsMTIgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIE1lZGlhUGxheWVy OjpNZWRpYUtleUV4Y2VwdGlvbiBjYW5jZWxLZXlSZXF1ZXN0KGNvbnN0IFN0cmluZyYsIGNvbnN0 IFN0cmluZyYpOwogI2VuZGlmCiAKKyNpZiBFTkFCTEUoRU5DUllQVEVEX01FRElBX1YyKQorICAg IFBhc3NSZWZQdHI8VWludDhBcnJheT4gZ2VuZXJhdGVLZXlSZXF1ZXN0KGNvbnN0IFN0cmluZyYg c2Vzc2lvbklkLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBVaW50OEFycmF5KiBpbml0RGF0YSwg U3RyaW5nJiBkZXN0aW5hdGlvblVSTCwgTWVkaWFQbGF5ZXI6Ok1lZGlhS2V5RXhjZXB0aW9uJiBl cnJvciwgdW5zaWduZWQgbG9uZyYgc3lzdGVtQ29kZSk7CisgICAgdm9pZCByZWxlYXNlS2V5cyhj b25zdCBTdHJpbmcmIHNlc3Npb25JZCk7CisgICAgYm9vbCB1cGRhdGUoY29uc3QgU3RyaW5nJiBz ZXNzaW9uSWQsIFVpbnQ4QXJyYXkqIGtleSwgUmVmUHRyPFVpbnQ4QXJyYXk+JiBuZXh0TWVzc2Fn ZSwgTWVkaWFQbGF5ZXI6Ok1lZGlhS2V5RXhjZXB0aW9uJiBlcnJvciwgdW5zaWduZWQgbG9uZyYg c3lzdGVtQ29kZSk7CisjZW5kaWYKKwogICAgIHZpcnR1YWwgU3RyaW5nIGxhbmd1YWdlT2ZQcmlt YXJ5QXVkaW9UcmFjaygpIGNvbnN0IG92ZXJyaWRlOwogCiAjaWYgSEFWRShBVkZPVU5EQVRJT05f TUVESUFfU0VMRUNUSU9OX0dST1VQKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0 aW9uT2JqQy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KaW5kZXggMGNmNzgy NGViN2FkOTYxZmM5ZDI4MTI1NTY4ZmE4OWYyNTlhY2I1ZS4uZTlmNGVlM2MwMWI1Y2YxMzNjYjQ3 YzA2MTVjMGNhOThmOGQ4NGNjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9u T2JqQy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCkBAIC0xNTk3LDE0 ICsxNTk3LDY5IEBAIE1lZGlhUGxheWVyOjpNZWRpYUtleUV4Y2VwdGlvbiBNZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjYW5jZWxLZXlSZXF1CiAjZW5kaWYKIAogI2lmIEVOQUJM RShFTkNSWVBURURfTUVESUFfVjIpCi1SZXRhaW5QdHI8QVZBc3NldFJlc291cmNlTG9hZGluZ1Jl cXVlc3Q+IE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OnRha2VSZXF1ZXN0Rm9y UGxheWVyQW5kS2V5VVJJKE1lZGlhUGxheWVyKiBwbGF5ZXIsIGNvbnN0IFN0cmluZyYga2V5VVJJ KQorUGFzc1JlZlB0cjxVaW50OEFycmF5PiBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25P YmpDOjpnZW5lcmF0ZUtleVJlcXVlc3QoY29uc3QgU3RyaW5nJiBzZXNzaW9uSWQsIGNvbnN0IFN0 cmluZyYgbWltZVR5cGUsIFVpbnQ4QXJyYXkqIGluaXREYXRhLCBTdHJpbmcmIGRlc3RpbmF0aW9u VVJMLCBNZWRpYVBsYXllcjo6TWVkaWFLZXlFeGNlcHRpb24mIGVycm9yLCB1bnNpZ25lZCBsb25n JiBzeXN0ZW1Db2RlKQogewotICAgIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMq IF90aGlzID0gcGxheWVyVG9Qcml2YXRlTWFwKCkuZ2V0KHBsYXllcik7Ci0gICAgaWYgKCFfdGhp cykKLSAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgVU5VU0VEX1BBUkFNKG1pbWVUeXBlKTsK IAotICAgIHJldHVybiBfdGhpcy0+bV9rZXlVUklUb1JlcXVlc3RNYXAudGFrZShrZXlVUkkpOwor ICAgIFN0cmluZyBrZXlVUkk7CisgICAgU3RyaW5nIGtleUlEOworICAgIFJlZlB0cjxVaW50OEFy cmF5PiBjZXJ0aWZpY2F0ZTsKKyAgICBpZiAoIU1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlv bk9iakM6OmV4dHJhY3RLZXlVUklLZXlJREFuZENlcnRpZmljYXRlRnJvbUluaXREYXRhKGluaXRE YXRhLCBrZXlVUkksIGtleUlELCBjZXJ0aWZpY2F0ZSkpIHsKKyAgICAgICAgZXJyb3IgPSBNZWRp YVBsYXllcjo6SW52YWxpZFBsYXllclN0YXRlOworICAgICAgICByZXR1cm4gMDsKKyAgICB9CisK KyAgICBSZXRhaW5QdHI8QVZBc3NldFJlc291cmNlTG9hZGluZ1JlcXVlc3Q+IHJlcXVlc3QgPSBt X2tleVVSSVRvUmVxdWVzdE1hcC50YWtlKGtleVVSSSk7CisgICAgaWYgKCFyZXF1ZXN0KSB7Cisg ICAgICAgIGVycm9yID0gTWVkaWFQbGF5ZXI6OkludmFsaWRQbGF5ZXJTdGF0ZTsKKyAgICAgICAg cmV0dXJuIDA7CisgICAgfQogCisgICAgbV9zZXNzaW9uSURUb1JlcXVlc3RNYXAuYWRkKHNlc3Np b25JZCwgcmVxdWVzdCk7CisKKyAgICBSZXRhaW5QdHI8TlNEYXRhPiBjZXJ0aWZpY2F0ZURhdGEg PSBhZG9wdE5TKFtbTlNEYXRhIGFsbG9jXSBpbml0V2l0aEJ5dGVzOmNlcnRpZmljYXRlLT5iYXNl QWRkcmVzcygpIGxlbmd0aDpjZXJ0aWZpY2F0ZS0+Ynl0ZUxlbmd0aCgpXSk7CisgICAgTlNTdHJp bmcqIGFzc2V0U3RyID0ga2V5SUQ7CisgICAgUmV0YWluUHRyPE5TRGF0YT4gYXNzZXRJRCA9IFtO U0RhdGEgZGF0YVdpdGhCeXRlczogW2Fzc2V0U3RyIGNTdHJpbmdVc2luZ0VuY29kaW5nOk5TVVRG OFN0cmluZ0VuY29kaW5nXSBsZW5ndGg6W2Fzc2V0U3RyIGxlbmd0aE9mQnl0ZXNVc2luZ0VuY29k aW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nXV07CisgICAgTlNFcnJvciogbnNFcnJvciA9IDA7Cisg ICAgUmV0YWluUHRyPE5TRGF0YT4ga2V5UmVxdWVzdCA9IFtyZXF1ZXN0IHN0cmVhbWluZ0NvbnRl bnRLZXlSZXF1ZXN0RGF0YUZvckFwcDpjZXJ0aWZpY2F0ZURhdGEuZ2V0KCkgY29udGVudElkZW50 aWZpZXI6YXNzZXRJRC5nZXQoKSBvcHRpb25zOm5pbCBlcnJvcjombnNFcnJvcl07CisKKyAgICBp ZiAoIWtleVJlcXVlc3QpIHsKKyAgICAgICAgTlNFcnJvciogdW5kZXJseWluZ0Vycm9yID0gW1tu c0Vycm9yIHVzZXJJbmZvXSBvYmplY3RGb3JLZXk6TlNVbmRlcmx5aW5nRXJyb3JLZXldOworICAg ICAgICBzeXN0ZW1Db2RlID0gW3VuZGVybHlpbmdFcnJvciBjb2RlXTsKKyAgICAgICAgcmV0dXJu IDA7CisgICAgfQorCisgICAgZXJyb3IgPSBNZWRpYVBsYXllcjo6Tm9FcnJvcjsKKyAgICBzeXN0 ZW1Db2RlID0gMDsKKyAgICBkZXN0aW5hdGlvblVSTCA9IFN0cmluZygpOworCisgICAgUmVmUHRy PEFycmF5QnVmZmVyPiBrZXlSZXF1ZXN0QnVmZmVyID0gQXJyYXlCdWZmZXI6OmNyZWF0ZShba2V5 UmVxdWVzdC5nZXQoKSBieXRlc10sIFtrZXlSZXF1ZXN0LmdldCgpIGxlbmd0aF0pOworICAgIHJl dHVybiBVaW50OEFycmF5OjpjcmVhdGUoa2V5UmVxdWVzdEJ1ZmZlciwgMCwga2V5UmVxdWVzdEJ1 ZmZlci0+Ynl0ZUxlbmd0aCgpKTsKK30KKwordm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5k YXRpb25PYmpDOjpyZWxlYXNlS2V5cyhjb25zdCBTdHJpbmcmIHNlc3Npb25JZCkKK3sKKyAgICBV TlVTRURfUEFSQU0oc2Vzc2lvbklkKTsKK30KKworYm9vbCBNZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb25PYmpDOjp1cGRhdGUoY29uc3QgU3RyaW5nJiBzZXNzaW9uSWQsIFVpbnQ4QXJyYXkq IGtleSwgUmVmUHRyPFVpbnQ4QXJyYXk+JiBuZXh0TWVzc2FnZSwgTWVkaWFQbGF5ZXI6Ok1lZGlh S2V5RXhjZXB0aW9uJiBlcnJvciwgdW5zaWduZWQgbG9uZyYgc3lzdGVtQ29kZSkKK3sKKyAgICBB U1NFUlQoa2V5KTsKKworICAgIFJldGFpblB0cjxBVkFzc2V0UmVzb3VyY2VMb2FkaW5nUmVxdWVz dD4gcmVxdWVzdCA9IG1fc2Vzc2lvbklEVG9SZXF1ZXN0TWFwLmdldChzZXNzaW9uSWQpOworICAg IGlmICghcmVxdWVzdCkgeworICAgICAgICBlcnJvciA9IE1lZGlhUGxheWVyOjpJbnZhbGlkUGxh eWVyU3RhdGU7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICBSZXRhaW5QdHI8 TlNEYXRhPiBrZXlEYXRhID0gYWRvcHROUyhbW05TRGF0YSBhbGxvY10gaW5pdFdpdGhCeXRlczpr ZXktPmJhc2VBZGRyZXNzKCkgbGVuZ3RoOmtleS0+Ynl0ZUxlbmd0aCgpXSk7CisgICAgW1tyZXF1 ZXN0IGRhdGFSZXF1ZXN0XSByZXNwb25kV2l0aERhdGE6a2V5RGF0YS5nZXQoKV07CisgICAgW3Jl cXVlc3QgZmluaXNoTG9hZGluZ107CisgICAgZXJyb3IgPSBNZWRpYVBsYXllcjo6Tm9FcnJvcjsK KyAgICBzeXN0ZW1Db2RlID0gMDsKKyAgICBuZXh0TWVzc2FnZSA9IG51bGxwdHI7CisKKyAgICBy ZXR1cm4gdHJ1ZTsKIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNv dXJjZUFWRk9iakMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5oCmluZGV4IGY1 YThiMTEzMTQwMTY2NjI3N2E3NDA0OGIxYTg5NzMxZGNlN2IzNTMuLjA4Y2MwOTc2MmUzMDIxN2Uy Mzg5YmViNTc1MmJkYTNmOWNjMTAzYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291 cmNlQVZGT2JqQy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5oCkBAIC03 Miw2ICs3MiwxMCBAQCBwdWJsaWM6CiAgICAgdm9pZCBlZmZlY3RpdmVSYXRlQ2hhbmdlZCgpOwog ICAgIHZvaWQgc2l6ZUNoYW5nZWQoKTsKIAorI2lmIEVOQUJMRShFTkNSWVBURURfTUVESUFfVjIp CisgICAgdm9pZCBrZXlOZWVkZWQoVWludDhBcnJheSopOworI2VuZGlmCisKIHByaXZhdGU6CiAg ICAgLy8gTWVkaWFQbGF5ZXJQcml2YXRlSW50ZXJmYWNlCiAgICAgdmlydHVhbCB2b2lkIGxvYWQo Y29uc3QgU3RyaW5nJiB1cmwpIG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVk aWFTb3VyY2VBVkZPYmpDLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDLm1tCmlu ZGV4IDZjNDY1Njg3ZjY5ZTcyMDQzMDAzYjUwMzY4NGJkOGI5YWRhY2M5MTUuLjI2NWU0NzRjMzQ1 YzE1ZDIyZjgzZjFkNzZkNzQ0OTM3M2ZmYWY1OGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1l ZGlhU291cmNlQVZGT2JqQy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMu bW0KQEAgLTUzNCw2ICs1MzQsMTMgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJj ZUFWRk9iakM6OnNpemVDaGFuZ2VkKCkKICAgICBtX3BsYXllci0+c2l6ZUNoYW5nZWQoKTsKIH0K IAorI2lmIEVOQUJMRShFTkNSWVBURURfTUVESUFfVjIpCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZU1lZGlhU291cmNlQVZGT2JqQzo6a2V5TmVlZGVkKFVpbnQ4QXJyYXkqIGluaXREYXRhKQorewor ICAgIG1fcGxheWVyLT5rZXlOZWVkZWQoaW5pdERhdGEpOworfQorI2VuZGlmCisKIHZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpzZXRSZWFkeVN0YXRlKE1lZGlhUGxh eWVyOjpSZWFkeVN0YXRlIHJlYWR5U3RhdGUpCiB7CiAgICAgaWYgKG1fcmVhZHlTdGF0ZSA9PSBy ZWFkeVN0YXRlKQo=