199972 2019-07-19 16:06:48 -0700 Add SPI for setting media cache and key location on _WKWebsiteDataStoreConfiguration 2019-07-23 12:34:17 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen jer.noble webkit-bug-importer oldest_to_newest 1554388 0 achristensen 2019-07-19 16:06:48 -0700 Add SPI for setting media cache and key location on _WKWebsiteDataStoreConfiguration 1554389 1 374518 achristensen 2019-07-19 16:08:12 -0700 Created attachment 374518 Patch 1554753 2 374611 achristensen 2019-07-22 11:22:53 -0700 Created attachment 374611 Patch 1554827 3 374625 achristensen 2019-07-22 13:33:55 -0700 Created attachment 374625 Patch 1554913 4 374651 achristensen 2019-07-22 16:27:56 -0700 Created attachment 374651 Patch 1555098 5 achristensen 2019-07-23 12:29:03 -0700 I verified the test does not time out on Mojave or Catalina. 1555101 6 achristensen 2019-07-23 12:33:07 -0700 http://trac.webkit.org/r247733 1555102 7 webkit-bug-importer 2019-07-23 12:34:17 -0700 <rdar://problem/53458848> 374518 2019-07-19 16:08:12 -0700 2019-07-22 11:22:52 -0700 Patch bug-199972-20190719160811.patch text/plain 10876 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3NjQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQzZWU2YzczZGZlNzc3YTE4 NjdjOWY2YWQyNjAwMGUzMDM3OGVmNzQuLjZkNjY0NTA3MmM0NTQyNDlkNWE5Zjc2MDI1NDI1Yjdm NGU3YzdjYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTktMDctMTkgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBBZGQgU1BJIGZv ciBzZXR0aW5nIG1lZGlhIGNhY2hlIGFuZCBrZXkgbG9jYXRpb24gb24gX1dLV2Vic2l0ZURhdGFT dG9yZUNvbmZpZ3VyYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE5OTk3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRoaXMgaXMgYSBzdGVwIHRvd2FyZHMgcmVtb3ZpbmcgV2Vic2l0ZURhdGFTdG9y ZTo6bGVnYWN5RGVmYXVsdERhdGFTdG9yZUNvbmZpZ3VyYXRpb24KKyAgICAgICAgSSBhZGRlZCBh IHVuaXQgdGVzdCBmb3IgdGhlIG1lZGlhIGNhY2hlIGxvY2F0aW9uLAorICAgICAgICBidXQgdGhl IG1lZGlhIGtleSBsb2NhdGlvbiBjYW4ndCByZWFzb25hYmx5IGJlIHVuaXQgdGVzdGVkIGluIGFu IG9wZW4gc291cmNlIHByb2plY3QuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dL V2Vic2l0ZURhdGFTdG9yZS5tbToKKyAgICAgICAgKC1bV0tXZWJzaXRlRGF0YVN0b3JlIF9pbml0 V2l0aENvbmZpZ3VyYXRpb246XSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tX ZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Q29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24ubW06CisgICAgICAgICgtW19X S1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIG1lZGlhQ2FjaGVEaXJlY3RvcnldKToKKyAg ICAgICAgKC1bX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24gc2V0TWVkaWFDYWNoZURp cmVjdG9yeTpdKToKKyAgICAgICAgKC1bX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24g bWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeV0pOgorICAgICAgICAoLVtfV0tXZWJzaXRlRGF0YVN0 b3JlQ29uZmlndXJhdGlvbiBzZXRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5Ol0pOgorCiAyMDE5 LTA3LTE4ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgRml4IHdhcm5pbmcgd2hlbiBpbXBvcnRpbmcgV2ViS2l0IGluIFN3aWZ0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3Jl Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9y ZS5tbQppbmRleCAyZDEwYTBiN2ZjMGQ1ODU0MDk0MzM0OWZkN2FmMjk4Y2EwMTljMjQ5Li5hZjdj OWM2NDc2MGE0M2I4OWQwNWNkNzU3ZjViNjE3MzE2OGZjMDhmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0KQEAg LTI1Miw2ICsyNTIsMTAgQEAgc3RhdGljIFZlY3RvcjxXZWJLaXQ6OldlYnNpdGVEYXRhUmVjb3Jk PiB0b1dlYnNpdGVEYXRhUmVjb3JkcyhOU0FycmF5ICpkYXRhUmVjb3IKICAgICAgICAgICAgIGNv bmZpZy0+c2V0TmV0d29ya0NhY2hlRGlyZWN0b3J5KGNvbmZpZ3VyYXRpb24ubmV0d29ya0NhY2hl RGlyZWN0b3J5LnBhdGgpOwogICAgICAgICBpZiAoY29uZmlndXJhdGlvbi5kZXZpY2VJZEhhc2hT YWx0c1N0b3JhZ2VEaXJlY3RvcnkpCiAgICAgICAgICAgICBjb25maWctPnNldERldmljZUlkSGFz aFNhbHRzU3RvcmFnZURpcmVjdG9yeShjb25maWd1cmF0aW9uLmRldmljZUlkSGFzaFNhbHRzU3Rv cmFnZURpcmVjdG9yeS5wYXRoKTsKKyAgICAgICAgaWYgKGNvbmZpZ3VyYXRpb24ubWVkaWFDYWNo ZURpcmVjdG9yeSkKKyAgICAgICAgICAgIGNvbmZpZy0+c2V0TWVkaWFDYWNoZURpcmVjdG9yeShj b25maWd1cmF0aW9uLm1lZGlhQ2FjaGVEaXJlY3RvcnkucGF0aCk7CisgICAgICAgIGlmIChjb25m aWd1cmF0aW9uLm1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkpCisgICAgICAgICAgICBjb25maWct PnNldE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoY29uZmlndXJhdGlvbi5tZWRpYUtleXNTdG9y YWdlRGlyZWN0b3J5LnBhdGgpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIFJFTEVBU0VfQVNTRVJU KCFjb25maWd1cmF0aW9uLl93ZWJTdG9yYWdlRGlyZWN0b3J5KTsKICAgICAgICAgUkVMRUFTRV9B U1NFUlQoIWNvbmZpZ3VyYXRpb24uX3dlYlNRTERhdGFiYXNlRGlyZWN0b3J5KTsKQEAgLTI2Miw2 ICsyNjYsOCBAQCBzdGF0aWMgVmVjdG9yPFdlYktpdDo6V2Vic2l0ZURhdGFSZWNvcmQ+IHRvV2Vi c2l0ZURhdGFSZWNvcmRzKE5TQXJyYXkgKmRhdGFSZWNvcgogICAgICAgICBSRUxFQVNFX0FTU0VS VCghY29uZmlndXJhdGlvbi5fc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeSk7CiAg ICAgICAgIFJFTEVBU0VfQVNTRVJUKCFjb25maWd1cmF0aW9uLm5ldHdvcmtDYWNoZURpcmVjdG9y eSk7CiAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCFjb25maWd1cmF0aW9uLmRldmljZUlkSGFzaFNh bHRzU3RvcmFnZURpcmVjdG9yeSk7CisgICAgICAgIFJFTEVBU0VfQVNTRVJUKCFjb25maWd1cmF0 aW9uLm1lZGlhQ2FjaGVEaXJlY3RvcnkpOworICAgICAgICBSRUxFQVNFX0FTU0VSVCghY29uZmln dXJhdGlvbi5tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KTsKICAgICB9CiAKICAgICBpZiAoY29u ZmlndXJhdGlvbi5zb3VyY2VBcHBsaWNhdGlvbkJ1bmRsZUlkZW50aWZpZXIpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZUNv bmZpZ3VyYXRpb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJz aXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5oCmluZGV4IDBkM2NjNjNjNTk5NDU0NmYwNzI4MzNh ZmNhZTg0NWY1NzIwNGE0MWEuLjdlZDc2MTlmNjhmNjkwZGM2YWRiNjYzMjZjMDM4Y2RjZmI1MTM5 ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJz aXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5oCkBAIC01NSw2ICs1 NSw4IEBAIFdLX0NMQVNTX0FWQUlMQUJMRShtYWNvcygxMC4xMyksIGlvcygxMS4wKSkKIEBwcm9w ZXJ0eSAobm9uYXRvbWljLCBjb3B5LCBzZXR0ZXI9X3NldFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRp b25EaXJlY3Rvcnk6KSBOU1VSTCAqX3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3Rvcnkg V0tfQVBJX0FWQUlMQUJMRShtYWNvcygxMC4xMy40KSwgaW9zKDExLjMpKTsKIEBwcm9wZXJ0eSAo bm9uYXRvbWljLCBudWxsYWJsZSwgY29weSkgTlNVUkwgKm5ldHdvcmtDYWNoZURpcmVjdG9yeSBX S19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwogQHBy b3BlcnR5IChub25hdG9taWMsIG51bGxhYmxlLCBjb3B5KSBOU1VSTCAqZGV2aWNlSWRIYXNoU2Fs dHNTdG9yYWdlRGlyZWN0b3J5IFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlv cyhXS19JT1NfVEJBKSk7CitAcHJvcGVydHkgKG5vbmF0b21pYywgbnVsbGFibGUsIGNvcHkpIE5T VVJMICptZWRpYUNhY2hlRGlyZWN0b3J5IFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RC QSksIGlvcyhXS19JT1NfVEJBKSk7CitAcHJvcGVydHkgKG5vbmF0b21pYywgbnVsbGFibGUsIGNv cHkpIE5TVVJMICptZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5IFdLX0FQSV9BVkFJTEFCTEUobWFj b3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CiAKIC8vIFRlc3Rpbmcgb25seS4KIEBw cm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIGFsbExvYWRzQmxvY2tlZEJ5RGV2aWNlTWFuYWdlbWVu dFJlc3RyaWN0aW9uc0ZvclRlc3RpbmcgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJB KSwgaW9zKFdLX0lPU19UQkEpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5tbSBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlv bi5tbQppbmRleCBlOGFlY2JmNmFmYmQ0ZWUxMjc3NjYwM2VkOTlhNjU0ZWQ5MTMyN2Y0Li5jOGZh MzlhNDc1NjhmYmRmYTIyODdlMzQyYzgzYWRmMzgzZTQ2ZmJjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRp b24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVE YXRhU3RvcmVDb25maWd1cmF0aW9uLm1tCkBAIC0yMjMsNiArMjIzLDMyIEBAIHN0YXRpYyB2b2lk IGNoZWNrVVJMQXJndW1lbnQoTlNVUkwgKnVybCkKICAgICBfY29uZmlndXJhdGlvbi0+c2V0U291 cmNlQXBwbGljYXRpb25TZWNvbmRhcnlJZGVudGlmaWVyKGlkZW50aWZpZXIpOwogfQogCistIChO U1VSTCAqKW1lZGlhQ2FjaGVEaXJlY3RvcnkKK3sKKyAgICByZXR1cm4gW05TVVJMIGZpbGVVUkxX aXRoUGF0aDpfY29uZmlndXJhdGlvbi0+bWVkaWFDYWNoZURpcmVjdG9yeSgpIGlzRGlyZWN0b3J5 OllFU107Cit9CisKKy0gKHZvaWQpc2V0TWVkaWFDYWNoZURpcmVjdG9yeTooTlNVUkwgKil1cmwK K3sKKyAgICBpZiAoIV9jb25maWd1cmF0aW9uLT5pc1BlcnNpc3RlbnQoKSkKKyAgICAgICAgW05T RXhjZXB0aW9uIHJhaXNlOk5TSW52YWxpZEFyZ3VtZW50RXhjZXB0aW9uIGZvcm1hdDpAIkNhbm5v dCBzZXQgbWVkaWFDYWNoZURpcmVjdG9yeSBvbiBhIG5vbi1wZXJzaXN0ZW50IF9XS1dlYnNpdGVE YXRhU3RvcmVDb25maWd1cmF0aW9uLiJdOworICAgIGNoZWNrVVJMQXJndW1lbnQodXJsKTsKKyAg ICBfY29uZmlndXJhdGlvbi0+c2V0TWVkaWFDYWNoZURpcmVjdG9yeSh1cmwucGF0aCk7Cit9CisK Ky0gKE5TVVJMICopbWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeQoreworICAgIHJldHVybiBbTlNV UkwgZmlsZVVSTFdpdGhQYXRoOl9jb25maWd1cmF0aW9uLT5tZWRpYUtleXNTdG9yYWdlRGlyZWN0 b3J5KCkgaXNEaXJlY3Rvcnk6WUVTXTsKK30KKworLSAodm9pZClzZXRNZWRpYUtleXNTdG9yYWdl RGlyZWN0b3J5OihOU1VSTCAqKXVybAoreworICAgIGlmICghX2NvbmZpZ3VyYXRpb24tPmlzUGVy c2lzdGVudCgpKQorICAgICAgICBbTlNFeGNlcHRpb24gcmFpc2U6TlNJbnZhbGlkQXJndW1lbnRF eGNlcHRpb24gZm9ybWF0OkAiQ2Fubm90IHNldCBtZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5IG9u IGEgbm9uLXBlcnNpc3RlbnQgX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uIl07Cisg ICAgY2hlY2tVUkxBcmd1bWVudCh1cmwpOworICAgIF9jb25maWd1cmF0aW9uLT5zZXRNZWRpYUtl eXNTdG9yYWdlRGlyZWN0b3J5KHVybC5wYXRoKTsKK30KKwogLSAoQk9PTClkZXZpY2VNYW5hZ2Vt ZW50UmVzdHJpY3Rpb25zRW5hYmxlZAogewogICAgIHJldHVybiBfY29uZmlndXJhdGlvbi0+ZGV2 aWNlTWFuYWdlbWVudFJlc3RyaWN0aW9uc0VuYWJsZWQoKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0No YW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4MmJmNmI0NTdkZTg4NWM2YmY4YTQ0YzAx ZWQ5MDIyMjUwMmNiMjA5Li4yMGNkMTcwYjNjMzUzYjAxMDQyYmJhNmI0MWU4OTk5MTFmOTI1N2U5 IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTMgQEAKKzIwMTktMDctMTkgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5A d2Via2l0Lm9yZz4KKworICAgICAgICBBZGQgU1BJIGZvciBzZXR0aW5nIG1lZGlhIGNhY2hlIGFu ZCBrZXkgbG9jYXRpb24gb24gX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTk3MgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMubW06CisgICAg ICAgIChURVNUKToKKwogMjAxOS0wNy0xOSAgQ2FybG9zIEFsYmVydG8gTG9wZXogUGVyZXogIDxj bG9wZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXVtXUEVdIHJ1bi13ZWJraXQtdGVzdHMg c2hvdWxkIHJ1biB3aXRoIGEgdGVtcG9yYWwgaG9tZWRpcgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMu bW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3Rv cmVDdXN0b21QYXRocy5tbQppbmRleCA1ZjVjYTVlZTkwODk0M2ZkMjU1MWJlMjhhYWNiN2ViYmIx NTYyYzlkLi43NzNjZTE4NGU4YzUyNmRiOGM1MjMxOThlMzE5ZjU1MzQ3MTNlMzUyIDEwMDY0NAot LS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3Rv cmVDdXN0b21QYXRocy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbQpAQCAtNDIsNiArNDIsNyBAQAogI2lt cG9ydCA8V2ViS2l0L19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLmg+CiAjaW1wb3J0 IDx3dGYvRGVxdWUuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KKyNpbXBvcnQgPHd0Zi90 ZXh0L1dURlN0cmluZy5oPgogCiBzdGF0aWMgYm9vbCByZWNlaXZlZFNjcmlwdE1lc3NhZ2U7CiBz dGF0aWMgRGVxdWU8UmV0YWluUHRyPFdLU2NyaXB0TWVzc2FnZT4+IHNjcmlwdE1lc3NhZ2VzOwpA QCAtNTU0LDMgKzU1NSw3MCBAQCBURVNUKFdlYktpdCwgTmV0d29ya0NhY2hlRGlyZWN0b3J5KQog ICAgIFtmaWxlTWFuYWdlciByZW1vdmVJdGVtQXRQYXRoOnBhdGggZXJyb3I6JmVycm9yXTsKICAg ICBFWFBFQ1RfRkFMU0UoZXJyb3IpOwogfQorCitURVNUKFdlYktpdCwgTWVkaWFDYWNoZSkKK3sK KyAgICBib29sIGRvbmUgPSBmYWxzZTsKKyAgICB1c2luZyBuYW1lc3BhY2UgVGVzdFdlYktpdEFQ STsKKyAgICBSZXRhaW5QdHI8TlNEYXRhPiBkYXRhID0gW05TRGF0YSBkYXRhV2l0aENvbnRlbnRz T2ZVUkw6W1tOU0J1bmRsZSBtYWluQnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpAInRlc3QiIHdpdGhF eHRlbnNpb246QCJtcDQiIHN1YmRpcmVjdG9yeTpAIlRlc3RXZWJLaXRBUEkucmVzb3VyY2VzIl1d OworICAgIHVpbnQ2NF90IGRhdGFMZW5ndGggPSBbZGF0YSBsZW5ndGhdOworCisgICAgVENQU2Vy dmVyIHNlcnZlcihbJl0gKGludCBzb2NrZXQpIHsKKyAgICAgICAgVENQU2VydmVyOjpyZWFkKHNv Y2tldCk7CisgICAgICAgIGNvbnN0IGNoYXIqIGZpcnN0UmVzcG9uc2UgPQorICAgICAgICAiSFRU UC8xLjEgMjAwIE9LXHJcbiIKKyAgICAgICAgIkNvbnRlbnQtVHlwZTogdGV4dC9odG1sXHJcbiIK KyAgICAgICAgIkNvbnRlbnQtTGVuZ3RoOiA1NVxyXG5cclxuIgorICAgICAgICAiPHZpZGVvPjxz b3VyY2Ugc3JjPSd0ZXN0Lm1wNCcgdHlwZT0ndmlkZW8vbXA0Jz48L3ZpZGVvPiI7CisgICAgICAg IFRDUFNlcnZlcjo6d3JpdGUoc29ja2V0LCBmaXJzdFJlc3BvbnNlLCBzdHJsZW4oZmlyc3RSZXNw b25zZSkpOworCisgICAgICAgIHdoaWxlICghZG9uZSkgeworICAgICAgICAgICAgYXV0byBieXRl cyA9IFRDUFNlcnZlcjo6cmVhZChzb2NrZXQpOworICAgICAgICAgICAgU3RyaW5nVmlldyByZXF1 ZXN0KHN0YXRpY19jYXN0PGNvbnN0IExDaGFyKj4oYnl0ZXMuZGF0YSgpKSwgYnl0ZXMuc2l6ZSgp KTsKKyAgICAgICAgICAgIFN0cmluZyByYW5nZUJ5dGVzID0gIlJhbmdlOiBieXRlcz0iX3M7Cisg ICAgICAgICAgICBhdXRvIGJlZ2luID0gcmVxdWVzdC5maW5kKFN0cmluZ1ZpZXcocmFuZ2VCeXRl cyksIDApOworICAgICAgICAgICAgQVNTRVJUKGJlZ2luICE9IG5vdEZvdW5kKTsKKyAgICAgICAg ICAgIGF1dG8gZGFzaCA9IHJlcXVlc3QuZmluZCgnLScsIGJlZ2luKTsKKyAgICAgICAgICAgIEFT U0VSVChkYXNoICE9IG5vdEZvdW5kKTsKKyAgICAgICAgICAgIGF1dG8gZW5kID0gcmVxdWVzdC5m aW5kKCdccicsIGRhc2gpOworICAgICAgICAgICAgQVNTRVJUKGVuZCAhPSBub3RGb3VuZCk7CisK KyAgICAgICAgICAgIGF1dG8gcmFuZ2VCZWdpbiA9ICpyZXF1ZXN0LnN1YnN0cmluZyhiZWdpbiAr IHJhbmdlQnl0ZXMubGVuZ3RoKCksIGRhc2ggLSBiZWdpbiAtIHJhbmdlQnl0ZXMubGVuZ3RoKCkp LnRvVUludDY0U3RyaWN0KCk7CisgICAgICAgICAgICBhdXRvIHJhbmdlRW5kID0gKnJlcXVlc3Qu c3Vic3RyaW5nKGRhc2ggKyAxLCBlbmQgLSBkYXNoIC0gMSkudG9VSW50NjRTdHJpY3QoKTsKKwor ICAgICAgICAgICAgTlNTdHJpbmcgKnJlc3BvbnNlSGVhZGVyU3RyaW5nID0gW05TU3RyaW5nIHN0 cmluZ1dpdGhGb3JtYXQ6CisgICAgICAgICAgICAgICAgQCJIVFRQLzEuMSAyMDYgUGFydGlhbCBD b250ZW50XHJcbiIKKyAgICAgICAgICAgICAgICAiQ29udGVudC1SYW5nZTogYnl0ZXMgJWxsdS0l bGx1LyVsbHVcclxuIgorICAgICAgICAgICAgICAgICJDb250ZW50LUxlbmd0aDogJWxsdVxyXG5c clxuIiwKKyAgICAgICAgICAgICAgICByYW5nZUJlZ2luLCByYW5nZUVuZCwgZGF0YUxlbmd0aCwg cmFuZ2VFbmQgLSByYW5nZUJlZ2luXTsKKyAgICAgICAgICAgIE5TRGF0YSAqcmVzcG9uc2VIZWFk ZXIgPSBbcmVzcG9uc2VIZWFkZXJTdHJpbmcgZGF0YVVzaW5nRW5jb2Rpbmc6TlNVVEY4U3RyaW5n RW5jb2RpbmddOworICAgICAgICAgICAgTlNEYXRhICpyZXNwb25zZUJvZHkgPSBbZGF0YSBzdWJk YXRhV2l0aFJhbmdlOk5TTWFrZVJhbmdlKHJhbmdlQmVnaW4sIHJhbmdlRW5kIC0gcmFuZ2VCZWdp bildOworICAgICAgICAgICAgTlNNdXRhYmxlRGF0YSAqcmVzcG9uc2UgPSBbTlNNdXRhYmxlRGF0 YSBkYXRhV2l0aENhcGFjaXR5OnJlc3BvbnNlSGVhZGVyLmxlbmd0aCArIHJlc3BvbnNlQm9keS5s ZW5ndGhdOworICAgICAgICAgICAgW3Jlc3BvbnNlIGFwcGVuZERhdGE6cmVzcG9uc2VIZWFkZXJd OworICAgICAgICAgICAgW3Jlc3BvbnNlIGFwcGVuZERhdGE6cmVzcG9uc2VCb2R5XTsKKyAgICAg ICAgICAgIFRDUFNlcnZlcjo6d3JpdGUoc29ja2V0LCByZXNwb25zZS5ieXRlcywgcmVzcG9uc2Uu bGVuZ3RoKTsKKyAgICAgICAgfQorICAgIH0pOworCisgICAgTlNVUkwgKnRlbXBEaXIgPSBbTlNV UkwgZmlsZVVSTFdpdGhQYXRoOltOU1RlbXBvcmFyeURpcmVjdG9yeSgpIHN0cmluZ0J5QXBwZW5k aW5nUGF0aENvbXBvbmVudDpAIkN1c3RvbVBhdGhzVGVzdCJdIGlzRGlyZWN0b3J5OllFU107Cisg ICAgTlNTdHJpbmcgKnBhdGggPSB0ZW1wRGlyLnBhdGg7CisgICAgTlNGaWxlTWFuYWdlciAqZmls ZU1hbmFnZXIgPSBbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl07CisgICAgRVhQRUNUX0ZB TFNFKFtmaWxlTWFuYWdlciBmaWxlRXhpc3RzQXRQYXRoOnBhdGhdKTsKKworICAgIGF1dG8gd2Vi c2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbX1dLV2Vic2l0ZURhdGFTdG9y ZUNvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbd2Vic2l0ZURhdGFTdG9yZUNvbmZp Z3VyYXRpb24gc2V0TWVkaWFDYWNoZURpcmVjdG9yeTp0ZW1wRGlyXTsKKworICAgIGF1dG8gd2Vi Vmlld0NvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxv Y10gaW5pdF0pOworICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbiBzZXRXZWJzaXRlRGF0YVN0b3Jl OltbW1dLV2Vic2l0ZURhdGFTdG9yZSBhbGxvY10gX2luaXRXaXRoQ29uZmlndXJhdGlvbjp3ZWJz aXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5nZXQoKV0gYXV0b3JlbGVhc2VdXTsKKworICAgIGF1 dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1l Ok5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246d2ViVmlld0NvbmZpZ3Vy YXRpb24uZ2V0KCldKTsKKyAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZFJlcXVlc3Q6W05T VVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpbTlNTdHJpbmcg c3RyaW5nV2l0aEZvcm1hdDpAImh0dHA6Ly8xMjcuMC4wLjE6JWQvIiwgc2VydmVyLnBvcnQoKV1d XV07CisKKyAgICB3aGlsZSAoIVtmaWxlTWFuYWdlciBmaWxlRXhpc3RzQXRQYXRoOnBhdGhdKQor ICAgICAgICBVdGlsOjpzcGluUnVuTG9vcCgpOworCisgICAgTlNFcnJvciAqZXJyb3IgPSBuaWw7 CisgICAgW2ZpbGVNYW5hZ2VyIHJlbW92ZUl0ZW1BdFBhdGg6cGF0aCBlcnJvcjomZXJyb3JdOwor ICAgIEVYUEVDVF9GQUxTRShlcnJvcik7CisgICAgZG9uZSA9IHRydWU7Cit9Cg== 374611 2019-07-22 11:22:53 -0700 2019-07-22 13:33:54 -0700 Patch bug-199972-20190722112253.patch text/plain 11007 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3Njg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM2NTE2NjEyZTgxZmJjM2Q0 OWY1ZjRhNjdhYjYwY2FiNDI4NzliZmQuLjQ0ZGU0ZDY4NWQ0NGRmNDdiZmMzMjkzZTdlOGFlMzE2 MDk1ZGMyNGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTktMDctMjIgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBBZGQgU1BJIGZv ciBzZXR0aW5nIG1lZGlhIGNhY2hlIGFuZCBrZXkgbG9jYXRpb24gb24gX1dLV2Vic2l0ZURhdGFT dG9yZUNvbmZpZ3VyYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE5OTk3MgorCisgICAgICAgIFJldmlld2VkIGJ5IEplciBOb2JsZS4KKworICAg ICAgICBUaGlzIGlzIGEgc3RlcCB0b3dhcmRzIHJlbW92aW5nIFdlYnNpdGVEYXRhU3RvcmU6Omxl Z2FjeURlZmF1bHREYXRhU3RvcmVDb25maWd1cmF0aW9uCisgICAgICAgIEkgYWRkZWQgYSB1bml0 IHRlc3QgZm9yIHRoZSBtZWRpYSBjYWNoZSBsb2NhdGlvbiwKKyAgICAgICAgYnV0IHRoZSBtZWRp YSBrZXkgbG9jYXRpb24gY2FuJ3QgcmVhc29uYWJseSBiZSB1bml0IHRlc3RlZCBpbiBhbiBvcGVu IHNvdXJjZSBwcm9qZWN0LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNp dGVEYXRhU3RvcmUubW06CisgICAgICAgICgtW1dLV2Vic2l0ZURhdGFTdG9yZSBfaW5pdFdpdGhD b25maWd1cmF0aW9uOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0 ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29h L19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLm1tOgorICAgICAgICAoLVtfV0tXZWJz aXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiBtZWRpYUNhY2hlRGlyZWN0b3J5XSk6CisgICAgICAg ICgtW19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIHNldE1lZGlhQ2FjaGVEaXJlY3Rv cnk6XSk6CisgICAgICAgICgtW19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIG1lZGlh S2V5c1N0b3JhZ2VEaXJlY3RvcnldKToKKyAgICAgICAgKC1bX1dLV2Vic2l0ZURhdGFTdG9yZUNv bmZpZ3VyYXRpb24gc2V0TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeTpdKToKKwogMjAxOS0wNy0y MiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAg IEFkZCBTUEkgdG8gX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24gZm9yIGNvbmZpZ3Vy aW5nIGFwcGxpY2F0aW9uIGNhY2hlIHN0b3JhZ2UgbG9jYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0gYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tCmluZGV4 IDUyOGY5ZDliYjgyY2EzOTkxODc1Njc4MTYyYTNiZGRmYTFhMTAwNDAuLmY1ZmM1MjgxZTUxNzA4 M2Y5MzUwOWFlYzU0N2M1ODU2YjU2ZmU4YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0KKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQpAQCAtMjU2LDYgKzI1 NiwxMCBAQCBzdGF0aWMgVmVjdG9yPFdlYktpdDo6V2Vic2l0ZURhdGFSZWNvcmQ+IHRvV2Vic2l0 ZURhdGFSZWNvcmRzKE5TQXJyYXkgKmRhdGFSZWNvcgogICAgICAgICAgICAgY29uZmlnLT5zZXRB cHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KGNvbmZpZ3VyYXRpb24uYXBwbGljYXRpb25DYWNoZURp cmVjdG9yeS5wYXRoKTsKICAgICAgICAgaWYgKGNvbmZpZ3VyYXRpb24uYXBwbGljYXRpb25DYWNo ZUZsYXRGaWxlU3ViZGlyZWN0b3J5TmFtZSkKICAgICAgICAgICAgIGNvbmZpZy0+c2V0QXBwbGlj YXRpb25DYWNoZUZsYXRGaWxlU3ViZGlyZWN0b3J5TmFtZShjb25maWd1cmF0aW9uLmFwcGxpY2F0 aW9uQ2FjaGVGbGF0RmlsZVN1YmRpcmVjdG9yeU5hbWUpOworICAgICAgICBpZiAoY29uZmlndXJh dGlvbi5tZWRpYUNhY2hlRGlyZWN0b3J5KQorICAgICAgICAgICAgY29uZmlnLT5zZXRNZWRpYUNh Y2hlRGlyZWN0b3J5KGNvbmZpZ3VyYXRpb24ubWVkaWFDYWNoZURpcmVjdG9yeS5wYXRoKTsKKyAg ICAgICAgaWYgKGNvbmZpZ3VyYXRpb24ubWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSkKKyAgICAg ICAgICAgIGNvbmZpZy0+c2V0TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeShjb25maWd1cmF0aW9u Lm1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkucGF0aCk7CiAgICAgfSBlbHNlIHsKICAgICAgICAg UkVMRUFTRV9BU1NFUlQoIWNvbmZpZ3VyYXRpb24uX3dlYlN0b3JhZ2VEaXJlY3RvcnkpOwogICAg ICAgICBSRUxFQVNFX0FTU0VSVCghY29uZmlndXJhdGlvbi5fd2ViU1FMRGF0YWJhc2VEaXJlY3Rv cnkpOwpAQCAtMjY3LDYgKzI3MSw4IEBAIHN0YXRpYyBWZWN0b3I8V2ViS2l0OjpXZWJzaXRlRGF0 YVJlY29yZD4gdG9XZWJzaXRlRGF0YVJlY29yZHMoTlNBcnJheSAqZGF0YVJlY29yCiAgICAgICAg IFJFTEVBU0VfQVNTRVJUKCFjb25maWd1cmF0aW9uLm5ldHdvcmtDYWNoZURpcmVjdG9yeSk7CiAg ICAgICAgIFJFTEVBU0VfQVNTRVJUKCFjb25maWd1cmF0aW9uLmRldmljZUlkSGFzaFNhbHRzU3Rv cmFnZURpcmVjdG9yeSk7CiAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCFjb25maWd1cmF0aW9uLmFw cGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkpOworICAgICAgICBSRUxFQVNFX0FTU0VSVCghY29uZmln dXJhdGlvbi5tZWRpYUNhY2hlRGlyZWN0b3J5KTsKKyAgICAgICAgUkVMRUFTRV9BU1NFUlQoIWNv bmZpZ3VyYXRpb24ubWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSk7CiAgICAgfQogCiAgICAgaWYg KGNvbmZpZ3VyYXRpb24uc291cmNlQXBwbGljYXRpb25CdW5kbGVJZGVudGlmaWVyKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3Rv cmVDb25maWd1cmF0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dL V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaAppbmRleCBjODhmYzg4YWU4NjQ0MTIyNWUx MzEwMmFmYTU0NzRjMTE3ZTkyMGY1Li5jOWVkNTEyOTEyNzI1MDk0ZDgxMWE2MmVkZjJlNTA3ZTZh ODJmNjA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dL V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaApAQCAtNTcs NiArNTcsOCBAQCBXS19DTEFTU19BVkFJTEFCTEUobWFjb3MoMTAuMTMpLCBpb3MoMTEuMCkpCiBA cHJvcGVydHkgKG5vbmF0b21pYywgbnVsbGFibGUsIGNvcHkpIE5TVVJMICpkZXZpY2VJZEhhc2hT YWx0c1N0b3JhZ2VEaXJlY3RvcnkgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwg aW9zKFdLX0lPU19UQkEpKTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxsYWJsZSwgY29weSkg TlNVUkwgKmFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhX S19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxs YWJsZSwgY29weSkgTlNTdHJpbmcgKmFwcGxpY2F0aW9uQ2FjaGVGbGF0RmlsZVN1YmRpcmVjdG9y eU5hbWUgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEp KTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxsYWJsZSwgY29weSkgTlNVUkwgKm1lZGlhQ2Fj aGVEaXJlY3RvcnkgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwgaW9zKFdLX0lP U19UQkEpKTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxsYWJsZSwgY29weSkgTlNVUkwgKm1l ZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJB KSwgaW9zKFdLX0lPU19UQkEpKTsKIAogLy8gVGVzdGluZyBvbmx5LgogQHByb3BlcnR5IChub25h dG9taWMpIEJPT0wgYWxsTG9hZHNCbG9ja2VkQnlEZXZpY2VNYW5hZ2VtZW50UmVzdHJpY3Rpb25z Rm9yVGVzdGluZyBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9T X1RCQSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19X S1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLm1tCmluZGV4IGVm MWVkOTFkM2NmY2UzMWM1NzUzZjE1ZWRkZTQ5YzZlN2VlNzcxMDIuLjgyNWMxOGY2MzQ5ZDQ2MTg2 Y2FlMzEyNDdkNzYzN2JlMzU4MWMxZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZp Z3VyYXRpb24ubW0KQEAgLTI0OCw2ICsyNDgsMzIgQEAgc3RhdGljIHZvaWQgY2hlY2tVUkxBcmd1 bWVudChOU1VSTCAqdXJsKQogICAgIF9jb25maWd1cmF0aW9uLT5zZXRBcHBsaWNhdGlvbkNhY2hl RmxhdEZpbGVTdWJkaXJlY3RvcnlOYW1lKG5hbWUpOwogfQogCistIChOU1VSTCAqKW1lZGlhQ2Fj aGVEaXJlY3RvcnkKK3sKKyAgICByZXR1cm4gW05TVVJMIGZpbGVVUkxXaXRoUGF0aDpfY29uZmln dXJhdGlvbi0+bWVkaWFDYWNoZURpcmVjdG9yeSgpIGlzRGlyZWN0b3J5OllFU107Cit9CisKKy0g KHZvaWQpc2V0TWVkaWFDYWNoZURpcmVjdG9yeTooTlNVUkwgKil1cmwKK3sKKyAgICBpZiAoIV9j b25maWd1cmF0aW9uLT5pc1BlcnNpc3RlbnQoKSkKKyAgICAgICAgW05TRXhjZXB0aW9uIHJhaXNl Ok5TSW52YWxpZEFyZ3VtZW50RXhjZXB0aW9uIGZvcm1hdDpAIkNhbm5vdCBzZXQgbWVkaWFDYWNo ZURpcmVjdG9yeSBvbiBhIG5vbi1wZXJzaXN0ZW50IF9XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1 cmF0aW9uLiJdOworICAgIGNoZWNrVVJMQXJndW1lbnQodXJsKTsKKyAgICBfY29uZmlndXJhdGlv bi0+c2V0TWVkaWFDYWNoZURpcmVjdG9yeSh1cmwucGF0aCk7Cit9CisKKy0gKE5TVVJMICopbWVk aWFLZXlzU3RvcmFnZURpcmVjdG9yeQoreworICAgIHJldHVybiBbTlNVUkwgZmlsZVVSTFdpdGhQ YXRoOl9jb25maWd1cmF0aW9uLT5tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KCkgaXNEaXJlY3Rv cnk6WUVTXTsKK30KKworLSAodm9pZClzZXRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5OihOU1VS TCAqKXVybAoreworICAgIGlmICghX2NvbmZpZ3VyYXRpb24tPmlzUGVyc2lzdGVudCgpKQorICAg ICAgICBbTlNFeGNlcHRpb24gcmFpc2U6TlNJbnZhbGlkQXJndW1lbnRFeGNlcHRpb24gZm9ybWF0 OkAiQ2Fubm90IHNldCBtZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5IG9uIGEgbm9uLXBlcnNpc3Rl bnQgX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uIl07CisgICAgY2hlY2tVUkxBcmd1 bWVudCh1cmwpOworICAgIF9jb25maWd1cmF0aW9uLT5zZXRNZWRpYUtleXNTdG9yYWdlRGlyZWN0 b3J5KHVybC5wYXRoKTsKK30KKwogLSAoQk9PTClkZXZpY2VNYW5hZ2VtZW50UmVzdHJpY3Rpb25z RW5hYmxlZAogewogICAgIHJldHVybiBfY29uZmlndXJhdGlvbi0+ZGV2aWNlTWFuYWdlbWVudFJl c3RyaWN0aW9uc0VuYWJsZWQoKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xz L0NoYW5nZUxvZwppbmRleCAyNWQ1ZGIxOWJhMzQ3YTMwYzgwMmNhYzYwMDljM2U4ZTQ3ODM0Yjcw Li5mY2FjOTZkMjQ2OTJkNWQyOWQyZjRlZmFiYzY5MDc5MGQwZmY5OTUzIDEwMDY0NAotLS0gYS9U b29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MTktMDctMjIgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKwor ICAgICAgICBBZGQgU1BJIGZvciBzZXR0aW5nIG1lZGlhIGNhY2hlIGFuZCBrZXkgbG9jYXRpb24g b24gX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTk3MgorCisgICAgICAgIFJldmlld2VkIGJ5 IEplciBOb2JsZS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev V2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tOgorICAgICAgICAoVEVTVCk6CisKIDIwMTkt MDctMjIgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAg ICAgICBBZGQgU1BJIHRvIF9XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIGZvciBjb25m aWd1cmluZyBhcHBsaWNhdGlvbiBjYWNoZSBzdG9yYWdlIGxvY2F0aW9uCmRpZmYgLS1naXQgYS9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0 b21QYXRocy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0 ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tCmluZGV4IDAzMGNkZWFlYTg5MGYwOGQ3MmQyODAwYzM3 YmYwZDNkNDU0OTFmNTAuLjRjNTllZjI0NTJlMzRlODUyYWZhM2U2NTI5ZDllNTg3NjA4OTIxMjUg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0 ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tCkBAIC00Miw2ICs0Miw3 IEBACiAjaW1wb3J0IDxXZWJLaXQvX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaD4K ICNpbXBvcnQgPHd0Zi9EZXF1ZS5oPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgorI2ltcG9y dCA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKIHN0YXRpYyBib29sIHJlY2VpdmVkU2NyaXB0TWVz c2FnZTsKIHN0YXRpYyBEZXF1ZTxSZXRhaW5QdHI8V0tTY3JpcHRNZXNzYWdlPj4gc2NyaXB0TWVz c2FnZXM7CkBAIC02MTEsMyArNjEyLDcyIEBAIFRFU1QoV2ViS2l0LCBBcHBsaWNhdGlvbkNhY2hl RGlyZWN0b3JpZXMpCiAgICAgW2ZpbGVNYW5hZ2VyIHJlbW92ZUl0ZW1BdFBhdGg6cGF0aCBlcnJv cjomZXJyb3JdOwogICAgIEVYUEVDVF9GQUxTRShlcnJvcik7CiB9CisKK1RFU1QoV2ViS2l0LCBN ZWRpYUNhY2hlKQoreworICAgIHN0ZDo6YXRvbWljPGJvb2w+IGRvbmUgPSBmYWxzZTsKKyAgICB1 c2luZyBuYW1lc3BhY2UgVGVzdFdlYktpdEFQSTsKKyAgICBSZXRhaW5QdHI8TlNEYXRhPiBkYXRh ID0gW05TRGF0YSBkYXRhV2l0aENvbnRlbnRzT2ZVUkw6W1tOU0J1bmRsZSBtYWluQnVuZGxlXSBV UkxGb3JSZXNvdXJjZTpAInRlc3QiIHdpdGhFeHRlbnNpb246QCJtcDQiIHN1YmRpcmVjdG9yeTpA IlRlc3RXZWJLaXRBUEkucmVzb3VyY2VzIl1dOworICAgIHVpbnQ2NF90IGRhdGFMZW5ndGggPSBb ZGF0YSBsZW5ndGhdOworCisgICAgVENQU2VydmVyIHNlcnZlcihbJl0gKGludCBzb2NrZXQpIHsK KyAgICAgICAgVENQU2VydmVyOjpyZWFkKHNvY2tldCk7CisgICAgICAgIGNvbnN0IGNoYXIqIGZp cnN0UmVzcG9uc2UgPQorICAgICAgICAiSFRUUC8xLjEgMjAwIE9LXHJcbiIKKyAgICAgICAgIkNv bnRlbnQtVHlwZTogdGV4dC9odG1sXHJcbiIKKyAgICAgICAgIkNvbnRlbnQtTGVuZ3RoOiA1NVxy XG5cclxuIgorICAgICAgICAiPHZpZGVvPjxzb3VyY2Ugc3JjPSd0ZXN0Lm1wNCcgdHlwZT0ndmlk ZW8vbXA0Jz48L3ZpZGVvPiI7CisgICAgICAgIFRDUFNlcnZlcjo6d3JpdGUoc29ja2V0LCBmaXJz dFJlc3BvbnNlLCBzdHJsZW4oZmlyc3RSZXNwb25zZSkpOworCisgICAgICAgIHdoaWxlICghZG9u ZSkgeworICAgICAgICAgICAgYXV0byBieXRlcyA9IFRDUFNlcnZlcjo6cmVhZChzb2NrZXQpOwor ICAgICAgICAgICAgU3RyaW5nVmlldyByZXF1ZXN0KHN0YXRpY19jYXN0PGNvbnN0IExDaGFyKj4o Ynl0ZXMuZGF0YSgpKSwgYnl0ZXMuc2l6ZSgpKTsKKyAgICAgICAgICAgIFN0cmluZyByYW5nZUJ5 dGVzID0gIlJhbmdlOiBieXRlcz0iX3M7CisgICAgICAgICAgICBhdXRvIGJlZ2luID0gcmVxdWVz dC5maW5kKFN0cmluZ1ZpZXcocmFuZ2VCeXRlcyksIDApOworICAgICAgICAgICAgQVNTRVJUKGJl Z2luICE9IG5vdEZvdW5kKTsKKyAgICAgICAgICAgIGF1dG8gZGFzaCA9IHJlcXVlc3QuZmluZCgn LScsIGJlZ2luKTsKKyAgICAgICAgICAgIEFTU0VSVChkYXNoICE9IG5vdEZvdW5kKTsKKyAgICAg ICAgICAgIGF1dG8gZW5kID0gcmVxdWVzdC5maW5kKCdccicsIGRhc2gpOworICAgICAgICAgICAg QVNTRVJUKGVuZCAhPSBub3RGb3VuZCk7CisKKyAgICAgICAgICAgIGF1dG8gcmFuZ2VCZWdpbiA9 ICpyZXF1ZXN0LnN1YnN0cmluZyhiZWdpbiArIHJhbmdlQnl0ZXMubGVuZ3RoKCksIGRhc2ggLSBi ZWdpbiAtIHJhbmdlQnl0ZXMubGVuZ3RoKCkpLnRvVUludDY0U3RyaWN0KCk7CisgICAgICAgICAg ICBhdXRvIHJhbmdlRW5kID0gKnJlcXVlc3Quc3Vic3RyaW5nKGRhc2ggKyAxLCBlbmQgLSBkYXNo IC0gMSkudG9VSW50NjRTdHJpY3QoKTsKKworICAgICAgICAgICAgTlNTdHJpbmcgKnJlc3BvbnNl SGVhZGVyU3RyaW5nID0gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6CisgICAgICAgICAgICAg ICAgQCJIVFRQLzEuMSAyMDYgUGFydGlhbCBDb250ZW50XHJcbiIKKyAgICAgICAgICAgICAgICAi Q29udGVudC1SYW5nZTogYnl0ZXMgJWxsdS0lbGx1LyVsbHVcclxuIgorICAgICAgICAgICAgICAg ICJDb250ZW50LUxlbmd0aDogJWxsdVxyXG5cclxuIiwKKyAgICAgICAgICAgICAgICByYW5nZUJl Z2luLCByYW5nZUVuZCwgZGF0YUxlbmd0aCwgcmFuZ2VFbmQgLSByYW5nZUJlZ2luXTsKKyAgICAg ICAgICAgIE5TRGF0YSAqcmVzcG9uc2VIZWFkZXIgPSBbcmVzcG9uc2VIZWFkZXJTdHJpbmcgZGF0 YVVzaW5nRW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmddOworICAgICAgICAgICAgTlNEYXRh ICpyZXNwb25zZUJvZHkgPSBbZGF0YSBzdWJkYXRhV2l0aFJhbmdlOk5TTWFrZVJhbmdlKHJhbmdl QmVnaW4sIHJhbmdlRW5kIC0gcmFuZ2VCZWdpbildOworICAgICAgICAgICAgTlNNdXRhYmxlRGF0 YSAqcmVzcG9uc2UgPSBbTlNNdXRhYmxlRGF0YSBkYXRhV2l0aENhcGFjaXR5OnJlc3BvbnNlSGVh ZGVyLmxlbmd0aCArIHJlc3BvbnNlQm9keS5sZW5ndGhdOworICAgICAgICAgICAgW3Jlc3BvbnNl IGFwcGVuZERhdGE6cmVzcG9uc2VIZWFkZXJdOworICAgICAgICAgICAgW3Jlc3BvbnNlIGFwcGVu ZERhdGE6cmVzcG9uc2VCb2R5XTsKKyAgICAgICAgICAgIGlmIChkb25lKQorICAgICAgICAgICAg ICAgIGJyZWFrOworICAgICAgICAgICAgVENQU2VydmVyOjp3cml0ZShzb2NrZXQsIHJlc3BvbnNl LmJ5dGVzLCByZXNwb25zZS5sZW5ndGgpOworICAgICAgICB9CisgICAgfSk7CisKKyAgICBOU1VS TCAqdGVtcERpciA9IFtOU1VSTCBmaWxlVVJMV2l0aFBhdGg6W05TVGVtcG9yYXJ5RGlyZWN0b3J5 KCkgc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiQ3VzdG9tUGF0aHNUZXN0Il0gaXNE aXJlY3Rvcnk6WUVTXTsKKyAgICBOU1N0cmluZyAqcGF0aCA9IHRlbXBEaXIucGF0aDsKKyAgICBO U0ZpbGVNYW5hZ2VyICpmaWxlTWFuYWdlciA9IFtOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2Vy XTsKKyAgICBFWFBFQ1RfRkFMU0UoW2ZpbGVNYW5hZ2VyIGZpbGVFeGlzdHNBdFBhdGg6cGF0aF0p OworCisgICAgYXV0byB3ZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tf V0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJz aXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiBzZXRNZWRpYUNhY2hlRGlyZWN0b3J5OnRlbXBEaXJd OworCisgICAgYXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdD b25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXdDb25maWd1cmF0aW9uIHNl dFdlYnNpdGVEYXRhU3RvcmU6W1tbV0tXZWJzaXRlRGF0YVN0b3JlIGFsbG9jXSBfaW5pdFdpdGhD b25maWd1cmF0aW9uOndlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLmdldCgpXSBhdXRvcmVs ZWFzZV1dOworCisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxs b2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlv bjp3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIFt3ZWJWaWV3IHN5bmNocm9ub3Vz bHlMb2FkUmVxdWVzdDpbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRo U3RyaW5nOltOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiaHR0cDovLzEyNy4wLjAuMTolZC8i LCBzZXJ2ZXIucG9ydCgpXV1dXTsKKworICAgIHdoaWxlICghW2ZpbGVNYW5hZ2VyIGZpbGVFeGlz dHNBdFBhdGg6cGF0aF0pCisgICAgICAgIFV0aWw6OnNwaW5SdW5Mb29wKCk7CisKKyAgICBOU0Vy cm9yICplcnJvciA9IG5pbDsKKyAgICBbZmlsZU1hbmFnZXIgcmVtb3ZlSXRlbUF0UGF0aDpwYXRo IGVycm9yOiZlcnJvcl07CisgICAgRVhQRUNUX0ZBTFNFKGVycm9yKTsKKyAgICBkb25lID0gdHJ1 ZTsKK30K 374625 2019-07-22 13:33:55 -0700 2019-07-22 16:27:55 -0700 Patch bug-199972-20190722133354.patch text/plain 12103 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3Njg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM2NTE2NjEyZTgxZmJjM2Q0 OWY1ZjRhNjdhYjYwY2FiNDI4NzliZmQuLjQ0ZGU0ZDY4NWQ0NGRmNDdiZmMzMjkzZTdlOGFlMzE2 MDk1ZGMyNGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTktMDctMjIgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBBZGQgU1BJIGZv ciBzZXR0aW5nIG1lZGlhIGNhY2hlIGFuZCBrZXkgbG9jYXRpb24gb24gX1dLV2Vic2l0ZURhdGFT dG9yZUNvbmZpZ3VyYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE5OTk3MgorCisgICAgICAgIFJldmlld2VkIGJ5IEplciBOb2JsZS4KKworICAg ICAgICBUaGlzIGlzIGEgc3RlcCB0b3dhcmRzIHJlbW92aW5nIFdlYnNpdGVEYXRhU3RvcmU6Omxl Z2FjeURlZmF1bHREYXRhU3RvcmVDb25maWd1cmF0aW9uCisgICAgICAgIEkgYWRkZWQgYSB1bml0 IHRlc3QgZm9yIHRoZSBtZWRpYSBjYWNoZSBsb2NhdGlvbiwKKyAgICAgICAgYnV0IHRoZSBtZWRp YSBrZXkgbG9jYXRpb24gY2FuJ3QgcmVhc29uYWJseSBiZSB1bml0IHRlc3RlZCBpbiBhbiBvcGVu IHNvdXJjZSBwcm9qZWN0LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNp dGVEYXRhU3RvcmUubW06CisgICAgICAgICgtW1dLV2Vic2l0ZURhdGFTdG9yZSBfaW5pdFdpdGhD b25maWd1cmF0aW9uOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0 ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29h L19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLm1tOgorICAgICAgICAoLVtfV0tXZWJz aXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiBtZWRpYUNhY2hlRGlyZWN0b3J5XSk6CisgICAgICAg ICgtW19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIHNldE1lZGlhQ2FjaGVEaXJlY3Rv cnk6XSk6CisgICAgICAgICgtW19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIG1lZGlh S2V5c1N0b3JhZ2VEaXJlY3RvcnldKToKKyAgICAgICAgKC1bX1dLV2Vic2l0ZURhdGFTdG9yZUNv bmZpZ3VyYXRpb24gc2V0TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeTpdKToKKwogMjAxOS0wNy0y MiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAg IEFkZCBTUEkgdG8gX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24gZm9yIGNvbmZpZ3Vy aW5nIGFwcGxpY2F0aW9uIGNhY2hlIHN0b3JhZ2UgbG9jYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0gYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tCmluZGV4 IDUyOGY5ZDliYjgyY2EzOTkxODc1Njc4MTYyYTNiZGRmYTFhMTAwNDAuLmY1ZmM1MjgxZTUxNzA4 M2Y5MzUwOWFlYzU0N2M1ODU2YjU2ZmU4YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0KKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQpAQCAtMjU2LDYgKzI1 NiwxMCBAQCBzdGF0aWMgVmVjdG9yPFdlYktpdDo6V2Vic2l0ZURhdGFSZWNvcmQ+IHRvV2Vic2l0 ZURhdGFSZWNvcmRzKE5TQXJyYXkgKmRhdGFSZWNvcgogICAgICAgICAgICAgY29uZmlnLT5zZXRB cHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KGNvbmZpZ3VyYXRpb24uYXBwbGljYXRpb25DYWNoZURp cmVjdG9yeS5wYXRoKTsKICAgICAgICAgaWYgKGNvbmZpZ3VyYXRpb24uYXBwbGljYXRpb25DYWNo ZUZsYXRGaWxlU3ViZGlyZWN0b3J5TmFtZSkKICAgICAgICAgICAgIGNvbmZpZy0+c2V0QXBwbGlj YXRpb25DYWNoZUZsYXRGaWxlU3ViZGlyZWN0b3J5TmFtZShjb25maWd1cmF0aW9uLmFwcGxpY2F0 aW9uQ2FjaGVGbGF0RmlsZVN1YmRpcmVjdG9yeU5hbWUpOworICAgICAgICBpZiAoY29uZmlndXJh dGlvbi5tZWRpYUNhY2hlRGlyZWN0b3J5KQorICAgICAgICAgICAgY29uZmlnLT5zZXRNZWRpYUNh Y2hlRGlyZWN0b3J5KGNvbmZpZ3VyYXRpb24ubWVkaWFDYWNoZURpcmVjdG9yeS5wYXRoKTsKKyAg ICAgICAgaWYgKGNvbmZpZ3VyYXRpb24ubWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSkKKyAgICAg ICAgICAgIGNvbmZpZy0+c2V0TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeShjb25maWd1cmF0aW9u Lm1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkucGF0aCk7CiAgICAgfSBlbHNlIHsKICAgICAgICAg UkVMRUFTRV9BU1NFUlQoIWNvbmZpZ3VyYXRpb24uX3dlYlN0b3JhZ2VEaXJlY3RvcnkpOwogICAg ICAgICBSRUxFQVNFX0FTU0VSVCghY29uZmlndXJhdGlvbi5fd2ViU1FMRGF0YWJhc2VEaXJlY3Rv cnkpOwpAQCAtMjY3LDYgKzI3MSw4IEBAIHN0YXRpYyBWZWN0b3I8V2ViS2l0OjpXZWJzaXRlRGF0 YVJlY29yZD4gdG9XZWJzaXRlRGF0YVJlY29yZHMoTlNBcnJheSAqZGF0YVJlY29yCiAgICAgICAg IFJFTEVBU0VfQVNTRVJUKCFjb25maWd1cmF0aW9uLm5ldHdvcmtDYWNoZURpcmVjdG9yeSk7CiAg ICAgICAgIFJFTEVBU0VfQVNTRVJUKCFjb25maWd1cmF0aW9uLmRldmljZUlkSGFzaFNhbHRzU3Rv cmFnZURpcmVjdG9yeSk7CiAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCFjb25maWd1cmF0aW9uLmFw cGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkpOworICAgICAgICBSRUxFQVNFX0FTU0VSVCghY29uZmln dXJhdGlvbi5tZWRpYUNhY2hlRGlyZWN0b3J5KTsKKyAgICAgICAgUkVMRUFTRV9BU1NFUlQoIWNv bmZpZ3VyYXRpb24ubWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSk7CiAgICAgfQogCiAgICAgaWYg KGNvbmZpZ3VyYXRpb24uc291cmNlQXBwbGljYXRpb25CdW5kbGVJZGVudGlmaWVyKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3Rv cmVDb25maWd1cmF0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dL V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaAppbmRleCBjODhmYzg4YWU4NjQ0MTIyNWUx MzEwMmFmYTU0NzRjMTE3ZTkyMGY1Li5jOWVkNTEyOTEyNzI1MDk0ZDgxMWE2MmVkZjJlNTA3ZTZh ODJmNjA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dL V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaApAQCAtNTcs NiArNTcsOCBAQCBXS19DTEFTU19BVkFJTEFCTEUobWFjb3MoMTAuMTMpLCBpb3MoMTEuMCkpCiBA cHJvcGVydHkgKG5vbmF0b21pYywgbnVsbGFibGUsIGNvcHkpIE5TVVJMICpkZXZpY2VJZEhhc2hT YWx0c1N0b3JhZ2VEaXJlY3RvcnkgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwg aW9zKFdLX0lPU19UQkEpKTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxsYWJsZSwgY29weSkg TlNVUkwgKmFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhX S19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxs YWJsZSwgY29weSkgTlNTdHJpbmcgKmFwcGxpY2F0aW9uQ2FjaGVGbGF0RmlsZVN1YmRpcmVjdG9y eU5hbWUgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEp KTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxsYWJsZSwgY29weSkgTlNVUkwgKm1lZGlhQ2Fj aGVEaXJlY3RvcnkgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwgaW9zKFdLX0lP U19UQkEpKTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxsYWJsZSwgY29weSkgTlNVUkwgKm1l ZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJB KSwgaW9zKFdLX0lPU19UQkEpKTsKIAogLy8gVGVzdGluZyBvbmx5LgogQHByb3BlcnR5IChub25h dG9taWMpIEJPT0wgYWxsTG9hZHNCbG9ja2VkQnlEZXZpY2VNYW5hZ2VtZW50UmVzdHJpY3Rpb25z Rm9yVGVzdGluZyBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9T X1RCQSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19X S1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLm1tCmluZGV4IGVm MWVkOTFkM2NmY2UzMWM1NzUzZjE1ZWRkZTQ5YzZlN2VlNzcxMDIuLjgyNWMxOGY2MzQ5ZDQ2MTg2 Y2FlMzEyNDdkNzYzN2JlMzU4MWMxZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZp Z3VyYXRpb24ubW0KQEAgLTI0OCw2ICsyNDgsMzIgQEAgc3RhdGljIHZvaWQgY2hlY2tVUkxBcmd1 bWVudChOU1VSTCAqdXJsKQogICAgIF9jb25maWd1cmF0aW9uLT5zZXRBcHBsaWNhdGlvbkNhY2hl RmxhdEZpbGVTdWJkaXJlY3RvcnlOYW1lKG5hbWUpOwogfQogCistIChOU1VSTCAqKW1lZGlhQ2Fj aGVEaXJlY3RvcnkKK3sKKyAgICByZXR1cm4gW05TVVJMIGZpbGVVUkxXaXRoUGF0aDpfY29uZmln dXJhdGlvbi0+bWVkaWFDYWNoZURpcmVjdG9yeSgpIGlzRGlyZWN0b3J5OllFU107Cit9CisKKy0g KHZvaWQpc2V0TWVkaWFDYWNoZURpcmVjdG9yeTooTlNVUkwgKil1cmwKK3sKKyAgICBpZiAoIV9j b25maWd1cmF0aW9uLT5pc1BlcnNpc3RlbnQoKSkKKyAgICAgICAgW05TRXhjZXB0aW9uIHJhaXNl Ok5TSW52YWxpZEFyZ3VtZW50RXhjZXB0aW9uIGZvcm1hdDpAIkNhbm5vdCBzZXQgbWVkaWFDYWNo ZURpcmVjdG9yeSBvbiBhIG5vbi1wZXJzaXN0ZW50IF9XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1 cmF0aW9uLiJdOworICAgIGNoZWNrVVJMQXJndW1lbnQodXJsKTsKKyAgICBfY29uZmlndXJhdGlv bi0+c2V0TWVkaWFDYWNoZURpcmVjdG9yeSh1cmwucGF0aCk7Cit9CisKKy0gKE5TVVJMICopbWVk aWFLZXlzU3RvcmFnZURpcmVjdG9yeQoreworICAgIHJldHVybiBbTlNVUkwgZmlsZVVSTFdpdGhQ YXRoOl9jb25maWd1cmF0aW9uLT5tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KCkgaXNEaXJlY3Rv cnk6WUVTXTsKK30KKworLSAodm9pZClzZXRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5OihOU1VS TCAqKXVybAoreworICAgIGlmICghX2NvbmZpZ3VyYXRpb24tPmlzUGVyc2lzdGVudCgpKQorICAg ICAgICBbTlNFeGNlcHRpb24gcmFpc2U6TlNJbnZhbGlkQXJndW1lbnRFeGNlcHRpb24gZm9ybWF0 OkAiQ2Fubm90IHNldCBtZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5IG9uIGEgbm9uLXBlcnNpc3Rl bnQgX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uIl07CisgICAgY2hlY2tVUkxBcmd1 bWVudCh1cmwpOworICAgIF9jb25maWd1cmF0aW9uLT5zZXRNZWRpYUtleXNTdG9yYWdlRGlyZWN0 b3J5KHVybC5wYXRoKTsKK30KKwogLSAoQk9PTClkZXZpY2VNYW5hZ2VtZW50UmVzdHJpY3Rpb25z RW5hYmxlZAogewogICAgIHJldHVybiBfY29uZmlndXJhdGlvbi0+ZGV2aWNlTWFuYWdlbWVudFJl c3RyaWN0aW9uc0VuYWJsZWQoKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xz L0NoYW5nZUxvZwppbmRleCAyNWQ1ZGIxOWJhMzQ3YTMwYzgwMmNhYzYwMDljM2U4ZTQ3ODM0Yjcw Li5mY2FjOTZkMjQ2OTJkNWQyOWQyZjRlZmFiYzY5MDc5MGQwZmY5OTUzIDEwMDY0NAotLS0gYS9U b29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MTktMDctMjIgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKwor ICAgICAgICBBZGQgU1BJIGZvciBzZXR0aW5nIG1lZGlhIGNhY2hlIGFuZCBrZXkgbG9jYXRpb24g b24gX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTk3MgorCisgICAgICAgIFJldmlld2VkIGJ5 IEplciBOb2JsZS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev V2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tOgorICAgICAgICAoVEVTVCk6CisKIDIwMTkt MDctMjIgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAg ICAgICBBZGQgU1BJIHRvIF9XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIGZvciBjb25m aWd1cmluZyBhcHBsaWNhdGlvbiBjYWNoZSBzdG9yYWdlIGxvY2F0aW9uCmRpZmYgLS1naXQgYS9U b29scy9UZXN0V2ViS2l0QVBJL1RDUFNlcnZlci5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1RD UFNlcnZlci5jcHAKaW5kZXggZjNhN2UwMTgzMGNiMjZhYjk2ODVkYTdiNTUyMzBlZGQzMjM5Yzcy OS4uMTIzODI1N2UwYjBkYTAyN2Q5NTYzODJmNWJkNTc0YmYwYmVhYzZjMyAxMDA2NDQKLS0tIGEv VG9vbHMvVGVzdFdlYktpdEFQSS9UQ1BTZXJ2ZXIuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVENQU2VydmVyLmNwcApAQCAtMjg0LDcgKzI4NCw4IEBAIHRlbXBsYXRlPD4gVmVjdG9yPHVp bnQ4X3Q+IFRDUFNlcnZlcjo6cmVhZChTb2NrZXQgc29ja2V0KQogewogICAgIHVpbnQ4X3QgYnVm ZmVyWzEwMDBdOwogICAgIGF1dG8gYnl0ZXNSZWFkID0gOjpyZWFkKHNvY2tldCwgYnVmZmVyLCBz aXplb2YoYnVmZmVyKSk7Ci0gICAgQVNTRVJUX1VOVVNFRChieXRlc1JlYWQsIGJ5dGVzUmVhZCA+ IDApOworICAgIGlmIChieXRlc1JlYWQgPD0gMCkKKyAgICAgICAgcmV0dXJuIHsgfTsKICAgICBB U1NFUlQoc3RhdGljX2Nhc3Q8c2l6ZV90PihieXRlc1JlYWQpIDwgc2l6ZW9mKGJ1ZmZlcikpOwog CiAgICAgVmVjdG9yPHVpbnQ4X3Q+IHZlY3RvcjsKQEAgLTMwMyw3ICszMDQsOCBAQCB0ZW1wbGF0 ZTw+IFZlY3Rvcjx1aW50OF90PiBUQ1BTZXJ2ZXI6OnJlYWQoU1NMKiBzc2wpCiB7CiAgICAgdWlu dDhfdCBidWZmZXJbMTAwMF07CiAgICAgYXV0byBieXRlc1JlYWQgPSBTU0xfcmVhZChzc2wsIGJ1 ZmZlciwgc2l6ZW9mKGJ1ZmZlcikpOwotICAgIEFTU0VSVF9VTlVTRUQoYnl0ZXNSZWFkLCBieXRl c1JlYWQgPiAwKTsKKyAgICBpZiAoYnl0ZXNSZWFkIDw9IDApCisgICAgICAgIHJldHVybiB7IH07 CiAgICAgQVNTRVJUKHN0YXRpY19jYXN0PHNpemVfdD4oYnl0ZXNSZWFkKSA8IHNpemVvZihidWZm ZXIpKTsKIAogICAgIFZlY3Rvcjx1aW50OF90PiB2ZWN0b3I7CmRpZmYgLS1naXQgYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRo cy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFT dG9yZUN1c3RvbVBhdGhzLm1tCmluZGV4IDAzMGNkZWFlYTg5MGYwOGQ3MmQyODAwYzM3YmYwZDNk NDU0OTFmNTAuLjQ5NTFjNDU0N2Y2NDJiYmNmNzcwMzg4ODVmMzEyZWE4Njc2MzhjYzEgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFT dG9yZUN1c3RvbVBhdGhzLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tCkBAIC00Miw2ICs0Miw3IEBACiAj aW1wb3J0IDxXZWJLaXQvX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaD4KICNpbXBv cnQgPHd0Zi9EZXF1ZS5oPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgorI2ltcG9ydCA8d3Rm L3RleHQvV1RGU3RyaW5nLmg+CiAKIHN0YXRpYyBib29sIHJlY2VpdmVkU2NyaXB0TWVzc2FnZTsK IHN0YXRpYyBEZXF1ZTxSZXRhaW5QdHI8V0tTY3JpcHRNZXNzYWdlPj4gc2NyaXB0TWVzc2FnZXM7 CkBAIC02MTEsMyArNjEyLDc0IEBAIFRFU1QoV2ViS2l0LCBBcHBsaWNhdGlvbkNhY2hlRGlyZWN0 b3JpZXMpCiAgICAgW2ZpbGVNYW5hZ2VyIHJlbW92ZUl0ZW1BdFBhdGg6cGF0aCBlcnJvcjomZXJy b3JdOwogICAgIEVYUEVDVF9GQUxTRShlcnJvcik7CiB9CisKK1RFU1QoV2ViS2l0LCBNZWRpYUNh Y2hlKQoreworICAgIHN0ZDo6YXRvbWljPGJvb2w+IGRvbmUgPSBmYWxzZTsKKyAgICB1c2luZyBu YW1lc3BhY2UgVGVzdFdlYktpdEFQSTsKKyAgICBSZXRhaW5QdHI8TlNEYXRhPiBkYXRhID0gW05T RGF0YSBkYXRhV2l0aENvbnRlbnRzT2ZVUkw6W1tOU0J1bmRsZSBtYWluQnVuZGxlXSBVUkxGb3JS ZXNvdXJjZTpAInRlc3QiIHdpdGhFeHRlbnNpb246QCJtcDQiIHN1YmRpcmVjdG9yeTpAIlRlc3RX ZWJLaXRBUEkucmVzb3VyY2VzIl1dOworICAgIHVpbnQ2NF90IGRhdGFMZW5ndGggPSBbZGF0YSBs ZW5ndGhdOworCisgICAgVENQU2VydmVyIHNlcnZlcihbJl0gKGludCBzb2NrZXQpIHsKKyAgICAg ICAgVENQU2VydmVyOjpyZWFkKHNvY2tldCk7CisgICAgICAgIGNvbnN0IGNoYXIqIGZpcnN0UmVz cG9uc2UgPQorICAgICAgICAiSFRUUC8xLjEgMjAwIE9LXHJcbiIKKyAgICAgICAgIkNvbnRlbnQt VHlwZTogdGV4dC9odG1sXHJcbiIKKyAgICAgICAgIkNvbnRlbnQtTGVuZ3RoOiA1NVxyXG5cclxu IgorICAgICAgICAiPHZpZGVvPjxzb3VyY2Ugc3JjPSd0ZXN0Lm1wNCcgdHlwZT0ndmlkZW8vbXA0 Jz48L3ZpZGVvPiI7CisgICAgICAgIFRDUFNlcnZlcjo6d3JpdGUoc29ja2V0LCBmaXJzdFJlc3Bv bnNlLCBzdHJsZW4oZmlyc3RSZXNwb25zZSkpOworCisgICAgICAgIHdoaWxlICghZG9uZSkgewor ICAgICAgICAgICAgYXV0byBieXRlcyA9IFRDUFNlcnZlcjo6cmVhZChzb2NrZXQpOworICAgICAg ICAgICAgaWYgKGRvbmUpCisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBTdHJp bmdWaWV3IHJlcXVlc3Qoc3RhdGljX2Nhc3Q8Y29uc3QgTENoYXIqPihieXRlcy5kYXRhKCkpLCBi eXRlcy5zaXplKCkpOworICAgICAgICAgICAgU3RyaW5nIHJhbmdlQnl0ZXMgPSAiUmFuZ2U6IGJ5 dGVzPSJfczsKKyAgICAgICAgICAgIGF1dG8gYmVnaW4gPSByZXF1ZXN0LmZpbmQoU3RyaW5nVmll dyhyYW5nZUJ5dGVzKSwgMCk7CisgICAgICAgICAgICBBU1NFUlQoYmVnaW4gIT0gbm90Rm91bmQp OworICAgICAgICAgICAgYXV0byBkYXNoID0gcmVxdWVzdC5maW5kKCctJywgYmVnaW4pOworICAg ICAgICAgICAgQVNTRVJUKGRhc2ggIT0gbm90Rm91bmQpOworICAgICAgICAgICAgYXV0byBlbmQg PSByZXF1ZXN0LmZpbmQoJ1xyJywgZGFzaCk7CisgICAgICAgICAgICBBU1NFUlQoZW5kICE9IG5v dEZvdW5kKTsKKworICAgICAgICAgICAgYXV0byByYW5nZUJlZ2luID0gKnJlcXVlc3Quc3Vic3Ry aW5nKGJlZ2luICsgcmFuZ2VCeXRlcy5sZW5ndGgoKSwgZGFzaCAtIGJlZ2luIC0gcmFuZ2VCeXRl cy5sZW5ndGgoKSkudG9VSW50NjRTdHJpY3QoKTsKKyAgICAgICAgICAgIGF1dG8gcmFuZ2VFbmQg PSAqcmVxdWVzdC5zdWJzdHJpbmcoZGFzaCArIDEsIGVuZCAtIGRhc2ggLSAxKS50b1VJbnQ2NFN0 cmljdCgpOworCisgICAgICAgICAgICBOU1N0cmluZyAqcmVzcG9uc2VIZWFkZXJTdHJpbmcgPSBb TlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDoKKyAgICAgICAgICAgICAgICBAIkhUVFAvMS4xIDIw NiBQYXJ0aWFsIENvbnRlbnRcclxuIgorICAgICAgICAgICAgICAgICJDb250ZW50LVJhbmdlOiBi eXRlcyAlbGx1LSVsbHUvJWxsdVxyXG4iCisgICAgICAgICAgICAgICAgIkNvbnRlbnQtTGVuZ3Ro OiAlbGx1XHJcblxyXG4iLAorICAgICAgICAgICAgICAgIHJhbmdlQmVnaW4sIHJhbmdlRW5kLCBk YXRhTGVuZ3RoLCByYW5nZUVuZCAtIHJhbmdlQmVnaW5dOworICAgICAgICAgICAgTlNEYXRhICpy ZXNwb25zZUhlYWRlciA9IFtyZXNwb25zZUhlYWRlclN0cmluZyBkYXRhVXNpbmdFbmNvZGluZzpO U1VURjhTdHJpbmdFbmNvZGluZ107CisgICAgICAgICAgICBOU0RhdGEgKnJlc3BvbnNlQm9keSA9 IFtkYXRhIHN1YmRhdGFXaXRoUmFuZ2U6TlNNYWtlUmFuZ2UocmFuZ2VCZWdpbiwgcmFuZ2VFbmQg LSByYW5nZUJlZ2luKV07CisgICAgICAgICAgICBOU011dGFibGVEYXRhICpyZXNwb25zZSA9IFtO U011dGFibGVEYXRhIGRhdGFXaXRoQ2FwYWNpdHk6cmVzcG9uc2VIZWFkZXIubGVuZ3RoICsgcmVz cG9uc2VCb2R5Lmxlbmd0aF07CisgICAgICAgICAgICBbcmVzcG9uc2UgYXBwZW5kRGF0YTpyZXNw b25zZUhlYWRlcl07CisgICAgICAgICAgICBbcmVzcG9uc2UgYXBwZW5kRGF0YTpyZXNwb25zZUJv ZHldOworICAgICAgICAgICAgVENQU2VydmVyOjp3cml0ZShzb2NrZXQsIHJlc3BvbnNlLmJ5dGVz LCByZXNwb25zZS5sZW5ndGgpOworICAgICAgICB9CisgICAgfSk7CisKKyAgICBOU1VSTCAqdGVt cERpciA9IFtOU1VSTCBmaWxlVVJMV2l0aFBhdGg6W05TVGVtcG9yYXJ5RGlyZWN0b3J5KCkgc3Ry aW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiQ3VzdG9tUGF0aHNUZXN0Il0gaXNEaXJlY3Rv cnk6WUVTXTsKKyAgICBOU1N0cmluZyAqcGF0aCA9IHRlbXBEaXIucGF0aDsKKyAgICBOU0ZpbGVN YW5hZ2VyICpmaWxlTWFuYWdlciA9IFtOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXTsKKyAg ICBFWFBFQ1RfRkFMU0UoW2ZpbGVNYW5hZ2VyIGZpbGVFeGlzdHNBdFBhdGg6cGF0aF0pOworCisg ICAgYXV0byB3ZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tfV0tXZWJz aXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJzaXRlRGF0 YVN0b3JlQ29uZmlndXJhdGlvbiBzZXRNZWRpYUNhY2hlRGlyZWN0b3J5OnRlbXBEaXJdOworCisg ICAgYXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1 cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXdDb25maWd1cmF0aW9uIHNldFdlYnNp dGVEYXRhU3RvcmU6W1tbV0tXZWJzaXRlRGF0YVN0b3JlIGFsbG9jXSBfaW5pdFdpdGhDb25maWd1 cmF0aW9uOndlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLmdldCgpXSBhdXRvcmVsZWFzZV1d OworCisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGlu aXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjp3ZWJW aWV3Q29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIFt3ZWJWaWV3IHN5bmNocm9ub3VzbHlMb2Fk UmVxdWVzdDpbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5n OltOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiaHR0cDovLzEyNy4wLjAuMTolZC8iLCBzZXJ2 ZXIucG9ydCgpXV1dXTsKKworICAgIHdoaWxlICghW2ZpbGVNYW5hZ2VyIGZpbGVFeGlzdHNBdFBh dGg6W3BhdGggc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiZGlza2NhY2hlcmVwb3Np dG9yeS5wbGlzdCJdXSkKKyAgICAgICAgVXRpbDo6c3BpblJ1bkxvb3AoKTsKKworICAgIGRvbmUg PSB0cnVlOworICAgIFtbd2ViVmlldyBjb25maWd1cmF0aW9uXS5wcm9jZXNzUG9vbCBfdGVybWlu YXRlTmV0d29ya1Byb2Nlc3NdOworCisgICAgTlNFcnJvciAqZXJyb3IgPSBuaWw7CisgICAgW2Zp bGVNYW5hZ2VyIHJlbW92ZUl0ZW1BdFBhdGg6cGF0aCBlcnJvcjomZXJyb3JdOworICAgIEVYUEVD VF9GQUxTRShlcnJvcik7Cit9Cg== 374651 2019-07-22 16:27:56 -0700 2019-07-22 16:28:52 -0700 Patch bug-199972-20190722162755.patch text/plain 12095 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3Njg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM2NTE2NjEyZTgxZmJjM2Q0 OWY1ZjRhNjdhYjYwY2FiNDI4NzliZmQuLjQ0ZGU0ZDY4NWQ0NGRmNDdiZmMzMjkzZTdlOGFlMzE2 MDk1ZGMyNGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTktMDctMjIgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBBZGQgU1BJIGZv ciBzZXR0aW5nIG1lZGlhIGNhY2hlIGFuZCBrZXkgbG9jYXRpb24gb24gX1dLV2Vic2l0ZURhdGFT dG9yZUNvbmZpZ3VyYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE5OTk3MgorCisgICAgICAgIFJldmlld2VkIGJ5IEplciBOb2JsZS4KKworICAg ICAgICBUaGlzIGlzIGEgc3RlcCB0b3dhcmRzIHJlbW92aW5nIFdlYnNpdGVEYXRhU3RvcmU6Omxl Z2FjeURlZmF1bHREYXRhU3RvcmVDb25maWd1cmF0aW9uCisgICAgICAgIEkgYWRkZWQgYSB1bml0 IHRlc3QgZm9yIHRoZSBtZWRpYSBjYWNoZSBsb2NhdGlvbiwKKyAgICAgICAgYnV0IHRoZSBtZWRp YSBrZXkgbG9jYXRpb24gY2FuJ3QgcmVhc29uYWJseSBiZSB1bml0IHRlc3RlZCBpbiBhbiBvcGVu IHNvdXJjZSBwcm9qZWN0LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNp dGVEYXRhU3RvcmUubW06CisgICAgICAgICgtW1dLV2Vic2l0ZURhdGFTdG9yZSBfaW5pdFdpdGhD b25maWd1cmF0aW9uOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0 ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29h L19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLm1tOgorICAgICAgICAoLVtfV0tXZWJz aXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiBtZWRpYUNhY2hlRGlyZWN0b3J5XSk6CisgICAgICAg ICgtW19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIHNldE1lZGlhQ2FjaGVEaXJlY3Rv cnk6XSk6CisgICAgICAgICgtW19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIG1lZGlh S2V5c1N0b3JhZ2VEaXJlY3RvcnldKToKKyAgICAgICAgKC1bX1dLV2Vic2l0ZURhdGFTdG9yZUNv bmZpZ3VyYXRpb24gc2V0TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeTpdKToKKwogMjAxOS0wNy0y MiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAg IEFkZCBTUEkgdG8gX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24gZm9yIGNvbmZpZ3Vy aW5nIGFwcGxpY2F0aW9uIGNhY2hlIHN0b3JhZ2UgbG9jYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0gYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tCmluZGV4 IDUyOGY5ZDliYjgyY2EzOTkxODc1Njc4MTYyYTNiZGRmYTFhMTAwNDAuLmY1ZmM1MjgxZTUxNzA4 M2Y5MzUwOWFlYzU0N2M1ODU2YjU2ZmU4YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0KKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQpAQCAtMjU2LDYgKzI1 NiwxMCBAQCBzdGF0aWMgVmVjdG9yPFdlYktpdDo6V2Vic2l0ZURhdGFSZWNvcmQ+IHRvV2Vic2l0 ZURhdGFSZWNvcmRzKE5TQXJyYXkgKmRhdGFSZWNvcgogICAgICAgICAgICAgY29uZmlnLT5zZXRB cHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KGNvbmZpZ3VyYXRpb24uYXBwbGljYXRpb25DYWNoZURp cmVjdG9yeS5wYXRoKTsKICAgICAgICAgaWYgKGNvbmZpZ3VyYXRpb24uYXBwbGljYXRpb25DYWNo ZUZsYXRGaWxlU3ViZGlyZWN0b3J5TmFtZSkKICAgICAgICAgICAgIGNvbmZpZy0+c2V0QXBwbGlj YXRpb25DYWNoZUZsYXRGaWxlU3ViZGlyZWN0b3J5TmFtZShjb25maWd1cmF0aW9uLmFwcGxpY2F0 aW9uQ2FjaGVGbGF0RmlsZVN1YmRpcmVjdG9yeU5hbWUpOworICAgICAgICBpZiAoY29uZmlndXJh dGlvbi5tZWRpYUNhY2hlRGlyZWN0b3J5KQorICAgICAgICAgICAgY29uZmlnLT5zZXRNZWRpYUNh Y2hlRGlyZWN0b3J5KGNvbmZpZ3VyYXRpb24ubWVkaWFDYWNoZURpcmVjdG9yeS5wYXRoKTsKKyAg ICAgICAgaWYgKGNvbmZpZ3VyYXRpb24ubWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSkKKyAgICAg ICAgICAgIGNvbmZpZy0+c2V0TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeShjb25maWd1cmF0aW9u Lm1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkucGF0aCk7CiAgICAgfSBlbHNlIHsKICAgICAgICAg UkVMRUFTRV9BU1NFUlQoIWNvbmZpZ3VyYXRpb24uX3dlYlN0b3JhZ2VEaXJlY3RvcnkpOwogICAg ICAgICBSRUxFQVNFX0FTU0VSVCghY29uZmlndXJhdGlvbi5fd2ViU1FMRGF0YWJhc2VEaXJlY3Rv cnkpOwpAQCAtMjY3LDYgKzI3MSw4IEBAIHN0YXRpYyBWZWN0b3I8V2ViS2l0OjpXZWJzaXRlRGF0 YVJlY29yZD4gdG9XZWJzaXRlRGF0YVJlY29yZHMoTlNBcnJheSAqZGF0YVJlY29yCiAgICAgICAg IFJFTEVBU0VfQVNTRVJUKCFjb25maWd1cmF0aW9uLm5ldHdvcmtDYWNoZURpcmVjdG9yeSk7CiAg ICAgICAgIFJFTEVBU0VfQVNTRVJUKCFjb25maWd1cmF0aW9uLmRldmljZUlkSGFzaFNhbHRzU3Rv cmFnZURpcmVjdG9yeSk7CiAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCFjb25maWd1cmF0aW9uLmFw cGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkpOworICAgICAgICBSRUxFQVNFX0FTU0VSVCghY29uZmln dXJhdGlvbi5tZWRpYUNhY2hlRGlyZWN0b3J5KTsKKyAgICAgICAgUkVMRUFTRV9BU1NFUlQoIWNv bmZpZ3VyYXRpb24ubWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSk7CiAgICAgfQogCiAgICAgaWYg KGNvbmZpZ3VyYXRpb24uc291cmNlQXBwbGljYXRpb25CdW5kbGVJZGVudGlmaWVyKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3Rv cmVDb25maWd1cmF0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dL V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaAppbmRleCBjODhmYzg4YWU4NjQ0MTIyNWUx MzEwMmFmYTU0NzRjMTE3ZTkyMGY1Li5jOWVkNTEyOTEyNzI1MDk0ZDgxMWE2MmVkZjJlNTA3ZTZh ODJmNjA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dL V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaApAQCAtNTcs NiArNTcsOCBAQCBXS19DTEFTU19BVkFJTEFCTEUobWFjb3MoMTAuMTMpLCBpb3MoMTEuMCkpCiBA cHJvcGVydHkgKG5vbmF0b21pYywgbnVsbGFibGUsIGNvcHkpIE5TVVJMICpkZXZpY2VJZEhhc2hT YWx0c1N0b3JhZ2VEaXJlY3RvcnkgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwg aW9zKFdLX0lPU19UQkEpKTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxsYWJsZSwgY29weSkg TlNVUkwgKmFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhX S19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxs YWJsZSwgY29weSkgTlNTdHJpbmcgKmFwcGxpY2F0aW9uQ2FjaGVGbGF0RmlsZVN1YmRpcmVjdG9y eU5hbWUgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEp KTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxsYWJsZSwgY29weSkgTlNVUkwgKm1lZGlhQ2Fj aGVEaXJlY3RvcnkgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwgaW9zKFdLX0lP U19UQkEpKTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxsYWJsZSwgY29weSkgTlNVUkwgKm1l ZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJB KSwgaW9zKFdLX0lPU19UQkEpKTsKIAogLy8gVGVzdGluZyBvbmx5LgogQHByb3BlcnR5IChub25h dG9taWMpIEJPT0wgYWxsTG9hZHNCbG9ja2VkQnlEZXZpY2VNYW5hZ2VtZW50UmVzdHJpY3Rpb25z Rm9yVGVzdGluZyBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9T X1RCQSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19X S1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLm1tCmluZGV4IGVm MWVkOTFkM2NmY2UzMWM1NzUzZjE1ZWRkZTQ5YzZlN2VlNzcxMDIuLjgyNWMxOGY2MzQ5ZDQ2MTg2 Y2FlMzEyNDdkNzYzN2JlMzU4MWMxZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZp Z3VyYXRpb24ubW0KQEAgLTI0OCw2ICsyNDgsMzIgQEAgc3RhdGljIHZvaWQgY2hlY2tVUkxBcmd1 bWVudChOU1VSTCAqdXJsKQogICAgIF9jb25maWd1cmF0aW9uLT5zZXRBcHBsaWNhdGlvbkNhY2hl RmxhdEZpbGVTdWJkaXJlY3RvcnlOYW1lKG5hbWUpOwogfQogCistIChOU1VSTCAqKW1lZGlhQ2Fj aGVEaXJlY3RvcnkKK3sKKyAgICByZXR1cm4gW05TVVJMIGZpbGVVUkxXaXRoUGF0aDpfY29uZmln dXJhdGlvbi0+bWVkaWFDYWNoZURpcmVjdG9yeSgpIGlzRGlyZWN0b3J5OllFU107Cit9CisKKy0g KHZvaWQpc2V0TWVkaWFDYWNoZURpcmVjdG9yeTooTlNVUkwgKil1cmwKK3sKKyAgICBpZiAoIV9j b25maWd1cmF0aW9uLT5pc1BlcnNpc3RlbnQoKSkKKyAgICAgICAgW05TRXhjZXB0aW9uIHJhaXNl Ok5TSW52YWxpZEFyZ3VtZW50RXhjZXB0aW9uIGZvcm1hdDpAIkNhbm5vdCBzZXQgbWVkaWFDYWNo ZURpcmVjdG9yeSBvbiBhIG5vbi1wZXJzaXN0ZW50IF9XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1 cmF0aW9uLiJdOworICAgIGNoZWNrVVJMQXJndW1lbnQodXJsKTsKKyAgICBfY29uZmlndXJhdGlv bi0+c2V0TWVkaWFDYWNoZURpcmVjdG9yeSh1cmwucGF0aCk7Cit9CisKKy0gKE5TVVJMICopbWVk aWFLZXlzU3RvcmFnZURpcmVjdG9yeQoreworICAgIHJldHVybiBbTlNVUkwgZmlsZVVSTFdpdGhQ YXRoOl9jb25maWd1cmF0aW9uLT5tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KCkgaXNEaXJlY3Rv cnk6WUVTXTsKK30KKworLSAodm9pZClzZXRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5OihOU1VS TCAqKXVybAoreworICAgIGlmICghX2NvbmZpZ3VyYXRpb24tPmlzUGVyc2lzdGVudCgpKQorICAg ICAgICBbTlNFeGNlcHRpb24gcmFpc2U6TlNJbnZhbGlkQXJndW1lbnRFeGNlcHRpb24gZm9ybWF0 OkAiQ2Fubm90IHNldCBtZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5IG9uIGEgbm9uLXBlcnNpc3Rl bnQgX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uIl07CisgICAgY2hlY2tVUkxBcmd1 bWVudCh1cmwpOworICAgIF9jb25maWd1cmF0aW9uLT5zZXRNZWRpYUtleXNTdG9yYWdlRGlyZWN0 b3J5KHVybC5wYXRoKTsKK30KKwogLSAoQk9PTClkZXZpY2VNYW5hZ2VtZW50UmVzdHJpY3Rpb25z RW5hYmxlZAogewogICAgIHJldHVybiBfY29uZmlndXJhdGlvbi0+ZGV2aWNlTWFuYWdlbWVudFJl c3RyaWN0aW9uc0VuYWJsZWQoKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xz L0NoYW5nZUxvZwppbmRleCAyNWQ1ZGIxOWJhMzQ3YTMwYzgwMmNhYzYwMDljM2U4ZTQ3ODM0Yjcw Li5mY2FjOTZkMjQ2OTJkNWQyOWQyZjRlZmFiYzY5MDc5MGQwZmY5OTUzIDEwMDY0NAotLS0gYS9U b29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MTktMDctMjIgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKwor ICAgICAgICBBZGQgU1BJIGZvciBzZXR0aW5nIG1lZGlhIGNhY2hlIGFuZCBrZXkgbG9jYXRpb24g b24gX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTk3MgorCisgICAgICAgIFJldmlld2VkIGJ5 IEplciBOb2JsZS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev V2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tOgorICAgICAgICAoVEVTVCk6CisKIDIwMTkt MDctMjIgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAg ICAgICBBZGQgU1BJIHRvIF9XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIGZvciBjb25m aWd1cmluZyBhcHBsaWNhdGlvbiBjYWNoZSBzdG9yYWdlIGxvY2F0aW9uCmRpZmYgLS1naXQgYS9U b29scy9UZXN0V2ViS2l0QVBJL1RDUFNlcnZlci5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1RD UFNlcnZlci5jcHAKaW5kZXggZjNhN2UwMTgzMGNiMjZhYjk2ODVkYTdiNTUyMzBlZGQzMjM5Yzcy OS4uMTIzODI1N2UwYjBkYTAyN2Q5NTYzODJmNWJkNTc0YmYwYmVhYzZjMyAxMDA2NDQKLS0tIGEv VG9vbHMvVGVzdFdlYktpdEFQSS9UQ1BTZXJ2ZXIuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVENQU2VydmVyLmNwcApAQCAtMjg0LDcgKzI4NCw4IEBAIHRlbXBsYXRlPD4gVmVjdG9yPHVp bnQ4X3Q+IFRDUFNlcnZlcjo6cmVhZChTb2NrZXQgc29ja2V0KQogewogICAgIHVpbnQ4X3QgYnVm ZmVyWzEwMDBdOwogICAgIGF1dG8gYnl0ZXNSZWFkID0gOjpyZWFkKHNvY2tldCwgYnVmZmVyLCBz aXplb2YoYnVmZmVyKSk7Ci0gICAgQVNTRVJUX1VOVVNFRChieXRlc1JlYWQsIGJ5dGVzUmVhZCA+ IDApOworICAgIGlmIChieXRlc1JlYWQgPD0gMCkKKyAgICAgICAgcmV0dXJuIHsgfTsKICAgICBB U1NFUlQoc3RhdGljX2Nhc3Q8c2l6ZV90PihieXRlc1JlYWQpIDwgc2l6ZW9mKGJ1ZmZlcikpOwog CiAgICAgVmVjdG9yPHVpbnQ4X3Q+IHZlY3RvcjsKQEAgLTMwMyw3ICszMDQsOCBAQCB0ZW1wbGF0 ZTw+IFZlY3Rvcjx1aW50OF90PiBUQ1BTZXJ2ZXI6OnJlYWQoU1NMKiBzc2wpCiB7CiAgICAgdWlu dDhfdCBidWZmZXJbMTAwMF07CiAgICAgYXV0byBieXRlc1JlYWQgPSBTU0xfcmVhZChzc2wsIGJ1 ZmZlciwgc2l6ZW9mKGJ1ZmZlcikpOwotICAgIEFTU0VSVF9VTlVTRUQoYnl0ZXNSZWFkLCBieXRl c1JlYWQgPiAwKTsKKyAgICBpZiAoYnl0ZXNSZWFkIDw9IDApCisgICAgICAgIHJldHVybiB7IH07 CiAgICAgQVNTRVJUKHN0YXRpY19jYXN0PHNpemVfdD4oYnl0ZXNSZWFkKSA8IHNpemVvZihidWZm ZXIpKTsKIAogICAgIFZlY3Rvcjx1aW50OF90PiB2ZWN0b3I7CmRpZmYgLS1naXQgYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRo cy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFT dG9yZUN1c3RvbVBhdGhzLm1tCmluZGV4IDAzMGNkZWFlYTg5MGYwOGQ3MmQyODAwYzM3YmYwZDNk NDU0OTFmNTAuLmUxZTU2YWIxMDNhZTEyNjlkZGJjZWRiNjk4MTk4N2RjZjlkZjU0YzUgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFT dG9yZUN1c3RvbVBhdGhzLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tCkBAIC00Miw2ICs0Miw3IEBACiAj aW1wb3J0IDxXZWJLaXQvX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaD4KICNpbXBv cnQgPHd0Zi9EZXF1ZS5oPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgorI2ltcG9ydCA8d3Rm L3RleHQvV1RGU3RyaW5nLmg+CiAKIHN0YXRpYyBib29sIHJlY2VpdmVkU2NyaXB0TWVzc2FnZTsK IHN0YXRpYyBEZXF1ZTxSZXRhaW5QdHI8V0tTY3JpcHRNZXNzYWdlPj4gc2NyaXB0TWVzc2FnZXM7 CkBAIC02MTEsMyArNjEyLDc1IEBAIFRFU1QoV2ViS2l0LCBBcHBsaWNhdGlvbkNhY2hlRGlyZWN0 b3JpZXMpCiAgICAgW2ZpbGVNYW5hZ2VyIHJlbW92ZUl0ZW1BdFBhdGg6cGF0aCBlcnJvcjomZXJy b3JdOwogICAgIEVYUEVDVF9GQUxTRShlcnJvcik7CiB9CisKK1RFU1QoV2ViS2l0LCBNZWRpYUNh Y2hlKQoreworICAgIHN0ZDo6YXRvbWljPGJvb2w+IGRvbmUgPSBmYWxzZTsKKyAgICB1c2luZyBu YW1lc3BhY2UgVGVzdFdlYktpdEFQSTsKKyAgICBSZXRhaW5QdHI8TlNEYXRhPiBkYXRhID0gW05T RGF0YSBkYXRhV2l0aENvbnRlbnRzT2ZVUkw6W1tOU0J1bmRsZSBtYWluQnVuZGxlXSBVUkxGb3JS ZXNvdXJjZTpAInRlc3QiIHdpdGhFeHRlbnNpb246QCJtcDQiIHN1YmRpcmVjdG9yeTpAIlRlc3RX ZWJLaXRBUEkucmVzb3VyY2VzIl1dOworICAgIHVpbnQ2NF90IGRhdGFMZW5ndGggPSBbZGF0YSBs ZW5ndGhdOworCisgICAgVENQU2VydmVyIHNlcnZlcihbJl0gKGludCBzb2NrZXQpIHsKKyAgICAg ICAgVENQU2VydmVyOjpyZWFkKHNvY2tldCk7CisgICAgICAgIGNvbnN0IGNoYXIqIGZpcnN0UmVz cG9uc2UgPQorICAgICAgICAiSFRUUC8xLjEgMjAwIE9LXHJcbiIKKyAgICAgICAgIkNvbnRlbnQt VHlwZTogdGV4dC9odG1sXHJcbiIKKyAgICAgICAgIkNvbnRlbnQtTGVuZ3RoOiA1NVxyXG5cclxu IgorICAgICAgICAiPHZpZGVvPjxzb3VyY2Ugc3JjPSd0ZXN0Lm1wNCcgdHlwZT0ndmlkZW8vbXA0 Jz48L3ZpZGVvPiI7CisgICAgICAgIFRDUFNlcnZlcjo6d3JpdGUoc29ja2V0LCBmaXJzdFJlc3Bv bnNlLCBzdHJsZW4oZmlyc3RSZXNwb25zZSkpOworCisgICAgICAgIHdoaWxlICghZG9uZSkgewor ICAgICAgICAgICAgYXV0byBieXRlcyA9IFRDUFNlcnZlcjo6cmVhZChzb2NrZXQpOworICAgICAg ICAgICAgaWYgKGRvbmUpCisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBTdHJp bmdWaWV3IHJlcXVlc3Qoc3RhdGljX2Nhc3Q8Y29uc3QgTENoYXIqPihieXRlcy5kYXRhKCkpLCBi eXRlcy5zaXplKCkpOworICAgICAgICAgICAgU3RyaW5nIHJhbmdlQnl0ZXMgPSAiUmFuZ2U6IGJ5 dGVzPSJfczsKKyAgICAgICAgICAgIGF1dG8gYmVnaW4gPSByZXF1ZXN0LmZpbmQoU3RyaW5nVmll dyhyYW5nZUJ5dGVzKSwgMCk7CisgICAgICAgICAgICBBU1NFUlQoYmVnaW4gIT0gbm90Rm91bmQp OworICAgICAgICAgICAgYXV0byBkYXNoID0gcmVxdWVzdC5maW5kKCctJywgYmVnaW4pOworICAg ICAgICAgICAgQVNTRVJUKGRhc2ggIT0gbm90Rm91bmQpOworICAgICAgICAgICAgYXV0byBlbmQg PSByZXF1ZXN0LmZpbmQoJ1xyJywgZGFzaCk7CisgICAgICAgICAgICBBU1NFUlQoZW5kICE9IG5v dEZvdW5kKTsKKworICAgICAgICAgICAgYXV0byByYW5nZUJlZ2luID0gKnJlcXVlc3Quc3Vic3Ry aW5nKGJlZ2luICsgcmFuZ2VCeXRlcy5sZW5ndGgoKSwgZGFzaCAtIGJlZ2luIC0gcmFuZ2VCeXRl cy5sZW5ndGgoKSkudG9VSW50NjRTdHJpY3QoKTsKKyAgICAgICAgICAgIGF1dG8gcmFuZ2VFbmQg PSAqcmVxdWVzdC5zdWJzdHJpbmcoZGFzaCArIDEsIGVuZCAtIGRhc2ggLSAxKS50b1VJbnQ2NFN0 cmljdCgpOworCisgICAgICAgICAgICBOU1N0cmluZyAqcmVzcG9uc2VIZWFkZXJTdHJpbmcgPSBb TlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDoKKyAgICAgICAgICAgICAgICBAIkhUVFAvMS4xIDIw NiBQYXJ0aWFsIENvbnRlbnRcclxuIgorICAgICAgICAgICAgICAgICJDb250ZW50LVJhbmdlOiBi eXRlcyAlbGx1LSVsbHUvJWxsdVxyXG4iCisgICAgICAgICAgICAgICAgIkNvbnRlbnQtTGVuZ3Ro OiAlbGx1XHJcblxyXG4iLAorICAgICAgICAgICAgICAgIHJhbmdlQmVnaW4sIHJhbmdlRW5kLCBk YXRhTGVuZ3RoLCByYW5nZUVuZCAtIHJhbmdlQmVnaW5dOworICAgICAgICAgICAgTlNEYXRhICpy ZXNwb25zZUhlYWRlciA9IFtyZXNwb25zZUhlYWRlclN0cmluZyBkYXRhVXNpbmdFbmNvZGluZzpO U1VURjhTdHJpbmdFbmNvZGluZ107CisgICAgICAgICAgICBOU0RhdGEgKnJlc3BvbnNlQm9keSA9 IFtkYXRhIHN1YmRhdGFXaXRoUmFuZ2U6TlNNYWtlUmFuZ2UocmFuZ2VCZWdpbiwgcmFuZ2VFbmQg LSByYW5nZUJlZ2luKV07CisgICAgICAgICAgICBOU011dGFibGVEYXRhICpyZXNwb25zZSA9IFtO U011dGFibGVEYXRhIGRhdGFXaXRoQ2FwYWNpdHk6cmVzcG9uc2VIZWFkZXIubGVuZ3RoICsgcmVz cG9uc2VCb2R5Lmxlbmd0aF07CisgICAgICAgICAgICBbcmVzcG9uc2UgYXBwZW5kRGF0YTpyZXNw b25zZUhlYWRlcl07CisgICAgICAgICAgICBbcmVzcG9uc2UgYXBwZW5kRGF0YTpyZXNwb25zZUJv ZHldOworICAgICAgICAgICAgVENQU2VydmVyOjp3cml0ZShzb2NrZXQsIHJlc3BvbnNlLmJ5dGVz LCByZXNwb25zZS5sZW5ndGgpOworICAgICAgICB9CisgICAgfSk7CisKKyAgICBOU1VSTCAqdGVt cERpciA9IFtOU1VSTCBmaWxlVVJMV2l0aFBhdGg6W05TVGVtcG9yYXJ5RGlyZWN0b3J5KCkgc3Ry aW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiQ3VzdG9tUGF0aHNUZXN0Il0gaXNEaXJlY3Rv cnk6WUVTXTsKKyAgICBOU1N0cmluZyAqcGF0aCA9IHRlbXBEaXIucGF0aDsKKyAgICBOU0ZpbGVN YW5hZ2VyICpmaWxlTWFuYWdlciA9IFtOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXTsKKyAg ICBFWFBFQ1RfRkFMU0UoW2ZpbGVNYW5hZ2VyIGZpbGVFeGlzdHNBdFBhdGg6cGF0aF0pOworCisg ICAgYXV0byB3ZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tfV0tXZWJz aXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJzaXRlRGF0 YVN0b3JlQ29uZmlndXJhdGlvbiBzZXRNZWRpYUNhY2hlRGlyZWN0b3J5OnRlbXBEaXJdOworCisg ICAgYXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1 cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXdDb25maWd1cmF0aW9uIHNldFdlYnNp dGVEYXRhU3RvcmU6W1tbV0tXZWJzaXRlRGF0YVN0b3JlIGFsbG9jXSBfaW5pdFdpdGhDb25maWd1 cmF0aW9uOndlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLmdldCgpXSBhdXRvcmVsZWFzZV1d OworCisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGlu aXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjp3ZWJW aWV3Q29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIFt3ZWJWaWV3IHN5bmNocm9ub3VzbHlMb2Fk UmVxdWVzdDpbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5n OltOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiaHR0cDovLzEyNy4wLjAuMTolZC8iLCBzZXJ2 ZXIucG9ydCgpXV1dXTsKKworICAgIE5TRXJyb3IgKmVycm9yID0gbmlsOworICAgIHdoaWxlICgh W2ZpbGVNYW5hZ2VyIGNvbnRlbnRzT2ZEaXJlY3RvcnlBdFBhdGg6cGF0aCBlcnJvcjomZXJyb3Jd LmNvdW50KQorICAgICAgICBVdGlsOjpzcGluUnVuTG9vcCgpOworICAgIEVYUEVDVF9GQUxTRShl cnJvcik7CisKKyAgICBkb25lID0gdHJ1ZTsKKyAgICBbW3dlYlZpZXcgY29uZmlndXJhdGlvbl0u cHJvY2Vzc1Bvb2wgX3Rlcm1pbmF0ZU5ldHdvcmtQcm9jZXNzXTsKKworICAgIFtmaWxlTWFuYWdl ciByZW1vdmVJdGVtQXRQYXRoOnBhdGggZXJyb3I6JmVycm9yXTsKKyAgICBFWFBFQ1RfRkFMU0Uo ZXJyb3IpOworfQo=