57385 2011-03-29 13:52:27 -0700 Make Windows-only InjectedBundle functions platform-specific 2011-03-29 17:40:16 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 1 jeffm jeffm oldest_to_newest 375721 0 jeffm 2011-03-29 13:52:27 -0700 Anders says that functions in the injected bundle that are specific to Windows should only be defined and implemented on Windows. This applies to WKBundleSetHostAllowsAnyHTTPSCertificate() and WKBundleSetClientCertificate(). 375882 1 87431 jeffm 2011-03-29 16:47:37 -0700 Created attachment 87431 Patch 375929 2 jeffm 2011-03-29 17:40:16 -0700 Committed r82370: <http://trac.webkit.org/changeset/82370> 87431 2011-03-29 16:47:37 -0700 2011-03-29 17:09:40 -0700 Patch bug-57385-20110329164734.patch text/plain 13326 jeffm SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyMzM2KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDMtMjkgIEplZmYgTWls bGVyICA8amVmZm1AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE1ha2UgV2luZG93cy1vbmx5IEluamVjdGVkQnVuZGxlIGZ1bmN0aW9u cyBwbGF0Zm9ybS1zcGVjaWZpYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTczODUKKyAgICAgICAgCisgICAgICAgIEFkZGVkIGZpbGVzIGZvciBXaW5k b3dzLXNwZWNpZmljIFdLQnVuZGxlIGZ1bmN0aW9ucy4KKyAgICAgICAgUmVtb3ZlZCBzdHViIHdy YXBwZXJzIGZvciBJbmplY3RlZEJ1bmRsZTo6c2V0SG9zdEFsbG93c0FueUhUVFBTQ2VydGlmaWNh dGUoKSBhbmQgSW5qZWN0ZWRCdW5kbGU6OnNldENsaWVudENlcnRpZmljYXRlKCkgZnJvbSBub24t V2luZG93cyBwbGF0Zm9ybXMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl L0FQSS9jL1dLQnVuZGxlLmNwcDogTW92ZWQgV0tCdW5kbGVTZXRIb3N0QWxsb3dzQW55SFRUUFND ZXJ0aWZpY2F0ZSgpIGFuZCBXS0J1bmRsZVNldENsaWVudENlcnRpZmljYXRlKCkgdG8gV0tCdW5k bGVQcml2YXRlV2luLmNwcC4KKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQ SS9jL1dLQnVuZGxlUHJpdmF0ZS5oOiBNb3ZlZCBXS0J1bmRsZVNldEhvc3RBbGxvd3NBbnlIVFRQ U0NlcnRpZmljYXRlKCkgYW5kIFdLQnVuZGxlU2V0Q2xpZW50Q2VydGlmaWNhdGUoKSB0byBXS0J1 bmRsZVByaXZhdGVXaW4uaC4KKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQ SS9jL3dpbjogQWRkZWQuCisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkv Yy93aW4vV0tCdW5kbGVQcml2YXRlV2luLmNwcDogQWRkZWQuCisgICAgICAgIChXS0J1bmRsZVNl dEhvc3RBbGxvd3NBbnlIVFRQU0NlcnRpZmljYXRlKTogTW92ZWQgZnJvbSBXS0J1bmRsZS5jcHAu CisgICAgICAgIChXS0J1bmRsZVNldENsaWVudENlcnRpZmljYXRlKTogTW92ZWQgZnJvbSBXS0J1 bmRsZS5jcHAuCisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy93aW4v V0tCdW5kbGVQcml2YXRlV2luLmg6IEFkZGVkLgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0 ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuaDogc2V0SG9zdEFsbG93c0FueUhUVFBTQ2VydGlmaWNh dGUoKSBhbmQgc2V0Q2xpZW50Q2VydGlmaWNhdGUoKSBhcmUgV2luZG93cy1vbmx5LgorICAgICAg ICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvZ3RrL0luamVjdGVkQnVuZGxlR3RrLmNwcDog UmVtb3ZlZCBzZXRIb3N0QWxsb3dzQW55SFRUUFNDZXJ0aWZpY2F0ZSgpIGFuZCBzZXRDbGllbnRD ZXJ0aWZpY2F0ZSgpLgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvbWFjL0lu amVjdGVkQnVuZGxlTWFjLmNwcDogUmVtb3ZlZCBzZXRIb3N0QWxsb3dzQW55SFRUUFNDZXJ0aWZp Y2F0ZSgpIGFuZCBzZXRDbGllbnRDZXJ0aWZpY2F0ZSgpLgorICAgICAgICAqIFdlYlByb2Nlc3Mv SW5qZWN0ZWRCdW5kbGUvcXQvSW5qZWN0ZWRCdW5kbGVRdC5jcHA6IFJlbW92ZWQgc2V0SG9zdEFs bG93c0FueUhUVFBTQ2VydGlmaWNhdGUoKSBhbmQgc2V0Q2xpZW50Q2VydGlmaWNhdGUoKS4KKyAg ICAgICAgKiB3aW4vV2ViS2l0Mi52Y3Byb2o6IEFkZGVkIFdLQnVuZGxlUHJpdmF0ZVdpbi5jcHAg YW5kIFdLQnVuZGxlUHJpdmF0ZVdpbi5oLgorICAgICAgICAqIHdpbi9XZWJLaXQyR2VuZXJhdGVk Lm1ha2U6IENvcHkgV0tCdW5kbGVQcml2YXRlV2luLmguCisKIDIwMTEtMDMtMjkgIEplZmYgTWls bGVyICA8amVmZm1AYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBmb3JtYXR0aW5nIG9mIFdlYktp dDIudmNwcm9qIGFmdGVyIHI4MjI4My4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv SW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmgJKHJldmlzaW9u IDgyMzM1KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9Jbmpl Y3RlZEJ1bmRsZS5oCSh3b3JraW5nIGNvcHkpCkBAIC04MCw4ICs4MCwxMCBAQCBwdWJsaWM6CiAg ICAgdm9pZCBpbml0aWFsaXplQ2xpZW50KFdLQnVuZGxlQ2xpZW50Kik7CiAgICAgdm9pZCBwb3N0 TWVzc2FnZShjb25zdCBTdHJpbmcmLCBBUElPYmplY3QqKTsKICAgICB2b2lkIHBvc3RTeW5jaHJv bm91c01lc3NhZ2UoY29uc3QgU3RyaW5nJiwgQVBJT2JqZWN0KiwgUmVmUHRyPEFQSU9iamVjdD4m IHJldHVybkRhdGEpOworI2lmIFBMQVRGT1JNKFdJTikKICAgICB2b2lkIHNldEhvc3RBbGxvd3NB bnlIVFRQU0NlcnRpZmljYXRlKGNvbnN0IFN0cmluZyYpOwogICAgIHZvaWQgc2V0Q2xpZW50Q2Vy dGlmaWNhdGUoY29uc3QgU3RyaW5nJiwgY29uc3QgV2ViQ2VydGlmaWNhdGVJbmZvKik7CisjZW5k aWYKIAogICAgIC8vIFRlc3RSdW5uZXIgb25seSBTUEkKICAgICB2b2lkIHNldFNob3VsZFRyYWNr VmlzaXRlZExpbmtzKGJvb2wpOwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Jbmpl Y3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZS5jcHAJKHJldmlzaW9u IDgyMzM1KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkv Yy9XS0J1bmRsZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzMiwxMyArMTMyLDMgQEAgdm9pZCBX S0J1bmRsZVJlcG9ydEV4Y2VwdGlvbihKU0NvbnRleHRSZQogewogICAgIEluamVjdGVkQnVuZGxl OjpyZXBvcnRFeGNlcHRpb24oY29udGV4dCwgZXhjZXB0aW9uKTsKIH0KLQotdm9pZCBXS0J1bmRs ZVNldEhvc3RBbGxvd3NBbnlIVFRQU0NlcnRpZmljYXRlKFdLQnVuZGxlUmVmIGJ1bmRsZVJlZiwg V0tTdHJpbmdSZWYgaG9zdCkKLXsKLSAgICB0b0ltcGwoYnVuZGxlUmVmKS0+c2V0SG9zdEFsbG93 c0FueUhUVFBTQ2VydGlmaWNhdGUodG9XVEZTdHJpbmcoaG9zdCkpOwotfQotCi12b2lkIFdLQnVu ZGxlU2V0Q2xpZW50Q2VydGlmaWNhdGUoV0tCdW5kbGVSZWYgYnVuZGxlUmVmLCBXS1N0cmluZ1Jl ZiBob3N0LCBXS0NlcnRpZmljYXRlSW5mb1JlZiBjZXJ0aWZpY2F0ZUluZm9SZWYpCi17Ci0gICAg dG9JbXBsKGJ1bmRsZVJlZiktPnNldENsaWVudENlcnRpZmljYXRlKHRvV1RGU3RyaW5nKGhvc3Qp LCB0b0ltcGwoY2VydGlmaWNhdGVJbmZvUmVmKSk7Ci19CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUHJpdmF0ZS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tC dW5kbGVQcml2YXRlLmgJKHJldmlzaW9uIDgyMzM1KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVByaXZhdGUuaAkod29ya2luZyBjb3B5 KQpAQCAtNjYsOSArNjYsNiBAQCBXS19FWFBPUlQgdm9pZCBXS0J1bmRsZVJlbW92ZUFsbFVzZXJD b250CiAvLyBXaWxsIG1ha2UgV2ViUHJvY2VzcyBpZ25vcmUgdGhpcyBwcmVmZXJlbmNlIHVudGls IGEgcHJlZmVyZW5jZXMgY2hhbmdlIG5vdGlmaWNhdGlvbiwgb25seSBmb3IgV2ViS2l0VGVzdFJ1 bm5lciB1c2UuCiBXS19FWFBPUlQgdm9pZCBXS0J1bmRsZU92ZXJyaWRlWFNTQXVkaXRvckVuYWJs ZWRGb3JUZXN0UnVubmVyKFdLQnVuZGxlUmVmIGJ1bmRsZSwgV0tCdW5kbGVQYWdlR3JvdXBSZWYg cGFnZUdyb3VwLCBib29sIGVuYWJsZWQpOwogCi1XS19FWFBPUlQgdm9pZCBXS0J1bmRsZVNldEhv c3RBbGxvd3NBbnlIVFRQU0NlcnRpZmljYXRlKFdLQnVuZGxlUmVmIGJ1bmRsZSwgV0tTdHJpbmdS ZWYgaG9zdCk7Ci1XS19FWFBPUlQgdm9pZCBXS0J1bmRsZVNldENsaWVudENlcnRpZmljYXRlKFdL QnVuZGxlUmVmIGJ1bmRsZSwgV0tTdHJpbmdSZWYgaG9zdCwgV0tDZXJ0aWZpY2F0ZUluZm9SZWYg Y2VydGlmaWNhdGVJbmZvKTsKLQogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAjZW5kaWYKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2Mvd2luL1dLQnVu ZGxlUHJpdmF0ZVdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9JbmplY3RlZEJ1bmRsZS9BUEkvYy93aW4vV0tCdW5kbGVQcml2YXRlV2luLmNwcAkocmV2aXNp b24gMCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2Mv d2luL1dLQnVuZGxlUHJpdmF0ZVdpbi5jcHAJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNDMgQEAK Ky8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9y bXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3Zp ZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVk aXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmln aHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dp bmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0 IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBk b2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlz dHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5D LiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJ TVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhF IElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEg UEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwg QVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJF Q1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05T RVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJF TUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERB VEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FV U0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJB Q1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9U SEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNP RlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERB TUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiV0tCdW5kbGVQcml2 YXRlV2luLmgiCisKKyNpbmNsdWRlICJJbmplY3RlZEJ1bmRsZS5oIgorI2luY2x1ZGUgIldLQVBJ Q2FzdC5oIgorI2luY2x1ZGUgIldLQnVuZGxlQVBJQ2FzdC5oIgorCit1c2luZyBuYW1lc3BhY2Ug V2ViS2l0OworCit2b2lkIFdLQnVuZGxlU2V0SG9zdEFsbG93c0FueUhUVFBTQ2VydGlmaWNhdGUo V0tCdW5kbGVSZWYgYnVuZGxlUmVmLCBXS1N0cmluZ1JlZiBob3N0KQoreworICAgIHRvSW1wbChi dW5kbGVSZWYpLT5zZXRIb3N0QWxsb3dzQW55SFRUUFNDZXJ0aWZpY2F0ZSh0b1dURlN0cmluZyho b3N0KSk7Cit9CisKK3ZvaWQgV0tCdW5kbGVTZXRDbGllbnRDZXJ0aWZpY2F0ZShXS0J1bmRsZVJl ZiBidW5kbGVSZWYsIFdLU3RyaW5nUmVmIGhvc3QsIFdLQ2VydGlmaWNhdGVJbmZvUmVmIGNlcnRp ZmljYXRlSW5mb1JlZikKK3sKKyAgICB0b0ltcGwoYnVuZGxlUmVmKS0+c2V0Q2xpZW50Q2VydGlm aWNhdGUodG9XVEZTdHJpbmcoaG9zdCksIHRvSW1wbChjZXJ0aWZpY2F0ZUluZm9SZWYpKTsKK30K ClByb3BlcnR5IGNoYW5nZXMgb246IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRC dW5kbGUvQVBJL2Mvd2luL1dLQnVuZGxlUHJpdmF0ZVdpbi5jcHAKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpBZGRlZDog c3ZuOmVvbC1zdHlsZQogICArIG5hdGl2ZQoKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2Mvd2luL1dLQnVuZGxlUHJpdmF0ZVdpbi5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2Mvd2lu L1dLQnVuZGxlUHJpdmF0ZVdpbi5oCShyZXZpc2lvbiAwKQorKysgU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy93aW4vV0tCdW5kbGVQcml2YXRlV2luLmgJKHJl dmlzaW9uIDApCkBAIC0wLDAgKzEsNDIgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTEgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZp Y2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRp b25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11 c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJp YnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0 CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRl cmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdB UkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElT JycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywg QlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFO VEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElT Q0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JT CisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVD SUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywg QlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBP UiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisg KiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJ TElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQg KElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdB WSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAq IFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaWZuZGVmIFdLQnVuZGxl UHJpdmF0ZVdpbl9oCisjZGVmaW5lIFdLQnVuZGxlUHJpdmF0ZVdpbl9oCisKKyNpbmNsdWRlIDxX ZWJLaXQyL1dLQmFzZS5oPgorCisjaWZkZWYgX19jcGx1c3BsdXMKK2V4dGVybiAiQyIgeworI2Vu ZGlmCisKK1dLX0VYUE9SVCB2b2lkIFdLQnVuZGxlU2V0SG9zdEFsbG93c0FueUhUVFBTQ2VydGlm aWNhdGUoV0tCdW5kbGVSZWYgYnVuZGxlLCBXS1N0cmluZ1JlZiBob3N0KTsKK1dLX0VYUE9SVCB2 b2lkIFdLQnVuZGxlU2V0Q2xpZW50Q2VydGlmaWNhdGUoV0tCdW5kbGVSZWYgYnVuZGxlLCBXS1N0 cmluZ1JlZiBob3N0LCBXS0NlcnRpZmljYXRlSW5mb1JlZiBjZXJ0aWZpY2F0ZUluZm8pOworCisj aWZkZWYgX19jcGx1c3BsdXMKK30KKyNlbmRpZgorCisjZW5kaWYgLyogV0tCdW5kbGVQcml2YXRl V2luX2ggKi8KClByb3BlcnR5IGNoYW5nZXMgb246IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv SW5qZWN0ZWRCdW5kbGUvQVBJL2Mvd2luL1dLQnVuZGxlUHJpdmF0ZVdpbi5oCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K QWRkZWQ6IHN2bjplb2wtc3R5bGUKICAgKyBuYXRpdmUKCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL2d0ay9JbmplY3RlZEJ1bmRsZUd0ay5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9ndGsvSW5q ZWN0ZWRCdW5kbGVHdGsuY3BwCShyZXZpc2lvbiA4MjMzNSkKKysrIFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvZ3RrL0luamVjdGVkQnVuZGxlR3RrLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNDUsMTYgKzQ1LDQgQEAgdm9pZCBJbmplY3RlZEJ1bmRsZTo6YWN0aXZhdGVN YWNGb250QXNjZQogICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKLXZvaWQgSW5qZWN0ZWRCdW5k bGU6OnNldEhvc3RBbGxvd3NBbnlIVFRQU0NlcnRpZmljYXRlKGNvbnN0IFN0cmluZyYgaG9zdCkK LXsKLSAgICAvLyBUaGlzIGlzIG9ubHkgdXNlZCBvbiBXaW5kb3dzLgotICAgIEFTU0VSVF9OT1Rf UkVBQ0hFRCgpOwotfQotCi12b2lkIEluamVjdGVkQnVuZGxlOjpzZXRDbGllbnRDZXJ0aWZpY2F0 ZShjb25zdCBTdHJpbmcmIGhvc3QsIGNvbnN0IFdlYkNlcnRpZmljYXRlSW5mbyogY2VydGlmaWNh dGVJbmZvKQotewotICAgIC8vIFRoaXMgaXMgb25seSB1c2VkIG9uIFdpbmRvd3MuCi0gICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9tYWMvSW5qZWN0ZWRCdW5kbGVN YWMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRC dW5kbGUvbWFjL0luamVjdGVkQnVuZGxlTWFjLmNwcAkocmV2aXNpb24gODIzMzUpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL21hYy9JbmplY3RlZEJ1bmRsZU1h Yy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg0LDE2ICs4NCw0IEBAIHZvaWQgSW5qZWN0ZWRCdW5k bGU6OmFjdGl2YXRlTWFjRm9udEFzY2UKIHsKIH0KIAotdm9pZCBJbmplY3RlZEJ1bmRsZTo6c2V0 SG9zdEFsbG93c0FueUhUVFBTQ2VydGlmaWNhdGUoY29uc3QgU3RyaW5nJiBob3N0KQotewotICAg IC8vIFRoaXMgaXMgb25seSB1c2VkIG9uIFdpbmRvd3MuCi0gICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7Ci19Ci0KLXZvaWQgSW5qZWN0ZWRCdW5kbGU6OnNldENsaWVudENlcnRpZmljYXRlKGNvbnN0 IFN0cmluZyYgaG9zdCwgY29uc3QgV2ViQ2VydGlmaWNhdGVJbmZvKiBjZXJ0aWZpY2F0ZUluZm8p Ci17Ci0gICAgLy8gVGhpcyBpcyBvbmx5IHVzZWQgb24gV2luZG93cy4KLSAgICBBU1NFUlRfTk9U X1JFQUNIRUQoKTsKLX0KLQogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL3F0L0luamVjdGVkQnVuZGxlUXQuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvcXQv SW5qZWN0ZWRCdW5kbGVRdC5jcHAJKHJldmlzaW9uIDgyMzM1KQorKysgU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9xdC9JbmplY3RlZEJ1bmRsZVF0LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNTgsMTYgKzU4LDQgQEAgdm9pZCBJbmplY3RlZEJ1bmRsZTo6YWN0aXZhdGVN YWNGb250QXNjZQogewogfQogCi12b2lkIEluamVjdGVkQnVuZGxlOjpzZXRIb3N0QWxsb3dzQW55 SFRUUFNDZXJ0aWZpY2F0ZShjb25zdCBTdHJpbmcmIGhvc3QpCi17Ci0gICAgLy8gVGhpcyBpcyBv bmx5IHVzZWQgb24gV2luZG93cy4KLSAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLX0KLQotdm9p ZCBJbmplY3RlZEJ1bmRsZTo6c2V0Q2xpZW50Q2VydGlmaWNhdGUoY29uc3QgU3RyaW5nJiBob3N0 LCBjb25zdCBXZWJDZXJ0aWZpY2F0ZUluZm8qIGNlcnRpZmljYXRlSW5mbykKLXsKLSAgICAvLyBU aGlzIGlzIG9ubHkgdXNlZCBvbiBXaW5kb3dzLgotICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwot fQotCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL3dpbi9XZWJL aXQyLnZjcHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi93aW4vV2ViS2l0Mi52Y3By b2oJKHJldmlzaW9uIDgyMzM2KQorKysgU291cmNlL1dlYktpdDIvd2luL1dlYktpdDIudmNwcm9q CSh3b3JraW5nIGNvcHkpCkBAIC0yMzI3LDYgKzIzMjcsMTggQEAKIAkJCQkJCQlSZWxhdGl2ZVBh dGg9Ii4uXFdlYlByb2Nlc3NcSW5qZWN0ZWRCdW5kbGVcQVBJXGNcV0tCdW5kbGVTY3JpcHRXb3Js ZC5oIgogCQkJCQkJCT4KIAkJCQkJCTwvRmlsZT4KKwkJCQkJCTxGaWx0ZXIKKwkJCQkJCQlOYW1l PSJ3aW4iCisJCQkJCQkJPgorCQkJCQkJCTxGaWxlCisJCQkJCQkJCVJlbGF0aXZlUGF0aD0iLi5c V2ViUHJvY2Vzc1xJbmplY3RlZEJ1bmRsZVxBUElcY1x3aW5cV0tCdW5kbGVQcml2YXRlV2luLmNw cCIKKwkJCQkJCQkJPgorCQkJCQkJCTwvRmlsZT4KKwkJCQkJCQk8RmlsZQorCQkJCQkJCQlSZWxh dGl2ZVBhdGg9Ii4uXFdlYlByb2Nlc3NcSW5qZWN0ZWRCdW5kbGVcQVBJXGNcd2luXFdLQnVuZGxl UHJpdmF0ZVdpbi5oIgorCQkJCQkJCQk+CisJCQkJCQkJPC9GaWxlPgorCQkJCQkJPC9GaWx0ZXI+ CiAJCQkJCTwvRmlsdGVyPgogCQkJCTwvRmlsdGVyPgogCQkJCTxGaWx0ZXIKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL3dpbi9XZWJLaXQyR2VuZXJhdGVkLm1ha2UKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvd2luL1dlYktpdDJHZW5lcmF0ZWQubWFrZQkocmV2aXNpb24gODIzMzUpCisrKyBT b3VyY2UvV2ViS2l0Mi93aW4vV2ViS2l0MkdlbmVyYXRlZC5tYWtlCSh3b3JraW5nIGNvcHkpCkBA IC03Niw2ICs3Niw3IEBAIGFsbDoKICAgICB4Y29weSAveSAvZCAiLi5cVUlQcm9jZXNzXEFQSVxD XHdpblxXS1ZpZXcuaCIgIiVDb25maWd1cmF0aW9uQnVpbGREaXIlXGluY2x1ZGVcV2ViS2l0MiIK ICAgICB4Y29weSAveSAvZCAiLi5cVUlQcm9jZXNzXEFQSVxDXHdpblxXS1ZpZXdQcml2YXRlLmgi ICIlQ29uZmlndXJhdGlvbkJ1aWxkRGlyJVxpbmNsdWRlXFdlYktpdDIiCiAgICAgeGNvcHkgL3kg L2QgIi4uXFVJUHJvY2Vzc1xBUElcY3BwXFdLUmV0YWluUHRyLmgiICIlQ29uZmlndXJhdGlvbkJ1 aWxkRGlyJVxpbmNsdWRlXFdlYktpdDIiCisgICAgeGNvcHkgL3kgL2QgIi4uXFdlYlByb2Nlc3Nc SW5qZWN0ZWRCdW5kbGVcQVBJXGNcd2luXFdLQnVuZGxlUHJpdmF0ZVdpbi5oIiAiJUNvbmZpZ3Vy YXRpb25CdWlsZERpciVcaW5jbHVkZVxXZWJLaXQyIgogICAgIHhjb3B5IC95IC9kICIuLlxXZWJQ cm9jZXNzXEluamVjdGVkQnVuZGxlXEFQSVxjXFdLQnVuZGxlLmgiICIlQ29uZmlndXJhdGlvbkJ1 aWxkRGlyJVxpbmNsdWRlXFdlYktpdDIiCiAgICAgeGNvcHkgL3kgL2QgIi4uXFdlYlByb2Nlc3Nc SW5qZWN0ZWRCdW5kbGVcQVBJXGNcV0tCdW5kbGVCYWNrRm9yd2FyZExpc3QuaCIgIiVDb25maWd1 cmF0aW9uQnVpbGREaXIlXGluY2x1ZGVcV2ViS2l0MiIKICAgICB4Y29weSAveSAvZCAiLi5cV2Vi UHJvY2Vzc1xJbmplY3RlZEJ1bmRsZVxBUElcY1xXS0J1bmRsZUJhY2tGb3J3YXJkTGlzdEl0ZW0u aCIgIiVDb25maWd1cmF0aW9uQnVpbGREaXIlXGluY2x1ZGVcV2ViS2l0MiIK