99934 2012-10-21 08:27:06 -0700 [EFL][WK2] Make Ewk_Form_Submission_Request, Ewk_Navigation_Data and Ewk_Navigation_Policy_Decision members private 2012-10-21 09:34:29 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 99696 1 cdumez cdumez gyuyoung.kim kenneth laszlo.gombos lucas.de.marchi rakuco tonikitoo webkit.review.bot oldest_to_newest 747101 0 cdumez 2012-10-21 08:27:06 -0700 as part of Bug 99696, make Ewk_Form_Submission_Request, Ewk_Navigation_Data and Ewk_Navigation_Policy_Decision class members private. 747102 1 169802 cdumez 2012-10-21 08:30:04 -0700 Created attachment 169802 Patch 747117 2 169802 webkit.review.bot 2012-10-21 09:34:25 -0700 Comment on attachment 169802 Patch Clearing flags on attachment: 169802 Committed r132005: <http://trac.webkit.org/changeset/132005> 747118 3 webkit.review.bot 2012-10-21 09:34:29 -0700 All reviewed patches have been landed. Closing bug. 169802 2012-10-21 08:30:04 -0700 2012-10-21 09:34:25 -0700 Patch 99934_more_cpp.patch text/plain 17907 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3M2NjMmNlLi43MjgyM2VmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNTgg QEAKIDIwMTItMTAtMjEgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KIAorICAgICAgICBbRUZMXVtXSzJdIE1ha2UgRXdrX0Zvcm1fU3VibWlzc2lvbl9SZXF1 ZXN0LCBFd2tfTmF2aWdhdGlvbl9EYXRhIGFuZCBFd2tfTmF2aWdhdGlvbl9Qb2xpY3lfRGVjaXNp b24gbWVtYmVycyBwcml2YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD05OTkzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIE1ha2UgRXdrX0Zvcm1fU3VibWlzc2lvbl9SZXF1ZXN0LCBFd2tfTmF2aWdhdGlv bl9EYXRhIGFuZAorICAgICAgICBFd2tfTmF2aWdhdGlvbl9Qb2xpY3lfRGVjaXNpb24gY2xhc3Mg bWVtYmVycyBwcml2YXRlLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Zvcm1f c3VibWlzc2lvbl9yZXF1ZXN0LmNwcDoKKyAgICAgICAgKEV3a19Gb3JtX1N1Ym1pc3Npb25fUmVx dWVzdDo6RXdrX0Zvcm1fU3VibWlzc2lvbl9SZXF1ZXN0KToKKyAgICAgICAgKEV3a19Gb3JtX1N1 Ym1pc3Npb25fUmVxdWVzdDo6fkV3a19Gb3JtX1N1Ym1pc3Npb25fUmVxdWVzdCk6CisgICAgICAg IChFd2tfRm9ybV9TdWJtaXNzaW9uX1JlcXVlc3Q6OmZpZWxkVmFsdWUpOgorICAgICAgICAoRXdr X0Zvcm1fU3VibWlzc2lvbl9SZXF1ZXN0OjpmaWVsZE5hbWVzKToKKyAgICAgICAgKEV3a19Gb3Jt X1N1Ym1pc3Npb25fUmVxdWVzdDo6c3VibWl0KToKKyAgICAgICAgKGV3a19mb3JtX3N1Ym1pc3Np b25fcmVxdWVzdF9maWVsZF9uYW1lc19nZXQpOgorICAgICAgICAoZXdrX2Zvcm1fc3VibWlzc2lv bl9yZXF1ZXN0X2ZpZWxkX3ZhbHVlX2dldCk6CisgICAgICAgIChld2tfZm9ybV9zdWJtaXNzaW9u X3JlcXVlc3Rfc3VibWl0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfZm9ybV9z dWJtaXNzaW9uX3JlcXVlc3RfcHJpdmF0ZS5oOgorICAgICAgICAoRXdrX0Zvcm1fU3VibWlzc2lv bl9SZXF1ZXN0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfbmF2aWdhdGlvbl9k YXRhLmNwcDoKKyAgICAgICAgKEV3a19OYXZpZ2F0aW9uX0RhdGE6OkV3a19OYXZpZ2F0aW9uX0Rh dGEpOgorICAgICAgICAoRXdrX05hdmlnYXRpb25fRGF0YTo6b3JpZ2luYWxSZXF1ZXN0KToKKyAg ICAgICAgKEV3a19OYXZpZ2F0aW9uX0RhdGE6OnRpdGxlKToKKyAgICAgICAgKEV3a19OYXZpZ2F0 aW9uX0RhdGE6OnVybCk6CisgICAgICAgIChld2tfbmF2aWdhdGlvbl9kYXRhX3RpdGxlX2dldCk6 CisgICAgICAgIChld2tfbmF2aWdhdGlvbl9kYXRhX29yaWdpbmFsX3JlcXVlc3RfZ2V0KToKKyAg ICAgICAgKGV3a19uYXZpZ2F0aW9uX2RhdGFfdXJsX2dldCk6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9lZmwvZXdrX25hdmlnYXRpb25fZGF0YV9wcml2YXRlLmg6CisgICAgICAgIChFd2tfTmF2 aWdhdGlvbl9EYXRhKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfbmF2aWdhdGlv bl9wb2xpY3lfZGVjaXNpb24uY3BwOgorICAgICAgICAoRXdrX05hdmlnYXRpb25fUG9saWN5X0Rl Y2lzaW9uOjpFd2tfTmF2aWdhdGlvbl9Qb2xpY3lfRGVjaXNpb24pOgorICAgICAgICAoRXdrX05h dmlnYXRpb25fUG9saWN5X0RlY2lzaW9uOjp+RXdrX05hdmlnYXRpb25fUG9saWN5X0RlY2lzaW9u KToKKyAgICAgICAgKEV3a19OYXZpZ2F0aW9uX1BvbGljeV9EZWNpc2lvbjo6bmF2aWdhdGlvblR5 cGUpOgorICAgICAgICAoRXdrX05hdmlnYXRpb25fUG9saWN5X0RlY2lzaW9uOjptb3VzZUJ1dHRv bik6CisgICAgICAgIChFd2tfTmF2aWdhdGlvbl9Qb2xpY3lfRGVjaXNpb246Om1vZGlmaWVycyk6 CisgICAgICAgIChFd2tfTmF2aWdhdGlvbl9Qb2xpY3lfRGVjaXNpb246OmZyYW1lTmFtZSk6Cisg ICAgICAgIChFd2tfTmF2aWdhdGlvbl9Qb2xpY3lfRGVjaXNpb246OnJlcXVlc3QpOgorICAgICAg ICAoRXdrX05hdmlnYXRpb25fUG9saWN5X0RlY2lzaW9uOjphY2NlcHQpOgorICAgICAgICAoRXdr X05hdmlnYXRpb25fUG9saWN5X0RlY2lzaW9uOjpyZWplY3QpOgorICAgICAgICAoRXdrX05hdmln YXRpb25fUG9saWN5X0RlY2lzaW9uOjpkb3dubG9hZCk6CisgICAgICAgIChld2tfbmF2aWdhdGlv bl9wb2xpY3lfbmF2aWdhdGlvbl90eXBlX2dldCk6CisgICAgICAgIChld2tfbmF2aWdhdGlvbl9w b2xpY3lfbW91c2VfYnV0dG9uX2dldCk6CisgICAgICAgIChld2tfbmF2aWdhdGlvbl9wb2xpY3lf bW9kaWZpZXJzX2dldCk6CisgICAgICAgIChld2tfbmF2aWdhdGlvbl9wb2xpY3lfZnJhbWVfbmFt ZV9nZXQpOgorICAgICAgICAoZXdrX25hdmlnYXRpb25fcG9saWN5X3JlcXVlc3RfZ2V0KToKKyAg ICAgICAgKGV3a19uYXZpZ2F0aW9uX3BvbGljeV9kZWNpc2lvbl9hY2NlcHQpOgorICAgICAgICAo ZXdrX25hdmlnYXRpb25fcG9saWN5X2RlY2lzaW9uX3JlamVjdCk6CisgICAgICAgIChld2tfbmF2 aWdhdGlvbl9wb2xpY3lfZGVjaXNpb25fZG93bmxvYWQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZWZsL2V3a19uYXZpZ2F0aW9uX3BvbGljeV9kZWNpc2lvbl9wcml2YXRlLmg6CisgICAgICAg IChFd2tfTmF2aWdhdGlvbl9Qb2xpY3lfRGVjaXNpb24pOgorCisyMDEyLTEwLTIxICBDaHJpc3Rv cGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CisKICAgICAgICAgW0VGTF1b V0syXSBNYWtlIEV3ayBpbnRlbnQgY2xhc3NlcyBtZW1iZXJzIHByaXZhdGUKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5ODMyCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19mb3JtX3N1Ym1pc3Npb25fcmVx dWVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfZm9ybV9zdWJt aXNzaW9uX3JlcXVlc3QuY3BwCmluZGV4IGVlMTQwZjkuLjc2ZGUyMWEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19mb3JtX3N1Ym1pc3Npb25fcmVxdWVz dC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Zvcm1fc3Vi bWlzc2lvbl9yZXF1ZXN0LmNwcApAQCAtMzUsNiArMzUsMzkgQEAKIAogdXNpbmcgbmFtZXNwYWNl IFdlYktpdDsKIAorRXdrX0Zvcm1fU3VibWlzc2lvbl9SZXF1ZXN0OjpFd2tfRm9ybV9TdWJtaXNz aW9uX1JlcXVlc3QoV0tEaWN0aW9uYXJ5UmVmIHZhbHVlcywgV0tGb3JtU3VibWlzc2lvbkxpc3Rl bmVyUmVmIGxpc3RlbmVyKQorICAgIDogbV93a1ZhbHVlcyh2YWx1ZXMpCisgICAgLCBtX3drTGlz dGVuZXIobGlzdGVuZXIpCisgICAgLCBtX2hhbmRsZWRSZXF1ZXN0KGZhbHNlKQoreyB9CisKK0V3 a19Gb3JtX1N1Ym1pc3Npb25fUmVxdWVzdDo6fkV3a19Gb3JtX1N1Ym1pc3Npb25fUmVxdWVzdCgp Cit7CisgICAgLy8gTWFrZSBzdXJlIHRoZSByZXF1ZXN0IGlzIGFsd2F5cyBoYW5kbGVkIGJlZm9y ZSBkZXN0cm95aW5nLgorICAgIGlmICghbV9oYW5kbGVkUmVxdWVzdCkKKyAgICAgICAgV0tGb3Jt U3VibWlzc2lvbkxpc3RlbmVyQ29udGludWUobV93a0xpc3RlbmVyLmdldCgpKTsKK30KKworU3Ry aW5nIEV3a19Gb3JtX1N1Ym1pc3Npb25fUmVxdWVzdDo6ZmllbGRWYWx1ZShjb25zdCBTdHJpbmcm IGZpZWxkTmFtZSkgY29uc3QKK3sKKyAgICBBU1NFUlQoZmllbGROYW1lKTsKKyAgICBXS1JldGFp blB0cjxXS1N0cmluZ1JlZj4gd2tGaWVsZE5hbWUgPSB0b0NvcGllZEFQSShmaWVsZE5hbWUpOwor ICAgIFdLU3RyaW5nUmVmIHdrVmFsdWUgPSBzdGF0aWNfY2FzdDxXS1N0cmluZ1JlZj4oV0tEaWN0 aW9uYXJ5R2V0SXRlbUZvcktleShtX3drVmFsdWVzLmdldCgpLCB3a0ZpZWxkTmFtZS5nZXQoKSkp OworCisgICAgcmV0dXJuIHdrVmFsdWUgPyB0b0ltcGwod2tWYWx1ZSktPnN0cmluZygpIDogU3Ry aW5nKCk7Cit9CisKK1dLUmV0YWluUHRyPFdLQXJyYXlSZWY+IEV3a19Gb3JtX1N1Ym1pc3Npb25f UmVxdWVzdDo6ZmllbGROYW1lcygpIGNvbnN0Cit7CisgICAgcmV0dXJuIGFkb3B0V0soV0tEaWN0 aW9uYXJ5Q29weUtleXMobV93a1ZhbHVlcy5nZXQoKSkpOworfQorCit2b2lkIEV3a19Gb3JtX1N1 Ym1pc3Npb25fUmVxdWVzdDo6c3VibWl0KCkKK3sKKyAgICBXS0Zvcm1TdWJtaXNzaW9uTGlzdGVu ZXJDb250aW51ZShtX3drTGlzdGVuZXIuZ2V0KCkpOworICAgIG1faGFuZGxlZFJlcXVlc3QgPSB0 cnVlOworfQorCiBFd2tfRm9ybV9TdWJtaXNzaW9uX1JlcXVlc3QqIGV3a19mb3JtX3N1Ym1pc3Np b25fcmVxdWVzdF9yZWYoRXdrX0Zvcm1fU3VibWlzc2lvbl9SZXF1ZXN0KiByZXF1ZXN0KQogewog ICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChyZXF1ZXN0LCAwKTsKQEAgLTU2LDcg Kzg5LDcgQEAgRWluYV9MaXN0KiBld2tfZm9ybV9zdWJtaXNzaW9uX3JlcXVlc3RfZmllbGRfbmFt ZXNfZ2V0KEV3a19Gb3JtX1N1Ym1pc3Npb25fUmVxdWUKIAogICAgIEVpbmFfTGlzdCogbmFtZXMg PSAwOwogCi0gICAgV0tSZXRhaW5QdHI8V0tBcnJheVJlZj4gd2tLZXlzKEFkb3B0V0ssIFdLRGlj dGlvbmFyeUNvcHlLZXlzKHJlcXVlc3QtPndrVmFsdWVzLmdldCgpKSk7CisgICAgV0tSZXRhaW5Q dHI8V0tBcnJheVJlZj4gd2tLZXlzID0gcmVxdWVzdC0+ZmllbGROYW1lcygpOwogICAgIGNvbnN0 IHNpemVfdCBudW1LZXlzID0gV0tBcnJheUdldFNpemUod2tLZXlzLmdldCgpKTsKICAgICBmb3Ig KHNpemVfdCBpID0gMDsgaSA8IG51bUtleXM7ICsraSkgewogICAgICAgICBXS1N0cmluZ1JlZiB3 a0tleSA9IHN0YXRpY19jYXN0PFdLU3RyaW5nUmVmPihXS0FycmF5R2V0SXRlbUF0SW5kZXgod2tL ZXlzLmdldCgpLCBpKSk7CkBAIC03MSwxOCArMTA0LDE2IEBAIGNvbnN0IGNoYXIqIGV3a19mb3Jt X3N1Ym1pc3Npb25fcmVxdWVzdF9maWVsZF92YWx1ZV9nZXQoRXdrX0Zvcm1fU3VibWlzc2lvbl9S ZXF1CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKHJlcXVlc3QsIDApOwogICAg IEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChuYW1lLCAwKTsKIAotICAgIFdLUmV0YWlu UHRyPFdLU3RyaW5nUmVmPiB3a0tleShBZG9wdFdLLCBXS1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0 cmluZyhuYW1lKSk7Ci0gICAgV0tTdHJpbmdSZWYgd2tWYWx1ZSA9IHN0YXRpY19jYXN0PFdLU3Ry aW5nUmVmPihXS0RpY3Rpb25hcnlHZXRJdGVtRm9yS2V5KHJlcXVlc3QtPndrVmFsdWVzLmdldCgp LCB3a0tleS5nZXQoKSkpOworICAgIFN0cmluZyB2YWx1ZSA9IHJlcXVlc3QtPmZpZWxkVmFsdWUo U3RyaW5nOjpmcm9tVVRGOChuYW1lKSk7CiAKLSAgICByZXR1cm4gd2tWYWx1ZSA/IGVpbmFfc3Ry aW5nc2hhcmVfYWRkKHRvSW1wbCh3a1ZhbHVlKS0+c3RyaW5nKCkudXRmOCgpLmRhdGEoKSkgOiAw OworICAgIHJldHVybiB2YWx1ZS5pc051bGwoKSA/ICAwIDogZWluYV9zdHJpbmdzaGFyZV9hZGQo dmFsdWUudXRmOCgpLmRhdGEoKSk7CiB9CiAKIEVpbmFfQm9vbCBld2tfZm9ybV9zdWJtaXNzaW9u X3JlcXVlc3Rfc3VibWl0KEV3a19Gb3JtX1N1Ym1pc3Npb25fUmVxdWVzdCogcmVxdWVzdCkKIHsK ICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwocmVxdWVzdCwgZmFsc2UpOwogCi0g ICAgV0tGb3JtU3VibWlzc2lvbkxpc3RlbmVyQ29udGludWUocmVxdWVzdC0+d2tMaXN0ZW5lci5n ZXQoKSk7Ci0gICAgcmVxdWVzdC0+aGFuZGxlZFJlcXVlc3QgPSB0cnVlOworICAgIHJlcXVlc3Qt PnN1Ym1pdCgpOwogCiAgICAgcmV0dXJuIHRydWU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfZm9ybV9zdWJtaXNzaW9uX3JlcXVlc3RfcHJpdmF0 ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Zvcm1fc3VibWlzc2lv bl9yZXF1ZXN0X3ByaXZhdGUuaAppbmRleCA5OTNiNTMzLi4zNzc0ZTYxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfZm9ybV9zdWJtaXNzaW9uX3JlcXVl c3RfcHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19m b3JtX3N1Ym1pc3Npb25fcmVxdWVzdF9wcml2YXRlLmgKQEAgLTMxLDMxICszMSwyOCBAQAogI2lu Y2x1ZGUgIldLUmV0YWluUHRyLmgiCiAjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4KICNpbmNs dWRlIDx3dGYvUmVmQ291bnRlZC5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgog CiBjbGFzcyBFd2tfRm9ybV9TdWJtaXNzaW9uX1JlcXVlc3QgOiBwdWJsaWMgUmVmQ291bnRlZDxF d2tfRm9ybV9TdWJtaXNzaW9uX1JlcXVlc3Q+IHsKIHB1YmxpYzoKLSAgICBXS1JldGFpblB0cjxX S0RpY3Rpb25hcnlSZWY+IHdrVmFsdWVzOwotICAgIFdLUmV0YWluUHRyPFdLRm9ybVN1Ym1pc3Np b25MaXN0ZW5lclJlZj4gd2tMaXN0ZW5lcjsKLSAgICBib29sIGhhbmRsZWRSZXF1ZXN0OwotCi0g ICAgfkV3a19Gb3JtX1N1Ym1pc3Npb25fUmVxdWVzdCgpCi0gICAgewotICAgICAgICAvLyBNYWtl IHN1cmUgdGhlIHJlcXVlc3QgaXMgYWx3YXlzIGhhbmRsZWQgYmVmb3JlIGRlc3Ryb3lpbmcuCi0g ICAgICAgIGlmICghaGFuZGxlZFJlcXVlc3QpCi0gICAgICAgICAgICBXS0Zvcm1TdWJtaXNzaW9u TGlzdGVuZXJDb250aW51ZSh3a0xpc3RlbmVyLmdldCgpKTsKLSAgICB9CisgICAgfkV3a19Gb3Jt X1N1Ym1pc3Npb25fUmVxdWVzdCgpOwogCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8RXdrX0Zvcm1f U3VibWlzc2lvbl9SZXF1ZXN0PiBjcmVhdGUoV0tEaWN0aW9uYXJ5UmVmIHZhbHVlcywgV0tGb3Jt U3VibWlzc2lvbkxpc3RlbmVyUmVmIGxpc3RlbmVyKQogICAgIHsKICAgICAgICAgcmV0dXJuIGFk b3B0UmVmKG5ldyBFd2tfRm9ybV9TdWJtaXNzaW9uX1JlcXVlc3QodmFsdWVzLCBsaXN0ZW5lcikp OwogICAgIH0KIAorICAgIFdLUmV0YWluUHRyPFdLQXJyYXlSZWY+IGZpZWxkTmFtZXMoKSBjb25z dDsKKyAgICBTdHJpbmcgZmllbGRWYWx1ZShjb25zdCBTdHJpbmcmIGZpZWxkTmFtZSkgY29uc3Q7 CisKKyAgICB2b2lkIHN1Ym1pdCgpOworCiBwcml2YXRlOgotICAgIEV3a19Gb3JtX1N1Ym1pc3Np b25fUmVxdWVzdChXS0RpY3Rpb25hcnlSZWYgdmFsdWVzLCBXS0Zvcm1TdWJtaXNzaW9uTGlzdGVu ZXJSZWYgbGlzdGVuZXIpCi0gICAgICAgIDogd2tWYWx1ZXModmFsdWVzKQotICAgICAgICAsIHdr TGlzdGVuZXIobGlzdGVuZXIpCi0gICAgICAgICwgaGFuZGxlZFJlcXVlc3QoZmFsc2UpCi0gICAg eyB9CisgICAgRXdrX0Zvcm1fU3VibWlzc2lvbl9SZXF1ZXN0KFdLRGljdGlvbmFyeVJlZiB2YWx1 ZXMsIFdLRm9ybVN1Ym1pc3Npb25MaXN0ZW5lclJlZiBsaXN0ZW5lcik7CisKKyAgICBXS1JldGFp blB0cjxXS0RpY3Rpb25hcnlSZWY+IG1fd2tWYWx1ZXM7CisgICAgV0tSZXRhaW5QdHI8V0tGb3Jt U3VibWlzc2lvbkxpc3RlbmVyUmVmPiBtX3drTGlzdGVuZXI7CisgICAgYm9vbCBtX2hhbmRsZWRS ZXF1ZXN0OwogfTsKIAogI2VuZGlmIC8vIGV3a19mb3JtX3N1Ym1pc3Npb25fcmVxdWVzdF9wcml2 YXRlX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19u YXZpZ2F0aW9uX2RhdGEuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdr X25hdmlnYXRpb25fZGF0YS5jcHAKaW5kZXggYTU4NDU5ZS4uM2QxZjA1ZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX25hdmlnYXRpb25fZGF0YS5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX25hdmlnYXRpb25fZGF0 YS5jcHAKQEAgLTMwLDYgKzMwLDI3IEBACiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKK0V3 a19OYXZpZ2F0aW9uX0RhdGE6OkV3a19OYXZpZ2F0aW9uX0RhdGEoV0tOYXZpZ2F0aW9uRGF0YVJl ZiBkYXRhUmVmKQorICAgIDogbV9yZXF1ZXN0KEV3a19VcmxfUmVxdWVzdDo6Y3JlYXRlKGFkb3B0 V0soV0tOYXZpZ2F0aW9uRGF0YUNvcHlPcmlnaW5hbFJlcXVlc3QoZGF0YVJlZikpLmdldCgpKSkK KyAgICAsIG1fdGl0bGUoQWRvcHRXSywgV0tOYXZpZ2F0aW9uRGF0YUNvcHlUaXRsZShkYXRhUmVm KSkKKyAgICAsIG1fdXJsKEFkb3B0V0ssIFdLTmF2aWdhdGlvbkRhdGFDb3B5VVJMKGRhdGFSZWYp KQoreyB9CisKK0V3a19VcmxfUmVxdWVzdCogRXdrX05hdmlnYXRpb25fRGF0YTo6b3JpZ2luYWxS ZXF1ZXN0KCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9yZXF1ZXN0LmdldCgpOworfQorCitjb25z dCBjaGFyKiBFd2tfTmF2aWdhdGlvbl9EYXRhOjp0aXRsZSgpIGNvbnN0Cit7CisgICAgcmV0dXJu IG1fdGl0bGU7Cit9CisKK2NvbnN0IGNoYXIqIEV3a19OYXZpZ2F0aW9uX0RhdGE6OnVybCgpIGNv bnN0Cit7CisgICAgcmV0dXJuIG1fdXJsOworfQorCiBFd2tfTmF2aWdhdGlvbl9EYXRhKiBld2tf bmF2aWdhdGlvbl9kYXRhX3JlZihFd2tfTmF2aWdhdGlvbl9EYXRhKiBkYXRhKQogewogICAgIEVJ TkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChkYXRhLCAwKTsKQEAgLTUwLDE5ICs3MSwxOSBA QCBjb25zdCBjaGFyKiBld2tfbmF2aWdhdGlvbl9kYXRhX3RpdGxlX2dldChjb25zdCBFd2tfTmF2 aWdhdGlvbl9EYXRhKiBkYXRhKQogewogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZB TChkYXRhLCAwKTsKIAotICAgIHJldHVybiBkYXRhLT50aXRsZTsKKyAgICByZXR1cm4gZGF0YS0+ dGl0bGUoKTsKIH0KIAogRXdrX1VybF9SZXF1ZXN0KiBld2tfbmF2aWdhdGlvbl9kYXRhX29yaWdp bmFsX3JlcXVlc3RfZ2V0KGNvbnN0IEV3a19OYXZpZ2F0aW9uX0RhdGEqIGRhdGEpCiB7CiAgICAg RUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKGRhdGEsIDApOwogCi0gICAgcmV0dXJuIGRh dGEtPnJlcXVlc3QuZ2V0KCk7CisgICAgcmV0dXJuIGRhdGEtPm9yaWdpbmFsUmVxdWVzdCgpOwog fQogCiBjb25zdCBjaGFyKiBld2tfbmF2aWdhdGlvbl9kYXRhX3VybF9nZXQoY29uc3QgRXdrX05h dmlnYXRpb25fRGF0YSogZGF0YSkKIHsKICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9W QUwoZGF0YSwgMCk7CiAKLSAgICByZXR1cm4gZGF0YS0+dXJsOworICAgIHJldHVybiBkYXRhLT51 cmwoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a19uYXZpZ2F0aW9uX2RhdGFfcHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX25hdmlnYXRpb25fZGF0YV9wcml2YXRlLmgKaW5kZXggZTA2MDE2ZC4uMGQwZWNi MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX25hdmln YXRpb25fZGF0YV9wcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX25hdmlnYXRpb25fZGF0YV9wcml2YXRlLmgKQEAgLTQxLDIxICs0MSwyMiBAQAogICov CiBjbGFzcyBFd2tfTmF2aWdhdGlvbl9EYXRhIDogcHVibGljIFJlZkNvdW50ZWQ8RXdrX05hdmln YXRpb25fRGF0YT4gewogcHVibGljOgotICAgIFJlZlB0cjxFd2tfVXJsX1JlcXVlc3Q+IHJlcXVl c3Q7Ci0gICAgV0tFaW5hU2hhcmVkU3RyaW5nIHRpdGxlOwotICAgIFdLRWluYVNoYXJlZFN0cmlu ZyB1cmw7Ci0KICAgICBzdGF0aWMgUGFzc1JlZlB0cjxFd2tfTmF2aWdhdGlvbl9EYXRhPiBjcmVh dGUoV0tOYXZpZ2F0aW9uRGF0YVJlZiBkYXRhUmVmKQogICAgIHsKICAgICAgICAgcmV0dXJuIGFk b3B0UmVmKG5ldyBFd2tfTmF2aWdhdGlvbl9EYXRhKGRhdGFSZWYpKTsKICAgICB9CiAKKyAgICBF d2tfVXJsX1JlcXVlc3QqIG9yaWdpbmFsUmVxdWVzdCgpIGNvbnN0OworCisgICAgY29uc3QgY2hh ciogdGl0bGUoKSBjb25zdDsKKyAgICBjb25zdCBjaGFyKiB1cmwoKSBjb25zdDsKKwogcHJpdmF0 ZToKLSAgICBleHBsaWNpdCBFd2tfTmF2aWdhdGlvbl9EYXRhKFdLTmF2aWdhdGlvbkRhdGFSZWYg ZGF0YVJlZikKLSAgICAgICAgOiByZXF1ZXN0KEV3a19VcmxfUmVxdWVzdDo6Y3JlYXRlKGFkb3B0 V0soV0tOYXZpZ2F0aW9uRGF0YUNvcHlPcmlnaW5hbFJlcXVlc3QoZGF0YVJlZikpLmdldCgpKSkK LSAgICAgICAgLCB0aXRsZShBZG9wdFdLLCBXS05hdmlnYXRpb25EYXRhQ29weVRpdGxlKGRhdGFS ZWYpKQotICAgICAgICAsIHVybChBZG9wdFdLLCBXS05hdmlnYXRpb25EYXRhQ29weVVSTChkYXRh UmVmKSkKLSAgICB7IH0KKyAgICBleHBsaWNpdCBFd2tfTmF2aWdhdGlvbl9EYXRhKFdLTmF2aWdh dGlvbkRhdGFSZWYgZGF0YVJlZik7CisKKyAgICBSZWZQdHI8RXdrX1VybF9SZXF1ZXN0PiBtX3Jl cXVlc3Q7CisgICAgV0tFaW5hU2hhcmVkU3RyaW5nIG1fdGl0bGU7CisgICAgV0tFaW5hU2hhcmVk U3RyaW5nIG1fdXJsOwogfTsKIAogI2VuZGlmIC8vIGV3a19uYXZpZ2F0aW9uX2RhdGFfcHJpdmF0 ZV9oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfbmF2 aWdhdGlvbl9wb2xpY3lfZGVjaXNpb24uY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX25hdmlnYXRpb25fcG9saWN5X2RlY2lzaW9uLmNwcAppbmRleCBkMzVjMDdlLi41 YzRmMjRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tf bmF2aWdhdGlvbl9wb2xpY3lfZGVjaXNpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a19uYXZpZ2F0aW9uX3BvbGljeV9kZWNpc2lvbi5jcHAKQEAgLTMyLDYg KzMyLDY2IEBACiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKK0V3a19OYXZpZ2F0aW9uX1Bv bGljeV9EZWNpc2lvbjo6RXdrX05hdmlnYXRpb25fUG9saWN5X0RlY2lzaW9uKFdLRnJhbWVQb2xp Y3lMaXN0ZW5lclJlZiBsaXN0ZW5lciwgRXdrX05hdmlnYXRpb25fVHlwZSBuYXZpZ2F0aW9uVHlw ZSwgRXZlbnRfTW91c2VfQnV0dG9uIG1vdXNlQnV0dG9uLCBFdmVudF9Nb2RpZmllcl9LZXlzIG1v ZGlmaWVycywgUGFzc1JlZlB0cjxFd2tfVXJsX1JlcXVlc3Q+IHJlcXVlc3QsIGNvbnN0IGNoYXIq IGZyYW1lTmFtZSkKKyAgICA6IG1fbGlzdGVuZXIobGlzdGVuZXIpCisgICAgLCBtX2FjdGVkVXBv bkJ5Q2xpZW50KGZhbHNlKQorICAgICwgbV9uYXZpZ2F0aW9uVHlwZShuYXZpZ2F0aW9uVHlwZSkK KyAgICAsIG1fbW91c2VCdXR0b24obW91c2VCdXR0b24pCisgICAgLCBtX21vZGlmaWVycyhtb2Rp ZmllcnMpCisgICAgLCBtX3JlcXVlc3QocmVxdWVzdCkKKyAgICAsIG1fZnJhbWVOYW1lKGZyYW1l TmFtZSkKK3sgfQorCitFd2tfTmF2aWdhdGlvbl9Qb2xpY3lfRGVjaXNpb246On5Fd2tfTmF2aWdh dGlvbl9Qb2xpY3lfRGVjaXNpb24oKQoreworICAgIC8vIFRoaXMgaXMgdGhlIGRlZmF1bHQgY2hv aWNlIGZvciBhbGwgcG9saWN5IGRlY2lzaW9ucyBpbiBXZWJQYWdlUHJveHkuY3BwLgorICAgIGlm ICghbV9hY3RlZFVwb25CeUNsaWVudCkKKyAgICAgICAgV0tGcmFtZVBvbGljeUxpc3RlbmVyVXNl KG1fbGlzdGVuZXIuZ2V0KCkpOworfQorCitFd2tfTmF2aWdhdGlvbl9UeXBlIEV3a19OYXZpZ2F0 aW9uX1BvbGljeV9EZWNpc2lvbjo6bmF2aWdhdGlvblR5cGUoKSBjb25zdAoreworICAgIHJldHVy biBtX25hdmlnYXRpb25UeXBlOworfQorCitFdmVudF9Nb3VzZV9CdXR0b24gRXdrX05hdmlnYXRp b25fUG9saWN5X0RlY2lzaW9uOjptb3VzZUJ1dHRvbigpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1f bW91c2VCdXR0b247Cit9CisKK0V2ZW50X01vZGlmaWVyX0tleXMgRXdrX05hdmlnYXRpb25fUG9s aWN5X0RlY2lzaW9uOjptb2RpZmllcnMoKSBjb25zdAoreworICAgIHJldHVybiBtX21vZGlmaWVy czsKK30KKworY29uc3QgY2hhciogRXdrX05hdmlnYXRpb25fUG9saWN5X0RlY2lzaW9uOjpmcmFt ZU5hbWUoKSBjb25zdAoreworICAgIHJldHVybiBtX2ZyYW1lTmFtZTsKK30KKworRXdrX1VybF9S ZXF1ZXN0KiBFd2tfTmF2aWdhdGlvbl9Qb2xpY3lfRGVjaXNpb246OnJlcXVlc3QoKSBjb25zdAor eworICAgIHJldHVybiBtX3JlcXVlc3QuZ2V0KCk7Cit9CisKK3ZvaWQgRXdrX05hdmlnYXRpb25f UG9saWN5X0RlY2lzaW9uOjphY2NlcHQoKQoreworICAgIFdLRnJhbWVQb2xpY3lMaXN0ZW5lclVz ZShtX2xpc3RlbmVyLmdldCgpKTsKKyAgICBtX2FjdGVkVXBvbkJ5Q2xpZW50ID0gdHJ1ZTsKK30K Kwordm9pZCBFd2tfTmF2aWdhdGlvbl9Qb2xpY3lfRGVjaXNpb246OnJlamVjdCgpCit7CisgICAg V0tGcmFtZVBvbGljeUxpc3RlbmVySWdub3JlKG1fbGlzdGVuZXIuZ2V0KCkpOworICAgIG1fYWN0 ZWRVcG9uQnlDbGllbnQgPSB0cnVlOworfQorCit2b2lkIEV3a19OYXZpZ2F0aW9uX1BvbGljeV9E ZWNpc2lvbjo6ZG93bmxvYWQoKQoreworICAgIFdLRnJhbWVQb2xpY3lMaXN0ZW5lckRvd25sb2Fk KG1fbGlzdGVuZXIuZ2V0KCkpOworICAgIG1fYWN0ZWRVcG9uQnlDbGllbnQgPSB0cnVlOworfQor CiBFd2tfTmF2aWdhdGlvbl9Qb2xpY3lfRGVjaXNpb24qIGV3a19uYXZpZ2F0aW9uX3BvbGljeV9k ZWNpc2lvbl9yZWYoRXdrX05hdmlnYXRpb25fUG9saWN5X0RlY2lzaW9uKiBkZWNpc2lvbikKIHsK ICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoZGVjaXNpb24sIDApOwpAQCAtNTIs NTkgKzExMiw1NiBAQCBFd2tfTmF2aWdhdGlvbl9UeXBlIGV3a19uYXZpZ2F0aW9uX3BvbGljeV9u YXZpZ2F0aW9uX3R5cGVfZ2V0KGNvbnN0IEV3a19OYXZpZ2F0aQogewogICAgIEVJTkFfU0FGRVRZ X09OX05VTExfUkVUVVJOX1ZBTChkZWNpc2lvbiwgRVdLX05BVklHQVRJT05fVFlQRV9PVEhFUik7 CiAKLSAgICByZXR1cm4gZGVjaXNpb24tPm5hdmlnYXRpb25UeXBlOworICAgIHJldHVybiBkZWNp c2lvbi0+bmF2aWdhdGlvblR5cGUoKTsKIH0KIAogRXZlbnRfTW91c2VfQnV0dG9uIGV3a19uYXZp Z2F0aW9uX3BvbGljeV9tb3VzZV9idXR0b25fZ2V0KGNvbnN0IEV3a19OYXZpZ2F0aW9uX1BvbGlj eV9EZWNpc2lvbiogZGVjaXNpb24pCiB7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5f VkFMKGRlY2lzaW9uLCBFVkVOVF9NT1VTRV9CVVRUT05fTk9ORSk7CiAKLSAgICByZXR1cm4gZGVj aXNpb24tPm1vdXNlQnV0dG9uOworICAgIHJldHVybiBkZWNpc2lvbi0+bW91c2VCdXR0b24oKTsK IH0KIAogRXZlbnRfTW9kaWZpZXJfS2V5cyBld2tfbmF2aWdhdGlvbl9wb2xpY3lfbW9kaWZpZXJz X2dldChjb25zdCBFd2tfTmF2aWdhdGlvbl9Qb2xpY3lfRGVjaXNpb24qIGRlY2lzaW9uKQogewog ICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChkZWNpc2lvbiwgc3RhdGljX2Nhc3Q8 RXZlbnRfTW9kaWZpZXJfS2V5cz4oMCkpOwogCi0gICAgcmV0dXJuIGRlY2lzaW9uLT5tb2RpZmll cnM7CisgICAgcmV0dXJuIGRlY2lzaW9uLT5tb2RpZmllcnMoKTsKIH0KIAogY29uc3QgY2hhciog ZXdrX25hdmlnYXRpb25fcG9saWN5X2ZyYW1lX25hbWVfZ2V0KGNvbnN0IEV3a19OYXZpZ2F0aW9u X1BvbGljeV9EZWNpc2lvbiogZGVjaXNpb24pCiB7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9S RVRVUk5fVkFMKGRlY2lzaW9uLCAwKTsKIAotICAgIHJldHVybiBkZWNpc2lvbi0+ZnJhbWVOYW1l OworICAgIHJldHVybiBkZWNpc2lvbi0+ZnJhbWVOYW1lKCk7CiB9CiAKIEV3a19VcmxfUmVxdWVz dCogZXdrX25hdmlnYXRpb25fcG9saWN5X3JlcXVlc3RfZ2V0KGNvbnN0IEV3a19OYXZpZ2F0aW9u X1BvbGljeV9EZWNpc2lvbiogZGVjaXNpb24pCiB7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9S RVRVUk5fVkFMKGRlY2lzaW9uLCAwKTsKIAotICAgIHJldHVybiBkZWNpc2lvbi0+cmVxdWVzdC5n ZXQoKTsKKyAgICByZXR1cm4gZGVjaXNpb24tPnJlcXVlc3QoKTsKIH0KIAogdm9pZCBld2tfbmF2 aWdhdGlvbl9wb2xpY3lfZGVjaXNpb25fYWNjZXB0KEV3a19OYXZpZ2F0aW9uX1BvbGljeV9EZWNp c2lvbiogZGVjaXNpb24pCiB7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk4oZGVjaXNp b24pOwogCi0gICAgV0tGcmFtZVBvbGljeUxpc3RlbmVyVXNlKGRlY2lzaW9uLT5saXN0ZW5lci5n ZXQoKSk7Ci0gICAgZGVjaXNpb24tPmFjdGVkVXBvbkJ5Q2xpZW50ID0gdHJ1ZTsKKyAgICBkZWNp c2lvbi0+YWNjZXB0KCk7CiB9CiAKIHZvaWQgZXdrX25hdmlnYXRpb25fcG9saWN5X2RlY2lzaW9u X3JlamVjdChFd2tfTmF2aWdhdGlvbl9Qb2xpY3lfRGVjaXNpb24qIGRlY2lzaW9uKQogewogICAg IEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKGRlY2lzaW9uKTsKIAotICAgIFdLRnJhbWVQb2xp Y3lMaXN0ZW5lcklnbm9yZShkZWNpc2lvbi0+bGlzdGVuZXIuZ2V0KCkpOwotICAgIGRlY2lzaW9u LT5hY3RlZFVwb25CeUNsaWVudCA9IHRydWU7CisgICAgZGVjaXNpb24tPnJlamVjdCgpOwogfQog CiB2b2lkIGV3a19uYXZpZ2F0aW9uX3BvbGljeV9kZWNpc2lvbl9kb3dubG9hZChFd2tfTmF2aWdh dGlvbl9Qb2xpY3lfRGVjaXNpb24qIGRlY2lzaW9uKQogewogICAgIEVJTkFfU0FGRVRZX09OX05V TExfUkVUVVJOKGRlY2lzaW9uKTsKIAotICAgIFdLRnJhbWVQb2xpY3lMaXN0ZW5lckRvd25sb2Fk KGRlY2lzaW9uLT5saXN0ZW5lci5nZXQoKSk7Ci0gICAgZGVjaXNpb24tPmFjdGVkVXBvbkJ5Q2xp ZW50ID0gdHJ1ZTsKKyAgICBkZWNpc2lvbi0+ZG93bmxvYWQoKTsKIH0KIAogLy8gRXdrX05hdmln YXRpb25fVHlwZSBlbnVtIHZhbGlkYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL2V3a19uYXZpZ2F0aW9uX3BvbGljeV9kZWNpc2lvbl9wcml2YXRlLmgg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfbmF2aWdhdGlvbl9wb2xpY3lf ZGVjaXNpb25fcHJpdmF0ZS5oCmluZGV4IGU3ZTQ1NDkuLjk1YTE4YjdjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfbmF2aWdhdGlvbl9wb2xpY3lfZGVj aXNpb25fcHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a19uYXZpZ2F0aW9uX3BvbGljeV9kZWNpc2lvbl9wcml2YXRlLmgKQEAgLTQyLDIwICs0Miw3IEBA CiAgKi8KIGNsYXNzIEV3a19OYXZpZ2F0aW9uX1BvbGljeV9EZWNpc2lvbiA6IHB1YmxpYyBSZWZD b3VudGVkPEV3a19OYXZpZ2F0aW9uX1BvbGljeV9EZWNpc2lvbj4gewogcHVibGljOgotICAgIFdL UmV0YWluUHRyPFdLRnJhbWVQb2xpY3lMaXN0ZW5lclJlZj4gbGlzdGVuZXI7Ci0gICAgYm9vbCBh Y3RlZFVwb25CeUNsaWVudDsKLSAgICBFd2tfTmF2aWdhdGlvbl9UeXBlIG5hdmlnYXRpb25UeXBl OwotICAgIEV2ZW50X01vdXNlX0J1dHRvbiBtb3VzZUJ1dHRvbjsKLSAgICBFdmVudF9Nb2RpZmll cl9LZXlzIG1vZGlmaWVyczsKLSAgICBSZWZQdHI8RXdrX1VybF9SZXF1ZXN0PiByZXF1ZXN0Owot ICAgIFdLRWluYVNoYXJlZFN0cmluZyBmcmFtZU5hbWU7Ci0KLSAgICB+RXdrX05hdmlnYXRpb25f UG9saWN5X0RlY2lzaW9uKCkKLSAgICB7Ci0gICAgICAgIC8vIFRoaXMgaXMgdGhlIGRlZmF1bHQg Y2hvaWNlIGZvciBhbGwgcG9saWN5IGRlY2lzaW9ucyBpbiBXZWJQYWdlUHJveHkuY3BwLgotICAg ICAgICBpZiAoIWFjdGVkVXBvbkJ5Q2xpZW50KQotICAgICAgICAgICAgV0tGcmFtZVBvbGljeUxp c3RlbmVyVXNlKGxpc3RlbmVyLmdldCgpKTsKLSAgICB9CisgICAgfkV3a19OYXZpZ2F0aW9uX1Bv bGljeV9EZWNpc2lvbigpOwogCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8RXdrX05hdmlnYXRpb25f UG9saWN5X0RlY2lzaW9uPiBjcmVhdGUoV0tGcmFtZU5hdmlnYXRpb25UeXBlIG5hdmlnYXRpb25U eXBlLCBXS0V2ZW50TW91c2VCdXR0b24gbW91c2VCdXR0b24sIFdLRXZlbnRNb2RpZmllcnMgbW9k aWZpZXJzLCBXS1VSTFJlcXVlc3RSZWYgcmVxdWVzdFJlZiwgY29uc3QgY2hhciogZnJhbWVOYW1l LCBXS0ZyYW1lUG9saWN5TGlzdGVuZXJSZWYgbGlzdGVuZXIpCiAgICAgewpAQCAtNjMsMTYgKzUw LDI2IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBFd2tfTmF2aWdhdGlv bl9Qb2xpY3lfRGVjaXNpb24obGlzdGVuZXIsIHN0YXRpY19jYXN0PEV3a19OYXZpZ2F0aW9uX1R5 cGU+KG5hdmlnYXRpb25UeXBlKSwgc3RhdGljX2Nhc3Q8RXZlbnRfTW91c2VfQnV0dG9uPihtb3Vz ZUJ1dHRvbiksIHN0YXRpY19jYXN0PEV2ZW50X01vZGlmaWVyX0tleXM+KG1vZGlmaWVycyksIHJl cXVlc3QucmVsZWFzZSgpLCBmcmFtZU5hbWUpKTsKICAgICB9CiAKKyAgICB2b2lkIGFjY2VwdCgp OworICAgIHZvaWQgcmVqZWN0KCk7CisgICAgdm9pZCBkb3dubG9hZCgpOworCisgICAgRXdrX05h dmlnYXRpb25fVHlwZSBuYXZpZ2F0aW9uVHlwZSgpIGNvbnN0OworICAgIEV2ZW50X01vdXNlX0J1 dHRvbiBtb3VzZUJ1dHRvbigpIGNvbnN0OworICAgIEV2ZW50X01vZGlmaWVyX0tleXMgbW9kaWZp ZXJzKCkgY29uc3Q7CisgICAgY29uc3QgY2hhciogZnJhbWVOYW1lKCkgY29uc3Q7CisgICAgRXdr X1VybF9SZXF1ZXN0KiByZXF1ZXN0KCkgY29uc3Q7CisKIHByaXZhdGU6Ci0gICAgRXdrX05hdmln YXRpb25fUG9saWN5X0RlY2lzaW9uKFdLRnJhbWVQb2xpY3lMaXN0ZW5lclJlZiBsaXN0ZW5lciwg RXdrX05hdmlnYXRpb25fVHlwZSBuYXZpZ2F0aW9uVHlwZSwgRXZlbnRfTW91c2VfQnV0dG9uIG1v dXNlQnV0dG9uLCBFdmVudF9Nb2RpZmllcl9LZXlzIG1vZGlmaWVycywgUGFzc1JlZlB0cjxFd2tf VXJsX1JlcXVlc3Q+IHJlcXVlc3QsIGNvbnN0IGNoYXIqIGZyYW1lTmFtZSkKLSAgICAgICAgOiBs aXN0ZW5lcihsaXN0ZW5lcikKLSAgICAgICAgLCBhY3RlZFVwb25CeUNsaWVudChmYWxzZSkKLSAg ICAgICAgLCBuYXZpZ2F0aW9uVHlwZShuYXZpZ2F0aW9uVHlwZSkKLSAgICAgICAgLCBtb3VzZUJ1 dHRvbihtb3VzZUJ1dHRvbikKLSAgICAgICAgLCBtb2RpZmllcnMobW9kaWZpZXJzKQotICAgICAg ICAsIHJlcXVlc3QocmVxdWVzdCkKLSAgICAgICAgLCBmcmFtZU5hbWUoZnJhbWVOYW1lKQotICAg IHsgfQorICAgIEV3a19OYXZpZ2F0aW9uX1BvbGljeV9EZWNpc2lvbihXS0ZyYW1lUG9saWN5TGlz dGVuZXJSZWYgbGlzdGVuZXIsIEV3a19OYXZpZ2F0aW9uX1R5cGUgbmF2aWdhdGlvblR5cGUsIEV2 ZW50X01vdXNlX0J1dHRvbiBtb3VzZUJ1dHRvbiwgRXZlbnRfTW9kaWZpZXJfS2V5cyBtb2RpZmll cnMsIFBhc3NSZWZQdHI8RXdrX1VybF9SZXF1ZXN0PiByZXF1ZXN0LCBjb25zdCBjaGFyKiBmcmFt ZU5hbWUpOworCisgICAgV0tSZXRhaW5QdHI8V0tGcmFtZVBvbGljeUxpc3RlbmVyUmVmPiBtX2xp c3RlbmVyOworICAgIGJvb2wgbV9hY3RlZFVwb25CeUNsaWVudDsKKyAgICBFd2tfTmF2aWdhdGlv bl9UeXBlIG1fbmF2aWdhdGlvblR5cGU7CisgICAgRXZlbnRfTW91c2VfQnV0dG9uIG1fbW91c2VC dXR0b247CisgICAgRXZlbnRfTW9kaWZpZXJfS2V5cyBtX21vZGlmaWVyczsKKyAgICBSZWZQdHI8 RXdrX1VybF9SZXF1ZXN0PiBtX3JlcXVlc3Q7CisgICAgV0tFaW5hU2hhcmVkU3RyaW5nIG1fZnJh bWVOYW1lOwogfTsKIAogI2VuZGlmIC8vIGV3a19uYXZpZ2F0aW9uX3BvbGljeV9kZWNpc2lvbl9w cml2YXRlX2gK