114659 2013-04-15 20:02:23 -0700 [EFL] Add a newline to the end of log message 2013-04-18 02:46:22 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 seokju webkit-unassigned commit-queue gyuyoung.kim lucas.de.marchi rakuco oldest_to_newest 876239 0 seokju 2013-04-15 20:02:23 -0700 Add a newline to the end of log message to facilitate debugging in EWebLauncher/MiniBrowser. 876240 1 198227 seokju 2013-04-15 20:04:37 -0700 Created attachment 198227 Patch 877747 2 seokju 2013-04-18 01:50:55 -0700 It is only trivial thing. gyuyoung : could you review this patch? 877748 3 gyuyoung.kim 2013-04-18 01:52:49 -0700 Why not adding '\n' to info() definition ? 877752 4 198698 seokju 2013-04-18 02:13:56 -0700 Created attachment 198698 Patch 877753 5 198698 seokju 2013-04-18 02:14:08 -0700 Comment on attachment 198698 Patch Applied Gyuyoung's comment. 877769 6 198698 commit-queue 2013-04-18 02:46:19 -0700 Comment on attachment 198698 Patch Clearing flags on attachment: 198698 Committed r148662: <http://trac.webkit.org/changeset/148662> 877770 7 commit-queue 2013-04-18 02:46:22 -0700 All reviewed patches have been landed. Closing bug. 198227 2013-04-15 20:04:37 -0700 2013-04-18 02:13:50 -0700 Patch bug-114659-20130416120410.patch text/plain 6284 seokju U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4NDgwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjc3YzA4MDQ4M2E1OTQzYmNlZTQ4MDUwZmE3ZjRmYmY0 OTFiODgwMC4uMDQ3NjA5YTI1YzI4ZGY1NjBhNTBjODhhYzNhZDE4ZDQwYTI2ODUyNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDEzLTA0LTE1ICBTZW9ranUgS3dvbiAgPHNlb2tqdS5rd29uQGdtYWlsLmNvbT4KKwor ICAgICAgICBbRUZMXSBBZGQgYSBuZXdsaW5lIHRvIHRoZSBlbmQgb2YgbG9nIG1lc3NhZ2UKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNDY1OQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRVdlYkxhdW5j aGVyL21haW4uYzoKKyAgICAgICAgKG9uX3Rvb2xiYXJzX3Zpc2libGVfc2V0KToKKyAgICAgICAg KG9uX3N0YXR1c2Jhcl92aXNpYmxlX3NldCk6CisgICAgICAgIChvbl9zY3JvbGxiYXJzX3Zpc2li bGVfc2V0KToKKyAgICAgICAgKG9uX21lbnViYXJfdmlzaWJsZV9zZXQpOgorICAgICAgICAob25f a2V5X2Rvd24pOgorICAgICAgICAqIE1pbmlCcm93c2VyL2VmbC9tYWluLmM6CisgICAgICAgIChv bl9rZXlfZG93bik6CisKIDIwMTMtMDQtMTUgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5v cmc+CiAKICAgICAgICAgV0tSIGdldHMgc3R1Y2sgd2hlbiB0aGVyZSBhcmUgbWFueSBtZXJnZXMK ZGlmZiAtLWdpdCBhL1Rvb2xzL0VXZWJMYXVuY2hlci9tYWluLmMgYi9Ub29scy9FV2ViTGF1bmNo ZXIvbWFpbi5jCmluZGV4IDNhNGViYTk1OGUxYzA4YTA5ZDBiNWQ1ZGQ1ZDA2N2IxNTEyMmYxNDIu LjJmMzQ3ODE2YmNjNjk1NjYyN2UxZTFkOWI2ODRlMTc5ZDU0ZjQ2YjQgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0VXZWJMYXVuY2hlci9tYWluLmMKKysrIGIvVG9vbHMvRVdlYkxhdW5jaGVyL21haW4uYwpA QCAtMzUwLDEwICszNTAsMTAgQEAgb25fdG9vbGJhcnNfdmlzaWJsZV9zZXQodm9pZCogdXNlcl9k YXRhLCBFdmFzX09iamVjdCogd2Vidmlldywgdm9pZCogZXZlbnRfaW5mbykKIHsKICAgICBFaW5h X0Jvb2wgKnZpc2libGUgPSAoRWluYV9Cb29sICopZXZlbnRfaW5mbzsKICAgICBpZiAoKnZpc2li bGUpIHsKLSAgICAgICAgaW5mbygiVG9vbGJhcnMgdmlzaWJsZSBjaGFuZ2VkOiBzaG93Iik7Cisg ICAgICAgIGluZm8oIlRvb2xiYXJzIHZpc2libGUgY2hhbmdlZDogc2hvd1xuIik7CiAgICAgICAg IHdpbmRvd1Byb3BlcnRpZXMudG9vbGJhcnNWaXNpYmxlID0gRUlOQV9UUlVFOwogICAgIH0gZWxz ZSB7Ci0gICAgICAgIGluZm8oIlRvb2xiYXJzIHZpc2libGUgY2hhbmdlZDogaGlkZSIpOworICAg ICAgICBpbmZvKCJUb29sYmFycyB2aXNpYmxlIGNoYW5nZWQ6IGhpZGVcbiIpOwogICAgICAgICB3 aW5kb3dQcm9wZXJ0aWVzLnRvb2xiYXJzVmlzaWJsZSA9IEVJTkFfRkFMU0U7CiAgICAgfQogfQpA QCAtMzcwLDEwICszNzAsMTAgQEAgb25fc3RhdHVzYmFyX3Zpc2libGVfc2V0KHZvaWQqIHVzZXJf ZGF0YSwgRXZhc19PYmplY3QqIHdlYnZpZXcsIHZvaWQqIGV2ZW50X2luZm8KIHsKICAgICBFaW5h X0Jvb2wgKnZpc2libGUgPSAoRWluYV9Cb29sICopZXZlbnRfaW5mbzsKICAgICBpZiAoKnZpc2li bGUpIHsKLSAgICAgICAgaW5mbygiU3RhdHVzYmFyIHZpc2libGUgY2hhbmdlZDogc2hvdyIpOwor ICAgICAgICBpbmZvKCJTdGF0dXNiYXIgdmlzaWJsZSBjaGFuZ2VkOiBzaG93XG4iKTsKICAgICAg ICAgd2luZG93UHJvcGVydGllcy5zdGF0dXNiYXJWaXNpYmxlID0gRUlOQV9UUlVFOwogICAgIH0g ZWxzZSB7Ci0gICAgICAgIGluZm8oIlN0YXR1c2JhciB2aXNpYmxlIGNoYW5nZWQ6IGhpZGUiKTsK KyAgICAgICAgaW5mbygiU3RhdHVzYmFyIHZpc2libGUgY2hhbmdlZDogaGlkZVxuIik7CiAgICAg ICAgIHdpbmRvd1Byb3BlcnRpZXMuc3RhdHVzYmFyVmlzaWJsZSA9IEVJTkFfRkFMU0U7CiAgICAg fQogfQpAQCAtMzkwLDEwICszOTAsMTAgQEAgb25fc2Nyb2xsYmFyc192aXNpYmxlX3NldCh2b2lk KiB1c2VyX2RhdGEsIEV2YXNfT2JqZWN0KiB3ZWJ2aWV3LCB2b2lkKiBldmVudF9pbmYKIHsKICAg ICBFaW5hX0Jvb2wgKnZpc2libGUgPSAoRWluYV9Cb29sICopZXZlbnRfaW5mbzsKICAgICBpZiAo KnZpc2libGUpIHsKLSAgICAgICAgaW5mbygiU2Nyb2xsYmFycyB2aXNpYmxlIGNoYW5nZWQ6IHNo b3ciKTsKKyAgICAgICAgaW5mbygiU2Nyb2xsYmFycyB2aXNpYmxlIGNoYW5nZWQ6IHNob3dcbiIp OwogICAgICAgICB3aW5kb3dQcm9wZXJ0aWVzLnNjcm9sbGJhcnNWaXNpYmxlID0gRUlOQV9UUlVF OwogICAgIH0gZWxzZSB7Ci0gICAgICAgIGluZm8oIlNjcm9sbGJhcnMgdmlzaWJsZSBjaGFuZ2Vk OiBoaWRlIik7CisgICAgICAgIGluZm8oIlNjcm9sbGJhcnMgdmlzaWJsZSBjaGFuZ2VkOiBoaWRl XG4iKTsKICAgICAgICAgd2luZG93UHJvcGVydGllcy5zY3JvbGxiYXJzVmlzaWJsZSA9IEVJTkFf RkFMU0U7CiAgICAgfQogfQpAQCAtNDEwLDEwICs0MTAsMTAgQEAgb25fbWVudWJhcl92aXNpYmxl X3NldCh2b2lkKiB1c2VyX2RhdGEsIEV2YXNfT2JqZWN0KiB3ZWJ2aWV3LCB2b2lkKiBldmVudF9p bmZvKQogewogICAgIEVpbmFfQm9vbCAqdmlzaWJsZSA9IChFaW5hX0Jvb2wgKilldmVudF9pbmZv OwogICAgIGlmICgqdmlzaWJsZSkgewotICAgICAgICBpbmZvKCJNZW51YmFyIHZpc2libGUgY2hh bmdlZDogc2hvdyIpOworICAgICAgICBpbmZvKCJNZW51YmFyIHZpc2libGUgY2hhbmdlZDogc2hv d1xuIik7CiAgICAgICAgIHdpbmRvd1Byb3BlcnRpZXMubWVudWJhclZpc2libGUgPSBFSU5BX1RS VUU7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgaW5mbygiTWVudWJhciB2aXNpYmxlIGNoYW5nZWQ6 IGhpZGUiKTsKKyAgICAgICAgaW5mbygiTWVudWJhciB2aXNpYmxlIGNoYW5nZWQ6IGhpZGVcbiIp OwogICAgICAgICB3aW5kb3dQcm9wZXJ0aWVzLm1lbnViYXJWaXNpYmxlID0gRUlOQV9GQUxTRTsK ICAgICB9CiB9CkBAIC01MjEsNyArNTIxLDcgQEAgb25fa2V5X2Rvd24odm9pZCAqZGF0YSwgRXZh cyAqZSwgRXZhc19PYmplY3QgKm9iaiwgdm9pZCAqZXZlbnRfaW5mbykKICAgICB9IGVsc2UgaWYg KCFzdHJjbXAoZXYtPmtleSwgIkYzIikpIHsKICAgICAgICAgY3VycmVudEVuY29kaW5nKys7CiAg ICAgICAgIGN1cnJlbnRFbmNvZGluZyAlPSAoc2l6ZW9mKGVuY29kaW5ncykgLyBzaXplb2YoZW5j b2RpbmdzWzBdKSk7Ci0gICAgICAgIGluZm8oIlNldCBlbmNvZGluZyAoRjMpIHByZXNzZWQuIE5l dyBlbmNvZGluZyB0byAlcyIsIGVuY29kaW5nc1tjdXJyZW50RW5jb2RpbmddKTsKKyAgICAgICAg aW5mbygiU2V0IGVuY29kaW5nIChGMykgcHJlc3NlZC4gTmV3IGVuY29kaW5nIHRvICVzXG4iLCBl bmNvZGluZ3NbY3VycmVudEVuY29kaW5nXSk7CiAgICAgICAgIGV3a192aWV3X3NldHRpbmdfZW5j b2RpbmdfY3VzdG9tX3NldChvYmosIGVuY29kaW5nc1tjdXJyZW50RW5jb2RpbmddKTsKICAgICB9 IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgIkY0IikpIHsKICAgICAgICAgRXZhc19PYmplY3Qg KmZyYW1lID0gZXdrX3ZpZXdfZnJhbWVfbWFpbl9nZXQob2JqKTsKQEAgLTYwNywxNiArNjA3LDE2 IEBAIG9uX2tleV9kb3duKHZvaWQgKmRhdGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpvYmosIHZv aWQgKmV2ZW50X2luZm8pCiAgICAgICAgIGluZm8oIlByZS1yZW5kZXIgJWQsJWQgKyAlZHglZFxu IiwgeCwgeSwgdywgaCk7CiAgICAgICAgIGV3a192aWV3X3ByZV9yZW5kZXJfcmVnaW9uKG9iaiwg eCwgeSwgdywgaCwgem9vbSk7CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJyIikg JiYgY3RybFByZXNzZWQpIHsKLSAgICAgICAgaW5mbygiUHJlLXJlbmRlciAxIGV4dHJhIGNvbHVt bi9yb3cgd2l0aCBjdXJyZW50IHpvb20iKTsKKyAgICAgICAgaW5mbygiUHJlLXJlbmRlciAxIGV4 dHJhIGNvbHVtbi9yb3cgd2l0aCBjdXJyZW50IHpvb21cbiIpOwogICAgICAgICBld2tfdmlld19w cmVfcmVuZGVyX3JlbGF0aXZlX3JhZGl1cyhvYmosIDEpOwogICAgIH0gZWxzZSBpZiAoIXN0cmNt cChldi0+a2V5LCAicCIpICYmIGN0cmxQcmVzc2VkKSB7Ci0gICAgICAgIGluZm8oIlByZS1yZW5k ZXJpbmcgc3RhcnQiKTsKKyAgICAgICAgaW5mbygiUHJlLXJlbmRlcmluZyBzdGFydFxuIik7CiAg ICAgICAgIGV3a192aWV3X3ByZV9yZW5kZXJfc3RhcnQob2JqKTsKICAgICB9IGVsc2UgaWYgKCFz dHJjbXAoZXYtPmtleSwgImQiKSAmJiBjdHJsUHJlc3NlZCkgewotICAgICAgICBpbmZvKCJSZW5k ZXIgc3VzcGVuZGVkIik7CisgICAgICAgIGluZm8oIlJlbmRlciBzdXNwZW5kZWRcbiIpOwogICAg ICAgICBld2tfdmlld19kaXNhYmxlX3JlbmRlcihvYmopOwogICAgIH0gZWxzZSBpZiAoIXN0cmNt cChldi0+a2V5LCAiZSIpICYmIGN0cmxQcmVzc2VkKSB7Ci0gICAgICAgIGluZm8oIlJlbmRlciBy ZXN1bWVkIik7CisgICAgICAgIGluZm8oIlJlbmRlciByZXN1bWVkXG4iKTsKICAgICAgICAgZXdr X3ZpZXdfZW5hYmxlX3JlbmRlcihvYmopOwogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5 LCAicyIpICYmIGN0cmxQcmVzc2VkKSB7CiAgICAgICAgIEV2YXNfT2JqZWN0ICpmcmFtZSA9IGV3 a192aWV3X2ZyYW1lX21haW5fZ2V0KG9iaik7CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nl ci9lZmwvbWFpbi5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwppbmRleCA4MDJkNTE4 ZWYzYjA0ODI1NjE3Y2JjMDNjNTY0YzdiZTYyNGJkMjJkLi4zYmM3NWY3ZDc1MjUzYmJjN2IzODc4 Zjg4YTYyOTQ2ZDQwMWFjNDNjIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFp bi5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKQEAgLTMzNCw3ICszMzQsNyBA QCBvbl9rZXlfZG93bih2b2lkICp1c2VyX2RhdGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpld2tf dmlldywgdm9pZCAqZXZlbnRfaW5mbykKICAgICAgICAgICAgIGluZm8oIkZvcndhcmQgaWdub3Jl ZDogTm8gZm9yd2FyZCBoaXN0b3J5XG4iKTsKICAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtl eSwgIkYzIikpIHsKICAgICAgICAgY3VycmVudEVuY29kaW5nID0gKGN1cnJlbnRFbmNvZGluZyAr IDEpICUgKHNpemVvZihlbmNvZGluZ3MpIC8gc2l6ZW9mKGVuY29kaW5nc1swXSkpOwotICAgICAg ICBpbmZvKCJTZXQgZW5jb2RpbmcgKEYzKSBwcmVzc2VkLiBOZXcgZW5jb2RpbmcgdG8gJXMiLCBl bmNvZGluZ3NbY3VycmVudEVuY29kaW5nXSk7CisgICAgICAgIGluZm8oIlNldCBlbmNvZGluZyAo RjMpIHByZXNzZWQuIE5ldyBlbmNvZGluZyB0byAlc1xuIiwgZW5jb2RpbmdzW2N1cnJlbnRFbmNv ZGluZ10pOwogICAgICAgICBld2tfdmlld19jdXN0b21fZW5jb2Rpbmdfc2V0KGV3a192aWV3LCBl bmNvZGluZ3NbY3VycmVudEVuY29kaW5nXSk7CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5r ZXksICJGNSIpKSB7CiAgICAgICAgIGluZm8oIlJlbG9hZCAoRjUpIHdhcyBwcmVzc2VkLCByZWxv YWRpbmcuXG4iKTsKQEAgLTM0OCw3ICszNDgsNyBAQCBvbl9rZXlfZG93bih2b2lkICp1c2VyX2Rh dGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpld2tfdmlldywgdm9pZCAqZXZlbnRfaW5mbykKICAg ICAgICAgaWYgKGV3a192aWV3X3BhZ2luYXRpb25fbW9kZV9zZXQoZXdrX3ZpZXcsIG1vZGUpKQog ICAgICAgICAgICAgaW5mbygiQ2hhbmdlIFBhZ2luYXRpb24gTW9kZSAoRjcpIHdhcyBwcmVzc2Vk LCBjaGFuZ2VkIHRvOiAlZFxuIiwgbW9kZSk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIGlu Zm8oIkNoYW5nZSBQYWdpbmF0aW9uIE1vZGUgKEY3KSB3YXMgcHJlc3NlZCwgYnV0IE5PVCBjaGFu Z2VkISIpOworICAgICAgICAgICAgaW5mbygiQ2hhbmdlIFBhZ2luYXRpb24gTW9kZSAoRjcpIHdh cyBwcmVzc2VkLCBidXQgTk9UIGNoYW5nZWQhXG4iKTsKICAgICB9IGVsc2UgaWYgKCFzdHJjbXAo ZXYtPmtleSwgIkY4IikpIHsKICAgICAgICAgaW5mbygiQ3JlYXRlIHNvdWNlIGNvZGUgd2luZG93 IChGOCkgd2FzIHByZXNzZWQuXG4iKTsKICAgICAgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9 IHdpbmRvd19jcmVhdGUoZXdrX3ZpZXcsIGV3a192aWV3X3VybF9nZXQoZXdrX3ZpZXcpLCAwLCAw LCBFSU5BX1RSVUUpOwo= 198698 2013-04-18 02:13:56 -0700 2013-04-18 02:46:19 -0700 Patch bug-114659-20130418181327.patch text/plain 21436 seokju U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4NjU5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjAxYjBhY2ViODUxZGFlNjAxMGUwNzQ5M2U1OWFjYzJh NjE3YmZmNC4uMjY1YjU1MzdjZDVjYzg1NjA0YWIxOTcwYjgxNDEzZGFiNjg2ZmRiOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3 IEBACisyMDEzLTA0LTE4ICBTZW9ranUgS3dvbiAgPHNlb2tqdS5rd29uQGdtYWlsLmNvbT4KKwor ICAgICAgICBbRUZMXSBBZGQgYSBuZXdsaW5lIHRvIHRoZSBlbmQgb2YgbG9nIG1lc3NhZ2UKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNDY1OQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgYSBuZXds aW5lIHRvIGluZm8oKSBkZWZpbml0aW9uLgorCisgICAgICAgICogRVdlYkxhdW5jaGVyL21haW4u YzoKKyAgICAgICAgKG9uX2xvYWRfZmluaXNoZWQpOgorICAgICAgICAob25fdG9vbHRpcF90ZXh0 X3NldCk6CisgICAgICAgIChvbl90b29sdGlwX3RleHRfdW5zZXQpOgorICAgICAgICAob25faW5w dXRtZXRob2RfY2hhbmdlZCk6CisgICAgICAgIChvbl9mb2N1c19vdXQpOgorICAgICAgICAob25f Zm9jdXNfaW4pOgorICAgICAgICAob25fa2V5X2Rvd24pOgorICAgICAgICAod2luZG93Q3JlYXRl KToKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9lZmwvbWFpbi5jOgorICAgICAgICAob25fa2V5X2Rv d24pOgorICAgICAgICAob25fZG93bmxvYWRfcmVxdWVzdCk6CisgICAgICAgIChvbl9kb3dubG9h ZF9maW5pc2hlZCk6CisgICAgICAgIChvbl9kb3dubG9hZF9mYWlsZWQpOgorICAgICAgICAob25f cmVmcmVzaF9idXR0b25fY2xpY2tlZCk6CisgICAgICAgIChvbl9wb3B1cF9tZW51X2Rpc2NhcmRl ZCk6CisgICAgICAgIChvbl9wb3B1cF9tZW51X2l0ZW1fY2xpY2tlZCk6CisgICAgICAgIChwb3B1 cF9tZW51X3BvcHVsYXRlKToKKyAgICAgICAgKG9uX3BvcHVwX21lbnVfc2hvdyk6CisgICAgICAg IChvbl93aW5kb3dfY3JlYXRlKToKKyAgICAgICAgKGNvbnRleHRfcG9wdXBfaXRlbV9zZWxlY3Rl ZF9jYik6CisgICAgICAgIChvbl9jb250ZXh0X21lbnVfc2hvdyk6CisgICAgICAgIChvbl9jb250 ZXh0X21lbnVfaGlkZSk6CisgICAgICAgICh3aW5kb3dfY3JlYXRlKToKKwogMjAxMy0wNC0xNyAg WmFuIERvYmVyc2VrICA8emFuZG9iZXJzZWtAZ21haWwuY29tPgogCiAgICAgICAgIFtEYXNoYm9h cmRdIFJlbW92ZSBjb2RlIGZvciBzaG93aW5nICdXZWJLaXQgcm9sbCcgYW5ub3RhdGlvbnMgaW4g dGltZWxpbmVzIGZvciBDaHJvbWl1bSBidWlsZGVycwpkaWZmIC0tZ2l0IGEvVG9vbHMvRVdlYkxh dW5jaGVyL21haW4uYyBiL1Rvb2xzL0VXZWJMYXVuY2hlci9tYWluLmMKaW5kZXggM2E0ZWJhOTU4 ZTFjMDhhMDlkMGI1ZDVkZDVkMDY3YjE1MTIyZjE0Mi4uYzYwZGRlZjkwNmI5NzliMjA0N2I2MWEz NmFlNWJkOTU1NzVhNTE2ZiAxMDA2NDQKLS0tIGEvVG9vbHMvRVdlYkxhdW5jaGVyL21haW4uYwor KysgYi9Ub29scy9FV2ViTGF1bmNoZXIvbWFpbi5jCkBAIC01Niw3ICs1Niw3IEBACiAjZGVmaW5l IGluZm8oZm9ybWF0LCBhcmdzLi4uKSAgICAgICBcCiAgICAgZG8geyAgICAgICAgICAgICAgICAg ICAgICAgICAgICBcCiAgICAgICAgIGlmICh2ZXJib3NlKSAgICAgICAgICAgICAgICBcCi0gICAg ICAgICAgICBwcmludGYoZm9ybWF0LCAjI2FyZ3MpOyBcCisgICAgICAgICAgICBwcmludGYoZm9y bWF0IlxuIiwgIyNhcmdzKTsgXAogICAgIH0gd2hpbGUgKDApCiAKICNkZWZpbmUgTUlOX1pPT01f TEVWRUwgMApAQCAtMzIzLDE2ICszMjMsMTYgQEAgb25fbG9hZF9maW5pc2hlZCh2b2lkICp1c2Vy X2RhdGEsIEV2YXNfT2JqZWN0ICp3ZWJ2aWV3LCB2b2lkICpldmVudF9pbmZvKQogICAgIGNvbnN0 IEV3a19GcmFtZV9Mb2FkX0Vycm9yICplcnIgPSAoY29uc3QgRXdrX0ZyYW1lX0xvYWRfRXJyb3Ig KilldmVudF9pbmZvOwogCiAgICAgaWYgKCFlcnIpCi0gICAgICAgIGluZm8oIlN1Y2NlZWRlZCBs b2FkaW5nIHBhZ2UuXG4iKTsKKyAgICAgICAgaW5mbygiU3VjY2VlZGVkIGxvYWRpbmcgcGFnZS4i KTsKICAgICBlbHNlIGlmIChlcnItPmlzX2NhbmNlbGxhdGlvbikKLSAgICAgICAgaW5mbygiTG9h ZCB3YXMgY2FuY2VsbGVkLlxuIik7CisgICAgICAgIGluZm8oIkxvYWQgd2FzIGNhbmNlbGxlZC4i KTsKICAgICBlbHNlCi0gICAgICAgIGluZm8oIkZhaWxlZCBsb2FkaW5nIHBhZ2U6ICVkICVzIFwi JXNcIiwgdXJsPSVzXG4iLAorICAgICAgICBpbmZvKCJGYWlsZWQgbG9hZGluZyBwYWdlOiAlZCAl cyBcIiVzXCIsIHVybD0lcyIsCiAgICAgICAgICAgICAgZXJyLT5jb2RlLCBlcnItPmRvbWFpbiwg ZXJyLT5kZXNjcmlwdGlvbiwgZXJyLT5mYWlsaW5nX3VybCk7CiAKICAgICBjdXJyZW50Wm9vbSA9 IGV3a192aWV3X3pvb21fZ2V0KHdlYnZpZXcpOwogICAgIGN1cnJlbnRab29tTGV2ZWwgPSBuZWFy ZXN0X3pvb21fbGV2ZWxfZ2V0KGN1cnJlbnRab29tKTsKLSAgICBpbmZvKCJXZWJDb3JlIFpvb209 JWYsIGN1cnJlbnRab29tTGV2ZWw9JWRcbiIsIGN1cnJlbnRab29tLCBjdXJyZW50Wm9vbUxldmVs KTsKKyAgICBpbmZvKCJXZWJDb3JlIFpvb209JWYsIGN1cnJlbnRab29tTGV2ZWw9JWQiLCBjdXJy ZW50Wm9vbSwgY3VycmVudFpvb21MZXZlbCk7CiB9CiAKIHN0YXRpYyB2b2lkCkBAIC00MjksMTMg KzQyOSwxMyBAQCBzdGF0aWMgdm9pZAogb25fdG9vbHRpcF90ZXh0X3NldCh2b2lkKiB1c2VyX2Rh dGEsIEV2YXNfT2JqZWN0KiB3ZWJ2aWV3LCB2b2lkKiBldmVudF9pbmZvKQogewogICAgIGNvbnN0 IGNoYXIgKnRleHQgPSAoY29uc3QgY2hhciAqKWV2ZW50X2luZm87Ci0gICAgaW5mbygiVG9vbHRp cCBpcyBzZXQ6ICVzXG4iLCB0ZXh0KTsKKyAgICBpbmZvKCJUb29sdGlwIGlzIHNldDogJXMiLCB0 ZXh0KTsKIH0KIAogc3RhdGljIHZvaWQKIG9uX3Rvb2x0aXBfdGV4dF91bnNldCh2b2lkKiB1c2Vy X2RhdGEsIEV2YXNfT2JqZWN0KiB3ZWJ2aWV3LCB2b2lkKiBldmVudF9pbmZvKQogewotICAgIGlu Zm8oIlRvb2x0aXAgaXMgdW5zZXRcbiIpOworICAgIGluZm8oIlRvb2x0aXAgaXMgdW5zZXQiKTsK IH0KIAogc3RhdGljIHZvaWQKQEAgLTQ0MywxMyArNDQzLDEzIEBAIG9uX2lucHV0bWV0aG9kX2No YW5nZWQodm9pZCogdXNlcl9kYXRhLCBFdmFzX09iamVjdCogd2Vidmlldywgdm9pZCogZXZlbnRf aW5mbykKIHsKICAgICBFaW5hX0Jvb2wgYWN0aXZlID0gKEVpbmFfQm9vbCkobG9uZylldmVudF9p bmZvOwogICAgIHVuc2lnbmVkIGludCBpbWg7Ci0gICAgaW5mbygiS2V5Ym9hcmQgY2hhbmdlZDog JWRcbiIsIGFjdGl2ZSk7CisgICAgaW5mbygiS2V5Ym9hcmQgY2hhbmdlZDogJWQiLCBhY3RpdmUp OwogCiAgICAgaWYgKCFhY3RpdmUpCiAgICAgICAgIHJldHVybjsKIAogICAgIGltaCA9IGV3a192 aWV3X2ltaF9nZXQod2Vidmlldyk7Ci0gICAgaW5mbygiICAgIEtleWJvYXJkIGZsYWdzOiAlIy4y eFxuIiwgaW1oKTsKKyAgICBpbmZvKCIgICAgS2V5Ym9hcmQgZmxhZ3M6ICUjLjJ4IiwgaW1oKTsK IAogfQogCkBAIC00NzQsMTMgKzQ3NCwxMyBAQCBvbl9tb3VzZV9kb3duKHZvaWQqIGRhdGEsIEV2 YXMqIGUsIEV2YXNfT2JqZWN0KiB3ZWJ2aWV3LCB2b2lkKiBldmVudF9pbmZvKQogc3RhdGljIHZv aWQKIG9uX2ZvY3VzX291dCh2b2lkICpkYXRhLCBFdmFzICplLCBFdmFzX09iamVjdCAqb2JqLCB2 b2lkICpldmVudF9pbmZvKQogewotICAgIGluZm8oInRoZSB3ZWJ2aWV3IGxvc3Qga2V5Ym9hcmQg Zm9jdXNcbiIpOworICAgIGluZm8oInRoZSB3ZWJ2aWV3IGxvc3Qga2V5Ym9hcmQgZm9jdXMiKTsK IH0KIAogc3RhdGljIHZvaWQKIG9uX2ZvY3VzX2luKHZvaWQgKmRhdGEsIEV2YXMgKmUsIEV2YXNf T2JqZWN0ICpvYmosIHZvaWQgKmV2ZW50X2luZm8pCiB7Ci0gICAgaW5mbygidGhlIHdlYnZpZXcg Z2FpbmVkIGtleWJvYXJkIGZvY3VzXG4iKTsKKyAgICBpbmZvKCJ0aGUgd2VidmlldyBnYWluZWQg a2V5Ym9hcmQgZm9jdXMiKTsKIH0KIAogc3RhdGljIHZvaWQKQEAgLTQ5OSw3ICs0OTksNyBAQCBv bl9rZXlfZG93bih2b2lkICpkYXRhLCBFdmFzICplLCBFdmFzX09iamVjdCAqb2JqLCB2b2lkICpl dmVudF9pbmZvKQogICAgIGlmICghc3RyY21wKGV2LT5rZXksICJFc2NhcGUiKSkgewogICAgICAg ICBjbG9zZVdpbmRvdyhhcHAtPmVlKTsKICAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwg IkYxIikpIHsKLSAgICAgICAgaW5mbygiQmFjayAoRjEpIHdhcyBwcmVzc2VkXG4iKTsKKyAgICAg ICAgaW5mbygiQmFjayAoRjEpIHdhcyBwcmVzc2VkIik7CiAgICAgICAgIGlmIChld2tfdmlld19i YWNrX3Bvc3NpYmxlKG9iaikpIHsKICAgICAgICAgICAgIEV3a19IaXN0b3J5ICpoaXN0b3J5ID0g ZXdrX3ZpZXdfaGlzdG9yeV9nZXQob2JqKTsKICAgICAgICAgICAgIEVpbmFfTGlzdCAqbGlzdCA9 IGV3a19oaXN0b3J5X2JhY2tfbGlzdF9nZXQoaGlzdG9yeSk7CkBAIC01MDcsOSArNTA3LDkgQEAg b25fa2V5X2Rvd24odm9pZCAqZGF0YSwgRXZhcyAqZSwgRXZhc19PYmplY3QgKm9iaiwgdm9pZCAq ZXZlbnRfaW5mbykKICAgICAgICAgICAgIGV3a19oaXN0b3J5X2l0ZW1fbGlzdF9mcmVlKGxpc3Qp OwogICAgICAgICAgICAgZXdrX3ZpZXdfYmFjayhvYmopOwogICAgICAgICB9IGVsc2UKLSAgICAg ICAgICAgIGluZm8oIkJhY2sgaWdub3JlZDogTm8gYmFjayBoaXN0b3J5XG4iKTsKKyAgICAgICAg ICAgIGluZm8oIkJhY2sgaWdub3JlZDogTm8gYmFjayBoaXN0b3J5Iik7CiAgICAgfSBlbHNlIGlm ICghc3RyY21wKGV2LT5rZXksICJGMiIpKSB7Ci0gICAgICAgIGluZm8oIkZvcndhcmQgKEYyKSB3 YXMgcHJlc3NlZFxuIik7CisgICAgICAgIGluZm8oIkZvcndhcmQgKEYyKSB3YXMgcHJlc3NlZCIp OwogICAgICAgICBpZiAoZXdrX3ZpZXdfZm9yd2FyZF9wb3NzaWJsZShvYmopKSB7CiAgICAgICAg ICAgICBFd2tfSGlzdG9yeSAqaGlzdG9yeSA9IGV3a192aWV3X2hpc3RvcnlfZ2V0KG9iaik7CiAg ICAgICAgICAgICBFaW5hX0xpc3QgKmxpc3QgPSBld2tfaGlzdG9yeV9mb3J3YXJkX2xpc3RfZ2V0 KGhpc3RvcnkpOwpAQCAtNTE3LDcgKzUxNyw3IEBAIG9uX2tleV9kb3duKHZvaWQgKmRhdGEsIEV2 YXMgKmUsIEV2YXNfT2JqZWN0ICpvYmosIHZvaWQgKmV2ZW50X2luZm8pCiAgICAgICAgICAgICBl d2tfaGlzdG9yeV9pdGVtX2xpc3RfZnJlZShsaXN0KTsKICAgICAgICAgICAgIGV3a192aWV3X2Zv cndhcmQob2JqKTsKICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBpbmZvKCJGb3J3YXJkIGln bm9yZWQ6IE5vIGZvcndhcmQgaGlzdG9yeVxuIik7CisgICAgICAgICAgICBpbmZvKCJGb3J3YXJk IGlnbm9yZWQ6IE5vIGZvcndhcmQgaGlzdG9yeSIpOwogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChl di0+a2V5LCAiRjMiKSkgewogICAgICAgICBjdXJyZW50RW5jb2RpbmcrKzsKICAgICAgICAgY3Vy cmVudEVuY29kaW5nICU9IChzaXplb2YoZW5jb2RpbmdzKSAvIHNpemVvZihlbmNvZGluZ3NbMF0p KTsKQEAgLTU3MCwyOSArNTcwLDI5IEBAIG9uX2tleV9kb3duKHZvaWQgKmRhdGEsIEV2YXMgKmUs IEV2YXNfT2JqZWN0ICpvYmosIHZvaWQgKmV2ZW50X2luZm8pCiAgICAgICAgIH0KIAogICAgIH0g ZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiRjUiKSkgewotICAgICAgICBpbmZvKCJSZWxvYWQg KEY1KSB3YXMgcHJlc3NlZCwgcmVsb2FkaW5nLlxuIik7CisgICAgICAgIGluZm8oIlJlbG9hZCAo RjUpIHdhcyBwcmVzc2VkLCByZWxvYWRpbmcuIik7CiAgICAgICAgIGV3a192aWV3X3JlbG9hZChv YmopOwogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiRjYiKSkgewotICAgICAgICBp bmZvKCJTdG9wIChGNikgd2FzIHByZXNzZWQsIHN0b3AgbG9hZGluZy5cbiIpOworICAgICAgICBp bmZvKCJTdG9wIChGNikgd2FzIHByZXNzZWQsIHN0b3AgbG9hZGluZy4iKTsKICAgICAgICAgZXdr X3ZpZXdfc3RvcChvYmopOwogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiRjEyIikp IHsKICAgICAgICAgRWluYV9Cb29sIHN0YXR1cyA9IGV3a192aWV3X3NldHRpbmdfc3BhdGlhbF9u YXZpZ2F0aW9uX2dldChvYmopOwogICAgICAgICBld2tfdmlld19zZXR0aW5nX3NwYXRpYWxfbmF2 aWdhdGlvbl9zZXQob2JqLCAhc3RhdHVzKTsKLSAgICAgICAgaW5mbygiQ29tbWFuZDo6a2V5Ym9h cmQgbmF2aWdhdGlvbiB0b2dnbGVcbiIpOworICAgICAgICBpbmZvKCJDb21tYW5kOjprZXlib2Fy ZCBuYXZpZ2F0aW9uIHRvZ2dsZSIpOwogICAgIH0gZWxzZSBpZiAoKCFzdHJjbXAoZXYtPmtleSwg Im1pbnVzIikgfHwgIXN0cmNtcChldi0+a2V5LCAiS1BfU3VidHJhY3QiKSkgJiYgY3RybFByZXNz ZWQpIHsKICAgICAgICAgaWYgKGN1cnJlbnRab29tTGV2ZWwgPiBNSU5fWk9PTV9MRVZFTCAmJiB6 b29tX2xldmVsX3NldChvYmosIGN1cnJlbnRab29tTGV2ZWwgLSAxKSkKICAgICAgICAgICAgIGN1 cnJlbnRab29tTGV2ZWwtLTsKLSAgICAgICAgaW5mbygiWm9vbSBvdXQgKEN0cmwgKyAnLScpIHdh cyBwcmVzc2VkLCB6b29tIGxldmVsIGJlY2FtZSAlLjJmXG4iLCB6b29tTGV2ZWxzW2N1cnJlbnRa b29tTGV2ZWxdIC8gMTAwLjApOworICAgICAgICBpbmZvKCJab29tIG91dCAoQ3RybCArICctJykg d2FzIHByZXNzZWQsIHpvb20gbGV2ZWwgYmVjYW1lICUuMmYiLCB6b29tTGV2ZWxzW2N1cnJlbnRa b29tTGV2ZWxdIC8gMTAwLjApOwogICAgIH0gZWxzZSBpZiAoKCFzdHJjbXAoZXYtPmtleSwgImVx dWFsIikgfHwgIXN0cmNtcChldi0+a2V5LCAiS1BfQWRkIikpICYmIGN0cmxQcmVzc2VkKSB7CiAg ICAgICAgIGlmIChjdXJyZW50Wm9vbUxldmVsIDwgTUFYX1pPT01fTEVWRUwgJiYgem9vbV9sZXZl bF9zZXQob2JqLCBjdXJyZW50Wm9vbUxldmVsICsgMSkpCiAgICAgICAgICAgICBjdXJyZW50Wm9v bUxldmVsKys7Ci0gICAgICAgIGluZm8oIlpvb20gaW4gKEN0cmwgKyAnKycpIHdhcyBwcmVzc2Vk LCB6b29tIGxldmVsIGJlY2FtZSAlLjJmXG4iLCB6b29tTGV2ZWxzW2N1cnJlbnRab29tTGV2ZWxd IC8gMTAwLjApOworICAgICAgICBpbmZvKCJab29tIGluIChDdHJsICsgJysnKSB3YXMgcHJlc3Nl ZCwgem9vbSBsZXZlbCBiZWNhbWUgJS4yZiIsIHpvb21MZXZlbHNbY3VycmVudFpvb21MZXZlbF0g LyAxMDAuMCk7CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICIwIikgJiYgY3RybFBy ZXNzZWQpIHsKICAgICAgICAgaWYgKHpvb21fbGV2ZWxfc2V0KG9iaiwgREVGQVVMVF9aT09NX0xF VkVMKSkKICAgICAgICAgICAgIGN1cnJlbnRab29tTGV2ZWwgPSBERUZBVUxUX1pPT01fTEVWRUw7 Ci0gICAgICAgIGluZm8oIlpvb20gdG8gZGVmYXVsdCAoQ3RybCArICcwJykgd2FzIHByZXNzZWQs IHpvb20gbGV2ZWwgYmVjYW1lICUuMmZcbiIsIHpvb21MZXZlbHNbY3VycmVudFpvb21MZXZlbF0g LyAxMDAuMCk7CisgICAgICAgIGluZm8oIlpvb20gdG8gZGVmYXVsdCAoQ3RybCArICcwJykgd2Fz IHByZXNzZWQsIHpvb20gbGV2ZWwgYmVjYW1lICUuMmYiLCB6b29tTGV2ZWxzW2N1cnJlbnRab29t TGV2ZWxdIC8gMTAwLjApOwogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAibiIpICYm IGN0cmxQcmVzc2VkKSB7Ci0gICAgICAgIGluZm8oIkNyZWF0ZSBuZXcgd2luZG93IChDdHJsK24p IHdhcyBwcmVzc2VkLlxuIik7CisgICAgICAgIGluZm8oIkNyZWF0ZSBuZXcgd2luZG93IChDdHJs K24pIHdhcyBwcmVzc2VkLiIpOwogICAgICAgICBicm93c2VyQ3JlYXRlKCJodHRwOi8vd3d3Lmdv b2dsZS5jb20iLCBhcHAtPnVzZXJBcmdzKTsKICAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtl eSwgImciKSAmJiBjdHJsUHJlc3NlZCApIHsKICAgICAgICAgRXZhc19Db29yZCB4LCB5LCB3LCBo OwpAQCAtNjA0LDcgKzYwNCw3IEBAIG9uX2tleV9kb3duKHZvaWQgKmRhdGEsIEV2YXMgKmUsIEV2 YXNfT2JqZWN0ICpvYmosIHZvaWQgKmV2ZW50X2luZm8pCiAgICAgICAgIHkgLT0gaDsKICAgICAg ICAgdyAqPSA0OwogICAgICAgICBoICo9IDQ7Ci0gICAgICAgIGluZm8oIlByZS1yZW5kZXIgJWQs JWQgKyAlZHglZFxuIiwgeCwgeSwgdywgaCk7CisgICAgICAgIGluZm8oIlByZS1yZW5kZXIgJWQs JWQgKyAlZHglZCIsIHgsIHksIHcsIGgpOwogICAgICAgICBld2tfdmlld19wcmVfcmVuZGVyX3Jl Z2lvbihvYmosIHgsIHksIHcsIGgsIHpvb20pOwogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+ a2V5LCAiciIpICYmIGN0cmxQcmVzc2VkKSB7CiAgICAgICAgIGluZm8oIlByZS1yZW5kZXIgMSBl eHRyYSBjb2x1bW4vcm93IHdpdGggY3VycmVudCB6b29tIik7CkBAIC02NTIsMTAgKzY1MiwxMCBA QCBvbl9rZXlfZG93bih2b2lkICpkYXRhLCBFdmFzICplLCBFdmFzX09iamVjdCAqb2JqLCB2b2lk ICpldmVudF9pbmZvKQogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiaSIpICYmIGN0 cmxQcmVzc2VkKSB7CiAgICAgICAgIEV2YXNfT2JqZWN0ICppbnNwZWN0b3JfdmlldyA9IGV3a192 aWV3X2luc3BlY3Rvcl92aWV3X2dldChvYmopOwogICAgICAgICBpZiAoaW5zcGVjdG9yX3ZpZXcp IHsKLSAgICAgICAgICAgIGluZm8oIldlYiBJbnNwZWN0b3IgY2xvc2VcbiIpOworICAgICAgICAg ICAgaW5mbygiV2ViIEluc3BlY3RvciBjbG9zZSIpOwogICAgICAgICAgICAgZXdrX3ZpZXdfaW5z cGVjdG9yX2Nsb3NlKG9iaik7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBpbmZvKCJX ZWIgSW5zcGVjdG9yIHNob3dcbiIpOworICAgICAgICAgICAgaW5mbygiV2ViIEluc3BlY3RvciBz aG93Iik7CiAgICAgICAgICAgICBld2tfdmlld19pbnNwZWN0b3Jfc2hvdyhvYmopOwogICAgICAg ICB9CiAgICAgfQpAQCAtODQ2LDEwICs4NDYsMTAgQEAgd2luZG93Q3JlYXRlKFVzZXJfQXJndW1l bnRzICp1c2VyQXJncykKIAogICAgIGlmICh1c2VyQXJncy0+YmFja2luZ1N0b3JlICYmICFzdHJj YXNlY21wKHVzZXJBcmdzLT5iYWNraW5nU3RvcmUsICJ0aWxlZCIpKSB7CiAgICAgICAgIGFwcC0+ YnJvd3NlciA9IGV3a192aWV3X3RpbGVkX2FkZChhcHAtPmV2YXMpOwotICAgICAgICBpbmZvKCJi YWNraW5nIHN0b3JlOiB0aWxlZFxuIik7CisgICAgICAgIGluZm8oImJhY2tpbmcgc3RvcmU6IHRp bGVkIik7CiAgICAgfSBlbHNlIHsKICAgICAgICAgYXBwLT5icm93c2VyID0gZXdrX3ZpZXdfc2lu Z2xlX2FkZChhcHAtPmV2YXMpOwotICAgICAgICBpbmZvKCJiYWNraW5nIHN0b3JlOiBzaW5nbGVc biIpOworICAgICAgICBpbmZvKCJiYWNraW5nIHN0b3JlOiBzaW5nbGUiKTsKIAogICAgICAgICBl d2tfdmlld19zZXR0aW5nX3RpbGVkX2JhY2tpbmdfc3RvcmVfZW5hYmxlZF9zZXQoYXBwLT5icm93 c2VyLCB1c2VyQXJncy0+ZW5hYmxlVGlsZWRCYWNraW5nU3RvcmUpOwogICAgIH0KZGlmZiAtLWdp dCBhL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMgYi9Ub29scy9NaW5pQnJvd3Nlci9lZmwv bWFpbi5jCmluZGV4IDBjMmQ5NTczZmZhZTNmZjBhY2VmNTgyYTlkMDI1NTlmZGI3YWRjNzkuLmI1 OWZjZTcxNWEzMDU1OWJlOTQ2YzQyMTk1NTdmMmRjZDU1YWM5MzAgMTAwNjQ0Ci0tLSBhL1Rvb2xz L01pbmlCcm93c2VyL2VmbC9tYWluLmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4u YwpAQCAtMzksNyArMzksNyBAQCBzdGF0aWMgY29uc3QgZG91YmxlIFRPT0xUSVBfREVMQVlfU0VD T05EUyA9IDEuMDsKICNkZWZpbmUgaW5mbyhmb3JtYXQsIGFyZ3MuLi4pICAgICAgIFwKICAgICBk byB7ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKICAgICAgICAgaWYgKHZlcmJvc2UpICAg ICAgICAgICAgICAgIFwKLSAgICAgICAgICAgIHByaW50Zihmb3JtYXQsICMjYXJncyk7IFwKKyAg ICAgICAgICAgIHByaW50Zihmb3JtYXQiXG4iLCAjI2FyZ3MpOyBcCiAgICAgfSB3aGlsZSAoMCkK IAogc3RhdGljIGludCB2ZXJib3NlID0gMTsKQEAgLTMyNiw0NyArMzI2LDQ3IEBAIG9uX2tleV9k b3duKHZvaWQgKnVzZXJfZGF0YSwgRXZhcyAqZSwgRXZhc19PYmplY3QgKmV3a192aWV3LCB2b2lk ICpldmVudF9pbmZvKQogICAgIEVpbmFfQm9vbCBjdHJsUHJlc3NlZCA9IGV2YXNfa2V5X21vZGlm aWVyX2lzX3NldChldmFzX2tleV9tb2RpZmllcl9nZXQoZSksICJDb250cm9sIik7CiAKICAgICBp ZiAoIXN0cmNtcChldi0+a2V5LCAiRjEiKSkgewotICAgICAgICBpbmZvKCJCYWNrIChGMSkgd2Fz IHByZXNzZWRcbiIpOworICAgICAgICBpbmZvKCJCYWNrIChGMSkgd2FzIHByZXNzZWQiKTsKICAg ICAgICAgaWYgKCFld2tfdmlld19iYWNrKGV3a192aWV3KSkKLSAgICAgICAgICAgIGluZm8oIkJh Y2sgaWdub3JlZDogTm8gYmFjayBoaXN0b3J5XG4iKTsKKyAgICAgICAgICAgIGluZm8oIkJhY2sg aWdub3JlZDogTm8gYmFjayBoaXN0b3J5Iik7CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5r ZXksICJGMiIpKSB7Ci0gICAgICAgIGluZm8oIkZvcndhcmQgKEYyKSB3YXMgcHJlc3NlZFxuIik7 CisgICAgICAgIGluZm8oIkZvcndhcmQgKEYyKSB3YXMgcHJlc3NlZCIpOwogICAgICAgICBpZiAo IWV3a192aWV3X2ZvcndhcmQoZXdrX3ZpZXcpKQotICAgICAgICAgICAgaW5mbygiRm9yd2FyZCBp Z25vcmVkOiBObyBmb3J3YXJkIGhpc3RvcnlcbiIpOworICAgICAgICAgICAgaW5mbygiRm9yd2Fy ZCBpZ25vcmVkOiBObyBmb3J3YXJkIGhpc3RvcnkiKTsKICAgICB9IGVsc2UgaWYgKCFzdHJjbXAo ZXYtPmtleSwgIkYzIikpIHsKICAgICAgICAgY3VycmVudEVuY29kaW5nID0gKGN1cnJlbnRFbmNv ZGluZyArIDEpICUgKHNpemVvZihlbmNvZGluZ3MpIC8gc2l6ZW9mKGVuY29kaW5nc1swXSkpOwog ICAgICAgICBpbmZvKCJTZXQgZW5jb2RpbmcgKEYzKSBwcmVzc2VkLiBOZXcgZW5jb2RpbmcgdG8g JXMiLCBlbmNvZGluZ3NbY3VycmVudEVuY29kaW5nXSk7CiAgICAgICAgIGV3a192aWV3X2N1c3Rv bV9lbmNvZGluZ19zZXQoZXdrX3ZpZXcsIGVuY29kaW5nc1tjdXJyZW50RW5jb2RpbmddKTsKICAg ICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgIkY1IikpIHsKLSAgICAgICAgaW5mbygiUmVs b2FkIChGNSkgd2FzIHByZXNzZWQsIHJlbG9hZGluZy5cbiIpOworICAgICAgICBpbmZvKCJSZWxv YWQgKEY1KSB3YXMgcHJlc3NlZCwgcmVsb2FkaW5nLiIpOwogICAgICAgICBld2tfdmlld19yZWxv YWQoZXdrX3ZpZXcpOwogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiRjYiKSkgewot ICAgICAgICBpbmZvKCJTdG9wIChGNikgd2FzIHByZXNzZWQsIHN0b3AgbG9hZGluZy5cbiIpOwor ICAgICAgICBpbmZvKCJTdG9wIChGNikgd2FzIHByZXNzZWQsIHN0b3AgbG9hZGluZy4iKTsKICAg ICAgICAgZXdrX3ZpZXdfc3RvcChld2tfdmlldyk7CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2 LT5rZXksICJGNyIpKSB7CiAgICAgICAgIEV3a19QYWdpbmF0aW9uX01vZGUgbW9kZSA9ICBld2tf dmlld19wYWdpbmF0aW9uX21vZGVfZ2V0KGV3a192aWV3KTsKICAgICAgICAgbW9kZSA9ICgrK21v ZGUpICUgKEVXS19QQUdJTkFUSU9OX01PREVfQk9UVE9NX1RPX1RPUCArIDEpOwogICAgICAgICBp ZiAoZXdrX3ZpZXdfcGFnaW5hdGlvbl9tb2RlX3NldChld2tfdmlldywgbW9kZSkpCi0gICAgICAg ICAgICBpbmZvKCJDaGFuZ2UgUGFnaW5hdGlvbiBNb2RlIChGNykgd2FzIHByZXNzZWQsIGNoYW5n ZWQgdG86ICVkXG4iLCBtb2RlKTsKKyAgICAgICAgICAgIGluZm8oIkNoYW5nZSBQYWdpbmF0aW9u IE1vZGUgKEY3KSB3YXMgcHJlc3NlZCwgY2hhbmdlZCB0bzogJWQiLCBtb2RlKTsKICAgICAgICAg ZWxzZQogICAgICAgICAgICAgaW5mbygiQ2hhbmdlIFBhZ2luYXRpb24gTW9kZSAoRjcpIHdhcyBw cmVzc2VkLCBidXQgTk9UIGNoYW5nZWQhIik7CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5r ZXksICJGOCIpKSB7Ci0gICAgICAgIGluZm8oIkNyZWF0ZSBzb3VjZSBjb2RlIHdpbmRvdyAoRjgp IHdhcyBwcmVzc2VkLlxuIik7CisgICAgICAgIGluZm8oIkNyZWF0ZSBzb3VjZSBjb2RlIHdpbmRv dyAoRjgpIHdhcyBwcmVzc2VkLiIpOwogICAgICAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0g d2luZG93X2NyZWF0ZShld2tfdmlldywgZXdrX3ZpZXdfdXJsX2dldChld2tfdmlldyksIDAsIDAs IEVJTkFfVFJVRSk7CiAgICAgICAgIHdpbmRvd3MgPSBlaW5hX2xpc3RfYXBwZW5kKHdpbmRvd3Ms IHdpbmRvdyk7CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJGMTEiKSkgewotICAg ICAgICBpbmZvKCJGdWxsc2NyZWVuIChGMTEpIHdhcyBwcmVzc2VkLCB0b2dnbGluZyB3aW5kb3cv ZnVsbHNjcmVlbi5cbiIpOworICAgICAgICBpbmZvKCJGdWxsc2NyZWVuIChGMTEpIHdhcyBwcmVz c2VkLCB0b2dnbGluZyB3aW5kb3cvZnVsbHNjcmVlbi4iKTsKICAgICAgICAgZWxtX3dpbl9mdWxs c2NyZWVuX3NldCh3aW5kb3ctPmVsbV93aW5kb3csICFlbG1fd2luX2Z1bGxzY3JlZW5fZ2V0KHdp bmRvdy0+ZWxtX3dpbmRvdykpOwogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAibiIp ICYmIGN0cmxQcmVzc2VkKSB7Ci0gICAgICAgIGluZm8oIkNyZWF0ZSBuZXcgd2luZG93IChDdHJs K24pIHdhcyBwcmVzc2VkLlxuIik7CisgICAgICAgIGluZm8oIkNyZWF0ZSBuZXcgd2luZG93IChD dHJsK24pIHdhcyBwcmVzc2VkLiIpOwogICAgICAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0g d2luZG93X2NyZWF0ZShOVUxMLCBERUZBVUxUX1VSTCwgMCwgMCwgRUlOQV9GQUxTRSk7CiAgICAg ICAgIC8vIDAgZXF1YWxzIGRlZmF1bHQgd2lkdGggYW5kIGhlaWdodC4KICAgICAgICAgd2luZG93 cyA9IGVpbmFfbGlzdF9hcHBlbmQod2luZG93cywgd2luZG93KTsKICAgICB9IGVsc2UgaWYgKCFz dHJjbXAoZXYtPmtleSwgImkiKSAmJiBjdHJsUHJlc3NlZCkgewotICAgICAgICBpbmZvKCJTaG93 IEluc3BlY3RvciAoQ3RybCtpKSB3YXMgcHJlc3NlZC5cbiIpOworICAgICAgICBpbmZvKCJTaG93 IEluc3BlY3RvciAoQ3RybCtpKSB3YXMgcHJlc3NlZC4iKTsKICAgICAgICAgZXdrX3ZpZXdfaW5z cGVjdG9yX3Nob3coZXdrX3ZpZXcpOwogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAi ZiIpICYmIGN0cmxQcmVzc2VkKSB7Ci0gICAgICAgIGluZm8oIlNob3cgU2VhcmNoIEJveCAoQ3Ry bCtmKSB3YXMgcHJlc3NlZC5cbiIpOworICAgICAgICBpbmZvKCJTaG93IFNlYXJjaCBCb3ggKEN0 cmwrZikgd2FzIHByZXNzZWQuIik7CiAgICAgICAgIHNlYXJjaF9ib3hfc2hvdyh3aW5kb3cpOwog ICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiRXNjYXBlIikpIHsKICAgICAgICAgaWYg KGV2YXNfb2JqZWN0X3Zpc2libGVfZ2V0KHdpbmRvdy0+c2VhcmNoLnNlYXJjaF9iYXIpKQpAQCAt Mzc2LDE1ICszNzYsMTUgQEAgb25fa2V5X2Rvd24odm9pZCAqdXNlcl9kYXRhLCBFdmFzICplLCBF dmFzX09iamVjdCAqZXdrX3ZpZXcsIHZvaWQgKmV2ZW50X2luZm8pCiAgICAgfSBlbHNlIGlmIChj dHJsUHJlc3NlZCAmJiAoIXN0cmNtcChldi0+a2V5LCAibWludXMiKSB8fCAhc3RyY21wKGV2LT5r ZXksICJLUF9TdWJ0cmFjdCIpKSkgewogICAgICAgICBpZiAoem9vbV9sZXZlbF9zZXQoZXdrX3Zp ZXcsIHdpbmRvdy0+Y3VycmVudF96b29tX2xldmVsIC0gMSkpCiAgICAgICAgICAgICB3aW5kb3ct PmN1cnJlbnRfem9vbV9sZXZlbC0tOwotICAgICAgICBpbmZvKCJab29tIG91dCAoQ3RybCArICct Jykgd2FzIHByZXNzZWQsIHpvb20gbGV2ZWwgYmVjYW1lICUuMmZcbiIsIHpvb21MZXZlbHNbd2lu ZG93LT5jdXJyZW50X3pvb21fbGV2ZWxdKTsKKyAgICAgICAgaW5mbygiWm9vbSBvdXQgKEN0cmwg KyAnLScpIHdhcyBwcmVzc2VkLCB6b29tIGxldmVsIGJlY2FtZSAlLjJmIiwgem9vbUxldmVsc1t3 aW5kb3ctPmN1cnJlbnRfem9vbV9sZXZlbF0pOwogICAgIH0gZWxzZSBpZiAoY3RybFByZXNzZWQg JiYgKCFzdHJjbXAoZXYtPmtleSwgImVxdWFsIikgfHwgIXN0cmNtcChldi0+a2V5LCAiS1BfQWRk IikpKSB7CiAgICAgICAgIGlmICh6b29tX2xldmVsX3NldChld2tfdmlldywgd2luZG93LT5jdXJy ZW50X3pvb21fbGV2ZWwgKyAxKSkKICAgICAgICAgICAgIHdpbmRvdy0+Y3VycmVudF96b29tX2xl dmVsKys7Ci0gICAgICAgIGluZm8oIlpvb20gaW4gKEN0cmwgKyAnKycpIHdhcyBwcmVzc2VkLCB6 b29tIGxldmVsIGJlY2FtZSAlLjJmXG4iLCB6b29tTGV2ZWxzW3dpbmRvdy0+Y3VycmVudF96b29t X2xldmVsXSk7CisgICAgICAgIGluZm8oIlpvb20gaW4gKEN0cmwgKyAnKycpIHdhcyBwcmVzc2Vk LCB6b29tIGxldmVsIGJlY2FtZSAlLjJmIiwgem9vbUxldmVsc1t3aW5kb3ctPmN1cnJlbnRfem9v bV9sZXZlbF0pOwogICAgIH0gZWxzZSBpZiAoY3RybFByZXNzZWQgJiYgIXN0cmNtcChldi0+a2V5 LCAiMCIpKSB7CiAgICAgICAgIGlmICh6b29tX2xldmVsX3NldChld2tfdmlldywgREVGQVVMVF9a T09NX0xFVkVMKSkKICAgICAgICAgICAgIHdpbmRvdy0+Y3VycmVudF96b29tX2xldmVsID0gREVG QVVMVF9aT09NX0xFVkVMOwotICAgICAgICBpbmZvKCJab29tIHRvIGRlZmF1bHQgKEN0cmwgKyAn MCcpIHdhcyBwcmVzc2VkLCB6b29tIGxldmVsIGJlY2FtZSAlLjJmXG4iLCB6b29tTGV2ZWxzW3dp bmRvdy0+Y3VycmVudF96b29tX2xldmVsXSk7CisgICAgICAgIGluZm8oIlpvb20gdG8gZGVmYXVs dCAoQ3RybCArICcwJykgd2FzIHByZXNzZWQsIHpvb20gbGV2ZWwgYmVjYW1lICUuMmYiLCB6b29t TGV2ZWxzW3dpbmRvdy0+Y3VycmVudF96b29tX2xldmVsXSk7CiAgICAgfQogfQogCkBAIC01MTAs NyArNTEwLDcgQEAgb25fZG93bmxvYWRfcmVxdWVzdCh2b2lkICp1c2VyX2RhdGEsIEV2YXNfT2Jq ZWN0ICpld2tfdmlldywgdm9pZCAqZXZlbnRfaW5mbykKICAgICB9CiAKICAgICBld2tfZG93bmxv YWRfam9iX2Rlc3RpbmF0aW9uX3NldChkb3dubG9hZCwgZWluYV9zdHJidWZfc3RyaW5nX2dldChk ZXN0aW5hdGlvbl9wYXRoKSk7Ci0gICAgaW5mbygiRG93bmxvYWRpbmc6ICVzXG4iLCBlaW5hX3N0 cmJ1Zl9zdHJpbmdfZ2V0KGRlc3RpbmF0aW9uX3BhdGgpKTsKKyAgICBpbmZvKCJEb3dubG9hZGlu ZzogJXMiLCBlaW5hX3N0cmJ1Zl9zdHJpbmdfZ2V0KGRlc3RpbmF0aW9uX3BhdGgpKTsKICAgICBl aW5hX3N0cmJ1Zl9mcmVlKGRlc3RpbmF0aW9uX3BhdGgpOwogfQogCkBAIC01ODUsMTMgKzU4NSwx MyBAQCBzdGF0aWMgdm9pZAogb25fZG93bmxvYWRfZmluaXNoZWQodm9pZCAqdXNlcl9kYXRhLCBF dmFzX09iamVjdCAqZXdrX3ZpZXcsIHZvaWQgKmV2ZW50X2luZm8pCiB7CiAgICAgRXdrX0Rvd25s b2FkX0pvYiAqZG93bmxvYWQgPSAoRXdrX0Rvd25sb2FkX0pvYiAqKWV2ZW50X2luZm87Ci0gICAg aW5mbygiRG93bmxvYWQgZmluaXNoZWQ6ICVzXG4iLCAgZXdrX2Rvd25sb2FkX2pvYl9kZXN0aW5h dGlvbl9nZXQoZG93bmxvYWQpKTsKKyAgICBpbmZvKCJEb3dubG9hZCBmaW5pc2hlZDogJXMiLCAg ZXdrX2Rvd25sb2FkX2pvYl9kZXN0aW5hdGlvbl9nZXQoZG93bmxvYWQpKTsKIH0KIAogc3RhdGlj IHZvaWQKIG9uX2Rvd25sb2FkX2ZhaWxlZCh2b2lkICp1c2VyX2RhdGEsIEV2YXNfT2JqZWN0ICpl d2tfdmlldywgdm9pZCAqZXZlbnRfaW5mbykKIHsKLSAgICBpbmZvKCJEb3dubG9hZCBmYWlsZWQh XG4iKTsKKyAgICBpbmZvKCJEb3dubG9hZCBmYWlsZWQhIik7CiB9CiAKIHN0YXRpYyB2b2lkCkBA IC03NTMsMTAgKzc1MywxMCBAQCBvbl9yZWZyZXNoX2J1dHRvbl9jbGlja2VkKHZvaWQgKnVzZXJf ZGF0YSwgRXZhc19PYmplY3QgKnJlZnJlc2hfYnV0dG9uLCB2b2lkICpldgogICAgIEV2YXMgKmV2 YXMgPSBldmFzX29iamVjdF9ldmFzX2dldChyZWZyZXNoX2J1dHRvbik7CiAgICAgRWluYV9Cb29s IGN0cmxQcmVzc2VkID0gZXZhc19rZXlfbW9kaWZpZXJfaXNfc2V0KGV2YXNfa2V5X21vZGlmaWVy X2dldChldmFzKSwgIkNvbnRyb2wiKTsKICAgICBpZiAoY3RybFByZXNzZWQpIHsKLSAgICAgICAg aW5mbygiUmVsb2FkaW5nIGFuZCBieXBhc3NpbmcgY2FjaGUuLi5cbiIpOworICAgICAgICBpbmZv KCJSZWxvYWRpbmcgYW5kIGJ5cGFzc2luZyBjYWNoZS4uLiIpOwogICAgICAgICBld2tfdmlld19y ZWxvYWRfYnlwYXNzX2NhY2hlKHdpbmRvdy0+ZXdrX3ZpZXcpOwogICAgIH0gZWxzZSB7Ci0gICAg ICAgIGluZm8oIlJlbG9hZGluZy4uLlxuIik7CisgICAgICAgIGluZm8oIlJlbG9hZGluZy4uLiIp OwogICAgICAgICBld2tfdmlld19yZWxvYWQod2luZG93LT5ld2tfdmlldyk7CiAgICAgfQogfQpA QCAtODk2LDcgKzg5Niw3IEBAIHN0YXRpYyB2b2lkCiBvbl9wb3B1cF9tZW51X2Rpc2NhcmRlZCh2 b2lkICp1c2VyX2RhdGEsIEV2YXNfT2JqZWN0ICpvYmosIHZvaWQgKmV2ZW50X2luZm8pCiB7CiAg ICAgLy8gVGhlIHVzZXIgY2xpY2tlZCBvdXRzaWRlIHRoZSBtZW51IHRvIGRpc2NhcmQgaXQuCi0g ICAgaW5mbygiUG9wdXAgbWVudSB3YXMgZGlzY2FyZGVkLlxuIik7CisgICAgaW5mbygiUG9wdXAg bWVudSB3YXMgZGlzY2FyZGVkLiIpOwogICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSAoQnJv d3Nlcl9XaW5kb3cgKil1c2VyX2RhdGE7CiAgICAgZXdrX3BvcHVwX21lbnVfY2xvc2Uod2luZG93 LT5wb3B1cC5ld2tfbWVudSk7CiB9CkBAIC05MDcsNyArOTA3LDcgQEAgb25fcG9wdXBfbWVudV9p dGVtX2NsaWNrZWQodm9pZCAqdXNlcl9kYXRhLCBFdmFzX09iamVjdCAqb2JqLCB2b2lkICpldmVu dF9pbmZvKQogICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSAoQnJvd3Nlcl9XaW5kb3cgKil1 c2VyX2RhdGE7CiAgICAgRWxtX09iamVjdF9JdGVtICppdGVtID0gKEVsbV9PYmplY3RfSXRlbSAq KWV2ZW50X2luZm87CiAKLSAgICBpbmZvKCJTZWxlY3RlZCBwb3B1cCBtZW51IGluZGV4OiAldVxu IiwgZWxtX21lbnVfaXRlbV9pbmRleF9nZXQoaXRlbSkpOworICAgIGluZm8oIlNlbGVjdGVkIHBv cHVwIG1lbnUgaW5kZXg6ICV1IiwgZWxtX21lbnVfaXRlbV9pbmRleF9nZXQoaXRlbSkpOwogICAg IGV3a19wb3B1cF9tZW51X3NlbGVjdGVkX2luZGV4X3NldCh3aW5kb3ctPnBvcHVwLmV3a19tZW51 LCBlbG1fbWVudV9pdGVtX2luZGV4X2dldChpdGVtKSk7CiAKICAgICAvLyBDbG9zZSBwb3B1cCBt ZW51LgpAQCAtOTQxLDcgKzk0MSw3IEBAIHBvcHVwX21lbnVfcG9wdWxhdGUoRXZhc19PYmplY3Qg KmVsbV9tZW51LCBFd2tfUG9wdXBfTWVudSAqZXdrX21lbnUsIHZvaWQgKnVzZXJfCiAgICAgICAg ICAgICB9CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAg IGluZm8oIlVucmVjb2duaXplZCBwb3B1cCBtZW51IGl0ZW0gdHlwZSFcbiIpOworICAgICAgICAg ICAgaW5mbygiVW5yZWNvZ25pemVkIHBvcHVwIG1lbnUgaXRlbSB0eXBlISIpOwogICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgIH0KICAgICB9CkBAIC05NjEsNyArOTYxLDcgQEAgb25fcG9wdXBf bWVudV9zaG93KEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNtYXJ0RGF0YSwgRWluYV9SZWN0YW5nbGUg cmVjdCwgRXdrX1RleHQKIAogICAgIHBvcHVwX21lbnVfcG9wdWxhdGUod2luZG93LT5wb3B1cC5l bG1fbWVudSwgZXdrX21lbnUsIHdpbmRvdyk7CiAKLSAgICBpbmZvKCJTaG93aW5nIHBvcHVwIG1l bnUgYXQgKCVkLCAlZClcbiIsIHJlY3QueCwgcmVjdC55KTsKKyAgICBpbmZvKCJTaG93aW5nIHBv cHVwIG1lbnUgYXQgKCVkLCAlZCkiLCByZWN0LngsIHJlY3QueSk7CiAgICAgZWxtX21lbnVfbW92 ZSh3aW5kb3ctPnBvcHVwLmVsbV9tZW51LCByZWN0LngsIHJlY3QueSk7CiAgICAgZXZhc19vYmpl Y3Rfc2hvdyh3aW5kb3ctPnBvcHVwLmVsbV9tZW51KTsKIApAQCAtMTA5Miw3ICsxMDkyLDcgQEAg b25fd2luZG93X2NyZWF0ZShFd2tfVmlld19TbWFydF9EYXRhICpzbWFydERhdGEsIGNvbnN0IGNo YXIgKnVybCwgY29uc3QgRXdrX1dpbmQKIAogICAgIHdpbmRvd3MgPSBlaW5hX2xpc3RfYXBwZW5k KHdpbmRvd3MsIHdpbmRvdyk7CiAKLSAgICBpbmZvKCJtaW5pYnJvd3NlcjogbG9jYXRpb24oJWQs JWQpIHNpemU9KCVkLCVkKSB1cmw9JXNcbiIsIHgsIHksIHdpZHRoLCBoZWlnaHQsIHVybCk7Cisg ICAgaW5mbygibWluaWJyb3dzZXI6IGxvY2F0aW9uKCVkLCVkKSBzaXplPSglZCwlZCkgdXJsPSVz IiwgeCwgeSwgd2lkdGgsIGhlaWdodCwgdXJsKTsKIAogICAgIHJldHVybiBuZXdfdmlldzsKIH0K QEAgLTExMTEsMTIgKzExMTEsMTIgQEAgc3RhdGljIHZvaWQKIGNvbnRleHRfcG9wdXBfaXRlbV9z ZWxlY3RlZF9jYih2b2lkICpkYXRhLCBFdmFzX09iamVjdCAqb2JqLCB2b2lkICpldmVudF9pbmZv KQogewogICAgIGlmICghZGF0YSkgewotICAgICAgICBpbmZvKCJFUlJPUjogY29udGV4dCBwb3B1 cCBjYWxsYmFjayBkYXRhIGlzIE5VTEwuXG4iKTsKKyAgICAgICAgaW5mbygiRVJST1I6IGNvbnRl eHQgcG9wdXAgY2FsbGJhY2sgZGF0YSBpcyBOVUxMLiIpOwogICAgICAgICByZXR1cm47CiAgICAg fQogCiAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtICpld2tfaXRlbSA9IChFd2tfQ29udGV4dF9N ZW51X0l0ZW0gKilkYXRhOwotICAgIGluZm8oIlNlbGVjdGVkIGNvbnRleHQgcG9wdXAgaXRlbTog JXMuXG4iLCBld2tfY29udGV4dF9tZW51X2l0ZW1fdGl0bGVfZ2V0KGV3a19pdGVtKSk7CisgICAg aW5mbygiU2VsZWN0ZWQgY29udGV4dCBwb3B1cCBpdGVtOiAlcy4iLCBld2tfY29udGV4dF9tZW51 X2l0ZW1fdGl0bGVfZ2V0KGV3a19pdGVtKSk7CiAgICAgZXdrX2NvbnRleHRfbWVudV9pdGVtX3Nl bGVjdChld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KGV3a19pdGVtKSwgZXdr X2l0ZW0pOwogICAgIGV3a19jb250ZXh0X21lbnVfaGlkZShld2tfY29udGV4dF9tZW51X2l0ZW1f cGFyZW50X21lbnVfZ2V0KGV3a19pdGVtKSk7CiB9CkBAIC0xMTU3LDIwICsxMTU3LDIwIEBAIG9u X2NvbnRleHRfbWVudV9zaG93KEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCBFdmFzX0Nvb3JkIHgs IEV2YXNfQ29vcmQgeSwgRXdrX0NvCiAgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IHdpbmRv d19maW5kX3dpdGhfZXdrX3ZpZXcoc2QtPnNlbGYpOwogCiAgICAgaWYgKCF3aW5kb3cgfHwgIW1l bnUpIHsKLSAgICAgICAgaW5mbygiRVJST1I6IG5lY2Vzc2FyeSBvYmplY3RzIGFyZSBOVUxMLlxu Iik7CisgICAgICAgIGluZm8oIkVSUk9SOiBuZWNlc3Nhcnkgb2JqZWN0cyBhcmUgTlVMTC4iKTsK ICAgICAgICAgcmV0dXJuIEVJTkFfRkFMU0U7CiAgICAgfQogCiAgICAgd2luZG93LT5jb250ZXh0 X3BvcHVwID0gZWxtX2N0eHBvcHVwX2FkZCh3aW5kb3ctPmVsbV93aW5kb3cpOwogCiAgICAgaWYg KCF3aW5kb3ctPmNvbnRleHRfcG9wdXApIHsKLSAgICAgICAgaW5mbygiRVJST1I6IGNvdWxkIG5v dCBjcmVhdGUgY29udGV4dCBwb3B1cCB3aWRnZXQuXG4iKTsKKyAgICAgICAgaW5mbygiRVJST1I6 IGNvdWxkIG5vdCBjcmVhdGUgY29udGV4dCBwb3B1cCB3aWRnZXQuIik7CiAgICAgICAgIHJldHVy biBFSU5BX0ZBTFNFOwogICAgIH0KIAogICAgIGNvbnRleHRfcG9wdXBfcG9wdWxhdGUod2luZG93 LCBtZW51KTsKIAotICAgIGluZm8oIlNob3dpbmcgY29udGV4dCBwb3B1cCBhdCAoJWQsICVkKS5c biIsIHgsIHkpOworICAgIGluZm8oIlNob3dpbmcgY29udGV4dCBwb3B1cCBhdCAoJWQsICVkKS4i LCB4LCB5KTsKICAgICBldmFzX29iamVjdF9tb3ZlKHdpbmRvdy0+Y29udGV4dF9wb3B1cCwgeCwg eSk7CiAgICAgZXZhc19vYmplY3Rfc2hvdyh3aW5kb3ctPmNvbnRleHRfcG9wdXApOwogCkBAIC0x MTgzLDcgKzExODMsNyBAQCBvbl9jb250ZXh0X21lbnVfaGlkZShFd2tfVmlld19TbWFydF9EYXRh ICpzZCkKICAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gd2luZG93X2ZpbmRfd2l0aF9ld2tf dmlldyhzZC0+c2VsZik7CiAKICAgICBpZiAoIXdpbmRvdyB8fCAhd2luZG93LT5jb250ZXh0X3Bv cHVwKSB7Ci0gICAgICAgIGluZm8oIkVSUk9SOiBuZWNlc3Nhcnkgb2JqZWN0cyBhcmUgTlVMTC5c biIpOworICAgICAgICBpbmZvKCJFUlJPUjogbmVjZXNzYXJ5IG9iamVjdHMgYXJlIE5VTEwuIik7 CiAgICAgICAgIHJldHVybiBFSU5BX0ZBTFNFOwogICAgIH0KIApAQCAtMTM3Niw3ICsxMzc2LDcg QEAgc3RhdGljIEJyb3dzZXJfV2luZG93ICp3aW5kb3dfY3JlYXRlKEV2YXNfT2JqZWN0ICpvcGVu ZXIsIGNvbnN0IGNoYXIgKnVybCwgaW50IHcKIHsKICAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93 ID0gY2FsbG9jKDEsIHNpemVvZihCcm93c2VyX1dpbmRvdykpOwogICAgIGlmICghd2luZG93KSB7 Ci0gICAgICAgIGluZm8oIkVSUk9SOiBjb3VsZCBub3QgY3JlYXRlIGJyb3dzZXIgd2luZG93Llxu Iik7CisgICAgICAgIGluZm8oIkVSUk9SOiBjb3VsZCBub3QgY3JlYXRlIGJyb3dzZXIgd2luZG93 LiIpOwogICAgICAgICByZXR1cm4gTlVMTDsKICAgICB9CiAKQEAgLTE1NDAsNyArMTU0MCw3IEBA IHN0YXRpYyBCcm93c2VyX1dpbmRvdyAqd2luZG93X2NyZWF0ZShFdmFzX09iamVjdCAqb3BlbmVy LCBjb25zdCBjaGFyICp1cmwsIGludCB3CiAgICAgZXdrX3NldHRpbmdzX2VuY29kaW5nX2RldGVj dG9yX2VuYWJsZWRfc2V0KHNldHRpbmdzLCBlbmNvZGluZ19kZXRlY3Rvcl9lbmFibGVkKTsKICAg ICBld2tfc2V0dGluZ3NfZnJhbWVfZmxhdHRlbmluZ19lbmFibGVkX3NldChzZXR0aW5ncywgZnJh bWVfZmxhdHRlbmluZ19lbmFibGVkKTsKICAgICBld2tfc2V0dGluZ3NfbG9jYWxfc3RvcmFnZV9l bmFibGVkX3NldChzZXR0aW5ncywgbG9jYWxfc3RvcmFnZV9lbmFibGVkKTsKLSAgICBpbmZvKCJI VE1MNSBsb2NhbCBzdG9yYWdlIGlzICVzIGZvciB0aGlzIHZpZXcuXG4iLCBsb2NhbF9zdG9yYWdl X2VuYWJsZWQgPyAiZW5hYmxlZCIgOiAiZGlzYWJsZWQiKTsKKyAgICBpbmZvKCJIVE1MNSBsb2Nh bCBzdG9yYWdlIGlzICVzIGZvciB0aGlzIHZpZXcuIiwgbG9jYWxfc3RvcmFnZV9lbmFibGVkID8g ImVuYWJsZWQiIDogImRpc2FibGVkIik7CiAgICAgZWxtX3dpbl9mdWxsc2NyZWVuX3NldCh3aW5k b3ctPmVsbV93aW5kb3csIGZ1bGxzY3JlZW5fZW5hYmxlZCk7CiAgICAgZXdrX3NldHRpbmdzX2Rl dmVsb3Blcl9leHRyYXNfZW5hYmxlZF9zZXQoc2V0dGluZ3MsIEVJTkFfVFJVRSk7CiAgICAgZXdr X3NldHRpbmdzX3ByZWZlcnJlZF9taW5pbXVtX2NvbnRlbnRzX3dpZHRoX3NldChzZXR0aW5ncywg MCk7Cg==