137469 2014-10-06 16:09:14 -0700 [EME][Mac] Update CDMSessionMediaSourceAVFObjC to match new API provided by AVStreamSession 2014-12-16 13:28:03 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble bfulgham calvaris commit-queue eric.carlson glenn philipj sergio webkit-bug-importer oldest_to_newest 1039870 0 jer.noble 2014-10-06 16:09:14 -0700 [EME][Mac] Update CDMSessionMediaSourceAVFObjC to match new API provided by AVStreamSession 1039871 1 239365 jer.noble 2014-10-06 16:13:52 -0700 Created attachment 239365 Patch 1040086 2 239365 bfulgham 2014-10-07 12:23:06 -0700 Comment on attachment 239365 Patch r=me. This shouldn't have any Windows repercussions. 1040221 3 239459 jer.noble 2014-10-07 23:14:44 -0700 Created attachment 239459 Patch for landing 1040338 4 jer.noble 2014-10-08 10:32:43 -0700 Committed r174460: <http://trac.webkit.org/changeset/174460> 1056102 5 jer.noble 2014-12-16 13:28:03 -0800 <rdar://problem/19269048> 239365 2014-10-06 16:13:52 -0700 2014-10-07 12:23:06 -0700 Patch bug-137469-20141006161355.patch text/plain 8453 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0MzU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzJmNTY4MjVkYTg4MTcx NGMzNGQwOTRmZjIwNTM5YzMzN2Q0NjYwMS4uY2VlNmVmNmIwZmFlYWNjM2QyZmIxOTVhNWZmNjUy NzBjZGMyYWIxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE0LTEwLTA2ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtFTUVdW01hY10gVXBkYXRl IENETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakMgdG8gbWF0Y2ggbmV3IEFQSSBwcm92aWRlZCBi eSBBVlN0cmVhbVNlc3Npb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzNzQ2OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFVwZGF0ZSBvdXIgZm9yd2FyZCBkZWNsYXJhdGlvbiB0byBtYXRjaCB0aGUgQVBJ IHByb3ZpZGVkIGJ5IEFWU3RyZWFtU2Vzc2lvbi4KKyAgICAgICAgQVZTdHJlYW1TZXNzaW9uIG5v dyB0YWtlcyBhbiBlcnJvcjogcGFyYW1ldGVyIGluIGl0cyBpbml0aWFsaWF6ZXIuIEl0IGFsc28g cHJvdmlkZXMgdGhlCisgICAgICAgIHNlc3Npb25JZGVudGlmaWVyIHVzZWQgYnkgdGhlIENETSwg d2hpY2ggQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQyB3aWxsIHVzZSBhcyB0aGUKKyAgICAg ICAgdmFsdWUgb2Ygc2Vzc2lvbklkLiBIYXZpbmcgdGhpcyBpZGVudGlmaWVyIGFsbG93cyB1cyB0 byBmaXJlIGEKKyAgICAgICAgc2VjdXJlLXByb29mLW9mLWtleS1yZWxlYXNlIG1lc3NhZ2UgYWZ0 ZXIgdGhlIGNsaWVudCBjYWxscyBNZWRpYUtleVNlc3Npb24uY2xvc2UoKS4KKyAgICAgICAgQmVj YXVzZSB0aGlzIGNhbGwgd2lsbCBub3cgZ2VuZXJhdGUgbWVzc2FnZXMsIHdoaWNoIGhhdmUgdG8g YmUgcmVzcG9uZGVkIHRvIGluIG9yZGVyCisgICAgICAgIHRvIHJlbW92ZSB0aG9zZSBwcm9vZnMg ZnJvbSBzdG9yYWdlLCBkbyBub3QgY2xlYXIgdGhlIENETVNlc3Npb24gZnJvbSBNZWRpYUtleVNl c3Npb24KKyAgICAgICAgYWZ0ZXIgY2FsbGluZyBjbG9zZSgpLgorCisgICAgICAgICogTW9kdWxl cy9lbmNyeXB0ZWRtZWRpYS9NZWRpYUtleVNlc3Npb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFLZXlTZXNzaW9uOjp+TWVkaWFLZXlTZXNzaW9uKToKKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhS2V5U2Vzc2lvbjo6Y2xvc2UpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFLZXlTZXNzaW9u OjpzZXRFcnJvcik6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYUtleVNlc3Npb246 OnNlc3Npb25JZCk6IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3Vu ZGF0aW9uL29iamMvQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQy5tbToKKyAgICAgICAgKFdl YkNvcmU6OkNETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakM6OkNETVNlc3Npb25NZWRpYVNvdXJj ZUFWRk9iakMpOgorICAgICAgICAoV2ViQ29yZTo6Q0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2Jq Qzo6cmVsZWFzZUtleXMpOgorICAgICAgICAoV2ViQ29yZTo6Q0RNU2Vzc2lvbk1lZGlhU291cmNl QVZGT2JqQzo6dXBkYXRlKToKKwogMjAxNC0wOS0yNSAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFw cGxlLmNvbT4KIAogICAgICAgICBbRU1FXSBQYXNzIGxvY2F0aW9uIGZvciBtZWRpYSBrZXkgc3Rv cmFnZSB0aHJvdWdoIGZyb20gV2ViS2l0L1dlYktpdDIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlhS2V5U2Vzc2lvbi5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlhS2V5U2Vzc2lvbi5jcHAKaW5kZXgg ZWU5NzdhMmVlZGU1MzcyYzVlMjNkMThlMDVkZmEyYzZlNjQ2YzVmMi4uNWE4NzU4ZjQwYTc2OTE1 YTE0YTllNmFmM2JkMmRjNWE2ODRiZjNmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9lbmNyeXB0ZWRtZWRpYS9NZWRpYUtleVNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTWVkaWFLZXlTZXNzaW9uLmNwcApAQCAtNjUsNyAr NjUsMTIgQEAgTWVkaWFLZXlTZXNzaW9uOjpNZWRpYUtleVNlc3Npb24oU2NyaXB0RXhlY3V0aW9u Q29udGV4dCogY29udGV4dCwgTWVkaWFLZXlzKiBrZXkKIAogTWVkaWFLZXlTZXNzaW9uOjp+TWVk aWFLZXlTZXNzaW9uKCkKIHsKLSAgICBjbG9zZSgpOworICAgIGlmIChtX3Nlc3Npb24pIHsKKyAg ICAgICAgbV9zZXNzaW9uLT5zZXRDbGllbnQobnVsbHB0cik7CisgICAgICAgIG1fc2Vzc2lvbiA9 IG51bGxwdHI7CisgICAgfQorCisgICAgbV9hc3luY0V2ZW50UXVldWUuY2FuY2VsQWxsRXZlbnRz KCk7CiB9CiAKIHZvaWQgTWVkaWFLZXlTZXNzaW9uOjpzZXRFcnJvcihNZWRpYUtleUVycm9yKiBl cnJvcikKQEAgLTc1LDEyICs4MCw4IEBAIHZvaWQgTWVkaWFLZXlTZXNzaW9uOjpzZXRFcnJvcihN ZWRpYUtleUVycm9yKiBlcnJvcikKIAogdm9pZCBNZWRpYUtleVNlc3Npb246OmNsb3NlKCkKIHsK LSAgICBpZiAobV9zZXNzaW9uKSB7CisgICAgaWYgKG1fc2Vzc2lvbikKICAgICAgICAgbV9zZXNz aW9uLT5yZWxlYXNlS2V5cygpOwotICAgICAgICBtX3Nlc3Npb24tPnNldENsaWVudChudWxscHRy KTsKLSAgICB9Ci0gICAgbV9zZXNzaW9uID0gbnVsbHB0cjsKLSAgICBtX2FzeW5jRXZlbnRRdWV1 ZS5jYW5jZWxBbGxFdmVudHMoKTsKIH0KIAogY29uc3QgU3RyaW5nJiBNZWRpYUtleVNlc3Npb246 OnNlc3Npb25JZCgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDLm1t IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RN U2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQy5tbQppbmRleCAwNTkxMzkxZWIwZTA1MTkwNTg3YjU3 OGQxMmNiMGZhNmIxZmEzZmZkLi4zMGMzMzZhOTkzNTY0YTVhMjY5OTE4YzQzMGFmNjNhZmFkMGVl OGViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9DRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDLm1tCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETVNlc3Npb25NZWRp YVNvdXJjZUFWRk9iakMubW0KQEAgLTU0LDEwICs1NCwxMSBAQCBTT0ZUX0xJTktfQ0xBU1NfT1BU SU9OQUwoQVZGb3VuZGF0aW9uLCBBVlN0cmVhbVNlc3Npb24pOwogQGVuZAogCiBAaW50ZXJmYWNl IEFWU3RyZWFtU2Vzc2lvbiA6IE5TT2JqZWN0Ci0tIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhBcHBJ ZGVudGlmaWVyOihOU0RhdGEgKilhcHBJZGVudGlmaWVyIHN0b3JhZ2VEaXJlY3RvcnlBdFVSTDoo TlNVUkwgKilzdG9yYWdlVVJMOworLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoQXBwSWRlbnRpZmll cjooTlNEYXRhICopYXBwSWRlbnRpZmllciBzdG9yYWdlRGlyZWN0b3J5QXRVUkw6KE5TVVJMICop c3RvcmFnZVVSTCBlcnJvcjooTlNFcnJvciAqKilvdXRFcnJvcjsKIC0gKHZvaWQpYWRkU3RyZWFt RGF0YVBhcnNlcjooQVZTdHJlYW1EYXRhUGFyc2VyICopc3RyZWFtRGF0YVBhcnNlcjsKIC0gKHZv aWQpcmVtb3ZlU3RyZWFtRGF0YVBhcnNlcjooQVZTdHJlYW1EYXRhUGFyc2VyICopc3RyZWFtRGF0 YVBhcnNlcjsKIC0gKHZvaWQpZXhwaXJlOworLSAoTlNTdHJpbmcgKilzZXNzaW9uSWRlbnRpZmll cjsKICsgKE5TQXJyYXkgKilwZW5kaW5nRXhwaXJlZFNlc3Npb25SZXBvcnRzV2l0aEFwcElkZW50 aWZpZXI6KE5TRGF0YSAqKWFwcElkZW50aWZpZXI7CiArICh2b2lkKXJlbW92ZVBlbmRpbmdFeHBp cmVkU2Vzc2lvblJlcG9ydHM6KE5TQXJyYXkgKilleHBpcmVkU2Vzc2lvblJlcG9ydHMgd2l0aEFw cElkZW50aWZpZXI6KE5TRGF0YSAqKWFwcElkZW50aWZpZXI7CiBAZW5kCkBAIC02Niw3ICs2Nyw2 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQzo6 Q0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQygpCiAgICAgOiBtX2NsaWVudChudWxscHRyKQot ICAgICwgbV9zZXNzaW9uSWQoY3JlYXRlQ2Fub25pY2FsVVVJRFN0cmluZygpKQogICAgICwgbV9t b2RlKE5vcm1hbCkKIHsKIH0KQEAgLTEwNywxNSArMTA3LDIwIEBAIFBhc3NSZWZQdHI8VWludDhB cnJheT4gQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQzo6Z2VuZXJhdGVLZXlSZXF1ZXN0KGNv bnN0IFN0CiAKIHZvaWQgQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQzo6cmVsZWFzZUtleXMo KQogewotICAgIGlmIChtX21vZGUgPT0gS2V5UmVsZWFzZSkgewotICAgICAgICBSZXRhaW5QdHI8 TlNEYXRhPiBjZXJ0aWZpY2F0ZURhdGEgPSBhZG9wdE5TKFtbTlNEYXRhIGFsbG9jXSBpbml0V2l0 aEJ5dGVzOm1fY2VydGlmaWNhdGUtPmRhdGEoKSBsZW5ndGg6bV9jZXJ0aWZpY2F0ZS0+bGVuZ3Ro KCldKTsKLSAgICAgICAgW2dldEFWU3RyZWFtU2Vzc2lvbkNsYXNzKCkgcmVtb3ZlUGVuZGluZ0V4 cGlyZWRTZXNzaW9uUmVwb3J0czpAW21fZXhwaXJlZFNlc3Npb24uZ2V0KCldIHdpdGhBcHBJZGVu dGlmaWVyOmNlcnRpZmljYXRlRGF0YS5nZXQoKV07Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0K ICAgICBpZiAobV9zdHJlYW1TZXNzaW9uKSB7CiAgICAgICAgIExPRyhNZWRpYSwgIkNETVNlc3Np b25NZWRpYVNvdXJjZUFWRk9iakM6OnJlbGVhc2VLZXlzKCVwKSAtIGV4cGlyaW5nIHN0cmVhbSBz ZXNzaW9uIiwgdGhpcyk7CiAgICAgICAgIFttX3N0cmVhbVNlc3Npb24gZXhwaXJlXTsKKworICAg ICAgICBSZXRhaW5QdHI8TlNEYXRhPiBjZXJ0aWZpY2F0ZURhdGEgPSBhZG9wdE5TKFtbTlNEYXRh IGFsbG9jXSBpbml0V2l0aEJ5dGVzOm1fY2VydGlmaWNhdGUtPmRhdGEoKSBsZW5ndGg6bV9jZXJ0 aWZpY2F0ZS0+bGVuZ3RoKCldKTsKKyAgICAgICAgTlNBcnJheSogZXhwaXJlZFNlc3Npb25zID0g W2dldEFWU3RyZWFtU2Vzc2lvbkNsYXNzKCkgcGVuZGluZ0V4cGlyZWRTZXNzaW9uUmVwb3J0c1dp dGhBcHBJZGVudGlmaWVyOmNlcnRpZmljYXRlRGF0YS5nZXQoKV07CisgICAgICAgIGZvciAoTlNE YXRhKiBleHBpcmVkU2Vzc2lvbkRhdGEgaW4gZXhwaXJlZFNlc3Npb25zKSB7CisgICAgICAgICAg ICBOU0RpY3Rpb25hcnkgKmV4cGlyZWRTZXNzaW9uID0gW05TUHJvcGVydHlMaXN0U2VyaWFsaXph dGlvbiBwcm9wZXJ0eUxpc3RXaXRoRGF0YTpleHBpcmVkU2Vzc2lvbkRhdGEgb3B0aW9uczprQ0ZQ cm9wZXJ0eUxpc3RJbW11dGFibGUgZm9ybWF0Om51bGxwdHIgZXJyb3I6bnVsbHB0cl07CisgICAg ICAgICAgICBpZiAoW2V4cGlyZWRTZXNzaW9uIG9iamVjdEZvcktleTptX3Nlc3Npb25JZF0pIHsK KyAgICAgICAgICAgICAgICBtX2V4cGlyZWRTZXNzaW9uID0gZXhwaXJlZFNlc3Npb25EYXRhOwor ICAgICAgICAgICAgICAgIG1fY2xpZW50LT5zZW5kTWVzc2FnZShVaW50OEFycmF5OjpjcmVhdGUo c3RhdGljX2Nhc3Q8Y29uc3QgdWludDhfdCo+KFttX2V4cGlyZWRTZXNzaW9uIGJ5dGVzXSksIFtt X2V4cGlyZWRTZXNzaW9uIGxlbmd0aF0pLmdldCgpLCBlbXB0eVN0cmluZygpKTsKKyAgICAgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQogICAgIH0KIH0KIApAQCAt MTUwLDYgKzE1NSwxNyBAQCBib29sIENETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakM6OnVwZGF0 ZShVaW50OEFycmF5KiBrZXksIFJlZlB0cjxVaW50OEFycmF5PiYgbgogICAgICAgICBtX2NlcnRp ZmljYXRlID0ga2V5OwogICAgIH0KIAorICAgIGlmIChpc0VxdWFsKGtleSwgImFja25vd2xlZGdl ZCIpKSB7CisgICAgICAgIGlmICghbV9leHBpcmVkU2Vzc2lvbikgeworICAgICAgICAgICAgZXJy b3JDb2RlID0gTWVkaWFQbGF5ZXI6OkludmFsaWRQbGF5ZXJTdGF0ZTsKKyAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICAgICAgfQorCisgICAgICAgIFJldGFpblB0cjxOU0RhdGE+IGNlcnRp ZmljYXRlRGF0YSA9IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQnl0ZXM6bV9jZXJ0 aWZpY2F0ZS0+ZGF0YSgpIGxlbmd0aDptX2NlcnRpZmljYXRlLT5sZW5ndGgoKV0pOworICAgICAg ICBbZ2V0QVZTdHJlYW1TZXNzaW9uQ2xhc3MoKSByZW1vdmVQZW5kaW5nRXhwaXJlZFNlc3Npb25S ZXBvcnRzOkBbbV9leHBpcmVkU2Vzc2lvbi5nZXQoKV0gd2l0aEFwcElkZW50aWZpZXI6Y2VydGlm aWNhdGVEYXRhLmdldCgpXTsKKyAgICAgICAgbV9leHBpcmVkU2Vzc2lvbiA9IG51bGxwdHI7Cisg ICAgfQorCiAgICAgUmVmUHRyPFNvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDPiBwcm90ZWN0ZWRT b3VyY2VCdWZmZXI7CiAgICAgZm9yIChhdXRvJiBzb3VyY2VCdWZmZXIgOiBtX3NvdXJjZUJ1ZmZl cnMpIHsKICAgICAgICAgaWYgKHNvdXJjZUJ1ZmZlci0+cHJvdGVjdGVkVHJhY2tJRCgpICE9IC0x KSB7CkBAIC0xNjAsMTMgKzE3NiwxOSBAQCBib29sIENETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9i akM6OnVwZGF0ZShVaW50OEFycmF5KiBrZXksIFJlZlB0cjxVaW50OEFycmF5PiYgbgogCiAgICAg aWYgKHNob3VsZEdlbmVyYXRlS2V5UmVxdWVzdCkgewogICAgICAgICBSZXRhaW5QdHI8TlNEYXRh PiBjZXJ0aWZpY2F0ZURhdGEgPSBhZG9wdE5TKFtbTlNEYXRhIGFsbG9jXSBpbml0V2l0aEJ5dGVz Om1fY2VydGlmaWNhdGUtPmRhdGEoKSBsZW5ndGg6bV9jZXJ0aWZpY2F0ZS0+bGVuZ3RoKCldKTsK LSAgICAgICAgaWYgKGdldEFWU3RyZWFtU2Vzc2lvbkNsYXNzKCkpIHsKKyAgICAgICAgaWYgKGdl dEFWU3RyZWFtU2Vzc2lvbkNsYXNzKCkgJiYgW2dldEFWU3RyZWFtU2Vzc2lvbkNsYXNzKCkgcmVz cG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihpbml0V2l0aEFwcElkZW50aWZpZXI6c3RvcmFnZURp cmVjdG9yeUF0VVJMOmVycm9yOildKSB7CiAgICAgICAgICAgICBTdHJpbmcgc3RvcmFnZURpcmVj dG9yeSA9IG1fY2xpZW50LT5tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KCk7CiAgICAgICAgICAg ICBTdHJpbmcgb3JpZ2luSWRlbnRpZmllciA9IG1fY2xpZW50LT5zZWN1cml0eU9yaWdpbklkZW50 aWZpZXIoKTsKICAgICAgICAgICAgIFN0cmluZyBzdG9yYWdlUGF0aCA9IHBhdGhCeUFwcGVuZGlu Z0NvbXBvbmVudChzdG9yYWdlRGlyZWN0b3J5LCBvcmlnaW5JZGVudGlmaWVyICsgIi5tZWRpYWtl eXMiKTsKLSAgICAgICAgICAgIG1fc3RyZWFtU2Vzc2lvbiA9IGFkb3B0TlMoW1tnZXRBVlN0cmVh bVNlc3Npb25DbGFzcygpIGFsbG9jXSBpbml0V2l0aEFwcElkZW50aWZpZXI6Y2VydGlmaWNhdGVE YXRhLmdldCgpIHN0b3JhZ2VEaXJlY3RvcnlBdFVSTDpbTlNVUkwgZmlsZVVSTFdpdGhQYXRoOnN0 b3JhZ2VQYXRoXV0pOworICAgICAgICAgICAgbV9zdHJlYW1TZXNzaW9uID0gYWRvcHROUyhbW2dl dEFWU3RyZWFtU2Vzc2lvbkNsYXNzKCkgYWxsb2NdIGluaXRXaXRoQXBwSWRlbnRpZmllcjpjZXJ0 aWZpY2F0ZURhdGEuZ2V0KCkgc3RvcmFnZURpcmVjdG9yeUF0VVJMOltOU1VSTCBmaWxlVVJMV2l0 aFBhdGg6c3RvcmFnZVBhdGhdIGVycm9yOm5pbF0pOwogICAgICAgICAgICAgZm9yIChhdXRvJiBz b3VyY2VCdWZmZXIgOiBtX3NvdXJjZUJ1ZmZlcnMpCiAgICAgICAgICAgICAgICAgW21fc3RyZWFt U2Vzc2lvbiBhZGRTdHJlYW1EYXRhUGFyc2VyOnNvdXJjZUJ1ZmZlci0+cGFyc2VyKCldOworICAg ICAgICAgICAgaWYgKFttX3N0cmVhbVNlc3Npb24gcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rv cihzZXNzaW9uSWRlbnRpZmllcildKSB7CisgICAgICAgICAgICAgICAgTlNTdHJpbmcqIHNlc3Np b25JZGVudGlmaWVyU3RyaW5nID0gW21fc3RyZWFtU2Vzc2lvbiBzZXNzaW9uSWRlbnRpZmllcl07 CisgICAgICAgICAgICAgICAgaWYgKFtzZXNzaW9uSWRlbnRpZmllclN0cmluZyBpc0tpbmRPZkNs YXNzOltOU1N0cmluZyBjbGFzc11dKQorICAgICAgICAgICAgICAgICAgICBtX3Nlc3Npb25JZCA9 IHNlc3Npb25JZGVudGlmaWVyU3RyaW5nOworICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAg ICAgICAgbV9zZXNzaW9uSWQgPSBjcmVhdGVDYW5vbmljYWxVVUlEU3RyaW5nKCk7CiAgICAgICAg ICAgICBMT0coTWVkaWEsICJDRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDOjp1cGRhdGUoJXAp IC0gY3JlYXRlZCBzdHJlYW0gc2Vzc2lvbiAlcCIsIHRoaXMsIG1fc3RyZWFtU2Vzc2lvbi5nZXQo KSk7CiAgICAgICAgIH0KIAo= 239459 2014-10-07 23:14:44 -0700 2014-10-07 23:14:44 -0700 Patch for landing bug-137469-20141007231447.patch text/plain 13683 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0NDA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDUxNGE0Y2JlZmU1ZTI1 YzJmOWU3OTdkNmQxNDVhYmY1MzM5ZTNhOS4uOTA0OTJlNjdjZDFlYzY5MDVhNTlhZGI3NGViN2Vj NzBkOTYzMGNiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE0LTEwLTA3ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtFTUVdW01hY10gVXBkYXRl IENETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakMgdG8gbWF0Y2ggbmV3IEFQSSBwcm92aWRlZCBi eSBBVlN0cmVhbVNlc3Npb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzNzQ2OQorCisgICAgICAgIFJldmlld2VkIGJ5IEJyZW50IEZ1bGdoYW0uCisK KyAgICAgICAgVXBkYXRlIG91ciBmb3J3YXJkIGRlY2xhcmF0aW9uIHRvIG1hdGNoIHRoZSBBUEkg cHJvdmlkZWQgYnkgQVZTdHJlYW1TZXNzaW9uLgorICAgICAgICBBVlN0cmVhbVNlc3Npb24gbm93 IHRha2VzIGFuIGVycm9yOiBwYXJhbWV0ZXIgaW4gaXRzIGluaXRpYWxpYXplci4gSXQgYWxzbyBw cm92aWRlcyB0aGUKKyAgICAgICAgc2Vzc2lvbklkZW50aWZpZXIgdXNlZCBieSB0aGUgQ0RNLCB3 aGljaCBDRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDIHdpbGwgdXNlIGFzIHRoZQorICAgICAg ICB2YWx1ZSBvZiBzZXNzaW9uSWQuIEhhdmluZyB0aGlzIGlkZW50aWZpZXIgYWxsb3dzIHVzIHRv IGZpcmUgYQorICAgICAgICBzZWN1cmUtcHJvb2Ytb2Yta2V5LXJlbGVhc2UgbWVzc2FnZSBhZnRl ciB0aGUgY2xpZW50IGNhbGxzIE1lZGlhS2V5U2Vzc2lvbi5jbG9zZSgpLgorICAgICAgICBCZWNh dXNlIHRoaXMgY2FsbCB3aWxsIG5vdyBnZW5lcmF0ZSBtZXNzYWdlcywgd2hpY2ggaGF2ZSB0byBi ZSByZXNwb25kZWQgdG8gaW4gb3JkZXIKKyAgICAgICAgdG8gcmVtb3ZlIHRob3NlIHByb29mcyBm cm9tIHN0b3JhZ2UsIGRvIG5vdCBjbGVhciB0aGUgQ0RNU2Vzc2lvbiBmcm9tIE1lZGlhS2V5U2Vz c2lvbgorICAgICAgICBhZnRlciBjYWxsaW5nIGNsb3NlKCkuCisKKyAgICAgICAgKiBNb2R1bGVz L2VuY3J5cHRlZG1lZGlhL01lZGlhS2V5U2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYUtleVNlc3Npb246On5NZWRpYUtleVNlc3Npb24pOgorICAgICAgICAoV2ViQ29yZTo6TWVk aWFLZXlTZXNzaW9uOjpjbG9zZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUtleVNlc3Npb246 OnNldEVycm9yKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhS2V5U2Vzc2lvbjo6 c2Vzc2lvbklkKTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9DRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDLmg6CisgICAgICAgIChXZWJD b3JlOjpDRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDOjpzZXRTZXNzaW9uSWQpOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETVNlc3Npb25NZWRpYVNv dXJjZUFWRk9iakMubW06CisgICAgICAgICgtW0NETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakNM aXN0ZW5lciBpbml0V2l0aFBhcmVudDpdKToKKyAgICAgICAgKC1bQ0RNU2Vzc2lvbk1lZGlhU291 cmNlQVZGT2JqQ0xpc3RlbmVyIGludmFsaWRhdGVdKToKKyAgICAgICAgKC1bQ0RNU2Vzc2lvbk1l ZGlhU291cmNlQVZGT2JqQ0xpc3RlbmVyIG9ic2VydmVWYWx1ZUZvcktleVBhdGg6b2ZPYmplY3Q6 Y2hhbmdlOmNvbnRleHQ6XSk6CisgICAgICAgIChXZWJDb3JlOjpDRE1TZXNzaW9uTWVkaWFTb3Vy Y2VBVkZPYmpDOjpDRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDKToKKyAgICAgICAgKFdlYkNv cmU6OkNETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakM6On5DRE1TZXNzaW9uTWVkaWFTb3VyY2VB VkZPYmpDKToKKyAgICAgICAgKFdlYkNvcmU6OkNETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakM6 OnJlbGVhc2VLZXlzKToKKyAgICAgICAgKFdlYkNvcmU6OkNETVNlc3Npb25NZWRpYVNvdXJjZUFW Rk9iakM6OnVwZGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpDRE1TZXNzaW9uTWVkaWFTb3VyY2VB VkZPYmpDOjphZGRTb3VyY2VCdWZmZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q0RNU2Vzc2lvbk1l ZGlhU291cmNlQVZGT2JqQzo6cmVtb3ZlU291cmNlQnVmZmVyKToKKwogMjAxNC0xMC0wNyAgTWFy dGluIEhvY2sgIDxtaG9ja0BhcHBsZS5jb20+CiAKICAgICAgICAgRGVmZXIgcmVzb2x1dGlvbiBv ZiB2aWV3cG9ydCBzaXplLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNy eXB0ZWRtZWRpYS9NZWRpYUtleVNlc3Npb24uY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9l bmNyeXB0ZWRtZWRpYS9NZWRpYUtleVNlc3Npb24uY3BwCmluZGV4IDIzMjdjMWM3OTFlZDllZjg2 YTcyYjk5MjkwNzdjMzUwMzdkNDcxNTUuLmY1Mzc2Y2YwNzBmOGM1NGJhMjhjZTNjN2ZmOTFjYmZl MTkzMmQyMDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVk aWEvTWVkaWFLZXlTZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5 cHRlZG1lZGlhL01lZGlhS2V5U2Vzc2lvbi5jcHAKQEAgLTU5LDcgKzU5LDEyIEBAIE1lZGlhS2V5 U2Vzc2lvbjo6TWVkaWFLZXlTZXNzaW9uKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQs IE1lZGlhS2V5cyoga2V5CiAKIE1lZGlhS2V5U2Vzc2lvbjo6fk1lZGlhS2V5U2Vzc2lvbigpCiB7 Ci0gICAgY2xvc2UoKTsKKyAgICBpZiAobV9zZXNzaW9uKSB7CisgICAgICAgIG1fc2Vzc2lvbi0+ c2V0Q2xpZW50KG51bGxwdHIpOworICAgICAgICBtX3Nlc3Npb24gPSBudWxscHRyOworICAgIH0K KworICAgIG1fYXN5bmNFdmVudFF1ZXVlLmNhbmNlbEFsbEV2ZW50cygpOwogfQogCiB2b2lkIE1l ZGlhS2V5U2Vzc2lvbjo6c2V0RXJyb3IoTWVkaWFLZXlFcnJvciogZXJyb3IpCkBAIC02OSwxMiAr NzQsOCBAQCB2b2lkIE1lZGlhS2V5U2Vzc2lvbjo6c2V0RXJyb3IoTWVkaWFLZXlFcnJvciogZXJy b3IpCiAKIHZvaWQgTWVkaWFLZXlTZXNzaW9uOjpjbG9zZSgpCiB7Ci0gICAgaWYgKG1fc2Vzc2lv bikgeworICAgIGlmIChtX3Nlc3Npb24pCiAgICAgICAgIG1fc2Vzc2lvbi0+cmVsZWFzZUtleXMo KTsKLSAgICAgICAgbV9zZXNzaW9uLT5zZXRDbGllbnQobnVsbHB0cik7Ci0gICAgfQotICAgIG1f c2Vzc2lvbiA9IG51bGxwdHI7Ci0gICAgbV9hc3luY0V2ZW50UXVldWUuY2FuY2VsQWxsRXZlbnRz KCk7CiB9CiAKIGNvbnN0IFN0cmluZyYgTWVkaWFLZXlTZXNzaW9uOjpzZXNzaW9uSWQoKSBjb25z dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL29iamMvQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQy5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNU2Vzc2lvbk1lZGlhU291cmNl QVZGT2JqQy5oCmluZGV4IGExMWEyYWJlZDA0ODIyZGE3NzgzMjk5ZmY2NDczZWJhZjI4ZTZkMzUu LjdjMTc0MDI1MzM4YTBlYzljZGZjYTRiMjRmNTA3ODRiY2FjMGNjMGIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETVNlc3Np b25NZWRpYVNvdXJjZUFWRk9iakMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDLmgKQEAg LTM0LDYgKzM0LDcgQEAKICNpZiBFTkFCTEUoRU5DUllQVEVEX01FRElBX1YyKSAmJiBFTkFCTEUo TUVESUFfU09VUkNFKQogCiBPQkpDX0NMQVNTIEFWU3RyZWFtU2Vzc2lvbjsKK09CSkNfQ0xBU1Mg Q0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQ0xpc3RlbmVyOwogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKQEAgLTU1LDYgKzU2LDggQEAgcHVibGljOgogICAgIHZvaWQgYWRkU291cmNlQnVmZmVy KFNvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDKik7CiAgICAgdm9pZCByZW1vdmVTb3VyY2VCdWZm ZXIoU291cmNlQnVmZmVyUHJpdmF0ZUFWRk9iakMqKTsKIAorICAgIHZvaWQgc2V0U2Vzc2lvbklk KGNvbnN0IFN0cmluZyYgc2Vzc2lvbklkKSB7IG1fc2Vzc2lvbklkID0gc2Vzc2lvbklkOyB9CisK IHByb3RlY3RlZDoKICAgICBQYXNzUmVmUHRyPFVpbnQ4QXJyYXk+IGdlbmVyYXRlS2V5UmVsZWFz ZU1lc3NhZ2UodW5zaWduZWQgc2hvcnQmIGVycm9yQ29kZSwgdW5zaWduZWQgbG9uZyYgc3lzdGVt Q29kZSk7CiAKQEAgLTY0LDYgKzY3LDcgQEAgcHJvdGVjdGVkOgogICAgIFJlZlB0cjxVaW50OEFy cmF5PiBtX2luaXREYXRhOwogICAgIFJlZlB0cjxVaW50OEFycmF5PiBtX2NlcnRpZmljYXRlOwog ICAgIFJldGFpblB0cjxOU0RhdGE+IG1fZXhwaXJlZFNlc3Npb247CisgICAgUmV0YWluUHRyPENE TVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakNMaXN0ZW5lcj4gbV9kYXRhUGFyc2VyTGlzdGVuZXI7 CiAgICAgU3RyaW5nIG1fc2Vzc2lvbklkOwogICAgIGVudW0geyBOb3JtYWwsIEtleVJlbGVhc2Ug fSBtX21vZGU7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQy5tbSBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETVNlc3Np b25NZWRpYVNvdXJjZUFWRk9iakMubW0KaW5kZXggZjBjN2UzOWM3NzBhNmUzNzIxZDBlZTQyODI3 YWM2ZmI2ODFhNjA0Mi4uNGQ4MmEzMmIyMDdiNzQ3ZjYxNTNmMzM2ODJiZjE5MzZhMGM5ZTBhZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9u L29iamMvQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQy5tbQorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1TZXNzaW9uTWVkaWFTb3Vy Y2VBVkZPYmpDLm1tCkBAIC01MSwxMCArNTEsMTEgQEAgU09GVF9MSU5LX0NMQVNTX09QVElPTkFM KEFWRm91bmRhdGlvbiwgQVZTdHJlYW1TZXNzaW9uKTsKIC0gKHZvaWQpcHJvY2Vzc0NvbnRlbnRL ZXlSZXNwb25zZUVycm9yOihOU0Vycm9yICopZXJyb3IgZm9yVHJhY2tJRDooQ01QZXJzaXN0ZW50 VHJhY2tJRCl0cmFja0lEOwogLSAodm9pZClyZW5ld0V4cGlyaW5nQ29udGVudEtleVJlc3BvbnNl RGF0YUZvclRyYWNrSUQ6KENNUGVyc2lzdGVudFRyYWNrSUQpdHJhY2tJRDsKIC0gKE5TRGF0YSAq KXN0cmVhbWluZ0NvbnRlbnRLZXlSZXF1ZXN0RGF0YUZvckFwcDooTlNEYXRhICopYXBwSWRlbnRp ZmllciBjb250ZW50SWRlbnRpZmllcjooTlNEYXRhICopY29udGVudElkZW50aWZpZXIgdHJhY2tJ RDooQ01QZXJzaXN0ZW50VHJhY2tJRCl0cmFja0lEIG9wdGlvbnM6KE5TRGljdGlvbmFyeSAqKW9w dGlvbnMgZXJyb3I6KE5TRXJyb3IgKiopb3V0RXJyb3I7CistIChOU0RhdGEgKilzZXNzaW9uSWRl bnRpZmllcjsKIEBlbmQKIAogQGludGVyZmFjZSBBVlN0cmVhbVNlc3Npb24gOiBOU09iamVjdAot LSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoQXBwSWRlbnRpZmllcjooTlNEYXRhICopYXBwSWRlbnRp ZmllciBzdG9yYWdlRGlyZWN0b3J5QXRVUkw6KE5TVVJMICopc3RvcmFnZVVSTDsKKy0gKGluc3Rh bmNldHlwZSlpbml0V2l0aEFwcElkZW50aWZpZXI6KE5TRGF0YSAqKWFwcElkZW50aWZpZXIgc3Rv cmFnZURpcmVjdG9yeUF0VVJMOihOU1VSTCAqKXN0b3JhZ2VVUkwgZXJyb3I6KE5TRXJyb3IgKiop b3V0RXJyb3I7CiAtICh2b2lkKWFkZFN0cmVhbURhdGFQYXJzZXI6KEFWU3RyZWFtRGF0YVBhcnNl ciAqKXN0cmVhbURhdGFQYXJzZXI7CiAtICh2b2lkKXJlbW92ZVN0cmVhbURhdGFQYXJzZXI6KEFW U3RyZWFtRGF0YVBhcnNlciAqKXN0cmVhbURhdGFQYXJzZXI7CiAtICh2b2lkKWV4cGlyZTsKQEAg LTYyLDIyICs2Myw2MCBAQCBTT0ZUX0xJTktfQ0xBU1NfT1BUSU9OQUwoQVZGb3VuZGF0aW9uLCBB VlN0cmVhbVNlc3Npb24pOwogKyAodm9pZClyZW1vdmVQZW5kaW5nRXhwaXJlZFNlc3Npb25SZXBv cnRzOihOU0FycmF5ICopZXhwaXJlZFNlc3Npb25SZXBvcnRzIHdpdGhBcHBJZGVudGlmaWVyOihO U0RhdGEgKilhcHBJZGVudGlmaWVyOwogQGVuZAogCitAaW50ZXJmYWNlIENETVNlc3Npb25NZWRp YVNvdXJjZUFWRk9iakNMaXN0ZW5lciA6IE5TT2JqZWN0IHsKKyAgICBXZWJDb3JlOjpDRE1TZXNz aW9uTWVkaWFTb3VyY2VBVkZPYmpDICptX3BhcmVudDsKK30KK0BlbmQKKworQGltcGxlbWVudGF0 aW9uIENETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakNMaXN0ZW5lcgorLSAoaWQpaW5pdFdpdGhQ YXJlbnQ6KFdlYkNvcmU6OkNETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakMgKilwYXJlbnQKK3sK KyAgICBpZiAoKHNlbGYgPSBbc3VwZXIgaW5pdF0pKQorICAgICAgICBtX3BhcmVudCA9IHBhcmVu dDsKKyAgICByZXR1cm4gc2VsZjsKK30KKworLSAodm9pZClpbnZhbGlkYXRlCit7CisgICAgbV9w YXJlbnQgPSBudWxscHRyOworfQorCistICh2b2lkKW9ic2VydmVWYWx1ZUZvcktleVBhdGg6KE5T U3RyaW5nICopa2V5UGF0aCBvZk9iamVjdDooaWQpb2JqZWN0IGNoYW5nZTooTlNEaWN0aW9uYXJ5 ICopY2hhbmdlIGNvbnRleHQ6KHZvaWQqKWNvbnRleHQKK3sKKyAgICBVTlVTRURfUEFSQU0oY2hh bmdlKTsKKyAgICBVTlVTRURfUEFSQU0oY29udGV4dCk7CisKKyAgICBpZiAoW2tleVBhdGggaXNF cXVhbDpAInNlc3Npb25JZGVudGlmaWVyIl0pIHsKKyAgICAgICAgUmV0YWluUHRyPE5TU3RyaW5n PiBzZXNzaW9uSWRlbnRpZmllclN0cmluZyA9IGFkb3B0TlMoW1tOU1N0cmluZyBhbGxvY10gaW5p dFdpdGhEYXRhOltvYmplY3Qgc2Vzc2lvbklkZW50aWZpZXJdIGVuY29kaW5nOihOU1VURjhTdHJp bmdFbmNvZGluZyldKTsKKyAgICAgICAgaWYgKG1fcGFyZW50KQorICAgICAgICAgICAgbV9wYXJl bnQtPnNldFNlc3Npb25JZChzZXNzaW9uSWRlbnRpZmllclN0cmluZy5nZXQoKSk7CisgICAgICAg IHJldHVybjsKKyAgICB9CisKKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKK30KK0BlbmQKKwog bmFtZXNwYWNlIFdlYkNvcmUgewogCiBDRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDOjpDRE1T ZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDKCkKICAgICA6IG1fY2xpZW50KG51bGxwdHIpCi0gICAg LCBtX3Nlc3Npb25JZChjcmVhdGVDYW5vbmljYWxVVUlEU3RyaW5nKCkpCisgICAgLCBtX2RhdGFQ YXJzZXJMaXN0ZW5lcihhZG9wdE5TKFtbQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQ0xpc3Rl bmVyIGFsbG9jXSBpbml0V2l0aFBhcmVudDp0aGlzXSkpCiAgICAgLCBtX21vZGUoTm9ybWFsKQog ewogfQogCiBDRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDOjp+Q0RNU2Vzc2lvbk1lZGlhU291 cmNlQVZGT2JqQygpCiB7Ci0gICAgaWYgKG1fc3RyZWFtU2Vzc2lvbikgewotICAgICAgICBmb3Ig KGF1dG8mIHNvdXJjZUJ1ZmZlciA6IG1fc291cmNlQnVmZmVycykKKyAgICBmb3IgKGF1dG8mIHNv dXJjZUJ1ZmZlciA6IG1fc291cmNlQnVmZmVycykgeworICAgICAgICBpZiAobV9zdHJlYW1TZXNz aW9uKQogICAgICAgICAgICAgW21fc3RyZWFtU2Vzc2lvbiByZW1vdmVTdHJlYW1EYXRhUGFyc2Vy OnNvdXJjZUJ1ZmZlci0+cGFyc2VyKCldOwotICAgICAgICBtX3N0cmVhbVNlc3Npb24gPSBuaWw7 CisKKyAgICAgICAgW3NvdXJjZUJ1ZmZlci0+cGFyc2VyKCkgcmVtb3ZlT2JzZXJ2ZXI6bV9kYXRh UGFyc2VyTGlzdGVuZXIuZ2V0KCkgZm9yS2V5UGF0aDpAInNlc3Npb25JZGVudGlmaWVyIiBjb250 ZXh0Om51bGxwdHJdOwogICAgIH0KKworICAgIG1fc3RyZWFtU2Vzc2lvbiA9IG5pbDsKKyAgICBb bV9kYXRhUGFyc2VyTGlzdGVuZXIgaW52YWxpZGF0ZV07CiB9CiAKIFBhc3NSZWZQdHI8VWludDhB cnJheT4gQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQzo6Z2VuZXJhdGVLZXlSZXF1ZXN0KGNv bnN0IFN0cmluZyYgbWltZVR5cGUsIFVpbnQ4QXJyYXkqIGluaXREYXRhLCBTdHJpbmcmIGRlc3Rp bmF0aW9uVVJMLCB1bnNpZ25lZCBzaG9ydCYgZXJyb3JDb2RlLCB1bnNpZ25lZCBsb25nJiBzeXN0 ZW1Db2RlKQpAQCAtMTA3LDE1ICsxNDYsMjAgQEAgUGFzc1JlZlB0cjxVaW50OEFycmF5PiBDRE1T ZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDOjpnZW5lcmF0ZUtleVJlcXVlc3QoY29uc3QgU3QKIAog dm9pZCBDRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDOjpyZWxlYXNlS2V5cygpCiB7Ci0gICAg aWYgKG1fbW9kZSA9PSBLZXlSZWxlYXNlKSB7Ci0gICAgICAgIFJldGFpblB0cjxOU0RhdGE+IGNl cnRpZmljYXRlRGF0YSA9IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQnl0ZXM6bV9j ZXJ0aWZpY2F0ZS0+ZGF0YSgpIGxlbmd0aDptX2NlcnRpZmljYXRlLT5sZW5ndGgoKV0pOwotICAg ICAgICBbZ2V0QVZTdHJlYW1TZXNzaW9uQ2xhc3MoKSByZW1vdmVQZW5kaW5nRXhwaXJlZFNlc3Np b25SZXBvcnRzOkBbbV9leHBpcmVkU2Vzc2lvbi5nZXQoKV0gd2l0aEFwcElkZW50aWZpZXI6Y2Vy dGlmaWNhdGVEYXRhLmdldCgpXTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQogICAgIGlmICht X3N0cmVhbVNlc3Npb24pIHsKICAgICAgICAgTE9HKE1lZGlhLCAiQ0RNU2Vzc2lvbk1lZGlhU291 cmNlQVZGT2JqQzo6cmVsZWFzZUtleXMoJXApIC0gZXhwaXJpbmcgc3RyZWFtIHNlc3Npb24iLCB0 aGlzKTsKICAgICAgICAgW21fc3RyZWFtU2Vzc2lvbiBleHBpcmVdOworCisgICAgICAgIFJldGFp blB0cjxOU0RhdGE+IGNlcnRpZmljYXRlRGF0YSA9IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGlu aXRXaXRoQnl0ZXM6bV9jZXJ0aWZpY2F0ZS0+ZGF0YSgpIGxlbmd0aDptX2NlcnRpZmljYXRlLT5s ZW5ndGgoKV0pOworICAgICAgICBOU0FycmF5KiBleHBpcmVkU2Vzc2lvbnMgPSBbZ2V0QVZTdHJl YW1TZXNzaW9uQ2xhc3MoKSBwZW5kaW5nRXhwaXJlZFNlc3Npb25SZXBvcnRzV2l0aEFwcElkZW50 aWZpZXI6Y2VydGlmaWNhdGVEYXRhLmdldCgpXTsKKyAgICAgICAgZm9yIChOU0RhdGEqIGV4cGly ZWRTZXNzaW9uRGF0YSBpbiBleHBpcmVkU2Vzc2lvbnMpIHsKKyAgICAgICAgICAgIE5TRGljdGlv bmFyeSAqZXhwaXJlZFNlc3Npb24gPSBbTlNQcm9wZXJ0eUxpc3RTZXJpYWxpemF0aW9uIHByb3Bl cnR5TGlzdFdpdGhEYXRhOmV4cGlyZWRTZXNzaW9uRGF0YSBvcHRpb25zOmtDRlByb3BlcnR5TGlz dEltbXV0YWJsZSBmb3JtYXQ6bnVsbHB0ciBlcnJvcjpudWxscHRyXTsKKyAgICAgICAgICAgIGlm IChbZXhwaXJlZFNlc3Npb24gb2JqZWN0Rm9yS2V5Om1fc2Vzc2lvbklkXSkgeworICAgICAgICAg ICAgICAgIG1fZXhwaXJlZFNlc3Npb24gPSBleHBpcmVkU2Vzc2lvbkRhdGE7CisgICAgICAgICAg ICAgICAgbV9jbGllbnQtPnNlbmRNZXNzYWdlKFVpbnQ4QXJyYXk6OmNyZWF0ZShzdGF0aWNfY2Fz dDxjb25zdCB1aW50OF90Kj4oW21fZXhwaXJlZFNlc3Npb24gYnl0ZXNdKSwgW21fZXhwaXJlZFNl c3Npb24gbGVuZ3RoXSkuZ2V0KCksIGVtcHR5U3RyaW5nKCkpOworICAgICAgICAgICAgICAgIGJy ZWFrOworICAgICAgICAgICAgfQorICAgICAgICB9CiAgICAgfQogfQogCkBAIC0xNjMsNiArMjA3 LDE3IEBAIGJvb2wgQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQzo6dXBkYXRlKFVpbnQ4QXJy YXkqIGtleSwgUmVmUHRyPFVpbnQ4QXJyYXk+JiBuCiAgICAgICAgIG1fY2VydGlmaWNhdGUgPSBr ZXk7CiAgICAgfQogCisgICAgaWYgKGlzRXF1YWwoa2V5LCAiYWNrbm93bGVkZ2VkIikpIHsKKyAg ICAgICAgaWYgKCFtX2V4cGlyZWRTZXNzaW9uKSB7CisgICAgICAgICAgICBlcnJvckNvZGUgPSBN ZWRpYVBsYXllcjo6SW52YWxpZFBsYXllclN0YXRlOworICAgICAgICAgICAgcmV0dXJuIGZhbHNl OworICAgICAgICB9CisKKyAgICAgICAgUmV0YWluUHRyPE5TRGF0YT4gY2VydGlmaWNhdGVEYXRh ID0gYWRvcHROUyhbW05TRGF0YSBhbGxvY10gaW5pdFdpdGhCeXRlczptX2NlcnRpZmljYXRlLT5k YXRhKCkgbGVuZ3RoOm1fY2VydGlmaWNhdGUtPmxlbmd0aCgpXSk7CisgICAgICAgIFtnZXRBVlN0 cmVhbVNlc3Npb25DbGFzcygpIHJlbW92ZVBlbmRpbmdFeHBpcmVkU2Vzc2lvblJlcG9ydHM6QFtt X2V4cGlyZWRTZXNzaW9uLmdldCgpXSB3aXRoQXBwSWRlbnRpZmllcjpjZXJ0aWZpY2F0ZURhdGEu Z2V0KCldOworICAgICAgICBtX2V4cGlyZWRTZXNzaW9uID0gbnVsbHB0cjsKKyAgICB9CisKICAg ICBSZWZQdHI8U291cmNlQnVmZmVyUHJpdmF0ZUFWRk9iakM+IHByb3RlY3RlZFNvdXJjZUJ1ZmZl cjsKICAgICBmb3IgKGF1dG8mIHNvdXJjZUJ1ZmZlciA6IG1fc291cmNlQnVmZmVycykgewogICAg ICAgICBpZiAoc291cmNlQnVmZmVyLT5wcm90ZWN0ZWRUcmFja0lEKCkgIT0gLTEpIHsKQEAgLTE3 Myw4ICsyMjgsOCBAQCBib29sIENETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakM6OnVwZGF0ZShV aW50OEFycmF5KiBrZXksIFJlZlB0cjxVaW50OEFycmF5PiYgbgogCiAgICAgaWYgKHNob3VsZEdl bmVyYXRlS2V5UmVxdWVzdCkgewogICAgICAgICBSZXRhaW5QdHI8TlNEYXRhPiBjZXJ0aWZpY2F0 ZURhdGEgPSBhZG9wdE5TKFtbTlNEYXRhIGFsbG9jXSBpbml0V2l0aEJ5dGVzOm1fY2VydGlmaWNh dGUtPmRhdGEoKSBsZW5ndGg6bV9jZXJ0aWZpY2F0ZS0+bGVuZ3RoKCldKTsKLSAgICAgICAgaWYg KGdldEFWU3RyZWFtU2Vzc2lvbkNsYXNzKCkpIHsKLSAgICAgICAgICAgIG1fc3RyZWFtU2Vzc2lv biA9IGFkb3B0TlMoW1tnZXRBVlN0cmVhbVNlc3Npb25DbGFzcygpIGFsbG9jXSBpbml0V2l0aEFw cElkZW50aWZpZXI6Y2VydGlmaWNhdGVEYXRhLmdldCgpIHN0b3JhZ2VEaXJlY3RvcnlBdFVSTDpb TlNVUkwgZmlsZVVSTFdpdGhQYXRoOnNlc3Npb25TdG9yYWdlRGlyZWN0b3J5KCldXSk7CisgICAg ICAgIGlmIChnZXRBVlN0cmVhbVNlc3Npb25DbGFzcygpICYmIFtnZXRBVlN0cmVhbVNlc3Npb25D bGFzcygpIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoaW5pdFdpdGhBcHBJZGVudGlmaWVy OnN0b3JhZ2VEaXJlY3RvcnlBdFVSTDplcnJvcjopXSkgeworICAgICAgICAgICAgbV9zdHJlYW1T ZXNzaW9uID0gYWRvcHROUyhbW2dldEFWU3RyZWFtU2Vzc2lvbkNsYXNzKCkgYWxsb2NdIGluaXRX aXRoQXBwSWRlbnRpZmllcjpjZXJ0aWZpY2F0ZURhdGEuZ2V0KCkgc3RvcmFnZURpcmVjdG9yeUF0 VVJMOltOU1VSTCBmaWxlVVJMV2l0aFBhdGg6c2Vzc2lvblN0b3JhZ2VEaXJlY3RvcnkoKV0gZXJy b3I6bmlsXSk7CiAgICAgICAgICAgICBmb3IgKGF1dG8mIHNvdXJjZUJ1ZmZlciA6IG1fc291cmNl QnVmZmVycykKICAgICAgICAgICAgICAgICBbbV9zdHJlYW1TZXNzaW9uIGFkZFN0cmVhbURhdGFQ YXJzZXI6c291cmNlQnVmZmVyLT5wYXJzZXIoKV07CiAgICAgICAgICAgICBMT0coTWVkaWEsICJD RE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDOjp1cGRhdGUoJXApIC0gY3JlYXRlZCBzdHJlYW0g c2Vzc2lvbiAlcCIsIHRoaXMsIG1fc3RyZWFtU2Vzc2lvbi5nZXQoKSk7CkBAIC0xOTEsNiArMjQ2 LDEyIEBAIGJvb2wgQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQzo6dXBkYXRlKFVpbnQ4QXJy YXkqIGtleSwgUmVmUHRyPFVpbnQ4QXJyYXk+JiBuCiAgICAgICAgIE5TRXJyb3IqIGVycm9yID0g bmlsOwogICAgICAgICBSZXRhaW5QdHI8TlNEYXRhPiByZXF1ZXN0ID0gW3Byb3RlY3RlZFNvdXJj ZUJ1ZmZlci0+cGFyc2VyKCkgc3RyZWFtaW5nQ29udGVudEtleVJlcXVlc3REYXRhRm9yQXBwOmNl cnRpZmljYXRlRGF0YS5nZXQoKSBjb250ZW50SWRlbnRpZmllcjppbml0RGF0YS5nZXQoKSB0cmFj a0lEOnByb3RlY3RlZFNvdXJjZUJ1ZmZlci0+cHJvdGVjdGVkVHJhY2tJRCgpIG9wdGlvbnM6bmls IGVycm9yOiZlcnJvcl07CiAKKyAgICAgICAgaWYgKFtwcm90ZWN0ZWRTb3VyY2VCdWZmZXItPnBh cnNlcigpIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Ioc2Vzc2lvbklkZW50aWZpZXIpXSkg eworICAgICAgICAgICAgUmV0YWluUHRyPE5TU3RyaW5nPiBzZXNzaW9uSWRlbnRpZmllclN0cmlu ZyA9IGFkb3B0TlMoW1tOU1N0cmluZyBhbGxvY10gaW5pdFdpdGhEYXRhOltwcm90ZWN0ZWRTb3Vy Y2VCdWZmZXItPnBhcnNlcigpIHNlc3Npb25JZGVudGlmaWVyXSBlbmNvZGluZzooTlNVVEY4U3Ry aW5nRW5jb2RpbmcpXSk7CisgICAgICAgICAgICBtX3Nlc3Npb25JZCA9IHNlc3Npb25JZGVudGlm aWVyU3RyaW5nLmdldCgpOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIG1fc2Vzc2lvbklk ID0gY3JlYXRlQ2Fub25pY2FsVVVJRFN0cmluZygpOworCiAgICAgICAgIGlmIChlcnJvcikgewog ICAgICAgICAgICAgTE9HKE1lZGlhLCAiQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQzo6dXBk YXRlKCVwKSAtIGVycm9yOiVAIiwgdGhpcywgW2Vycm9yIGRlc2NyaXB0aW9uXSk7CiAgICAgICAg ICAgICBlcnJvckNvZGUgPSBNZWRpYVBsYXllcjo6SW52YWxpZFBsYXllclN0YXRlOwpAQCAtMjM4 LDYgKzI5OSw5IEBAIHZvaWQgQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQzo6YWRkU291cmNl QnVmZmVyKFNvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDKiBzCiAKICAgICBpZiAobV9zdHJlYW1T ZXNzaW9uKQogICAgICAgICBbbV9zdHJlYW1TZXNzaW9uIGFkZFN0cmVhbURhdGFQYXJzZXI6c291 cmNlQnVmZmVyLT5wYXJzZXIoKV07CisKKworICAgIFtzb3VyY2VCdWZmZXItPnBhcnNlcigpIGFk ZE9ic2VydmVyOm1fZGF0YVBhcnNlckxpc3RlbmVyLmdldCgpIGZvcktleVBhdGg6QCJzZXNzaW9u SWRlbnRpZmllciIgb3B0aW9uczowIGNvbnRleHQ6bnVsbHB0cl07CiB9CiAKIHZvaWQgQ0RNU2Vz c2lvbk1lZGlhU291cmNlQVZGT2JqQzo6cmVtb3ZlU291cmNlQnVmZmVyKFNvdXJjZUJ1ZmZlclBy aXZhdGVBVkZPYmpDKiBzb3VyY2VCdWZmZXIpCkBAIC0yNTAsNiArMzE0LDggQEAgdm9pZCBDRE1T ZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDOjpyZW1vdmVTb3VyY2VCdWZmZXIoU291cmNlQnVmZmVy UHJpdmF0ZUFWRk9iakMKIAogICAgIHNvdXJjZUJ1ZmZlci0+dW5yZWdpc3RlckZvckVycm9yTm90 aWZpY2F0aW9ucyh0aGlzKTsKICAgICBtX3NvdXJjZUJ1ZmZlcnMucmVtb3ZlKG1fc291cmNlQnVm ZmVycy5maW5kKHNvdXJjZUJ1ZmZlcikpOworCisgICAgW3NvdXJjZUJ1ZmZlci0+cGFyc2VyKCkg cmVtb3ZlT2JzZXJ2ZXI6bV9kYXRhUGFyc2VyTGlzdGVuZXIuZ2V0KCkgZm9yS2V5UGF0aDpAInNl c3Npb25JZGVudGlmaWVyIiBjb250ZXh0Om51bGxwdHJdOwogfQogCiBQYXNzUmVmUHRyPFVpbnQ4 QXJyYXk+IENETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakM6OmdlbmVyYXRlS2V5UmVsZWFzZU1l c3NhZ2UodW5zaWduZWQgc2hvcnQmIGVycm9yQ29kZSwgdW5zaWduZWQgbG9uZyYgc3lzdGVtQ29k ZSkK