215825 2020-08-25 14:17:41 -0700 [Mac,EME] Netflix.com shows HDCP error for all streams 2020-08-26 10:57:11 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble eric.carlson peng.liu6 webkit-bug-importer oldest_to_newest 1682790 0 jer.noble 2020-08-25 14:17:41 -0700 [Mac,EME] Netflix.com shows HDCP error for all streams 1682793 1 jer.noble 2020-08-25 14:22:40 -0700 <rdar://problem/66948621> 1682795 2 407231 jer.noble 2020-08-25 14:26:54 -0700 Created attachment 407231 Patch 1682801 3 407231 eric.carlson 2020-08-25 14:35:51 -0700 Comment on attachment 407231 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=407231&action=review > Source/WebCore/ChangeLog:11 > + displayID. This causes AVFoundation to do a "lowest common level of support" rather than a specific display check. s/level of support/level of support/ > Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:1388 > +bool CDMInstanceSessionFairPlayStreamingAVFObjC::keyRequestHasInsufficientProtectionForDisplayID(AVContentKeyRequest *request, PlatformDisplayID displayID) const s/AVContentKeyRequest *request/AVContentKeyRequest *request/ > Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:1390 > + // willOutputBeObscuredDueToInsufficientExternalProtectionForDisplays will always return "YES" prior s/return "YES" prior/return "YES" prior to/ > Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:1400 > + // and to query the HDCP level required by each AVContentKeyRequest, and do the comparison between th two in the s/between th two/between the two/ 1682807 4 407231 peng.liu6 2020-08-25 14:43:35 -0700 Comment on attachment 407231 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=407231&action=review > Source/WebCore/ChangeLog:13 > + AVContentKeyRequest will report that it's output is restricted if any non-HDCP compliant display is attached. s/it's/its 1682813 5 407237 jer.noble 2020-08-25 14:57:07 -0700 Created attachment 407237 Patch for landing 1683045 6 ews-feeder 2020-08-26 10:57:11 -0700 Committed r266176: <https://trac.webkit.org/changeset/266176> All reviewed patches have been landed. Closing bug and clearing flags on attachment 407237. 407231 2020-08-25 14:26:54 -0700 2020-08-25 14:35:51 -0700 Patch bug-215825-20200825142653.patch text/plain 7333 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1NTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTVkOTQ4YjFjYWM1ZWJl MjYyODMzZjkzYjQ3OWJjNWY3MGJhNjY4ZS4uZGViYTgzMjExNTQ0MjI5NTcxOGVhZmY5MGJkMTZi MmNjNTdjNTllNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA4LTI1ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNYWMsRU1FXSBOZXRmbGl4 LmNvbSBzaG93cyBIRENQIGVycm9yIGZvciBhbGwgc3RyZWFtcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE1ODI1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTmV3IEFQSSBhZGRlZCB0byBBVkNvbnRlbnRL ZXlTZXNzaW9uIGhpdHMgYSBzYW5kYm94IHJlc3RyaWN0aW9uIHdoZW4gcnVuIGluIHRoZSBXZWJD b250ZW50IHByb2Nlc3MsIGFuZCB0aGUgZGVmYXVsdAorICAgICAgICBiZWhhdmlvciB3aGVuIGFu IGVycm9yIGNoZWNraW5nIEhEQ1Agc3RhdHVzIGlzIHRvIHJlcG9ydCB0aGF0IHRoZSBvdXRwdXQg aXMgcmVzdHJpY3RlZCwgcmVnYXJkbGVzcyBvZiB0aGUgZGlzcGxheXMKKyAgICAgICAgYWN0dWFs IGNhcGFiaWxpdGllcy4gVG8gd29yayBhcm91bmQgdGhpcyBiZWhhdmlvciBmb3Igbm93LCBwYXNz IGluIGFuIGVtcHR5IGRpc3BsYXlJRCBhcnJheSwgcmF0aGVyIHRoYW4gdGhlIGFjdHVhbAorICAg ICAgICBkaXNwbGF5SUQuIFRoaXMgY2F1c2VzIEFWRm91bmRhdGlvbiB0byBkbyBhICJsb3dlc3Qg Y29tbW9uIGxldmVsICBvZiBzdXBwb3J0IiByYXRoZXIgdGhhbiBhIHNwZWNpZmljIGRpc3BsYXkg Y2hlY2suCisgICAgICAgIFRoZSB1cHNpZGUgaXMgdGhhdCB0aGlzIGNhbGwgbm8gbG9uZ2VyIHJl cXVpcmVzIGEgY29ubmVjdGlvbiB0byB0aGUgV2luZG93U2VydmVyLiBUaGUgZG93bnNpZGUgaXMg dGhhdCB0aGUKKyAgICAgICAgQVZDb250ZW50S2V5UmVxdWVzdCB3aWxsIHJlcG9ydCB0aGF0IGl0 J3Mgb3V0cHV0IGlzIHJlc3RyaWN0ZWQgaWYgYW55IG5vbi1IRENQIGNvbXBsaWFudCBkaXNwbGF5 IGlzIGF0dGFjaGVkLgorCisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETUlu c3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9i akMubW06CisgICAgICAgIChXZWJDb3JlOjpDRE1JbnN0YW5jZVNlc3Npb25GYWlyUGxheVN0cmVh bWluZ0FWRk9iakM6OmtleVN0YXR1c2VzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNETUlu c3RhbmNlU2Vzc2lvbkZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6a2V5UmVxdWVzdEhhc0luc3Vm ZmljaWVudFByb3RlY3Rpb25Gb3JEaXNwbGF5SUQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 Q0RNSW5zdGFuY2VTZXNzaW9uRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDOjp1cGRhdGVQcm90ZWN0 aW9uU3RhdHVzRm9yRGlzcGxheUlEKToKKwogMjAyMC0wOC0xMSAgQnJhZHkgRWlkc29uICA8YmVp ZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGEgInVzZSBzdG9yZWQgY3JlZGVudGlhbHMi IHNldHRpbmcgdG8gV0tXZWJWaWV3LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWlu Z0FWRk9iakMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL0NETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDLmgKaW5kZXggYzA1NDAz M2I0OTJmY2E0ZjYzMGY0ZDE4NjY5ZTAxZDkyNWEyYTA5MS4uM2U5NDM1NzhjYjk3NDA2OTI3ODJj ZGQxODMzY2Q4Y2I4MGRiN2Y4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FW Rk9iakMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vb2JqYy9DRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQy5oCkBAIC0xOTAsMTAg KzE5MCwxMiBAQCBwcml2YXRlOgogICAgIGJvb2wgZW5zdXJlU2Vzc2lvbk9yR3JvdXAoKTsKICAg ICBib29sIGlzTGljZW5zZVR5cGVTdXBwb3J0ZWQoTGljZW5zZVR5cGUpIGNvbnN0OwogCi0gICAg S2V5U3RhdHVzVmVjdG9yIGtleVN0YXR1c2VzKCkgY29uc3Q7CisgICAgS2V5U3RhdHVzVmVjdG9y IGtleVN0YXR1c2VzKE9wdGlvbmFsPFBsYXRmb3JtRGlzcGxheUlEPiA9IFdURjo6bnVsbG9wdCkg Y29uc3Q7CiAgICAgdm9pZCBuZXh0UmVxdWVzdCgpOwogICAgIEFWQ29udGVudEtleVJlcXVlc3Qq IGxhc3RLZXlSZXF1ZXN0KCkgY29uc3Q7CiAKKyAgICBib29sIGtleVJlcXVlc3RIYXNJbnN1ZmZp Y2llbnRQcm90ZWN0aW9uRm9yRGlzcGxheUlEKEFWQ29udGVudEtleVJlcXVlc3QgKiwgUGxhdGZv cm1EaXNwbGF5SUQpIGNvbnN0OworCiAjaWYgIVJFTEVBU0VfTE9HX0RJU0FCTEVECiAgICAgV1RG OjpMb2dnZXIqIGxvZ2dlclB0cigpIGNvbnN0IHsgcmV0dXJuIG1fbG9nZ2VyLmdldCgpOyB9Owog ICAgIGNvbnN0IHZvaWQqIGxvZ0lkZW50aWZpZXIoKSBjb25zdCB7IHJldHVybiBtX2xvZ0lkZW50 aWZpZXI7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9vYmpjL0NETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDLm1tIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNSW5z dGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMubW0KaW5kZXggZGY0YTZkNmFmMWIxNjg0YmVm ZTRmNmIwOTIzYWU4NGRmZTg4ZjQ1NS4uYmU4OGVmMjgyZjhmYmQ2OWQ0N2Y0OWRlYjdhMWI4ZGQ5 Nzc3NDljZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMubW0KKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RN SW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMubW0KQEAgLTEzNDAsMTAgKzEzNDAsMTMg QEAgc3RhdGljIGF1dG8gcmVxdWVzdFN0YXR1c1RvQ0RNU3RhdHVzKEFWQ29udGVudEtleVJlcXVl c3RTdGF0dXMgc3RhdHVzKQogICAgIH0KIH0KIAotQ0RNSW5zdGFuY2VTZXNzaW9uOjpLZXlTdGF0 dXNWZWN0b3IgQ0RNSW5zdGFuY2VTZXNzaW9uRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDOjprZXlT dGF0dXNlcygpIGNvbnN0CitDRE1JbnN0YW5jZVNlc3Npb246OktleVN0YXR1c1ZlY3RvciBDRE1J bnN0YW5jZVNlc3Npb25GYWlyUGxheVN0cmVhbWluZ0FWRk9iakM6OmtleVN0YXR1c2VzKE9wdGlv bmFsPFBsYXRmb3JtRGlzcGxheUlEPiBkaXNwbGF5SUQpIGNvbnN0CiB7CiAgICAgS2V5U3RhdHVz VmVjdG9yIGtleVN0YXR1c2VzOwogCisgICAgaWYgKCFkaXNwbGF5SUQgJiYgbV9jbGllbnQpCisg ICAgICAgIGRpc3BsYXlJRCA9IG1fY2xpZW50LT5kaXNwbGF5SUQoKTsKKwogICAgIGZvciAoYXV0 byYgcmVxdWVzdCA6IG1fcmVxdWVzdHMpIHsKICAgICAgICAgZm9yIChhdXRvJiBvbmVSZXF1ZXN0 IDogcmVxdWVzdC5yZXF1ZXN0cykgewogICAgICAgICAgICAgYXV0byBrZXlJRHMgPSBrZXlJRHNG b3JSZXF1ZXN0KG9uZVJlcXVlc3QuZ2V0KCkpOwpAQCAtMTM1MSw2ICsxMzU0LDkgQEAgQ0RNSW5z dGFuY2VTZXNzaW9uOjpLZXlTdGF0dXNWZWN0b3IgQ0RNSW5zdGFuY2VTZXNzaW9uRmFpclBsYXlT dHJlYW1pbmdBVkZPYmpDOjoKICAgICAgICAgICAgIGlmIChtX291dHB1dE9ic2N1cmVkIHx8IG9u ZVJlcXVlc3QuZ2V0KCkuZXJyb3IuY29kZSA9PSBTZWN1cml0eUxldmVsRXJyb3IpCiAgICAgICAg ICAgICAgICAgc3RhdHVzID0gQ0RNS2V5U3RhdHVzOjpPdXRwdXRSZXN0cmljdGVkOwogCisgICAg ICAgICAgICBpZiAoZGlzcGxheUlEICYmIGtleVJlcXVlc3RIYXNJbnN1ZmZpY2llbnRQcm90ZWN0 aW9uRm9yRGlzcGxheUlEKG9uZVJlcXVlc3QuZ2V0KCksICpkaXNwbGF5SUQpKQorICAgICAgICAg ICAgICAgIHN0YXR1cyA9IENETUtleVN0YXR1czo6T3V0cHV0UmVzdHJpY3RlZDsKKwogICAgICAg ICAgICAgZm9yIChhdXRvJiBrZXlJRCA6IGtleUlEcykKICAgICAgICAgICAgICAgICBrZXlTdGF0 dXNlcy5hcHBlbmQoeyBXVEZNb3ZlKGtleUlEKSwgc3RhdHVzIH0pOwogICAgICAgICB9CkBAIC0x Mzc5LDIxICsxMzg1LDM1IEBAIHZvaWQgQ0RNSW5zdGFuY2VTZXNzaW9uRmFpclBsYXlTdHJlYW1p bmdBVkZPYmpDOjpleHRlcm5hbFByb3RlY3Rpb25TdGF0dXNEaWRDaGFuCiAgICAgdXBkYXRlUHJv dGVjdGlvblN0YXR1c0ZvckRpc3BsYXlJRChtX2NsaWVudC0+ZGlzcGxheUlEKCkpOwogfQogCi12 b2lkIENETUluc3RhbmNlU2Vzc2lvbkZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6dXBkYXRlUHJv dGVjdGlvblN0YXR1c0ZvckRpc3BsYXlJRChQbGF0Zm9ybURpc3BsYXlJRCBkaXNwbGF5SUQpCiti b29sIENETUluc3RhbmNlU2Vzc2lvbkZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6a2V5UmVxdWVz dEhhc0luc3VmZmljaWVudFByb3RlY3Rpb25Gb3JEaXNwbGF5SUQoQVZDb250ZW50S2V5UmVxdWVz dCAgKnJlcXVlc3QsIFBsYXRmb3JtRGlzcGxheUlEIGRpc3BsYXlJRCkgY29uc3QKIHsKLSAgICBp ZiAobV9yZXF1ZXN0cy5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIGF1dG8ga2V5 UmVxdWVzdEhhc0luc3VmZmljaWVudFByb3RlY3Rpb25Gb3JEaXNwbGF5SUQgPSBbZGlzcGxheUlE XSAoYXV0byYgcmVxdWVzdCkgLT4gYm9vbCB7Ci0gICAgICAgIGlmIChbcmVxdWVzdCByZXNwb25k c1RvU2VsZWN0b3I6QHNlbGVjdG9yKHdpbGxPdXRwdXRCZU9ic2N1cmVkRHVlVG9JbnN1ZmZpY2ll bnRFeHRlcm5hbFByb3RlY3Rpb25Gb3JEaXNwbGF5czopXSkKLSAgICAgICAgICAgIHJldHVybiBb cmVxdWVzdCB3aWxsT3V0cHV0QmVPYnNjdXJlZER1ZVRvSW5zdWZmaWNpZW50RXh0ZXJuYWxQcm90 ZWN0aW9uRm9yRGlzcGxheXM6QFsgQChkaXNwbGF5SUQpIF1dOworICAgIC8vIHdpbGxPdXRwdXRC ZU9ic2N1cmVkRHVlVG9JbnN1ZmZpY2llbnRFeHRlcm5hbFByb3RlY3Rpb25Gb3JEaXNwbGF5cyB3 aWxsIGFsd2F5cyByZXR1cm4gIllFUyIgcHJpb3IKKyAgICAvLyByZWNlaXZpbmcgYSByZXNwb25z ZS4KKyAgICBpZiAocmVxdWVzdC5zdGF0dXMgIT0gQVZDb250ZW50S2V5UmVxdWVzdFN0YXR1c1Jl Y2VpdmVkUmVzcG9uc2UgJiYgcmVxdWVzdC5zdGF0dXMgIT0gQVZDb250ZW50S2V5UmVxdWVzdFN0 YXR1c1JlbmV3ZWQpIHsKKyAgICAgICAgQUxXQVlTX0xPR19JRl9QT1NTSUJMRShMT0dJREVOVElG SUVSLCAicmVxdWVzdCBoYXMgaW5zdWZmaWNpZW50IHN0YXR1cyAiLCAoaW50KXJlcXVlc3Quc3Rh dHVzKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIH07CisgICAgfQogCi0gICAgYm9vbCBv dXRwdXRXaWxsQmVPYnNjdXJlZCA9IFdURjo6YW55T2YobV9yZXF1ZXN0cywgWyZdKFJlcXVlc3Qm IHJlcXVlc3QpIHsKLSAgICAgICAgcmV0dXJuIFdURjo6YW55T2YocmVxdWVzdC5yZXF1ZXN0cywg a2V5UmVxdWVzdEhhc0luc3VmZmljaWVudFByb3RlY3Rpb25Gb3JEaXNwbGF5SUQpOwotICAgIH0p OwotICAgIG91dHB1dE9ic2N1cmVkRHVlVG9JbnN1ZmZpY2llbnRFeHRlcm5hbFByb3RlY3Rpb25D aGFuZ2VkKG91dHB1dFdpbGxCZU9ic2N1cmVkKTsKKyAgICAvLyBGSVhNRTogQVZGb3VuZGF0aW9u IHJlcXVpcmVzIGEgY29ubmVjdGlvbiB0byB0aGUgV2luZG93U2VydmVyIGluIG9yZGVyIHRvIHF1 ZXJ5IHRoZSBIRENQIHN0YXR1cyBvZiBpbmRpdmlkdWFsCisgICAgLy8gZGlzcGxheXMuIFBhc3Np bmcgaW4gYW4gZW1wdHkgTlNBcnJheSB3aWxsIGNhdXNlIEFWRm91bmRhdGlvbiB0byBmYWxsIGJh Y2sgdG8gYSAibWluaW11bSBzdXBwb3J0ZWQgSERDUCBsZXZlbCIKKyAgICAvLyBhY3Jvc3MgYWxs IGRpc3BsYXlzLiBSZXBsYWNlIHRoZSBiZWxvdyB3aXRoIGV4cGxpY2l0IEFQSXMgdG8gcXVlcnkg dGhlIHBlci1kaXNwbGF5IEhEQ1Agc3RhdHVzIGluIHRoZSBVSVByb2Nlc3MKKyAgICAvLyBhbmQg dG8gcXVlcnkgdGhlIEhEQ1AgbGV2ZWwgcmVxdWlyZWQgYnkgZWFjaCBBVkNvbnRlbnRLZXlSZXF1 ZXN0LCBhbmQgZG8gdGhlIGNvbXBhcmlzb24gYmV0d2VlbiB0aCB0d28gaW4gdGhlCisgICAgLy8g V2ViUHJvY2Vzcy4KKyAgICBVTlVTRURfUEFSQU0oZGlzcGxheUlEKTsKKyAgICBpZiAoW3JlcXVl c3QgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcih3aWxsT3V0cHV0QmVPYnNjdXJlZER1ZVRv SW5zdWZmaWNpZW50RXh0ZXJuYWxQcm90ZWN0aW9uRm9yRGlzcGxheXM6KV0pIHsKKyAgICAgICAg YXV0byBvYnNjdXJlZCA9IFtyZXF1ZXN0IHdpbGxPdXRwdXRCZU9ic2N1cmVkRHVlVG9JbnN1ZmZp Y2llbnRFeHRlcm5hbFByb3RlY3Rpb25Gb3JEaXNwbGF5czpAWyBdXTsKKyAgICAgICAgQUxXQVlT X0xPR19JRl9QT1NTSUJMRShMT0dJREVOVElGSUVSLCAicmVxdWVzdCB3aWxsT3V0cHV0QmVPYnNj dXJlZC4uLmZvckRpc3BsYXlzOlsgbmlsIF0gPSAiLCBvYnNjdXJlZCA/ICJ0cnVlIiA6ICJmYWxz ZSIpOworICAgICAgICByZXR1cm4gb2JzY3VyZWQ7CisgICAgfQorICAgIHJldHVybiBmYWxzZTsK K307CisKKwordm9pZCBDRE1JbnN0YW5jZVNlc3Npb25GYWlyUGxheVN0cmVhbWluZ0FWRk9iakM6 OnVwZGF0ZVByb3RlY3Rpb25TdGF0dXNGb3JEaXNwbGF5SUQoUGxhdGZvcm1EaXNwbGF5SUQgZGlz cGxheUlEKQoreworICAgIGlmIChtX3JlcXVlc3RzLmlzRW1wdHkoKSB8fCAhbV9jbGllbnQpCisg ICAgICAgIHJldHVybjsKKyAgICBtX2NsaWVudC0+dXBkYXRlS2V5U3RhdHVzZXMoa2V5U3RhdHVz ZXMoZGlzcGxheUlEKSk7CiB9CiAKIGJvb2wgQ0RNSW5zdGFuY2VTZXNzaW9uRmFpclBsYXlTdHJl YW1pbmdBVkZPYmpDOjplbnN1cmVTZXNzaW9uT3JHcm91cCgpCg== 407237 2020-08-25 14:57:07 -0700 2020-08-26 10:57:11 -0700 Patch for landing bug-215825-20200825145706.patch text/plain 7332 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1NTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTVkOTQ4YjFjYWM1ZWJl MjYyODMzZjkzYjQ3OWJjNWY3MGJhNjY4ZS4uN2RmOWNkMDcxM2RiNjk1OGRhYzllZWQ2NjAzMDdj OTljYjNhOWZiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA4LTI1ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNYWMsRU1FXSBOZXRmbGl4 LmNvbSBzaG93cyBIRENQIGVycm9yIGZvciBhbGwgc3RyZWFtcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE1ODI1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgRXJpYyBDYXJsc29uLgorCisgICAgICAgIE5ldyBBUEkgYWRkZWQgdG8gQVZDb250ZW50S2V5 U2Vzc2lvbiBoaXRzIGEgc2FuZGJveCByZXN0cmljdGlvbiB3aGVuIHJ1biBpbiB0aGUgV2ViQ29u dGVudCBwcm9jZXNzLCBhbmQgdGhlIGRlZmF1bHQKKyAgICAgICAgYmVoYXZpb3Igd2hlbiBhbiBl cnJvciBjaGVja2luZyBIRENQIHN0YXR1cyBpcyB0byByZXBvcnQgdGhhdCB0aGUgb3V0cHV0IGlz IHJlc3RyaWN0ZWQsIHJlZ2FyZGxlc3Mgb2YgdGhlIGRpc3BsYXlzCisgICAgICAgIGFjdHVhbCBj YXBhYmlsaXRpZXMuIFRvIHdvcmsgYXJvdW5kIHRoaXMgYmVoYXZpb3IgZm9yIG5vdywgcGFzcyBp biBhbiBlbXB0eSBkaXNwbGF5SUQgYXJyYXksIHJhdGhlciB0aGFuIHRoZSBhY3R1YWwKKyAgICAg ICAgZGlzcGxheUlELiBUaGlzIGNhdXNlcyBBVkZvdW5kYXRpb24gdG8gZG8gYSAibG93ZXN0IGNv bW1vbiBsZXZlbCBvZiBzdXBwb3J0IiByYXRoZXIgdGhhbiBhIHNwZWNpZmljIGRpc3BsYXkgY2hl Y2suCisgICAgICAgIFRoZSB1cHNpZGUgaXMgdGhhdCB0aGlzIGNhbGwgbm8gbG9uZ2VyIHJlcXVp cmVzIGEgY29ubmVjdGlvbiB0byB0aGUgV2luZG93U2VydmVyLiBUaGUgZG93bnNpZGUgaXMgdGhh dCB0aGUKKyAgICAgICAgQVZDb250ZW50S2V5UmVxdWVzdCB3aWxsIHJlcG9ydCB0aGF0IGl0cyBv dXRwdXQgaXMgcmVzdHJpY3RlZCBpZiBhbnkgbm9uLUhEQ1AgY29tcGxpYW50IGRpc3BsYXkgaXMg YXR0YWNoZWQuCisKKyAgICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNSW5zdGFu Y2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vb2JqYy9DRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQy5t bToKKyAgICAgICAgKFdlYkNvcmU6OkNETUluc3RhbmNlU2Vzc2lvbkZhaXJQbGF5U3RyZWFtaW5n QVZGT2JqQzo6a2V5U3RhdHVzZXMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q0RNSW5zdGFu Y2VTZXNzaW9uRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDOjprZXlSZXF1ZXN0SGFzSW5zdWZmaWNp ZW50UHJvdGVjdGlvbkZvckRpc3BsYXlJRCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpDRE1J bnN0YW5jZVNlc3Npb25GYWlyUGxheVN0cmVhbWluZ0FWRk9iakM6OnVwZGF0ZVByb3RlY3Rpb25T dGF0dXNGb3JEaXNwbGF5SUQpOgorCiAyMDIwLTA4LTExICBCcmFkeSBFaWRzb24gIDxiZWlkc29u QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgYSAidXNlIHN0b3JlZCBjcmVkZW50aWFscyIgc2V0 dGluZyB0byBXS1dlYlZpZXcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZG T2JqQy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29i amMvQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMuaAppbmRleCBjMDU0MDMzYjQ5 MmZjYTRmNjMwZjRkMTg2NjllMDFkOTI1YTJhMDkxLi4zZTk0MzU3OGNiOTc0MDY5Mjc4MmNkZDE4 MzNjZDhjYjgwZGI3Zjg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2Jq Qy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9v YmpjL0NETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDLmgKQEAgLTE5MCwxMCArMTkw LDEyIEBAIHByaXZhdGU6CiAgICAgYm9vbCBlbnN1cmVTZXNzaW9uT3JHcm91cCgpOwogICAgIGJv b2wgaXNMaWNlbnNlVHlwZVN1cHBvcnRlZChMaWNlbnNlVHlwZSkgY29uc3Q7CiAKLSAgICBLZXlT dGF0dXNWZWN0b3Iga2V5U3RhdHVzZXMoKSBjb25zdDsKKyAgICBLZXlTdGF0dXNWZWN0b3Iga2V5 U3RhdHVzZXMoT3B0aW9uYWw8UGxhdGZvcm1EaXNwbGF5SUQ+ID0gV1RGOjpudWxsb3B0KSBjb25z dDsKICAgICB2b2lkIG5leHRSZXF1ZXN0KCk7CiAgICAgQVZDb250ZW50S2V5UmVxdWVzdCogbGFz dEtleVJlcXVlc3QoKSBjb25zdDsKIAorICAgIGJvb2wga2V5UmVxdWVzdEhhc0luc3VmZmljaWVu dFByb3RlY3Rpb25Gb3JEaXNwbGF5SUQoQVZDb250ZW50S2V5UmVxdWVzdCAqLCBQbGF0Zm9ybURp c3BsYXlJRCkgY29uc3Q7CisKICNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKICAgICBXVEY6Okxv Z2dlciogbG9nZ2VyUHRyKCkgY29uc3QgeyByZXR1cm4gbV9sb2dnZXIuZ2V0KCk7IH07CiAgICAg Y29uc3Qgdm9pZCogbG9nSWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1fbG9nSWRlbnRpZmll cjsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3Vu ZGF0aW9uL29iamMvQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMubW0gYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1JbnN0YW5j ZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQy5tbQppbmRleCBkZjRhNmQ2YWYxYjE2ODRiZWZlNGY2 YjA5MjNhZTg0ZGZlODhmNDU1Li44ZjY3ZDQ3OGZkOTlmYjJkODhjZTcxMmJmODAyNmIzODJmMzBh NmRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9DRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQy5tbQorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1JbnN0 YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQy5tbQpAQCAtMTM0MCwxMCArMTM0MCwxMyBAQCBz dGF0aWMgYXV0byByZXF1ZXN0U3RhdHVzVG9DRE1TdGF0dXMoQVZDb250ZW50S2V5UmVxdWVzdFN0 YXR1cyBzdGF0dXMpCiAgICAgfQogfQogCi1DRE1JbnN0YW5jZVNlc3Npb246OktleVN0YXR1c1Zl Y3RvciBDRE1JbnN0YW5jZVNlc3Npb25GYWlyUGxheVN0cmVhbWluZ0FWRk9iakM6OmtleVN0YXR1 c2VzKCkgY29uc3QKK0NETUluc3RhbmNlU2Vzc2lvbjo6S2V5U3RhdHVzVmVjdG9yIENETUluc3Rh bmNlU2Vzc2lvbkZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6a2V5U3RhdHVzZXMoT3B0aW9uYWw8 UGxhdGZvcm1EaXNwbGF5SUQ+IGRpc3BsYXlJRCkgY29uc3QKIHsKICAgICBLZXlTdGF0dXNWZWN0 b3Iga2V5U3RhdHVzZXM7CiAKKyAgICBpZiAoIWRpc3BsYXlJRCAmJiBtX2NsaWVudCkKKyAgICAg ICAgZGlzcGxheUlEID0gbV9jbGllbnQtPmRpc3BsYXlJRCgpOworCiAgICAgZm9yIChhdXRvJiBy ZXF1ZXN0IDogbV9yZXF1ZXN0cykgewogICAgICAgICBmb3IgKGF1dG8mIG9uZVJlcXVlc3QgOiBy ZXF1ZXN0LnJlcXVlc3RzKSB7CiAgICAgICAgICAgICBhdXRvIGtleUlEcyA9IGtleUlEc0ZvclJl cXVlc3Qob25lUmVxdWVzdC5nZXQoKSk7CkBAIC0xMzUxLDYgKzEzNTQsOSBAQCBDRE1JbnN0YW5j ZVNlc3Npb246OktleVN0YXR1c1ZlY3RvciBDRE1JbnN0YW5jZVNlc3Npb25GYWlyUGxheVN0cmVh bWluZ0FWRk9iakM6OgogICAgICAgICAgICAgaWYgKG1fb3V0cHV0T2JzY3VyZWQgfHwgb25lUmVx dWVzdC5nZXQoKS5lcnJvci5jb2RlID09IFNlY3VyaXR5TGV2ZWxFcnJvcikKICAgICAgICAgICAg ICAgICBzdGF0dXMgPSBDRE1LZXlTdGF0dXM6Ok91dHB1dFJlc3RyaWN0ZWQ7CiAKKyAgICAgICAg ICAgIGlmIChkaXNwbGF5SUQgJiYga2V5UmVxdWVzdEhhc0luc3VmZmljaWVudFByb3RlY3Rpb25G b3JEaXNwbGF5SUQob25lUmVxdWVzdC5nZXQoKSwgKmRpc3BsYXlJRCkpCisgICAgICAgICAgICAg ICAgc3RhdHVzID0gQ0RNS2V5U3RhdHVzOjpPdXRwdXRSZXN0cmljdGVkOworCiAgICAgICAgICAg ICBmb3IgKGF1dG8mIGtleUlEIDoga2V5SURzKQogICAgICAgICAgICAgICAgIGtleVN0YXR1c2Vz LmFwcGVuZCh7IFdURk1vdmUoa2V5SUQpLCBzdGF0dXMgfSk7CiAgICAgICAgIH0KQEAgLTEzNzks MjEgKzEzODUsMzUgQEAgdm9pZCBDRE1JbnN0YW5jZVNlc3Npb25GYWlyUGxheVN0cmVhbWluZ0FW Rk9iakM6OmV4dGVybmFsUHJvdGVjdGlvblN0YXR1c0RpZENoYW4KICAgICB1cGRhdGVQcm90ZWN0 aW9uU3RhdHVzRm9yRGlzcGxheUlEKG1fY2xpZW50LT5kaXNwbGF5SUQoKSk7CiB9CiAKLXZvaWQg Q0RNSW5zdGFuY2VTZXNzaW9uRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDOjp1cGRhdGVQcm90ZWN0 aW9uU3RhdHVzRm9yRGlzcGxheUlEKFBsYXRmb3JtRGlzcGxheUlEIGRpc3BsYXlJRCkKK2Jvb2wg Q0RNSW5zdGFuY2VTZXNzaW9uRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDOjprZXlSZXF1ZXN0SGFz SW5zdWZmaWNpZW50UHJvdGVjdGlvbkZvckRpc3BsYXlJRChBVkNvbnRlbnRLZXlSZXF1ZXN0ICpy ZXF1ZXN0LCBQbGF0Zm9ybURpc3BsYXlJRCBkaXNwbGF5SUQpIGNvbnN0CiB7Ci0gICAgaWYgKG1f cmVxdWVzdHMuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBhdXRvIGtleVJlcXVl c3RIYXNJbnN1ZmZpY2llbnRQcm90ZWN0aW9uRm9yRGlzcGxheUlEID0gW2Rpc3BsYXlJRF0gKGF1 dG8mIHJlcXVlc3QpIC0+IGJvb2wgewotICAgICAgICBpZiAoW3JlcXVlc3QgcmVzcG9uZHNUb1Nl bGVjdG9yOkBzZWxlY3Rvcih3aWxsT3V0cHV0QmVPYnNjdXJlZER1ZVRvSW5zdWZmaWNpZW50RXh0 ZXJuYWxQcm90ZWN0aW9uRm9yRGlzcGxheXM6KV0pCi0gICAgICAgICAgICByZXR1cm4gW3JlcXVl c3Qgd2lsbE91dHB1dEJlT2JzY3VyZWREdWVUb0luc3VmZmljaWVudEV4dGVybmFsUHJvdGVjdGlv bkZvckRpc3BsYXlzOkBbIEAoZGlzcGxheUlEKSBdXTsKKyAgICAvLyB3aWxsT3V0cHV0QmVPYnNj dXJlZER1ZVRvSW5zdWZmaWNpZW50RXh0ZXJuYWxQcm90ZWN0aW9uRm9yRGlzcGxheXMgd2lsbCBh bHdheXMgcmV0dXJuICJZRVMiIHByaW9yIHRvCisgICAgLy8gcmVjZWl2aW5nIGEgcmVzcG9uc2Uu CisgICAgaWYgKHJlcXVlc3Quc3RhdHVzICE9IEFWQ29udGVudEtleVJlcXVlc3RTdGF0dXNSZWNl aXZlZFJlc3BvbnNlICYmIHJlcXVlc3Quc3RhdHVzICE9IEFWQ29udGVudEtleVJlcXVlc3RTdGF0 dXNSZW5ld2VkKSB7CisgICAgICAgIEFMV0FZU19MT0dfSUZfUE9TU0lCTEUoTE9HSURFTlRJRklF UiwgInJlcXVlc3QgaGFzIGluc3VmZmljaWVudCBzdGF0dXMgIiwgKGludClyZXF1ZXN0LnN0YXR1 cyk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9OworICAgIH0KIAotICAgIGJvb2wgb3V0 cHV0V2lsbEJlT2JzY3VyZWQgPSBXVEY6OmFueU9mKG1fcmVxdWVzdHMsIFsmXShSZXF1ZXN0JiBy ZXF1ZXN0KSB7Ci0gICAgICAgIHJldHVybiBXVEY6OmFueU9mKHJlcXVlc3QucmVxdWVzdHMsIGtl eVJlcXVlc3RIYXNJbnN1ZmZpY2llbnRQcm90ZWN0aW9uRm9yRGlzcGxheUlEKTsKLSAgICB9KTsK LSAgICBvdXRwdXRPYnNjdXJlZER1ZVRvSW5zdWZmaWNpZW50RXh0ZXJuYWxQcm90ZWN0aW9uQ2hh bmdlZChvdXRwdXRXaWxsQmVPYnNjdXJlZCk7CisgICAgLy8gRklYTUU6IEFWRm91bmRhdGlvbiBy ZXF1aXJlcyBhIGNvbm5lY3Rpb24gdG8gdGhlIFdpbmRvd1NlcnZlciBpbiBvcmRlciB0byBxdWVy eSB0aGUgSERDUCBzdGF0dXMgb2YgaW5kaXZpZHVhbAorICAgIC8vIGRpc3BsYXlzLiBQYXNzaW5n IGluIGFuIGVtcHR5IE5TQXJyYXkgd2lsbCBjYXVzZSBBVkZvdW5kYXRpb24gdG8gZmFsbCBiYWNr IHRvIGEgIm1pbmltdW0gc3VwcG9ydGVkIEhEQ1AgbGV2ZWwiCisgICAgLy8gYWNyb3NzIGFsbCBk aXNwbGF5cy4gUmVwbGFjZSB0aGUgYmVsb3cgd2l0aCBleHBsaWNpdCBBUElzIHRvIHF1ZXJ5IHRo ZSBwZXItZGlzcGxheSBIRENQIHN0YXR1cyBpbiB0aGUgVUlQcm9jZXNzCisgICAgLy8gYW5kIHRv IHF1ZXJ5IHRoZSBIRENQIGxldmVsIHJlcXVpcmVkIGJ5IGVhY2ggQVZDb250ZW50S2V5UmVxdWVz dCwgYW5kIGRvIHRoZSBjb21wYXJpc29uIGJldHdlZW4gdGhlIHR3byBpbiB0aGUKKyAgICAvLyBX ZWJQcm9jZXNzLgorICAgIFVOVVNFRF9QQVJBTShkaXNwbGF5SUQpOworICAgIGlmIChbcmVxdWVz dCByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHdpbGxPdXRwdXRCZU9ic2N1cmVkRHVlVG9J bnN1ZmZpY2llbnRFeHRlcm5hbFByb3RlY3Rpb25Gb3JEaXNwbGF5czopXSkgeworICAgICAgICBh dXRvIG9ic2N1cmVkID0gW3JlcXVlc3Qgd2lsbE91dHB1dEJlT2JzY3VyZWREdWVUb0luc3VmZmlj aWVudEV4dGVybmFsUHJvdGVjdGlvbkZvckRpc3BsYXlzOkBbIF1dOworICAgICAgICBBTFdBWVNf TE9HX0lGX1BPU1NJQkxFKExPR0lERU5USUZJRVIsICJyZXF1ZXN0IHdpbGxPdXRwdXRCZU9ic2N1 cmVkLi4uZm9yRGlzcGxheXM6WyBuaWwgXSA9ICIsIG9ic2N1cmVkID8gInRydWUiIDogImZhbHNl Iik7CisgICAgICAgIHJldHVybiBvYnNjdXJlZDsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOwor fTsKKworCit2b2lkIENETUluc3RhbmNlU2Vzc2lvbkZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6 dXBkYXRlUHJvdGVjdGlvblN0YXR1c0ZvckRpc3BsYXlJRChQbGF0Zm9ybURpc3BsYXlJRCBkaXNw bGF5SUQpCit7CisgICAgaWYgKG1fcmVxdWVzdHMuaXNFbXB0eSgpIHx8ICFtX2NsaWVudCkKKyAg ICAgICAgcmV0dXJuOworICAgIG1fY2xpZW50LT51cGRhdGVLZXlTdGF0dXNlcyhrZXlTdGF0dXNl cyhkaXNwbGF5SUQpKTsKIH0KIAogYm9vbCBDRE1JbnN0YW5jZVNlc3Npb25GYWlyUGxheVN0cmVh bWluZ0FWRk9iakM6OmVuc3VyZVNlc3Npb25Pckdyb3VwKCkK