212535 2020-05-29 11:10:10 -0700 [Cocoa] EME should return more helpful error code during key exchange 2020-05-31 12:52:59 -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 1657347 0 jer.noble 2020-05-29 11:10:10 -0700 [Cocoa] EME should return more helpful error code during key exchange 1657352 1 jer.noble 2020-05-29 11:14:13 -0700 <rdar://problem/60439979> 1657358 2 400603 jer.noble 2020-05-29 11:17:32 -0700 Created attachment 400603 Patch 1657390 3 400603 eric.carlson 2020-05-29 13:13:20 -0700 Comment on attachment 400603 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=400603&action=review > Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:1192 > + // to provide, signal this state by "suceeding", but set the key status s/suceeding/succeeding/ 1657799 4 400708 jer.noble 2020-05-31 11:53:04 -0700 Created attachment 400708 Patch for landing 1657801 5 ews-feeder 2020-05-31 12:52:58 -0700 Committed r262365: <https://trac.webkit.org/changeset/262365> All reviewed patches have been landed. Closing bug and clearing flags on attachment 400708. 400603 2020-05-29 11:17:32 -0700 2020-05-29 13:13:20 -0700 Patch bug-212535-20200529111731.patch text/plain 4329 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyMTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWZmZTg4M2E2YTkwN2Zl MzRhZWIwYTkyYzVlODY4NjRkY2QyMjFmNy4uYTNkODhiZTM2ZGI5ZmUyZmM2ZGVkNzczNjEwN2E1 MDgzNWE1ZGQ5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA1LTI5ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gRU1FIHNob3Vs ZCByZXR1cm4gbW9yZSBoZWxwZnVsIGVycm9yIGNvZGUgZHVyaW5nIGtleSBleGNoYW5nZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyNTM1CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS82MDQzOTk3OT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBDbGllbnRzIGhhdmUgcmVxdWVzdGVkIHRoYXQgdGhlIEVN RSBBUEkgcHJvdmlkZSBtb3JlIGhlbHBmdWwgaW5mb3JtYXRpb24gd2hlbiB0aGUgRmFpclBsYXkg Q0RNIGlzIHVuYWJsZQorICAgICAgICB0byBwcm92aWRlIHRoZSByZXF1ZXN0ZWQgbGV2ZWwgb2Yg a2V5IHNlY3VyaXR5LiBDdXJyZW50bHksIHdlIHJlamVjdCB0aGUgdXBkYXRlKCkgcHJvbWlzZSB3 aXRoIGEgZ2VuZXJpYworICAgICAgICAiZmFpbGVkIiBlcnJvciBjb2RlLiBJbnN0ZWFkLCByZXNv bHZlIHRoZSBwcm9taXNlLCBidXQgbWFyayB0aGUga2V5IGFzICJvdXRwdXQtcmVzdHJpY3RlZCIg aW4gdGhlIGtleQorICAgICAgICBzdGF0dXMgbWFwLCBpbmRpY2F0aW5nIHRoYXQgdGhlIGtleSBj YW5ub3QgYmUgdXNlZCB3aXRoIHJlcXVpcmVkIGxldmVsIG9mIHNlY3VyaXR5LgorCisgICAgICAg IERyaXZlLWJ5IGZpeDogV2UgY3VycmVudGx5IEFTU0VSVCgpIHRoYXQgdGhlIGNhbGxiYWNrIGZy b20gcmVtb3ZlU2Vzc2lvbkRhdGEoKSBpc24ndCBjYWxsZWQgaWYgdGhlIHNlc3Npb24KKyAgICAg ICAgaXMgbm90IGEgUFVSIHNlc3Npb24uIFdoZW4gY2FsbGluZyByZW1vdmVTZXNzaW9uRGF0YSgp IG9uIGEgbm9uLVBVUiBzZXNzaW9uLCBjYWxsIHRoZSBjYWxsYmFjayB3aXRoIGEgZ2VuZXJpYwor ICAgICAgICAiZmFpbGVkIiBlcnJvci4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9vYmpjL0NETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDLm1tOgor ICAgICAgICAoV2ViQ29yZTo6Q0RNSW5zdGFuY2VTZXNzaW9uRmFpclBsYXlTdHJlYW1pbmdBVkZP YmpDOjpyZW1vdmVTZXNzaW9uRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpDRE1JbnN0YW5jZVNl c3Npb25GYWlyUGxheVN0cmVhbWluZ0FWRk9iakM6OmRpZEZhaWxUb1Byb3ZpZGVSZXF1ZXN0KToK KyAgICAgICAgKFdlYkNvcmU6OkNETUluc3RhbmNlU2Vzc2lvbkZhaXJQbGF5U3RyZWFtaW5nQVZG T2JqQzo6a2V5U3RhdHVzZXMgY29uc3QpOgorCiAyMDIwLTA1LTI3ICBNaWd1ZWwgR29tZXogIDxt YWdvbWV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgW1dQRV0gUkVHUkVTU0lPTihyMjUzNjc1KSBD cmFzaCB3aGVuIHVzaW5nIHRocmVhZGVkIHJlbmRlcmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNSW5zdGFuY2VGYWly UGxheVN0cmVhbWluZ0FWRk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vb2JqYy9DRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQy5t bQppbmRleCBlNmFhYmM5MmJhMTk5ZDUzNDdlNjc5ZGYxYjZhYTNlY2QyODg0MDVkLi4wZDAyMWFh YzMwODA2MzczZjkwM2U2MWEwNTYxOGZmYmMzNGM4NGExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1JbnN0YW5jZUZhaXJQ bGF5U3RyZWFtaW5nQVZGT2JqQy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2Jq Qy5tbQpAQCAtNTIsNiArNTIsNyBAQAogc3RhdGljIGNvbnN0IE5TU3RyaW5nICpQbGF5YmFja1Nl c3Npb25JZEtleSA9IEAiUGxheWJhY2tTZXNzaW9uSUQiOwogc3RhdGljIE5TU3RyaW5nICogY29u c3QgSW5pdGlhbGl6YXRpb25EYXRhVHlwZUtleSA9IEAiSW5pdGlhbGl6YXRpb25EYXRhVHlwZSI7 CiBzdGF0aWMgTlNTdHJpbmcgKiBjb25zdCBDb250ZW50S2V5UmVwb3J0R3JvdXBLZXkgPSBAIkNv bnRlbnRLZXlSZXBvcnRHcm91cCI7CitzdGF0aWMgY29uc3QgTlNJbnRlZ2VyIFNlY3VyaXR5TGV2 ZWxFcnJvciA9IC00MjgxMTsKIAogQGludGVyZmFjZSBXZWJDb3JlRlBTQ29udGVudEtleVNlc3Np b25EZWxlZ2F0ZSA6IE5TT2JqZWN0PEFWQ29udGVudEtleVNlc3Npb25EZWxlZ2F0ZT4gewogICAg IFdlYkNvcmU6OkFWQ29udGVudEtleVNlc3Npb25EZWxlZ2F0ZUNsaWVudCogX3BhcmVudDsKQEAg LTk2OSw3ICs5NzAsMTAgQEAgdm9pZCBDRE1JbnN0YW5jZVNlc3Npb25GYWlyUGxheVN0cmVhbWlu Z0FWRk9iakM6OnJlbW92ZVNlc3Npb25EYXRhKGNvbnN0IFN0cmluZyYKIAogICAgICAgICBERUJV R19MT0dfSUZfUE9TU0lCTEUoTE9HSURFTlRJRklFUiwgIiBTdWNjZWVkZWQiKTsKICAgICAgICAg Y2FsbGJhY2soV1RGTW92ZShjaGFuZ2VkS2V5cyksIFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKGV4cGly ZWRTZXNzaW9uc0RhdGEuZ2V0KCkpLCBTdWNjZWVkZWQpOworICAgICAgICByZXR1cm47CiAgICAg fQorCisgICAgY2FsbGJhY2soeyB9LCBXVEY6Om51bGxvcHQsIEZhaWxlZCk7CiB9CiAKIHZvaWQg Q0RNSW5zdGFuY2VTZXNzaW9uRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDOjpzdG9yZVJlY29yZE9m S2V5VXNhZ2UoY29uc3QgU3RyaW5nJikKQEAgLTExODIsNyArMTE4NiwxNiBAQCB2b2lkIENETUlu c3RhbmNlU2Vzc2lvbkZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6ZGlkUHJvdmlkZVBlcnNpc3Rh YmxlUmVxdWVzdChBVgogdm9pZCBDRE1JbnN0YW5jZVNlc3Npb25GYWlyUGxheVN0cmVhbWluZ0FW Rk9iakM6OmRpZEZhaWxUb1Byb3ZpZGVSZXF1ZXN0KEFWQ29udGVudEtleVJlcXVlc3QgKnJlcXVl c3QsIE5TRXJyb3IgKmVycm9yKQogewogICAgIFVOVVNFRF9QQVJBTShyZXF1ZXN0KTsKLSAgICBV TlVTRURfUEFSQU0oZXJyb3IpOworCisgICAgLy8gUmF0aGVyIHRoYW4gcmVqZWN0IHRoZSB1cGRh dGUoKSBwcm9taXNlIHdoZW4gdGhlIENETSBpbmRpY2F0ZXMgdGhhdAorICAgIC8vIHRoZSBrZXkg cmVxdWlyZXMgYSBoaWdoZXIgbGV2ZWwgb2Ygc2VjdXJpdHkgdGhhbiBpdCBpcyBjdXJyZW50bHkg YWJsZQorICAgIC8vIHRvIHByb3ZpZGUsIHNpZ25hbCB0aGlzIHN0YXRlIGJ5ICJzdWNlZWRpbmci LCBidXQgc2V0IHRoZSBrZXkgc3RhdHVzCisgICAgLy8gdG8gIm91dHB1dC1yZXN0cmljdGVkIi4K KworICAgIGlmIChlcnJvci5jb2RlID09IFNlY3VyaXR5TGV2ZWxFcnJvcikgeworICAgICAgICBy ZXF1ZXN0RGlkU3VjY2VlZChyZXF1ZXN0KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KIAogICAg IGlmIChtX3VwZGF0ZVJlc3BvbnNlQ29sbGVjdG9yKSB7CiAgICAgICAgIG1fdXBkYXRlUmVzcG9u c2VDb2xsZWN0b3ItPmFkZEVycm9yUmVzcG9uc2UocmVxdWVzdCwgZXJyb3IpOwpAQCAtMTMxMiw3 ICsxMzI1LDcgQEAgQ0RNSW5zdGFuY2VTZXNzaW9uOjpLZXlTdGF0dXNWZWN0b3IgQ0RNSW5zdGFu Y2VTZXNzaW9uRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDOjoKICAgICAgICAgZm9yIChhdXRvJiBv bmVSZXF1ZXN0IDogcmVxdWVzdC5yZXF1ZXN0cykgewogICAgICAgICAgICAgYXV0byBrZXlJRHMg PSBrZXlJRHNGb3JSZXF1ZXN0KG9uZVJlcXVlc3QuZ2V0KCkpOwogICAgICAgICAgICAgYXV0byBz dGF0dXMgPSByZXF1ZXN0U3RhdHVzVG9DRE1TdGF0dXMob25lUmVxdWVzdC5nZXQoKS5zdGF0dXMp OwotICAgICAgICAgICAgaWYgKG1fb3V0cHV0T2JzY3VyZWQpCisgICAgICAgICAgICBpZiAobV9v dXRwdXRPYnNjdXJlZCB8fCBvbmVSZXF1ZXN0LmdldCgpLmVycm9yLmNvZGUgPT0gU2VjdXJpdHlM ZXZlbEVycm9yKQogICAgICAgICAgICAgICAgIHN0YXR1cyA9IENETUtleVN0YXR1czo6T3V0cHV0 UmVzdHJpY3RlZDsKIAogICAgICAgICAgICAgZm9yIChhdXRvJiBrZXlJRCA6IGtleUlEcykK 400708 2020-05-31 11:53:04 -0700 2020-05-31 12:52:59 -0700 Patch for landing bug-212535-20200531115303.patch text/plain 4364 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyMTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTc4MDk1Y2JhMjJmN2Mw MTMyMWFiOTQyYzcxOGVkMGNhNjdhNDZmZC4uNGU4YWJmZmY3MDY1YTBmZjQ2N2Y5YmYyZjUzMWNm OThhYTRlZDFjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA1LTI5ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gRU1FIHNob3Vs ZCByZXR1cm4gbW9yZSBoZWxwZnVsIGVycm9yIGNvZGUgZHVyaW5nIGtleSBleGNoYW5nZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyNTM1CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS82MDQzOTk3OT4KKworICAgICAgICBSZXZpZXdlZCBieSBFcmlj IENhcmxzb24uCisKKyAgICAgICAgQ2xpZW50cyBoYXZlIHJlcXVlc3RlZCB0aGF0IHRoZSBFTUUg QVBJIHByb3ZpZGUgbW9yZSBoZWxwZnVsIGluZm9ybWF0aW9uIHdoZW4gdGhlIEZhaXJQbGF5IENE TSBpcyB1bmFibGUKKyAgICAgICAgdG8gcHJvdmlkZSB0aGUgcmVxdWVzdGVkIGxldmVsIG9mIGtl eSBzZWN1cml0eS4gQ3VycmVudGx5LCB3ZSByZWplY3QgdGhlIHVwZGF0ZSgpIHByb21pc2Ugd2l0 aCBhIGdlbmVyaWMKKyAgICAgICAgImZhaWxlZCIgZXJyb3IgY29kZS4gSW5zdGVhZCwgcmVzb2x2 ZSB0aGUgcHJvbWlzZSwgYnV0IG1hcmsgdGhlIGtleSBhcyAib3V0cHV0LXJlc3RyaWN0ZWQiIGlu IHRoZSBrZXkKKyAgICAgICAgc3RhdHVzIG1hcCwgaW5kaWNhdGluZyB0aGF0IHRoZSBrZXkgY2Fu bm90IGJlIHVzZWQgd2l0aCByZXF1aXJlZCBsZXZlbCBvZiBzZWN1cml0eS4KKworICAgICAgICBE cml2ZS1ieSBmaXg6IFdlIGN1cnJlbnRseSBBU1NFUlQoKSB0aGF0IHRoZSBjYWxsYmFjayBmcm9t IHJlbW92ZVNlc3Npb25EYXRhKCkgaXNuJ3QgY2FsbGVkIGlmIHRoZSBzZXNzaW9uCisgICAgICAg IGlzIG5vdCBhIFBVUiBzZXNzaW9uLiBXaGVuIGNhbGxpbmcgcmVtb3ZlU2Vzc2lvbkRhdGEoKSBv biBhIG5vbi1QVVIgc2Vzc2lvbiwgY2FsbCB0aGUgY2FsbGJhY2sgd2l0aCBhIGdlbmVyaWMKKyAg ICAgICAgImZhaWxlZCIgZXJyb3IuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vb2JqYy9DRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQy5tbToKKyAg ICAgICAgKFdlYkNvcmU6OkNETUluc3RhbmNlU2Vzc2lvbkZhaXJQbGF5U3RyZWFtaW5nQVZGT2Jq Qzo6cmVtb3ZlU2Vzc2lvbkRhdGEpOgorICAgICAgICAoV2ViQ29yZTo6Q0RNSW5zdGFuY2VTZXNz aW9uRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDOjpkaWRGYWlsVG9Qcm92aWRlUmVxdWVzdCk6Cisg ICAgICAgIChXZWJDb3JlOjpDRE1JbnN0YW5jZVNlc3Npb25GYWlyUGxheVN0cmVhbWluZ0FWRk9i akM6OmtleVN0YXR1c2VzIGNvbnN0KToKKwogMjAyMC0wNS0yOSAgSmVyIE5vYmxlICA8amVyLm5v YmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIFRyYW5zaXRpb24gYmV0d2VlbiBlbmNy eXB0ZWQgYW5kIGNsZWFyIGNvZGVjcyB0aHJvd3MgZXJyb3IgZnJvbSBTb3VyY2VCdWZmZXIuYXBw ZW5kQnVmZmVyKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2F2Zm91bmRhdGlvbi9vYmpjL0NETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDLm1t IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RN SW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMubW0KaW5kZXggZTZhYWJjOTJiYTE5OWQ1 MzQ3ZTY3OWRmMWI2YWEzZWNkMjg4NDA1ZC4uNzVhMGE4Y2MxMjFiMWNhZmM3MTZhMGYxYTYwNGMz ZjhjYzYxNWQ4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv YXZmb3VuZGF0aW9uL29iamMvQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMubW0K KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMv Q0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMubW0KQEAgLTUyLDYgKzUyLDcgQEAK IHN0YXRpYyBjb25zdCBOU1N0cmluZyAqUGxheWJhY2tTZXNzaW9uSWRLZXkgPSBAIlBsYXliYWNr U2Vzc2lvbklEIjsKIHN0YXRpYyBOU1N0cmluZyAqIGNvbnN0IEluaXRpYWxpemF0aW9uRGF0YVR5 cGVLZXkgPSBAIkluaXRpYWxpemF0aW9uRGF0YVR5cGUiOwogc3RhdGljIE5TU3RyaW5nICogY29u c3QgQ29udGVudEtleVJlcG9ydEdyb3VwS2V5ID0gQCJDb250ZW50S2V5UmVwb3J0R3JvdXAiOwor c3RhdGljIGNvbnN0IE5TSW50ZWdlciBTZWN1cml0eUxldmVsRXJyb3IgPSAtNDI4MTE7CiAKIEBp bnRlcmZhY2UgV2ViQ29yZUZQU0NvbnRlbnRLZXlTZXNzaW9uRGVsZWdhdGUgOiBOU09iamVjdDxB VkNvbnRlbnRLZXlTZXNzaW9uRGVsZWdhdGU+IHsKICAgICBXZWJDb3JlOjpBVkNvbnRlbnRLZXlT ZXNzaW9uRGVsZWdhdGVDbGllbnQqIF9wYXJlbnQ7CkBAIC05NjksNyArOTcwLDEwIEBAIHZvaWQg Q0RNSW5zdGFuY2VTZXNzaW9uRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDOjpyZW1vdmVTZXNzaW9u RGF0YShjb25zdCBTdHJpbmcmCiAKICAgICAgICAgREVCVUdfTE9HX0lGX1BPU1NJQkxFKExPR0lE RU5USUZJRVIsICIgU3VjY2VlZGVkIik7CiAgICAgICAgIGNhbGxiYWNrKFdURk1vdmUoY2hhbmdl ZEtleXMpLCBTaGFyZWRCdWZmZXI6OmNyZWF0ZShleHBpcmVkU2Vzc2lvbnNEYXRhLmdldCgpKSwg U3VjY2VlZGVkKTsKKyAgICAgICAgcmV0dXJuOwogICAgIH0KKworICAgIGNhbGxiYWNrKHsgfSwg V1RGOjpudWxsb3B0LCBGYWlsZWQpOwogfQogCiB2b2lkIENETUluc3RhbmNlU2Vzc2lvbkZhaXJQ bGF5U3RyZWFtaW5nQVZGT2JqQzo6c3RvcmVSZWNvcmRPZktleVVzYWdlKGNvbnN0IFN0cmluZyYp CkBAIC0xMTgyLDcgKzExODYsMTYgQEAgdm9pZCBDRE1JbnN0YW5jZVNlc3Npb25GYWlyUGxheVN0 cmVhbWluZ0FWRk9iakM6OmRpZFByb3ZpZGVQZXJzaXN0YWJsZVJlcXVlc3QoQVYKIHZvaWQgQ0RN SW5zdGFuY2VTZXNzaW9uRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDOjpkaWRGYWlsVG9Qcm92aWRl UmVxdWVzdChBVkNvbnRlbnRLZXlSZXF1ZXN0ICpyZXF1ZXN0LCBOU0Vycm9yICplcnJvcikKIHsK ICAgICBVTlVTRURfUEFSQU0ocmVxdWVzdCk7Ci0gICAgVU5VU0VEX1BBUkFNKGVycm9yKTsKKwor ICAgIC8vIFJhdGhlciB0aGFuIHJlamVjdCB0aGUgdXBkYXRlKCkgcHJvbWlzZSB3aGVuIHRoZSBD RE0gaW5kaWNhdGVzIHRoYXQKKyAgICAvLyB0aGUga2V5IHJlcXVpcmVzIGEgaGlnaGVyIGxldmVs IG9mIHNlY3VyaXR5IHRoYW4gaXQgaXMgY3VycmVudGx5IGFibGUKKyAgICAvLyB0byBwcm92aWRl LCBzaWduYWwgdGhpcyBzdGF0ZSBieSAic3VjY2VlZGluZyIsIGJ1dCBzZXQgdGhlIGtleSBzdGF0 dXMKKyAgICAvLyB0byAib3V0cHV0LXJlc3RyaWN0ZWQiLgorCisgICAgaWYgKGVycm9yLmNvZGUg PT0gU2VjdXJpdHlMZXZlbEVycm9yKSB7CisgICAgICAgIHJlcXVlc3REaWRTdWNjZWVkKHJlcXVl c3QpOworICAgICAgICByZXR1cm47CisgICAgfQogCiAgICAgaWYgKG1fdXBkYXRlUmVzcG9uc2VD b2xsZWN0b3IpIHsKICAgICAgICAgbV91cGRhdGVSZXNwb25zZUNvbGxlY3Rvci0+YWRkRXJyb3JS ZXNwb25zZShyZXF1ZXN0LCBlcnJvcik7CkBAIC0xMzEyLDcgKzEzMjUsNyBAQCBDRE1JbnN0YW5j ZVNlc3Npb246OktleVN0YXR1c1ZlY3RvciBDRE1JbnN0YW5jZVNlc3Npb25GYWlyUGxheVN0cmVh bWluZ0FWRk9iakM6OgogICAgICAgICBmb3IgKGF1dG8mIG9uZVJlcXVlc3QgOiByZXF1ZXN0LnJl cXVlc3RzKSB7CiAgICAgICAgICAgICBhdXRvIGtleUlEcyA9IGtleUlEc0ZvclJlcXVlc3Qob25l UmVxdWVzdC5nZXQoKSk7CiAgICAgICAgICAgICBhdXRvIHN0YXR1cyA9IHJlcXVlc3RTdGF0dXNU b0NETVN0YXR1cyhvbmVSZXF1ZXN0LmdldCgpLnN0YXR1cyk7Ci0gICAgICAgICAgICBpZiAobV9v dXRwdXRPYnNjdXJlZCkKKyAgICAgICAgICAgIGlmIChtX291dHB1dE9ic2N1cmVkIHx8IG9uZVJl cXVlc3QuZ2V0KCkuZXJyb3IuY29kZSA9PSBTZWN1cml0eUxldmVsRXJyb3IpCiAgICAgICAgICAg ICAgICAgc3RhdHVzID0gQ0RNS2V5U3RhdHVzOjpPdXRwdXRSZXN0cmljdGVkOwogCiAgICAgICAg ICAgICBmb3IgKGF1dG8mIGtleUlEIDoga2V5SURzKQo=