176154 2017-08-31 02:43:54 -0700 [GTK][Wayland] Crash when gdk_keymap_get_entries_for_keyval returns TRUE but n_keys=0 2017-08-31 07:07:23 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugzilla.gnome.org/show_bug.cgi?id=787069 Gtk P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply clopez oldest_to_newest 1343885 0 cgarcia 2017-08-31 02:43:54 -0700 I think this is actually a GTK+ bug (I'll file a bug report), but in Wayland gdk_keymap_get_entries_for_keyval() can return TRUE with n_keys=0. We have several places in WebKit where we just check the return value of gdk_keymap_get_entries_for_keyval() and then use the returned array to get the first position assuming it has at least one item. This has always worked in X11 because the GDK X11 backend does the right thing, but it's crashing in Wayland now. It should be fixed in GTK+ but in the meantime it's easy to workaround by also checking n_keys > 0. 1343887 1 319454 cgarcia 2017-08-31 02:47:51 -0700 Created attachment 319454 Patch 1343888 2 319455 cgarcia 2017-08-31 02:55:24 -0700 Created attachment 319455 Patch 1343920 3 cgarcia 2017-08-31 07:07:23 -0700 Committed r221419: <http://trac.webkit.org/changeset/221419> 319454 2017-08-31 02:47:51 -0700 2017-08-31 02:55:24 -0700 Patch wk-wayland-crash.diff text/plain 9131 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggYTM1NzJiNTM0OWQuLmZkOGE3ODM0MDBhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE5IEBACisyMDE3LTA4LTMxICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KKworICAgICAgICBbR1RLXVtXYXlsYW5kXSBDcmFzaCB3aGVuIGdka19rZXltYXBfZ2V0 X2VudHJpZXNfZm9yX2tleXZhbCByZXR1cm5zIFRSVUUgYnV0IG5fa2V5cz0wCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzYxNTQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBXYXlsYW5kIGdka19rZXlt YXBfZ2V0X2VudHJpZXNfZm9yX2tleXZhbCgpIGNhbiByZXR1cm4gVFJVRSB3aXRoIG5fa2V5cz0w LiBXZSBoYXZlIHNldmVyYWwgcGxhY2VzIGluIFdlYktpdAorICAgICAgICB3aGVyZSB3ZSBqdXN0 IGNoZWNrIHRoZSByZXR1cm4gdmFsdWUgb2YgZ2RrX2tleW1hcF9nZXRfZW50cmllc19mb3Jfa2V5 dmFsKCkgYW5kIHRoZW4gdXNlIHRoZSByZXR1cm5lZCBhcnJheSB0bworICAgICAgICBnZXQgdGhl IGZpcnN0IHBvc2l0aW9uIGFzc3VtaW5nIGl0IGhhcyBhdCBsZWFzdCBvbmUgaXRlbS4gVGhpcyBo YXMgYWx3YXlzIHdvcmtlZCBpbiBYMTEgYmVjYXVzZSB0aGUgR0RLIFgxMQorICAgICAgICBiYWNr ZW5kIGRvZXMgdGhlIHJpZ2h0IHRoaW5nLCBidXQgaXQncyBjcmFzaGluZyBpbiBXYXlsYW5kIG5v dy4gSXQgc2hvdWxkIGJlIGZpeGVkIGluIEdUSysgYnV0IGluIHRoZSBtZWFudGltZQorICAgICAg ICBpdCdzIGVhc3kgdG8gd29ya2Fyb3VuZCBieSBhbHNvIGNoZWNraW5nIG5fa2V5cyA+IDAuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvQXV0b21hdGlvbi9ndGsvV2ViQXV0b21hdGlvblNlc3Npb25H dGsuY3BwOgorICAgICAgICAoV2ViS2l0Ojpkb0tleVN0cm9rZUV2ZW50KToKKwogMjAxNy0wOC0z MCAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIFJFR1JF U1NJT04gKHIyMTgxNDQpIC1bV0tDb250ZW50VmlldyB0YXJnZXRGb3JBY3Rpb246d2l0aFNlbmRl cjpdIHJldHVybnMgdGhlIGNvbnRlbnQgdmlldyBmb3IgYWN0aW9ucyBpbXBsZW1lbnRlZCBvbmx5 IGJ5IHRoZSBXS1dlYlZpZXcsIGNhdXNpbmcgYSBjcmFzaApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9ndGsvV2ViQXV0b21hdGlvblNlc3Npb25HdGsuY3Bw IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9ndGsvV2ViQXV0b21hdGlvblNl c3Npb25HdGsuY3BwCmluZGV4IDBkNDIxNGEwMzMwLi5jMDY3NzFjN2VlOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9ndGsvV2ViQXV0b21hdGlvblNlc3Np b25HdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vZ3RrL1dl YkF1dG9tYXRpb25TZXNzaW9uR3RrLmNwcApAQCAtMTQ1LDcgKzE0NSw3IEBAIHN0YXRpYyB2b2lk IGRvS2V5U3Ryb2tlRXZlbnQoR2RrRXZlbnRUeXBlIHR5cGUsIEd0a1dpZGdldCogd2lkZ2V0LCB1 bnNpZ25lZCBrZXlWCiAgICAgLy8gV2hlbiBzeW50aGVzaXppbmcgYW4gZXZlbnQsIGFuIGludmFs aWQgaGFyZHdhcmVfa2V5Y29kZSB2YWx1ZSBjYW4gY2F1c2UgaXQgdG8gYmUgYmFkbHkgcHJvY2Vz c2VkIGJ5IEdUSysuCiAgICAgR1VuaXF1ZU91dFB0cjxHZGtLZXltYXBLZXk+IGtleXM7CiAgICAg aW50IGtleXNDb3VudDsKLSAgICBpZiAoZ2RrX2tleW1hcF9nZXRfZW50cmllc19mb3Jfa2V5dmFs KGdka19rZXltYXBfZ2V0X2RlZmF1bHQoKSwga2V5VmFsLCAma2V5cy5vdXRQdHIoKSwgJmtleXND b3VudCkpCisgICAgaWYgKGdka19rZXltYXBfZ2V0X2VudHJpZXNfZm9yX2tleXZhbChnZGtfa2V5 bWFwX2dldF9kZWZhdWx0KCksIGtleVZhbCwgJmtleXMub3V0UHRyKCksICZrZXlzQ291bnQpICYm IGtleXNDb3VudCkKICAgICAgICAgZXZlbnQtPmtleS5oYXJkd2FyZV9rZXljb2RlID0ga2V5cy5n ZXQoKVswXS5rZXljb2RlOwogCiAgICAgZ3RrX21haW5fZG9fZXZlbnQoZXZlbnQuZ2V0KCkpOwpk aWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGMwMDFj NzgzNWY3Li4wZDU1ODE0OTcyNyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rv b2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3LTA4LTMxICBDYXJsb3MgR2FyY2lh IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVtXYXlsYW5kXSBD cmFzaCB3aGVuIGdka19rZXltYXBfZ2V0X2VudHJpZXNfZm9yX2tleXZhbCByZXR1cm5zIFRSVUUg YnV0IG5fa2V5cz0wCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNzYxNTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBBbHNvIGNoZWNrIHRoZSBuX2tleXMgPiAwIHdoZW4gdXNpbmcgZ2RrX2tleW1hcF9nZXRf ZW50cmllc19mb3Jfa2V5dmFsKCkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdC9ndGsvSW5wdXRNZXRob2RGaWx0ZXIuY3BwOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6 VGVzdElucHV0TWV0aG9kRmlsdGVyOjpzZW5kS2V5RXZlbnRUb0ZpbHRlcik6CisgICAgICAgICog VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHdGsvVGVzdFByaW50aW5nLmNwcDogUmVtb3ZlIGR1 cGxpY2F0ZWQgY29kZSBhbmQgdXNlIFdlYlZpZXdUZXN0OjprZXlTdHJva2UgaW5zdGVhZC4KKyAg ICAgICAgKiBUZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9ndGsvV2ViVmlld1Rlc3RHdGsu Y3BwOgorICAgICAgICAoV2ViVmlld1Rlc3Q6OmtleVN0cm9rZSk6CisgICAgICAgICogVGVzdFdl YktpdEFQSS9ndGsvUGxhdGZvcm1XZWJWaWV3R3RrLmNwcDoKKyAgICAgICAgKFRlc3RXZWJLaXRB UEk6OmRvS2V5U3Ryb2tlKToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL2d0ay9FdmVudFNl bmRlclByb3h5R3RrLmNwcDoKKyAgICAgICAgKFdUUjo6RXZlbnRTZW5kZXJQcm94eTo6a2V5RG93 bik6CisKIDIwMTctMDgtMzAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEu Y29tPgogCiAgICAgICAgIFtHVEtdIEltcHJvdmUgdGhlIHdheSB1bml0IHRlc3QgYXJlIHJ1biBh bmQgdGhlIHJlc3VsdHMgcmVwb3J0ZWQKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0L2d0ay9JbnB1dE1ldGhvZEZpbHRlci5jcHAgYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdC9ndGsvSW5wdXRNZXRob2RGaWx0ZXIuY3BwCmluZGV4IDRhMGU2ODRk NmUyLi5mOTE5YjJlMjM3MCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXQvZ3RrL0lucHV0TWV0aG9kRmlsdGVyLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdC9ndGsvSW5wdXRNZXRob2RGaWx0ZXIuY3BwCkBAIC02Nyw3ICs2Nyw3IEBA IHB1YmxpYzoKIAogICAgICAgICBHVW5pcXVlT3V0UHRyPEdka0tleW1hcEtleT4ga2V5czsKICAg ICAgICAgZ2ludCBuS2V5czsKLSAgICAgICAgaWYgKGdka19rZXltYXBfZ2V0X2VudHJpZXNfZm9y X2tleXZhbChnZGtfa2V5bWFwX2dldF9kZWZhdWx0KCksIGdka0tleVZhbHVlLCAma2V5cy5vdXRQ dHIoKSwgJm5LZXlzKSkKKyAgICAgICAgaWYgKGdka19rZXltYXBfZ2V0X2VudHJpZXNfZm9yX2tl eXZhbChnZGtfa2V5bWFwX2dldF9kZWZhdWx0KCksIGdka0tleVZhbHVlLCAma2V5cy5vdXRQdHIo KSwgJm5LZXlzKSAmJiBuS2V5cykgewogICAgICAgICAgICAgZXZlbnQtPmtleS5oYXJkd2FyZV9r ZXljb2RlID0ga2V5cy5nZXQoKVswXS5rZXljb2RlOwogCiAgICAgICAgIGZpbHRlcktleUV2ZW50 KCZldmVudC0+a2V5KTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0R3RrL1Rlc3RQcmludGluZy5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dEd0ay9UZXN0UHJpbnRpbmcuY3BwCmluZGV4IDJiNTIyMTE5MmE5Li43MTBhZTljNmJjYiAxMDA2 NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHdGsvVGVzdFByaW50aW5n LmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEd0ay9UZXN0UHJpbnRp bmcuY3BwCkBAIC0zNjUsMzIgKzM2NSw2IEBAIHB1YmxpYzoKICAgICAgICAgZ19tYWluX2xvb3Bf cXVpdChtX21haW5Mb29wKTsKICAgICB9CiAKLSAgICB2b2lkIHNlbmRLZXlFdmVudCh1bnNpZ25l ZCBnZGtLZXlWYWx1ZSwgR2RrRXZlbnRUeXBlIHR5cGUsIHVuc2lnbmVkIG1vZGlmaWVycykKLSAg ICB7Ci0gICAgICAgIEdka0V2ZW50KiBldmVudCA9IGdka19ldmVudF9uZXcodHlwZSk7Ci0gICAg ICAgIGV2ZW50LT5rZXkua2V5dmFsID0gZ2RrS2V5VmFsdWU7Ci0gICAgICAgIGV2ZW50LT5rZXku c3RhdGUgPSBtb2RpZmllcnM7Ci0gICAgICAgIGV2ZW50LT5rZXkud2luZG93ID0gZ3RrX3dpZGdl dF9nZXRfd2luZG93KEdUS19XSURHRVQobV93ZWJWaWV3KSk7Ci0gICAgICAgIGV2ZW50LT5rZXku dGltZSA9IEdES19DVVJSRU5UX1RJTUU7Ci0gICAgICAgIGdfb2JqZWN0X3JlZihldmVudC0+a2V5 LndpbmRvdyk7Ci0gICAgICAgIGdka19ldmVudF9zZXRfZGV2aWNlKGV2ZW50LCBnZGtfZGV2aWNl X21hbmFnZXJfZ2V0X2NsaWVudF9wb2ludGVyKGdka19kaXNwbGF5X2dldF9kZXZpY2VfbWFuYWdl cihnZGtfZGlzcGxheV9nZXRfZGVmYXVsdCgpKSkpOwotCi0gICAgICAgIEdVbmlxdWVPdXRQdHI8 R2RrS2V5bWFwS2V5PiBrZXlzOwotICAgICAgICBnaW50IG5LZXlzOwotICAgICAgICBpZiAoZ2Rr X2tleW1hcF9nZXRfZW50cmllc19mb3Jfa2V5dmFsKGdka19rZXltYXBfZ2V0X2RlZmF1bHQoKSwg Z2RrS2V5VmFsdWUsICZrZXlzLm91dFB0cigpLCAmbktleXMpKQotICAgICAgICAgICAgZXZlbnQt PmtleS5oYXJkd2FyZV9rZXljb2RlID0ga2V5cy5nZXQoKVswXS5rZXljb2RlOwotCi0gICAgICAg IGd0a19tYWluX2RvX2V2ZW50KGV2ZW50KTsKLQotICAgICAgICBnZGtfZXZlbnRfZnJlZShldmVu dCk7Ci0gICAgfQotCi0gICAgdm9pZCBzZW5kS2V5UHJlc3NBbmRSZWxlYXNlRXZlbnQodW5zaWdu ZWQgZ2RrS2V5VmFsdWUsIHVuc2lnbmVkIG1vZGlmaWVycyA9IDApCi0gICAgewotICAgICAgICBz ZW5kS2V5RXZlbnQoZ2RrS2V5VmFsdWUsIEdES19LRVlfUFJFU1MsIG1vZGlmaWVycyk7Ci0gICAg ICAgIHNlbmRLZXlFdmVudChnZGtLZXlWYWx1ZSwgR0RLX0tFWV9SRUxFQVNFLCBtb2RpZmllcnMp OwotICAgIH0KLQogICAgIHZvaWQgY3JlYXRlV2ViS2l0UHJpbnRPcGVyYXRpb24oKQogICAgIHsK ICAgICAgICAgbV9wcmludE9wZXJhdGlvbiA9IGFkb3B0R1JlZih3ZWJraXRfcHJpbnRfb3BlcmF0 aW9uX25ldyhtX3dlYlZpZXcpKTsKQEAgLTQxMCwyMyArMzg0LDIzIEBAIHB1YmxpYzoKICAgICB2 b2lkIHN0YXJ0UHJpbnRpbmcoKQogICAgIHsKICAgICAgICAgLy8gVG8gc3RhcnQgcHJpbnRpbmcg aXQgaXMgZW5vdWdoIHRvIHByZXNzIHRoZSBSZXR1cm4ga2V5Ci0gICAgICAgIHNlbmRLZXlQcmVz c0FuZFJlbGVhc2VFdmVudChHREtfS0VZX1JldHVybik7CisgICAgICAgIGtleVN0cm9rZShHREtf S0VZX1JldHVybik7CiAgICAgfQogCiAgICAgdm9pZCBqdW1wVG9GaXJzdFByaW50ZXIoKQogICAg IHsKICAgICAgICAgLy8gSW5pdGlhbGx5IHRoZSBHdGtOb3RlYm9vayBoYXMgZm9jdXMsIHNvIHdl IGp1c3QgbmVlZCB0byBwcmVzcyB0aGUgVGFiCiAgICAgICAgIC8vIGtleSB0byBqdW1wIHRvIHRo ZSBmaXJzdCBwcmludGVyCi0gICAgICAgIHNlbmRLZXlQcmVzc0FuZFJlbGVhc2VFdmVudChHREtf S0VZX1RhYik7CisgICAgICAgIGtleVN0cm9rZShHREtfS0VZX1RhYik7CiAgICAgfQogCiAgICAg dm9pZCBqdW1wVG9DdXN0b21XaWRnZXQoKQogICAgIHsKICAgICAgICAgLy8gSnVtcCBiYWNrIHRv IHRoZSBHdGtOb3RlYm9vawotICAgICAgICBzZW5kS2V5UHJlc3NBbmRSZWxlYXNlRXZlbnQoR0RL X0tFWV9UYWIsIEdES19TSElGVF9NQVNLKTsKKyAgICAgICAga2V5U3Ryb2tlKEdES19LRVlfVGFi LCBHREtfU0hJRlRfTUFTSyk7CiAgICAgICAgIC8vIEN1c3RvbSB3aWRnZXQgaXMgb24gdGhlIHRo aXJkIHRhYgotICAgICAgICBzZW5kS2V5UHJlc3NBbmRSZWxlYXNlRXZlbnQoR0RLX0tFWV9SaWdo dCk7Ci0gICAgICAgIHNlbmRLZXlQcmVzc0FuZFJlbGVhc2VFdmVudChHREtfS0VZX1JpZ2h0KTsK KyAgICAgICAga2V5U3Ryb2tlKEdES19LRVlfUmlnaHQpOworICAgICAgICBrZXlTdHJva2UoR0RL X0tFWV9SaWdodCk7CiAgICAgfQogCiAgICAgdm9pZCBvcGVuRGlhbG9nTW92ZVRocm91Z2hJdEFu ZFdhaXRVbnRpbENsb3NlZCgpCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIv V2ViS2l0R0xpYi9ndGsvV2ViVmlld1Rlc3RHdGsuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9n bGliL1dlYktpdEdMaWIvZ3RrL1dlYlZpZXdUZXN0R3RrLmNwcAppbmRleCA4YjNkOGJhMGQ5OS4u YTEzNDFhNjg0OGQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRH TGliL2d0ay9XZWJWaWV3VGVzdEd0ay5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9nbGli L1dlYktpdEdMaWIvZ3RrL1dlYlZpZXdUZXN0R3RrLmNwcApAQCAtMTQ4LDcgKzE0OCw3IEBAIHZv aWQgV2ViVmlld1Rlc3Q6OmtleVN0cm9rZSh1bnNpZ25lZCBrZXlWYWwsIHVuc2lnbmVkIGtleU1v ZGlmaWVycykKICAgICAvLyBXaGVuIHN5bnRoZXNpemluZyBhbiBldmVudCwgYW4gaW52YWxpZCBo YXJkd2FyZV9rZXljb2RlIHZhbHVlIGNhbiBjYXVzZSBpdCB0byBiZSBiYWRseSBwcm9jZXNzZWQg YnkgR1RLKy4KICAgICBHVW5pcXVlT3V0UHRyPEdka0tleW1hcEtleT4ga2V5czsKICAgICBpbnQg a2V5c0NvdW50OwotICAgIGlmIChnZGtfa2V5bWFwX2dldF9lbnRyaWVzX2Zvcl9rZXl2YWwoZ2Rr X2tleW1hcF9nZXRfZGVmYXVsdCgpLCBrZXlWYWwsICZrZXlzLm91dFB0cigpLCAma2V5c0NvdW50 KSkKKyAgICBpZiAoZ2RrX2tleW1hcF9nZXRfZW50cmllc19mb3Jfa2V5dmFsKGdka19rZXltYXBf Z2V0X2RlZmF1bHQoKSwga2V5VmFsLCAma2V5cy5vdXRQdHIoKSwgJmtleXNDb3VudCkgJiYga2V5 c0NvdW50KQogICAgICAgICBldmVudC0+a2V5LmhhcmR3YXJlX2tleWNvZGUgPSBrZXlzLmdldCgp WzBdLmtleWNvZGU7CiAKICAgICBndGtfbWFpbl9kb19ldmVudChldmVudC5nZXQoKSk7CmRpZmYg LS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL2d0ay9QbGF0Zm9ybVdlYlZpZXdHdGsuY3BwIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9ndGsvUGxhdGZvcm1XZWJWaWV3R3RrLmNwcAppbmRleCAwZmVi MmI1NGE1Mi4uMTdjMjI2YmNmOWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ3Rr L1BsYXRmb3JtV2ViVmlld0d0ay5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9ndGsvUGxh dGZvcm1XZWJWaWV3R3RrLmNwcApAQCAtOTUsNyArOTUsNyBAQCBzdGF0aWMgdm9pZCBkb0tleVN0 cm9rZShHdGtXaWRnZXQqIHZpZXdXaWRnZXQsIHVuc2lnbmVkIGludCBrZXlWYWwpCiAgICAgLy8g V2hlbiBzeW50aGVzaXppbmcgYW4gZXZlbnQsIGFuIGludmFsaWQgaGFyZHdhcmVfa2V5Y29kZSB2 YWx1ZSBjYW4gY2F1c2UgaXQgdG8gYmUgYmFkbHkgcHJvY2Vzc2VkIGJ5IEdUSysuCiAgICAgR1Vu aXF1ZU91dFB0cjxHZGtLZXltYXBLZXk+IGtleXM7CiAgICAgaW50IGtleXNDb3VudDsKLSAgICBp ZiAoZ2RrX2tleW1hcF9nZXRfZW50cmllc19mb3Jfa2V5dmFsKGdka19rZXltYXBfZ2V0X2RlZmF1 bHQoKSwga2V5VmFsLCAma2V5cy5vdXRQdHIoKSwgJmtleXNDb3VudCkpCisgICAgaWYgKGdka19r ZXltYXBfZ2V0X2VudHJpZXNfZm9yX2tleXZhbChnZGtfa2V5bWFwX2dldF9kZWZhdWx0KCksIGtl eVZhbCwgJmtleXMub3V0UHRyKCksICZrZXlzQ291bnQpICYmIGtleXNDb3VudCkKICAgICAgICAg ZXZlbnQtPmtleS5oYXJkd2FyZV9rZXljb2RlID0ga2V5cy5nZXQoKVswXS5rZXljb2RlOwogCiAg ICAgZ3RrX21haW5fZG9fZXZlbnQoZXZlbnQuZ2V0KCkpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9ndGsvRXZlbnRTZW5kZXJQcm94eUd0ay5jcHAgYi9Ub29scy9XZWJLaXRU ZXN0UnVubmVyL2d0ay9FdmVudFNlbmRlclByb3h5R3RrLmNwcAppbmRleCA4NTA4YjcxZjNhNi4u Mzc4MTQxZDJjY2MgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvZ3RrL0V2ZW50 U2VuZGVyUHJveHlHdGsuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvZ3RrL0V2ZW50 U2VuZGVyUHJveHlHdGsuY3BwCkBAIC0zMTUsNyArMzE1LDcgQEAgdm9pZCBFdmVudFNlbmRlclBy b3h5OjprZXlEb3duKFdLU3RyaW5nUmVmIGtleVJlZiwgV0tFdmVudE1vZGlmaWVycyB3a01vZGlm aWVycywKIAogICAgIEdVbmlxdWVPdXRQdHI8R2RrS2V5bWFwS2V5PiBrZXlzOwogICAgIGdpbnQg bktleXM7Ci0gICAgaWYgKGdka19rZXltYXBfZ2V0X2VudHJpZXNfZm9yX2tleXZhbChnZGtfa2V5 bWFwX2dldF9kZWZhdWx0KCksIGdka0tleVN5bSwgJmtleXMub3V0UHRyKCksICZuS2V5cykpCisg ICAgaWYgKGdka19rZXltYXBfZ2V0X2VudHJpZXNfZm9yX2tleXZhbChnZGtfa2V5bWFwX2dldF9k ZWZhdWx0KCksIGdka0tleVN5bSwgJmtleXMub3V0UHRyKCksICZuS2V5cykgJiYgbktleXMpCiAg ICAgICAgIHByZXNzRXZlbnQtPmtleS5oYXJkd2FyZV9rZXljb2RlID0ga2V5cy5nZXQoKVswXS5r ZXljb2RlOwogCiAgICAgR2RrRXZlbnQqIHJlbGVhc2VFdmVudCA9IGdka19ldmVudF9jb3B5KHBy ZXNzRXZlbnQpOwo= 319455 2017-08-31 02:55:24 -0700 2017-08-31 07:01:36 -0700 Patch wk-wayland-crash.diff text/plain 9129 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggYTM1NzJiNTM0OWQuLmZkOGE3ODM0MDBhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE5IEBACisyMDE3LTA4LTMxICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KKworICAgICAgICBbR1RLXVtXYXlsYW5kXSBDcmFzaCB3aGVuIGdka19rZXltYXBfZ2V0 X2VudHJpZXNfZm9yX2tleXZhbCByZXR1cm5zIFRSVUUgYnV0IG5fa2V5cz0wCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzYxNTQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBXYXlsYW5kIGdka19rZXlt YXBfZ2V0X2VudHJpZXNfZm9yX2tleXZhbCgpIGNhbiByZXR1cm4gVFJVRSB3aXRoIG5fa2V5cz0w LiBXZSBoYXZlIHNldmVyYWwgcGxhY2VzIGluIFdlYktpdAorICAgICAgICB3aGVyZSB3ZSBqdXN0 IGNoZWNrIHRoZSByZXR1cm4gdmFsdWUgb2YgZ2RrX2tleW1hcF9nZXRfZW50cmllc19mb3Jfa2V5 dmFsKCkgYW5kIHRoZW4gdXNlIHRoZSByZXR1cm5lZCBhcnJheSB0bworICAgICAgICBnZXQgdGhl IGZpcnN0IHBvc2l0aW9uIGFzc3VtaW5nIGl0IGhhcyBhdCBsZWFzdCBvbmUgaXRlbS4gVGhpcyBo YXMgYWx3YXlzIHdvcmtlZCBpbiBYMTEgYmVjYXVzZSB0aGUgR0RLIFgxMQorICAgICAgICBiYWNr ZW5kIGRvZXMgdGhlIHJpZ2h0IHRoaW5nLCBidXQgaXQncyBjcmFzaGluZyBpbiBXYXlsYW5kIG5v dy4gSXQgc2hvdWxkIGJlIGZpeGVkIGluIEdUSysgYnV0IGluIHRoZSBtZWFudGltZQorICAgICAg ICBpdCdzIGVhc3kgdG8gd29ya2Fyb3VuZCBieSBhbHNvIGNoZWNraW5nIG5fa2V5cyA+IDAuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvQXV0b21hdGlvbi9ndGsvV2ViQXV0b21hdGlvblNlc3Npb25H dGsuY3BwOgorICAgICAgICAoV2ViS2l0Ojpkb0tleVN0cm9rZUV2ZW50KToKKwogMjAxNy0wOC0z MCAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIFJFR1JF U1NJT04gKHIyMTgxNDQpIC1bV0tDb250ZW50VmlldyB0YXJnZXRGb3JBY3Rpb246d2l0aFNlbmRl cjpdIHJldHVybnMgdGhlIGNvbnRlbnQgdmlldyBmb3IgYWN0aW9ucyBpbXBsZW1lbnRlZCBvbmx5 IGJ5IHRoZSBXS1dlYlZpZXcsIGNhdXNpbmcgYSBjcmFzaApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9ndGsvV2ViQXV0b21hdGlvblNlc3Npb25HdGsuY3Bw IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9ndGsvV2ViQXV0b21hdGlvblNl c3Npb25HdGsuY3BwCmluZGV4IDBkNDIxNGEwMzMwLi5jMDY3NzFjN2VlOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9ndGsvV2ViQXV0b21hdGlvblNlc3Np b25HdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vZ3RrL1dl YkF1dG9tYXRpb25TZXNzaW9uR3RrLmNwcApAQCAtMTQ1LDcgKzE0NSw3IEBAIHN0YXRpYyB2b2lk IGRvS2V5U3Ryb2tlRXZlbnQoR2RrRXZlbnRUeXBlIHR5cGUsIEd0a1dpZGdldCogd2lkZ2V0LCB1 bnNpZ25lZCBrZXlWCiAgICAgLy8gV2hlbiBzeW50aGVzaXppbmcgYW4gZXZlbnQsIGFuIGludmFs aWQgaGFyZHdhcmVfa2V5Y29kZSB2YWx1ZSBjYW4gY2F1c2UgaXQgdG8gYmUgYmFkbHkgcHJvY2Vz c2VkIGJ5IEdUSysuCiAgICAgR1VuaXF1ZU91dFB0cjxHZGtLZXltYXBLZXk+IGtleXM7CiAgICAg aW50IGtleXNDb3VudDsKLSAgICBpZiAoZ2RrX2tleW1hcF9nZXRfZW50cmllc19mb3Jfa2V5dmFs KGdka19rZXltYXBfZ2V0X2RlZmF1bHQoKSwga2V5VmFsLCAma2V5cy5vdXRQdHIoKSwgJmtleXND b3VudCkpCisgICAgaWYgKGdka19rZXltYXBfZ2V0X2VudHJpZXNfZm9yX2tleXZhbChnZGtfa2V5 bWFwX2dldF9kZWZhdWx0KCksIGtleVZhbCwgJmtleXMub3V0UHRyKCksICZrZXlzQ291bnQpICYm IGtleXNDb3VudCkKICAgICAgICAgZXZlbnQtPmtleS5oYXJkd2FyZV9rZXljb2RlID0ga2V5cy5n ZXQoKVswXS5rZXljb2RlOwogCiAgICAgZ3RrX21haW5fZG9fZXZlbnQoZXZlbnQuZ2V0KCkpOwpk aWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGMwMDFj NzgzNWY3Li4wZDU1ODE0OTcyNyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rv b2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3LTA4LTMxICBDYXJsb3MgR2FyY2lh IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVtXYXlsYW5kXSBD cmFzaCB3aGVuIGdka19rZXltYXBfZ2V0X2VudHJpZXNfZm9yX2tleXZhbCByZXR1cm5zIFRSVUUg YnV0IG5fa2V5cz0wCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNzYxNTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBBbHNvIGNoZWNrIHRoZSBuX2tleXMgPiAwIHdoZW4gdXNpbmcgZ2RrX2tleW1hcF9nZXRf ZW50cmllc19mb3Jfa2V5dmFsKCkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdC9ndGsvSW5wdXRNZXRob2RGaWx0ZXIuY3BwOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6 VGVzdElucHV0TWV0aG9kRmlsdGVyOjpzZW5kS2V5RXZlbnRUb0ZpbHRlcik6CisgICAgICAgICog VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHdGsvVGVzdFByaW50aW5nLmNwcDogUmVtb3ZlIGR1 cGxpY2F0ZWQgY29kZSBhbmQgdXNlIFdlYlZpZXdUZXN0OjprZXlTdHJva2UgaW5zdGVhZC4KKyAg ICAgICAgKiBUZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9ndGsvV2ViVmlld1Rlc3RHdGsu Y3BwOgorICAgICAgICAoV2ViVmlld1Rlc3Q6OmtleVN0cm9rZSk6CisgICAgICAgICogVGVzdFdl YktpdEFQSS9ndGsvUGxhdGZvcm1XZWJWaWV3R3RrLmNwcDoKKyAgICAgICAgKFRlc3RXZWJLaXRB UEk6OmRvS2V5U3Ryb2tlKToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL2d0ay9FdmVudFNl bmRlclByb3h5R3RrLmNwcDoKKyAgICAgICAgKFdUUjo6RXZlbnRTZW5kZXJQcm94eTo6a2V5RG93 bik6CisKIDIwMTctMDgtMzAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEu Y29tPgogCiAgICAgICAgIFtHVEtdIEltcHJvdmUgdGhlIHdheSB1bml0IHRlc3QgYXJlIHJ1biBh bmQgdGhlIHJlc3VsdHMgcmVwb3J0ZWQKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0L2d0ay9JbnB1dE1ldGhvZEZpbHRlci5jcHAgYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdC9ndGsvSW5wdXRNZXRob2RGaWx0ZXIuY3BwCmluZGV4IDRhMGU2ODRk NmUyLi4yZGU3OTBmYzYwMyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXQvZ3RrL0lucHV0TWV0aG9kRmlsdGVyLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdC9ndGsvSW5wdXRNZXRob2RGaWx0ZXIuY3BwCkBAIC02Nyw3ICs2Nyw3IEBA IHB1YmxpYzoKIAogICAgICAgICBHVW5pcXVlT3V0UHRyPEdka0tleW1hcEtleT4ga2V5czsKICAg ICAgICAgZ2ludCBuS2V5czsKLSAgICAgICAgaWYgKGdka19rZXltYXBfZ2V0X2VudHJpZXNfZm9y X2tleXZhbChnZGtfa2V5bWFwX2dldF9kZWZhdWx0KCksIGdka0tleVZhbHVlLCAma2V5cy5vdXRQ dHIoKSwgJm5LZXlzKSkKKyAgICAgICAgaWYgKGdka19rZXltYXBfZ2V0X2VudHJpZXNfZm9yX2tl eXZhbChnZGtfa2V5bWFwX2dldF9kZWZhdWx0KCksIGdka0tleVZhbHVlLCAma2V5cy5vdXRQdHIo KSwgJm5LZXlzKSAmJiBuS2V5cykKICAgICAgICAgICAgIGV2ZW50LT5rZXkuaGFyZHdhcmVfa2V5 Y29kZSA9IGtleXMuZ2V0KClbMF0ua2V5Y29kZTsKIAogICAgICAgICBmaWx0ZXJLZXlFdmVudCgm ZXZlbnQtPmtleSk7CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dEd0ay9UZXN0UHJpbnRpbmcuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRH dGsvVGVzdFByaW50aW5nLmNwcAppbmRleCAyYjUyMjExOTJhOS4uNzEwYWU5YzZiY2IgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R3RrL1Rlc3RQcmludGluZy5j cHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHdGsvVGVzdFByaW50aW5n LmNwcApAQCAtMzY1LDMyICszNjUsNiBAQCBwdWJsaWM6CiAgICAgICAgIGdfbWFpbl9sb29wX3F1 aXQobV9tYWluTG9vcCk7CiAgICAgfQogCi0gICAgdm9pZCBzZW5kS2V5RXZlbnQodW5zaWduZWQg Z2RrS2V5VmFsdWUsIEdka0V2ZW50VHlwZSB0eXBlLCB1bnNpZ25lZCBtb2RpZmllcnMpCi0gICAg ewotICAgICAgICBHZGtFdmVudCogZXZlbnQgPSBnZGtfZXZlbnRfbmV3KHR5cGUpOwotICAgICAg ICBldmVudC0+a2V5LmtleXZhbCA9IGdka0tleVZhbHVlOwotICAgICAgICBldmVudC0+a2V5LnN0 YXRlID0gbW9kaWZpZXJzOwotICAgICAgICBldmVudC0+a2V5LndpbmRvdyA9IGd0a193aWRnZXRf Z2V0X3dpbmRvdyhHVEtfV0lER0VUKG1fd2ViVmlldykpOwotICAgICAgICBldmVudC0+a2V5LnRp bWUgPSBHREtfQ1VSUkVOVF9USU1FOwotICAgICAgICBnX29iamVjdF9yZWYoZXZlbnQtPmtleS53 aW5kb3cpOwotICAgICAgICBnZGtfZXZlbnRfc2V0X2RldmljZShldmVudCwgZ2RrX2RldmljZV9t YW5hZ2VyX2dldF9jbGllbnRfcG9pbnRlcihnZGtfZGlzcGxheV9nZXRfZGV2aWNlX21hbmFnZXIo Z2RrX2Rpc3BsYXlfZ2V0X2RlZmF1bHQoKSkpKTsKLQotICAgICAgICBHVW5pcXVlT3V0UHRyPEdk a0tleW1hcEtleT4ga2V5czsKLSAgICAgICAgZ2ludCBuS2V5czsKLSAgICAgICAgaWYgKGdka19r ZXltYXBfZ2V0X2VudHJpZXNfZm9yX2tleXZhbChnZGtfa2V5bWFwX2dldF9kZWZhdWx0KCksIGdk a0tleVZhbHVlLCAma2V5cy5vdXRQdHIoKSwgJm5LZXlzKSkKLSAgICAgICAgICAgIGV2ZW50LT5r ZXkuaGFyZHdhcmVfa2V5Y29kZSA9IGtleXMuZ2V0KClbMF0ua2V5Y29kZTsKLQotICAgICAgICBn dGtfbWFpbl9kb19ldmVudChldmVudCk7Ci0KLSAgICAgICAgZ2RrX2V2ZW50X2ZyZWUoZXZlbnQp OwotICAgIH0KLQotICAgIHZvaWQgc2VuZEtleVByZXNzQW5kUmVsZWFzZUV2ZW50KHVuc2lnbmVk IGdka0tleVZhbHVlLCB1bnNpZ25lZCBtb2RpZmllcnMgPSAwKQotICAgIHsKLSAgICAgICAgc2Vu ZEtleUV2ZW50KGdka0tleVZhbHVlLCBHREtfS0VZX1BSRVNTLCBtb2RpZmllcnMpOwotICAgICAg ICBzZW5kS2V5RXZlbnQoZ2RrS2V5VmFsdWUsIEdES19LRVlfUkVMRUFTRSwgbW9kaWZpZXJzKTsK LSAgICB9Ci0KICAgICB2b2lkIGNyZWF0ZVdlYktpdFByaW50T3BlcmF0aW9uKCkKICAgICB7CiAg ICAgICAgIG1fcHJpbnRPcGVyYXRpb24gPSBhZG9wdEdSZWYod2Via2l0X3ByaW50X29wZXJhdGlv bl9uZXcobV93ZWJWaWV3KSk7CkBAIC00MTAsMjMgKzM4NCwyMyBAQCBwdWJsaWM6CiAgICAgdm9p ZCBzdGFydFByaW50aW5nKCkKICAgICB7CiAgICAgICAgIC8vIFRvIHN0YXJ0IHByaW50aW5nIGl0 IGlzIGVub3VnaCB0byBwcmVzcyB0aGUgUmV0dXJuIGtleQotICAgICAgICBzZW5kS2V5UHJlc3NB bmRSZWxlYXNlRXZlbnQoR0RLX0tFWV9SZXR1cm4pOworICAgICAgICBrZXlTdHJva2UoR0RLX0tF WV9SZXR1cm4pOwogICAgIH0KIAogICAgIHZvaWQganVtcFRvRmlyc3RQcmludGVyKCkKICAgICB7 CiAgICAgICAgIC8vIEluaXRpYWxseSB0aGUgR3RrTm90ZWJvb2sgaGFzIGZvY3VzLCBzbyB3ZSBq dXN0IG5lZWQgdG8gcHJlc3MgdGhlIFRhYgogICAgICAgICAvLyBrZXkgdG8ganVtcCB0byB0aGUg Zmlyc3QgcHJpbnRlcgotICAgICAgICBzZW5kS2V5UHJlc3NBbmRSZWxlYXNlRXZlbnQoR0RLX0tF WV9UYWIpOworICAgICAgICBrZXlTdHJva2UoR0RLX0tFWV9UYWIpOwogICAgIH0KIAogICAgIHZv aWQganVtcFRvQ3VzdG9tV2lkZ2V0KCkKICAgICB7CiAgICAgICAgIC8vIEp1bXAgYmFjayB0byB0 aGUgR3RrTm90ZWJvb2sKLSAgICAgICAgc2VuZEtleVByZXNzQW5kUmVsZWFzZUV2ZW50KEdES19L RVlfVGFiLCBHREtfU0hJRlRfTUFTSyk7CisgICAgICAgIGtleVN0cm9rZShHREtfS0VZX1RhYiwg R0RLX1NISUZUX01BU0spOwogICAgICAgICAvLyBDdXN0b20gd2lkZ2V0IGlzIG9uIHRoZSB0aGly ZCB0YWIKLSAgICAgICAgc2VuZEtleVByZXNzQW5kUmVsZWFzZUV2ZW50KEdES19LRVlfUmlnaHQp OwotICAgICAgICBzZW5kS2V5UHJlc3NBbmRSZWxlYXNlRXZlbnQoR0RLX0tFWV9SaWdodCk7Cisg ICAgICAgIGtleVN0cm9rZShHREtfS0VZX1JpZ2h0KTsKKyAgICAgICAga2V5U3Ryb2tlKEdES19L RVlfUmlnaHQpOwogICAgIH0KIAogICAgIHZvaWQgb3BlbkRpYWxvZ01vdmVUaHJvdWdoSXRBbmRX YWl0VW50aWxDbG9zZWQoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9nbGliL1dl YktpdEdMaWIvZ3RrL1dlYlZpZXdUZXN0R3RrLmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xp Yi9XZWJLaXRHTGliL2d0ay9XZWJWaWV3VGVzdEd0ay5jcHAKaW5kZXggOGIzZDhiYTBkOTkuLmEx MzQxYTY4NDhkIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xp Yi9ndGsvV2ViVmlld1Rlc3RHdGsuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9X ZWJLaXRHTGliL2d0ay9XZWJWaWV3VGVzdEd0ay5jcHAKQEAgLTE0OCw3ICsxNDgsNyBAQCB2b2lk IFdlYlZpZXdUZXN0OjprZXlTdHJva2UodW5zaWduZWQga2V5VmFsLCB1bnNpZ25lZCBrZXlNb2Rp ZmllcnMpCiAgICAgLy8gV2hlbiBzeW50aGVzaXppbmcgYW4gZXZlbnQsIGFuIGludmFsaWQgaGFy ZHdhcmVfa2V5Y29kZSB2YWx1ZSBjYW4gY2F1c2UgaXQgdG8gYmUgYmFkbHkgcHJvY2Vzc2VkIGJ5 IEdUSysuCiAgICAgR1VuaXF1ZU91dFB0cjxHZGtLZXltYXBLZXk+IGtleXM7CiAgICAgaW50IGtl eXNDb3VudDsKLSAgICBpZiAoZ2RrX2tleW1hcF9nZXRfZW50cmllc19mb3Jfa2V5dmFsKGdka19r ZXltYXBfZ2V0X2RlZmF1bHQoKSwga2V5VmFsLCAma2V5cy5vdXRQdHIoKSwgJmtleXNDb3VudCkp CisgICAgaWYgKGdka19rZXltYXBfZ2V0X2VudHJpZXNfZm9yX2tleXZhbChnZGtfa2V5bWFwX2dl dF9kZWZhdWx0KCksIGtleVZhbCwgJmtleXMub3V0UHRyKCksICZrZXlzQ291bnQpICYmIGtleXND b3VudCkKICAgICAgICAgZXZlbnQtPmtleS5oYXJkd2FyZV9rZXljb2RlID0ga2V5cy5nZXQoKVsw XS5rZXljb2RlOwogCiAgICAgZ3RrX21haW5fZG9fZXZlbnQoZXZlbnQuZ2V0KCkpOwpkaWZmIC0t Z2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9ndGsvUGxhdGZvcm1XZWJWaWV3R3RrLmNwcCBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvZ3RrL1BsYXRmb3JtV2ViVmlld0d0ay5jcHAKaW5kZXggMGZlYjJi NTRhNTIuLjE3YzIyNmJjZjliIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL2d0ay9Q bGF0Zm9ybVdlYlZpZXdHdGsuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ3RrL1BsYXRm b3JtV2ViVmlld0d0ay5jcHAKQEAgLTk1LDcgKzk1LDcgQEAgc3RhdGljIHZvaWQgZG9LZXlTdHJv a2UoR3RrV2lkZ2V0KiB2aWV3V2lkZ2V0LCB1bnNpZ25lZCBpbnQga2V5VmFsKQogICAgIC8vIFdo ZW4gc3ludGhlc2l6aW5nIGFuIGV2ZW50LCBhbiBpbnZhbGlkIGhhcmR3YXJlX2tleWNvZGUgdmFs dWUgY2FuIGNhdXNlIGl0IHRvIGJlIGJhZGx5IHByb2Nlc3NlZCBieSBHVEsrLgogICAgIEdVbmlx dWVPdXRQdHI8R2RrS2V5bWFwS2V5PiBrZXlzOwogICAgIGludCBrZXlzQ291bnQ7Ci0gICAgaWYg KGdka19rZXltYXBfZ2V0X2VudHJpZXNfZm9yX2tleXZhbChnZGtfa2V5bWFwX2dldF9kZWZhdWx0 KCksIGtleVZhbCwgJmtleXMub3V0UHRyKCksICZrZXlzQ291bnQpKQorICAgIGlmIChnZGtfa2V5 bWFwX2dldF9lbnRyaWVzX2Zvcl9rZXl2YWwoZ2RrX2tleW1hcF9nZXRfZGVmYXVsdCgpLCBrZXlW YWwsICZrZXlzLm91dFB0cigpLCAma2V5c0NvdW50KSAmJiBrZXlzQ291bnQpCiAgICAgICAgIGV2 ZW50LT5rZXkuaGFyZHdhcmVfa2V5Y29kZSA9IGtleXMuZ2V0KClbMF0ua2V5Y29kZTsKIAogICAg IGd0a19tYWluX2RvX2V2ZW50KGV2ZW50LmdldCgpKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvZ3RrL0V2ZW50U2VuZGVyUHJveHlHdGsuY3BwIGIvVG9vbHMvV2ViS2l0VGVz dFJ1bm5lci9ndGsvRXZlbnRTZW5kZXJQcm94eUd0ay5jcHAKaW5kZXggODUwOGI3MWYzYTYuLjM3 ODE0MWQyY2NjIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2d0ay9FdmVudFNl bmRlclByb3h5R3RrLmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2d0ay9FdmVudFNl bmRlclByb3h5R3RrLmNwcApAQCAtMzE1LDcgKzMxNSw3IEBAIHZvaWQgRXZlbnRTZW5kZXJQcm94 eTo6a2V5RG93bihXS1N0cmluZ1JlZiBrZXlSZWYsIFdLRXZlbnRNb2RpZmllcnMgd2tNb2RpZmll cnMsCiAKICAgICBHVW5pcXVlT3V0UHRyPEdka0tleW1hcEtleT4ga2V5czsKICAgICBnaW50IG5L ZXlzOwotICAgIGlmIChnZGtfa2V5bWFwX2dldF9lbnRyaWVzX2Zvcl9rZXl2YWwoZ2RrX2tleW1h cF9nZXRfZGVmYXVsdCgpLCBnZGtLZXlTeW0sICZrZXlzLm91dFB0cigpLCAmbktleXMpKQorICAg IGlmIChnZGtfa2V5bWFwX2dldF9lbnRyaWVzX2Zvcl9rZXl2YWwoZ2RrX2tleW1hcF9nZXRfZGVm YXVsdCgpLCBnZGtLZXlTeW0sICZrZXlzLm91dFB0cigpLCAmbktleXMpICYmIG5LZXlzKQogICAg ICAgICBwcmVzc0V2ZW50LT5rZXkuaGFyZHdhcmVfa2V5Y29kZSA9IGtleXMuZ2V0KClbMF0ua2V5 Y29kZTsKIAogICAgIEdka0V2ZW50KiByZWxlYXNlRXZlbnQgPSBnZGtfZXZlbnRfY29weShwcmVz c0V2ZW50KTsK