24356 2009-03-04 09:31:32 -0800 Rename AllowUniversalAccessFromFileUrls to AllowUniversalAccessFromFileURLs 2009-03-04 12:32:51 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 abarth webkit-unassigned abarth ap oldest_to_newest 112206 0 abarth 2009-03-04 09:31:32 -0800 WebKit style fail. 112212 1 ap 2009-03-04 10:00:05 -0800 Per bug 24340 comment 4, Qt API should probably remain an exception. 112213 2 28267 abarth 2009-03-04 10:00:21 -0800 Created attachment 28267 patch I left the Qt parts in Qt style (i.e., Url). 112243 3 28267 ap 2009-03-04 11:24:06 -0800 Comment on attachment 28267 patch r=me. Thanks! - } else if(settings->allowUniversalAccessFromFileUrls() && securityOrigin()->isLocal()) { + } else if(settings->allowUniversalAccessFromFileURLs() && securityOrigin()->isLocal()) { Please add a space after if here. 112253 4 abarth 2009-03-04 11:59:00 -0800 Sending WebCore/ChangeLog Sending WebCore/WebCore.base.exp Sending WebCore/dom/Document.cpp Sending WebCore/page/Settings.cpp Sending WebCore/page/Settings.h Sending WebKit/mac/ChangeLog Sending WebKit/mac/WebView/WebPreferenceKeysPrivate.h Sending WebKit/mac/WebView/WebPreferences.mm Sending WebKit/mac/WebView/WebPreferencesPrivate.h Sending WebKit/mac/WebView/WebView.mm Sending WebKit/qt/Api/qwebsettings.cpp Sending WebKit/qt/ChangeLog Sending WebKit/win/ChangeLog Sending WebKit/win/Interfaces/IWebPreferencesPrivate.idl Sending WebKit/win/WebPreferenceKeysPrivate.h Sending WebKit/win/WebPreferences.cpp Sending WebKit/win/WebPreferences.h Sending WebKit/win/WebView.cpp Transmitting file data .................. Committed revision 41426. I'll mark this bug as fixed once the buildbots give us the green light. 28267 2009-03-04 10:00:21 -0800 2009-03-04 11:24:06 -0800 patch rename.patch text/plain 17640 abarth SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MTQyMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDktMDMtMDQgIEFkYW0gQmFydGggIDxhYmF0aEB3ZWJraXQub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDM1NgorCisgICAgICAgIEZpeCBX ZWJLaXQgc3R5bGUgZm9yIGFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzLgorCisgICAg ICAgICogV2ViQ29yZS5iYXNlLmV4cDoKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmluaXRTZWN1cml0eUNvbnRleHQpOgorICAgICAgICAq IHBhZ2UvU2V0dGluZ3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OlNldHRpbmdz KToKKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpzZXRBbGxvd1VuaXZlcnNhbEFjY2Vzc0Zy b21GaWxlVVJMcyk6CisgICAgICAgICogcGFnZS9TZXR0aW5ncy5oOgorICAgICAgICAoV2ViQ29y ZTo6U2V0dGluZ3M6OmFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzKToKKwogMjAwOS0w My0wMiAgS2ltIEdyw7ZuaG9sbSAgPGtpbS5ncm9uaG9sbUBub21vdm9rLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KSW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5iYXNl LmV4cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL1dlYkNvcmUuYmFzZS5leHAJKHJldmlzaW9uIDQx NDIwKQorKysgV2ViQ29yZS9XZWJDb3JlLmJhc2UuZXhwCSh3b3JraW5nIGNvcHkpCkBAIC02MTgs NyArNjE4LDcgQEAgX19aTjdXZWJDb3JlOFNldHRpbmdzMzFzZXRTaHJpbmtzU3RhbmRhbAogX19a TjdXZWJDb3JlOFNldHRpbmdzMzJzZXROZWVkc0Fkb2JlRnJhbWVSZWxvYWRpbmdRdWlya0ViCiBf X1pON1dlYkNvcmU4U2V0dGluZ3MzM3NldEVuZm9yY2VDU1NNSU1FVHlwZUluU3RyaWN0TW9kZUVi CiBfX1pON1dlYkNvcmU4U2V0dGluZ3MzNWRpc2FibGVSYW5nZU11dGF0aW9uRm9yT2xkQXBwbGVN YWlsRWIKLV9fWk43V2ViQ29yZThTZXR0aW5nczM1c2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9t RmlsZVVybHNFYgorX19aTjdXZWJDb3JlOFNldHRpbmdzMzVzZXRBbGxvd1VuaXZlcnNhbEFjY2Vz c0Zyb21GaWxlVVJMc0ViCiBfX1pON1dlYkNvcmU4U2V0dGluZ3MzNnNldE9mZmxpbmVXZWJBcHBs aWNhdGlvbkNhY2hlRW5hYmxlZEViCiBfX1pON1dlYkNvcmU4U2V0dGluZ3M0MHNldEphdmFTY3Jp cHRDYW5PcGVuV2luZG93c0F1dG9tYXRpY2FsbHlFYgogX19aTjdXZWJDb3JlOFNldHRpbmdzNDBz ZXRUZXh0RGlyZWN0aW9uU3VibWVudUluY2x1c2lvbkJlaGF2aW9yRU5TXzM3VGV4dERpcmVjdGlv blN1Ym1lbnVJbmNsdXNpb25CZWhhdmlvckUKSW5kZXg6IFdlYkNvcmUvZG9tL0RvY3VtZW50LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAJKHJldmlzaW9uIDQxNDIw KQorKysgV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MTU1LDcg KzQxNTUsNyBAQCB2b2lkIERvY3VtZW50Ojppbml0U2VjdXJpdHlDb250ZXh0KCkKICAgICAgICAg ICAvLyBzaXRlcy4KICAgICAgICAgICBzZWN1cml0eU9yaWdpbigpLT5ncmFudFVuaXZlcnNhbEFj Y2VzcygpOwogCi0gICAgICAgIH0gZWxzZSBpZihzZXR0aW5ncy0+YWxsb3dVbml2ZXJzYWxBY2Nl c3NGcm9tRmlsZVVybHMoKSAmJiBzZWN1cml0eU9yaWdpbigpLT5pc0xvY2FsKCkpIHsKKyAgICAg ICAgfSBlbHNlIGlmKHNldHRpbmdzLT5hbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcygp ICYmIHNlY3VyaXR5T3JpZ2luKCktPmlzTG9jYWwoKSkgewogICAgICAgICAgIC8vIFNvbWUgY2xp ZW50cyB3YW50IGZpbGU6Ly8gVVJMcyB0byBoYXZlIHVuaXZlcnNhbCBhY2Nlc3MsIGJ1dCB0aGF0 CiAgICAgICAgICAgLy8gc2V0dGluZyBpcyBkYW5nZXJvdXMgZm9yIG90aGVyIGNsaWVudHMuCiAg ICAgICAgICAgc2VjdXJpdHlPcmlnaW4oKS0+Z3JhbnRVbml2ZXJzYWxBY2Nlc3MoKTsKSW5kZXg6 IFdlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL1Nl dHRpbmdzLmNwcAkocmV2aXNpb24gNDE0MjApCisrKyBXZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC02MSw3ICs2MSw3IEBAIFNldHRpbmdzOjpTZXR0aW5ncyhQYWdl KiBwYWdlKQogICAgICwgbV9sb2NhbFN0b3JhZ2VFbmFibGVkKGZhbHNlKQogICAgICwgbV9pc0ph dmFTY3JpcHRFbmFibGVkKGZhbHNlKQogICAgICwgbV9pc1dlYlNlY3VyaXR5RW5hYmxlZCh0cnVl KQotICAgICwgbV9hbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVXJscyh0cnVlKQorICAgICwg bV9hbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcyh0cnVlKQogICAgICwgbV9qYXZhU2Ny aXB0Q2FuT3BlbldpbmRvd3NBdXRvbWF0aWNhbGx5KGZhbHNlKQogICAgICwgbV9zaG91bGRQcmlu dEJhY2tncm91bmRzKGZhbHNlKQogICAgICwgbV90ZXh0QXJlYXNBcmVSZXNpemFibGUoZmFsc2Up CkBAIC0xOTksOSArMTk5LDkgQEAgdm9pZCBTZXR0aW5nczo6c2V0V2ViU2VjdXJpdHlFbmFibGVk KGJvbwogICAgIG1faXNXZWJTZWN1cml0eUVuYWJsZWQgPSBpc1dlYlNlY3VyaXR5RW5hYmxlZDsK IH0KIAotdm9pZCBTZXR0aW5nczo6c2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVybHMo Ym9vbCBhbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVXJscykKK3ZvaWQgU2V0dGluZ3M6OnNl dEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzKGJvb2wgYWxsb3dVbml2ZXJzYWxBY2Nl c3NGcm9tRmlsZVVSTHMpCiB7Ci0gICAgbV9hbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVXJs cyA9IGFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVcmxzOworICAgIG1fYWxsb3dVbml2ZXJz YWxBY2Nlc3NGcm9tRmlsZVVSTHMgPSBhbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMczsK IH0KIAogdm9pZCBTZXR0aW5nczo6c2V0SmF2YUVuYWJsZWQoYm9vbCBpc0phdmFFbmFibGVkKQpJ bmRleDogV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdl L1NldHRpbmdzLmgJKHJldmlzaW9uIDQxNDIwKQorKysgV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgJ KHdvcmtpbmcgY29weSkKQEAgLTkyLDggKzkyLDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAg ICAgICB2b2lkIHNldFdlYlNlY3VyaXR5RW5hYmxlZChib29sKTsKICAgICAgICAgYm9vbCBpc1dl YlNlY3VyaXR5RW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNXZWJTZWN1cml0eUVuYWJsZWQ7 IH0KIAotICAgICAgICB2b2lkIHNldEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVcmxzKGJv b2wpOwotICAgICAgICBib29sIGFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVcmxzKCkgY29u c3QgeyByZXR1cm4gbV9hbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVXJsczsgfQorICAgICAg ICB2b2lkIHNldEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzKGJvb2wpOworICAgICAg ICBib29sIGFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzKCkgY29uc3QgeyByZXR1cm4g bV9hbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMczsgfQogCiAgICAgICAgIHZvaWQgc2V0 SmF2YVNjcmlwdENhbk9wZW5XaW5kb3dzQXV0b21hdGljYWxseShib29sKTsKICAgICAgICAgYm9v bCBKYXZhU2NyaXB0Q2FuT3BlbldpbmRvd3NBdXRvbWF0aWNhbGx5KCkgY29uc3QgeyByZXR1cm4g bV9qYXZhU2NyaXB0Q2FuT3BlbldpbmRvd3NBdXRvbWF0aWNhbGx5OyB9CkBAIC0yMzUsNyArMjM1 LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29sIG1fbG9jYWxTdG9yYWdlRW5h YmxlZCA6IDE7CiAgICAgICAgIGJvb2wgbV9pc0phdmFTY3JpcHRFbmFibGVkIDogMTsKICAgICAg ICAgYm9vbCBtX2lzV2ViU2VjdXJpdHlFbmFibGVkIDogMTsKLSAgICAgICAgYm9vbCBtX2FsbG93 VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVcmxzOiAxOworICAgICAgICBib29sIG1fYWxsb3dVbml2 ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHM6IDE7CiAgICAgICAgIGJvb2wgbV9qYXZhU2NyaXB0Q2Fu T3BlbldpbmRvd3NBdXRvbWF0aWNhbGx5IDogMTsKICAgICAgICAgYm9vbCBtX3Nob3VsZFByaW50 QmFja2dyb3VuZHMgOiAxOwogICAgICAgICBib29sIG1fdGV4dEFyZWFzQXJlUmVzaXphYmxlIDog MTsKSW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMv Q2hhbmdlTG9nCShyZXZpc2lvbiA0MTQyMSkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMDktMDMtMDQgIEFkYW0gQmFydGggIDxhYmF0 aEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDM1NgorCisg ICAgICAgIEZpeCBXZWJLaXQgc3R5bGUgZm9yIGFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVV UkxzLgorCisgICAgICAgICogV2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUuaDoKKyAg ICAgICAgKiBXZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tOgorICAgICAgICAoK1tXZWJQcmVmZXJl bmNlcyBpbml0aWFsaXplXSk6CisgICAgICAgICgtW1dlYlByZWZlcmVuY2VzIGFsbG93VW5pdmVy c2FsQWNjZXNzRnJvbUZpbGVVUkxzXSk6CisgICAgICAgICgtW1dlYlByZWZlcmVuY2VzIHNldEFs bG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzOl0pOgorICAgICAgICAqIFdlYlZpZXcvV2Vi UHJlZmVyZW5jZXNQcml2YXRlLmg6CisgICAgICAgICogV2ViVmlldy9XZWJWaWV3Lm1tOgorICAg ICAgICAoLVtXZWJWaWV3IF9wcmVmZXJlbmNlc0NoYW5nZWROb3RpZmljYXRpb246XSk6CisKIDIw MDktMDMtMDMgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAgICA8 cmRhcjovL3Byb2JsZW0vNjU4MTIwMz4gV2ViQ29yZSBhbmQgV2ViS2l0IHNob3VsZCBpbnN0YWxs IHRoZSBzYW1lIHNldCBvZiBoZWFkZXJzIGR1cmluZyBpbnN0YWxsaGRycyBwaGFzZSBhcyBidWls ZCBwaGFzZQpJbmRleDogV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0 ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5c1By aXZhdGUuaAkocmV2aXNpb24gNDE0MjApCisrKyBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVy ZW5jZUtleXNQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ5LDcgKzQ5LDcgQEAKICNkZWZp bmUgV2ViS2l0SmF2YUVuYWJsZWRQcmVmZXJlbmNlS2V5IEAiV2ViS2l0SmF2YUVuYWJsZWQiCiAj ZGVmaW5lIFdlYktpdEphdmFTY3JpcHRFbmFibGVkUHJlZmVyZW5jZUtleSBAIldlYktpdEphdmFT Y3JpcHRFbmFibGVkIgogI2RlZmluZSBXZWJLaXRXZWJTZWN1cml0eUVuYWJsZWRQcmVmZXJlbmNl S2V5IEAiV2ViS2l0V2ViU2VjdXJpdHlFbmFibGVkIgotI2RlZmluZSBXZWJLaXRBbGxvd1VuaXZl cnNhbEFjY2Vzc0Zyb21GaWxlVXJsc1ByZWZlcmVuY2VLZXkgQCJXZWJLaXRBbGxvd1VuaXZlcnNh bEFjY2Vzc0Zyb21GaWxlVXJscyIKKyNkZWZpbmUgV2ViS2l0QWxsb3dVbml2ZXJzYWxBY2Nlc3NG cm9tRmlsZVVSTHNQcmVmZXJlbmNlS2V5IEAiV2ViS2l0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9t RmlsZVVSTHMiCiAjZGVmaW5lIFdlYktpdEphdmFTY3JpcHRDYW5PcGVuV2luZG93c0F1dG9tYXRp Y2FsbHlQcmVmZXJlbmNlS2V5IEAiV2ViS2l0SmF2YVNjcmlwdENhbk9wZW5XaW5kb3dzQXV0b21h dGljYWxseSIKICNkZWZpbmUgV2ViS2l0UGx1Z2luc0VuYWJsZWRQcmVmZXJlbmNlS2V5IEAiV2Vi S2l0UGx1Z2luc0VuYWJsZWQiCiAjZGVmaW5lIFdlYktpdERhdGFiYXNlc0VuYWJsZWRQcmVmZXJl bmNlS2V5IEAiV2ViS2l0RGF0YWJhc2VzRW5hYmxlZFByZWZlcmVuY2VLZXkiCkluZGV4OiBXZWJL aXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21h Yy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tCShyZXZpc2lvbiA0MTQyMCkKKysrIFdlYktpdC9t YWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbQkod29ya2luZyBjb3B5KQpAQCAtMzE0LDcgKzMx NCw3IEBAIHN0YXRpYyBXZWJDYWNoZU1vZGVsIGNhY2hlTW9kZWxGb3JNYWluQnUKICAgICAgICAg W05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10sICBXZWJLaXRKYXZhRW5hYmxlZFByZWZlcmVu Y2VLZXksCiAgICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpZRVNdLCAgV2ViS2l0SmF2 YVNjcmlwdEVuYWJsZWRQcmVmZXJlbmNlS2V5LAogICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0 aEJvb2w6WUVTXSwgIFdlYktpdFdlYlNlY3VyaXR5RW5hYmxlZFByZWZlcmVuY2VLZXksCi0gICAg ICAgIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpZRVNdLCAgV2ViS2l0QWxsb3dVbml2ZXJzYWxB Y2Nlc3NGcm9tRmlsZVVybHNQcmVmZXJlbmNlS2V5LAorICAgICAgICBbTlNOdW1iZXIgbnVtYmVy V2l0aEJvb2w6WUVTXSwgIFdlYktpdEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzUHJl ZmVyZW5jZUtleSwKICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10sICBXZWJL aXRKYXZhU2NyaXB0Q2FuT3BlbldpbmRvd3NBdXRvbWF0aWNhbGx5UHJlZmVyZW5jZUtleSwKICAg ICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10sICBXZWJLaXRQbHVnaW5zRW5hYmxl ZFByZWZlcmVuY2VLZXksCiAgICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpZRVNdLCAg V2ViS2l0RGF0YWJhc2VzRW5hYmxlZFByZWZlcmVuY2VLZXksCkBAIC04NzQsMTQgKzg3NCwxNCBA QCBzdGF0aWMgV2ViQ2FjaGVNb2RlbCBjYWNoZU1vZGVsRm9yTWFpbkJ1CiAgICAgW3NlbGYgX3Nl dEJvb2xWYWx1ZTogZmxhZyBmb3JLZXk6IFdlYktpdFdlYlNlY3VyaXR5RW5hYmxlZFByZWZlcmVu Y2VLZXldOwogfQogCi0tIChCT09MKWFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVcmxzCist IChCT09MKWFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzCiB7Ci0gICAgcmV0dXJuIFtz ZWxmIF9ib29sVmFsdWVGb3JLZXk6IFdlYktpdEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVV cmxzUHJlZmVyZW5jZUtleV07CisgICAgcmV0dXJuIFtzZWxmIF9ib29sVmFsdWVGb3JLZXk6IFdl YktpdEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzUHJlZmVyZW5jZUtleV07CiB9CiAK LS0gKHZvaWQpc2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVybHM6KEJPT0wpZmxhZwor LSAodm9pZClzZXRBbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMczooQk9PTClmbGFnCiB7 Ci0gICAgW3NlbGYgX3NldEJvb2xWYWx1ZTogZmxhZyBmb3JLZXk6IFdlYktpdEFsbG93VW5pdmVy c2FsQWNjZXNzRnJvbUZpbGVVcmxzUHJlZmVyZW5jZUtleV07CisgICAgW3NlbGYgX3NldEJvb2xW YWx1ZTogZmxhZyBmb3JLZXk6IFdlYktpdEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxz UHJlZmVyZW5jZUtleV07CiB9CiAKIC0gKE5TVGltZUludGVydmFsKV9iYWNrRm9yd2FyZENhY2hl RXhwaXJhdGlvbkludGVydmFsCkluZGV4OiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5j ZXNQcml2YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVu Y2VzUHJpdmF0ZS5oCShyZXZpc2lvbiA0MTQyMCkKKysrIFdlYktpdC9tYWMvV2ViVmlldy9XZWJQ cmVmZXJlbmNlc1ByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtOTIsOCArOTIsOCBAQCBleHRl cm4gTlNTdHJpbmcgKldlYlByZWZlcmVuY2VzUmVtb3ZlZE5vCiAtIChCT09MKWlzV2ViU2VjdXJp dHlFbmFibGVkOwogLSAodm9pZClzZXRXZWJTZWN1cml0eUVuYWJsZWQ6KEJPT0wpZmxhZzsKIAot LSAoQk9PTClhbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVXJsczsKLS0gKHZvaWQpc2V0QWxs b3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVybHM6KEJPT0wpZmxhZzsKKy0gKEJPT0wpYWxsb3dV bml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHM7CistICh2b2lkKXNldEFsbG93VW5pdmVyc2FsQWNj ZXNzRnJvbUZpbGVVUkxzOihCT09MKWZsYWc7CiAKIC0gKEJPT0wpem9vbXNUZXh0T25seTsKIC0g KHZvaWQpc2V0Wm9vbXNUZXh0T25seTooQk9PTCl6b29tc1RleHRPbmx5OwpJbmRleDogV2ViS2l0 L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9XZWJWaWV3 L1dlYlZpZXcubW0JKHJldmlzaW9uIDQxNDIwKQorKysgV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZp ZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTEzMTcsNyArMTMxNyw3IEBAIHN0YXRpYyB2b2lkIFdl YktpdEluaXRpYWxpemVBcHBsaWNhdGlvbkMKICAgICBzZXR0aW5ncy0+c2V0SmF2YUVuYWJsZWQo W3ByZWZlcmVuY2VzIGlzSmF2YUVuYWJsZWRdKTsKICAgICBzZXR0aW5ncy0+c2V0SmF2YVNjcmlw dEVuYWJsZWQoW3ByZWZlcmVuY2VzIGlzSmF2YVNjcmlwdEVuYWJsZWRdKTsKICAgICBzZXR0aW5n cy0+c2V0V2ViU2VjdXJpdHlFbmFibGVkKFtwcmVmZXJlbmNlcyBpc1dlYlNlY3VyaXR5RW5hYmxl ZF0pOwotICAgIHNldHRpbmdzLT5zZXRBbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVXJscyhb cHJlZmVyZW5jZXMgYWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVybHNdKTsKKyAgICBzZXR0 aW5ncy0+c2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMoW3ByZWZlcmVuY2VzIGFs bG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzXSk7CiAgICAgc2V0dGluZ3MtPnNldEphdmFT Y3JpcHRDYW5PcGVuV2luZG93c0F1dG9tYXRpY2FsbHkoW3ByZWZlcmVuY2VzIGphdmFTY3JpcHRD YW5PcGVuV2luZG93c0F1dG9tYXRpY2FsbHldKTsKICAgICBzZXR0aW5ncy0+c2V0TWluaW11bUZv bnRTaXplKFtwcmVmZXJlbmNlcyBtaW5pbXVtRm9udFNpemVdKTsKICAgICBzZXR0aW5ncy0+c2V0 TWluaW11bUxvZ2ljYWxGb250U2l6ZShbcHJlZmVyZW5jZXMgbWluaW11bUxvZ2ljYWxGb250U2l6 ZV0pOwpJbmRleDogV2ViS2l0L3F0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQv Q2hhbmdlTG9nCShyZXZpc2lvbiA0MTQyMSkKKysrIFdlYktpdC9xdC9DaGFuZ2VMb2cJKHdvcmtp bmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAwOS0wMy0wNCAgQWRhbSBCYXJ0aCAgPGFiYXRo QHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MzU2CisKKyAg ICAgICAgRml4IFdlYktpdCBzdHlsZSBmb3IgYWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVS THMuCisKKyAgICAgICAgKiBBcGkvcXdlYnNldHRpbmdzLmNwcDoKKyAgICAgICAgKFFXZWJTZXR0 aW5nc1ByaXZhdGU6OmFwcGx5KToKKwogMjAwOS0wMy0wMyAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3 ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFsZXhleSBQcm9za3VyeWFrb3YuCklu ZGV4OiBXZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCShyZXZpc2lvbiA0MTQyMSkKKysrIFdlYktpdC9xdC9B cGkvcXdlYnNldHRpbmdzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTg2LDcgKzE4Niw3IEBAIHZv aWQgUVdlYlNldHRpbmdzUHJpdmF0ZTo6YXBwbHkoKQogCiAgICAgICAgIHZhbHVlID0gYXR0cmli dXRlcy52YWx1ZShRV2ViU2V0dGluZ3M6OkFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVcmxz LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnbG9iYWwtPmF0dHJpYnV0 ZXMudmFsdWUoUVdlYlNldHRpbmdzOjpBbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVXJscykp OwotICAgICAgICBzZXR0aW5ncy0+c2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVybHMo dmFsdWUpOworICAgICAgICBzZXR0aW5ncy0+c2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmls ZVVSTHModmFsdWUpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIFFMaXN0PFFXZWJTZXR0aW5nc1By aXZhdGUgKj4gc2V0dGluZ3MgPSAqOjphbGxTZXR0aW5ncygpOwogICAgICAgICBmb3IgKGludCBp ID0gMDsgaSA8IHNldHRpbmdzLmNvdW50KCk7ICsraSkKQEAgLTMxNiw3ICszMTYsNyBAQCBRV2Vi U2V0dGluZ3MgKlFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0dGluCiAgICAgXHZhbHVlIExvY2FsU3Rv cmFnZURhdGFiYXNlRW5hYmxlZCBTcGVjaWZpZXMgd2hldGhlciBzdXBwb3J0IGZvciB0aGUgSFRN TCA1CiAgICAgICAgIGxvY2FsIHN0b3JhZ2UgZmVhdHVyZSBpcyBlbmFibGVkIG9yIG5vdC4KICAg ICBcdmFsdWUgQWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVybHMgU3BlY2lmaWVzIHdoZXRo ZXIgZG9jdW1lbnRzIGZyb20gZmlsZQotICAgICAgICBVUkxzIHNob3VsZCBiZSBncmFudGVkIHVu aXZlcnNhbCBhY2Nlc3MgKGUuZy4sIHRvIEhUVFAgYW5kIEhUVFBTIGRvY3VtZW50cykuCisgICAg ICAgIFVybHMgc2hvdWxkIGJlIGdyYW50ZWQgdW5pdmVyc2FsIGFjY2VzcyAoZS5nLiwgdG8gSFRU UCBhbmQgSFRUUFMgZG9jdW1lbnRzKS4KICovCiAKIC8qIQpJbmRleDogV2ViS2l0L3dpbi9DaGFu Z2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDQxNDIx KQorKysgV2ViS2l0L3dpbi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMSBA QAorMjAwOS0wMy0wNCAgQWRhbSBCYXJ0aCAgPGFiYXRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MzU2CisKKyAgICAgICAgRml4IFdlYktpdCBzdHlsZSBm b3IgYWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMuCisKKyAgICAgICAgKiBJbnRlcmZh Y2VzL0lXZWJQcmVmZXJlbmNlc1ByaXZhdGUuaWRsOgorICAgICAgICAqIFdlYlByZWZlcmVuY2VL ZXlzUHJpdmF0ZS5oOgorICAgICAgICAqIFdlYlByZWZlcmVuY2VzLmNwcDoKKyAgICAgICAgKFdl YlByZWZlcmVuY2VzOjppbml0aWFsaXplRGVmYXVsdFNldHRpbmdzKToKKyAgICAgICAgKFdlYlBy ZWZlcmVuY2VzOjphbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcyk6CisgICAgICAgIChX ZWJQcmVmZXJlbmNlczo6c2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMpOgorICAg ICAgICAqIFdlYlByZWZlcmVuY2VzLmg6CisgICAgICAgICogV2ViVmlldy5jcHA6CisgICAgICAg IChXZWJWaWV3Ojpub3RpZnlQcmVmZXJlbmNlc0NoYW5nZWQpOgorCiAyMDA5LTAyLTI3ICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBT ZWlkZWwuCkluZGV4OiBXZWJLaXQvd2luL1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdC93aW4vV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmgJKHJldmlzaW9u IDQxNDIwKQorKysgV2ViS2l0L3dpbi9XZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUuaAkod29ya2lu ZyBjb3B5KQpAQCAtNDgsNyArNDgsNyBAQAogI2RlZmluZSBXZWJLaXRKYXZhRW5hYmxlZFByZWZl cmVuY2VLZXkgIldlYktpdEphdmFFbmFibGVkIgogI2RlZmluZSBXZWJLaXRKYXZhU2NyaXB0RW5h YmxlZFByZWZlcmVuY2VLZXkgIldlYktpdEphdmFTY3JpcHRFbmFibGVkIgogI2RlZmluZSBXZWJL aXRXZWJTZWN1cml0eUVuYWJsZWRQcmVmZXJlbmNlS2V5ICJXZWJLaXRXZWJTZWN1cml0eUVuYWJs ZWQiCi0jZGVmaW5lIFdlYktpdEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVcmxzUHJlZmVy ZW5jZUtleSAiV2ViS2l0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVybHMiCisjZGVmaW5l IFdlYktpdEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzUHJlZmVyZW5jZUtleSAiV2Vi S2l0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMiCiAjZGVmaW5lIFdlYktpdEphdmFT Y3JpcHRDYW5PcGVuV2luZG93c0F1dG9tYXRpY2FsbHlQcmVmZXJlbmNlS2V5ICJXZWJLaXRKYXZh U2NyaXB0Q2FuT3BlbldpbmRvd3NBdXRvbWF0aWNhbGx5IgogI2RlZmluZSBXZWJLaXRQbHVnaW5z RW5hYmxlZFByZWZlcmVuY2VLZXkgIldlYktpdFBsdWdpbnNFbmFibGVkIgogI2RlZmluZSBXZWJL aXREYXRhYmFzZXNFbmFibGVkUHJlZmVyZW5jZUtleSAiV2ViS2l0RGF0YWJhc2VzRW5hYmxlZCIK SW5kZXg6IFdlYktpdC93aW4vV2ViUHJlZmVyZW5jZXMuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dC93aW4vV2ViUHJlZmVyZW5jZXMuY3BwCShyZXZpc2lvbiA0MTQyMCkKKysrIFdlYktpdC93aW4v V2ViUHJlZmVyZW5jZXMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMDQsNyArMjA0LDcgQEAgdm9p ZCBXZWJQcmVmZXJlbmNlczo6aW5pdGlhbGl6ZURlZmF1bHRTZQogICAgIENGRGljdGlvbmFyeUFk ZFZhbHVlKGRlZmF1bHRzLCBDRlNUUihXZWJLaXRKYXZhRW5hYmxlZFByZWZlcmVuY2VLZXkpLCBr Q0ZCb29sZWFuVHJ1ZSk7CiAgICAgQ0ZEaWN0aW9uYXJ5QWRkVmFsdWUoZGVmYXVsdHMsIENGU1RS KFdlYktpdEphdmFTY3JpcHRFbmFibGVkUHJlZmVyZW5jZUtleSksIGtDRkJvb2xlYW5UcnVlKTsK ICAgICBDRkRpY3Rpb25hcnlBZGRWYWx1ZShkZWZhdWx0cywgQ0ZTVFIoV2ViS2l0V2ViU2VjdXJp dHlFbmFibGVkUHJlZmVyZW5jZUtleSksIGtDRkJvb2xlYW5UcnVlKTsKLSAgICBDRkRpY3Rpb25h cnlBZGRWYWx1ZShkZWZhdWx0cywgQ0ZTVFIoV2ViS2l0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9t RmlsZVVybHNQcmVmZXJlbmNlS2V5KSwga0NGQm9vbGVhblRydWUpOworICAgIENGRGljdGlvbmFy eUFkZFZhbHVlKGRlZmF1bHRzLCBDRlNUUihXZWJLaXRBbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21G aWxlVVJMc1ByZWZlcmVuY2VLZXkpLCBrQ0ZCb29sZWFuVHJ1ZSk7CiAgICAgQ0ZEaWN0aW9uYXJ5 QWRkVmFsdWUoZGVmYXVsdHMsIENGU1RSKFdlYktpdEphdmFTY3JpcHRDYW5PcGVuV2luZG93c0F1 dG9tYXRpY2FsbHlQcmVmZXJlbmNlS2V5KSwga0NGQm9vbGVhblRydWUpOwogICAgIENGRGljdGlv bmFyeUFkZFZhbHVlKGRlZmF1bHRzLCBDRlNUUihXZWJLaXRQbHVnaW5zRW5hYmxlZFByZWZlcmVu Y2VLZXkpLCBrQ0ZCb29sZWFuVHJ1ZSk7CiAgICAgQ0ZEaWN0aW9uYXJ5QWRkVmFsdWUoZGVmYXVs dHMsIENGU1RSKFdlYktpdERhdGFiYXNlc0VuYWJsZWRQcmVmZXJlbmNlS2V5KSwga0NGQm9vbGVh blRydWUpOwpAQCAtNzY3LDE3ICs3NjcsMTcgQEAgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBX ZWJQcmVmZXJlbmNlcwogICAgIHJldHVybiBTX09LOwogfQogCi1IUkVTVUxUIFNURE1FVEhPRENB TExUWVBFIFdlYlByZWZlcmVuY2VzOjphbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVXJscygK K0hSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgV2ViUHJlZmVyZW5jZXM6OmFsbG93VW5pdmVyc2Fs QWNjZXNzRnJvbUZpbGVVUkxzKAogICAgIC8qIFtyZXR2YWxdW291dF0gKi8gQk9PTCogYWxsb3dB Y2Nlc3MpCiB7Ci0gICAgKmFsbG93QWNjZXNzID0gYm9vbFZhbHVlRm9yS2V5KENGU1RSKFdlYktp dEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVcmxzUHJlZmVyZW5jZUtleSkpOworICAgICph bGxvd0FjY2VzcyA9IGJvb2xWYWx1ZUZvcktleShDRlNUUihXZWJLaXRBbGxvd1VuaXZlcnNhbEFj Y2Vzc0Zyb21GaWxlVVJMc1ByZWZlcmVuY2VLZXkpKTsKICAgICByZXR1cm4gU19PSzsKIH0KIAot SFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBXZWJQcmVmZXJlbmNlczo6c2V0QWxsb3dVbml2ZXJz YWxBY2Nlc3NGcm9tRmlsZVVybHMoCitIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFdlYlByZWZl cmVuY2VzOjpzZXRBbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcygKICAgICAvKiBbaW5d ICovIEJPT0wgYWxsb3dBY2Nlc3MpCiB7Ci0gICAgc2V0Qm9vbFZhbHVlKENGU1RSKFdlYktpdEFs bG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVcmxzUHJlZmVyZW5jZUtleSksIGFsbG93QWNjZXNz KTsKKyAgICBzZXRCb29sVmFsdWUoQ0ZTVFIoV2ViS2l0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9t RmlsZVVSTHNQcmVmZXJlbmNlS2V5KSwgYWxsb3dBY2Nlc3MpOwogICAgIHJldHVybiBTX09LOwog fQogCkluZGV4OiBXZWJLaXQvd2luL1dlYlByZWZlcmVuY2VzLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L3dpbi9XZWJQcmVmZXJlbmNlcy5oCShyZXZpc2lvbiA0MTQyMCkKKysrIFdlYktpdC93aW4v V2ViUHJlZmVyZW5jZXMuaAkod29ya2luZyBjb3B5KQpAQCAtMzUwLDEwICszNTAsMTAgQEAgcHVi bGljOgogICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBzZXRXZWJTZWN1cml0 eUVuYWJsZWQoCiAgICAgLyogW2luXSAqLyBCT09MIGVuYWJsZWQpOwogCi0gICAgdmlydHVhbCBI UkVTVUxUIFNURE1FVEhPRENBTExUWVBFIGFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVcmxz KAorICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBhbGxvd1VuaXZlcnNhbEFj Y2Vzc0Zyb21GaWxlVVJMcygKICAgICAvKiBbcmV0dmFsXVtvdXRdICovIEJPT0wqIGFsbG93QWNj ZXNzKTsKIAotICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBzZXRBbGxvd1Vu aXZlcnNhbEFjY2Vzc0Zyb21GaWxlVXJscygKKyAgICB2aXJ0dWFsIEhSRVNVTFQgU1RETUVUSE9E Q0FMTFRZUEUgc2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMoCiAgICAgLyogW2lu XSAqLyBCT09MIGFsbG93QWNjZXNzKTsKIAogICAgIC8vIFdlYlByZWZlcmVuY2VzCkluZGV4OiBX ZWJLaXQvd2luL1dlYlZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vV2ViVmlldy5j cHAJKHJldmlzaW9uIDQxNDIwKQorKysgV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNDIxMSwxMCArNDIxMSwxMCBAQCBIUkVTVUxUIFdlYlZpZXc6Om5vdGlmeVByZWZl cmVuY2VzQ2hhbmdlCiAgICAgICAgIHJldHVybiBocjsKICAgICBzZXR0aW5ncy0+c2V0V2ViU2Vj dXJpdHlFbmFibGVkKCEhZW5hYmxlZCk7CiAKLSAgICBociA9IHByZWZzUHJpdmF0ZS0+YWxsb3dV bml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVybHMoJmVuYWJsZWQpOworICAgIGhyID0gcHJlZnNQcml2 YXRlLT5hbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcygmZW5hYmxlZCk7CiAgICAgaWYg KEZBSUxFRChocikpCiAgICAgICAgIHJldHVybiBocjsKLSAgICBzZXR0aW5ncy0+c2V0QWxsb3dV bml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVybHMoISFlbmFibGVkKTsKKyAgICBzZXR0aW5ncy0+c2V0 QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMoISFlbmFibGVkKTsKIAogI2lmIFVTRShT QUZBUklfVEhFTUUpCiAgICAgaHIgPSBwcmVmc1ByaXZhdGUtPnNob3VsZFBhaW50TmF0aXZlQ29u dHJvbHMoJmVuYWJsZWQpOwpJbmRleDogV2ViS2l0L3dpbi9JbnRlcmZhY2VzL0lXZWJQcmVmZXJl bmNlc1ByaXZhdGUuaWRsCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vSW50ZXJmYWNlcy9JV2Vi UHJlZmVyZW5jZXNQcml2YXRlLmlkbAkocmV2aXNpb24gNDE0MjApCisrKyBXZWJLaXQvd2luL0lu dGVyZmFjZXMvSVdlYlByZWZlcmVuY2VzUHJpdmF0ZS5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTcz LDYgKzczLDYgQEAgaW50ZXJmYWNlIElXZWJQcmVmZXJlbmNlc1ByaXZhdGUgOiBJVW5rbgogICAg IEhSRVNVTFQgaXNXZWJTZWN1cml0eUVuYWJsZWQoW291dCwgcmV0dmFsXSBCT09MKiBlbmFibGVk KTsKICAgICBIUkVTVUxUIHNldFdlYlNlY3VyaXR5RW5hYmxlZChbaW5dIEJPT0wgZW5hYmxlZCk7 CiAKLSAgICBIUkVTVUxUIGFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVcmxzKFtvdXQsIHJl dHZhbF0gQk9PTCAqYWxsb3dBY2Nlc3MpOwotICAgIEhSRVNVTFQgc2V0QWxsb3dVbml2ZXJzYWxB Y2Nlc3NGcm9tRmlsZVVybHMoW2luXSBCT09MIGFsbG93QWNjZXNzKTsKKyAgICBIUkVTVUxUIGFs bG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzKFtvdXQsIHJldHZhbF0gQk9PTCAqYWxsb3dB Y2Nlc3MpOworICAgIEhSRVNVTFQgc2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMo W2luXSBCT09MIGFsbG93QWNjZXNzKTsKIH0K