95549 2012-08-31 03:48:14 -0700 [GTK] Add API to get/set the security policy of a given URI scheme 2012-09-06 09:49:20 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 cgarcia webkit-unassigned gustavo mario mrobinson xan.lopez oldest_to_newest 709461 0 cgarcia 2012-08-31 03:48:14 -0700 This is useful to set the security policy for custom URI schemes, for example, to be treated as local or secure. 709463 1 161654 cgarcia 2012-08-31 03:51:39 -0700 Created attachment 161654 Patch 709531 2 cgarcia 2012-08-31 05:50:04 -0700 I needed this API to implement custom URI schemes in Yelp in preparation for the WebKit2 port. See the last patch in this bug: https://bugzilla.gnome.org/show_bug.cgi?id=683100 710468 3 mario 2012-09-03 01:11:59 -0700 The patch looks good to me. If I wanted to be a nitpicker I would just say "maybe expand a bit more the documentation, as in making some things clearer such as what a URI scheme is (maybe a reference to RFC 3986?) or what a 'CORS request' is (Cross-Origin Resource Sharing, I assume)" 710769 4 161654 mrobinson 2012-09-03 18:04:14 -0700 Comment on attachment 161654 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=161654&action=review Looks good to me! Just a couple comments. > Source/WebKit/gtk/webkit/webkitglobals.h:149 > + * @WEBKIT_SECURITY_POLICY_NO_ACCESS: Pages loaded with this URI scheme WEBKIT_SECURITY_POLICY_NO_ACCESS seems a bit too broad. Perhaps WEBKIT_SECURITY_POLICY_NO_ACCESS_TO_OTHER_SCHEMES or something better? > Source/WebKit/gtk/webkit/webkitglobals.h:155 > + * @WEBKIT_SECURITY_POLICY_CORS_ENABLED: URI scheme that can be sent CORS requests. Agree with Mario here that you might want to link to the CORS spec. 713307 5 162512 cgarcia 2012-09-06 08:19:07 -0700 Created attachment 162512 Updated patch to address review comments 713380 6 cgarcia 2012-09-06 09:49:20 -0700 Committed r127749: <http://trac.webkit.org/changeset/127749> 161654 2012-08-31 03:51:39 -0700 2012-09-06 08:19:07 -0700 Patch wk-security-policy.diff text/plain 9985 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Z3RrL0NoYW5nZUxvZwppbmRleCA0MGQ3MTIyLi5iMDBlNzA0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTItMDgtMzEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNp YUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEFkZCBBUEkgdG8gZ2V0L3NldCB0aGUgc2Vj dXJpdHkgcG9saWN5IG9mIGEgZ2l2ZW4gVVJJIHNjaGVtZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTU1NDkKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgV2ViS2l0U2VjdXJpdHlQb2xpY3kgZW51bSB3 aXRoIGZsYWdzIHRoYXQgcmVwcmVzZW50IHRoZQorICAgICAgICBzZWN1cml0eSBwb2xpY3kgb2Yg YSBVUkkgc2NoZW1lLiBBZGQgbWV0aG9kcyB0byBnZXQgYW5kIHNldCB0aGUKKyAgICAgICAgc2Vj dXJpdHkgcG9saWN5IGZsYWdzIGZvciBhIGdpdmVuIFVSSSBzY2hlbWUuCisKKyAgICAgICAgKiBk b2NzL3dlYmtpdGd0ay1zZWN0aW9ucy50eHQ6IEFkZCBuZXcgc3ltYm9scy4KKyAgICAgICAgKiB0 ZXN0cy90ZXN0Z2xvYmFscy5jOgorICAgICAgICAodGVzdF9nbG9iYWxzX3NlY3VyaXR5X3BvbGlj eSk6CisgICAgICAgIChtYWluKToKKyAgICAgICAgKiB3ZWJraXQvd2Via2l0Z2xvYmFscy5jcHA6 CisgICAgICAgICh3ZWJraXRfc2V0X3NlY3VyaXR5X3BvbGljeV9mb3JfdXJpX3NjaGVtZSk6Cisg ICAgICAgICh3ZWJraXRfZ2V0X3NlY3VyaXR5X3BvbGljeV9mb3JfdXJpX3NjaGVtZSk6CisgICAg ICAgICogd2Via2l0L3dlYmtpdGdsb2JhbHMuaDoKKwogMjAxMi0wOC0yMyAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMTI2 MzA2KTogaXQgYnJva2UgdGhlIHBsdWdpbiBwcm9jZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2d0ay9kb2NzL3dlYmtpdGd0ay1zZWN0aW9ucy50eHQgYi9Tb3VyY2UvV2ViS2l0L2d0ay9k b2NzL3dlYmtpdGd0ay1zZWN0aW9ucy50eHQKaW5kZXggNTk5NzBiNS4uYjcwN2JmOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9ndGsvZG9jcy93ZWJraXRndGstc2VjdGlvbnMudHh0CisrKyBi L1NvdXJjZS9XZWJLaXQvZ3RrL2RvY3Mvd2Via2l0Z3RrLXNlY3Rpb25zLnR4dApAQCAtNTM2LDYg KzUzNiwxMCBAQCB3ZWJraXRfc2V0X2NhY2hlX21vZGVsCiA8U1VCU0VDVElPTiBDb250ZXh0TWVu dUl0ZW0+CiBXZWJLaXRDb250ZXh0TWVudUFjdGlvbgogd2Via2l0X2NvbnRleHRfbWVudV9pdGVt X2dldF9hY3Rpb24KKzxTVUJTRUNUSU9OIFNlY3VyaXR5UG9saWN5PgorV2ViS2l0U2VjdXJpdHlQ b2xpY3kKK3dlYmtpdF9zZXRfc2VjdXJpdHlfcG9saWN5X2Zvcl91cmlfc2NoZW1lCit3ZWJraXRf Z2V0X3NlY3VyaXR5X3BvbGljeV9mb3JfdXJpX3NjaGVtZQogPFNVQlNFQ1RJT04gUHJpdmF0ZT4K IFdFQktJVEdUS19BUElfVkVSU0lPTgogPC9TRUNUSU9OPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9ndGsvdGVzdHMvdGVzdGdsb2JhbHMuYyBiL1NvdXJjZS9XZWJLaXQvZ3RrL3Rlc3RzL3Rl c3RnbG9iYWxzLmMKaW5kZXggNTA5YzNiZi4uOGQxOGYwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9ndGsvdGVzdHMvdGVzdGdsb2JhbHMuYworKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0 cy90ZXN0Z2xvYmFscy5jCkBAIC00NSw2ICs0NSw1OCBAQCBzdGF0aWMgdm9pZCB0ZXN0X2dsb2Jh bHNfZGVmYXVsdF9zZXNzaW9uKCkKICAgICBnX2Fzc2VydChzb3VwX3Nlc3Npb25fZ2V0X2ZlYXR1 cmUoc2Vzc2lvbiwgV0VCS0lUX1RZUEVfU09VUF9BVVRIX0RJQUxPRykgPT0gTlVMTCk7CiB9CiAK K3N0YXRpYyB2b2lkIHRlc3RfZ2xvYmFsc19zZWN1cml0eV9wb2xpY3koKQoreworICAgIC8vIENo ZWNrIGRlZmF1bHQgcG9saWN5IGZvciB3ZWxsIGtub3duIHNjaGVtZXMuCisgICAgV2ViS2l0U2Vj dXJpdHlQb2xpY3kgcG9saWN5ID0gd2Via2l0X2dldF9zZWN1cml0eV9wb2xpY3lfZm9yX3VyaV9z Y2hlbWUoImh0dHAiKTsKKyAgICBndWludCBtYXNrID0gV0VCS0lUX1NFQ1VSSVRZX1BPTElDWV9D T1JTX0VOQUJMRUQ7CisgICAgZ19hc3NlcnRfY21wdWludChwb2xpY3kgJiBtYXNrLCA9PSwgbWFz ayk7CisKKyAgICBwb2xpY3kgPSB3ZWJraXRfZ2V0X3NlY3VyaXR5X3BvbGljeV9mb3JfdXJpX3Nj aGVtZSgiaHR0cHMiKTsKKyAgICBtYXNrID0gV0VCS0lUX1NFQ1VSSVRZX1BPTElDWV9TRUNVUkUg fCBXRUJLSVRfU0VDVVJJVFlfUE9MSUNZX0NPUlNfRU5BQkxFRDsKKyAgICBnX2Fzc2VydF9jbXB1 aW50KHBvbGljeSAmIG1hc2ssID09LCBtYXNrKTsKKworICAgIHBvbGljeSA9IHdlYmtpdF9nZXRf c2VjdXJpdHlfcG9saWN5X2Zvcl91cmlfc2NoZW1lKCJmaWxlIik7CisgICAgbWFzayA9IFdFQktJ VF9TRUNVUklUWV9QT0xJQ1lfTE9DQUw7CisgICAgZ19hc3NlcnRfY21wdWludChwb2xpY3kgJiBt YXNrLCA9PSwgbWFzayk7CisKKyAgICBwb2xpY3kgPSB3ZWJraXRfZ2V0X3NlY3VyaXR5X3BvbGlj eV9mb3JfdXJpX3NjaGVtZSgiZGF0YSIpOworICAgIG1hc2sgPSBXRUJLSVRfU0VDVVJJVFlfUE9M SUNZX05PX0FDQ0VTUyB8IFdFQktJVF9TRUNVUklUWV9QT0xJQ1lfU0VDVVJFOworICAgIGdfYXNz ZXJ0X2NtcHVpbnQocG9saWN5ICYgbWFzaywgPT0sIG1hc2spOworCisgICAgcG9saWN5ID0gd2Vi a2l0X2dldF9zZWN1cml0eV9wb2xpY3lfZm9yX3VyaV9zY2hlbWUoImFib3V0Iik7CisgICAgbWFz ayA9IFdFQktJVF9TRUNVUklUWV9QT0xJQ1lfTk9fQUNDRVNTIHwgV0VCS0lUX1NFQ1VSSVRZX1BP TElDWV9TRUNVUkUgfCBXRUJLSVRfU0VDVVJJVFlfUE9MSUNZX0VNUFRZX0RPQ1VNRU5UOworICAg IGdfYXNzZXJ0X2NtcHVpbnQocG9saWN5ICYgbWFzaywgPT0sIG1hc2spOworCisgICAgLy8gQ3Vz dG9tIHNjaGVtZS4KKyAgICBwb2xpY3kgPSB3ZWJraXRfZ2V0X3NlY3VyaXR5X3BvbGljeV9mb3Jf dXJpX3NjaGVtZSgiZm9vIik7CisgICAgZ19hc3NlcnQoIXBvbGljeSk7CisKKyAgICBwb2xpY3kg fD0gV0VCS0lUX1NFQ1VSSVRZX1BPTElDWV9MT0NBTDsKKyAgICB3ZWJraXRfc2V0X3NlY3VyaXR5 X3BvbGljeV9mb3JfdXJpX3NjaGVtZSgiZm9vIiwgcG9saWN5KTsKKyAgICBnX2Fzc2VydF9jbXB1 aW50KHdlYmtpdF9nZXRfc2VjdXJpdHlfcG9saWN5X2Zvcl91cmlfc2NoZW1lKCJmb28iKSwgPT0s IHBvbGljeSk7CisKKyAgICBwb2xpY3kgfD0gV0VCS0lUX1NFQ1VSSVRZX1BPTElDWV9OT19BQ0NF U1M7CisgICAgd2Via2l0X3NldF9zZWN1cml0eV9wb2xpY3lfZm9yX3VyaV9zY2hlbWUoImZvbyIs IHBvbGljeSk7CisgICAgZ19hc3NlcnRfY21wdWludCh3ZWJraXRfZ2V0X3NlY3VyaXR5X3BvbGlj eV9mb3JfdXJpX3NjaGVtZSgiZm9vIiksID09LCBwb2xpY3kpOworCisgICAgcG9saWN5IHw9IFdF QktJVF9TRUNVUklUWV9QT0xJQ1lfRElTUExBWV9JU09MQVRFRDsKKyAgICB3ZWJraXRfc2V0X3Nl Y3VyaXR5X3BvbGljeV9mb3JfdXJpX3NjaGVtZSgiZm9vIiwgcG9saWN5KTsKKyAgICBnX2Fzc2Vy dF9jbXB1aW50KHdlYmtpdF9nZXRfc2VjdXJpdHlfcG9saWN5X2Zvcl91cmlfc2NoZW1lKCJmb28i KSwgPT0sIHBvbGljeSk7CisKKyAgICBwb2xpY3kgfD0gV0VCS0lUX1NFQ1VSSVRZX1BPTElDWV9T RUNVUkU7CisgICAgd2Via2l0X3NldF9zZWN1cml0eV9wb2xpY3lfZm9yX3VyaV9zY2hlbWUoImZv byIsIHBvbGljeSk7CisgICAgZ19hc3NlcnRfY21wdWludCh3ZWJraXRfZ2V0X3NlY3VyaXR5X3Bv bGljeV9mb3JfdXJpX3NjaGVtZSgiZm9vIiksID09LCBwb2xpY3kpOworCisgICAgcG9saWN5IHw9 IFdFQktJVF9TRUNVUklUWV9QT0xJQ1lfQ09SU19FTkFCTEVEOworICAgIHdlYmtpdF9zZXRfc2Vj dXJpdHlfcG9saWN5X2Zvcl91cmlfc2NoZW1lKCJmb28iLCBwb2xpY3kpOworICAgIGdfYXNzZXJ0 X2NtcHVpbnQod2Via2l0X2dldF9zZWN1cml0eV9wb2xpY3lfZm9yX3VyaV9zY2hlbWUoImZvbyIp LCA9PSwgcG9saWN5KTsKKworICAgIHBvbGljeSB8PSBXRUJLSVRfU0VDVVJJVFlfUE9MSUNZX0VN UFRZX0RPQ1VNRU5UOworICAgIHdlYmtpdF9zZXRfc2VjdXJpdHlfcG9saWN5X2Zvcl91cmlfc2No ZW1lKCJmb28iLCBwb2xpY3kpOworICAgIGdfYXNzZXJ0X2NtcHVpbnQod2Via2l0X2dldF9zZWN1 cml0eV9wb2xpY3lfZm9yX3VyaV9zY2hlbWUoImZvbyIpLCA9PSwgcG9saWN5KTsKK30KKwogaW50 IG1haW4oaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQogewogICAgIGd0a190ZXN0X2luaXQoJmFyZ2Ms ICZhcmd2LCBOVUxMKTsKQEAgLTUyLDYgKzEwNCw4IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFy KiogYXJndikKICAgICBnX3Rlc3RfYnVnX2Jhc2UoImh0dHBzOi8vYnVncy53ZWJraXQub3JnLyIp OwogICAgIGdfdGVzdF9hZGRfZnVuYygiL3dlYmtpdC9nbG9iYWxzL2RlZmF1bHRfc2Vzc2lvbiIs CiAgICAgICAgICAgICAgICAgICAgIHRlc3RfZ2xvYmFsc19kZWZhdWx0X3Nlc3Npb24pOworICAg IGdfdGVzdF9hZGRfZnVuYygiL3dlYmtpdC9nbG9iYWxzL3NlY3VyaXR5LXBvbGljeSIsCisgICAg ICAgICAgICAgICAgICAgIHRlc3RfZ2xvYmFsc19zZWN1cml0eV9wb2xpY3kpOwogICAgIHJldHVy biBnX3Rlc3RfcnVuKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtp dC93ZWJraXRnbG9iYWxzLmNwcCBiL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRnbG9i YWxzLmNwcAppbmRleCA0MDM1NmI4Li5hZTBiNDgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2d0ay93ZWJraXQvd2Via2l0Z2xvYmFscy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ndGsvd2Vi a2l0L3dlYmtpdGdsb2JhbHMuY3BwCkBAIC00MCw2ICs0MCw3IEBACiAjaW5jbHVkZSAiUmVzb3Vy Y2VIYW5kbGVDbGllbnQuaCIKICNpbmNsdWRlICJSZXNvdXJjZUhhbmRsZUludGVybmFsLmgiCiAj aW5jbHVkZSAiUmVzb3VyY2VSZXNwb25zZS5oIgorI2luY2x1ZGUgIlNjaGVtZVJlZ2lzdHJ5Lmgi CiAjaW5jbHVkZSAid2Via2l0YXBwbGljYXRpb25jYWNoZS5oIgogI2luY2x1ZGUgIndlYmtpdGZh dmljb25kYXRhYmFzZS5oIgogI2luY2x1ZGUgIndlYmtpdGdsb2JhbHNwcml2YXRlLmgiCkBAIC00 OTEsNiArNDkyLDcxIEBAIFdlYktpdENvbnRleHRNZW51QWN0aW9uIHdlYmtpdF9jb250ZXh0X21l bnVfaXRlbV9nZXRfYWN0aW9uKEd0a01lbnVJdGVtKiBpdGVtKQogI2VuZGlmCiB9CiAKKy8qKgor ICogd2Via2l0X3NldF9zZWN1cml0eV9wb2xpY3lfZm9yX3VyaV9zY2hlbWU6CisgKiBAc2NoZW1l OiBhIFVSSSBzY2hlbWUKKyAqIEBwb2xpY3k6IGEgI1dlYktpdFNlY3VyaXR5UG9saWN5CisgKgor ICogU2V0IHRoZSBzZWN1cml0eSBwb2xpY3kgZm9yIHRoZSBnaXZlbiBVUkkgc2NoZW1lLgorICoK KyAqIFNpbmNlOiAyLjAKKyAqLwordm9pZCB3ZWJraXRfc2V0X3NlY3VyaXR5X3BvbGljeV9mb3Jf dXJpX3NjaGVtZShjb25zdCBjaGFyICpzY2hlbWUsIFdlYktpdFNlY3VyaXR5UG9saWN5IHBvbGlj eSkKK3sKKyAgICBnX3JldHVybl9pZl9mYWlsKHNjaGVtZSk7CisKKyAgICBpZiAoIXBvbGljeSkK KyAgICAgICAgcmV0dXJuOworCisgICAgU3RyaW5nIHVybFNjaGVtZSA9IFN0cmluZzo6ZnJvbVVU Rjgoc2NoZW1lKTsKKworICAgIGlmIChwb2xpY3kgJiBXRUJLSVRfU0VDVVJJVFlfUE9MSUNZX0xP Q0FMKQorICAgICAgICBTY2hlbWVSZWdpc3RyeTo6cmVnaXN0ZXJVUkxTY2hlbWVBc0xvY2FsKHVy bFNjaGVtZSk7CisgICAgaWYgKHBvbGljeSAmIFdFQktJVF9TRUNVUklUWV9QT0xJQ1lfTk9fQUND RVNTKQorICAgICAgICBTY2hlbWVSZWdpc3RyeTo6cmVnaXN0ZXJVUkxTY2hlbWVBc05vQWNjZXNz KHVybFNjaGVtZSk7CisgICAgaWYgKHBvbGljeSAmIFdFQktJVF9TRUNVUklUWV9QT0xJQ1lfRElT UExBWV9JU09MQVRFRCkKKyAgICAgICAgU2NoZW1lUmVnaXN0cnk6OnJlZ2lzdGVyVVJMU2NoZW1l QXNEaXNwbGF5SXNvbGF0ZWQodXJsU2NoZW1lKTsKKyAgICBpZiAocG9saWN5ICYgV0VCS0lUX1NF Q1VSSVRZX1BPTElDWV9TRUNVUkUpCisgICAgICAgIFNjaGVtZVJlZ2lzdHJ5OjpyZWdpc3RlclVS TFNjaGVtZUFzU2VjdXJlKHVybFNjaGVtZSk7CisgICAgaWYgKHBvbGljeSAmIFdFQktJVF9TRUNV UklUWV9QT0xJQ1lfQ09SU19FTkFCTEVEKQorICAgICAgICBTY2hlbWVSZWdpc3RyeTo6cmVnaXN0 ZXJVUkxTY2hlbWVBc0NPUlNFbmFibGVkKHVybFNjaGVtZSk7CisgICAgaWYgKHBvbGljeSAmIFdF QktJVF9TRUNVUklUWV9QT0xJQ1lfRU1QVFlfRE9DVU1FTlQpCisgICAgICAgIFNjaGVtZVJlZ2lz dHJ5OjpyZWdpc3RlclVSTFNjaGVtZUFzRW1wdHlEb2N1bWVudCh1cmxTY2hlbWUpOworfQorCisv KioKKyAqIHdlYmtpdF9nZXRfc2VjdXJpdHlfcG9saWN5X2Zvcl91cmlfc2NoZW1lOgorICogQHNj aGVtZTogYSBVUkkgc2NoZW1lCisgKgorICogR2V0IHRoZSBzZWN1cml0eSBwb2xpY3kgZm9yIHRo ZSBnaXZlbiBVUkkgc2NoZW1lLgorICoKKyAqIFJldHVybnM6IGEgI1dlYktpdFNlY3VyaXR5UG9s aWN5CisgKgorICogU2luY2U6IDIuMAorICovCitXZWJLaXRTZWN1cml0eVBvbGljeSB3ZWJraXRf Z2V0X3NlY3VyaXR5X3BvbGljeV9mb3JfdXJpX3NjaGVtZShjb25zdCBjaGFyICpzY2hlbWUpCit7 CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoc2NoZW1lLCBzdGF0aWNfY2FzdDxXZWJLaXRTZWN1 cml0eVBvbGljeT4oMCkpOworCisgICAgZ3VpbnQgcG9saWN5ID0gMDsKKyAgICBTdHJpbmcgdXJs U2NoZW1lID0gU3RyaW5nOjpmcm9tVVRGOChzY2hlbWUpOworCisgICAgaWYgKFNjaGVtZVJlZ2lz dHJ5OjpzaG91bGRUcmVhdFVSTFNjaGVtZUFzTG9jYWwodXJsU2NoZW1lKSkKKyAgICAgICAgcG9s aWN5IHw9IFdFQktJVF9TRUNVUklUWV9QT0xJQ1lfTE9DQUw7CisgICAgaWYgKFNjaGVtZVJlZ2lz dHJ5OjpzaG91bGRUcmVhdFVSTFNjaGVtZUFzTm9BY2Nlc3ModXJsU2NoZW1lKSkKKyAgICAgICAg cG9saWN5IHw9IFdFQktJVF9TRUNVUklUWV9QT0xJQ1lfTk9fQUNDRVNTOworICAgIGlmIChTY2hl bWVSZWdpc3RyeTo6c2hvdWxkVHJlYXRVUkxTY2hlbWVBc0Rpc3BsYXlJc29sYXRlZCh1cmxTY2hl bWUpKQorICAgICAgICBwb2xpY3kgfD0gV0VCS0lUX1NFQ1VSSVRZX1BPTElDWV9ESVNQTEFZX0lT T0xBVEVEOworICAgIGlmIChTY2hlbWVSZWdpc3RyeTo6c2hvdWxkVHJlYXRVUkxTY2hlbWVBc1Nl Y3VyZSh1cmxTY2hlbWUpKQorICAgICAgICBwb2xpY3kgfD0gV0VCS0lUX1NFQ1VSSVRZX1BPTElD WV9TRUNVUkU7CisgICAgaWYgKFNjaGVtZVJlZ2lzdHJ5OjpzaG91bGRUcmVhdFVSTFNjaGVtZUFz Q09SU0VuYWJsZWQodXJsU2NoZW1lKSkKKyAgICAgICAgcG9saWN5IHw9IFdFQktJVF9TRUNVUklU WV9QT0xJQ1lfQ09SU19FTkFCTEVEOworICAgIGlmIChTY2hlbWVSZWdpc3RyeTo6c2hvdWxkTG9h ZFVSTFNjaGVtZUFzRW1wdHlEb2N1bWVudCh1cmxTY2hlbWUpKQorICAgICAgICBwb2xpY3kgfD0g V0VCS0lUX1NFQ1VSSVRZX1BPTElDWV9FTVBUWV9ET0NVTUVOVDsKKworICAgIHJldHVybiBzdGF0 aWNfY2FzdDxXZWJLaXRTZWN1cml0eVBvbGljeT4ocG9saWN5KTsKK30KKwogdm9pZCB3ZWJraXRJ bml0KCkKIHsKICAgICBzdGF0aWMgYm9vbCBpc0luaXRpYWxpemVkID0gZmFsc2U7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0Z2xvYmFscy5oIGIvU291cmNlL1dl YktpdC9ndGsvd2Via2l0L3dlYmtpdGdsb2JhbHMuaAppbmRleCAwYmZjMDgzLi44ZGJmNGVlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0Z2xvYmFscy5oCisrKyBi L1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRnbG9iYWxzLmgKQEAgLTE0Miw2ICsxNDIs MzMgQEAgdHlwZWRlZiBlbnVtIHsKICAgICBXRUJLSVRfQ09OVEVYVF9NRU5VX0FDVElPTl9NRURJ QV9NVVRFCiB9IFdlYktpdENvbnRleHRNZW51QWN0aW9uOwogCisvKioKKyAqIFdlYktpdFNlY3Vy aXR5UG9saWN5OgorICogQFdFQktJVF9TRUNVUklUWV9QT0xJQ1lfTE9DQUw6IExvY2FsIFVSSSBz Y2hlbWUsIG90aGVyIG5vbi1sb2NhbCBwYWdlcworICogICBjYW5ub3QgbGluayB0byBvciBhY2Nl c3MgVVJJcyBvZiB0aGlzIHNjaGVtZS4KKyAqIEBXRUJLSVRfU0VDVVJJVFlfUE9MSUNZX05PX0FD Q0VTUzogUGFnZXMgbG9hZGVkIHdpdGggdGhpcyBVUkkgc2NoZW1lCisgKiAgIGNhbm5vdCBhY2Nl c3MgcGFnZXMgbG9hZGVkIHdpdGggYW55IG90aGVyIFVSSSBzY2hlbWUuCisgKiBAV0VCS0lUX1NF Q1VSSVRZX1BPTElDWV9ESVNQTEFZX0lTT0xBVEVEOiBQYWdlcyBjYW5ub3QgZGlzcGxheSB0aGVz ZSBVUklzCisgKiAgIHVubGVzcyB0aGV5IGFyZSBmcm9tIHRoZSBzYW1lIHNjaGVtZS4KKyAqIEBX RUJLSVRfU0VDVVJJVFlfUE9MSUNZX1NFQ1VSRTogU2VjdXJlIFVSSSBzY2hlbWUsIGRvZXNuJ3Qg Z2VuZXJhdGUgbWl4ZWQKKyAqICAgY29udGVudCB3YXJuaW5ncyB3aGVuIGluY2x1ZGVkIGJ5IGFu IEhUVFBTIHBhZ2UuCisgKiBAV0VCS0lUX1NFQ1VSSVRZX1BPTElDWV9DT1JTX0VOQUJMRUQ6IFVS SSBzY2hlbWUgdGhhdCBjYW4gYmUgc2VudCBDT1JTIHJlcXVlc3RzLgorICogQFdFQktJVF9TRUNV UklUWV9QT0xJQ1lfRU1QVFlfRE9DVU1FTlQ6IFN0cmljdGx5IGVtcHR5IGRvY3VtZW50cyBhbGxv d2VkCisgKiAgIHRvIGNvbW1pdCBzeW5jaHJvbm91c2x5LgorICoKKyAqIEZsYWdzIHVzZWQgdG8g cmVwcmVzZW50IHRoZSBzZWN1cml0eSBwb2xpY3kgb2YgYSBVUkkgc2NoZW1lLgorICoKKyAqIFNp bmNlOiAyLjAKKyAqLwordHlwZWRlZiBlbnVtIHsKKyAgICBXRUJLSVRfU0VDVVJJVFlfUE9MSUNZ X0xPQ0FMICAgICAgICAgICAgPSAxIDw8IDEsCisgICAgV0VCS0lUX1NFQ1VSSVRZX1BPTElDWV9O T19BQ0NFU1MgICAgICAgID0gMSA8PCAyLAorICAgIFdFQktJVF9TRUNVUklUWV9QT0xJQ1lfRElT UExBWV9JU09MQVRFRCA9IDEgPDwgMywKKyAgICBXRUJLSVRfU0VDVVJJVFlfUE9MSUNZX1NFQ1VS RSAgICAgICAgICAgPSAxIDw8IDQsCisgICAgV0VCS0lUX1NFQ1VSSVRZX1BPTElDWV9DT1JTX0VO QUJMRUQgICAgID0gMSA8PCA1LAorICAgIFdFQktJVF9TRUNVUklUWV9QT0xJQ1lfRU1QVFlfRE9D VU1FTlQgICA9IDEgPDwgNgorfSBXZWJLaXRTZWN1cml0eVBvbGljeTsKKwogV0VCS0lUX0FQSSBT b3VwU2Vzc2lvbioKIHdlYmtpdF9nZXRfZGVmYXVsdF9zZXNzaW9uICAgICAgICAgICAgICAgICAg ICAgICh2b2lkKTsKIApAQCAtMTcxLDYgKzE5OCwxMyBAQCB3ZWJraXRfc2V0X3RleHRfY2hlY2tl ciAgICAgICAgICAgICAgICAgICAgICAgIChHT2JqZWN0KiAgY2hlY2tlcik7CiBXRUJLSVRfQVBJ IFdlYktpdENvbnRleHRNZW51QWN0aW9uCiB3ZWJraXRfY29udGV4dF9tZW51X2l0ZW1fZ2V0X2Fj dGlvbiAgICAgICAgICAgIChHdGtNZW51SXRlbSogaXRlbSk7CiAKK1dFQktJVF9BUEkgdm9pZAor d2Via2l0X3NldF9zZWN1cml0eV9wb2xpY3lfZm9yX3VyaV9zY2hlbWUgICAgICAoY29uc3QgZ2No YXIgICAgICAgICAqc2NoZW1lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgV2ViS2l0U2VjdXJpdHlQb2xpY3kgcG9saWN5KTsKKworV0VCS0lUX0FQSSBX ZWJLaXRTZWN1cml0eVBvbGljeQord2Via2l0X2dldF9zZWN1cml0eV9wb2xpY3lfZm9yX3VyaV9z Y2hlbWUgICAgICAoY29uc3QgZ2NoYXIgICAgICAgICAqc2NoZW1lKTsKKwogR19FTkRfREVDTFMK IAogI2VuZGlmCg== 162512 2012-09-06 08:19:07 -0700 2012-09-06 08:23:18 -0700 Updated patch to address review comments wk-security-policy2.diff text/plain 10265 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Z3RrL0NoYW5nZUxvZwppbmRleCBlN2UyMzc5Li43MDY5ZTZkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTItMDktMDYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNp YUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEFkZCBBUEkgdG8gZ2V0L3NldCB0aGUgc2Vj dXJpdHkgcG9saWN5IG9mIGEgZ2l2ZW4gVVJJIHNjaGVtZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTU1NDkKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgV2ViS2l0U2VjdXJpdHlQb2xpY3kgZW51bSB3 aXRoIGZsYWdzIHRoYXQgcmVwcmVzZW50IHRoZQorICAgICAgICBzZWN1cml0eSBwb2xpY3kgb2Yg YSBVUkkgc2NoZW1lLiBBZGQgbWV0aG9kcyB0byBnZXQgYW5kIHNldCB0aGUKKyAgICAgICAgc2Vj dXJpdHkgcG9saWN5IGZsYWdzIGZvciBhIGdpdmVuIFVSSSBzY2hlbWUuCisKKyAgICAgICAgKiBk b2NzL3dlYmtpdGd0ay1zZWN0aW9ucy50eHQ6IEFkZCBuZXcgc3ltYm9scy4KKyAgICAgICAgKiB0 ZXN0cy90ZXN0Z2xvYmFscy5jOgorICAgICAgICAodGVzdF9nbG9iYWxzX3NlY3VyaXR5X3BvbGlj eSk6CisgICAgICAgIChtYWluKToKKyAgICAgICAgKiB3ZWJraXQvd2Via2l0Z2xvYmFscy5jcHA6 CisgICAgICAgICh3ZWJraXRfc2V0X3NlY3VyaXR5X3BvbGljeV9mb3JfdXJpX3NjaGVtZSk6Cisg ICAgICAgICh3ZWJraXRfZ2V0X3NlY3VyaXR5X3BvbGljeV9mb3JfdXJpX3NjaGVtZSk6CisgICAg ICAgICogd2Via2l0L3dlYmtpdGdsb2JhbHMuaDoKKwogMjAxMi0wOS0wNSAgS2F1c3R1YmggQXRy YXdhbGthciAgPGthdXN0dWJoQG1vdG9yb2xhLmNvbT4KIAogICAgICAgICBbRFJUXSBMVEM6OiBN b3ZlIHByaW50aW5nIHJlbGF0ZWQgQVBJcyBmcm9tIExheW91dFRlc3RDb250cm9sbGVyIHRvIElu dGVybmFscwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvZG9jcy93ZWJraXRndGstc2Vj dGlvbnMudHh0IGIvU291cmNlL1dlYktpdC9ndGsvZG9jcy93ZWJraXRndGstc2VjdGlvbnMudHh0 CmluZGV4IDU5OTcwYjUuLmI3MDdiZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL2Rv Y3Mvd2Via2l0Z3RrLXNlY3Rpb25zLnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9kb2NzL3dl YmtpdGd0ay1zZWN0aW9ucy50eHQKQEAgLTUzNiw2ICs1MzYsMTAgQEAgd2Via2l0X3NldF9jYWNo ZV9tb2RlbAogPFNVQlNFQ1RJT04gQ29udGV4dE1lbnVJdGVtPgogV2ViS2l0Q29udGV4dE1lbnVB Y3Rpb24KIHdlYmtpdF9jb250ZXh0X21lbnVfaXRlbV9nZXRfYWN0aW9uCis8U1VCU0VDVElPTiBT ZWN1cml0eVBvbGljeT4KK1dlYktpdFNlY3VyaXR5UG9saWN5Cit3ZWJraXRfc2V0X3NlY3VyaXR5 X3BvbGljeV9mb3JfdXJpX3NjaGVtZQord2Via2l0X2dldF9zZWN1cml0eV9wb2xpY3lfZm9yX3Vy aV9zY2hlbWUKIDxTVUJTRUNUSU9OIFByaXZhdGU+CiBXRUJLSVRHVEtfQVBJX1ZFUlNJT04KIDwv U0VDVElPTj4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3RnbG9iYWxz LmMgYi9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0Z2xvYmFscy5jCmluZGV4IDUwOWMzYmYu LmYzMjYwNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3RnbG9iYWxz LmMKKysrIGIvU291cmNlL1dlYktpdC9ndGsvdGVzdHMvdGVzdGdsb2JhbHMuYwpAQCAtNDUsNiAr NDUsNTggQEAgc3RhdGljIHZvaWQgdGVzdF9nbG9iYWxzX2RlZmF1bHRfc2Vzc2lvbigpCiAgICAg Z19hc3NlcnQoc291cF9zZXNzaW9uX2dldF9mZWF0dXJlKHNlc3Npb24sIFdFQktJVF9UWVBFX1NP VVBfQVVUSF9ESUFMT0cpID09IE5VTEwpOwogfQogCitzdGF0aWMgdm9pZCB0ZXN0X2dsb2JhbHNf c2VjdXJpdHlfcG9saWN5KCkKK3sKKyAgICAvLyBDaGVjayBkZWZhdWx0IHBvbGljeSBmb3Igd2Vs bCBrbm93biBzY2hlbWVzLgorICAgIFdlYktpdFNlY3VyaXR5UG9saWN5IHBvbGljeSA9IHdlYmtp dF9nZXRfc2VjdXJpdHlfcG9saWN5X2Zvcl91cmlfc2NoZW1lKCJodHRwIik7CisgICAgZ3VpbnQg bWFzayA9IFdFQktJVF9TRUNVUklUWV9QT0xJQ1lfQ09SU19FTkFCTEVEOworICAgIGdfYXNzZXJ0 X2NtcHVpbnQocG9saWN5ICYgbWFzaywgPT0sIG1hc2spOworCisgICAgcG9saWN5ID0gd2Via2l0 X2dldF9zZWN1cml0eV9wb2xpY3lfZm9yX3VyaV9zY2hlbWUoImh0dHBzIik7CisgICAgbWFzayA9 IFdFQktJVF9TRUNVUklUWV9QT0xJQ1lfU0VDVVJFIHwgV0VCS0lUX1NFQ1VSSVRZX1BPTElDWV9D T1JTX0VOQUJMRUQ7CisgICAgZ19hc3NlcnRfY21wdWludChwb2xpY3kgJiBtYXNrLCA9PSwgbWFz ayk7CisKKyAgICBwb2xpY3kgPSB3ZWJraXRfZ2V0X3NlY3VyaXR5X3BvbGljeV9mb3JfdXJpX3Nj aGVtZSgiZmlsZSIpOworICAgIG1hc2sgPSBXRUJLSVRfU0VDVVJJVFlfUE9MSUNZX0xPQ0FMOwor ICAgIGdfYXNzZXJ0X2NtcHVpbnQocG9saWN5ICYgbWFzaywgPT0sIG1hc2spOworCisgICAgcG9s aWN5ID0gd2Via2l0X2dldF9zZWN1cml0eV9wb2xpY3lfZm9yX3VyaV9zY2hlbWUoImRhdGEiKTsK KyAgICBtYXNrID0gV0VCS0lUX1NFQ1VSSVRZX1BPTElDWV9OT19BQ0NFU1NfVE9fT1RIRVJfU0NI RU1FIHwgV0VCS0lUX1NFQ1VSSVRZX1BPTElDWV9TRUNVUkU7CisgICAgZ19hc3NlcnRfY21wdWlu dChwb2xpY3kgJiBtYXNrLCA9PSwgbWFzayk7CisKKyAgICBwb2xpY3kgPSB3ZWJraXRfZ2V0X3Nl Y3VyaXR5X3BvbGljeV9mb3JfdXJpX3NjaGVtZSgiYWJvdXQiKTsKKyAgICBtYXNrID0gV0VCS0lU X1NFQ1VSSVRZX1BPTElDWV9OT19BQ0NFU1NfVE9fT1RIRVJfU0NIRU1FIHwgV0VCS0lUX1NFQ1VS SVRZX1BPTElDWV9TRUNVUkUgfCBXRUJLSVRfU0VDVVJJVFlfUE9MSUNZX0VNUFRZX0RPQ1VNRU5U OworICAgIGdfYXNzZXJ0X2NtcHVpbnQocG9saWN5ICYgbWFzaywgPT0sIG1hc2spOworCisgICAg Ly8gQ3VzdG9tIHNjaGVtZS4KKyAgICBwb2xpY3kgPSB3ZWJraXRfZ2V0X3NlY3VyaXR5X3BvbGlj eV9mb3JfdXJpX3NjaGVtZSgiZm9vIik7CisgICAgZ19hc3NlcnQoIXBvbGljeSk7CisKKyAgICBw b2xpY3kgfD0gV0VCS0lUX1NFQ1VSSVRZX1BPTElDWV9MT0NBTDsKKyAgICB3ZWJraXRfc2V0X3Nl Y3VyaXR5X3BvbGljeV9mb3JfdXJpX3NjaGVtZSgiZm9vIiwgcG9saWN5KTsKKyAgICBnX2Fzc2Vy dF9jbXB1aW50KHdlYmtpdF9nZXRfc2VjdXJpdHlfcG9saWN5X2Zvcl91cmlfc2NoZW1lKCJmb28i KSwgPT0sIHBvbGljeSk7CisKKyAgICBwb2xpY3kgfD0gV0VCS0lUX1NFQ1VSSVRZX1BPTElDWV9O T19BQ0NFU1NfVE9fT1RIRVJfU0NIRU1FOworICAgIHdlYmtpdF9zZXRfc2VjdXJpdHlfcG9saWN5 X2Zvcl91cmlfc2NoZW1lKCJmb28iLCBwb2xpY3kpOworICAgIGdfYXNzZXJ0X2NtcHVpbnQod2Vi a2l0X2dldF9zZWN1cml0eV9wb2xpY3lfZm9yX3VyaV9zY2hlbWUoImZvbyIpLCA9PSwgcG9saWN5 KTsKKworICAgIHBvbGljeSB8PSBXRUJLSVRfU0VDVVJJVFlfUE9MSUNZX0RJU1BMQVlfSVNPTEFU RUQ7CisgICAgd2Via2l0X3NldF9zZWN1cml0eV9wb2xpY3lfZm9yX3VyaV9zY2hlbWUoImZvbyIs IHBvbGljeSk7CisgICAgZ19hc3NlcnRfY21wdWludCh3ZWJraXRfZ2V0X3NlY3VyaXR5X3BvbGlj eV9mb3JfdXJpX3NjaGVtZSgiZm9vIiksID09LCBwb2xpY3kpOworCisgICAgcG9saWN5IHw9IFdF QktJVF9TRUNVUklUWV9QT0xJQ1lfU0VDVVJFOworICAgIHdlYmtpdF9zZXRfc2VjdXJpdHlfcG9s aWN5X2Zvcl91cmlfc2NoZW1lKCJmb28iLCBwb2xpY3kpOworICAgIGdfYXNzZXJ0X2NtcHVpbnQo d2Via2l0X2dldF9zZWN1cml0eV9wb2xpY3lfZm9yX3VyaV9zY2hlbWUoImZvbyIpLCA9PSwgcG9s aWN5KTsKKworICAgIHBvbGljeSB8PSBXRUJLSVRfU0VDVVJJVFlfUE9MSUNZX0NPUlNfRU5BQkxF RDsKKyAgICB3ZWJraXRfc2V0X3NlY3VyaXR5X3BvbGljeV9mb3JfdXJpX3NjaGVtZSgiZm9vIiwg cG9saWN5KTsKKyAgICBnX2Fzc2VydF9jbXB1aW50KHdlYmtpdF9nZXRfc2VjdXJpdHlfcG9saWN5 X2Zvcl91cmlfc2NoZW1lKCJmb28iKSwgPT0sIHBvbGljeSk7CisKKyAgICBwb2xpY3kgfD0gV0VC S0lUX1NFQ1VSSVRZX1BPTElDWV9FTVBUWV9ET0NVTUVOVDsKKyAgICB3ZWJraXRfc2V0X3NlY3Vy aXR5X3BvbGljeV9mb3JfdXJpX3NjaGVtZSgiZm9vIiwgcG9saWN5KTsKKyAgICBnX2Fzc2VydF9j bXB1aW50KHdlYmtpdF9nZXRfc2VjdXJpdHlfcG9saWN5X2Zvcl91cmlfc2NoZW1lKCJmb28iKSwg PT0sIHBvbGljeSk7Cit9CisKIGludCBtYWluKGludCBhcmdjLCBjaGFyKiogYXJndikKIHsKICAg ICBndGtfdGVzdF9pbml0KCZhcmdjLCAmYXJndiwgTlVMTCk7CkBAIC01Miw2ICsxMDQsOCBAQCBp bnQgbWFpbihpbnQgYXJnYywgY2hhcioqIGFyZ3YpCiAgICAgZ190ZXN0X2J1Z19iYXNlKCJodHRw czovL2J1Z3Mud2Via2l0Lm9yZy8iKTsKICAgICBnX3Rlc3RfYWRkX2Z1bmMoIi93ZWJraXQvZ2xv YmFscy9kZWZhdWx0X3Nlc3Npb24iLAogICAgICAgICAgICAgICAgICAgICB0ZXN0X2dsb2JhbHNf ZGVmYXVsdF9zZXNzaW9uKTsKKyAgICBnX3Rlc3RfYWRkX2Z1bmMoIi93ZWJraXQvZ2xvYmFscy9z ZWN1cml0eS1wb2xpY3kiLAorICAgICAgICAgICAgICAgICAgICB0ZXN0X2dsb2JhbHNfc2VjdXJp dHlfcG9saWN5KTsKICAgICByZXR1cm4gZ190ZXN0X3J1bigpOwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0Z2xvYmFscy5jcHAgYi9Tb3VyY2UvV2ViS2l0 L2d0ay93ZWJraXQvd2Via2l0Z2xvYmFscy5jcHAKaW5kZXggNDAzNTZiOC4uZDI3MTVhNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdGdsb2JhbHMuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRnbG9iYWxzLmNwcApAQCAtNDAsNiArNDAs NyBAQAogI2luY2x1ZGUgIlJlc291cmNlSGFuZGxlQ2xpZW50LmgiCiAjaW5jbHVkZSAiUmVzb3Vy Y2VIYW5kbGVJbnRlcm5hbC5oIgogI2luY2x1ZGUgIlJlc291cmNlUmVzcG9uc2UuaCIKKyNpbmNs dWRlICJTY2hlbWVSZWdpc3RyeS5oIgogI2luY2x1ZGUgIndlYmtpdGFwcGxpY2F0aW9uY2FjaGUu aCIKICNpbmNsdWRlICJ3ZWJraXRmYXZpY29uZGF0YWJhc2UuaCIKICNpbmNsdWRlICJ3ZWJraXRn bG9iYWxzcHJpdmF0ZS5oIgpAQCAtNDkxLDYgKzQ5Miw3MSBAQCBXZWJLaXRDb250ZXh0TWVudUFj dGlvbiB3ZWJraXRfY29udGV4dF9tZW51X2l0ZW1fZ2V0X2FjdGlvbihHdGtNZW51SXRlbSogaXRl bSkKICNlbmRpZgogfQogCisvKioKKyAqIHdlYmtpdF9zZXRfc2VjdXJpdHlfcG9saWN5X2Zvcl91 cmlfc2NoZW1lOgorICogQHNjaGVtZTogYSBVUkkgc2NoZW1lCisgKiBAcG9saWN5OiBhICNXZWJL aXRTZWN1cml0eVBvbGljeQorICoKKyAqIFNldCB0aGUgc2VjdXJpdHkgcG9saWN5IGZvciB0aGUg Z2l2ZW4gVVJJIHNjaGVtZS4KKyAqCisgKiBTaW5jZTogMi4wCisgKi8KK3ZvaWQgd2Via2l0X3Nl dF9zZWN1cml0eV9wb2xpY3lfZm9yX3VyaV9zY2hlbWUoY29uc3QgY2hhciAqc2NoZW1lLCBXZWJL aXRTZWN1cml0eVBvbGljeSBwb2xpY3kpCit7CisgICAgZ19yZXR1cm5faWZfZmFpbChzY2hlbWUp OworCisgICAgaWYgKCFwb2xpY3kpCisgICAgICAgIHJldHVybjsKKworICAgIFN0cmluZyB1cmxT Y2hlbWUgPSBTdHJpbmc6OmZyb21VVEY4KHNjaGVtZSk7CisKKyAgICBpZiAocG9saWN5ICYgV0VC S0lUX1NFQ1VSSVRZX1BPTElDWV9MT0NBTCkKKyAgICAgICAgU2NoZW1lUmVnaXN0cnk6OnJlZ2lz dGVyVVJMU2NoZW1lQXNMb2NhbCh1cmxTY2hlbWUpOworICAgIGlmIChwb2xpY3kgJiBXRUJLSVRf U0VDVVJJVFlfUE9MSUNZX05PX0FDQ0VTU19UT19PVEhFUl9TQ0hFTUUpCisgICAgICAgIFNjaGVt ZVJlZ2lzdHJ5OjpyZWdpc3RlclVSTFNjaGVtZUFzTm9BY2Nlc3ModXJsU2NoZW1lKTsKKyAgICBp ZiAocG9saWN5ICYgV0VCS0lUX1NFQ1VSSVRZX1BPTElDWV9ESVNQTEFZX0lTT0xBVEVEKQorICAg ICAgICBTY2hlbWVSZWdpc3RyeTo6cmVnaXN0ZXJVUkxTY2hlbWVBc0Rpc3BsYXlJc29sYXRlZCh1 cmxTY2hlbWUpOworICAgIGlmIChwb2xpY3kgJiBXRUJLSVRfU0VDVVJJVFlfUE9MSUNZX1NFQ1VS RSkKKyAgICAgICAgU2NoZW1lUmVnaXN0cnk6OnJlZ2lzdGVyVVJMU2NoZW1lQXNTZWN1cmUodXJs U2NoZW1lKTsKKyAgICBpZiAocG9saWN5ICYgV0VCS0lUX1NFQ1VSSVRZX1BPTElDWV9DT1JTX0VO QUJMRUQpCisgICAgICAgIFNjaGVtZVJlZ2lzdHJ5OjpyZWdpc3RlclVSTFNjaGVtZUFzQ09SU0Vu YWJsZWQodXJsU2NoZW1lKTsKKyAgICBpZiAocG9saWN5ICYgV0VCS0lUX1NFQ1VSSVRZX1BPTElD WV9FTVBUWV9ET0NVTUVOVCkKKyAgICAgICAgU2NoZW1lUmVnaXN0cnk6OnJlZ2lzdGVyVVJMU2No ZW1lQXNFbXB0eURvY3VtZW50KHVybFNjaGVtZSk7Cit9CisKKy8qKgorICogd2Via2l0X2dldF9z ZWN1cml0eV9wb2xpY3lfZm9yX3VyaV9zY2hlbWU6CisgKiBAc2NoZW1lOiBhIFVSSSBzY2hlbWUK KyAqCisgKiBHZXQgdGhlIHNlY3VyaXR5IHBvbGljeSBmb3IgdGhlIGdpdmVuIFVSSSBzY2hlbWUu CisgKgorICogUmV0dXJuczogYSAjV2ViS2l0U2VjdXJpdHlQb2xpY3kKKyAqCisgKiBTaW5jZTog Mi4wCisgKi8KK1dlYktpdFNlY3VyaXR5UG9saWN5IHdlYmtpdF9nZXRfc2VjdXJpdHlfcG9saWN5 X2Zvcl91cmlfc2NoZW1lKGNvbnN0IGNoYXIgKnNjaGVtZSkKK3sKKyAgICBnX3JldHVybl92YWxf aWZfZmFpbChzY2hlbWUsIHN0YXRpY19jYXN0PFdlYktpdFNlY3VyaXR5UG9saWN5PigwKSk7CisK KyAgICBndWludCBwb2xpY3kgPSAwOworICAgIFN0cmluZyB1cmxTY2hlbWUgPSBTdHJpbmc6OmZy b21VVEY4KHNjaGVtZSk7CisKKyAgICBpZiAoU2NoZW1lUmVnaXN0cnk6OnNob3VsZFRyZWF0VVJM U2NoZW1lQXNMb2NhbCh1cmxTY2hlbWUpKQorICAgICAgICBwb2xpY3kgfD0gV0VCS0lUX1NFQ1VS SVRZX1BPTElDWV9MT0NBTDsKKyAgICBpZiAoU2NoZW1lUmVnaXN0cnk6OnNob3VsZFRyZWF0VVJM U2NoZW1lQXNOb0FjY2Vzcyh1cmxTY2hlbWUpKQorICAgICAgICBwb2xpY3kgfD0gV0VCS0lUX1NF Q1VSSVRZX1BPTElDWV9OT19BQ0NFU1NfVE9fT1RIRVJfU0NIRU1FOworICAgIGlmIChTY2hlbWVS ZWdpc3RyeTo6c2hvdWxkVHJlYXRVUkxTY2hlbWVBc0Rpc3BsYXlJc29sYXRlZCh1cmxTY2hlbWUp KQorICAgICAgICBwb2xpY3kgfD0gV0VCS0lUX1NFQ1VSSVRZX1BPTElDWV9ESVNQTEFZX0lTT0xB VEVEOworICAgIGlmIChTY2hlbWVSZWdpc3RyeTo6c2hvdWxkVHJlYXRVUkxTY2hlbWVBc1NlY3Vy ZSh1cmxTY2hlbWUpKQorICAgICAgICBwb2xpY3kgfD0gV0VCS0lUX1NFQ1VSSVRZX1BPTElDWV9T RUNVUkU7CisgICAgaWYgKFNjaGVtZVJlZ2lzdHJ5OjpzaG91bGRUcmVhdFVSTFNjaGVtZUFzQ09S U0VuYWJsZWQodXJsU2NoZW1lKSkKKyAgICAgICAgcG9saWN5IHw9IFdFQktJVF9TRUNVUklUWV9Q T0xJQ1lfQ09SU19FTkFCTEVEOworICAgIGlmIChTY2hlbWVSZWdpc3RyeTo6c2hvdWxkTG9hZFVS TFNjaGVtZUFzRW1wdHlEb2N1bWVudCh1cmxTY2hlbWUpKQorICAgICAgICBwb2xpY3kgfD0gV0VC S0lUX1NFQ1VSSVRZX1BPTElDWV9FTVBUWV9ET0NVTUVOVDsKKworICAgIHJldHVybiBzdGF0aWNf Y2FzdDxXZWJLaXRTZWN1cml0eVBvbGljeT4ocG9saWN5KTsKK30KKwogdm9pZCB3ZWJraXRJbml0 KCkKIHsKICAgICBzdGF0aWMgYm9vbCBpc0luaXRpYWxpemVkID0gZmFsc2U7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0Z2xvYmFscy5oIGIvU291cmNlL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdGdsb2JhbHMuaAppbmRleCAwYmZjMDgzLi5mMDAyZDZkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0Z2xvYmFscy5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRnbG9iYWxzLmgKQEAgLTE0Miw2ICsxNDIsMzUg QEAgdHlwZWRlZiBlbnVtIHsKICAgICBXRUJLSVRfQ09OVEVYVF9NRU5VX0FDVElPTl9NRURJQV9N VVRFCiB9IFdlYktpdENvbnRleHRNZW51QWN0aW9uOwogCisvKioKKyAqIFdlYktpdFNlY3VyaXR5 UG9saWN5OgorICogQFdFQktJVF9TRUNVUklUWV9QT0xJQ1lfTE9DQUw6IExvY2FsIFVSSSBzY2hl bWUsIG90aGVyIG5vbi1sb2NhbCBwYWdlcworICogICBjYW5ub3QgbGluayB0byBvciBhY2Nlc3Mg VVJJcyBvZiB0aGlzIHNjaGVtZS4KKyAqIEBXRUJLSVRfU0VDVVJJVFlfUE9MSUNZX05PX0FDQ0VT U19UT19PVEhFUl9TQ0hFTUU6IFBhZ2VzIGxvYWRlZCB3aXRoIHRoaXMgVVJJIHNjaGVtZQorICog ICBjYW5ub3QgYWNjZXNzIHBhZ2VzIGxvYWRlZCB3aXRoIGFueSBvdGhlciBVUkkgc2NoZW1lLgor ICogQFdFQktJVF9TRUNVUklUWV9QT0xJQ1lfRElTUExBWV9JU09MQVRFRDogUGFnZXMgY2Fubm90 IGRpc3BsYXkgdGhlc2UgVVJJcworICogICB1bmxlc3MgdGhleSBhcmUgZnJvbSB0aGUgc2FtZSBz Y2hlbWUuCisgKiBAV0VCS0lUX1NFQ1VSSVRZX1BPTElDWV9TRUNVUkU6IFNlY3VyZSBVUkkgc2No ZW1lLCBkb2Vzbid0IGdlbmVyYXRlIG1peGVkCisgKiAgIGNvbnRlbnQgd2FybmluZ3Mgd2hlbiBp bmNsdWRlZCBieSBhbiBIVFRQUyBwYWdlLgorICogQFdFQktJVF9TRUNVUklUWV9QT0xJQ1lfQ09S U19FTkFCTEVEOiBVUkkgc2NoZW1lIHRoYXQgY2FuIGJlIHNlbnQKKyAqICAgQ09SUyAoQ3Jvc3Mt b3JpZ2luIHJlc291cmNlIHNoYXJpbmcpIHJlcXVlc3RzLiBTZWUgVzNDIENPUlMgc3BlY2lmaWNh dGlvbgorICogICBodHRwOi8vd3d3LnczLm9yZy9UUi9jb3JzLy4KKyAqIEBXRUJLSVRfU0VDVVJJ VFlfUE9MSUNZX0VNUFRZX0RPQ1VNRU5UOiBTdHJpY3RseSBlbXB0eSBkb2N1bWVudHMgYWxsb3dl ZAorICogICB0byBjb21taXQgc3luY2hyb25vdXNseS4KKyAqCisgKiBGbGFncyB1c2VkIHRvIHJl cHJlc2VudCB0aGUgc2VjdXJpdHkgcG9saWN5IG9mIGEgVVJJIHNjaGVtZS4KKyAqCisgKiBTaW5j ZTogMi4wCisgKi8KK3R5cGVkZWYgZW51bSB7CisgICAgV0VCS0lUX1NFQ1VSSVRZX1BPTElDWV9M T0NBTCAgICAgICAgICAgICAgICAgICAgID0gMSA8PCAxLAorICAgIFdFQktJVF9TRUNVUklUWV9Q T0xJQ1lfTk9fQUNDRVNTX1RPX09USEVSX1NDSEVNRSA9IDEgPDwgMiwKKyAgICBXRUJLSVRfU0VD VVJJVFlfUE9MSUNZX0RJU1BMQVlfSVNPTEFURUQgICAgICAgICAgPSAxIDw8IDMsCisgICAgV0VC S0lUX1NFQ1VSSVRZX1BPTElDWV9TRUNVUkUgICAgICAgICAgICAgICAgICAgID0gMSA8PCA0LAor ICAgIFdFQktJVF9TRUNVUklUWV9QT0xJQ1lfQ09SU19FTkFCTEVEICAgICAgICAgICAgICA9IDEg PDwgNSwKKyAgICBXRUJLSVRfU0VDVVJJVFlfUE9MSUNZX0VNUFRZX0RPQ1VNRU5UICAgICAgICAg ICAgPSAxIDw8IDYKK30gV2ViS2l0U2VjdXJpdHlQb2xpY3k7CisKIFdFQktJVF9BUEkgU291cFNl c3Npb24qCiB3ZWJraXRfZ2V0X2RlZmF1bHRfc2Vzc2lvbiAgICAgICAgICAgICAgICAgICAgICAo dm9pZCk7CiAKQEAgLTE3MSw2ICsyMDAsMTMgQEAgd2Via2l0X3NldF90ZXh0X2NoZWNrZXIgICAg ICAgICAgICAgICAgICAgICAgICAoR09iamVjdCogIGNoZWNrZXIpOwogV0VCS0lUX0FQSSBXZWJL aXRDb250ZXh0TWVudUFjdGlvbgogd2Via2l0X2NvbnRleHRfbWVudV9pdGVtX2dldF9hY3Rpb24g ICAgICAgICAgICAoR3RrTWVudUl0ZW0qIGl0ZW0pOwogCitXRUJLSVRfQVBJIHZvaWQKK3dlYmtp dF9zZXRfc2VjdXJpdHlfcG9saWN5X2Zvcl91cmlfc2NoZW1lICAgICAgKGNvbnN0IGdjaGFyICAg ICAgICAgKnNjaGVtZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFdlYktpdFNlY3VyaXR5UG9saWN5IHBvbGljeSk7CisKK1dFQktJVF9BUEkgV2ViS2l0 U2VjdXJpdHlQb2xpY3kKK3dlYmtpdF9nZXRfc2VjdXJpdHlfcG9saWN5X2Zvcl91cmlfc2NoZW1l ICAgICAgKGNvbnN0IGdjaGFyICAgICAgICAgKnNjaGVtZSk7CisKIEdfRU5EX0RFQ0xTCiAKICNl bmRpZgo=