30717 2009-10-23 09:32:06 -0700 Style problems present in Android-specific files 2009-10-23 15:40:47 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 1 steveblock steveblock benm commit-queue oldest_to_newest 157170 0 steveblock 2009-10-23 09:32:06 -0700 Android-specific files in WebCore/page/android/ and WebCore/platform/android/ contain style problems. 157172 1 41729 steveblock 2009-10-23 09:51:53 -0700 Created attachment 41729 Patch 1 for Bug 30717 157190 2 41729 eric 2009-10-23 11:10:24 -0700 Comment on attachment 41729 Patch 1 for Bug 30717 LGTM. 157294 3 41729 eric 2009-10-23 14:04:04 -0700 Comment on attachment 41729 Patch 1 for Bug 30717 Steve is not a committer to marking this cq+ even though he didn't request auto-commit. 157342 4 41729 commit-queue 2009-10-23 15:40:43 -0700 Comment on attachment 41729 Patch 1 for Bug 30717 Clearing flags on attachment: 41729 Committed r50006: <http://trac.webkit.org/changeset/50006> 157343 5 commit-queue 2009-10-23 15:40:47 -0700 All reviewed patches have been landed. Closing bug. 41729 2009-10-23 09:51:53 -0700 2009-10-23 15:40:43 -0700 Patch 1 for Bug 30717 fixAndroidStyle.txt text/plain 20963 steveblock SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0OTk3OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzIgQEAKKzIwMDktMTAtMjMgIFN0ZXZlIEJsb2NrICA8c3RldmVibG9ja0Bnb29n bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEZpeGVzIHN0eWxlIHByb2JsZW1zIGluIEFuZHJvaWQtc3BlY2lmaWMgZmlsZXMuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDcxNworCisgICAgICAg IFN0eWxlIGNoYW5nZXMgb25seSwgbm8gbmV3IHRlc3RzIHBvc3NpYmxlLgorCisgICAgICAgICog cGFnZS9hbmRyb2lkL0V2ZW50SGFuZGxlckFuZHJvaWQuY3BwOiBNb2RpZmllZC4KKyAgICAgICAg KFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6cGFzc01vdXNlRG93bkV2ZW50VG9XaWRnZXQpOiBGaXhl cyB3aGl0ZXNwYWNlIGluIG1ldGhvZCBzaWduYXR1cmUuCisgICAgICAgIChXZWJDb3JlOjpFdmVu dEhhbmRsZXI6OnBhc3NTdWJmcmFtZUV2ZW50VG9TdWJmcmFtZSk6IEZpeGVzIHdoaXRlc3BhY2Ug aW4gbWV0aG9kIHNpZ25hdHVyZS4KKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6cGFz c1doZWVsRXZlbnRUb1dpZGdldCk6IEZpeGVzIHdoaXRlc3BhY2UgaW4gbWV0aG9kIHNpZ25hdHVy ZS4KKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6cGFzc01vdXNlTW92ZUV2ZW50VG9T dWJmcmFtZSk6IEZpeGVzIHdoaXRlc3BhY2UgaW4gbWV0aG9kIHNpZ25hdHVyZS4KKyAgICAgICAg KiBwbGF0Zm9ybS9hbmRyb2lkL0NsaXBib2FyZEFuZHJvaWQuaDogTW9kaWZpZWQuIEZpeGVzIGhl YWRlciBpbmNsdWRlIG9yZGVyIGFuZCBpbmRlbnRpbmcuCisgICAgICAgICogcGxhdGZvcm0vYW5k cm9pZC9DdXJzb3JBbmRyb2lkLmNwcDogTW9kaWZpZWQuIAorICAgICAgICAoV2ViQ29yZTo6Z3Jh YkN1cnNvcik6IEZpeGVzIGZ1bmN0aW9uIGJyYWNlcy4KKyAgICAgICAgKFdlYkNvcmU6OmdyYWJi aW5nQ3Vyc29yKTogRml4ZXMgZnVuY3Rpb24gYnJhY2VzLgorICAgICAgICAqIHBsYXRmb3JtL2Fu ZHJvaWQvRmlsZUNob29zZXJBbmRyb2lkLmNwcDogTW9kaWZpZWQuCisgICAgICAgIChXZWJDb3Jl OjpGaWxlQ2hvb3Nlcjo6YmFzZW5hbWVGb3JXaWR0aCk6IEZpeGVzIGJyYWNlcyBvbiB3aGlsZSBz dGF0ZW1lbnQsIGFuZCB1cGRhdGVzIFN0cmluZzo6Y29weSB0byBTdHJpbmc6OnRocmVhZHNhZmVD b3B5LgorICAgICAgICAqIHBsYXRmb3JtL2FuZHJvaWQvRmlsZVN5c3RlbUFuZHJvaWQuY3BwOiBN b2RpZmllZC4gRml4ZXMgaGVhZGVyIGluY2x1ZGUgb3JkZXIuCisgICAgICAgIChXZWJDb3JlOjp1 bmxvYWRNb2R1bGUpOiBGaXhlcyB6ZXJvIHRlc3QuCisgICAgICAgIChXZWJDb3JlOjp3cml0ZVRv RmlsZSk6IEZpeGVzIGlmIHN0YXRlbWVudCBzdHJ1Y3R1cmUuCisgICAgICAgICogcGxhdGZvcm0v YW5kcm9pZC9LZXlFdmVudEFuZHJvaWQuY3BwOiBNb2RpZmllZC4KKyAgICAgICAgKFdlYkNvcmU6 OndpbmRvd3NLZXlDb2RlRm9yS2V5RXZlbnQpOiBGaXhlcyBzd2l0Y2ggc3RhdGVtZW50IGluZGVu dGluZy4KKyAgICAgICAgKFdlYkNvcmU6OmtleUlkZW50aWZpZXJGb3JBbmRyb2lkS2V5Q29kZSk6 IEZpeGVzIHN3aXRjaCBzdGF0ZW1lbnQgaW5kZW50aW5nLgorICAgICAgICAqIHBsYXRmb3JtL2Fu ZHJvaWQvU2NyZWVuQW5kcm9pZC5jcHA6IE1vZGlmaWVkLiBGaXhlcyBoZWFkZXIgaW5jbHVkZSBv cmRlciBhbmQgc3dpdGNoIHN0YXRlbWVudCBpbmRlbnRpbmcuCisgICAgICAgICogcGxhdGZvcm0v YW5kcm9pZC9UZW1wb3JhcnlMaW5rU3R1YnMuY3BwOiBNb2RpZmllZC4gRml4ZXMgaGVhZGVyIGlu Y2x1ZGUgb3JkZXIuCisKIDIwMDktMTAtMjMgIFN0ZXZlIEJsb2NrICA8c3RldmVibG9ja0Bnb29n bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpJbmRleDogV2ViQ29y ZS9wYWdlL2FuZHJvaWQvRXZlbnRIYW5kbGVyQW5kcm9pZC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9wYWdlL2FuZHJvaWQvRXZlbnRIYW5kbGVyQW5kcm9pZC5jcHAJKHJldmlzaW9uIDQ5OTc1 KQorKysgV2ViQ29yZS9wYWdlL2FuZHJvaWQvRXZlbnRIYW5kbGVyQW5kcm9pZC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTY4LDcgKzY4LDcgQEAgYm9vbCBFdmVudEhhbmRsZXI6OnBhc3NXaWRnZXRN b3VzZURvd25FdgogCiAvLyBUaGlzIGZ1bmN0aW9uIGlzIHVzZWQgdG8gcm91dGUgdGhlIG1vdXNl IGRvd24gZXZlbnQgdG8gdGhlIG5hdGl2ZSB3aWRnZXRzLCBpdCBzZWVtcyBsaWtlIGEKIC8vIHdv cmsgYXJvdW5kIGZvciB0aGUgTWFjIHBsYXRmb3JtIHdoaWNoIGRvZXMgbm90IHN1cHBvcnQgZG91 YmxlIGNsaWNrcywgYnV0IGJyb3dzZXJzIGRvLgotYm9vbCBFdmVudEhhbmRsZXI6OnBhc3NNb3Vz ZURvd25FdmVudFRvV2lkZ2V0KFdpZGdldCogKQorYm9vbCBFdmVudEhhbmRsZXI6OnBhc3NNb3Vz ZURvd25FdmVudFRvV2lkZ2V0KFdpZGdldCopCiB7CiAgICAgLy8gcmV0dXJuIGZhbHNlIHNvIHRo ZSBub3JtYWwgcHJvcG9nYXRpb24gaGFuZGxlcyB0aGUgZXZlbnQKICAgICByZXR1cm4gZmFsc2U7 CkBAIC04NCw3ICs4NCw3IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpldmVudEFjdGl2YXRlZFZpZXco Y28KIC8vIEl0IGlzIHVzZWQgdG8gZW5zdXJlIHRoYXQgZXZlbnRzIGFyZSBzeW5jJ2VkIGNvcnJl Y3RseSBiZXR3ZWVuIGZyYW1lcy4gRm9yIGV4YW1wbGUKIC8vIGlmIHRoZSB1c2VyIHByZXNzZXMg ZG93biBpbiBvbmUgZnJhbWUgYW5kIHVwIGluIGFub3RoZXIgZnJhbWUsIHRoaXMgZnVuY3Rpb24g d2lsbAogLy8gcmV0dXJucyB0cnVlLCBhbmQgcGFzcyB0aGUgZXZlbnQgdG8gdGhlIGNvcnJlY3Qg ZnJhbWUuCi1ib29sIEV2ZW50SGFuZGxlcjo6cGFzc1N1YmZyYW1lRXZlbnRUb1N1YmZyYW1lKE1v dXNlRXZlbnRXaXRoSGl0VGVzdFJlc3VsdHMmICwgRnJhbWUqICwgSGl0VGVzdFJlc3VsdCogKQor Ym9vbCBFdmVudEhhbmRsZXI6OnBhc3NTdWJmcmFtZUV2ZW50VG9TdWJmcmFtZShNb3VzZUV2ZW50 V2l0aEhpdFRlc3RSZXN1bHRzJiwgRnJhbWUqLCBIaXRUZXN0UmVzdWx0KikKIHsKICAgICBub3RJ bXBsZW1lbnRlZCgpOwogICAgIHJldHVybiBmYWxzZTsKQEAgLTkzLDcgKzkzLDcgQEAgYm9vbCBF dmVudEhhbmRsZXI6OnBhc3NTdWJmcmFtZUV2ZW50VG9TdQogLy8gVGhpcyBpcyBjYWxsZWQgdG8g cm91dGUgd2hlZWwgZXZlbnRzIHRvIGNoaWxkIHdpZGdldHMgd2hlbiB0aGV5IGFyZSBSZW5kZXJX aWRnZXQKIC8vIGFzIHRoZSBwYXJlbnQgdXN1YWxseSBnZXRzIHdoZWVsIGV2ZW50LiBEb24ndCBo YXZlIGEgbW91c2Ugd2l0aCBhIHdoZWVsIHRvIGNvbmZpcm0KIC8vIHRoZSBvcGVyYXRpb24gb2Yg dGhpcyBmdW5jdGlvbi4KLWJvb2wgRXZlbnRIYW5kbGVyOjpwYXNzV2hlZWxFdmVudFRvV2lkZ2V0 KFBsYXRmb3JtV2hlZWxFdmVudCYgLCBXaWRnZXQqICkKK2Jvb2wgRXZlbnRIYW5kbGVyOjpwYXNz V2hlZWxFdmVudFRvV2lkZ2V0KFBsYXRmb3JtV2hlZWxFdmVudCYsIFdpZGdldCopCiB7CiAgICAg bm90SW1wbGVtZW50ZWQoKTsKICAgICByZXR1cm4gZmFsc2U7CkBAIC0xMDUsNyArMTA1LDcgQEAg Ym9vbCBFdmVudEhhbmRsZXI6OnBhc3NNb3VzZVByZXNzRXZlbnRUbwogfQogCiBib29sIEV2ZW50 SGFuZGxlcjo6cGFzc01vdXNlTW92ZUV2ZW50VG9TdWJmcmFtZShNb3VzZUV2ZW50V2l0aEhpdFRl c3RSZXN1bHRzJiBtZXYsIAotICAgIEZyYW1lKiBzdWJmcmFtZSwgSGl0VGVzdFJlc3VsdCogKQor ICAgIEZyYW1lKiBzdWJmcmFtZSwgSGl0VGVzdFJlc3VsdCopCiB7CiAgICAgcmV0dXJuIHBhc3NT dWJmcmFtZUV2ZW50VG9TdWJmcmFtZShtZXYsIHN1YmZyYW1lKTsKIH0KSW5kZXg6IFdlYkNvcmUv cGxhdGZvcm0vYW5kcm9pZC9DbGlwYm9hcmRBbmRyb2lkLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9wbGF0Zm9ybS9hbmRyb2lkL0NsaXBib2FyZEFuZHJvaWQuaAkocmV2aXNpb24gNDk5NzUpCisr KyBXZWJDb3JlL3BsYXRmb3JtL2FuZHJvaWQvQ2xpcGJvYXJkQW5kcm9pZC5oCSh3b3JraW5nIGNv cHkpCkBAIC0zMywzMSArMzMsMzEgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0gICAgY2xh c3MgQ2FjaGVkSW1hZ2U7CitjbGFzcyBDYWNoZWRJbWFnZTsKIAotICAgIGNsYXNzIENsaXBib2Fy ZEFuZHJvaWQgOiBwdWJsaWMgQ2xpcGJvYXJkLCBwdWJsaWMgQ2FjaGVkUmVzb3VyY2VDbGllbnQg ewotICAgIHB1YmxpYzoKLSAgICAgICAgQ2xpcGJvYXJkQW5kcm9pZChDbGlwYm9hcmRBY2Nlc3NQ b2xpY3kgcG9saWN5LCBib29sIGlzRm9yRHJhZ2dpbmcpOwotICAgICAgICB+Q2xpcGJvYXJkQW5k cm9pZCgpOwotICAgIAotICAgICAgICB2b2lkIGNsZWFyRGF0YShjb25zdCBTdHJpbmcmKTsKLSAg ICAgICAgdm9pZCBjbGVhckFsbERhdGEoKTsKLSAgICAgICAgU3RyaW5nIGdldERhdGEoY29uc3Qg U3RyaW5nJiwgYm9vbCYgc3VjY2VzcykgY29uc3Q7Ci0gICAgICAgIGJvb2wgc2V0RGF0YShjb25z dCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmKTsKLSAgICAKLSAgICAgICAgLy8gZXh0ZW5zaW9ucyBi ZXlvbmQgSUUncyBBUEkKLSAgICAgICAgSGFzaFNldDxTdHJpbmc+IHR5cGVzKCkgY29uc3Q7Citj bGFzcyBDbGlwYm9hcmRBbmRyb2lkIDogcHVibGljIENsaXBib2FyZCwgcHVibGljIENhY2hlZFJl c291cmNlQ2xpZW50IHsKK3B1YmxpYzoKKyAgICBDbGlwYm9hcmRBbmRyb2lkKENsaXBib2FyZEFj Y2Vzc1BvbGljeSBwb2xpY3ksIGJvb2wgaXNGb3JEcmFnZ2luZyk7CisgICAgfkNsaXBib2FyZEFu ZHJvaWQoKTsKKworICAgIHZvaWQgY2xlYXJEYXRhKGNvbnN0IFN0cmluZyYpOworICAgIHZvaWQg Y2xlYXJBbGxEYXRhKCk7CisgICAgU3RyaW5nIGdldERhdGEoY29uc3QgU3RyaW5nJiwgYm9vbCYg c3VjY2VzcykgY29uc3Q7CisgICAgYm9vbCBzZXREYXRhKGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0 cmluZyYpOworCisgICAgLy8gZXh0ZW5zaW9ucyBiZXlvbmQgSUUncyBBUEkKKyAgICBIYXNoU2V0 PFN0cmluZz4gdHlwZXMoKSBjb25zdDsKKworICAgIHZvaWQgc2V0RHJhZ0ltYWdlKENhY2hlZElt YWdlKiwgY29uc3QgSW50UG9pbnQmKTsKKyAgICB2b2lkIHNldERyYWdJbWFnZUVsZW1lbnQoTm9k ZSosIGNvbnN0IEludFBvaW50Jik7CiAgICAgCi0gICAgICAgIHZvaWQgc2V0RHJhZ0ltYWdlKENh Y2hlZEltYWdlKiwgY29uc3QgSW50UG9pbnQmKTsKLSAgICAgICAgdm9pZCBzZXREcmFnSW1hZ2VF bGVtZW50KE5vZGUqLCBjb25zdCBJbnRQb2ludCYpOwotICAgICAgICAKLSAgICAgICAgdmlydHVh bCBEcmFnSW1hZ2VSZWYgY3JlYXRlRHJhZ0ltYWdlKEludFBvaW50JikgY29uc3Q7Ci0gICAgICAg IHZpcnR1YWwgdm9pZCBkZWNsYXJlQW5kV3JpdGVEcmFnSW1hZ2UoRWxlbWVudCosIGNvbnN0IEtV UkwmLCBjb25zdCBTdHJpbmcmLCBGcmFtZSopOwotICAgICAgICB2aXJ0dWFsIHZvaWQgd3JpdGVV UkwoY29uc3QgS1VSTCYsIGNvbnN0IFN0cmluZyYsIEZyYW1lKik7Ci0gICAgICAgIHZpcnR1YWwg dm9pZCB3cml0ZVJhbmdlKFJhbmdlKiwgRnJhbWUqKTsKKyAgICB2aXJ0dWFsIERyYWdJbWFnZVJl ZiBjcmVhdGVEcmFnSW1hZ2UoSW50UG9pbnQmKSBjb25zdDsKKyAgICB2aXJ0dWFsIHZvaWQgZGVj bGFyZUFuZFdyaXRlRHJhZ0ltYWdlKEVsZW1lbnQqLCBjb25zdCBLVVJMJiwgY29uc3QgU3RyaW5n JiwgRnJhbWUqKTsKKyAgICB2aXJ0dWFsIHZvaWQgd3JpdGVVUkwoY29uc3QgS1VSTCYsIGNvbnN0 IFN0cmluZyYsIEZyYW1lKik7CisgICAgdmlydHVhbCB2b2lkIHdyaXRlUmFuZ2UoUmFuZ2UqLCBG cmFtZSopOwogCi0gICAgICAgIHZpcnR1YWwgYm9vbCBoYXNEYXRhKCk7Ci0gICAgfTsKKyAgICB2 aXJ0dWFsIGJvb2wgaGFzRGF0YSgpOworfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCklu ZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2FuZHJvaWQvQ3Vyc29yQW5kcm9pZC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL0N1cnNvckFuZHJvaWQuY3BwCShyZXZpc2lv biA0OTk3NSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vYW5kcm9pZC9DdXJzb3JBbmRyb2lkLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjMsNiArMjMsNyBAQAogICogKElOQ0xVRElORyBORUdMSUdFTkNF IE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAgKiBPRiBU SElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLiAKICAqLworCiAjZGVmaW5lIExPR19UQUcgIldlYkNvcmUiCiAKICNpbmNsdWRlICJj b25maWcuaCIKQEAgLTI4MiwxMiArMjgzLDE0IEBAIGNvbnN0IEN1cnNvciYgd2VzdFBhbm5pbmdD dXJzb3IoKQogICAgIHJldHVybiBjOwogfQogCi1jb25zdCBDdXJzb3ImIGdyYWJDdXJzb3IoKSB7 Citjb25zdCBDdXJzb3ImIGdyYWJDdXJzb3IoKQorewogICAgIG5vdEltcGxlbWVudGVkKCk7CiAg ICAgcmV0dXJuIGM7CiB9CiAKLWNvbnN0IEN1cnNvciYgZ3JhYmJpbmdDdXJzb3IoKSB7Citjb25z dCBDdXJzb3ImIGdyYWJiaW5nQ3Vyc29yKCkKK3sKICAgICBub3RJbXBsZW1lbnRlZCgpOwogICAg IHJldHVybiBjOwogfQpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL0ZpbGVDaG9vc2Vy QW5kcm9pZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL0ZpbGVD aG9vc2VyQW5kcm9pZC5jcHAJKHJldmlzaW9uIDQ5OTc1KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9h bmRyb2lkL0ZpbGVDaG9vc2VyQW5kcm9pZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM2LDEwICsz Niw5IEBAIFN0cmluZyBGaWxlQ2hvb3Nlcjo6YmFzZW5hbWVGb3JXaWR0aChjb24KICAgICAgICAg cmV0dXJuIFN0cmluZygpOwogICAgIC8vIEZJWE1FOiBUaGlzIGNvdWxkIGJlIGEgbG90IGZhc3Rl ciwgYnV0IGFzc3VtaW5nIHRoZSBkYXRhIHdpbGwgbm90CiAgICAgLy8gb2Z0ZW4gYmUgbXVjaCBs b25nZXIgdGhhbiB0aGUgcHJvdmlkZWQgd2lkdGgsIHRoaXMgbWF5IGJlIGZhc3QgZW5vdWdoLgot ICAgIFN0cmluZyBvdXRwdXQgPSBtX2ZpbGVuYW1lc1swXS5jb3B5KCk7Ci0gICAgd2hpbGUgKGZv bnQud2lkdGgoVGV4dFJ1bihvdXRwdXQuaW1wbCgpKSkgPiB3aWR0aCAmJiBvdXRwdXQubGVuZ3Ro KCkgPiA0KSB7CisgICAgU3RyaW5nIG91dHB1dCA9IG1fZmlsZW5hbWVzWzBdLnRocmVhZHNhZmVD b3B5KCk7CisgICAgd2hpbGUgKGZvbnQud2lkdGgoVGV4dFJ1bihvdXRwdXQuaW1wbCgpKSkgPiB3 aWR0aCAmJiBvdXRwdXQubGVuZ3RoKCkgPiA0KQogICAgICAgICBvdXRwdXQgPSBvdXRwdXQucmVw bGFjZShvdXRwdXQubGVuZ3RoKCkgLSA0LCA0LCBTdHJpbmcoIi4uLiIpKTsKLSAgICB9CiAgICAg cmV0dXJuIG91dHB1dDsKIH0KIApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL0ZpbGVT eXN0ZW1BbmRyb2lkLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2FuZHJvaWQv RmlsZVN5c3RlbUFuZHJvaWQuY3BwCShyZXZpc2lvbiA0OTk3NSkKKysrIFdlYkNvcmUvcGxhdGZv cm0vYW5kcm9pZC9GaWxlU3lzdGVtQW5kcm9pZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMwLDEy ICszMCwxMiBAQAogCiAjaW5jbHVkZSAiQ1N0cmluZy5oIgogI2luY2x1ZGUgIlN0cmluZ0J1aWxk ZXIuaCIKLSNpbmNsdWRlIDxmbm1hdGNoLmg+Ci0jaW5jbHVkZSA8ZGxmY24uaD4KKyNpbmNsdWRl ICJjdXRpbHMvbG9nLmgiCiAjaW5jbHVkZSA8ZGlyZW50Lmg+CisjaW5jbHVkZSA8ZGxmY24uaD4K ICNpbmNsdWRlIDxlcnJuby5oPgorI2luY2x1ZGUgPGZubWF0Y2guaD4KICNpbmNsdWRlIDxzeXMv c3RhdC5oPgotI2luY2x1ZGUgImN1dGlscy9sb2cuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog CkBAIC03Miw3ICs3Miw3IEBAIENTdHJpbmcgb3BlblRlbXBvcmFyeUZpbGUoY29uc3QgY2hhciog cHIKIAogYm9vbCB1bmxvYWRNb2R1bGUoUGxhdGZvcm1Nb2R1bGUgbW9kdWxlKQogewotICAgIHJl dHVybiBkbGNsb3NlKG1vZHVsZSkgPT0gMDsKKyAgICByZXR1cm4gIWRsY2xvc2UobW9kdWxlKTsK IH0KIAogdm9pZCBjbG9zZUZpbGUoUGxhdGZvcm1GaWxlSGFuZGxlJiBoYW5kbGUpCkBAIC05MCw3 ICs5MCw3IEBAIGludCB3cml0ZVRvRmlsZShQbGF0Zm9ybUZpbGVIYW5kbGUgaGFuZGwKICAgICAg ICAgaW50IGJ5dGVzV3JpdHRlbiA9IHdyaXRlKGhhbmRsZSwgZGF0YSwgKHNpemVfdCkobGVuZ3Ro IC0gdG90YWxCeXRlc1dyaXR0ZW4pKTsKICAgICAgICAgaWYgKGJ5dGVzV3JpdHRlbiA8IDAgJiYg ZXJybm8gIT0gRUlOVFIpCiAgICAgICAgICAgICByZXR1cm4gLTE7Ci0gICAgICAgIGVsc2UgaWYg KGJ5dGVzV3JpdHRlbiA+IDApCisgICAgICAgIGlmIChieXRlc1dyaXR0ZW4gPiAwKQogICAgICAg ICAgICAgdG90YWxCeXRlc1dyaXR0ZW4gKz0gYnl0ZXNXcml0dGVuOwogICAgIH0KIApJbmRleDog V2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL0tleUV2ZW50QW5kcm9pZC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL0tleUV2ZW50QW5kcm9pZC5jcHAJKHJldmlzaW9u IDQ5OTc1KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL0tleUV2ZW50QW5kcm9pZC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTQxLDEyOCArNDEsMTI4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK IHN0YXRpYyBpbnQgd2luZG93c0tleUNvZGVGb3JLZXlFdmVudCh1bnNpZ25lZCBpbnQga2V5Q29k ZSkKIHsKICAgICAvLyBEb2VzIG5vdCBwcm92aWRlIGFsbCBrZXkgY29kZXMsIGFuZCBkb2VzIG5v dCBoYW5kbGUgYWxsIGtleXMuCi0gICAgc3dpdGNoKGtleUNvZGUpIHsKLSAgICAgICAgY2FzZSBr S2V5Q29kZURlbDoKLSAgICAgICAgICAgIHJldHVybiBWS19CQUNLOwotICAgICAgICBjYXNlIGtL ZXlDb2RlVGFiOgotICAgICAgICAgICAgcmV0dXJuIFZLX1RBQjsKLSAgICAgICAgY2FzZSBrS2V5 Q29kZUNsZWFyOgotICAgICAgICAgICAgcmV0dXJuIFZLX0NMRUFSOwotICAgICAgICBjYXNlIGtL ZXlDb2RlRHBhZENlbnRlcjoKLSAgICAgICAgY2FzZSBrS2V5Q29kZU5ld2xpbmU6Ci0gICAgICAg ICAgICByZXR1cm4gVktfUkVUVVJOOwotICAgICAgICBjYXNlIGtLZXlDb2RlU2hpZnRMZWZ0Ogot ICAgICAgICBjYXNlIGtLZXlDb2RlU2hpZnRSaWdodDoKLSAgICAgICAgICAgIHJldHVybiBWS19T SElGVDsKLSAgICAgICAgLy8gYmFjayB3aWxsIHNlcnZlIGFzIGVzY2FwZSwgYWx0aG91Z2ggd2Ug cHJvYmFibHkgZG8gbm90IGhhdmUgYWNjZXNzIHRvIGl0Ci0gICAgICAgIGNhc2Uga0tleUNvZGVC YWNrOgotICAgICAgICAgICAgcmV0dXJuIFZLX0VTQ0FQRTsKLSAgICAgICAgY2FzZSBrS2V5Q29k ZVNwYWNlOgotICAgICAgICAgICAgcmV0dXJuIFZLX1NQQUNFOwotICAgICAgICBjYXNlIGtLZXlD b2RlSG9tZToKLSAgICAgICAgICAgIHJldHVybiBWS19IT01FOwotICAgICAgICBjYXNlIGtLZXlD b2RlRHBhZExlZnQ6Ci0gICAgICAgICAgICByZXR1cm4gVktfTEVGVDsKLSAgICAgICAgY2FzZSBr S2V5Q29kZURwYWRVcDoKLSAgICAgICAgICAgIHJldHVybiBWS19VUDsKLSAgICAgICAgY2FzZSBr S2V5Q29kZURwYWRSaWdodDoKLSAgICAgICAgICAgIHJldHVybiBWS19SSUdIVDsKLSAgICAgICAg Y2FzZSBrS2V5Q29kZURwYWREb3duOgotICAgICAgICAgICAgcmV0dXJuIFZLX0RPV047Ci0gICAg ICAgIGNhc2Uga0tleUNvZGUwOgotICAgICAgICAgICAgcmV0dXJuIFZLXzA7Ci0gICAgICAgIGNh c2Uga0tleUNvZGUxOgotICAgICAgICAgICAgcmV0dXJuIFZLXzE7Ci0gICAgICAgIGNhc2Uga0tl eUNvZGUyOgotICAgICAgICAgICAgcmV0dXJuIFZLXzI7Ci0gICAgICAgIGNhc2Uga0tleUNvZGUz OgotICAgICAgICAgICAgcmV0dXJuIFZLXzM7Ci0gICAgICAgIGNhc2Uga0tleUNvZGU0OgotICAg ICAgICAgICAgcmV0dXJuIFZLXzQ7Ci0gICAgICAgIGNhc2Uga0tleUNvZGU1OgotICAgICAgICAg ICAgcmV0dXJuIFZLXzU7Ci0gICAgICAgIGNhc2Uga0tleUNvZGU2OgotICAgICAgICAgICAgcmV0 dXJuIFZLXzY7Ci0gICAgICAgIGNhc2Uga0tleUNvZGU3OgotICAgICAgICAgICAgcmV0dXJuIFZL Xzc7Ci0gICAgICAgIGNhc2Uga0tleUNvZGU4OgotICAgICAgICAgICAgcmV0dXJuIFZLXzg7Ci0g ICAgICAgIGNhc2Uga0tleUNvZGU5OgotICAgICAgICAgICAgcmV0dXJuIFZLXzk7Ci0gICAgICAg IGNhc2Uga0tleUNvZGVBOgotICAgICAgICAgICAgcmV0dXJuIFZLX0E7Ci0gICAgICAgIGNhc2Ug a0tleUNvZGVCOgotICAgICAgICAgICAgcmV0dXJuIFZLX0I7Ci0gICAgICAgIGNhc2Uga0tleUNv ZGVDOgotICAgICAgICAgICAgcmV0dXJuIFZLX0M7Ci0gICAgICAgIGNhc2Uga0tleUNvZGVEOgot ICAgICAgICAgICAgcmV0dXJuIFZLX0Q7Ci0gICAgICAgIGNhc2Uga0tleUNvZGVFOgotICAgICAg ICAgICAgcmV0dXJuIFZLX0U7Ci0gICAgICAgIGNhc2Uga0tleUNvZGVGOgotICAgICAgICAgICAg cmV0dXJuIFZLX0Y7Ci0gICAgICAgIGNhc2Uga0tleUNvZGVHOgotICAgICAgICAgICAgcmV0dXJu IFZLX0c7Ci0gICAgICAgIGNhc2Uga0tleUNvZGVIOgotICAgICAgICAgICAgcmV0dXJuIFZLX0g7 Ci0gICAgICAgIGNhc2Uga0tleUNvZGVJOgotICAgICAgICAgICAgcmV0dXJuIFZLX0k7Ci0gICAg ICAgIGNhc2Uga0tleUNvZGVKOgotICAgICAgICAgICAgcmV0dXJuIFZLX0o7Ci0gICAgICAgIGNh c2Uga0tleUNvZGVLOgotICAgICAgICAgICAgcmV0dXJuIFZLX0s7Ci0gICAgICAgIGNhc2Uga0tl eUNvZGVMOgotICAgICAgICAgICAgcmV0dXJuIFZLX0w7Ci0gICAgICAgIGNhc2Uga0tleUNvZGVN OgotICAgICAgICAgICAgcmV0dXJuIFZLX007Ci0gICAgICAgIGNhc2Uga0tleUNvZGVOOgotICAg ICAgICAgICAgcmV0dXJuIFZLX047Ci0gICAgICAgIGNhc2Uga0tleUNvZGVPOgotICAgICAgICAg ICAgcmV0dXJuIFZLX087Ci0gICAgICAgIGNhc2Uga0tleUNvZGVQOgotICAgICAgICAgICAgcmV0 dXJuIFZLX1A7Ci0gICAgICAgIGNhc2Uga0tleUNvZGVROgotICAgICAgICAgICAgcmV0dXJuIFZL X1E7Ci0gICAgICAgIGNhc2Uga0tleUNvZGVSOgotICAgICAgICAgICAgcmV0dXJuIFZLX1I7Ci0g ICAgICAgIGNhc2Uga0tleUNvZGVTOgotICAgICAgICAgICAgcmV0dXJuIFZLX1M7Ci0gICAgICAg IGNhc2Uga0tleUNvZGVUOgotICAgICAgICAgICAgcmV0dXJuIFZLX1Q7Ci0gICAgICAgIGNhc2Ug a0tleUNvZGVVOgotICAgICAgICAgICAgcmV0dXJuIFZLX1U7Ci0gICAgICAgIGNhc2Uga0tleUNv ZGVWOgotICAgICAgICAgICAgcmV0dXJuIFZLX1Y7Ci0gICAgICAgIGNhc2Uga0tleUNvZGVXOgot ICAgICAgICAgICAgcmV0dXJuIFZLX1c7Ci0gICAgICAgIGNhc2Uga0tleUNvZGVYOgotICAgICAg ICAgICAgcmV0dXJuIFZLX1g7Ci0gICAgICAgIGNhc2Uga0tleUNvZGVZOgotICAgICAgICAgICAg cmV0dXJuIFZLX1k7Ci0gICAgICAgIGNhc2Uga0tleUNvZGVaOgotICAgICAgICAgICAgcmV0dXJu IFZLX1o7Ci0gICAgICAgIC8vIGNvbG9uCi0gICAgICAgIGNhc2Uga0tleUNvZGVTZW1pY29sb246 Ci0gICAgICAgICAgICByZXR1cm4gVktfT0VNXzE7Ci0gICAgICAgIGNhc2Uga0tleUNvZGVDb21t YToKLSAgICAgICAgICAgIHJldHVybiBWS19PRU1fQ09NTUE7Ci0gICAgICAgIGNhc2Uga0tleUNv ZGVNaW51czoKLSAgICAgICAgICAgIHJldHVybiBWS19PRU1fTUlOVVM7Ci0gICAgICAgIGNhc2Ug a0tleUNvZGVFcXVhbHM6Ci0gICAgICAgICAgICByZXR1cm4gVktfT0VNX1BMVVM7Ci0gICAgICAg IGNhc2Uga0tleUNvZGVQZXJpb2Q6Ci0gICAgICAgICAgICByZXR1cm4gVktfT0VNX1BFUklPRDsK LSAgICAgICAgY2FzZSBrS2V5Q29kZVNsYXNoOgotICAgICAgICAgICAgcmV0dXJuIFZLX09FTV8y OwotICAgICAgICAvLyBtYXliZSBub3QgdGhlIHJpZ2h0IGNob2ljZQotICAgICAgICBjYXNlIGtL ZXlDb2RlTGVmdEJyYWNrZXQ6Ci0gICAgICAgICAgICByZXR1cm4gVktfT0VNXzQ7Ci0gICAgICAg IGNhc2Uga0tleUNvZGVCYWNrc2xhc2g6Ci0gICAgICAgICAgICByZXR1cm4gVktfT0VNXzU7Ci0g ICAgICAgIGNhc2Uga0tleUNvZGVSaWdodEJyYWNrZXQ6Ci0gICAgICAgICAgICByZXR1cm4gVktf T0VNXzY7Ci0gICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICByZXR1cm4gMDsKKyAgICBzd2l0 Y2ggKGtleUNvZGUpIHsKKyAgICBjYXNlIGtLZXlDb2RlRGVsOgorICAgICAgICByZXR1cm4gVktf QkFDSzsKKyAgICBjYXNlIGtLZXlDb2RlVGFiOgorICAgICAgICByZXR1cm4gVktfVEFCOworICAg IGNhc2Uga0tleUNvZGVDbGVhcjoKKyAgICAgICAgcmV0dXJuIFZLX0NMRUFSOworICAgIGNhc2Ug a0tleUNvZGVEcGFkQ2VudGVyOgorICAgIGNhc2Uga0tleUNvZGVOZXdsaW5lOgorICAgICAgICBy ZXR1cm4gVktfUkVUVVJOOworICAgIGNhc2Uga0tleUNvZGVTaGlmdExlZnQ6CisgICAgY2FzZSBr S2V5Q29kZVNoaWZ0UmlnaHQ6CisgICAgICAgIHJldHVybiBWS19TSElGVDsKKyAgICAvLyBiYWNr IHdpbGwgc2VydmUgYXMgZXNjYXBlLCBhbHRob3VnaCB3ZSBwcm9iYWJseSBkbyBub3QgaGF2ZSBh Y2Nlc3MgdG8gaXQKKyAgICBjYXNlIGtLZXlDb2RlQmFjazoKKyAgICAgICAgcmV0dXJuIFZLX0VT Q0FQRTsKKyAgICBjYXNlIGtLZXlDb2RlU3BhY2U6CisgICAgICAgIHJldHVybiBWS19TUEFDRTsK KyAgICBjYXNlIGtLZXlDb2RlSG9tZToKKyAgICAgICAgcmV0dXJuIFZLX0hPTUU7CisgICAgY2Fz ZSBrS2V5Q29kZURwYWRMZWZ0OgorICAgICAgICByZXR1cm4gVktfTEVGVDsKKyAgICBjYXNlIGtL ZXlDb2RlRHBhZFVwOgorICAgICAgICByZXR1cm4gVktfVVA7CisgICAgY2FzZSBrS2V5Q29kZURw YWRSaWdodDoKKyAgICAgICAgcmV0dXJuIFZLX1JJR0hUOworICAgIGNhc2Uga0tleUNvZGVEcGFk RG93bjoKKyAgICAgICAgcmV0dXJuIFZLX0RPV047CisgICAgY2FzZSBrS2V5Q29kZTA6CisgICAg ICAgIHJldHVybiBWS18wOworICAgIGNhc2Uga0tleUNvZGUxOgorICAgICAgICByZXR1cm4gVktf MTsKKyAgICBjYXNlIGtLZXlDb2RlMjoKKyAgICAgICAgcmV0dXJuIFZLXzI7CisgICAgY2FzZSBr S2V5Q29kZTM6CisgICAgICAgIHJldHVybiBWS18zOworICAgIGNhc2Uga0tleUNvZGU0OgorICAg ICAgICByZXR1cm4gVktfNDsKKyAgICBjYXNlIGtLZXlDb2RlNToKKyAgICAgICAgcmV0dXJuIFZL XzU7CisgICAgY2FzZSBrS2V5Q29kZTY6CisgICAgICAgIHJldHVybiBWS182OworICAgIGNhc2Ug a0tleUNvZGU3OgorICAgICAgICByZXR1cm4gVktfNzsKKyAgICBjYXNlIGtLZXlDb2RlODoKKyAg ICAgICAgcmV0dXJuIFZLXzg7CisgICAgY2FzZSBrS2V5Q29kZTk6CisgICAgICAgIHJldHVybiBW S185OworICAgIGNhc2Uga0tleUNvZGVBOgorICAgICAgICByZXR1cm4gVktfQTsKKyAgICBjYXNl IGtLZXlDb2RlQjoKKyAgICAgICAgcmV0dXJuIFZLX0I7CisgICAgY2FzZSBrS2V5Q29kZUM6Cisg ICAgICAgIHJldHVybiBWS19DOworICAgIGNhc2Uga0tleUNvZGVEOgorICAgICAgICByZXR1cm4g VktfRDsKKyAgICBjYXNlIGtLZXlDb2RlRToKKyAgICAgICAgcmV0dXJuIFZLX0U7CisgICAgY2Fz ZSBrS2V5Q29kZUY6CisgICAgICAgIHJldHVybiBWS19GOworICAgIGNhc2Uga0tleUNvZGVHOgor ICAgICAgICByZXR1cm4gVktfRzsKKyAgICBjYXNlIGtLZXlDb2RlSDoKKyAgICAgICAgcmV0dXJu IFZLX0g7CisgICAgY2FzZSBrS2V5Q29kZUk6CisgICAgICAgIHJldHVybiBWS19JOworICAgIGNh c2Uga0tleUNvZGVKOgorICAgICAgICByZXR1cm4gVktfSjsKKyAgICBjYXNlIGtLZXlDb2RlSzoK KyAgICAgICAgcmV0dXJuIFZLX0s7CisgICAgY2FzZSBrS2V5Q29kZUw6CisgICAgICAgIHJldHVy biBWS19MOworICAgIGNhc2Uga0tleUNvZGVNOgorICAgICAgICByZXR1cm4gVktfTTsKKyAgICBj YXNlIGtLZXlDb2RlTjoKKyAgICAgICAgcmV0dXJuIFZLX047CisgICAgY2FzZSBrS2V5Q29kZU86 CisgICAgICAgIHJldHVybiBWS19POworICAgIGNhc2Uga0tleUNvZGVQOgorICAgICAgICByZXR1 cm4gVktfUDsKKyAgICBjYXNlIGtLZXlDb2RlUToKKyAgICAgICAgcmV0dXJuIFZLX1E7CisgICAg Y2FzZSBrS2V5Q29kZVI6CisgICAgICAgIHJldHVybiBWS19SOworICAgIGNhc2Uga0tleUNvZGVT OgorICAgICAgICByZXR1cm4gVktfUzsKKyAgICBjYXNlIGtLZXlDb2RlVDoKKyAgICAgICAgcmV0 dXJuIFZLX1Q7CisgICAgY2FzZSBrS2V5Q29kZVU6CisgICAgICAgIHJldHVybiBWS19VOworICAg IGNhc2Uga0tleUNvZGVWOgorICAgICAgICByZXR1cm4gVktfVjsKKyAgICBjYXNlIGtLZXlDb2Rl VzoKKyAgICAgICAgcmV0dXJuIFZLX1c7CisgICAgY2FzZSBrS2V5Q29kZVg6CisgICAgICAgIHJl dHVybiBWS19YOworICAgIGNhc2Uga0tleUNvZGVZOgorICAgICAgICByZXR1cm4gVktfWTsKKyAg ICBjYXNlIGtLZXlDb2RlWjoKKyAgICAgICAgcmV0dXJuIFZLX1o7CisgICAgLy8gY29sb24KKyAg ICBjYXNlIGtLZXlDb2RlU2VtaWNvbG9uOgorICAgICAgICByZXR1cm4gVktfT0VNXzE7CisgICAg Y2FzZSBrS2V5Q29kZUNvbW1hOgorICAgICAgICByZXR1cm4gVktfT0VNX0NPTU1BOworICAgIGNh c2Uga0tleUNvZGVNaW51czoKKyAgICAgICAgcmV0dXJuIFZLX09FTV9NSU5VUzsKKyAgICBjYXNl IGtLZXlDb2RlRXF1YWxzOgorICAgICAgICByZXR1cm4gVktfT0VNX1BMVVM7CisgICAgY2FzZSBr S2V5Q29kZVBlcmlvZDoKKyAgICAgICAgcmV0dXJuIFZLX09FTV9QRVJJT0Q7CisgICAgY2FzZSBr S2V5Q29kZVNsYXNoOgorICAgICAgICByZXR1cm4gVktfT0VNXzI7CisgICAgLy8gbWF5YmUgbm90 IHRoZSByaWdodCBjaG9pY2UKKyAgICBjYXNlIGtLZXlDb2RlTGVmdEJyYWNrZXQ6CisgICAgICAg IHJldHVybiBWS19PRU1fNDsKKyAgICBjYXNlIGtLZXlDb2RlQmFja3NsYXNoOgorICAgICAgICBy ZXR1cm4gVktfT0VNXzU7CisgICAgY2FzZSBrS2V5Q29kZVJpZ2h0QnJhY2tldDoKKyAgICAgICAg cmV0dXJuIFZLX09FTV82OworICAgIGRlZmF1bHQ6CisgICAgICAgIHJldHVybiAwOwogICAgIH0K IH0KIApAQCAtMTcxLDI4ICsxNzEsMjggQEAgc3RhdGljIFN0cmluZyBrZXlJZGVudGlmaWVyRm9y QW5kcm9pZEtleQogICAgIC8vIERvZXMgbm90IHJldHVybiBhbGwgb2YgdGhlIHNhbWUga2V5IGlk ZW50aWZpZXJzLCBhbmQKICAgICAvLyBkb2VzIG5vdCBoYW5kbGUgYWxsIHRoZSBrZXlzLgogICAg IHN3aXRjaCAoa2V5Q29kZSkgewotICAgICAgICBjYXNlIGtLZXlDb2RlQ2xlYXI6Ci0gICAgICAg ICAgICByZXR1cm4gIkNsZWFyIjsKLSAgICAgICAgY2FzZSBrS2V5Q29kZU5ld2xpbmU6Ci0gICAg ICAgIGNhc2Uga0tleUNvZGVEcGFkQ2VudGVyOgotICAgICAgICAgICAgcmV0dXJuICJFbnRlciI7 Ci0gICAgICAgIGNhc2Uga0tleUNvZGVIb21lOgotICAgICAgICAgICAgcmV0dXJuICJIb21lIjsK LSAgICAgICAgY2FzZSBrS2V5Q29kZURwYWREb3duOgotICAgICAgICAgICAgcmV0dXJuICJEb3du IjsKLSAgICAgICAgY2FzZSBrS2V5Q29kZURwYWRMZWZ0OgotICAgICAgICAgICAgcmV0dXJuICJM ZWZ0IjsKLSAgICAgICAgY2FzZSBrS2V5Q29kZURwYWRSaWdodDoKLSAgICAgICAgICAgIHJldHVy biAiUmlnaHQiOwotICAgICAgICBjYXNlIGtLZXlDb2RlRHBhZFVwOgotICAgICAgICAgICAgcmV0 dXJuICJVcCI7Ci0gICAgICAgIC8vIFN0YW5kYXJkIHNheXMgdGhhdCBERUwgYmVjb21lcyBVKzAw MDA3Ri4KLSAgICAgICAgY2FzZSBrS2V5Q29kZURlbDoKLSAgICAgICAgICAgIHJldHVybiAiVSsw MDAwN0YiOwotICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgY2hhciB1cHBlclsxNl07Ci0g ICAgICAgICAgICBzcHJpbnRmKHVwcGVyLCAiVSslMDZYIiwgd2luZG93c0tleUNvZGVGb3JLZXlF dmVudChrZXlDb2RlKSk7Ci0gICAgICAgICAgICByZXR1cm4gU3RyaW5nKHVwcGVyKTsKKyAgICBj YXNlIGtLZXlDb2RlQ2xlYXI6CisgICAgICAgIHJldHVybiAiQ2xlYXIiOworICAgIGNhc2Uga0tl eUNvZGVOZXdsaW5lOgorICAgIGNhc2Uga0tleUNvZGVEcGFkQ2VudGVyOgorICAgICAgICByZXR1 cm4gIkVudGVyIjsKKyAgICBjYXNlIGtLZXlDb2RlSG9tZToKKyAgICAgICAgcmV0dXJuICJIb21l IjsKKyAgICBjYXNlIGtLZXlDb2RlRHBhZERvd246CisgICAgICAgIHJldHVybiAiRG93biI7Cisg ICAgY2FzZSBrS2V5Q29kZURwYWRMZWZ0OgorICAgICAgICByZXR1cm4gIkxlZnQiOworICAgIGNh c2Uga0tleUNvZGVEcGFkUmlnaHQ6CisgICAgICAgIHJldHVybiAiUmlnaHQiOworICAgIGNhc2Ug a0tleUNvZGVEcGFkVXA6CisgICAgICAgIHJldHVybiAiVXAiOworICAgIC8vIFN0YW5kYXJkIHNh eXMgdGhhdCBERUwgYmVjb21lcyBVKzAwMDA3Ri4KKyAgICBjYXNlIGtLZXlDb2RlRGVsOgorICAg ICAgICByZXR1cm4gIlUrMDAwMDdGIjsKKyAgICBkZWZhdWx0OgorICAgICAgICBjaGFyIHVwcGVy WzE2XTsKKyAgICAgICAgc3ByaW50Zih1cHBlciwgIlUrJTA2WCIsIHdpbmRvd3NLZXlDb2RlRm9y S2V5RXZlbnQoa2V5Q29kZSkpOworICAgICAgICByZXR1cm4gU3RyaW5nKHVwcGVyKTsKICAgICB9 CiB9CiAKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vYW5kcm9pZC9TY3JlZW5BbmRyb2lkLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2FuZHJvaWQvU2NyZWVuQW5kcm9pZC5jcHAJ KHJldmlzaW9uIDQ5OTc1KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL1NjcmVlbkFuZHJv aWQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMSwxNCArMzEsMTIgQEAKIAogI2luY2x1ZGUgIkZs b2F0UmVjdC5oIgogI2luY2x1ZGUgIldpZGdldC5oIgotCisjaW5jbHVkZSAidWkvRGlzcGxheUlu Zm8uaCIKKyNpbmNsdWRlICJ1aS9QaXhlbEZvcm1hdC5oIgorI2luY2x1ZGUgInVpL1N1cmZhY2VD b21wb3NlckNsaWVudC5oIgogI3VuZGVmIExPRyAvLyBGSVhNRTogU3RpbGwgaGF2ZSB0byBkbyB0 aGlzIHRvIGdldCB0aGUgbG9nIHRvIHNob3cgdXAKICNpbmNsdWRlICJ1dGlscy9Mb2cuaCIKIAot I2luY2x1ZGUgInVpL1N1cmZhY2VDb21wb3NlckNsaWVudC5oIgotI2luY2x1ZGUgInVpL1BpeGVs Rm9ybWF0LmgiCi0jaW5jbHVkZSAidWkvRGlzcGxheUluZm8uaCIKLQogbmFtZXNwYWNlIFdlYkNv cmUgewogCiBpbnQgc2NyZWVuRGVwdGgoV2lkZ2V0KiBwYWdlKQpAQCAtNzAsMTggKzY4LDE4IEBA IGludCBTY3JlZW46Om9yaWVudGF0aW9uKCkgY29uc3QKICAgICAvLyB0byB0aGUgdmFsdWVzIGRl c2NyaWJlZCBoZXJlCiAgICAgLy8gKGh0dHA6Ly9kZXZlbG9wZXIuYXBwbGUuY29tL2RvY3VtZW50 YXRpb24vQXBwbGVBcHBsaWNhdGlvbnMvUmVmZXJlbmNlL1NhZmFyaVdlYkNvbnRlbnQvSGFuZGxp bmdFdmVudHMvY2hhcHRlcl84X3NlY3Rpb25fNi5odG1sKQogICAgIHN3aXRjaCAoaW5mby5vcmll bnRhdGlvbikgewotICAgICAgICBjYXNlIGFuZHJvaWQ6OklTdXJmYWNlQ29tcG9zZXI6OmVPcmll bnRhdGlvbkRlZmF1bHQ6Ci0gICAgICAgICAgICByZXR1cm4gMDsKLSAgICAgICAgY2FzZSBhbmRy b2lkOjpJU3VyZmFjZUNvbXBvc2VyOjplT3JpZW50YXRpb245MDoKLSAgICAgICAgICAgIHJldHVy biA5MDsKLSAgICAgICAgY2FzZSBhbmRyb2lkOjpJU3VyZmFjZUNvbXBvc2VyOjplT3JpZW50YXRp b24xODA6Ci0gICAgICAgICAgICByZXR1cm4gMTgwOwotICAgICAgICBjYXNlIGFuZHJvaWQ6OklT dXJmYWNlQ29tcG9zZXI6OmVPcmllbnRhdGlvbjI3MDoKLSAgICAgICAgICAgIHJldHVybiAtOTA7 Ci0gICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICBMT0dFKCJCYWQgb3JpZW50YXRpb24gcmV0 dXJuZWQgZnJvbSBnZXREaXNwbGF5SW5kbyAlZCIsCi0gICAgICAgICAgICAgICAgICAgIGluZm8u b3JpZW50YXRpb24pOwotICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgY2FzZSBhbmRyb2lkOjpJ U3VyZmFjZUNvbXBvc2VyOjplT3JpZW50YXRpb25EZWZhdWx0OgorICAgICAgICByZXR1cm4gMDsK KyAgICBjYXNlIGFuZHJvaWQ6OklTdXJmYWNlQ29tcG9zZXI6OmVPcmllbnRhdGlvbjkwOgorICAg ICAgICByZXR1cm4gOTA7CisgICAgY2FzZSBhbmRyb2lkOjpJU3VyZmFjZUNvbXBvc2VyOjplT3Jp ZW50YXRpb24xODA6CisgICAgICAgIHJldHVybiAxODA7CisgICAgY2FzZSBhbmRyb2lkOjpJU3Vy ZmFjZUNvbXBvc2VyOjplT3JpZW50YXRpb24yNzA6CisgICAgICAgIHJldHVybiAtOTA7CisgICAg ZGVmYXVsdDoKKyAgICAgICAgTE9HRSgiQmFkIG9yaWVudGF0aW9uIHJldHVybmVkIGZyb20gZ2V0 RGlzcGxheUluZG8gJWQiLAorICAgICAgICAgICAgICAgIGluZm8ub3JpZW50YXRpb24pOworICAg ICAgICByZXR1cm4gMDsKICAgICB9CiB9CiAjZW5kaWYKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0v YW5kcm9pZC9UZW1wb3JhcnlMaW5rU3R1YnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxh dGZvcm0vYW5kcm9pZC9UZW1wb3JhcnlMaW5rU3R1YnMuY3BwCShyZXZpc2lvbiA0OTk3NSkKKysr IFdlYkNvcmUvcGxhdGZvcm0vYW5kcm9pZC9UZW1wb3JhcnlMaW5rU3R1YnMuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0yOCwxNyArMjgsMTUgQEAKIAogI2RlZmluZSBBTkRST0lEX0NPTVBJTEVfSEFD SwogCi0jaW5jbHVkZSA8c3RkaW8uaD4KLSNpbmNsdWRlIDxzdGRsaWIuaD4KICNpbmNsdWRlICJB WE9iamVjdENhY2hlLmgiCisjaW5jbHVkZSAiQ1N0cmluZy5oIgogI2luY2x1ZGUgIkNhY2hlZFBh Z2UuaCIKICNpbmNsdWRlICJDYWNoZWRSZXNvdXJjZS5oIgotI2luY2x1ZGUgIkNvb2tpZUphci5o IgorI2luY2x1ZGUgIkNsaXBib2FyZC5oIgogI2luY2x1ZGUgIkNvbnNvbGUuaCIKICNpbmNsdWRl ICJDb250ZXh0TWVudS5oIgogI2luY2x1ZGUgIkNvbnRleHRNZW51SXRlbS5oIgotI2luY2x1ZGUg IkNsaXBib2FyZC5oIgotI2luY2x1ZGUgIkNTdHJpbmcuaCIKKyNpbmNsdWRlICJDb29raWVKYXIu aCIKICNpbmNsdWRlICJDdXJzb3IuaCIKICNpbmNsdWRlICJEYXRhYmFzZS5oIgogI2luY2x1ZGUg IkRvY3VtZW50RnJhZ21lbnQuaCIKQEAgLTQ5LDggKzQ3LDggQEAKICNpbmNsdWRlICJGaWxlTGlz dC5oIgogI2luY2x1ZGUgIkZvbnQuaCIKICNpbmNsdWRlICJGcmFtZS5oIgotI2luY2x1ZGUgIkZy YW1lTG9hZGVyLmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkUmVxdWVzdC5oIgorI2luY2x1ZGUgIkZy YW1lTG9hZGVyLmgiCiAjaW5jbHVkZSAiRnJhbWVWaWV3LmgiCiAjaW5jbHVkZSAiR3JhcGhpY3ND b250ZXh0LmgiCiAjaW5jbHVkZSAiSFRNTEZyYW1lT3duZXJFbGVtZW50LmgiCkBAIC02MCwyMSAr NTgsMTEgQEAKICNpbmNsdWRlICJJY29uRGF0YWJhc2UuaCIKICNpbmNsdWRlICJJY29uTG9hZGVy LmgiCiAjaW5jbHVkZSAiSW50UG9pbnQuaCIKLQotI2lmIFVTRShKU0MpCi0jaW5jbHVkZSAiSmF2 YVNjcmlwdENhbGxGcmFtZS5oIgotI2luY2x1ZGUgIkphdmFTY3JpcHREZWJ1Z1NlcnZlci5oIgot I2luY2x1ZGUgIkFQSS9KU0NsYXNzUmVmLmgiCi0jaW5jbHVkZSAiSmF2YVNjcmlwdFByb2ZpbGUu aCIKLSNpbmNsdWRlICJqbmlfdXRpbGl0eS5oIgotI2VuZGlmCi0KICNpbmNsdWRlICJLVVJMLmgi CiAjaW5jbHVkZSAiTGFuZ3VhZ2UuaCIKLSNpbmNsdWRlICJsb2FkZXIuaCIKICNpbmNsdWRlICJM b2NhbGl6ZWRTdHJpbmdzLmgiCi0jaW5jbHVkZSAiTWFpblJlc291cmNlTG9hZGVyLmgiCiAjaW5j bHVkZSAiTUlNRVR5cGVSZWdpc3RyeS5oIgorI2luY2x1ZGUgIk1haW5SZXNvdXJjZUxvYWRlci5o IgogI2luY2x1ZGUgIk5vZGUuaCIKICNpbmNsdWRlICJOb3RJbXBsZW1lbnRlZC5oIgogI2luY2x1 ZGUgIlBhZ2VDYWNoZS5oIgpAQCAtODksNiArNzcsMTcgQEAKICNpbmNsdWRlICJTY3JvbGxiYXJU aGVtZS5oIgogI2luY2x1ZGUgIlNtYXJ0UmVwbGFjZS5oIgogI2luY2x1ZGUgIldpZGdldC5oIgor I2luY2x1ZGUgImxvYWRlci5oIgorI2luY2x1ZGUgPHN0ZGlvLmg+CisjaW5jbHVkZSA8c3RkbGli Lmg+CisKKyNpZiBVU0UoSlNDKQorI2luY2x1ZGUgIkFQSS9KU0NsYXNzUmVmLmgiCisjaW5jbHVk ZSAiSmF2YVNjcmlwdENhbGxGcmFtZS5oIgorI2luY2x1ZGUgIkphdmFTY3JpcHREZWJ1Z1NlcnZl ci5oIgorI2luY2x1ZGUgIkphdmFTY3JpcHRQcm9maWxlLmgiCisjaW5jbHVkZSAiam5pX3V0aWxp dHkuaCIKKyNlbmRpZgogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAo=