194844 2019-02-19 17:08:33 -0800 Unify WebsiteDataStore::defaultDataStoreConfiguration across ports 2019-03-01 14:19:24 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 don.olmstead don.olmstead berto bfulgham cgarcia commit-queue ews-watchlist fujii gustavo mcatanzaro webkit-bug-importer youennf oldest_to_newest 1507923 0 don.olmstead 2019-02-19 17:08:33 -0800 Currently not all directories are set within the defaultdataStoreConnection. For example ServiceWorker support will crash since setServiceWorkerRegistrationDirectory is not set. 1507926 1 362456 don.olmstead 2019-02-19 17:13:56 -0800 Created attachment 362456 Patch 1507948 2 362463 don.olmstead 2019-02-19 17:47:06 -0800 Created attachment 362463 Patch Not implementing device id hash salt. 1507951 3 fujii 2019-02-19 18:00:01 -0800 Do you want to add following, too? configuration->setCacheStorageDirectory(defaultCacheStorageDirectory()); configuration->setMediaCacheDirectory(defaultMediaCacheDirectory()); configuration->setJavaScriptConfigurationDirectory(defaultJavaScriptConfigurationDirectory()); Do you want to implement following, too? WebsiteDataStore::defaultMediaCacheDirectory() WebsiteDataStore::defaultJavaScriptConfigurationDirectory() 1507954 4 362465 don.olmstead 2019-02-19 18:14:35 -0800 Created attachment 362465 Patch 1507955 5 fujii 2019-02-19 18:17:45 -0800 Then, you should implement following. WebsiteDataStore::defaultMediaCacheDirectory() WebsiteDataStore::defaultJavaScriptConfigurationDirectory() 1511537 6 don.olmstead 2019-03-01 12:40:34 -0800 Changing up the focus of this bug. There are very very slight variations in each port's implementation of defaultDataStoreConfiguration. Honestly this seems to be just bit rot and theres no real reason to have things it in a platform specific source file. 1511544 7 363359 don.olmstead 2019-03-01 12:46:10 -0800 Created attachment 363359 Patch 1511546 8 363360 don.olmstead 2019-03-01 12:46:59 -0800 Created attachment 363360 Patch 1511551 9 ews-watchlist 2019-03-01 12:52:09 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1511554 10 363360 youennf 2019-03-01 13:00:06 -0800 Comment on attachment 363360 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363360&action=review > Source/WebKit/UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp:-193 > - configuration->setDeviceIdHashSaltsStorageDirectory(defaultDeviceIdHashSaltsStorageDirectory()); This one might be good to add as well above. 1511557 11 363360 bfulgham 2019-03-01 13:00:55 -0800 Comment on attachment 363360 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363360&action=review > Source/WebKit/ChangeLog:18 > + (API::WebsiteDataStore::defaultDataStoreConfiguration): Deleted. Ooo! Nice. >> Source/WebKit/UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp:-193 >> - configuration->setDeviceIdHashSaltsStorageDirectory(defaultDeviceIdHashSaltsStorageDirectory()); > > This one might be good to add as well above. Should we have a "setPlatformConfiguration<Mumble>" that adds any platform-specific things? Maybe only glib has this need at the moment. 1511559 12 363360 bfulgham 2019-03-01 13:04:23 -0800 Comment on attachment 363360 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363360&action=review >>> Source/WebKit/UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp:-193 >>> - configuration->setDeviceIdHashSaltsStorageDirectory(defaultDeviceIdHashSaltsStorageDirectory()); >> >> This one might be good to add as well above. > > Should we have a "setPlatformConfiguration<Mumble>" that adds any platform-specific things? > > Maybe only glib has this need at the moment. I take it back -- it's in common code, so let's just add it in the unified location. 1511561 13 363363 don.olmstead 2019-03-01 13:10:27 -0800 Created attachment 363363 Patch Good catch on missing call to the Glib device id hash bits. Fixed that. 1511612 14 363363 commit-queue 2019-03-01 14:18:27 -0800 Comment on attachment 363363 Patch Clearing flags on attachment: 363363 Committed r242289: <https://trac.webkit.org/changeset/242289> 1511613 15 commit-queue 2019-03-01 14:18:29 -0800 All reviewed patches have been landed. Closing bug. 1511614 16 webkit-bug-importer 2019-03-01 14:19:24 -0800 <rdar://problem/48522763> 362456 2019-02-19 17:13:56 -0800 2019-02-19 17:47:06 -0800 Patch bug-194844.diff text/plain 2988 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggOTEwMTliYmQxN2EuLjJhODAwOTZiNWNjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE4IEBACisyMDE5LTAyLTE5ICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+ CisKKyAgICAgICAgW1dpbl0gU2V0IGFkZGl0aW9uYWwgZGlyZWN0b3JpZXMgd2l0aGluIFdlYnNp dGVEYXRhU3RvcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE5NDg0NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZHMgdGhlIGRldmljZSBoYXNoIHNhbHRzIHN0b3JhZ2UgZGlyZWN0b3JpZXMuIFNldHMg dGhlIGRlZmF1bHQgZGF0YSBzdG9yZSBkaXJlY3RvcmllcyBmb3IKKyAgICAgICAgSW5kZXhlZERC LCBTZXJ2aWNlIFdvcmtlciwgYW5kIHRoZSBEZXZpY2UgSUQgSGFzaCBTYWx0cy4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvd2luL0FQSVdlYnNpdGVEYXRhU3RvcmVXaW4uY3BwOgorICAgICAg ICAoQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0RGV2aWNlSWRIYXNoU2FsdHNTdG9yYWdl RGlyZWN0b3J5KToKKyAgICAgICAgKEFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6bGVnYWN5RGVmYXVs dERldmljZUlkSGFzaFNhbHRzU3RvcmFnZURpcmVjdG9yeSk6CisgICAgICAgIChBUEk6OldlYnNp dGVEYXRhU3RvcmU6OmRlZmF1bHREYXRhU3RvcmVDb25maWd1cmF0aW9uKToKKwogMjAxOS0wMi0x OSAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgUGFzcyByb290 Q29udGVudHNMYXllciB0byBNYWMgcmVtb3RlIGxheWVyIHRyZWUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93aW4vQVBJV2Vic2l0ZURhdGFTdG9yZVdpbi5jcHAgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd2luL0FQSVdlYnNpdGVEYXRhU3RvcmVXaW4uY3Bw CmluZGV4IDMyMjViOTIxNzBkLi43MjgxNWY0MzY5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL3dpbi9BUElXZWJzaXRlRGF0YVN0b3JlV2luLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd2luL0FQSVdlYnNpdGVEYXRhU3RvcmVXaW4uY3BwCkBA IC02Nyw4ICs2Nyw3IEBAIFN0cmluZyBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0TWVkaWFLZXlz U3RvcmFnZURpcmVjdG9yeSgpCiAKIFN0cmluZyBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0RGV2 aWNlSWRIYXNoU2FsdHNTdG9yYWdlRGlyZWN0b3J5KCkKIHsKLSAgICAvLyBOb3QgSW1wbGVtZW50 ZWQuCi0gICAgcmV0dXJuIFN0cmluZygpOworICAgIHJldHVybiBGaWxlU3lzdGVtOjpwYXRoQnlB cHBlbmRpbmdDb21wb25lbnQoRmlsZVN5c3RlbTo6bG9jYWxVc2VyU3BlY2lmaWNTdG9yYWdlRGly ZWN0b3J5KCksICJEZXZpY2VJZEhhc2hTYWx0cyIpOwogfQogCiBTdHJpbmcgV2Vic2l0ZURhdGFT dG9yZTo6ZGVmYXVsdFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KCkKQEAgLTEyOCw4ICsxMjcsNyBA QCBTdHJpbmcgV2Vic2l0ZURhdGFTdG9yZTo6bGVnYWN5RGVmYXVsdE1lZGlhS2V5c1N0b3JhZ2VE aXJlY3RvcnkoKQogCiBTdHJpbmcgV2Vic2l0ZURhdGFTdG9yZTo6bGVnYWN5RGVmYXVsdERldmlj ZUlkSGFzaFNhbHRzU3RvcmFnZURpcmVjdG9yeSgpCiB7Ci0gICAgLy8gTm90IEltcGxlbWVudGVk LgotICAgIHJldHVybiBTdHJpbmcoKTsKKyAgICByZXR1cm4gRmlsZVN5c3RlbTo6cGF0aEJ5QXBw ZW5kaW5nQ29tcG9uZW50KEZpbGVTeXN0ZW06OmxvY2FsVXNlclNwZWNpZmljU3RvcmFnZURpcmVj dG9yeSgpLCAiRGV2aWNlSWRIYXNoU2FsdHMiKTsKIH0KIAogU3RyaW5nIFdlYnNpdGVEYXRhU3Rv cmU6OmxlZ2FjeURlZmF1bHRKYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeSgpCkBAIC0x NDMsMTAgKzE0MSwxNCBAQCBSZWY8V2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlv bj4gV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9yZUNvbgogCiAgICAgY29uZmlndXJh dGlvbi0+c2V0QXBwbGljYXRpb25DYWNoZURpcmVjdG9yeShkZWZhdWx0QXBwbGljYXRpb25DYWNo ZURpcmVjdG9yeSgpKTsKICAgICBjb25maWd1cmF0aW9uLT5zZXROZXR3b3JrQ2FjaGVEaXJlY3Rv cnkoZGVmYXVsdE5ldHdvcmtDYWNoZURpcmVjdG9yeSgpKTsKKworICAgIGNvbmZpZ3VyYXRpb24t PnNldEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KGRlZmF1bHRJbmRleGVkREJEYXRhYmFzZURp cmVjdG9yeSgpKTsKKyAgICBjb25maWd1cmF0aW9uLT5zZXRTZXJ2aWNlV29ya2VyUmVnaXN0cmF0 aW9uRGlyZWN0b3J5KGRlZmF1bHRTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5KCkp OwogICAgIGNvbmZpZ3VyYXRpb24tPnNldFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KGRlZmF1bHRX ZWJTUUxEYXRhYmFzZURpcmVjdG9yeSgpKTsKICAgICBjb25maWd1cmF0aW9uLT5zZXRMb2NhbFN0 b3JhZ2VEaXJlY3RvcnkoZGVmYXVsdExvY2FsU3RvcmFnZURpcmVjdG9yeSgpKTsKICAgICBjb25m aWd1cmF0aW9uLT5zZXRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KGRlZmF1bHRNZWRpYUtleXNT dG9yYWdlRGlyZWN0b3J5KCkpOwogICAgIGNvbmZpZ3VyYXRpb24tPnNldFJlc291cmNlTG9hZFN0 YXRpc3RpY3NEaXJlY3RvcnkoZGVmYXVsdFJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3Rvcnko KSk7CisgICAgY29uZmlndXJhdGlvbi0+c2V0RGV2aWNlSWRIYXNoU2FsdHNTdG9yYWdlRGlyZWN0 b3J5KGRlZmF1bHREZXZpY2VJZEhhc2hTYWx0c1N0b3JhZ2VEaXJlY3RvcnkoKSk7CiAKICAgICBy ZXR1cm4gY29uZmlndXJhdGlvbjsKIH0K 362463 2019-02-19 17:47:06 -0800 2019-02-19 18:14:35 -0800 Patch bug-194844.diff text/plain 1987 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggOTEwMTliYmQxN2EuLmE5MDVjOTliYmMxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE2IEBACisyMDE5LTAyLTE5ICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+ CisKKyAgICAgICAgW1dpbl0gU2V0IGFkZGl0aW9uYWwgZGlyZWN0b3JpZXMgd2l0aGluIFdlYnNp dGVEYXRhU3RvcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE5NDg0NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFNldHMgdGhlIGRlZmF1bHQgZGF0YSBzdG9yZSBkaXJlY3RvcmllcyBmb3IgSW5kZXhlZERC LCBTZXJ2aWNlIFdvcmtlciwgYW5kIHRoZQorICAgICAgICBEZXZpY2UgSUQgSGFzaCBTYWx0cy4K KworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvd2luL0FQSVdlYnNpdGVEYXRhU3RvcmVXaW4uY3Bw OgorICAgICAgICAoQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0RGF0YVN0b3JlQ29uZmln dXJhdGlvbik6CisKIDIwMTktMDItMTkgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29t PgogCiAgICAgICAgIFBhc3Mgcm9vdENvbnRlbnRzTGF5ZXIgdG8gTWFjIHJlbW90ZSBsYXllciB0 cmVlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd2luL0FQSVdlYnNp dGVEYXRhU3RvcmVXaW4uY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dpbi9BUElX ZWJzaXRlRGF0YVN0b3JlV2luLmNwcAppbmRleCAzMjI1YjkyMTcwZC4uOGZjOGYzZmMwZjYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93aW4vQVBJV2Vic2l0ZURhdGFT dG9yZVdpbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dpbi9BUElXZWJz aXRlRGF0YVN0b3JlV2luLmNwcApAQCAtMTQzLDEwICsxNDMsMTQgQEAgUmVmPFdlYktpdDo6V2Vi c2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24+IFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHREYXRh U3RvcmVDb24KIAogICAgIGNvbmZpZ3VyYXRpb24tPnNldEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3Rv cnkoZGVmYXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKSk7CiAgICAgY29uZmlndXJhdGlv bi0+c2V0TmV0d29ya0NhY2hlRGlyZWN0b3J5KGRlZmF1bHROZXR3b3JrQ2FjaGVEaXJlY3Rvcnko KSk7CisKKyAgICBjb25maWd1cmF0aW9uLT5zZXRJbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeShk ZWZhdWx0SW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkoKSk7CisgICAgY29uZmlndXJhdGlvbi0+ c2V0U2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeShkZWZhdWx0U2VydmljZVdvcmtl clJlZ2lzdHJhdGlvbkRpcmVjdG9yeSgpKTsKICAgICBjb25maWd1cmF0aW9uLT5zZXRXZWJTUUxE YXRhYmFzZURpcmVjdG9yeShkZWZhdWx0V2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkoKSk7CiAgICAg Y29uZmlndXJhdGlvbi0+c2V0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KGRlZmF1bHRMb2NhbFN0b3Jh Z2VEaXJlY3RvcnkoKSk7CiAgICAgY29uZmlndXJhdGlvbi0+c2V0TWVkaWFLZXlzU3RvcmFnZURp cmVjdG9yeShkZWZhdWx0TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSgpKTsKICAgICBjb25maWd1 cmF0aW9uLT5zZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5KGRlZmF1bHRSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5KCkpOworICAgIGNvbmZpZ3VyYXRpb24tPnNldERldmlj ZUlkSGFzaFNhbHRzU3RvcmFnZURpcmVjdG9yeShkZWZhdWx0RGV2aWNlSWRIYXNoU2FsdHNTdG9y YWdlRGlyZWN0b3J5KCkpOwogCiAgICAgcmV0dXJuIGNvbmZpZ3VyYXRpb247CiB9Cg== 362465 2019-02-19 18:14:35 -0800 2019-03-01 12:46:10 -0800 Patch bug-194844.diff text/plain 2195 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggOTEwMTliYmQxN2EuLjhhODZiMWEzOTk1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDEzIEBACisyMDE5LTAyLTE5ICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+ CisKKyAgICAgICAgW1dpbl0gU2V0IGFkZGl0aW9uYWwgZGlyZWN0b3JpZXMgd2l0aGluIFdlYnNp dGVEYXRhU3RvcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE5NDg0NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS93aW4vQVBJV2Vic2l0ZURhdGFTdG9yZVdpbi5jcHA6CisgICAg ICAgIChBUEk6OldlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHREYXRhU3RvcmVDb25maWd1cmF0aW9u KToKKwogMjAxOS0wMi0xOSAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAg ICAgICAgUGFzcyByb290Q29udGVudHNMYXllciB0byBNYWMgcmVtb3RlIGxheWVyIHRyZWUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93aW4vQVBJV2Vic2l0ZURhdGFT dG9yZVdpbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd2luL0FQSVdlYnNpdGVE YXRhU3RvcmVXaW4uY3BwCmluZGV4IDMyMjViOTIxNzBkLi4xMDdhMzcyNDljYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dpbi9BUElXZWJzaXRlRGF0YVN0b3JlV2lu LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd2luL0FQSVdlYnNpdGVEYXRh U3RvcmVXaW4uY3BwCkBAIC0xNDIsMTEgKzE0MiwxOSBAQCBSZWY8V2ViS2l0OjpXZWJzaXRlRGF0 YVN0b3JlQ29uZmlndXJhdGlvbj4gV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9yZUNv bgogICAgIGF1dG8gY29uZmlndXJhdGlvbiA9IFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZUNvbmZp Z3VyYXRpb246OmNyZWF0ZSgpOwogCiAgICAgY29uZmlndXJhdGlvbi0+c2V0QXBwbGljYXRpb25D YWNoZURpcmVjdG9yeShkZWZhdWx0QXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSgpKTsKKyAgICBj b25maWd1cmF0aW9uLT5zZXRDYWNoZVN0b3JhZ2VEaXJlY3RvcnkoZGVmYXVsdENhY2hlU3RvcmFn ZURpcmVjdG9yeSgpKTsKICAgICBjb25maWd1cmF0aW9uLT5zZXROZXR3b3JrQ2FjaGVEaXJlY3Rv cnkoZGVmYXVsdE5ldHdvcmtDYWNoZURpcmVjdG9yeSgpKTsKKyAgICBjb25maWd1cmF0aW9uLT5z ZXRNZWRpYUNhY2hlRGlyZWN0b3J5KGRlZmF1bHRNZWRpYUNhY2hlRGlyZWN0b3J5KCkpOworCisg ICAgY29uZmlndXJhdGlvbi0+c2V0SW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkoZGVmYXVsdElu ZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KCkpOworICAgIGNvbmZpZ3VyYXRpb24tPnNldFNlcnZp Y2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkoZGVmYXVsdFNlcnZpY2VXb3JrZXJSZWdpc3Ry YXRpb25EaXJlY3RvcnkoKSk7CiAgICAgY29uZmlndXJhdGlvbi0+c2V0V2ViU1FMRGF0YWJhc2VE aXJlY3RvcnkoZGVmYXVsdFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KCkpOwogICAgIGNvbmZpZ3Vy YXRpb24tPnNldExvY2FsU3RvcmFnZURpcmVjdG9yeShkZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0 b3J5KCkpOwogICAgIGNvbmZpZ3VyYXRpb24tPnNldE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3Rvcnko ZGVmYXVsdE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoKSk7CiAgICAgY29uZmlndXJhdGlvbi0+ c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeShkZWZhdWx0UmVzb3VyY2VMb2FkU3Rh dGlzdGljc0RpcmVjdG9yeSgpKTsKKyAgICBjb25maWd1cmF0aW9uLT5zZXREZXZpY2VJZEhhc2hT YWx0c1N0b3JhZ2VEaXJlY3RvcnkoZGVmYXVsdERldmljZUlkSGFzaFNhbHRzU3RvcmFnZURpcmVj dG9yeSgpKTsKKworICAgIGNvbmZpZ3VyYXRpb24tPnNldEphdmFTY3JpcHRDb25maWd1cmF0aW9u RGlyZWN0b3J5KGRlZmF1bHRKYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeSgpKTsKIAog ICAgIHJldHVybiBjb25maWd1cmF0aW9uOwogfQo= 363359 2019-03-01 12:46:10 -0800 2019-03-01 12:46:59 -0800 Patch bug-194844.diff text/plain 7336 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggYjRjZjMxODFmYzMuLmJiZDFmZjUwZGQxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE5IEBACisyMDE5LTAzLTAxICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+ CisKKyAgICAgICAgVW5pZnkgV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9yZUNvbmZp Z3VyYXRpb24gYWNyb3NzIHBvcnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xOTQ4NDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJV2Vic2l0ZURhdGFTdG9yZS5jcHA6Cisg ICAgICAgIChBUEk6OldlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHREYXRhU3RvcmVDb25maWd1cmF0 aW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL0FQSVdlYnNpdGVEYXRhU3RvcmVD b2NvYS5tbToKKyAgICAgICAgKEFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9y ZUNvbmZpZ3VyYXRpb24pOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ2xpYi9B UElXZWJzaXRlRGF0YVN0b3JlR0xpYi5jcHA6CisgICAgICAgIChBUEk6OldlYnNpdGVEYXRhU3Rv cmU6OmRlZmF1bHREYXRhU3RvcmVDb25maWd1cmF0aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL3dpbi9BUElXZWJzaXRlRGF0YVN0b3JlV2luLmNwcDoKKyAgICAgICAgKEFQ STo6V2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9yZUNvbmZpZ3VyYXRpb24pOiBEZWxl dGVkLgorCiAyMDE5LTAzLTAxICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+ CiAKICAgICAgICAgW1dpbkNhaXJvXSBFbmFibGUgc2VydmljZSB3b3JrZXIKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElXZWJzaXRlRGF0YVN0b3JlLmNwcCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElXZWJzaXRlRGF0YVN0b3JlLmNwcAppbmRleCAy Nzk3YzhjMjQxMi4uMTEzZTQzZTkwZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9BUElXZWJzaXRlRGF0YVN0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQVBJV2Vic2l0ZURhdGFTdG9yZS5jcHAKQEAgLTEzMyw2ICsxMzMsMjggQEAgV1RG OjpTdHJpbmcgV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdEphdmFTY3JpcHRDb25maWd1cmF0aW9u RGlyZWN0b3J5KCkKIH0KICNlbmRpZgogCitSZWY8V2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlQ29u ZmlndXJhdGlvbj4gV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9yZUNvbmZpZ3VyYXRp b24oKQoreworICAgIGF1dG8gY29uZmlndXJhdGlvbiA9IFdlYktpdDo6V2Vic2l0ZURhdGFTdG9y ZUNvbmZpZ3VyYXRpb246OmNyZWF0ZSgpOworCisgICAgY29uZmlndXJhdGlvbi0+c2V0QXBwbGlj YXRpb25DYWNoZURpcmVjdG9yeShkZWZhdWx0QXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSgpKTsK KyAgICBjb25maWd1cmF0aW9uLT5zZXRBcHBsaWNhdGlvbkNhY2hlRmxhdEZpbGVTdWJkaXJlY3Rv cnlOYW1lKCJGaWxlcyIpOworICAgIGNvbmZpZ3VyYXRpb24tPnNldENhY2hlU3RvcmFnZURpcmVj dG9yeShkZWZhdWx0Q2FjaGVTdG9yYWdlRGlyZWN0b3J5KCkpOworICAgIGNvbmZpZ3VyYXRpb24t PnNldE5ldHdvcmtDYWNoZURpcmVjdG9yeShkZWZhdWx0TmV0d29ya0NhY2hlRGlyZWN0b3J5KCkp OworICAgIGNvbmZpZ3VyYXRpb24tPnNldE1lZGlhQ2FjaGVEaXJlY3RvcnkoZGVmYXVsdE1lZGlh Q2FjaGVEaXJlY3RvcnkoKSk7CisKKyAgICBjb25maWd1cmF0aW9uLT5zZXRJbmRleGVkREJEYXRh YmFzZURpcmVjdG9yeShkZWZhdWx0SW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkoKSk7CisgICAg Y29uZmlndXJhdGlvbi0+c2V0U2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeShkZWZh dWx0U2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeSgpKTsKKyAgICBjb25maWd1cmF0 aW9uLT5zZXRXZWJTUUxEYXRhYmFzZURpcmVjdG9yeShkZWZhdWx0V2ViU1FMRGF0YWJhc2VEaXJl Y3RvcnkoKSk7CisgICAgY29uZmlndXJhdGlvbi0+c2V0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KGRl ZmF1bHRMb2NhbFN0b3JhZ2VEaXJlY3RvcnkoKSk7CisgICAgY29uZmlndXJhdGlvbi0+c2V0TWVk aWFLZXlzU3RvcmFnZURpcmVjdG9yeShkZWZhdWx0TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSgp KTsKKyAgICBjb25maWd1cmF0aW9uLT5zZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5 KGRlZmF1bHRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5KCkpOworCisgICAgY29uZmln dXJhdGlvbi0+c2V0SmF2YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJlY3RvcnkoZGVmYXVsdEphdmFT Y3JpcHRDb25maWd1cmF0aW9uRGlyZWN0b3J5KCkpOworCisgICAgcmV0dXJuIGNvbmZpZ3VyYXRp b247Cit9CisKIFJlZjxXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uPiBXZWJz aXRlRGF0YVN0b3JlOjpsZWdhY3lEZWZhdWx0RGF0YVN0b3JlQ29uZmlndXJhdGlvbigpCiB7CiAg ICAgYXV0byBjb25maWd1cmF0aW9uID0gZGVmYXVsdERhdGFTdG9yZUNvbmZpZ3VyYXRpb24oKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9BUElXZWJzaXRl RGF0YVN0b3JlQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvQVBJ V2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCmluZGV4IDM4ODRmNDNjMWUyLi45NmEwM2VlZDgzZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL0FQSVdlYnNpdGVE YXRhU3RvcmVDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev QVBJV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCkBAIC0zMTMsMjYgKzMxMyw0IEBAIFdURjo6U3Ry aW5nIFdlYnNpdGVEYXRhU3RvcmU6OndlYnNpdGVEYXRhRGlyZWN0b3J5RmlsZVN5c3RlbVJlcHJl c2VudGF0aW9uKGNvbnN0CiAgICAgcmV0dXJuIHVybC5hYnNvbHV0ZVVSTC5wYXRoLmZpbGVTeXN0 ZW1SZXByZXNlbnRhdGlvbjsKIH0KIAotUmVmPFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZUNvbmZp Z3VyYXRpb24+IFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHREYXRhU3RvcmVDb25maWd1cmF0aW9u KCkKLXsKLSAgICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmVD b25maWd1cmF0aW9uOjpjcmVhdGUoKTsKLQotICAgIGNvbmZpZ3VyYXRpb24tPnNldEFwcGxpY2F0 aW9uQ2FjaGVEaXJlY3RvcnkoZGVmYXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKSk7Ci0g ICAgY29uZmlndXJhdGlvbi0+c2V0QXBwbGljYXRpb25DYWNoZUZsYXRGaWxlU3ViZGlyZWN0b3J5 TmFtZSgiRmlsZXMiKTsKLSAgICBjb25maWd1cmF0aW9uLT5zZXRDYWNoZVN0b3JhZ2VEaXJlY3Rv cnkoZGVmYXVsdENhY2hlU3RvcmFnZURpcmVjdG9yeSgpKTsKLSAgICBjb25maWd1cmF0aW9uLT5z ZXROZXR3b3JrQ2FjaGVEaXJlY3RvcnkoZGVmYXVsdE5ldHdvcmtDYWNoZURpcmVjdG9yeSgpKTsK LSAgICBjb25maWd1cmF0aW9uLT5zZXRNZWRpYUNhY2hlRGlyZWN0b3J5KGRlZmF1bHRNZWRpYUNh Y2hlRGlyZWN0b3J5KCkpOwotCi0gICAgY29uZmlndXJhdGlvbi0+c2V0SW5kZXhlZERCRGF0YWJh c2VEaXJlY3RvcnkoZGVmYXVsdEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KCkpOwotICAgIGNv bmZpZ3VyYXRpb24tPnNldFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkoZGVmYXVs dFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkoKSk7Ci0gICAgY29uZmlndXJhdGlv bi0+c2V0V2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkoZGVmYXVsdFdlYlNRTERhdGFiYXNlRGlyZWN0 b3J5KCkpOwotICAgIGNvbmZpZ3VyYXRpb24tPnNldExvY2FsU3RvcmFnZURpcmVjdG9yeShkZWZh dWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KCkpOwotICAgIGNvbmZpZ3VyYXRpb24tPnNldE1lZGlh S2V5c1N0b3JhZ2VEaXJlY3RvcnkoZGVmYXVsdE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoKSk7 Ci0gICAgY29uZmlndXJhdGlvbi0+c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeShk ZWZhdWx0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSgpKTsKLSAgICAKLSAgICBjb25m aWd1cmF0aW9uLT5zZXRKYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeShkZWZhdWx0SmF2 YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJlY3RvcnkoKSk7Ci0KLSAgICByZXR1cm4gY29uZmlndXJh dGlvbjsKLX0KLQogfSAvLyBuYW1lc3BhY2UgQVBJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvZ2xpYi9BUElXZWJzaXRlRGF0YVN0b3JlR0xpYi5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9BUElXZWJzaXRlRGF0YVN0b3JlR0xpYi5jcHAKaW5k ZXggZjVhYjkzMWNiZWQuLmQ1NzJjNTQ5MDBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvZ2xpYi9BUElXZWJzaXRlRGF0YVN0b3JlR0xpYi5jcHAKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvQVBJV2Vic2l0ZURhdGFTdG9yZUdMaWIuY3BwCkBA IC0xNzcsMjMgKzE3Nyw0IEBAIFdURjo6U3RyaW5nIFdlYnNpdGVEYXRhU3RvcmU6OmxlZ2FjeURl ZmF1bHRKYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeSgpCiAgICAgcmV0dXJuIEZpbGVT eXN0ZW06OnN0cmluZ0Zyb21GaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oamF2YVNjcmlwdENvcmVD b25maWdEaXJlY3RvcnkuZ2V0KCkpOwogfQogCi1SZWY8V2ViS2l0OjpXZWJzaXRlRGF0YVN0b3Jl Q29uZmlndXJhdGlvbj4gV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9yZUNvbmZpZ3Vy YXRpb24oKQotewotICAgIGF1dG8gY29uZmlndXJhdGlvbiA9IFdlYktpdDo6V2Vic2l0ZURhdGFT dG9yZUNvbmZpZ3VyYXRpb246OmNyZWF0ZSgpOwotCi0gICAgY29uZmlndXJhdGlvbi0+c2V0QXBw bGljYXRpb25DYWNoZURpcmVjdG9yeShkZWZhdWx0QXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSgp KTsKLSAgICBjb25maWd1cmF0aW9uLT5zZXROZXR3b3JrQ2FjaGVEaXJlY3RvcnkoZGVmYXVsdE5l dHdvcmtDYWNoZURpcmVjdG9yeSgpKTsKLQotICAgIGNvbmZpZ3VyYXRpb24tPnNldEluZGV4ZWRE QkRhdGFiYXNlRGlyZWN0b3J5KGRlZmF1bHRJbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSgpKTsK LSAgICBjb25maWd1cmF0aW9uLT5zZXRTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5 KGRlZmF1bHRTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5KCkpOwotICAgIGNvbmZp Z3VyYXRpb24tPnNldFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KGRlZmF1bHRXZWJTUUxEYXRhYmFz ZURpcmVjdG9yeSgpKTsKLSAgICBjb25maWd1cmF0aW9uLT5zZXRMb2NhbFN0b3JhZ2VEaXJlY3Rv cnkoZGVmYXVsdExvY2FsU3RvcmFnZURpcmVjdG9yeSgpKTsKLSAgICBjb25maWd1cmF0aW9uLT5z ZXRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KGRlZmF1bHRNZWRpYUtleXNTdG9yYWdlRGlyZWN0 b3J5KCkpOwotICAgIGNvbmZpZ3VyYXRpb24tPnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJl Y3RvcnkoZGVmYXVsdFJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnkoKSk7Ci0gICAgY29u ZmlndXJhdGlvbi0+c2V0RGV2aWNlSWRIYXNoU2FsdHNTdG9yYWdlRGlyZWN0b3J5KGRlZmF1bHRE ZXZpY2VJZEhhc2hTYWx0c1N0b3JhZ2VEaXJlY3RvcnkoKSk7Ci0KLSAgICByZXR1cm4gY29uZmln dXJhdGlvbjsKLX0KLQogfSAvLyBuYW1lc3BhY2UgQVBJCi0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS93aW4vQVBJV2Vic2l0ZURhdGFTdG9yZVdpbi5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd2luL0FQSVdlYnNpdGVEYXRhU3RvcmVXaW4uY3BwCmlu ZGV4IDMyMjViOTIxNzBkLi5iNWJjMTU1YjdlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL3dpbi9BUElXZWJzaXRlRGF0YVN0b3JlV2luLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvd2luL0FQSVdlYnNpdGVEYXRhU3RvcmVXaW4uY3BwCkBAIC0x MzcsMTggKzEzNyw0IEBAIFN0cmluZyBXZWJzaXRlRGF0YVN0b3JlOjpsZWdhY3lEZWZhdWx0SmF2 YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJlY3RvcnkoKQogICAgIHJldHVybiBGaWxlU3lzdGVtOjpw YXRoQnlBcHBlbmRpbmdDb21wb25lbnQoRmlsZVN5c3RlbTo6bG9jYWxVc2VyU3BlY2lmaWNTdG9y YWdlRGlyZWN0b3J5KCksICJKYXZhU2NyaXB0Q29yZURlYnVnIik7CiB9CiAKLVJlZjxXZWJLaXQ6 OldlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uPiBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0 RGF0YVN0b3JlQ29uZmlndXJhdGlvbigpCi17Ci0gICAgYXV0byBjb25maWd1cmF0aW9uID0gV2Vi S2l0OjpXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbjo6Y3JlYXRlKCk7Ci0KLSAgICBjb25m aWd1cmF0aW9uLT5zZXRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KGRlZmF1bHRBcHBsaWNhdGlv bkNhY2hlRGlyZWN0b3J5KCkpOwotICAgIGNvbmZpZ3VyYXRpb24tPnNldE5ldHdvcmtDYWNoZURp cmVjdG9yeShkZWZhdWx0TmV0d29ya0NhY2hlRGlyZWN0b3J5KCkpOwotICAgIGNvbmZpZ3VyYXRp b24tPnNldFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KGRlZmF1bHRXZWJTUUxEYXRhYmFzZURpcmVj dG9yeSgpKTsKLSAgICBjb25maWd1cmF0aW9uLT5zZXRMb2NhbFN0b3JhZ2VEaXJlY3RvcnkoZGVm YXVsdExvY2FsU3RvcmFnZURpcmVjdG9yeSgpKTsKLSAgICBjb25maWd1cmF0aW9uLT5zZXRNZWRp YUtleXNTdG9yYWdlRGlyZWN0b3J5KGRlZmF1bHRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KCkp OwotICAgIGNvbmZpZ3VyYXRpb24tPnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3Rvcnko ZGVmYXVsdFJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnkoKSk7Ci0KLSAgICByZXR1cm4g Y29uZmlndXJhdGlvbjsKLX0KLQogfSAvLyBuYW1lc3BhY2UgQVBJCg== 363360 2019-03-01 12:46:59 -0800 2019-03-01 13:10:27 -0800 Patch bug-194844.diff text/plain 7496 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggYjRjZjMxODFmYzMuLmE3NGQ3MDBiOTA4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDIyIEBACisyMDE5LTAzLTAxICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+ CisKKyAgICAgICAgVW5pZnkgV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9yZUNvbmZp Z3VyYXRpb24gYWNyb3NzIHBvcnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xOTQ4NDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBNb3ZlIHRoZSBDb2NvYSBpbXBsZW1lbnRhdGlvbiBpbnRvIEFQSVdlYnNp dGVEYXRhU3RvcmUuY3BwIGFzIHRoZSBzb3VyY2Ugb2YgdHJ1dGguIFRoaXMKKyAgICAgICAgd2ls bCBmaXggYSBjcmFzaCBpbiBXaW5kb3dzIGFyb3VuZCBTZXJ2aWNlIFdvcmtlcnMuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0FQSVdlYnNpdGVEYXRhU3RvcmUuY3BwOgorICAgICAgICAoQVBJ OjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0RGF0YVN0b3JlQ29uZmlndXJhdGlvbik6CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9BUElXZWJzaXRlRGF0YVN0b3JlQ29jb2EubW06Cisg ICAgICAgIChBUEk6OldlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHREYXRhU3RvcmVDb25maWd1cmF0 aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2dsaWIvQVBJV2Vic2l0ZURh dGFTdG9yZUdMaWIuY3BwOgorICAgICAgICAoQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0 RGF0YVN0b3JlQ29uZmlndXJhdGlvbik6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL0FQ SS93aW4vQVBJV2Vic2l0ZURhdGFTdG9yZVdpbi5jcHA6CisgICAgICAgIChBUEk6OldlYnNpdGVE YXRhU3RvcmU6OmRlZmF1bHREYXRhU3RvcmVDb25maWd1cmF0aW9uKTogRGVsZXRlZC4KKwogMjAx OS0wMy0wMSAgRG9uIE9sbXN0ZWFkICA8ZG9uLm9sbXN0ZWFkQHNvbnkuY29tPgogCiAgICAgICAg IFtXaW5DYWlyb10gRW5hYmxlIHNlcnZpY2Ugd29ya2VyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQVBJV2Vic2l0ZURhdGFTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQVBJV2Vic2l0ZURhdGFTdG9yZS5jcHAKaW5kZXggMjc5N2M4YzI0MTIu LjExM2U0M2U5MGZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJ V2Vic2l0ZURhdGFTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQ SVdlYnNpdGVEYXRhU3RvcmUuY3BwCkBAIC0xMzMsNiArMTMzLDI4IEBAIFdURjo6U3RyaW5nIFdl YnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRKYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeSgp CiB9CiAjZW5kaWYKIAorUmVmPFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24+ IFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHREYXRhU3RvcmVDb25maWd1cmF0aW9uKCkKK3sKKyAg ICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0 aW9uOjpjcmVhdGUoKTsKKworICAgIGNvbmZpZ3VyYXRpb24tPnNldEFwcGxpY2F0aW9uQ2FjaGVE aXJlY3RvcnkoZGVmYXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKSk7CisgICAgY29uZmln dXJhdGlvbi0+c2V0QXBwbGljYXRpb25DYWNoZUZsYXRGaWxlU3ViZGlyZWN0b3J5TmFtZSgiRmls ZXMiKTsKKyAgICBjb25maWd1cmF0aW9uLT5zZXRDYWNoZVN0b3JhZ2VEaXJlY3RvcnkoZGVmYXVs dENhY2hlU3RvcmFnZURpcmVjdG9yeSgpKTsKKyAgICBjb25maWd1cmF0aW9uLT5zZXROZXR3b3Jr Q2FjaGVEaXJlY3RvcnkoZGVmYXVsdE5ldHdvcmtDYWNoZURpcmVjdG9yeSgpKTsKKyAgICBjb25m aWd1cmF0aW9uLT5zZXRNZWRpYUNhY2hlRGlyZWN0b3J5KGRlZmF1bHRNZWRpYUNhY2hlRGlyZWN0 b3J5KCkpOworCisgICAgY29uZmlndXJhdGlvbi0+c2V0SW5kZXhlZERCRGF0YWJhc2VEaXJlY3Rv cnkoZGVmYXVsdEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KCkpOworICAgIGNvbmZpZ3VyYXRp b24tPnNldFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkoZGVmYXVsdFNlcnZpY2VX b3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkoKSk7CisgICAgY29uZmlndXJhdGlvbi0+c2V0V2Vi U1FMRGF0YWJhc2VEaXJlY3RvcnkoZGVmYXVsdFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KCkpOwor ICAgIGNvbmZpZ3VyYXRpb24tPnNldExvY2FsU3RvcmFnZURpcmVjdG9yeShkZWZhdWx0TG9jYWxT dG9yYWdlRGlyZWN0b3J5KCkpOworICAgIGNvbmZpZ3VyYXRpb24tPnNldE1lZGlhS2V5c1N0b3Jh Z2VEaXJlY3RvcnkoZGVmYXVsdE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoKSk7CisgICAgY29u ZmlndXJhdGlvbi0+c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeShkZWZhdWx0UmVz b3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSgpKTsKKworICAgIGNvbmZpZ3VyYXRpb24tPnNl dEphdmFTY3JpcHRDb25maWd1cmF0aW9uRGlyZWN0b3J5KGRlZmF1bHRKYXZhU2NyaXB0Q29uZmln dXJhdGlvbkRpcmVjdG9yeSgpKTsKKworICAgIHJldHVybiBjb25maWd1cmF0aW9uOworfQorCiBS ZWY8V2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbj4gV2Vic2l0ZURhdGFTdG9y ZTo6bGVnYWN5RGVmYXVsdERhdGFTdG9yZUNvbmZpZ3VyYXRpb24oKQogewogICAgIGF1dG8gY29u ZmlndXJhdGlvbiA9IGRlZmF1bHREYXRhU3RvcmVDb25maWd1cmF0aW9uKCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvQVBJV2Vic2l0ZURhdGFTdG9yZUNv Y29hLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL0FQSVdlYnNpdGVEYXRh U3RvcmVDb2NvYS5tbQppbmRleCAzODg0ZjQzYzFlMi4uOTZhMDNlZWQ4M2QgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9BUElXZWJzaXRlRGF0YVN0b3JlQ29j b2EubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL0FQSVdlYnNpdGVE YXRhU3RvcmVDb2NvYS5tbQpAQCAtMzEzLDI2ICszMTMsNCBAQCBXVEY6OlN0cmluZyBXZWJzaXRl RGF0YVN0b3JlOjp3ZWJzaXRlRGF0YURpcmVjdG9yeUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihj b25zdAogICAgIHJldHVybiB1cmwuYWJzb2x1dGVVUkwucGF0aC5maWxlU3lzdGVtUmVwcmVzZW50 YXRpb247CiB9CiAKLVJlZjxXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uPiBX ZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0RGF0YVN0b3JlQ29uZmlndXJhdGlvbigpCi17Ci0gICAg YXV0byBjb25maWd1cmF0aW9uID0gV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlv bjo6Y3JlYXRlKCk7Ci0KLSAgICBjb25maWd1cmF0aW9uLT5zZXRBcHBsaWNhdGlvbkNhY2hlRGly ZWN0b3J5KGRlZmF1bHRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkpOwotICAgIGNvbmZpZ3Vy YXRpb24tPnNldEFwcGxpY2F0aW9uQ2FjaGVGbGF0RmlsZVN1YmRpcmVjdG9yeU5hbWUoIkZpbGVz Iik7Ci0gICAgY29uZmlndXJhdGlvbi0+c2V0Q2FjaGVTdG9yYWdlRGlyZWN0b3J5KGRlZmF1bHRD YWNoZVN0b3JhZ2VEaXJlY3RvcnkoKSk7Ci0gICAgY29uZmlndXJhdGlvbi0+c2V0TmV0d29ya0Nh Y2hlRGlyZWN0b3J5KGRlZmF1bHROZXR3b3JrQ2FjaGVEaXJlY3RvcnkoKSk7Ci0gICAgY29uZmln dXJhdGlvbi0+c2V0TWVkaWFDYWNoZURpcmVjdG9yeShkZWZhdWx0TWVkaWFDYWNoZURpcmVjdG9y eSgpKTsKLQotICAgIGNvbmZpZ3VyYXRpb24tPnNldEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5 KGRlZmF1bHRJbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSgpKTsKLSAgICBjb25maWd1cmF0aW9u LT5zZXRTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5KGRlZmF1bHRTZXJ2aWNlV29y a2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5KCkpOwotICAgIGNvbmZpZ3VyYXRpb24tPnNldFdlYlNR TERhdGFiYXNlRGlyZWN0b3J5KGRlZmF1bHRXZWJTUUxEYXRhYmFzZURpcmVjdG9yeSgpKTsKLSAg ICBjb25maWd1cmF0aW9uLT5zZXRMb2NhbFN0b3JhZ2VEaXJlY3RvcnkoZGVmYXVsdExvY2FsU3Rv cmFnZURpcmVjdG9yeSgpKTsKLSAgICBjb25maWd1cmF0aW9uLT5zZXRNZWRpYUtleXNTdG9yYWdl RGlyZWN0b3J5KGRlZmF1bHRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KCkpOwotICAgIGNvbmZp Z3VyYXRpb24tPnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnkoZGVmYXVsdFJlc291 cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnkoKSk7Ci0gICAgCi0gICAgY29uZmlndXJhdGlvbi0+ c2V0SmF2YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJlY3RvcnkoZGVmYXVsdEphdmFTY3JpcHRDb25m aWd1cmF0aW9uRGlyZWN0b3J5KCkpOwotCi0gICAgcmV0dXJuIGNvbmZpZ3VyYXRpb247Ci19Ci0K IH0gLy8gbmFtZXNwYWNlIEFQSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL2dsaWIvQVBJV2Vic2l0ZURhdGFTdG9yZUdMaWIuY3BwIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL2dsaWIvQVBJV2Vic2l0ZURhdGFTdG9yZUdMaWIuY3BwCmluZGV4IGY1YWI5MzFj YmVkLi5kNTcyYzU0OTAwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L2dsaWIvQVBJV2Vic2l0ZURhdGFTdG9yZUdMaWIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9nbGliL0FQSVdlYnNpdGVEYXRhU3RvcmVHTGliLmNwcApAQCAtMTc3LDIzICsx NzcsNCBAQCBXVEY6OlN0cmluZyBXZWJzaXRlRGF0YVN0b3JlOjpsZWdhY3lEZWZhdWx0SmF2YVNj cmlwdENvbmZpZ3VyYXRpb25EaXJlY3RvcnkoKQogICAgIHJldHVybiBGaWxlU3lzdGVtOjpzdHJp bmdGcm9tRmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGphdmFTY3JpcHRDb3JlQ29uZmlnRGlyZWN0 b3J5LmdldCgpKTsKIH0KIAotUmVmPFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRp b24+IFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHREYXRhU3RvcmVDb25maWd1cmF0aW9uKCkKLXsK LSAgICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmVDb25maWd1 cmF0aW9uOjpjcmVhdGUoKTsKLQotICAgIGNvbmZpZ3VyYXRpb24tPnNldEFwcGxpY2F0aW9uQ2Fj aGVEaXJlY3RvcnkoZGVmYXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKSk7Ci0gICAgY29u ZmlndXJhdGlvbi0+c2V0TmV0d29ya0NhY2hlRGlyZWN0b3J5KGRlZmF1bHROZXR3b3JrQ2FjaGVE aXJlY3RvcnkoKSk7Ci0KLSAgICBjb25maWd1cmF0aW9uLT5zZXRJbmRleGVkREJEYXRhYmFzZURp cmVjdG9yeShkZWZhdWx0SW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkoKSk7Ci0gICAgY29uZmln dXJhdGlvbi0+c2V0U2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeShkZWZhdWx0U2Vy dmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeSgpKTsKLSAgICBjb25maWd1cmF0aW9uLT5z ZXRXZWJTUUxEYXRhYmFzZURpcmVjdG9yeShkZWZhdWx0V2ViU1FMRGF0YWJhc2VEaXJlY3Rvcnko KSk7Ci0gICAgY29uZmlndXJhdGlvbi0+c2V0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KGRlZmF1bHRM b2NhbFN0b3JhZ2VEaXJlY3RvcnkoKSk7Ci0gICAgY29uZmlndXJhdGlvbi0+c2V0TWVkaWFLZXlz U3RvcmFnZURpcmVjdG9yeShkZWZhdWx0TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSgpKTsKLSAg ICBjb25maWd1cmF0aW9uLT5zZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5KGRlZmF1 bHRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5KCkpOwotICAgIGNvbmZpZ3VyYXRpb24t PnNldERldmljZUlkSGFzaFNhbHRzU3RvcmFnZURpcmVjdG9yeShkZWZhdWx0RGV2aWNlSWRIYXNo U2FsdHNTdG9yYWdlRGlyZWN0b3J5KCkpOwotCi0gICAgcmV0dXJuIGNvbmZpZ3VyYXRpb247Ci19 Ci0KIH0gLy8gbmFtZXNwYWNlIEFQSQotCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvd2luL0FQSVdlYnNpdGVEYXRhU3RvcmVXaW4uY3BwIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL3dpbi9BUElXZWJzaXRlRGF0YVN0b3JlV2luLmNwcAppbmRleCAzMjI1Yjky MTcwZC4uYjViYzE1NWI3ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS93aW4vQVBJV2Vic2l0ZURhdGFTdG9yZVdpbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL3dpbi9BUElXZWJzaXRlRGF0YVN0b3JlV2luLmNwcApAQCAtMTM3LDE4ICsxMzcs NCBAQCBTdHJpbmcgV2Vic2l0ZURhdGFTdG9yZTo6bGVnYWN5RGVmYXVsdEphdmFTY3JpcHRDb25m aWd1cmF0aW9uRGlyZWN0b3J5KCkKICAgICByZXR1cm4gRmlsZVN5c3RlbTo6cGF0aEJ5QXBwZW5k aW5nQ29tcG9uZW50KEZpbGVTeXN0ZW06OmxvY2FsVXNlclNwZWNpZmljU3RvcmFnZURpcmVjdG9y eSgpLCAiSmF2YVNjcmlwdENvcmVEZWJ1ZyIpOwogfQogCi1SZWY8V2ViS2l0OjpXZWJzaXRlRGF0 YVN0b3JlQ29uZmlndXJhdGlvbj4gV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9yZUNv bmZpZ3VyYXRpb24oKQotewotICAgIGF1dG8gY29uZmlndXJhdGlvbiA9IFdlYktpdDo6V2Vic2l0 ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb246OmNyZWF0ZSgpOwotCi0gICAgY29uZmlndXJhdGlvbi0+ c2V0QXBwbGljYXRpb25DYWNoZURpcmVjdG9yeShkZWZhdWx0QXBwbGljYXRpb25DYWNoZURpcmVj dG9yeSgpKTsKLSAgICBjb25maWd1cmF0aW9uLT5zZXROZXR3b3JrQ2FjaGVEaXJlY3RvcnkoZGVm YXVsdE5ldHdvcmtDYWNoZURpcmVjdG9yeSgpKTsKLSAgICBjb25maWd1cmF0aW9uLT5zZXRXZWJT UUxEYXRhYmFzZURpcmVjdG9yeShkZWZhdWx0V2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkoKSk7Ci0g ICAgY29uZmlndXJhdGlvbi0+c2V0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KGRlZmF1bHRMb2NhbFN0 b3JhZ2VEaXJlY3RvcnkoKSk7Ci0gICAgY29uZmlndXJhdGlvbi0+c2V0TWVkaWFLZXlzU3RvcmFn ZURpcmVjdG9yeShkZWZhdWx0TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSgpKTsKLSAgICBjb25m aWd1cmF0aW9uLT5zZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5KGRlZmF1bHRSZXNv dXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5KCkpOwotCi0gICAgcmV0dXJuIGNvbmZpZ3VyYXRp b247Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIEFQSQo= 363363 2019-03-01 13:10:27 -0800 2019-03-01 14:18:27 -0800 Patch bug-194844.diff text/plain 9012 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggYjRjZjMxODFmYzMuLjhkZTQwYTM3MzE4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDI2IEBACisyMDE5LTAzLTAxICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+ CisKKyAgICAgICAgVW5pZnkgV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9yZUNvbmZp Z3VyYXRpb24gYWNyb3NzIHBvcnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xOTQ4NDQKKworICAgICAgICBSZXZpZXdlZCBieSBZb3Vlbm4gRmFibGV0 LgorCisgICAgICAgIE1vdmUgdGhlIENvY29hIGltcGxlbWVudGF0aW9uIGludG8gQVBJV2Vic2l0 ZURhdGFTdG9yZS5jcHAgYXMgdGhlIHNvdXJjZSBvZiB0cnV0aCBhbmQKKyAgICAgICAgYXBwZW5k IGNvbmZpZ3VyYXRpb24gZm9yIEdsaWIncyBEZXZpY2VJZEhhc2hTYWx0cyBzdG9yYWdlIGRpcmVj dG9yeS4gVGhpcyBhbHNvIGZpeGVzCisgICAgICAgIGEgY3Jhc2ggaW4gV2luZG93cyB3aGVuIHJ1 bm5pbmcgYSBTZXJ2aWNlIFdvcmtlci4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJV2Vi c2l0ZURhdGFTdG9yZS5jcHA6CisgICAgICAgIChBUEk6OldlYnNpdGVEYXRhU3RvcmU6OmRlZmF1 bHREZXZpY2VJZEhhc2hTYWx0c1N0b3JhZ2VEaXJlY3RvcnkpOgorICAgICAgICAoQVBJOjpXZWJz aXRlRGF0YVN0b3JlOjpkZWZhdWx0RGF0YVN0b3JlQ29uZmlndXJhdGlvbik6CisgICAgICAgICog VUlQcm9jZXNzL0FQSS9Db2NvYS9BUElXZWJzaXRlRGF0YVN0b3JlQ29jb2EubW06CisgICAgICAg IChBUEk6OldlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHREZXZpY2VJZEhhc2hTYWx0c1N0b3JhZ2VE aXJlY3RvcnkpOiBEZWxldGVkLgorICAgICAgICAoQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZh dWx0RGF0YVN0b3JlQ29uZmlndXJhdGlvbik6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9nbGliL0FQSVdlYnNpdGVEYXRhU3RvcmVHTGliLmNwcDoKKyAgICAgICAgKEFQSTo6V2Vi c2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9yZUNvbmZpZ3VyYXRpb24pOiBEZWxldGVkLgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvd2luL0FQSVdlYnNpdGVEYXRhU3RvcmVXaW4uY3BwOgor ICAgICAgICAoQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0RGV2aWNlSWRIYXNoU2FsdHNT dG9yYWdlRGlyZWN0b3J5KTogRGVsZXRlZC4KKyAgICAgICAgKEFQSTo6V2Vic2l0ZURhdGFTdG9y ZTo6ZGVmYXVsdERhdGFTdG9yZUNvbmZpZ3VyYXRpb24pOiBEZWxldGVkLgorCiAyMDE5LTAzLTAx ICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+CiAKICAgICAgICAgW1dpbkNh aXJvXSBFbmFibGUgc2VydmljZSB3b3JrZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9BUElXZWJzaXRlRGF0YVN0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9BUElXZWJzaXRlRGF0YVN0b3JlLmNwcAppbmRleCAyNzk3YzhjMjQxMi4uZjc0YjJj NWRiOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElXZWJzaXRl RGF0YVN0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJV2Vic2l0 ZURhdGFTdG9yZS5jcHAKQEAgLTEzMyw2ICsxMzMsMzcgQEAgV1RGOjpTdHJpbmcgV2Vic2l0ZURh dGFTdG9yZTo6ZGVmYXVsdEphdmFTY3JpcHRDb25maWd1cmF0aW9uRGlyZWN0b3J5KCkKIH0KICNl bmRpZgogCisjaWYgIVVTRShHTElCKQorV1RGOjpTdHJpbmcgV2Vic2l0ZURhdGFTdG9yZTo6ZGVm YXVsdERldmljZUlkSGFzaFNhbHRzU3RvcmFnZURpcmVjdG9yeSgpCit7CisgICAgLy8gTm90IGlt cGxlbWVudGVkLgorICAgIHJldHVybiBXVEY6OlN0cmluZygpOworfQorI2VuZGlmCisKK1JlZjxX ZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uPiBXZWJzaXRlRGF0YVN0b3JlOjpk ZWZhdWx0RGF0YVN0b3JlQ29uZmlndXJhdGlvbigpCit7CisgICAgYXV0byBjb25maWd1cmF0aW9u ID0gV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbjo6Y3JlYXRlKCk7CisKKyAg ICBjb25maWd1cmF0aW9uLT5zZXRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KGRlZmF1bHRBcHBs aWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkpOworICAgIGNvbmZpZ3VyYXRpb24tPnNldEFwcGxpY2F0 aW9uQ2FjaGVGbGF0RmlsZVN1YmRpcmVjdG9yeU5hbWUoIkZpbGVzIik7CisgICAgY29uZmlndXJh dGlvbi0+c2V0Q2FjaGVTdG9yYWdlRGlyZWN0b3J5KGRlZmF1bHRDYWNoZVN0b3JhZ2VEaXJlY3Rv cnkoKSk7CisgICAgY29uZmlndXJhdGlvbi0+c2V0TmV0d29ya0NhY2hlRGlyZWN0b3J5KGRlZmF1 bHROZXR3b3JrQ2FjaGVEaXJlY3RvcnkoKSk7CisgICAgY29uZmlndXJhdGlvbi0+c2V0TWVkaWFD YWNoZURpcmVjdG9yeShkZWZhdWx0TWVkaWFDYWNoZURpcmVjdG9yeSgpKTsKKworICAgIGNvbmZp Z3VyYXRpb24tPnNldEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KGRlZmF1bHRJbmRleGVkREJE YXRhYmFzZURpcmVjdG9yeSgpKTsKKyAgICBjb25maWd1cmF0aW9uLT5zZXRTZXJ2aWNlV29ya2Vy UmVnaXN0cmF0aW9uRGlyZWN0b3J5KGRlZmF1bHRTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGly ZWN0b3J5KCkpOworICAgIGNvbmZpZ3VyYXRpb24tPnNldFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5 KGRlZmF1bHRXZWJTUUxEYXRhYmFzZURpcmVjdG9yeSgpKTsKKyAgICBjb25maWd1cmF0aW9uLT5z ZXRMb2NhbFN0b3JhZ2VEaXJlY3RvcnkoZGVmYXVsdExvY2FsU3RvcmFnZURpcmVjdG9yeSgpKTsK KyAgICBjb25maWd1cmF0aW9uLT5zZXRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KGRlZmF1bHRN ZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KCkpOworICAgIGNvbmZpZ3VyYXRpb24tPnNldFJlc291 cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnkoZGVmYXVsdFJlc291cmNlTG9hZFN0YXRpc3RpY3NE aXJlY3RvcnkoKSk7CisgICAgY29uZmlndXJhdGlvbi0+c2V0RGV2aWNlSWRIYXNoU2FsdHNTdG9y YWdlRGlyZWN0b3J5KGRlZmF1bHREZXZpY2VJZEhhc2hTYWx0c1N0b3JhZ2VEaXJlY3RvcnkoKSk7 CisKKyAgICBjb25maWd1cmF0aW9uLT5zZXRKYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9y eShkZWZhdWx0SmF2YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJlY3RvcnkoKSk7CisKKyAgICByZXR1 cm4gY29uZmlndXJhdGlvbjsKK30KKwogUmVmPFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZUNvbmZp Z3VyYXRpb24+IFdlYnNpdGVEYXRhU3RvcmU6OmxlZ2FjeURlZmF1bHREYXRhU3RvcmVDb25maWd1 cmF0aW9uKCkKIHsKICAgICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBkZWZhdWx0RGF0YVN0b3JlQ29u ZmlndXJhdGlvbigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL0FQSVdlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9BUElXZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0KaW5kZXggMzg4NGY0M2MxZTIu LjNhZTg4NDUxMTk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvQVBJV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9BUElXZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0KQEAgLTk0LDEyICs5NCw2 IEBAIFdURjo6U3RyaW5nIFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRNZWRpYUtleXNTdG9yYWdl RGlyZWN0b3J5KCkKICAgICByZXR1cm4gd2Vic2l0ZURhdGFEaXJlY3RvcnlGaWxlU3lzdGVtUmVw cmVzZW50YXRpb24oIk1lZGlhS2V5cyIpOwogfQogCi1XVEY6OlN0cmluZyBXZWJzaXRlRGF0YVN0 b3JlOjpkZWZhdWx0RGV2aWNlSWRIYXNoU2FsdHNTdG9yYWdlRGlyZWN0b3J5KCkKLXsKLSAgICAv LyBOb3QgaW1wbGVtZW50ZWQuCi0gICAgcmV0dXJuIFN0cmluZygpOwotfQotCiBXVEY6OlN0cmlu ZyBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0V2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkoKQogewog ICAgIHJldHVybiB3ZWJzaXRlRGF0YURpcmVjdG9yeUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbigi V2ViU1FMIik7CkBAIC0zMTMsMjYgKzMwNyw0IEBAIFdURjo6U3RyaW5nIFdlYnNpdGVEYXRhU3Rv cmU6OndlYnNpdGVEYXRhRGlyZWN0b3J5RmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGNvbnN0CiAg ICAgcmV0dXJuIHVybC5hYnNvbHV0ZVVSTC5wYXRoLmZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbjsK IH0KIAotUmVmPFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24+IFdlYnNpdGVE YXRhU3RvcmU6OmRlZmF1bHREYXRhU3RvcmVDb25maWd1cmF0aW9uKCkKLXsKLSAgICBhdXRvIGNv bmZpZ3VyYXRpb24gPSBXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uOjpjcmVh dGUoKTsKLQotICAgIGNvbmZpZ3VyYXRpb24tPnNldEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3Rvcnko ZGVmYXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKSk7Ci0gICAgY29uZmlndXJhdGlvbi0+ c2V0QXBwbGljYXRpb25DYWNoZUZsYXRGaWxlU3ViZGlyZWN0b3J5TmFtZSgiRmlsZXMiKTsKLSAg ICBjb25maWd1cmF0aW9uLT5zZXRDYWNoZVN0b3JhZ2VEaXJlY3RvcnkoZGVmYXVsdENhY2hlU3Rv cmFnZURpcmVjdG9yeSgpKTsKLSAgICBjb25maWd1cmF0aW9uLT5zZXROZXR3b3JrQ2FjaGVEaXJl Y3RvcnkoZGVmYXVsdE5ldHdvcmtDYWNoZURpcmVjdG9yeSgpKTsKLSAgICBjb25maWd1cmF0aW9u LT5zZXRNZWRpYUNhY2hlRGlyZWN0b3J5KGRlZmF1bHRNZWRpYUNhY2hlRGlyZWN0b3J5KCkpOwot Ci0gICAgY29uZmlndXJhdGlvbi0+c2V0SW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkoZGVmYXVs dEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KCkpOwotICAgIGNvbmZpZ3VyYXRpb24tPnNldFNl cnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkoZGVmYXVsdFNlcnZpY2VXb3JrZXJSZWdp c3RyYXRpb25EaXJlY3RvcnkoKSk7Ci0gICAgY29uZmlndXJhdGlvbi0+c2V0V2ViU1FMRGF0YWJh c2VEaXJlY3RvcnkoZGVmYXVsdFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KCkpOwotICAgIGNvbmZp Z3VyYXRpb24tPnNldExvY2FsU3RvcmFnZURpcmVjdG9yeShkZWZhdWx0TG9jYWxTdG9yYWdlRGly ZWN0b3J5KCkpOwotICAgIGNvbmZpZ3VyYXRpb24tPnNldE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3Rv cnkoZGVmYXVsdE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoKSk7Ci0gICAgY29uZmlndXJhdGlv bi0+c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeShkZWZhdWx0UmVzb3VyY2VMb2Fk U3RhdGlzdGljc0RpcmVjdG9yeSgpKTsKLSAgICAKLSAgICBjb25maWd1cmF0aW9uLT5zZXRKYXZh U2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeShkZWZhdWx0SmF2YVNjcmlwdENvbmZpZ3VyYXRp b25EaXJlY3RvcnkoKSk7Ci0KLSAgICByZXR1cm4gY29uZmlndXJhdGlvbjsKLX0KLQogfSAvLyBu YW1lc3BhY2UgQVBJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xp Yi9BUElXZWJzaXRlRGF0YVN0b3JlR0xpYi5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvZ2xpYi9BUElXZWJzaXRlRGF0YVN0b3JlR0xpYi5jcHAKaW5kZXggZjVhYjkzMWNiZWQuLmQ1 NzJjNTQ5MDBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9B UElXZWJzaXRlRGF0YVN0b3JlR0xpYi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL2dsaWIvQVBJV2Vic2l0ZURhdGFTdG9yZUdMaWIuY3BwCkBAIC0xNzcsMjMgKzE3Nyw0IEBA IFdURjo6U3RyaW5nIFdlYnNpdGVEYXRhU3RvcmU6OmxlZ2FjeURlZmF1bHRKYXZhU2NyaXB0Q29u ZmlndXJhdGlvbkRpcmVjdG9yeSgpCiAgICAgcmV0dXJuIEZpbGVTeXN0ZW06OnN0cmluZ0Zyb21G aWxlU3lzdGVtUmVwcmVzZW50YXRpb24oamF2YVNjcmlwdENvcmVDb25maWdEaXJlY3RvcnkuZ2V0 KCkpOwogfQogCi1SZWY8V2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbj4gV2Vi c2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9yZUNvbmZpZ3VyYXRpb24oKQotewotICAgIGF1 dG8gY29uZmlndXJhdGlvbiA9IFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb246 OmNyZWF0ZSgpOwotCi0gICAgY29uZmlndXJhdGlvbi0+c2V0QXBwbGljYXRpb25DYWNoZURpcmVj dG9yeShkZWZhdWx0QXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSgpKTsKLSAgICBjb25maWd1cmF0 aW9uLT5zZXROZXR3b3JrQ2FjaGVEaXJlY3RvcnkoZGVmYXVsdE5ldHdvcmtDYWNoZURpcmVjdG9y eSgpKTsKLQotICAgIGNvbmZpZ3VyYXRpb24tPnNldEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5 KGRlZmF1bHRJbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSgpKTsKLSAgICBjb25maWd1cmF0aW9u LT5zZXRTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5KGRlZmF1bHRTZXJ2aWNlV29y a2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5KCkpOwotICAgIGNvbmZpZ3VyYXRpb24tPnNldFdlYlNR TERhdGFiYXNlRGlyZWN0b3J5KGRlZmF1bHRXZWJTUUxEYXRhYmFzZURpcmVjdG9yeSgpKTsKLSAg ICBjb25maWd1cmF0aW9uLT5zZXRMb2NhbFN0b3JhZ2VEaXJlY3RvcnkoZGVmYXVsdExvY2FsU3Rv cmFnZURpcmVjdG9yeSgpKTsKLSAgICBjb25maWd1cmF0aW9uLT5zZXRNZWRpYUtleXNTdG9yYWdl RGlyZWN0b3J5KGRlZmF1bHRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KCkpOwotICAgIGNvbmZp Z3VyYXRpb24tPnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnkoZGVmYXVsdFJlc291 cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnkoKSk7Ci0gICAgY29uZmlndXJhdGlvbi0+c2V0RGV2 aWNlSWRIYXNoU2FsdHNTdG9yYWdlRGlyZWN0b3J5KGRlZmF1bHREZXZpY2VJZEhhc2hTYWx0c1N0 b3JhZ2VEaXJlY3RvcnkoKSk7Ci0KLSAgICByZXR1cm4gY29uZmlndXJhdGlvbjsKLX0KLQogfSAv LyBuYW1lc3BhY2UgQVBJCi0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS93aW4vQVBJV2Vic2l0ZURhdGFTdG9yZVdpbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvd2luL0FQSVdlYnNpdGVEYXRhU3RvcmVXaW4uY3BwCmluZGV4IDMyMjViOTIxNzBkLi4y ODdiNzU2YWZlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dpbi9B UElXZWJzaXRlRGF0YVN0b3JlV2luLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvd2luL0FQSVdlYnNpdGVEYXRhU3RvcmVXaW4uY3BwCkBAIC02NSwxMiArNjUsNiBAQCBTdHJp bmcgV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoKQog ICAgIHJldHVybiBGaWxlU3lzdGVtOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQoRmlsZVN5c3Rl bTo6bG9jYWxVc2VyU3BlY2lmaWNTdG9yYWdlRGlyZWN0b3J5KCksICJNZWRpYUtleVN0b3JhZ2Ui KTsKIH0KIAotU3RyaW5nIFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHREZXZpY2VJZEhhc2hTYWx0 c1N0b3JhZ2VEaXJlY3RvcnkoKQotewotICAgIC8vIE5vdCBJbXBsZW1lbnRlZC4KLSAgICByZXR1 cm4gU3RyaW5nKCk7Ci19Ci0KIFN0cmluZyBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0V2ViU1FM RGF0YWJhc2VEaXJlY3RvcnkoKQogewogICAgIHJldHVybiBGaWxlU3lzdGVtOjpwYXRoQnlBcHBl bmRpbmdDb21wb25lbnQoRmlsZVN5c3RlbTo6bG9jYWxVc2VyU3BlY2lmaWNTdG9yYWdlRGlyZWN0 b3J5KCksICJXZWJTUUwiKTsKQEAgLTEzNywxOCArMTMxLDQgQEAgU3RyaW5nIFdlYnNpdGVEYXRh U3RvcmU6OmxlZ2FjeURlZmF1bHRKYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeSgpCiAg ICAgcmV0dXJuIEZpbGVTeXN0ZW06OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChGaWxlU3lzdGVt Ojpsb2NhbFVzZXJTcGVjaWZpY1N0b3JhZ2VEaXJlY3RvcnkoKSwgIkphdmFTY3JpcHRDb3JlRGVi dWciKTsKIH0KIAotUmVmPFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24+IFdl YnNpdGVEYXRhU3RvcmU6OmRlZmF1bHREYXRhU3RvcmVDb25maWd1cmF0aW9uKCkKLXsKLSAgICBh dXRvIGNvbmZpZ3VyYXRpb24gPSBXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9u OjpjcmVhdGUoKTsKLQotICAgIGNvbmZpZ3VyYXRpb24tPnNldEFwcGxpY2F0aW9uQ2FjaGVEaXJl Y3RvcnkoZGVmYXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKSk7Ci0gICAgY29uZmlndXJh dGlvbi0+c2V0TmV0d29ya0NhY2hlRGlyZWN0b3J5KGRlZmF1bHROZXR3b3JrQ2FjaGVEaXJlY3Rv cnkoKSk7Ci0gICAgY29uZmlndXJhdGlvbi0+c2V0V2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkoZGVm YXVsdFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KCkpOwotICAgIGNvbmZpZ3VyYXRpb24tPnNldExv Y2FsU3RvcmFnZURpcmVjdG9yeShkZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KCkpOwotICAg IGNvbmZpZ3VyYXRpb24tPnNldE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoZGVmYXVsdE1lZGlh S2V5c1N0b3JhZ2VEaXJlY3RvcnkoKSk7Ci0gICAgY29uZmlndXJhdGlvbi0+c2V0UmVzb3VyY2VM b2FkU3RhdGlzdGljc0RpcmVjdG9yeShkZWZhdWx0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVj dG9yeSgpKTsKLQotICAgIHJldHVybiBjb25maWd1cmF0aW9uOwotfQotCiB9IC8vIG5hbWVzcGFj ZSBBUEkK