180684 2017-12-11 16:56:45 -0800 [EME] Support reporting and restoring persistent usage data. 2017-12-12 13:36:03 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson ews-watchlist webkit-bug-importer oldest_to_newest 1380473 0 jer.noble 2017-12-11 16:56:45 -0800 [EME] Support reporting and restoring persistent usage data. 1380716 1 329125 jer.noble 2017-12-12 10:52:28 -0800 Created attachment 329125 Patch 1380719 2 ews-watchlist 2017-12-12 10:56:05 -0800 Attachment 329125 did not pass style-queue: ERROR: Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:311: Missing space around : in range-based for statement [whitespace/colon] [4] ERROR: Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:319: Missing space before { [whitespace/braces] [5] ERROR: Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:365: Missing space around : in range-based for statement [whitespace/colon] [4] ERROR: Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:373: Missing space before { [whitespace/braces] [5] Total errors found: 4 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1380773 3 webkit-bug-importer 2017-12-12 12:32:19 -0800 <rdar://problem/36001422> 1380814 4 329125 commit-queue 2017-12-12 13:36:02 -0800 Comment on attachment 329125 Patch Clearing flags on attachment: 329125 Committed r225802: <https://trac.webkit.org/changeset/225802> 1380815 5 commit-queue 2017-12-12 13:36:03 -0800 All reviewed patches have been landed. Closing bug. 329125 2017-12-12 10:52:28 -0800 2017-12-12 13:36:02 -0800 Patch bug-180684-20171212105228.patch text/plain 13571 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1NjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTZmZWMyMjQ4NjZkZTI0 MjhkNTFlZDUxYTcwZjdhZWM3MmRmNjU3NS4uOTMwYWUzNTQyMmQyZjNlMjg3NmRiMDE4Mjg5NWI1 MWJjMDRiNmFlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE3LTEyLTExICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtFTUVdIFN1cHBvcnQgcmVw b3J0aW5nIGFuZCByZXN0b3JpbmcgcGVyc2lzdGVudCB1c2FnZSBkYXRhLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgwNjg0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHN1cHBvcnQgZm9yIHJlYWRp bmcgYW5kIGFja25vd2xlZGdpbmcgcGVyc2lzdGVudCB1c2FnZSBkYXRhIGZyb20gdGhlIE1lZGlh S2V5cyBzdG9yYWdlCisgICAgICAgIGRpcmVjdG9yeS4KKworICAgICAgICBBZGQgYSBtZWNoYW5p c20gZm9yIHBhc3NpbmcgdGhlIHN0b3JhZ2UgbG9jYXRpb24gZG93biB0byBDRE1Qcml2YXRlIGFu ZCBDRE1JbnN0YW5jZSBvYmplY3RzCisgICAgICAgIGluc2lkZSBvZiB0aGUgQ0RNIGNsYXNzIGl0 c2VsZjoKKworICAgICAgICAqIE1vZHVsZXMvZW5jcnlwdGVkbWVkaWEvQ0RNLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNETTo6Y3JlYXRlSW5zdGFuY2UpOgorICAgICAgICAoV2ViQ29yZTo6Q0RN OjpzdG9yYWdlRGlyZWN0b3J5IGNvbnN0KToKKyAgICAgICAgKiBNb2R1bGVzL2VuY3J5cHRlZG1l ZGlhL0NETS5oOgorCisgICAgICAgIFN1cHBvcnQgbG9hZGluZyBleHBpcmVkIHNlc3Npb24gZGF0 YSwgYWNrbm93bGVkZ2luZyBleHBpcmVkIHNlc3Npb24gZGF0YSwgY2xvc2luZyBzZXNzaW9ucwor ICAgICAgICBhbmQgcmVtb3ZpbmcgdXNhYmxlIGtleSBkYXRhLgorCisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWlu Z0FWRk9iakMuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq Yy9DRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQy5tbToKKyAgICAgICAgKFdlYkNv cmU6OmlzRXF1YWwpOgorICAgICAgICAoV2ViQ29yZTo6Q0RNSW5zdGFuY2VGYWlyUGxheVN0cmVh bWluZ0FWRk9iakM6OnVwZGF0ZUxpY2Vuc2UpOgorICAgICAgICAoV2ViQ29yZTo6Q0RNSW5zdGFu Y2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakM6OmxvYWRTZXNzaW9uKToKKyAgICAgICAgKFdlYkNv cmU6OkNETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDOjpjbG9zZVNlc3Npb24pOgor ICAgICAgICAoV2ViQ29yZTo6Q0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakM6OnJl bW92ZVNlc3Npb25EYXRhKToKKwogMjAxNy0xMi0wNyAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFw cGxlLmNvbT4KIAogICAgICAgICBbRU1FXSBzdXBwb3J0IHVwZGF0ZSgpIGZvciBGYWlyUGxheVN0 cmVhbWluZyBpbiBNb2Rlcm4gRU1FIEFQSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9lbmNyeXB0ZWRtZWRpYS9DRE0uY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNy eXB0ZWRtZWRpYS9DRE0uY3BwCmluZGV4IGI3NDBiYjA4OTcyOTlhNjM2YmYxMTgzZGUwMjc1NTI5 ZWQ0YTY3MTQuLjc2MGVlMjAzNTI0ZDIzMWJjMDdkMWNjNWY1MjdlYThjODk1N2JhOGMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvQ0RNLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL0NETS5jcHAKQEAgLTMxLDEz ICszMSwxNyBAQAogI2luY2x1ZGUgIkNETUZhY3RvcnkuaCIKICNpbmNsdWRlICJDRE1Qcml2YXRl LmgiCiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKKyNpbmNsdWRlICJGaWxlU3lzdGVtLmgiCiAjaW5j bHVkZSAiSW5pdERhdGFSZWdpc3RyeS5oIgogI2luY2x1ZGUgIk1lZGlhS2V5c1JlcXVpcmVtZW50 LmgiCiAjaW5jbHVkZSAiTWVkaWFQbGF5ZXIuaCIKICNpbmNsdWRlICJOb3RJbXBsZW1lbnRlZC5o IgorI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJQYXJzZWRDb250ZW50VHlwZS5oIgogI2lu Y2x1ZGUgIlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaCIKICNpbmNsdWRlICJTZWN1cml0eU9yaWdp bi5oIgorI2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2luRGF0YS5oIgorI2luY2x1ZGUgIlNldHRpbmdz LmgiCiAjaW5jbHVkZSA8d3RmL05ldmVyRGVzdHJveWVkLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKQEAgLTU5MCw3ICs1OTQsOSBAQCBSZWZQdHI8Q0RNSW5zdGFuY2U+IENETTo6Y3JlYXRlSW5z dGFuY2UoKQogewogICAgIGlmICghbV9wcml2YXRlKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsK LSAgICByZXR1cm4gbV9wcml2YXRlLT5jcmVhdGVJbnN0YW5jZSgpOworICAgIGF1dG8gaW5zdGFu Y2UgPSBtX3ByaXZhdGUtPmNyZWF0ZUluc3RhbmNlKCk7CisgICAgaW5zdGFuY2UtPnNldFN0b3Jh Z2VEaXJlY3Rvcnkoc3RvcmFnZURpcmVjdG9yeSgpKTsKKyAgICByZXR1cm4gaW5zdGFuY2U7CiB9 CiAKIGJvb2wgQ0RNOjpzdXBwb3J0c1NlcnZlckNlcnRpZmljYXRlcygpIGNvbnN0CkBAIC02MzIs NiArNjM4LDIzIEBAIHN0ZDo6b3B0aW9uYWw8U3RyaW5nPiBDRE06OnNhbml0aXplU2Vzc2lvbklk KGNvbnN0IFN0cmluZyYgc2Vzc2lvbklkKQogICAgIHJldHVybiBtX3ByaXZhdGUtPnNhbml0aXpl U2Vzc2lvbklkKHNlc3Npb25JZCk7CiB9CiAKK1N0cmluZyBDRE06OnN0b3JhZ2VEaXJlY3Rvcnko KSBjb25zdAoreworICAgIGF1dG8qIGRvY3VtZW50ID0gZG93bmNhc3Q8RG9jdW1lbnQ+KHNjcmlw dEV4ZWN1dGlvbkNvbnRleHQoKSk7CisgICAgaWYgKCFkb2N1bWVudCkKKyAgICAgICAgcmV0dXJu IGVtcHR5U3RyaW5nKCk7CisKKyAgICBhdXRvKiBwYWdlID0gZG9jdW1lbnQtPnBhZ2UoKTsKKyAg ICBpZiAoIXBhZ2UgfHwgcGFnZS0+dXNlc0VwaGVtZXJhbFNlc3Npb24oKSkKKyAgICAgICAgcmV0 dXJuIGVtcHR5U3RyaW5nKCk7CisKKyAgICBhdXRvIHN0b3JhZ2VEaXJlY3RvcnkgPSBkb2N1bWVu dC0+c2V0dGluZ3MoKS5tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KCk7CisgICAgaWYgKHN0b3Jh Z2VEaXJlY3RvcnkuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKKwor ICAgIHJldHVybiBGaWxlU3lzdGVtOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQoc3RvcmFnZURp cmVjdG9yeSwgU2VjdXJpdHlPcmlnaW5EYXRhOjpmcm9tU2VjdXJpdHlPcmlnaW4oZG9jdW1lbnQt PnNlY3VyaXR5T3JpZ2luKCkpLmRhdGFiYXNlSWRlbnRpZmllcigpKTsKK30KKwogfQogCiAjZW5k aWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvQ0RN LmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL0NETS5oCmluZGV4IDk3 YTRjNTU4ZDA3ZWRlZmYxMDRkMjQ5ZGYxZmNhZmNkMGQ5ZjcyZjIuLjRiZjdiNjg3ODg1ZmNmMmEy MWE1NTBkNjMxZjVlYTliYzMxNDE5NjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvZW5jcnlwdGVkbWVkaWEvQ0RNLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNy eXB0ZWRtZWRpYS9DRE0uaApAQCAtNzUsNiArNzUsOCBAQCBwdWJsaWM6CiAKICAgICBzdGQ6Om9w dGlvbmFsPFN0cmluZz4gc2FuaXRpemVTZXNzaW9uSWQoY29uc3QgU3RyaW5nJiBzZXNzaW9uSWQp OwogCisgICAgU3RyaW5nIHN0b3JhZ2VEaXJlY3RvcnkoKSBjb25zdDsKKwogcHJpdmF0ZToKICAg ICBDRE0oRG9jdW1lbnQmLCBjb25zdCBTdHJpbmcmIGtleVN5c3RlbSk7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETUlu c3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5n QVZGT2JqQy5oCmluZGV4IDFjNmM3ZmJhZTBkYWRmZmMxNzBmYThkMDVjNTkyM2YwOWM1OTA5ZDku LjE5ZWE1Nzk0NTJhOWZjMjI2YWY5NzQ0ZGI5ZDdhNjFiYTgwMmIxMGQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETUluc3Rh bmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWlu Z0FWRk9iakMuaApAQCAtODMsMTEgKzgzLDEyIEBAIHByaXZhdGU6CiAKICAgICBXZWFrUHRyRmFj dG9yeTxDRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQz4gbV93ZWFrUHRyRmFjdG9y eTsKICAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBtX3NlcnZlckNlcnRpZmljYXRlOwotICAgIGJv b2wgbV9wZXJzaXN0ZW50U3RhdGVBbGxvd2VkIHsgZmFsc2UgfTsKKyAgICBib29sIG1fcGVyc2lz dGVudFN0YXRlQWxsb3dlZCB7IHRydWUgfTsKICAgICBSZXRhaW5QdHI8TlNVUkw+IG1fc3RvcmFn ZURpcmVjdG9yeTsKICAgICBSZXRhaW5QdHI8QVZDb250ZW50S2V5U2Vzc2lvbj4gbV9zZXNzaW9u OwogICAgIFJldGFpblB0cjxBVkNvbnRlbnRLZXlSZXF1ZXN0PiBtX3JlcXVlc3Q7CiAgICAgUmV0 YWluUHRyPFdlYkNvcmVGUFNDb250ZW50S2V5U2Vzc2lvbkRlbGVnYXRlPiBtX2RlbGVnYXRlOwor ICAgIFZlY3RvcjxSZXRhaW5QdHI8TlNEYXRhPj4gbV9leHBpcmVkU2Vzc2lvbnM7CiAgICAgU3Ry aW5nIG1fc2Vzc2lvbklkOwogCiAgICAgTGljZW5zZUNhbGxiYWNrIG1fcmVxdWVzdExpY2Vuc2VD YWxsYmFjazsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9vYmpjL0NETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDLm1tIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNSW5z dGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMubW0KaW5kZXggMWU5YzIzOWY3YTkxOWFmOTYw MDk2MzBmNGIyYTZhMWQwMzE4ZmYyNy4uMDE1NzJjMTcxMGQ1YjI0MDg5YjhiZDg5M2IxNDljMmRm NDM1NDJmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMubW0KKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RN SW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMubW0KQEAgLTMyLDYgKzMyLDcgQEAKICNp bXBvcnQgIkNETUtleVN5c3RlbUNvbmZpZ3VyYXRpb24uaCIKICNpbXBvcnQgIk5vdEltcGxlbWVu dGVkLmgiCiAjaW1wb3J0ICJTaGFyZWRCdWZmZXIuaCIKKyNpbXBvcnQgIlRleHREZWNvZGVyLmgi CiAjaW1wb3J0IDxBVkZvdW5kYXRpb24vQVZDb250ZW50S2V5U2Vzc2lvbi5oPgogI2ltcG9ydCA8 cGFsL3NwaS9tYWMvQVZGb3VuZGF0aW9uU1BJLmg+CiAjaW1wb3J0IDx3dGYvU29mdExpbmtpbmcu aD4KQEAgLTQ3LDYgKzQ4LDggQEAgU09GVF9MSU5LX0NPTlNUQU5UX01BWV9GQUlMKEFWRm91bmRh dGlvbiwgQVZDb250ZW50S2V5U3lzdGVtRmFpclBsYXlTdHJlYW1pbmcsIE4KIFNPRlRfTElOS19D TEFTU19PUFRJT05BTChBVkZvdW5kYXRpb24sIEFWUGVyc2lzdGFibGVDb250ZW50S2V5UmVxdWVz dCk7CiAjZW5kaWYKIAorc3RhdGljIGNvbnN0IE5TU3RyaW5nICpQbGF5YmFja1Nlc3Npb25JZEtl eSA9IEAiUGxheWJhY2tTZXNzaW9uSUQiOworCiBAaW50ZXJmYWNlIFdlYkNvcmVGUFNDb250ZW50 S2V5U2Vzc2lvbkRlbGVnYXRlIDogTlNPYmplY3Q8QVZDb250ZW50S2V5U2Vzc2lvbkRlbGVnYXRl PiB7CiAgICAgV2ViQ29yZTo6Q0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMqIF9w YXJlbnQ7CiB9CkBAIC0yMzksOCArMjQyLDM2IEBAIHZvaWQgQ0RNSW5zdGFuY2VGYWlyUGxheVN0 cmVhbWluZ0FWRk9iakM6OnJlcXVlc3RMaWNlbnNlKExpY2Vuc2VUeXBlIGxpY2Vuc2VUeXBlCiAg ICAgW21fc2Vzc2lvbiBwcm9jZXNzQ29udGVudEtleVJlcXVlc3RXaXRoSWRlbnRpZmllcjpuaWwg aW5pdGlhbGl6YXRpb25EYXRhOmluaXREYXRhLT5jcmVhdGVOU0RhdGEoKS5nZXQoKSBvcHRpb25z Om5pbF07CiB9CiAKK3N0YXRpYyBib29sIGlzRXF1YWwoY29uc3QgU2hhcmVkQnVmZmVyJiBkYXRh LCBjb25zdCBTdHJpbmcmIHZhbHVlKQoreworICAgIGF1dG8gYXJyYXlCdWZmZXIgPSBkYXRhLnRy eUNyZWF0ZUFycmF5QnVmZmVyKCk7CisgICAgaWYgKCFhcnJheUJ1ZmZlcikKKyAgICAgICAgcmV0 dXJuIGZhbHNlOworCisgICAgYXV0byBleGNlcHRpb25PckRlY29kZXIgPSBUZXh0RGVjb2Rlcjo6 Y3JlYXRlKEFTQ0lJTGl0ZXJhbCgidXRmOCIpLCBUZXh0RGVjb2Rlcjo6T3B0aW9ucygpKTsKKyAg ICBpZiAoZXhjZXB0aW9uT3JEZWNvZGVyLmhhc0V4Y2VwdGlvbigpKQorICAgICAgICByZXR1cm4g ZmFsc2U7CisKKyAgICBSZWY8VGV4dERlY29kZXI+IGRlY29kZXIgPSBleGNlcHRpb25PckRlY29k ZXIucmVsZWFzZVJldHVyblZhbHVlKCk7CisgICAgYXV0byBzdHJpbmdPckV4Y2VwdGlvbiA9IGRl Y29kZXItPmRlY29kZShCdWZmZXJTb3VyY2U6OlZhcmlhbnRUeXBlKFdURk1vdmUoYXJyYXlCdWZm ZXIpKSwgVGV4dERlY29kZXI6OkRlY29kZU9wdGlvbnMoKSk7CisgICAgaWYgKHN0cmluZ09yRXhj ZXB0aW9uLmhhc0V4Y2VwdGlvbigpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXR1 cm4gc3RyaW5nT3JFeGNlcHRpb24ucmV0dXJuVmFsdWUoKSA9PSB2YWx1ZTsKK30KKwogdm9pZCBD RE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6dXBkYXRlTGljZW5zZShjb25zdCBT dHJpbmcmLCBMaWNlbnNlVHlwZSwgY29uc3QgU2hhcmVkQnVmZmVyJiByZXNwb25zZURhdGEsIExp Y2Vuc2VVcGRhdGVDYWxsYmFjayBjYWxsYmFjaykKIHsKKyAgICBpZiAoIW1fZXhwaXJlZFNlc3Np b25zLmlzRW1wdHkoKSAmJiBpc0VxdWFsKHJlc3BvbnNlRGF0YSwgQVNDSUlMaXRlcmFsKCJhY2tu b3dsZWRnZWQiKSkpIHsKKyAgICAgICAgYXV0byBleHBpcmVkU2Vzc2lvbnMgPSBhZG9wdE5TKFtb TlNNdXRhYmxlQXJyYXkgYWxsb2NdIGluaXRdKTsKKyAgICAgICAgZm9yIChhdXRvJiBzZXNzaW9u IDogbV9leHBpcmVkU2Vzc2lvbnMpCisgICAgICAgICAgICBbZXhwaXJlZFNlc3Npb25zIGFkZE9i amVjdDpzZXNzaW9uLmdldCgpXTsgCisgICAgICAgIFJldGFpblB0cjxOU0RhdGE+IGFwcElkZW50 aWZpZXIgPSBtX3NlcnZlckNlcnRpZmljYXRlLT5jcmVhdGVOU0RhdGEoKTsKKyAgICAgICAgW2dl dEFWQ29udGVudEtleVNlc3Npb25DbGFzcygpIHJlbW92ZVBlbmRpbmdFeHBpcmVkU2Vzc2lvblJl cG9ydHM6ZXhwaXJlZFNlc3Npb25zLmdldCgpIHdpdGhBcHBJZGVudGlmaWVyOmFwcElkZW50aWZp ZXIuZ2V0KCkgc3RvcmFnZURpcmVjdG9yeUF0VVJMOm1fc3RvcmFnZURpcmVjdG9yeS5nZXQoKV07 CisgICAgICAgIGNhbGxiYWNrKGZhbHNlLCB7IH0sIHN0ZDo6bnVsbG9wdCwgc3RkOjpudWxsb3B0 LCBTdWNjZWVkZWQpOworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgaWYgKCFtX3JlcXVl c3QpIHsKICAgICAgICAgY2FsbGJhY2soZmFsc2UsIHN0ZDo6bnVsbG9wdCwgc3RkOjpudWxsb3B0 LCBzdGQ6Om51bGxvcHQsIEZhaWxlZCk7CiAgICAgICAgIHJldHVybjsKQEAgLTI2MiwyNCArMjkz LDk4IEBAIHZvaWQgQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakM6OnVwZGF0ZUxp Y2Vuc2UoY29uc3QgU3RyaW5nJiwgTGljZW5zZVR5CiAgICAgY2FsbGJhY2soZmFsc2UsIHN0ZDo6 bWFrZV9vcHRpb25hbChXVEZNb3ZlKGtleVN0YXR1c2VzKSksIHN0ZDo6bnVsbG9wdCwgc3RkOjpu dWxsb3B0LCBTdWNjZWVkZWQpOwogfQogCi12b2lkIENETUluc3RhbmNlRmFpclBsYXlTdHJlYW1p bmdBVkZPYmpDOjpsb2FkU2Vzc2lvbihMaWNlbnNlVHlwZSwgY29uc3QgU3RyaW5nJiwgY29uc3Qg U3RyaW5nJiwgTG9hZFNlc3Npb25DYWxsYmFjaykKLXsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwor dm9pZCBDRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6bG9hZFNlc3Npb24oTGlj ZW5zZVR5cGUgbGljZW5zZVR5cGUsIGNvbnN0IFN0cmluZyYgc2Vzc2lvbklkLCBjb25zdCBTdHJp bmcmIG9yaWdpbiwgTG9hZFNlc3Npb25DYWxsYmFjayBjYWxsYmFjaykKK3sKKyAgICBVTlVTRURf UEFSQU0ob3JpZ2luKTsKKyAgICBpZiAobGljZW5zZVR5cGUgPT0gTGljZW5zZVR5cGU6OlBlcnNp c3RlbnRVc2FnZVJlY29yZCkgeworICAgICAgICBpZiAoIW1fcGVyc2lzdGVudFN0YXRlQWxsb3dl ZCB8fCAhbV9zdG9yYWdlRGlyZWN0b3J5KSB7CisgICAgICAgICAgICBjYWxsYmFjayhzdGQ6Om51 bGxvcHQsIHN0ZDo6bnVsbG9wdCwgc3RkOjpudWxsb3B0LCBGYWlsZWQsIFNlc3Npb25Mb2FkRmFp bHVyZTo6TWlzbWF0Y2hlZFNlc3Npb25UeXBlKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgfQorICAgICAgICBpZiAoIW1fc2VydmVyQ2VydGlmaWNhdGUpIHsKKyAgICAgICAgICAgIGNh bGxiYWNrKHN0ZDo6bnVsbG9wdCwgc3RkOjpudWxsb3B0LCBzdGQ6Om51bGxvcHQsIEZhaWxlZCwg U2Vzc2lvbkxvYWRGYWlsdXJlOjpPdGhlcik7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAg IH0KKworICAgICAgICBSZXRhaW5QdHI8TlNEYXRhPiBhcHBJZGVudGlmaWVyID0gbV9zZXJ2ZXJD ZXJ0aWZpY2F0ZS0+Y3JlYXRlTlNEYXRhKCk7CisgICAgICAgIEtleVN0YXR1c1ZlY3RvciBjaGFu Z2VkS2V5czsKKyAgICAgICAgZm9yIChOU0RhdGEqIGV4cGlyZWRTZXNzaW9uRGF0YSBpbiBbZ2V0 QVZDb250ZW50S2V5U2Vzc2lvbkNsYXNzKCkgcGVuZGluZ0V4cGlyZWRTZXNzaW9uUmVwb3J0c1dp dGhBcHBJZGVudGlmaWVyOmFwcElkZW50aWZpZXIuZ2V0KCkgc3RvcmFnZURpcmVjdG9yeUF0VVJM Om1fc3RvcmFnZURpcmVjdG9yeS5nZXQoKV0pIHsKKyAgICAgICAgICAgIE5TRGljdGlvbmFyeSAq ZXhwaXJlZFNlc3Npb24gPSBbTlNQcm9wZXJ0eUxpc3RTZXJpYWxpemF0aW9uIHByb3BlcnR5TGlz dFdpdGhEYXRhOmV4cGlyZWRTZXNzaW9uRGF0YSBvcHRpb25zOmtDRlByb3BlcnR5TGlzdEltbXV0 YWJsZSBmb3JtYXQ6bnVsbHB0ciBlcnJvcjpudWxscHRyXTsKKyAgICAgICAgICAgIE5TU3RyaW5n ICpwbGF5YmFja1Nlc3Npb25JZFZhbHVlID0gKE5TU3RyaW5nICopW2V4cGlyZWRTZXNzaW9uIG9i amVjdEZvcktleTpQbGF5YmFja1Nlc3Npb25JZEtleV07CisgICAgICAgICAgICBpZiAoIVtwbGF5 YmFja1Nlc3Npb25JZFZhbHVlIGlzS2luZE9mQ2xhc3M6W05TU3RyaW5nIGNsYXNzXV0pCisgICAg ICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgICAgIGlmIChzZXNzaW9uSWQgPT0gU3Ry aW5nKHBsYXliYWNrU2Vzc2lvbklkVmFsdWUpKSB7CisgICAgICAgICAgICAgICAgLy8gRklYTUUo cmRhcjovL3Byb2JsZW0vMzU5MzQ5MjIpOiB1c2Uga2V5IHZhbHVlcyBzdG9yZWQgaW4gZXhwaXJl ZCBzZXNzaW9uIHJlcG9ydCBvbmNlIGF2YWlsYWJsZQorICAgICAgICAgICAgICAgIGNoYW5nZWRL ZXlzLmFwcGVuZCgoS2V5U3RhdHVzVmVjdG9yOjpWYWx1ZVR5cGUpeyBTaGFyZWRCdWZmZXI6OmNy ZWF0ZSgpLCBLZXlTdGF0dXM6OlJlbGVhc2VkIH0pOworICAgICAgICAgICAgICAgIG1fZXhwaXJl ZFNlc3Npb25zLmFwcGVuZChleHBpcmVkU2Vzc2lvbkRhdGEpOworICAgICAgICAgICAgfQorICAg ICAgICB9CisKKyAgICAgICAgaWYgKGNoYW5nZWRLZXlzLmlzRW1wdHkoKSkgeworICAgICAgICAg ICAgY2FsbGJhY2soc3RkOjpudWxsb3B0LCBzdGQ6Om51bGxvcHQsIHN0ZDo6bnVsbG9wdCwgRmFp bGVkLCBTZXNzaW9uTG9hZEZhaWx1cmU6Ok5vU2Vzc2lvbkRhdGEpOworICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICB9CisKKyAgICAgICAgY2FsbGJhY2soV1RGTW92ZShjaGFuZ2VkS2V5cyks IHN0ZDo6bnVsbG9wdCwgc3RkOjpudWxsb3B0LCBTdWNjZWVkZWQsIFNlc3Npb25Mb2FkRmFpbHVy ZTo6Tm9uZSk7CisgICAgfQogfQogCi12b2lkIENETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdB VkZPYmpDOjpjbG9zZVNlc3Npb24oY29uc3QgU3RyaW5nJiwgQ2xvc2VTZXNzaW9uQ2FsbGJhY2sp Cit2b2lkIENETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDOjpjbG9zZVNlc3Npb24o Y29uc3QgU3RyaW5nJiwgQ2xvc2VTZXNzaW9uQ2FsbGJhY2sgY2FsbGJhY2spCiB7Ci0gICAgbm90 SW1wbGVtZW50ZWQoKTsKKyAgICBpZiAobV9yZXF1ZXN0TGljZW5zZUNhbGxiYWNrKSB7CisgICAg ICAgIG1fcmVxdWVzdExpY2Vuc2VDYWxsYmFjayhTaGFyZWRCdWZmZXI6OmNyZWF0ZSgpLCBtX3Nl c3Npb25JZCwgZmFsc2UsIEZhaWxlZCk7CisgICAgICAgIG1fcmVxdWVzdExpY2Vuc2VDYWxsYmFj ayA9IG51bGxwdHI7CisgICAgfQorICAgIGlmIChtX3VwZGF0ZUxpY2Vuc2VDYWxsYmFjaykgewor ICAgICAgICBtX3VwZGF0ZUxpY2Vuc2VDYWxsYmFjayh0cnVlLCBzdGQ6Om51bGxvcHQsIHN0ZDo6 bnVsbG9wdCwgc3RkOjpudWxsb3B0LCBGYWlsZWQpOworICAgICAgICBtX3VwZGF0ZUxpY2Vuc2VD YWxsYmFjayA9IG51bGxwdHI7CisgICAgfQorICAgIGlmIChtX3JlbW92ZVNlc3Npb25EYXRhQ2Fs bGJhY2spIHsKKyAgICAgICAgbV9yZW1vdmVTZXNzaW9uRGF0YUNhbGxiYWNrKHsgfSwgc3RkOjpu dWxsb3B0LCBGYWlsZWQpOworICAgICAgICBtX3JlbW92ZVNlc3Npb25EYXRhQ2FsbGJhY2sgPSBu dWxscHRyOworICAgIH0KKyAgICBtX3Nlc3Npb24gPSBudWxscHRyOworICAgIG1fcmVxdWVzdCA9 IG51bGxwdHI7CisgICAgY2FsbGJhY2soKTsKIH0KIAotdm9pZCBDRE1JbnN0YW5jZUZhaXJQbGF5 U3RyZWFtaW5nQVZGT2JqQzo6cmVtb3ZlU2Vzc2lvbkRhdGEoY29uc3QgU3RyaW5nJiwgTGljZW5z ZVR5cGUsIFJlbW92ZVNlc3Npb25EYXRhQ2FsbGJhY2spCit2b2lkIENETUluc3RhbmNlRmFpclBs YXlTdHJlYW1pbmdBVkZPYmpDOjpyZW1vdmVTZXNzaW9uRGF0YShjb25zdCBTdHJpbmcmIHNlc3Np b25JZCwgTGljZW5zZVR5cGUgbGljZW5zZVR5cGUsIFJlbW92ZVNlc3Npb25EYXRhQ2FsbGJhY2sg Y2FsbGJhY2spCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBbbV9zZXNzaW9uIGV4cGly ZV07CisKKyAgICBpZiAobGljZW5zZVR5cGUgPT0gTGljZW5zZVR5cGU6OlBlcnNpc3RlbnRVc2Fn ZVJlY29yZCkgeworICAgICAgICBpZiAoIW1fcGVyc2lzdGVudFN0YXRlQWxsb3dlZCB8fCAhbV9z dG9yYWdlRGlyZWN0b3J5IHx8ICFtX3NlcnZlckNlcnRpZmljYXRlKSB7CisgICAgICAgICAgICBj YWxsYmFjayh7IH0sIHN0ZDo6bnVsbG9wdCwgRmFpbGVkKTsKKyAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgfQorCisgICAgICAgIFJldGFpblB0cjxOU0RhdGE+IGFwcElkZW50aWZpZXIgPSBt X3NlcnZlckNlcnRpZmljYXRlLT5jcmVhdGVOU0RhdGEoKTsKKyAgICAgICAgUmV0YWluUHRyPE5T TXV0YWJsZUFycmF5PiBleHBpcmVkU2Vzc2lvbnNBcnJheSA9IGFkb3B0TlMoW1tOU011dGFibGVB cnJheSBhbGxvY10gaW5pdF0pOworICAgICAgICBLZXlTdGF0dXNWZWN0b3IgY2hhbmdlZEtleXM7 CisgICAgICAgIGZvciAoTlNEYXRhKiBleHBpcmVkU2Vzc2lvbkRhdGEgaW4gW2dldEFWQ29udGVu dEtleVNlc3Npb25DbGFzcygpIHBlbmRpbmdFeHBpcmVkU2Vzc2lvblJlcG9ydHNXaXRoQXBwSWRl bnRpZmllcjphcHBJZGVudGlmaWVyLmdldCgpIHN0b3JhZ2VEaXJlY3RvcnlBdFVSTDptX3N0b3Jh Z2VEaXJlY3RvcnkuZ2V0KCldKSB7CisgICAgICAgICAgICBOU0RpY3Rpb25hcnkgKmV4cGlyZWRT ZXNzaW9uID0gW05TUHJvcGVydHlMaXN0U2VyaWFsaXphdGlvbiBwcm9wZXJ0eUxpc3RXaXRoRGF0 YTpleHBpcmVkU2Vzc2lvbkRhdGEgb3B0aW9uczprQ0ZQcm9wZXJ0eUxpc3RJbW11dGFibGUgZm9y bWF0Om51bGxwdHIgZXJyb3I6bnVsbHB0cl07CisgICAgICAgICAgICBOU1N0cmluZyAqcGxheWJh Y2tTZXNzaW9uSWRWYWx1ZSA9IChOU1N0cmluZyAqKVtleHBpcmVkU2Vzc2lvbiBvYmplY3RGb3JL ZXk6UGxheWJhY2tTZXNzaW9uSWRLZXldOworICAgICAgICAgICAgaWYgKCFbcGxheWJhY2tTZXNz aW9uSWRWYWx1ZSBpc0tpbmRPZkNsYXNzOltOU1N0cmluZyBjbGFzc11dKQorICAgICAgICAgICAg ICAgIGNvbnRpbnVlOworCisgICAgICAgICAgICBpZiAoc2Vzc2lvbklkID09IFN0cmluZyhwbGF5 YmFja1Nlc3Npb25JZFZhbHVlKSkgeworICAgICAgICAgICAgICAgIC8vIEZJWE1FKHJkYXI6Ly9w cm9ibGVtLzM1OTM0OTIyKTogdXNlIGtleSB2YWx1ZXMgc3RvcmVkIGluIGV4cGlyZWQgc2Vzc2lv biByZXBvcnQgb25jZSBhdmFpbGFibGUKKyAgICAgICAgICAgICAgICBjaGFuZ2VkS2V5cy5hcHBl bmQoKEtleVN0YXR1c1ZlY3Rvcjo6VmFsdWVUeXBlKXsgU2hhcmVkQnVmZmVyOjpjcmVhdGUoKSwg S2V5U3RhdHVzOjpSZWxlYXNlZCB9KTsKKyAgICAgICAgICAgICAgICBtX2V4cGlyZWRTZXNzaW9u cy5hcHBlbmQoZXhwaXJlZFNlc3Npb25EYXRhKTsKKyAgICAgICAgICAgICAgICBbZXhwaXJlZFNl c3Npb25zQXJyYXkgYWRkT2JqZWN0OmV4cGlyZWRTZXNzaW9uXTsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgfQorCisgICAgICAgIFJldGFpblB0cjxOU0RhdGE+IGV4cGlyZWRTZXNzaW9uc0RhdGEg PSBbTlNQcm9wZXJ0eUxpc3RTZXJpYWxpemF0aW9uIGRhdGFXaXRoUHJvcGVydHlMaXN0OmV4cGly ZWRTZXNzaW9uc0FycmF5LmdldCgpIGZvcm1hdDpOU1Byb3BlcnR5TGlzdEJpbmFyeUZvcm1hdF92 MV8wIG9wdGlvbnM6a0NGUHJvcGVydHlMaXN0SW1tdXRhYmxlIGVycm9yOm51bGxwdHJdOworCisg ICAgICAgIGNhbGxiYWNrKFdURk1vdmUoY2hhbmdlZEtleXMpLCBTaGFyZWRCdWZmZXI6OmNyZWF0 ZShleHBpcmVkU2Vzc2lvbnNEYXRhLmdldCgpKSwgU3VjY2VlZGVkKTsKKyAgICB9CiB9CiAKIHZv aWQgQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakM6OnN0b3JlUmVjb3JkT2ZLZXlV c2FnZShjb25zdCBTdHJpbmcmKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgLy8gbm8t b3A7IGtleSB1c2FnZSBkYXRhIGlzIHN0b3JlZCBhdXRvbWF0aWNhbGx5LgogfQogCiBjb25zdCBT dHJpbmcmIENETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDOjprZXlTeXN0ZW0oKSBj b25zdAo=