232071 2021-10-21 02:41:02 -0700 Hardware PCF filtering does not work on iOS 15 when using WebGL2 2022-11-15 04:59:58 -0800 1 1 1 Unclassified WebKit WebGL WebKit Nightly Build iPhone / iPad Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mvaligursky kpiddington bfulgham dino ews-watchlist gman kbr kkinnunen kondapallykalyan kpiddington webkit-bug-importer oldest_to_newest 1807058 0 mvaligursky 2021-10-21 02:41:02 -0700 See https://github.com/playcanvas/engine/issues/3590#issuecomment-945994262 Hardware PCF filtering (compare sampling of depth shadow) does not seem to work on iOS 15. It works on all other devices and platforms, including Safari 15 on MacOS. Steps to repro: http://playcanvas.github.io/#/graphics/shadow-cascades in Controls, set Count to 1, resolution to around 512, filtering PCF3 (it's easier to click on sliders than slide them) and notice how pixelated the shadows are on iOS 15 platform. 1807371 1 webkit-bug-importer 2021-10-21 14:49:03 -0700 <rdar://problem/84524233> 1807828 2 kbr 2021-10-22 12:47:04 -0700 Only Apple engineers will be able to triage this effectively but is there any way you can provide a smaller test case? Although - I think depth comparisons in the direct-to-Metal translator were a known missing feature and might have been implemented upstream. Kyle, do you remember? Searching anglebug.com I couldn't find recent CLs. 1807952 3 kpiddington 2021-10-22 16:39:33 -0700 (In reply to Kenneth Russell from comment #2) > Only Apple engineers will be able to triage this effectively but is there > any way you can provide a smaller test case? > > Although - I think depth comparisons in the direct-to-Metal translator were > a known missing feature and might have been implemented upstream. Kyle, do > you remember? Searching anglebug.com I couldn't find recent CLs. I believe the CL you were thinking of was here: https://chromium-review.googlesource.com/c/angle/angle/+/3232818, which just added some workarounds for platforms that didn't correctly implement sample_compare for various options. Martin, which iOS device are you seeing this regression on? Could you attach a screenshot so I could compare on my own devices? 1807960 4 kpiddington 2021-10-22 16:50:06 -0700 Answered my own question by looking at the forums :) Perhaps you can answer me a second question then: What pixel format are you using to back the depth buffer? on iOS, we have several formats that cannot be filtered on iOS that can on macOS. Are you perhaps using Depth32Float or D32S8 to back your depth buffer? Does changing that to Depth16 improve the issue? https://developer.apple.com/metal/Metal-Feature-Set-Tables.pdf 1809749 5 mvaligursky 2021-10-28 10:42:48 -0700 Yes, it uses Depth32Float format. I'll test out the 16bit format next week when back from holidays. Is there some way to test for the filtering support of a format? Thanks! 1810607 6 mvaligursky 2021-11-01 07:18:38 -0700 I've tested this on iPhone XR, OS 15.0. Originally we used 32bit float depth texture: glFormat = gl.DEPTH_COMPONENT; glInternalFormat = gl.DEPTH_COMPONENT32F; glPixelType = gl.FLOAT; I now tried 16 bit: glFormat = gl.DEPTH_COMPONENT; glInternalFormat = gl.DEPTH_COMPONENT16; glPixelType = gl.UNSIGNED_INT; And also 24bit: glFormat = gl.DEPTH_COMPONENT; glInternalFormat = gl.DEPTH_COMPONENT24; glPixelType = gl.UNSIGNED_INT; They all work as expected on MacOS, but I still get no filtering on iPhone XR. I also tried Google Pixel 3A and all 3 versions work fine there. 1810647 7 kpiddington 2021-11-01 09:24:34 -0700 Thanks for having a look. I've found a related issue from the SPIRV-Cross team: https://github.com/KhronosGroup/SPIRV-Cross/issues/533 It seems by inserting a constexpr sampler into our shadow sampler function, we're able to return PCF functionality to this shader. Right now, I'm double checking if this is a case of state initialization gone wrong, or if we've missed some restriction. 1810998 8 443049 kpiddington 2021-11-01 18:23:11 -0700 Created attachment 443049 Patch 1810999 9 ews-watchlist 2021-11-01 18:24:21 -0700 Note that there are important steps to take when updating ANGLE. See https://trac.webkit.org/wiki/UpdatingANGLE 1811052 10 443049 kkinnunen 2021-11-02 00:59:13 -0700 Comment on attachment 443049 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=443049&action=review Some comments that might come up later in the upstream. I'm not saying if it's 100% required to fix the comments here to land this here now. > Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/DisplayMtl.mm:-941 > - Would it be more in line with the project code structure to rename this to supports32BitFloatFiltering and then have the .json query this property? then move maybe also the conditions `display->supportsMacGPUFamily(1) ||` somehow into this FeatureMtl trigger? > Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/DisplayMtl.mm:1086 > + return [mMetalDevice supports32BitFloatFiltering]; I think your compile failure is the case where this one is a "property" name, where as below is a "getter method name". it looks a bit odd to have one "supports" and the other "is...Supported". > Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/DisplayMtl.mm:1090 > +bool DisplayMtl::supportsDepth24Stencil8PixelFormat() const Would it be more in line with the project structure to add this as a FeaturesMtl, too? Note: allowSeparatedDepthStencilBuffers is already a related feature query, so this one should be maybe added in such a way that it's clear that both are internally consistent. FWIW: If I understand correctly, the current DEPTH24_STENCIL8 emulation implementation is triggered based on `allowSeparatedDepthStencilBuffers`. It kind of makes sense today, but it appears funny after supportsDepth24Stencil8PixelFormat is introduced as this would be the more appropriate flag to check in many places. > Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/TextureMtl.mm:799 > + !mFormat.getCaps().filterable) > { now you can use `webkit-patch format -g HEAD` to get this formatted according to ANGLE rules. 1813389 11 443747 kpiddington 2021-11-09 16:13:37 -0800 Created attachment 443747 Patch 1813400 12 443754 kpiddington 2021-11-09 16:36:21 -0800 Created attachment 443754 Patch 1813712 13 kbr 2021-11-10 11:12:33 -0800 Surfacing a conversation we've had on Slack on this topic: Depth textures in OpenGL ES 3.0 are actually specified as not being filterable; i.e. using GL_LINEAR filtering for the min/mag filter is supposed to make the texture non-renderable. See: https://github.com/KhronosGroup/WebGL/issues/3353 Martin, is it specifically linear filtering of depth textures that your algorithm relies on? Or is it something else about how depth comparisons are being performed that might be different? 1813839 14 kbr 2021-11-10 16:25:50 -0800 More feedback based on chats. It seems likely that linear filtering is being allowed because the TEXTURE_COMPARE_MODE is set to COMPARE_REF_TO_TEXTURE. The depth texture would be considered incomplete specifically if TEXTURE_COMPARE_MODE were set to NONE. https://github.com/KhronosGroup/WebGL/issues/3359 If the proposed patch is applied, what happens to Gregg's test from: https://github.com/KhronosGroup/WebGL/issues/3353 specifically, https://jsgist.org/?src=493218139726a53b7b3affbb636148e9 and the d16 linear case? If that continues to be rejected as non-renderable - then I think this patch is OK. ANGLE must then be enforcing the renderability / filterability requirements at higher levels than the Metal backend. 1813948 15 mvaligursky 2021-11-11 01:32:10 -0800 Yes, the PCF depends on LINEAR filtering of the depth map. But as you said, this is only supported when COMPARE_REF_TO_TEXTURE is set - in which case the hardware should do 4 samples, compare them to passed in depth value, and return the interpolated result. At the moment on iOS15 it seems it only does single sample, or does not interpolate 4 samples. Other WebGL2 platforms give us this result (source is a very low res shadow map to see the points clearly) https://user-images.githubusercontent.com/59932779/137777777-6ffa5fdb-5b43-4d27-9b45-6361be4871e3.png but iOS15 gives us this: https://user-images.githubusercontent.com/59932779/137777731-62d53fe4-c274-43ea-b0b6-6d6c8cb5a462.png These are the settings we use https://user-images.githubusercontent.com/59932779/137777856-2ffae554-815e-40d0-baaf-21c252984b92.png 1813949 16 mvaligursky 2021-11-11 01:35:22 -0800 See the page 28 here: https://www.slideserve.com/myrrh/shadow-mapping-powerpoint-ppt-presentation it seems like iOS15 is doing GL_NEAREST instead of GL_LINEAR. 1817121 17 kpiddington 2021-11-20 09:37:10 -0800 Using Gregg's test here: https://jsgist.org/?src=493218139726a53b7b3affbb636148e9 D16 and D32 Linear sampled filtering still correctly does not render, though sample_compare now correctly filters. I think this patch brings us into spec alignment. 1817247 18 443754 kbr 2021-11-22 00:36:07 -0800 Comment on attachment 443754 Patch Thanks for confirming that Gregg's sample renders correctly on iOS with this change. r+ 1818913 19 ews-feeder 2021-11-30 13:35:34 -0800 Committed r286323 (244682@main): <https://commits.webkit.org/244682@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 443754. 1837515 20 bfulgham 2022-02-04 11:07:56 -0800 This change should be present in STP 139, iOS 15.4 Beta, and macOS 12.3 Beta. 1912573 21 mvaligursky 2022-11-15 04:59:58 -0800 I'd like to report, that the original repro case I made (see here: https://github.com/playcanvas/engine/issues/3590#issuecomment-945994262 ) still does not render correctly on iPhone XR 16.1.1, tested in Safari. 443049 2021-11-01 18:23:11 -0700 2021-11-09 16:13:34 -0800 Patch bug-232071-20211101202310.patch text/plain 11415 kpiddington U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MDcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggOWI4ZDIzYTZjNzFhYmNkZGNjZWI2N2M0YmZhMjcyYTIyMGQ5YmJlNy4uYWIzYzNlMTQwZmU2 YzgwY2NmMGYxYjNjOGRjNzY2OTk1MTRlZWMwMyAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI1IEBACisyMDIxLTExLTAxICBLeWxlIFBpZGRpbmd0b24gIDxrcGlkZGlu Z3RvbkBhcHBsZS5jb20+CisKKyAgICAgICAgSGFyZHdhcmUgUENGIGZpbHRlcmluZyBkb2VzIG5v dCB3b3JrIG9uIGlPUyAxNSB3aGVuIHVzaW5nIFdlYkdMMgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDcxCisKKwlMb3dlciByZXN0cmljdGlvbnMg b24gc2FtcGxpbmcgRDMyRiBmb3JtYXRzLCBhbmQgYWxsb3cgZmlsdGVyaW5nCisJb2YgRGVwdGgx NkYgb24gaU9TIGhhcmR3YXJlLCBhcyBpdCB3YXMgcHJldmlvdXNseSByZXN0cmljdGVkLgorCQor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluY2x1ZGUv cGxhdGZvcm0vRmVhdHVyZXNNdGwuaDoKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIv bWV0YWwvRGlzcGxheU10bC5oOgorICAgICAgICAqIHNyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRh bC9EaXNwbGF5TXRsLm1tOgorICAgICAgICAocng6OkRpc3BsYXlNdGw6OmluaXRpYWxpemVGZWF0 dXJlcyk6CisgICAgICAgIChyeDo6RGlzcGxheU10bDo6c3VwcG9ydHMzMkJpdEZsb2F0RmlsdGVy aW5nIGNvbnN0KToKKyAgICAgICAgKHJ4OjpEaXNwbGF5TXRsOjpzdXBwb3J0c0RlcHRoMjRTdGVu Y2lsOFBpeGVsRm9ybWF0IGNvbnN0KToKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIv bWV0YWwvVGV4dHVyZU10bC5tbToKKyAgICAgICAgKHJ4OjpUZXh0dXJlTXRsOjplbnN1cmVTYW1w bGVyU3RhdGVDcmVhdGVkKToKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwv bXRsX2Zvcm1hdF9tYXAuanNvbjoKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0 YWwvbXRsX2Zvcm1hdF90YWJsZV9hdXRvZ2VuLm1tOgorICAgICAgICAocng6Om10bDo6Rm9ybWF0 VGFibGU6OmluaXROYXRpdmVGb3JtYXRDYXBzQXV0b2dlbik6CisKIDIwMjEtMTAtMjcgIEtpbW1v IEtpbm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChT YWZhcmkgMTUpOiBQb29yIFdlYkdMIHBlcmZvcm1hbmNlIG9uIGh0dHBzOi8vZG93bmxvYWRzLnNj aXJyYS5jb20vbGFicy9wYXJ0aWNsZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FO R0xFL2luY2x1ZGUvcGxhdGZvcm0vRmVhdHVyZXNNdGwuaCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FO R0xFL2luY2x1ZGUvcGxhdGZvcm0vRmVhdHVyZXNNdGwuaAppbmRleCAwOWMyY2JiYTJiMWNlODJh MmM4MjcxZTA1YzhkYTNiYWQ0NDE4NjczLi4yYWYwMDYxM2JmNGM4ZDg5YzcxOGIzYTFhOTcyY2U0 OGRiN2Y5NDY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9pbmNsdWRlL3Bs YXRmb3JtL0ZlYXR1cmVzTXRsLmgKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvaW5jbHVk ZS9wbGF0Zm9ybS9GZWF0dXJlc010bC5oCkBAIC0yMSwxMSArMjEsNiBAQCBzdHJ1Y3QgRmVhdHVy ZXNNdGwgOiBGZWF0dXJlU2V0QmFzZQogICAgICAgICAiaGFzX2Jhc2VfdmVydGV4X2luc3RhbmNl ZF9kcmF3IiwgRmVhdHVyZUNhdGVnb3J5OjpNZXRhbEZlYXR1cmVzLAogICAgICAgICAiVGhlIHJl bmRlcmVyIHN1cHBvcnRzIGJhc2UgdmVydGV4IGluc3RhbmNlZCBkcmF3IiwgJm1lbWJlcnN9Owog Ci0gICAgLy8gU3VwcG9ydCBkZXB0aCB0ZXh0dXJlIGZpbHRlcmluZwotICAgIEZlYXR1cmUgaGFz RGVwdGhUZXh0dXJlRmlsdGVyaW5nID0gewotICAgICAgICAiaGFzX2RlcHRoX3RleHR1cmVfZmls dGVyaW5nIiwgRmVhdHVyZUNhdGVnb3J5OjpNZXRhbEZlYXR1cmVzLAotICAgICAgICAiVGhlIHJl bmRlcmVyIHN1cHBvcnRzIGRlcHRoIHRleHR1cmUncyBmaWx0ZXJpbmcgb3RoZXIgdGhhbiBuZWFy ZXN0IiwgJm1lbWJlcnN9OwotCiAgICAgLy8gU3VwcG9ydCBleHBsaWNpdCBtZW1vcnkgYmFycmll cgogICAgIEZlYXR1cmUgaGFzRXhwbGljaXRNZW1CYXJyaWVyID0geyJoYXNfZXhwbGljaXRfbWVt X2JhcnJpZXIiLCBGZWF0dXJlQ2F0ZWdvcnk6Ok1ldGFsRmVhdHVyZXMsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIlRoZSByZW5kZXJlciBzdXBwb3J0cyBleHBsaWNpdCBt ZW1vcnkgYmFycmllciIsICZtZW1iZXJzfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5 L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9EaXNwbGF5TXRsLmggYi9Tb3VyY2Uv VGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvRGlzcGxheU10bC5o CmluZGV4IGViY2VkMGI5N2M0MGYwODY3YTZkMTc2OTFhNDQ2NDVkZDY2M2Q1MjguLjcyOTViNTAz ZmQwMWM1NjEwYWE1M2Y3NDMzNzhiNTM5ZTk4NTE4MGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGly ZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9EaXNwbGF5TXRsLmgKKysr IGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL0Rp c3BsYXlNdGwuaApAQCAtMTIyLDYgKzEyMiw4IEBAIGNsYXNzIERpc3BsYXlNdGwgOiBwdWJsaWMg RGlzcGxheUltcGwKICAgICBib29sIHN1cHBvcnRzRWl0aGVyR1BVRmFtaWx5KHVpbnQ4X3QgaU9T RmFtaWx5LCB1aW50OF90IG1hY0ZhbWlseSkgY29uc3Q7CiAgICAgYm9vbCBzdXBwb3J0c0lPU0dQ VUZhbWlseSh1aW50OF90IGlPU0ZhbWlseSkgY29uc3Q7CiAgICAgYm9vbCBzdXBwb3J0c01hY0dQ VUZhbWlseSh1aW50OF90IG1hY0ZhbWlseSkgY29uc3Q7CisgICAgYm9vbCBzdXBwb3J0c0RlcHRo MjRTdGVuY2lsOFBpeGVsRm9ybWF0KCkgY29uc3Q7CisgICAgYm9vbCBzdXBwb3J0czMyQml0Rmxv YXRGaWx0ZXJpbmcoKSBjb25zdDsKICAgICBib29sIGlzQU1EKCkgY29uc3Q7CiAgICAgYm9vbCBp c0ludGVsKCkgY29uc3Q7CiAgICAgYm9vbCBpc05WSURJQSgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEv U291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL0Rpc3Bs YXlNdGwubW0gYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIv bWV0YWwvRGlzcGxheU10bC5tbQppbmRleCBjYjNhZmZmNDNlM2Q2MTZjMGYxOTdhYzY3OGNmOWUx ZWIzYmJjNzBhLi5iZTA1ZTIwOTkzNDUyOTFkZjFjNTk3MzM5OThmN2MxYjE5ODAwN2VhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0 YWwvRGlzcGxheU10bC5tbQorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5H TEUvcmVuZGVyZXIvbWV0YWwvRGlzcGxheU10bC5tbQpAQCAtOTM4LDkgKzkzOCw2IEBAIHZvaWQg RGlzcGxheU10bDo6aW5pdGlhbGl6ZUZlYXR1cmVzKCkKIAogICAgIEFOR0xFX0ZFQVRVUkVfQ09O RElUSU9OKCgmbUZlYXR1cmVzKSwgYWxsb3dHZW5NdWx0aXBsZU1pcHNQZXJQYXNzLCB0cnVlKTsK ICAgICBBTkdMRV9GRUFUVVJFX0NPTkRJVElPTigoJm1GZWF0dXJlcyksIGZvcmNlQnVmZmVyR1BV U3RvcmFnZSwgZmFsc2UpOwotCi0gICAgQU5HTEVfRkVBVFVSRV9DT05ESVRJT04oKCZtRmVhdHVy ZXMpLCBoYXNEZXB0aFRleHR1cmVGaWx0ZXJpbmcsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgKGlzT1NYIHx8IGlzQ2F0YWx5c3QpICYmICFpc0FSTSk7CiAgICAgQU5HTEVfRkVBVFVSRV9D T05ESVRJT04oKCZtRmVhdHVyZXMpLCBoYXNFeHBsaWNpdE1lbUJhcnJpZXIsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgaXNNZXRhbDJfMSAmJiAoaXNPU1ggfHwgaXNDYXRhbHlzdCkgJiYg IWlzQVJNKTsKICAgICBBTkdMRV9GRUFUVVJFX0NPTkRJVElPTigoJm1GZWF0dXJlcyksIGhhc0Rl cHRoQXV0b1Jlc29sdmUsIHN1cHBvcnRzRWl0aGVyR1BVRmFtaWx5KDMsIDIpKTsKQEAgLTEwODIs NiArMTA3OSwyMSBAQCBib29sIERpc3BsYXlNdGw6OnN1cHBvcnRzRWl0aGVyR1BVRmFtaWx5KHVp bnQ4X3QgaU9TRmFtaWx5LCB1aW50OF90IG1hY0ZhbWlseSkgYwogICAgIHJldHVybiBzdXBwb3J0 c0lPU0dQVUZhbWlseShpT1NGYW1pbHkpIHx8IHN1cHBvcnRzTWFjR1BVRmFtaWx5KG1hY0ZhbWls eSk7CiB9CiAKKworCitib29sIERpc3BsYXlNdGw6OnN1cHBvcnRzMzJCaXRGbG9hdEZpbHRlcmlu ZygpIGNvbnN0Cit7CisgICAgcmV0dXJuIFttTWV0YWxEZXZpY2Ugc3VwcG9ydHMzMkJpdEZsb2F0 RmlsdGVyaW5nXTsKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKK2Jvb2wgRGlzcGxheU10bDo6c3Vw cG9ydHNEZXB0aDI0U3RlbmNpbDhQaXhlbEZvcm1hdCgpIGNvbnN0Cit7CisjaWYgVEFSR0VUX09T X09TWCB8fCBUQVJHRVRfT1NfTUFDQ0FUQUxZU1QKKyAgICByZXR1cm4gW21NZXRhbERldmljZSBp c0RlcHRoMjRTdGVuY2lsOFBpeGVsRm9ybWF0U3VwcG9ydGVkXTsKKyNlbmRpZgorICAgIHJldHVy biBmYWxzZTsKK30KIGJvb2wgRGlzcGxheU10bDo6aXNBTUQoKSBjb25zdAogewogICAgIHJldHVy biBhbmdsZTo6SXNBTUQobU1ldGFsRGV2aWNlVmVuZG9ySWQpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL1RleHR1cmVNdGwu bW0gYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwv VGV4dHVyZU10bC5tbQppbmRleCA2Nzc5ZmEzZjA0OTViMmE1ODJiZjZlOTc0Zjc1OTMzMDY4MGUx NTFlLi40YzVjMmQ5MjgxYzlkNzg3M2QyN2EzZjIwN2U3YjY4YjdiM2FhYTYzIDEwMDY0NAotLS0g YS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvVGV4 dHVyZU10bC5tbQorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVu ZGVyZXIvbWV0YWwvVGV4dHVyZU10bC5tbQpAQCAtNzk1LDcgKzc5NSw3IEBAIGFuZ2xlOjpSZXN1 bHQgVGV4dHVyZU10bDo6ZW5zdXJlU2FtcGxlclN0YXRlQ3JlYXRlZChjb25zdCBnbDo6Q29udGV4 dCAqY29udGV4dCkKICAgICBtdGw6OlNhbXBsZXJEZXNjIHNhbXBsZXJEZXNjKG1TdGF0ZS5nZXRT YW1wbGVyU3RhdGUoKSk7CiAKICAgICBpZiAobUZvcm1hdC5hY3R1YWxBbmdsZUZvcm1hdCgpLmRl cHRoQml0cyAmJgotICAgICAgICAhZGlzcGxheU10bC0+Z2V0RmVhdHVyZXMoKS5oYXNEZXB0aFRl eHR1cmVGaWx0ZXJpbmcuZW5hYmxlZCkKKyAgICAgICAgIW1Gb3JtYXQuZ2V0Q2FwcygpLmZpbHRl cmFibGUpCiAgICAgewogICAgICAgICAvLyBPbiBkZXZpY2VzIG5vdCBzdXBwb3J0aW5nIGZpbHRl cmluZyBmb3IgZGVwdGggdGV4dHVyZXMsIHdlIG5lZWQgdG8gY29udmVydCB0byBuZWFyZXN0CiAg ICAgICAgIC8vIGhlcmUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMv bGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvbXRsX2Zvcm1hdF9tYXAuanNvbiBiL1NvdXJjZS9UaGly ZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfZm9ybWF0X21hcC5q c29uCmluZGV4IDgzYTcyOTE5NWM4MDZjNDdmNDNkOTZlMGQ5MWUwMWRiNzdhODJlNDMuLmU0MGNj NWQwMjE0M2Q2YzFhNjMxYWZlOTc2ZGFhNWE3MjdjMDkxNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9U aGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfZm9ybWF0X21h cC5qc29uCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJl ci9tZXRhbC9tdGxfZm9ybWF0X21hcC5qc29uCkBAIC02MDcsNyArNjA3LDcgQEAKICAgICAgICAg ICAgICAgICAiY29sb3JSZW5kZXJhYmxlIjogInRydWUiCiAgICAgICAgICAgICB9LAogICAgICAg ICAgICAgIk1UTFBpeGVsRm9ybWF0RGVwdGgzMkZsb2F0Ijp7Ci0gICAgICAgICAgICAgICAgImZp bHRlcmFibGUiOiAiZGlzcGxheS0+c3VwcG9ydHNNYWNHUFVGYW1pbHkoMSkiLAorICAgICAgICAg ICAgICAgICJmaWx0ZXJhYmxlIjogImRpc3BsYXktPnN1cHBvcnRzTWFjR1BVRmFtaWx5KDEpIHx8 IGRpc3BsYXktPnN1cHBvcnRzMzJCaXRGbG9hdEZpbHRlcmluZygpIiwKICAgICAgICAgICAgICAg ICAid3JpdGFibGUiOiAiZmFsc2UiLAogICAgICAgICAgICAgICAgICJibGVuZGFibGUiOiAiZmFs c2UiLAogICAgICAgICAgICAgICAgICJtdWx0aXNhbXBsZSI6ICJ0cnVlIiwKQEAgLTYyNSw3ICs2 MjUsNyBAQAogICAgICAgICAgICAgICAgICJkZXB0aFJlbmRlcmFibGUiOiAidHJ1ZSIKICAgICAg ICAgICAgIH0sCiAgICAgICAgICAgICAiTVRMUGl4ZWxGb3JtYXREZXB0aDMyRmxvYXRfU3RlbmNp bDgiOnsKLSAgICAgICAgICAgICAgICAiZmlsdGVyYWJsZSI6ICJkaXNwbGF5LT5zdXBwb3J0c01h Y0dQVUZhbWlseSgxKSIsCisgICAgICAgICAgICAgICAgImZpbHRlcmFibGUiOiAiZGlzcGxheS0+ c3VwcG9ydHNNYWNHUFVGYW1pbHkoMSkgfHwgZGlzcGxheS0+c3VwcG9ydHMzMkJpdEZsb2F0Rmls dGVyaW5nKCkiLAogICAgICAgICAgICAgICAgICJ3cml0YWJsZSI6ICJmYWxzZSIsCiAgICAgICAg ICAgICAgICAgImJsZW5kYWJsZSI6ICJmYWxzZSIsCiAgICAgICAgICAgICAgICAgIm11bHRpc2Ft cGxlIjogInRydWUiLApAQCAtNjQ1LDEzICs2NDUsMTMgQEAKICAgICAgICAgICAgICAgICAiZGVw dGhSZW5kZXJhYmxlIjogInRydWUiCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgIk1UTFBp eGVsRm9ybWF0RGVwdGgyNFVub3JtX1N0ZW5jaWw4Ijp7Ci0gICAgICAgICAgICAgICAgImZpbHRl cmFibGUiOiAiZGlzcGxheS0+c3VwcG9ydHNNYWNHUFVGYW1pbHkoMSkiLAorICAgICAgICAgICAg ICAgICJmaWx0ZXJhYmxlIjogImRpc3BsYXktPnN1cHBvcnRzTWFjR1BVRmFtaWx5KDEpICYmIGRp c3BsYXktPnN1cHBvcnRzRGVwdGgyNFN0ZW5jaWw4UGl4ZWxGb3JtYXQoKSIsCiAgICAgICAgICAg ICAgICAgIndyaXRhYmxlIjogImZhbHNlIiwKICAgICAgICAgICAgICAgICAiYmxlbmRhYmxlIjog ImZhbHNlIiwKICAgICAgICAgICAgICAgICAibXVsdGlzYW1wbGUiOiAidHJ1ZSIsCiAgICAgICAg ICAgICAgICAgInJlc29sdmUiOiAic3VwcG9ydERlcHRoU3RlbmNpbEF1dG9SZXNvbHZlIiwKICAg ICAgICAgICAgICAgICAiY29sb3JSZW5kZXJhYmxlIjogImZhbHNlIiwKLSAgICAgICAgICAgICAg ICAiZGVwdGhSZW5kZXJhYmxlIjogImRpc3BsYXktPnN1cHBvcnRzTWFjR1BVRmFtaWx5KDEpIgor ICAgICAgICAgICAgICAgICJkZXB0aFJlbmRlcmFibGUiOiAiZGlzcGxheS0+c3VwcG9ydHNNYWNH UFVGYW1pbHkoMSkgJiYgZGlzcGxheS0+c3VwcG9ydHNEZXB0aDI0U3RlbmNpbDhQaXhlbEZvcm1h dCgpIgogICAgICAgICAgICAgfSwKICAgICAgICAgICAgICJNVExQaXhlbEZvcm1hdEJDMV9SR0JB Ijp7CiAgICAgICAgICAgICAgICAgImZpbHRlcmFibGUiOiAidHJ1ZSIKQEAgLTEwMTQsNCArMTAx NCw0IEBACiAgICAgICAgICAgICAiUjhHOEI4X1NTQ0FMRUQiOiAiUjhHOEI4QThfU0lOVCIKICAg ICAgICAgfQogICAgIH0KLX0KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCit9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwv bXRsX2Zvcm1hdF90YWJsZV9hdXRvZ2VuLm1tIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3Jj L2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL210bF9mb3JtYXRfdGFibGVfYXV0b2dlbi5tbQppbmRl eCA0Njc0MjgxN2FlOWQ1NGNmYjk5MjJhM2ViZDFkODFiZTRmMmM2ZTdkLi44NzRhMjY0YTdjYzE3 MjdjNWUxNDc4NGMzZWY1NTFjZjA4NWUxODI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvbXRsX2Zvcm1hdF90YWJsZV9hdXRv Z2VuLm1tCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJl ci9tZXRhbC9tdGxfZm9ybWF0X3RhYmxlX2F1dG9nZW4ubW0KQEAgLTMxNDMsOSArMzE0Myw5IEBA IHZvaWQgRm9ybWF0VGFibGU6OmluaXROYXRpdmVGb3JtYXRDYXBzQXV0b2dlbihjb25zdCBEaXNw bGF5TXRsICpkaXNwbGF5KQogCiAgICAgc2V0Rm9ybWF0Q2FwcyhNVExQaXhlbEZvcm1hdEJHUkE4 VW5vcm1fc1JHQiwgLyoqIGZpbHRlcmFibGUqLyB0cnVlLCAvKiogd3JpdGFibGUqLyBkaXNwbGF5 LT5zdXBwb3J0c0lPU0dQVUZhbWlseSgyKSwgLyoqIGJsZW5kYWJsZSovIHRydWUsIC8qKiBtdWx0 aXNhbXBsZSovIHRydWUsIC8qKiByZXNvbHZlKi8gdHJ1ZSwgLyoqIGNvbG9yUmVuZGVyYWJsZSov IHRydWUsIC8qKiBkZXB0aFJlbmRlcmFibGUqLyBmYWxzZSk7CiAKLSAgICBzZXRGb3JtYXRDYXBz KE1UTFBpeGVsRm9ybWF0RGVwdGgzMkZsb2F0LCAvKiogZmlsdGVyYWJsZSovIGRpc3BsYXktPnN1 cHBvcnRzTWFjR1BVRmFtaWx5KDEpLCAvKiogd3JpdGFibGUqLyBmYWxzZSwgLyoqIGJsZW5kYWJs ZSovIGZhbHNlLCAvKiogbXVsdGlzYW1wbGUqLyB0cnVlLCAvKiogcmVzb2x2ZSovIHN1cHBvcnRE ZXB0aEF1dG9SZXNvbHZlLCAvKiogY29sb3JSZW5kZXJhYmxlKi8gZmFsc2UsIC8qKiBkZXB0aFJl bmRlcmFibGUqLyB0cnVlKTsKKyAgICBzZXRGb3JtYXRDYXBzKE1UTFBpeGVsRm9ybWF0RGVwdGgz MkZsb2F0LCAvKiogZmlsdGVyYWJsZSovIGRpc3BsYXktPnN1cHBvcnRzTWFjR1BVRmFtaWx5KDEp IHx8IGRpc3BsYXktPnN1cHBvcnRzMzJCaXRGbG9hdEZpbHRlcmluZygpLCAvKiogd3JpdGFibGUq LyBmYWxzZSwgLyoqIGJsZW5kYWJsZSovIGZhbHNlLCAvKiogbXVsdGlzYW1wbGUqLyB0cnVlLCAv KiogcmVzb2x2ZSovIHN1cHBvcnREZXB0aEF1dG9SZXNvbHZlLCAvKiogY29sb3JSZW5kZXJhYmxl Ki8gZmFsc2UsIC8qKiBkZXB0aFJlbmRlcmFibGUqLyB0cnVlKTsKIAotICAgIHNldEZvcm1hdENh cHMoTVRMUGl4ZWxGb3JtYXREZXB0aDMyRmxvYXRfU3RlbmNpbDgsIC8qKiBmaWx0ZXJhYmxlKi8g ZGlzcGxheS0+c3VwcG9ydHNNYWNHUFVGYW1pbHkoMSksIC8qKiB3cml0YWJsZSovIGZhbHNlLCAv KiogYmxlbmRhYmxlKi8gZmFsc2UsIC8qKiBtdWx0aXNhbXBsZSovIHRydWUsIC8qKiByZXNvbHZl Ki8gc3VwcG9ydERlcHRoU3RlbmNpbEF1dG9SZXNvbHZlLCAvKiogY29sb3JSZW5kZXJhYmxlKi8g ZmFsc2UsIC8qKiBkZXB0aFJlbmRlcmFibGUqLyB0cnVlKTsKKyAgICBzZXRGb3JtYXRDYXBzKE1U TFBpeGVsRm9ybWF0RGVwdGgzMkZsb2F0X1N0ZW5jaWw4LCAvKiogZmlsdGVyYWJsZSovIGRpc3Bs YXktPnN1cHBvcnRzTWFjR1BVRmFtaWx5KDEpIHx8IGRpc3BsYXktPnN1cHBvcnRzMzJCaXRGbG9h dEZpbHRlcmluZygpLCAvKiogd3JpdGFibGUqLyBmYWxzZSwgLyoqIGJsZW5kYWJsZSovIGZhbHNl LCAvKiogbXVsdGlzYW1wbGUqLyB0cnVlLCAvKiogcmVzb2x2ZSovIHN1cHBvcnREZXB0aFN0ZW5j aWxBdXRvUmVzb2x2ZSwgLyoqIGNvbG9yUmVuZGVyYWJsZSovIGZhbHNlLCAvKiogZGVwdGhSZW5k ZXJhYmxlKi8gdHJ1ZSk7CiAKICAgICBzZXRGb3JtYXRDYXBzKE1UTFBpeGVsRm9ybWF0UjE2Rmxv YXQsIC8qKiBmaWx0ZXJhYmxlKi8gdHJ1ZSwgLyoqIHdyaXRhYmxlKi8gdHJ1ZSwgLyoqIGJsZW5k YWJsZSovIHRydWUsIC8qKiBtdWx0aXNhbXBsZSovIHRydWUsIC8qKiByZXNvbHZlKi8gdHJ1ZSwg LyoqIGNvbG9yUmVuZGVyYWJsZSovIHRydWUsIC8qKiBkZXB0aFJlbmRlcmFibGUqLyBmYWxzZSk7 CiAKQEAgLTMyNjIsNyArMzI2Miw3IEBAIHZvaWQgRm9ybWF0VGFibGU6OmluaXROYXRpdmVGb3Jt YXRDYXBzQXV0b2dlbihjb25zdCBEaXNwbGF5TXRsICpkaXNwbGF5KQogCiAgICAgc2V0Rm9ybWF0 Q2FwcyhNVExQaXhlbEZvcm1hdERlcHRoMTZVbm9ybSwgLyoqIGZpbHRlcmFibGUqLyB0cnVlLCAv Kiogd3JpdGFibGUqLyBmYWxzZSwgLyoqIGJsZW5kYWJsZSovIGZhbHNlLCAvKiogbXVsdGlzYW1w bGUqLyB0cnVlLCAvKiogcmVzb2x2ZSovIHN1cHBvcnREZXB0aEF1dG9SZXNvbHZlLCAvKiogY29s b3JSZW5kZXJhYmxlKi8gZmFsc2UsIC8qKiBkZXB0aFJlbmRlcmFibGUqLyB0cnVlKTsKIAotICAg IHNldEZvcm1hdENhcHMoTVRMUGl4ZWxGb3JtYXREZXB0aDI0VW5vcm1fU3RlbmNpbDgsIC8qKiBm aWx0ZXJhYmxlKi8gZGlzcGxheS0+c3VwcG9ydHNNYWNHUFVGYW1pbHkoMSksIC8qKiB3cml0YWJs ZSovIGZhbHNlLCAvKiogYmxlbmRhYmxlKi8gZmFsc2UsIC8qKiBtdWx0aXNhbXBsZSovIHRydWUs IC8qKiByZXNvbHZlKi8gc3VwcG9ydERlcHRoU3RlbmNpbEF1dG9SZXNvbHZlLCAvKiogY29sb3JS ZW5kZXJhYmxlKi8gZmFsc2UsIC8qKiBkZXB0aFJlbmRlcmFibGUqLyBkaXNwbGF5LT5zdXBwb3J0 c01hY0dQVUZhbWlseSgxKSk7CisgICAgc2V0Rm9ybWF0Q2FwcyhNVExQaXhlbEZvcm1hdERlcHRo MjRVbm9ybV9TdGVuY2lsOCwgLyoqIGZpbHRlcmFibGUqLyBkaXNwbGF5LT5zdXBwb3J0c01hY0dQ VUZhbWlseSgxKSAmJiBkaXNwbGF5LT5zdXBwb3J0c0RlcHRoMjRTdGVuY2lsOFBpeGVsRm9ybWF0 KCksIC8qKiB3cml0YWJsZSovIGZhbHNlLCAvKiogYmxlbmRhYmxlKi8gZmFsc2UsIC8qKiBtdWx0 aXNhbXBsZSovIHRydWUsIC8qKiByZXNvbHZlKi8gc3VwcG9ydERlcHRoU3RlbmNpbEF1dG9SZXNv bHZlLCAvKiogY29sb3JSZW5kZXJhYmxlKi8gZmFsc2UsIC8qKiBkZXB0aFJlbmRlcmFibGUqLyBk aXNwbGF5LT5zdXBwb3J0c01hY0dQVUZhbWlseSgxKSk7CiAKICNlbGlmICFUQVJHRVRfT1NfU0lN VUxBVE9SICYmIChUQVJHRVRfT1NfSU9TIHx8IFRBUkdFVF9PU19UVikgIC8vIFRBUkdFVF9PU19P U1ggfHwgVEFSR0VUX09TX01BQ0NBVEFMWVNUCiAgICAgc2V0Rm9ybWF0Q2FwcyhNVExQaXhlbEZv cm1hdEExQkdSNVVub3JtLCAvKiogZmlsdGVyYWJsZSovIHRydWUsIC8qKiB3cml0YWJsZSovIGZh bHNlLCAvKiogYmxlbmRhYmxlKi8gdHJ1ZSwgLyoqIG11bHRpc2FtcGxlKi8gdHJ1ZSwgLyoqIHJl c29sdmUqLyB0cnVlLCAvKiogY29sb3JSZW5kZXJhYmxlKi8gdHJ1ZSwgLyoqIGRlcHRoUmVuZGVy YWJsZSovIGZhbHNlKTsK 443747 2021-11-09 16:13:37 -0800 2021-11-09 16:58:22 -0800 Patch bug-232071-20211109161336.patch text/plain 11378 kpiddington U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NTM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggYzA0NzBhYTZjN2FiYzU3ZTM2MDFmMjJjOTlkYjI1OWNiZjRiYjJhMC4uOGJhOWNiN2Y5Y2Ex YjUyNmY4ZmNiNzdjNDI5MjYzYzVkNWIwNDY0NiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI1IEBACisyMDIxLTExLTA5ICBLeWxlIFBpZGRpbmd0b24gIDxrcGlkZGlu Z3RvbkBhcHBsZS5jb20+CisKKyAgICAgICAgSGFyZHdhcmUgUENGIGZpbHRlcmluZyBkb2VzIG5v dCB3b3JrIG9uIGlPUyAxNSB3aGVuIHVzaW5nIFdlYkdMMgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDcxCisKKwlMb3dlciByZXN0cmljdGlvbnMg b24gc2FtcGxpbmcgRDMyRiBmb3JtYXRzLCBhbmQgYWxsb3cgZmlsdGVyaW5nCisJb2YgRGVwdGgx NkYgb24gaU9TIGhhcmR3YXJlLCBhcyBpdCB3YXMgcHJldmlvdXNseSByZXN0cmljdGVkLgorCQor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluY2x1ZGUv cGxhdGZvcm0vRmVhdHVyZXNNdGwuaDoKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIv bWV0YWwvRGlzcGxheU10bC5oOgorICAgICAgICAqIHNyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRh bC9EaXNwbGF5TXRsLm1tOgorICAgICAgICAocng6OkRpc3BsYXlNdGw6OmluaXRpYWxpemVGZWF0 dXJlcyk6CisgICAgICAgIChyeDo6RGlzcGxheU10bDo6c3VwcG9ydHMzMkJpdEZsb2F0RmlsdGVy aW5nIGNvbnN0KToKKyAgICAgICAgKHJ4OjpEaXNwbGF5TXRsOjpzdXBwb3J0c0RlcHRoMjRTdGVu Y2lsOFBpeGVsRm9ybWF0IGNvbnN0KToKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIv bWV0YWwvVGV4dHVyZU10bC5tbToKKyAgICAgICAgKHJ4OjpUZXh0dXJlTXRsOjplbnN1cmVTYW1w bGVyU3RhdGVDcmVhdGVkKToKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwv bXRsX2Zvcm1hdF9tYXAuanNvbjoKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0 YWwvbXRsX2Zvcm1hdF90YWJsZV9hdXRvZ2VuLm1tOgorICAgICAgICAocng6Om10bDo6Rm9ybWF0 VGFibGU6OmluaXROYXRpdmVGb3JtYXRDYXBzQXV0b2dlbik6CisKIDIwMjEtMTEtMDYgIERhdmlk IEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgZW1wdHkgZGly ZWN0b3JpZXMgZnJvbSBmcm9tIHN2bi53ZWJraXQub3JnIHJlcG9zaXRvcnkgYXMgb2YgcjI4NTM1 NwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvaW5jbHVkZS9wbGF0Zm9ybS9G ZWF0dXJlc010bC5oIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvaW5jbHVkZS9wbGF0Zm9ybS9G ZWF0dXJlc010bC5oCmluZGV4IDA5YzJjYmJhMmIxY2U4MmEyYzgyNzFlMDVjOGRhM2JhZDQ0MTg2 NzMuLjJhZjAwNjEzYmY0YzhkODljNzE4YjNhMWE5NzJjZTQ4ZGI3Zjk0NjUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL2luY2x1ZGUvcGxhdGZvcm0vRmVhdHVyZXNNdGwuaAor KysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9pbmNsdWRlL3BsYXRmb3JtL0ZlYXR1cmVzTXRs LmgKQEAgLTIxLDExICsyMSw2IEBAIHN0cnVjdCBGZWF0dXJlc010bCA6IEZlYXR1cmVTZXRCYXNl CiAgICAgICAgICJoYXNfYmFzZV92ZXJ0ZXhfaW5zdGFuY2VkX2RyYXciLCBGZWF0dXJlQ2F0ZWdv cnk6Ok1ldGFsRmVhdHVyZXMsCiAgICAgICAgICJUaGUgcmVuZGVyZXIgc3VwcG9ydHMgYmFzZSB2 ZXJ0ZXggaW5zdGFuY2VkIGRyYXciLCAmbWVtYmVyc307CiAKLSAgICAvLyBTdXBwb3J0IGRlcHRo IHRleHR1cmUgZmlsdGVyaW5nCi0gICAgRmVhdHVyZSBoYXNEZXB0aFRleHR1cmVGaWx0ZXJpbmcg PSB7Ci0gICAgICAgICJoYXNfZGVwdGhfdGV4dHVyZV9maWx0ZXJpbmciLCBGZWF0dXJlQ2F0ZWdv cnk6Ok1ldGFsRmVhdHVyZXMsCi0gICAgICAgICJUaGUgcmVuZGVyZXIgc3VwcG9ydHMgZGVwdGgg dGV4dHVyZSdzIGZpbHRlcmluZyBvdGhlciB0aGFuIG5lYXJlc3QiLCAmbWVtYmVyc307Ci0KICAg ICAvLyBTdXBwb3J0IGV4cGxpY2l0IG1lbW9yeSBiYXJyaWVyCiAgICAgRmVhdHVyZSBoYXNFeHBs aWNpdE1lbUJhcnJpZXIgPSB7Imhhc19leHBsaWNpdF9tZW1fYmFycmllciIsIEZlYXR1cmVDYXRl Z29yeTo6TWV0YWxGZWF0dXJlcywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAiVGhlIHJlbmRlcmVyIHN1cHBvcnRzIGV4cGxpY2l0IG1lbW9yeSBiYXJyaWVyIiwgJm1lbWJl cnN9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3Jl bmRlcmVyL21ldGFsL0Rpc3BsYXlNdGwuaCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9s aWJBTkdMRS9yZW5kZXJlci9tZXRhbC9EaXNwbGF5TXRsLmgKaW5kZXggZWJjZWQwYjk3YzQwZjA4 NjdhNmQxNzY5MWE0NDY0NWRkNjYzZDUyOC4uNzI5NWI1MDNmZDAxYzU2MTBhYTUzZjc0MzM3OGI1 MzllOTg1MTgwZiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFO R0xFL3JlbmRlcmVyL21ldGFsL0Rpc3BsYXlNdGwuaAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9B TkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvRGlzcGxheU10bC5oCkBAIC0xMjIsNiAr MTIyLDggQEAgY2xhc3MgRGlzcGxheU10bCA6IHB1YmxpYyBEaXNwbGF5SW1wbAogICAgIGJvb2wg c3VwcG9ydHNFaXRoZXJHUFVGYW1pbHkodWludDhfdCBpT1NGYW1pbHksIHVpbnQ4X3QgbWFjRmFt aWx5KSBjb25zdDsKICAgICBib29sIHN1cHBvcnRzSU9TR1BVRmFtaWx5KHVpbnQ4X3QgaU9TRmFt aWx5KSBjb25zdDsKICAgICBib29sIHN1cHBvcnRzTWFjR1BVRmFtaWx5KHVpbnQ4X3QgbWFjRmFt aWx5KSBjb25zdDsKKyAgICBib29sIHN1cHBvcnRzRGVwdGgyNFN0ZW5jaWw4UGl4ZWxGb3JtYXQo KSBjb25zdDsKKyAgICBib29sIHN1cHBvcnRzMzJCaXRGbG9hdEZpbHRlcmluZygpIGNvbnN0Owog ICAgIGJvb2wgaXNBTUQoKSBjb25zdDsKICAgICBib29sIGlzSW50ZWwoKSBjb25zdDsKICAgICBi b29sIGlzTlZJRElBKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdM RS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvRGlzcGxheU10bC5tbSBiL1NvdXJjZS9UaGly ZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9EaXNwbGF5TXRsLm1tCmlu ZGV4IGNiM2FmZmY0M2UzZDYxNmMwZjE5N2FjNjc4Y2Y5ZTFlYjNiYmM3MGEuLmJhYzcwNWY2ZThk OTAyYjU2MDM2MzgyMzE1NzhjYmIwNTliZjA5MDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBh cnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9EaXNwbGF5TXRsLm1tCisrKyBi L1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9EaXNw bGF5TXRsLm1tCkBAIC05MzgsOSArOTM4LDYgQEAgdm9pZCBEaXNwbGF5TXRsOjppbml0aWFsaXpl RmVhdHVyZXMoKQogCiAgICAgQU5HTEVfRkVBVFVSRV9DT05ESVRJT04oKCZtRmVhdHVyZXMpLCBh bGxvd0dlbk11bHRpcGxlTWlwc1BlclBhc3MsIHRydWUpOwogICAgIEFOR0xFX0ZFQVRVUkVfQ09O RElUSU9OKCgmbUZlYXR1cmVzKSwgZm9yY2VCdWZmZXJHUFVTdG9yYWdlLCBmYWxzZSk7Ci0KLSAg ICBBTkdMRV9GRUFUVVJFX0NPTkRJVElPTigoJm1GZWF0dXJlcyksIGhhc0RlcHRoVGV4dHVyZUZp bHRlcmluZywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAoaXNPU1ggfHwgaXNDYXRhbHlz dCkgJiYgIWlzQVJNKTsKICAgICBBTkdMRV9GRUFUVVJFX0NPTkRJVElPTigoJm1GZWF0dXJlcyks IGhhc0V4cGxpY2l0TWVtQmFycmllciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpc01l dGFsMl8xICYmIChpc09TWCB8fCBpc0NhdGFseXN0KSAmJiAhaXNBUk0pOwogICAgIEFOR0xFX0ZF QVRVUkVfQ09ORElUSU9OKCgmbUZlYXR1cmVzKSwgaGFzRGVwdGhBdXRvUmVzb2x2ZSwgc3VwcG9y dHNFaXRoZXJHUFVGYW1pbHkoMywgMikpOwpAQCAtMTA4Miw2ICsxMDc5LDI4IEBAIGJvb2wgRGlz cGxheU10bDo6c3VwcG9ydHNFaXRoZXJHUFVGYW1pbHkodWludDhfdCBpT1NGYW1pbHksIHVpbnQ4 X3QgbWFjRmFtaWx5KSBjCiAgICAgcmV0dXJuIHN1cHBvcnRzSU9TR1BVRmFtaWx5KGlPU0ZhbWls eSkgfHwgc3VwcG9ydHNNYWNHUFVGYW1pbHkobWFjRmFtaWx5KTsKIH0KIAorCisKK2Jvb2wgRGlz cGxheU10bDo6c3VwcG9ydHMzMkJpdEZsb2F0RmlsdGVyaW5nKCkgY29uc3QKK3sKKyAgICBpZihA YXZhaWxhYmxlKGlvcyAxNC4wLCBtYWNPUyAxMS4wLCopKQorICAgIHsKKyAgICAgICAgcmV0dXJu IFttTWV0YWxEZXZpY2Ugc3VwcG9ydHMzMkJpdEZsb2F0RmlsdGVyaW5nXTsKKyAgICB9CisgICAg ZWxzZQorICAgIHsKKyAgICAgICAgcmV0dXJuIHN1cHBvcnRzTWFjR1BVRmFtaWx5KDEpOworICAg IH0KKyAgICByZXR1cm4gZmFsc2U7Cit9CisKK2Jvb2wgRGlzcGxheU10bDo6c3VwcG9ydHNEZXB0 aDI0U3RlbmNpbDhQaXhlbEZvcm1hdCgpIGNvbnN0Cit7CisjaWYgVEFSR0VUX09TX09TWCB8fCBU QVJHRVRfT1NfTUFDQ0FUQUxZU1QKKyAgICByZXR1cm4gW21NZXRhbERldmljZSBpc0RlcHRoMjRT dGVuY2lsOFBpeGVsRm9ybWF0U3VwcG9ydGVkXTsKKyNlbmRpZgorICAgIHJldHVybiBmYWxzZTsK K30KIGJvb2wgRGlzcGxheU10bDo6aXNBTUQoKSBjb25zdAogewogICAgIHJldHVybiBhbmdsZTo6 SXNBTUQobU1ldGFsRGV2aWNlVmVuZG9ySWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL1RleHR1cmVNdGwubW0gYi9Tb3Vy Y2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvVGV4dHVyZU10 bC5tbQppbmRleCA2Nzc5ZmEzZjA0OTViMmE1ODJiZjZlOTc0Zjc1OTMzMDY4MGUxNTFlLi40YzVj MmQ5MjgxYzlkNzg3M2QyN2EzZjIwN2U3YjY4YjdiM2FhYTYzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvVGV4dHVyZU10bC5t bQorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0 YWwvVGV4dHVyZU10bC5tbQpAQCAtNzk1LDcgKzc5NSw3IEBAIGFuZ2xlOjpSZXN1bHQgVGV4dHVy ZU10bDo6ZW5zdXJlU2FtcGxlclN0YXRlQ3JlYXRlZChjb25zdCBnbDo6Q29udGV4dCAqY29udGV4 dCkKICAgICBtdGw6OlNhbXBsZXJEZXNjIHNhbXBsZXJEZXNjKG1TdGF0ZS5nZXRTYW1wbGVyU3Rh dGUoKSk7CiAKICAgICBpZiAobUZvcm1hdC5hY3R1YWxBbmdsZUZvcm1hdCgpLmRlcHRoQml0cyAm JgotICAgICAgICAhZGlzcGxheU10bC0+Z2V0RmVhdHVyZXMoKS5oYXNEZXB0aFRleHR1cmVGaWx0 ZXJpbmcuZW5hYmxlZCkKKyAgICAgICAgIW1Gb3JtYXQuZ2V0Q2FwcygpLmZpbHRlcmFibGUpCiAg ICAgewogICAgICAgICAvLyBPbiBkZXZpY2VzIG5vdCBzdXBwb3J0aW5nIGZpbHRlcmluZyBmb3Ig ZGVwdGggdGV4dHVyZXMsIHdlIG5lZWQgdG8gY29udmVydCB0byBuZWFyZXN0CiAgICAgICAgIC8v IGhlcmUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUv cmVuZGVyZXIvbWV0YWwvbXRsX2Zvcm1hdF9tYXAuanNvbiBiL1NvdXJjZS9UaGlyZFBhcnR5L0FO R0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfZm9ybWF0X21hcC5qc29uCmluZGV4 IDgzYTcyOTE5NWM4MDZjNDdmNDNkOTZlMGQ5MWUwMWRiNzdhODJlNDMuLjBmMWM4ZTdmODhkY2U4 NjhmZWEzODU3ZTgyY2YxZjBhM2FhYTA5Y2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5 L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfZm9ybWF0X21hcC5qc29uCisr KyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9t dGxfZm9ybWF0X21hcC5qc29uCkBAIC02MDcsNyArNjA3LDcgQEAKICAgICAgICAgICAgICAgICAi Y29sb3JSZW5kZXJhYmxlIjogInRydWUiCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgIk1U TFBpeGVsRm9ybWF0RGVwdGgzMkZsb2F0Ijp7Ci0gICAgICAgICAgICAgICAgImZpbHRlcmFibGUi OiAiZGlzcGxheS0+c3VwcG9ydHNNYWNHUFVGYW1pbHkoMSkiLAorICAgICAgICAgICAgICAgICJm aWx0ZXJhYmxlIjogImRpc3BsYXktPnN1cHBvcnRzMzJCaXRGbG9hdEZpbHRlcmluZygpIiwKICAg ICAgICAgICAgICAgICAid3JpdGFibGUiOiAiZmFsc2UiLAogICAgICAgICAgICAgICAgICJibGVu ZGFibGUiOiAiZmFsc2UiLAogICAgICAgICAgICAgICAgICJtdWx0aXNhbXBsZSI6ICJ0cnVlIiwK QEAgLTYyNSw3ICs2MjUsNyBAQAogICAgICAgICAgICAgICAgICJkZXB0aFJlbmRlcmFibGUiOiAi dHJ1ZSIKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAiTVRMUGl4ZWxGb3JtYXREZXB0aDMy RmxvYXRfU3RlbmNpbDgiOnsKLSAgICAgICAgICAgICAgICAiZmlsdGVyYWJsZSI6ICJkaXNwbGF5 LT5zdXBwb3J0c01hY0dQVUZhbWlseSgxKSIsCisgICAgICAgICAgICAgICAgImZpbHRlcmFibGUi OiAiZGlzcGxheS0+c3VwcG9ydHMzMkJpdEZsb2F0RmlsdGVyaW5nKCkiLAogICAgICAgICAgICAg ICAgICJ3cml0YWJsZSI6ICJmYWxzZSIsCiAgICAgICAgICAgICAgICAgImJsZW5kYWJsZSI6ICJm YWxzZSIsCiAgICAgICAgICAgICAgICAgIm11bHRpc2FtcGxlIjogInRydWUiLApAQCAtNjQ1LDEz ICs2NDUsMTMgQEAKICAgICAgICAgICAgICAgICAiZGVwdGhSZW5kZXJhYmxlIjogInRydWUiCiAg ICAgICAgICAgICB9LAogICAgICAgICAgICAgIk1UTFBpeGVsRm9ybWF0RGVwdGgyNFVub3JtX1N0 ZW5jaWw4Ijp7Ci0gICAgICAgICAgICAgICAgImZpbHRlcmFibGUiOiAiZGlzcGxheS0+c3VwcG9y dHNNYWNHUFVGYW1pbHkoMSkiLAorICAgICAgICAgICAgICAgICJmaWx0ZXJhYmxlIjogImRpc3Bs YXktPnN1cHBvcnRzTWFjR1BVRmFtaWx5KDEpICYmIGRpc3BsYXktPnN1cHBvcnRzRGVwdGgyNFN0 ZW5jaWw4UGl4ZWxGb3JtYXQoKSIsCiAgICAgICAgICAgICAgICAgIndyaXRhYmxlIjogImZhbHNl IiwKICAgICAgICAgICAgICAgICAiYmxlbmRhYmxlIjogImZhbHNlIiwKICAgICAgICAgICAgICAg ICAibXVsdGlzYW1wbGUiOiAidHJ1ZSIsCiAgICAgICAgICAgICAgICAgInJlc29sdmUiOiAic3Vw cG9ydERlcHRoU3RlbmNpbEF1dG9SZXNvbHZlIiwKICAgICAgICAgICAgICAgICAiY29sb3JSZW5k ZXJhYmxlIjogImZhbHNlIiwKLSAgICAgICAgICAgICAgICAiZGVwdGhSZW5kZXJhYmxlIjogImRp c3BsYXktPnN1cHBvcnRzTWFjR1BVRmFtaWx5KDEpIgorICAgICAgICAgICAgICAgICJkZXB0aFJl bmRlcmFibGUiOiAiZGlzcGxheS0+c3VwcG9ydHNNYWNHUFVGYW1pbHkoMSkgJiYgZGlzcGxheS0+ c3VwcG9ydHNEZXB0aDI0U3RlbmNpbDhQaXhlbEZvcm1hdCgpIgogICAgICAgICAgICAgfSwKICAg ICAgICAgICAgICJNVExQaXhlbEZvcm1hdEJDMV9SR0JBIjp7CiAgICAgICAgICAgICAgICAgImZp bHRlcmFibGUiOiAidHJ1ZSIKQEAgLTEwMTQsNCArMTAxNCw0IEBACiAgICAgICAgICAgICAiUjhH OEI4X1NTQ0FMRUQiOiAiUjhHOEI4QThfU0lOVCIKICAgICAgICAgfQogICAgIH0KLX0KXCBObyBu ZXdsaW5lIGF0IGVuZCBvZiBmaWxlCit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9B TkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvbXRsX2Zvcm1hdF90YWJsZV9hdXRvZ2Vu Lm1tIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFs L210bF9mb3JtYXRfdGFibGVfYXV0b2dlbi5tbQppbmRleCA0Njc0MjgxN2FlOWQ1NGNmYjk5MjJh M2ViZDFkODFiZTRmMmM2ZTdkLi44YjdiM2FjZDJhYjNiOWZhMjY5OTMwYmE0ZDc2NmYwZTc4MWU5 OWQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVu ZGVyZXIvbWV0YWwvbXRsX2Zvcm1hdF90YWJsZV9hdXRvZ2VuLm1tCisrKyBiL1NvdXJjZS9UaGly ZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfZm9ybWF0X3RhYmxl X2F1dG9nZW4ubW0KQEAgLTMxNDMsOSArMzE0Myw5IEBAIHZvaWQgRm9ybWF0VGFibGU6OmluaXRO YXRpdmVGb3JtYXRDYXBzQXV0b2dlbihjb25zdCBEaXNwbGF5TXRsICpkaXNwbGF5KQogCiAgICAg c2V0Rm9ybWF0Q2FwcyhNVExQaXhlbEZvcm1hdEJHUkE4VW5vcm1fc1JHQiwgLyoqIGZpbHRlcmFi bGUqLyB0cnVlLCAvKiogd3JpdGFibGUqLyBkaXNwbGF5LT5zdXBwb3J0c0lPU0dQVUZhbWlseSgy KSwgLyoqIGJsZW5kYWJsZSovIHRydWUsIC8qKiBtdWx0aXNhbXBsZSovIHRydWUsIC8qKiByZXNv bHZlKi8gdHJ1ZSwgLyoqIGNvbG9yUmVuZGVyYWJsZSovIHRydWUsIC8qKiBkZXB0aFJlbmRlcmFi bGUqLyBmYWxzZSk7CiAKLSAgICBzZXRGb3JtYXRDYXBzKE1UTFBpeGVsRm9ybWF0RGVwdGgzMkZs b2F0LCAvKiogZmlsdGVyYWJsZSovIGRpc3BsYXktPnN1cHBvcnRzTWFjR1BVRmFtaWx5KDEpLCAv Kiogd3JpdGFibGUqLyBmYWxzZSwgLyoqIGJsZW5kYWJsZSovIGZhbHNlLCAvKiogbXVsdGlzYW1w bGUqLyB0cnVlLCAvKiogcmVzb2x2ZSovIHN1cHBvcnREZXB0aEF1dG9SZXNvbHZlLCAvKiogY29s b3JSZW5kZXJhYmxlKi8gZmFsc2UsIC8qKiBkZXB0aFJlbmRlcmFibGUqLyB0cnVlKTsKKyAgICBz ZXRGb3JtYXRDYXBzKE1UTFBpeGVsRm9ybWF0RGVwdGgzMkZsb2F0LCAvKiogZmlsdGVyYWJsZSov ICBkaXNwbGF5LT5zdXBwb3J0czMyQml0RmxvYXRGaWx0ZXJpbmcoKSwgLyoqIHdyaXRhYmxlKi8g ZmFsc2UsIC8qKiBibGVuZGFibGUqLyBmYWxzZSwgLyoqIG11bHRpc2FtcGxlKi8gdHJ1ZSwgLyoq IHJlc29sdmUqLyBzdXBwb3J0RGVwdGhBdXRvUmVzb2x2ZSwgLyoqIGNvbG9yUmVuZGVyYWJsZSov IGZhbHNlLCAvKiogZGVwdGhSZW5kZXJhYmxlKi8gdHJ1ZSk7CiAKLSAgICBzZXRGb3JtYXRDYXBz KE1UTFBpeGVsRm9ybWF0RGVwdGgzMkZsb2F0X1N0ZW5jaWw4LCAvKiogZmlsdGVyYWJsZSovIGRp c3BsYXktPnN1cHBvcnRzTWFjR1BVRmFtaWx5KDEpLCAvKiogd3JpdGFibGUqLyBmYWxzZSwgLyoq IGJsZW5kYWJsZSovIGZhbHNlLCAvKiogbXVsdGlzYW1wbGUqLyB0cnVlLCAvKiogcmVzb2x2ZSov IHN1cHBvcnREZXB0aFN0ZW5jaWxBdXRvUmVzb2x2ZSwgLyoqIGNvbG9yUmVuZGVyYWJsZSovIGZh bHNlLCAvKiogZGVwdGhSZW5kZXJhYmxlKi8gdHJ1ZSk7CisgICAgc2V0Rm9ybWF0Q2FwcyhNVExQ aXhlbEZvcm1hdERlcHRoMzJGbG9hdF9TdGVuY2lsOCwgLyoqIGZpbHRlcmFibGUqLyAgZGlzcGxh eS0+c3VwcG9ydHMzMkJpdEZsb2F0RmlsdGVyaW5nKCksIC8qKiB3cml0YWJsZSovIGZhbHNlLCAv KiogYmxlbmRhYmxlKi8gZmFsc2UsIC8qKiBtdWx0aXNhbXBsZSovIHRydWUsIC8qKiByZXNvbHZl Ki8gc3VwcG9ydERlcHRoU3RlbmNpbEF1dG9SZXNvbHZlLCAvKiogY29sb3JSZW5kZXJhYmxlKi8g ZmFsc2UsIC8qKiBkZXB0aFJlbmRlcmFibGUqLyB0cnVlKTsKIAogICAgIHNldEZvcm1hdENhcHMo TVRMUGl4ZWxGb3JtYXRSMTZGbG9hdCwgLyoqIGZpbHRlcmFibGUqLyB0cnVlLCAvKiogd3JpdGFi bGUqLyB0cnVlLCAvKiogYmxlbmRhYmxlKi8gdHJ1ZSwgLyoqIG11bHRpc2FtcGxlKi8gdHJ1ZSwg LyoqIHJlc29sdmUqLyB0cnVlLCAvKiogY29sb3JSZW5kZXJhYmxlKi8gdHJ1ZSwgLyoqIGRlcHRo UmVuZGVyYWJsZSovIGZhbHNlKTsKIApAQCAtMzI2Miw3ICszMjYyLDcgQEAgdm9pZCBGb3JtYXRU YWJsZTo6aW5pdE5hdGl2ZUZvcm1hdENhcHNBdXRvZ2VuKGNvbnN0IERpc3BsYXlNdGwgKmRpc3Bs YXkpCiAKICAgICBzZXRGb3JtYXRDYXBzKE1UTFBpeGVsRm9ybWF0RGVwdGgxNlVub3JtLCAvKiog ZmlsdGVyYWJsZSovIHRydWUsIC8qKiB3cml0YWJsZSovIGZhbHNlLCAvKiogYmxlbmRhYmxlKi8g ZmFsc2UsIC8qKiBtdWx0aXNhbXBsZSovIHRydWUsIC8qKiByZXNvbHZlKi8gc3VwcG9ydERlcHRo QXV0b1Jlc29sdmUsIC8qKiBjb2xvclJlbmRlcmFibGUqLyBmYWxzZSwgLyoqIGRlcHRoUmVuZGVy YWJsZSovIHRydWUpOwogCi0gICAgc2V0Rm9ybWF0Q2FwcyhNVExQaXhlbEZvcm1hdERlcHRoMjRV bm9ybV9TdGVuY2lsOCwgLyoqIGZpbHRlcmFibGUqLyBkaXNwbGF5LT5zdXBwb3J0c01hY0dQVUZh bWlseSgxKSwgLyoqIHdyaXRhYmxlKi8gZmFsc2UsIC8qKiBibGVuZGFibGUqLyBmYWxzZSwgLyoq IG11bHRpc2FtcGxlKi8gdHJ1ZSwgLyoqIHJlc29sdmUqLyBzdXBwb3J0RGVwdGhTdGVuY2lsQXV0 b1Jlc29sdmUsIC8qKiBjb2xvclJlbmRlcmFibGUqLyBmYWxzZSwgLyoqIGRlcHRoUmVuZGVyYWJs ZSovIGRpc3BsYXktPnN1cHBvcnRzTWFjR1BVRmFtaWx5KDEpKTsKKyAgICBzZXRGb3JtYXRDYXBz KE1UTFBpeGVsRm9ybWF0RGVwdGgyNFVub3JtX1N0ZW5jaWw4LCAvKiogZmlsdGVyYWJsZSovIGRp c3BsYXktPnN1cHBvcnRzTWFjR1BVRmFtaWx5KDEpICYmIGRpc3BsYXktPnN1cHBvcnRzRGVwdGgy NFN0ZW5jaWw4UGl4ZWxGb3JtYXQoKSwgLyoqIHdyaXRhYmxlKi8gZmFsc2UsIC8qKiBibGVuZGFi bGUqLyBmYWxzZSwgLyoqIG11bHRpc2FtcGxlKi8gdHJ1ZSwgLyoqIHJlc29sdmUqLyBzdXBwb3J0 RGVwdGhTdGVuY2lsQXV0b1Jlc29sdmUsIC8qKiBjb2xvclJlbmRlcmFibGUqLyBmYWxzZSwgLyoq IGRlcHRoUmVuZGVyYWJsZSovIGRpc3BsYXktPnN1cHBvcnRzTWFjR1BVRmFtaWx5KDEpKTsKIAog I2VsaWYgIVRBUkdFVF9PU19TSU1VTEFUT1IgJiYgKFRBUkdFVF9PU19JT1MgfHwgVEFSR0VUX09T X1RWKSAgLy8gVEFSR0VUX09TX09TWCB8fCBUQVJHRVRfT1NfTUFDQ0FUQUxZU1QKICAgICBzZXRG b3JtYXRDYXBzKE1UTFBpeGVsRm9ybWF0QTFCR1I1VW5vcm0sIC8qKiBmaWx0ZXJhYmxlKi8gdHJ1 ZSwgLyoqIHdyaXRhYmxlKi8gZmFsc2UsIC8qKiBibGVuZGFibGUqLyB0cnVlLCAvKiogbXVsdGlz YW1wbGUqLyB0cnVlLCAvKiogcmVzb2x2ZSovIHRydWUsIC8qKiBjb2xvclJlbmRlcmFibGUqLyB0 cnVlLCAvKiogZGVwdGhSZW5kZXJhYmxlKi8gZmFsc2UpOwo= 443754 2021-11-09 16:36:21 -0800 2021-11-30 13:35:36 -0800 Patch bug-232071-20211109163621.patch text/plain 11609 kpiddington U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NTM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggYzA0NzBhYTZjN2FiYzU3ZTM2MDFmMjJjOTlkYjI1OWNiZjRiYjJhMC4uOGJhOWNiN2Y5Y2Ex YjUyNmY4ZmNiNzdjNDI5MjYzYzVkNWIwNDY0NiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI1IEBACisyMDIxLTExLTA5ICBLeWxlIFBpZGRpbmd0b24gIDxrcGlkZGlu Z3RvbkBhcHBsZS5jb20+CisKKyAgICAgICAgSGFyZHdhcmUgUENGIGZpbHRlcmluZyBkb2VzIG5v dCB3b3JrIG9uIGlPUyAxNSB3aGVuIHVzaW5nIFdlYkdMMgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDcxCisKKwlMb3dlciByZXN0cmljdGlvbnMg b24gc2FtcGxpbmcgRDMyRiBmb3JtYXRzLCBhbmQgYWxsb3cgZmlsdGVyaW5nCisJb2YgRGVwdGgx NkYgb24gaU9TIGhhcmR3YXJlLCBhcyBpdCB3YXMgcHJldmlvdXNseSByZXN0cmljdGVkLgorCQor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluY2x1ZGUv cGxhdGZvcm0vRmVhdHVyZXNNdGwuaDoKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIv bWV0YWwvRGlzcGxheU10bC5oOgorICAgICAgICAqIHNyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRh bC9EaXNwbGF5TXRsLm1tOgorICAgICAgICAocng6OkRpc3BsYXlNdGw6OmluaXRpYWxpemVGZWF0 dXJlcyk6CisgICAgICAgIChyeDo6RGlzcGxheU10bDo6c3VwcG9ydHMzMkJpdEZsb2F0RmlsdGVy aW5nIGNvbnN0KToKKyAgICAgICAgKHJ4OjpEaXNwbGF5TXRsOjpzdXBwb3J0c0RlcHRoMjRTdGVu Y2lsOFBpeGVsRm9ybWF0IGNvbnN0KToKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIv bWV0YWwvVGV4dHVyZU10bC5tbToKKyAgICAgICAgKHJ4OjpUZXh0dXJlTXRsOjplbnN1cmVTYW1w bGVyU3RhdGVDcmVhdGVkKToKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwv bXRsX2Zvcm1hdF9tYXAuanNvbjoKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0 YWwvbXRsX2Zvcm1hdF90YWJsZV9hdXRvZ2VuLm1tOgorICAgICAgICAocng6Om10bDo6Rm9ybWF0 VGFibGU6OmluaXROYXRpdmVGb3JtYXRDYXBzQXV0b2dlbik6CisKIDIwMjEtMTEtMDYgIERhdmlk IEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgZW1wdHkgZGly ZWN0b3JpZXMgZnJvbSBmcm9tIHN2bi53ZWJraXQub3JnIHJlcG9zaXRvcnkgYXMgb2YgcjI4NTM1 NwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvaW5jbHVkZS9wbGF0Zm9ybS9G ZWF0dXJlc010bC5oIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvaW5jbHVkZS9wbGF0Zm9ybS9G ZWF0dXJlc010bC5oCmluZGV4IDA5YzJjYmJhMmIxY2U4MmEyYzgyNzFlMDVjOGRhM2JhZDQ0MTg2 NzMuLjJhZjAwNjEzYmY0YzhkODljNzE4YjNhMWE5NzJjZTQ4ZGI3Zjk0NjUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL2luY2x1ZGUvcGxhdGZvcm0vRmVhdHVyZXNNdGwuaAor KysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9pbmNsdWRlL3BsYXRmb3JtL0ZlYXR1cmVzTXRs LmgKQEAgLTIxLDExICsyMSw2IEBAIHN0cnVjdCBGZWF0dXJlc010bCA6IEZlYXR1cmVTZXRCYXNl CiAgICAgICAgICJoYXNfYmFzZV92ZXJ0ZXhfaW5zdGFuY2VkX2RyYXciLCBGZWF0dXJlQ2F0ZWdv cnk6Ok1ldGFsRmVhdHVyZXMsCiAgICAgICAgICJUaGUgcmVuZGVyZXIgc3VwcG9ydHMgYmFzZSB2 ZXJ0ZXggaW5zdGFuY2VkIGRyYXciLCAmbWVtYmVyc307CiAKLSAgICAvLyBTdXBwb3J0IGRlcHRo IHRleHR1cmUgZmlsdGVyaW5nCi0gICAgRmVhdHVyZSBoYXNEZXB0aFRleHR1cmVGaWx0ZXJpbmcg PSB7Ci0gICAgICAgICJoYXNfZGVwdGhfdGV4dHVyZV9maWx0ZXJpbmciLCBGZWF0dXJlQ2F0ZWdv cnk6Ok1ldGFsRmVhdHVyZXMsCi0gICAgICAgICJUaGUgcmVuZGVyZXIgc3VwcG9ydHMgZGVwdGgg dGV4dHVyZSdzIGZpbHRlcmluZyBvdGhlciB0aGFuIG5lYXJlc3QiLCAmbWVtYmVyc307Ci0KICAg ICAvLyBTdXBwb3J0IGV4cGxpY2l0IG1lbW9yeSBiYXJyaWVyCiAgICAgRmVhdHVyZSBoYXNFeHBs aWNpdE1lbUJhcnJpZXIgPSB7Imhhc19leHBsaWNpdF9tZW1fYmFycmllciIsIEZlYXR1cmVDYXRl Z29yeTo6TWV0YWxGZWF0dXJlcywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAiVGhlIHJlbmRlcmVyIHN1cHBvcnRzIGV4cGxpY2l0IG1lbW9yeSBiYXJyaWVyIiwgJm1lbWJl cnN9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3Jl bmRlcmVyL21ldGFsL0Rpc3BsYXlNdGwuaCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9s aWJBTkdMRS9yZW5kZXJlci9tZXRhbC9EaXNwbGF5TXRsLmgKaW5kZXggZWJjZWQwYjk3YzQwZjA4 NjdhNmQxNzY5MWE0NDY0NWRkNjYzZDUyOC4uNzI5NWI1MDNmZDAxYzU2MTBhYTUzZjc0MzM3OGI1 MzllOTg1MTgwZiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFO R0xFL3JlbmRlcmVyL21ldGFsL0Rpc3BsYXlNdGwuaAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9B TkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvRGlzcGxheU10bC5oCkBAIC0xMjIsNiAr MTIyLDggQEAgY2xhc3MgRGlzcGxheU10bCA6IHB1YmxpYyBEaXNwbGF5SW1wbAogICAgIGJvb2wg c3VwcG9ydHNFaXRoZXJHUFVGYW1pbHkodWludDhfdCBpT1NGYW1pbHksIHVpbnQ4X3QgbWFjRmFt aWx5KSBjb25zdDsKICAgICBib29sIHN1cHBvcnRzSU9TR1BVRmFtaWx5KHVpbnQ4X3QgaU9TRmFt aWx5KSBjb25zdDsKICAgICBib29sIHN1cHBvcnRzTWFjR1BVRmFtaWx5KHVpbnQ4X3QgbWFjRmFt aWx5KSBjb25zdDsKKyAgICBib29sIHN1cHBvcnRzRGVwdGgyNFN0ZW5jaWw4UGl4ZWxGb3JtYXQo KSBjb25zdDsKKyAgICBib29sIHN1cHBvcnRzMzJCaXRGbG9hdEZpbHRlcmluZygpIGNvbnN0Owog ICAgIGJvb2wgaXNBTUQoKSBjb25zdDsKICAgICBib29sIGlzSW50ZWwoKSBjb25zdDsKICAgICBi b29sIGlzTlZJRElBKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdM RS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvRGlzcGxheU10bC5tbSBiL1NvdXJjZS9UaGly ZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9EaXNwbGF5TXRsLm1tCmlu ZGV4IGNiM2FmZmY0M2UzZDYxNmMwZjE5N2FjNjc4Y2Y5ZTFlYjNiYmM3MGEuLjFkN2M0YjllMWI5 NGRlZGI2MGZjOGMxNDUyOTQ4MzhlODQ3YzFkZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBh cnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9EaXNwbGF5TXRsLm1tCisrKyBi L1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9EaXNw bGF5TXRsLm1tCkBAIC05MzgsOSArOTM4LDYgQEAgdm9pZCBEaXNwbGF5TXRsOjppbml0aWFsaXpl RmVhdHVyZXMoKQogCiAgICAgQU5HTEVfRkVBVFVSRV9DT05ESVRJT04oKCZtRmVhdHVyZXMpLCBh bGxvd0dlbk11bHRpcGxlTWlwc1BlclBhc3MsIHRydWUpOwogICAgIEFOR0xFX0ZFQVRVUkVfQ09O RElUSU9OKCgmbUZlYXR1cmVzKSwgZm9yY2VCdWZmZXJHUFVTdG9yYWdlLCBmYWxzZSk7Ci0KLSAg ICBBTkdMRV9GRUFUVVJFX0NPTkRJVElPTigoJm1GZWF0dXJlcyksIGhhc0RlcHRoVGV4dHVyZUZp bHRlcmluZywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAoaXNPU1ggfHwgaXNDYXRhbHlz dCkgJiYgIWlzQVJNKTsKICAgICBBTkdMRV9GRUFUVVJFX0NPTkRJVElPTigoJm1GZWF0dXJlcyks IGhhc0V4cGxpY2l0TWVtQmFycmllciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpc01l dGFsMl8xICYmIChpc09TWCB8fCBpc0NhdGFseXN0KSAmJiAhaXNBUk0pOwogICAgIEFOR0xFX0ZF QVRVUkVfQ09ORElUSU9OKCgmbUZlYXR1cmVzKSwgaGFzRGVwdGhBdXRvUmVzb2x2ZSwgc3VwcG9y dHNFaXRoZXJHUFVGYW1pbHkoMywgMikpOwpAQCAtMTA4Miw2ICsxMDc5LDMxIEBAIGJvb2wgRGlz cGxheU10bDo6c3VwcG9ydHNFaXRoZXJHUFVGYW1pbHkodWludDhfdCBpT1NGYW1pbHksIHVpbnQ4 X3QgbWFjRmFtaWx5KSBjCiAgICAgcmV0dXJuIHN1cHBvcnRzSU9TR1BVRmFtaWx5KGlPU0ZhbWls eSkgfHwgc3VwcG9ydHNNYWNHUFVGYW1pbHkobWFjRmFtaWx5KTsKIH0KIAorCisKK2Jvb2wgRGlz cGxheU10bDo6c3VwcG9ydHMzMkJpdEZsb2F0RmlsdGVyaW5nKCkgY29uc3QKK3sKKyNpZiAoZGVm aW5lZChfX01BQ18xMV8wKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IF9f TUFDXzExXzApIHx8XAorICAgIChkZWZpbmVkKF9fSVBIT05FXzE0XzApICYmIF9fSVBIT05FX09T X1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IF9fSVBIT05FXzE0XzApIHx8XAorICAgIChkZWZpbmVk KF9fVFZPU18xNF8wKSAmJiBfX1RWX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IF9fVFZPU18x NF8wKQorICAgIGlmKEBhdmFpbGFibGUoaW9zIDE0LjAsIG1hY09TIDExLjAsKikpCisgICAgewor ICAgICAgICByZXR1cm4gW21NZXRhbERldmljZSBzdXBwb3J0czMyQml0RmxvYXRGaWx0ZXJpbmdd OworICAgIH0KKyAgICBlbHNlCisjZW5kaWYKKyAgICB7CisgICAgICAgIHJldHVybiBzdXBwb3J0 c01hY0dQVUZhbWlseSgxKTsKKyAgICB9Cit9CisKK2Jvb2wgRGlzcGxheU10bDo6c3VwcG9ydHNE ZXB0aDI0U3RlbmNpbDhQaXhlbEZvcm1hdCgpIGNvbnN0Cit7CisjaWYgVEFSR0VUX09TX09TWCB8 fCBUQVJHRVRfT1NfTUFDQ0FUQUxZU1QKKyAgICByZXR1cm4gW21NZXRhbERldmljZSBpc0RlcHRo MjRTdGVuY2lsOFBpeGVsRm9ybWF0U3VwcG9ydGVkXTsKKyNlbmRpZgorICAgIHJldHVybiBmYWxz ZTsKK30KIGJvb2wgRGlzcGxheU10bDo6aXNBTUQoKSBjb25zdAogewogICAgIHJldHVybiBhbmds ZTo6SXNBTUQobU1ldGFsRGV2aWNlVmVuZG9ySWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJk UGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL1RleHR1cmVNdGwubW0gYi9T b3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvVGV4dHVy ZU10bC5tbQppbmRleCA2Nzc5ZmEzZjA0OTViMmE1ODJiZjZlOTc0Zjc1OTMzMDY4MGUxNTFlLi40 YzVjMmQ5MjgxYzlkNzg3M2QyN2EzZjIwN2U3YjY4YjdiM2FhYTYzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvVGV4dHVyZU10 bC5tbQorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIv bWV0YWwvVGV4dHVyZU10bC5tbQpAQCAtNzk1LDcgKzc5NSw3IEBAIGFuZ2xlOjpSZXN1bHQgVGV4 dHVyZU10bDo6ZW5zdXJlU2FtcGxlclN0YXRlQ3JlYXRlZChjb25zdCBnbDo6Q29udGV4dCAqY29u dGV4dCkKICAgICBtdGw6OlNhbXBsZXJEZXNjIHNhbXBsZXJEZXNjKG1TdGF0ZS5nZXRTYW1wbGVy U3RhdGUoKSk7CiAKICAgICBpZiAobUZvcm1hdC5hY3R1YWxBbmdsZUZvcm1hdCgpLmRlcHRoQml0 cyAmJgotICAgICAgICAhZGlzcGxheU10bC0+Z2V0RmVhdHVyZXMoKS5oYXNEZXB0aFRleHR1cmVG aWx0ZXJpbmcuZW5hYmxlZCkKKyAgICAgICAgIW1Gb3JtYXQuZ2V0Q2FwcygpLmZpbHRlcmFibGUp CiAgICAgewogICAgICAgICAvLyBPbiBkZXZpY2VzIG5vdCBzdXBwb3J0aW5nIGZpbHRlcmluZyBm b3IgZGVwdGggdGV4dHVyZXMsIHdlIG5lZWQgdG8gY29udmVydCB0byBuZWFyZXN0CiAgICAgICAg IC8vIGhlcmUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5H TEUvcmVuZGVyZXIvbWV0YWwvbXRsX2Zvcm1hdF9tYXAuanNvbiBiL1NvdXJjZS9UaGlyZFBhcnR5 L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfZm9ybWF0X21hcC5qc29uCmlu ZGV4IDgzYTcyOTE5NWM4MDZjNDdmNDNkOTZlMGQ5MWUwMWRiNzdhODJlNDMuLjBmMWM4ZTdmODhk Y2U4NjhmZWEzODU3ZTgyY2YxZjBhM2FhYTA5Y2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBh cnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfZm9ybWF0X21hcC5qc29u CisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRh bC9tdGxfZm9ybWF0X21hcC5qc29uCkBAIC02MDcsNyArNjA3LDcgQEAKICAgICAgICAgICAgICAg ICAiY29sb3JSZW5kZXJhYmxlIjogInRydWUiCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAg Ik1UTFBpeGVsRm9ybWF0RGVwdGgzMkZsb2F0Ijp7Ci0gICAgICAgICAgICAgICAgImZpbHRlcmFi bGUiOiAiZGlzcGxheS0+c3VwcG9ydHNNYWNHUFVGYW1pbHkoMSkiLAorICAgICAgICAgICAgICAg ICJmaWx0ZXJhYmxlIjogImRpc3BsYXktPnN1cHBvcnRzMzJCaXRGbG9hdEZpbHRlcmluZygpIiwK ICAgICAgICAgICAgICAgICAid3JpdGFibGUiOiAiZmFsc2UiLAogICAgICAgICAgICAgICAgICJi bGVuZGFibGUiOiAiZmFsc2UiLAogICAgICAgICAgICAgICAgICJtdWx0aXNhbXBsZSI6ICJ0cnVl IiwKQEAgLTYyNSw3ICs2MjUsNyBAQAogICAgICAgICAgICAgICAgICJkZXB0aFJlbmRlcmFibGUi OiAidHJ1ZSIKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAiTVRMUGl4ZWxGb3JtYXREZXB0 aDMyRmxvYXRfU3RlbmNpbDgiOnsKLSAgICAgICAgICAgICAgICAiZmlsdGVyYWJsZSI6ICJkaXNw bGF5LT5zdXBwb3J0c01hY0dQVUZhbWlseSgxKSIsCisgICAgICAgICAgICAgICAgImZpbHRlcmFi bGUiOiAiZGlzcGxheS0+c3VwcG9ydHMzMkJpdEZsb2F0RmlsdGVyaW5nKCkiLAogICAgICAgICAg ICAgICAgICJ3cml0YWJsZSI6ICJmYWxzZSIsCiAgICAgICAgICAgICAgICAgImJsZW5kYWJsZSI6 ICJmYWxzZSIsCiAgICAgICAgICAgICAgICAgIm11bHRpc2FtcGxlIjogInRydWUiLApAQCAtNjQ1 LDEzICs2NDUsMTMgQEAKICAgICAgICAgICAgICAgICAiZGVwdGhSZW5kZXJhYmxlIjogInRydWUi CiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgIk1UTFBpeGVsRm9ybWF0RGVwdGgyNFVub3Jt X1N0ZW5jaWw4Ijp7Ci0gICAgICAgICAgICAgICAgImZpbHRlcmFibGUiOiAiZGlzcGxheS0+c3Vw cG9ydHNNYWNHUFVGYW1pbHkoMSkiLAorICAgICAgICAgICAgICAgICJmaWx0ZXJhYmxlIjogImRp c3BsYXktPnN1cHBvcnRzTWFjR1BVRmFtaWx5KDEpICYmIGRpc3BsYXktPnN1cHBvcnRzRGVwdGgy NFN0ZW5jaWw4UGl4ZWxGb3JtYXQoKSIsCiAgICAgICAgICAgICAgICAgIndyaXRhYmxlIjogImZh bHNlIiwKICAgICAgICAgICAgICAgICAiYmxlbmRhYmxlIjogImZhbHNlIiwKICAgICAgICAgICAg ICAgICAibXVsdGlzYW1wbGUiOiAidHJ1ZSIsCiAgICAgICAgICAgICAgICAgInJlc29sdmUiOiAi c3VwcG9ydERlcHRoU3RlbmNpbEF1dG9SZXNvbHZlIiwKICAgICAgICAgICAgICAgICAiY29sb3JS ZW5kZXJhYmxlIjogImZhbHNlIiwKLSAgICAgICAgICAgICAgICAiZGVwdGhSZW5kZXJhYmxlIjog ImRpc3BsYXktPnN1cHBvcnRzTWFjR1BVRmFtaWx5KDEpIgorICAgICAgICAgICAgICAgICJkZXB0 aFJlbmRlcmFibGUiOiAiZGlzcGxheS0+c3VwcG9ydHNNYWNHUFVGYW1pbHkoMSkgJiYgZGlzcGxh eS0+c3VwcG9ydHNEZXB0aDI0U3RlbmNpbDhQaXhlbEZvcm1hdCgpIgogICAgICAgICAgICAgfSwK ICAgICAgICAgICAgICJNVExQaXhlbEZvcm1hdEJDMV9SR0JBIjp7CiAgICAgICAgICAgICAgICAg ImZpbHRlcmFibGUiOiAidHJ1ZSIKQEAgLTEwMTQsNCArMTAxNCw0IEBACiAgICAgICAgICAgICAi UjhHOEI4X1NTQ0FMRUQiOiAiUjhHOEI4QThfU0lOVCIKICAgICAgICAgfQogICAgIH0KLX0KXCBO byBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvbXRsX2Zvcm1hdF90YWJsZV9hdXRv Z2VuLm1tIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21l dGFsL210bF9mb3JtYXRfdGFibGVfYXV0b2dlbi5tbQppbmRleCA0Njc0MjgxN2FlOWQ1NGNmYjk5 MjJhM2ViZDFkODFiZTRmMmM2ZTdkLi44YjdiM2FjZDJhYjNiOWZhMjY5OTMwYmE0ZDc2NmYwZTc4 MWU5OWQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUv cmVuZGVyZXIvbWV0YWwvbXRsX2Zvcm1hdF90YWJsZV9hdXRvZ2VuLm1tCisrKyBiL1NvdXJjZS9U aGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfZm9ybWF0X3Rh YmxlX2F1dG9nZW4ubW0KQEAgLTMxNDMsOSArMzE0Myw5IEBAIHZvaWQgRm9ybWF0VGFibGU6Omlu aXROYXRpdmVGb3JtYXRDYXBzQXV0b2dlbihjb25zdCBEaXNwbGF5TXRsICpkaXNwbGF5KQogCiAg ICAgc2V0Rm9ybWF0Q2FwcyhNVExQaXhlbEZvcm1hdEJHUkE4VW5vcm1fc1JHQiwgLyoqIGZpbHRl cmFibGUqLyB0cnVlLCAvKiogd3JpdGFibGUqLyBkaXNwbGF5LT5zdXBwb3J0c0lPU0dQVUZhbWls eSgyKSwgLyoqIGJsZW5kYWJsZSovIHRydWUsIC8qKiBtdWx0aXNhbXBsZSovIHRydWUsIC8qKiBy ZXNvbHZlKi8gdHJ1ZSwgLyoqIGNvbG9yUmVuZGVyYWJsZSovIHRydWUsIC8qKiBkZXB0aFJlbmRl cmFibGUqLyBmYWxzZSk7CiAKLSAgICBzZXRGb3JtYXRDYXBzKE1UTFBpeGVsRm9ybWF0RGVwdGgz MkZsb2F0LCAvKiogZmlsdGVyYWJsZSovIGRpc3BsYXktPnN1cHBvcnRzTWFjR1BVRmFtaWx5KDEp LCAvKiogd3JpdGFibGUqLyBmYWxzZSwgLyoqIGJsZW5kYWJsZSovIGZhbHNlLCAvKiogbXVsdGlz YW1wbGUqLyB0cnVlLCAvKiogcmVzb2x2ZSovIHN1cHBvcnREZXB0aEF1dG9SZXNvbHZlLCAvKiog Y29sb3JSZW5kZXJhYmxlKi8gZmFsc2UsIC8qKiBkZXB0aFJlbmRlcmFibGUqLyB0cnVlKTsKKyAg ICBzZXRGb3JtYXRDYXBzKE1UTFBpeGVsRm9ybWF0RGVwdGgzMkZsb2F0LCAvKiogZmlsdGVyYWJs ZSovICBkaXNwbGF5LT5zdXBwb3J0czMyQml0RmxvYXRGaWx0ZXJpbmcoKSwgLyoqIHdyaXRhYmxl Ki8gZmFsc2UsIC8qKiBibGVuZGFibGUqLyBmYWxzZSwgLyoqIG11bHRpc2FtcGxlKi8gdHJ1ZSwg LyoqIHJlc29sdmUqLyBzdXBwb3J0RGVwdGhBdXRvUmVzb2x2ZSwgLyoqIGNvbG9yUmVuZGVyYWJs ZSovIGZhbHNlLCAvKiogZGVwdGhSZW5kZXJhYmxlKi8gdHJ1ZSk7CiAKLSAgICBzZXRGb3JtYXRD YXBzKE1UTFBpeGVsRm9ybWF0RGVwdGgzMkZsb2F0X1N0ZW5jaWw4LCAvKiogZmlsdGVyYWJsZSov IGRpc3BsYXktPnN1cHBvcnRzTWFjR1BVRmFtaWx5KDEpLCAvKiogd3JpdGFibGUqLyBmYWxzZSwg LyoqIGJsZW5kYWJsZSovIGZhbHNlLCAvKiogbXVsdGlzYW1wbGUqLyB0cnVlLCAvKiogcmVzb2x2 ZSovIHN1cHBvcnREZXB0aFN0ZW5jaWxBdXRvUmVzb2x2ZSwgLyoqIGNvbG9yUmVuZGVyYWJsZSov IGZhbHNlLCAvKiogZGVwdGhSZW5kZXJhYmxlKi8gdHJ1ZSk7CisgICAgc2V0Rm9ybWF0Q2FwcyhN VExQaXhlbEZvcm1hdERlcHRoMzJGbG9hdF9TdGVuY2lsOCwgLyoqIGZpbHRlcmFibGUqLyAgZGlz cGxheS0+c3VwcG9ydHMzMkJpdEZsb2F0RmlsdGVyaW5nKCksIC8qKiB3cml0YWJsZSovIGZhbHNl LCAvKiogYmxlbmRhYmxlKi8gZmFsc2UsIC8qKiBtdWx0aXNhbXBsZSovIHRydWUsIC8qKiByZXNv bHZlKi8gc3VwcG9ydERlcHRoU3RlbmNpbEF1dG9SZXNvbHZlLCAvKiogY29sb3JSZW5kZXJhYmxl Ki8gZmFsc2UsIC8qKiBkZXB0aFJlbmRlcmFibGUqLyB0cnVlKTsKIAogICAgIHNldEZvcm1hdENh cHMoTVRMUGl4ZWxGb3JtYXRSMTZGbG9hdCwgLyoqIGZpbHRlcmFibGUqLyB0cnVlLCAvKiogd3Jp dGFibGUqLyB0cnVlLCAvKiogYmxlbmRhYmxlKi8gdHJ1ZSwgLyoqIG11bHRpc2FtcGxlKi8gdHJ1 ZSwgLyoqIHJlc29sdmUqLyB0cnVlLCAvKiogY29sb3JSZW5kZXJhYmxlKi8gdHJ1ZSwgLyoqIGRl cHRoUmVuZGVyYWJsZSovIGZhbHNlKTsKIApAQCAtMzI2Miw3ICszMjYyLDcgQEAgdm9pZCBGb3Jt YXRUYWJsZTo6aW5pdE5hdGl2ZUZvcm1hdENhcHNBdXRvZ2VuKGNvbnN0IERpc3BsYXlNdGwgKmRp c3BsYXkpCiAKICAgICBzZXRGb3JtYXRDYXBzKE1UTFBpeGVsRm9ybWF0RGVwdGgxNlVub3JtLCAv KiogZmlsdGVyYWJsZSovIHRydWUsIC8qKiB3cml0YWJsZSovIGZhbHNlLCAvKiogYmxlbmRhYmxl Ki8gZmFsc2UsIC8qKiBtdWx0aXNhbXBsZSovIHRydWUsIC8qKiByZXNvbHZlKi8gc3VwcG9ydERl cHRoQXV0b1Jlc29sdmUsIC8qKiBjb2xvclJlbmRlcmFibGUqLyBmYWxzZSwgLyoqIGRlcHRoUmVu ZGVyYWJsZSovIHRydWUpOwogCi0gICAgc2V0Rm9ybWF0Q2FwcyhNVExQaXhlbEZvcm1hdERlcHRo MjRVbm9ybV9TdGVuY2lsOCwgLyoqIGZpbHRlcmFibGUqLyBkaXNwbGF5LT5zdXBwb3J0c01hY0dQ VUZhbWlseSgxKSwgLyoqIHdyaXRhYmxlKi8gZmFsc2UsIC8qKiBibGVuZGFibGUqLyBmYWxzZSwg LyoqIG11bHRpc2FtcGxlKi8gdHJ1ZSwgLyoqIHJlc29sdmUqLyBzdXBwb3J0RGVwdGhTdGVuY2ls QXV0b1Jlc29sdmUsIC8qKiBjb2xvclJlbmRlcmFibGUqLyBmYWxzZSwgLyoqIGRlcHRoUmVuZGVy YWJsZSovIGRpc3BsYXktPnN1cHBvcnRzTWFjR1BVRmFtaWx5KDEpKTsKKyAgICBzZXRGb3JtYXRD YXBzKE1UTFBpeGVsRm9ybWF0RGVwdGgyNFVub3JtX1N0ZW5jaWw4LCAvKiogZmlsdGVyYWJsZSov IGRpc3BsYXktPnN1cHBvcnRzTWFjR1BVRmFtaWx5KDEpICYmIGRpc3BsYXktPnN1cHBvcnRzRGVw dGgyNFN0ZW5jaWw4UGl4ZWxGb3JtYXQoKSwgLyoqIHdyaXRhYmxlKi8gZmFsc2UsIC8qKiBibGVu ZGFibGUqLyBmYWxzZSwgLyoqIG11bHRpc2FtcGxlKi8gdHJ1ZSwgLyoqIHJlc29sdmUqLyBzdXBw b3J0RGVwdGhTdGVuY2lsQXV0b1Jlc29sdmUsIC8qKiBjb2xvclJlbmRlcmFibGUqLyBmYWxzZSwg LyoqIGRlcHRoUmVuZGVyYWJsZSovIGRpc3BsYXktPnN1cHBvcnRzTWFjR1BVRmFtaWx5KDEpKTsK IAogI2VsaWYgIVRBUkdFVF9PU19TSU1VTEFUT1IgJiYgKFRBUkdFVF9PU19JT1MgfHwgVEFSR0VU X09TX1RWKSAgLy8gVEFSR0VUX09TX09TWCB8fCBUQVJHRVRfT1NfTUFDQ0FUQUxZU1QKICAgICBz ZXRGb3JtYXRDYXBzKE1UTFBpeGVsRm9ybWF0QTFCR1I1VW5vcm0sIC8qKiBmaWx0ZXJhYmxlKi8g dHJ1ZSwgLyoqIHdyaXRhYmxlKi8gZmFsc2UsIC8qKiBibGVuZGFibGUqLyB0cnVlLCAvKiogbXVs dGlzYW1wbGUqLyB0cnVlLCAvKiogcmVzb2x2ZSovIHRydWUsIC8qKiBjb2xvclJlbmRlcmFibGUq LyB0cnVlLCAvKiogZGVwdGhSZW5kZXJhYmxlKi8gZmFsc2UpOwo=