167896 2017-02-06 11:40:00 -0800 [EME] Alias CDMInstance enums to the specification-defined enums 2017-02-08 01:36:24 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan calvaris jer.noble oldest_to_newest 1273660 0 zan 2017-02-06 11:40:00 -0800 [EME] Utility functions for conversions between CDMInstance and W3C EME enums 1273663 1 300743 zan 2017-02-06 11:44:16 -0800 Created attachment 300743 Patch 1273670 2 300743 sam 2017-02-06 11:59:15 -0800 Comment on attachment 300743 Patch Is there a reason to have both types here? Can we just define one to be the other using a using declaration? 1273925 3 zan 2017-02-07 04:40:08 -0800 (In reply to comment #2) > Comment on attachment 300743 [details] > Patch > > Is there a reason to have both types here? Can we just define one to be the > other using a using declaration? That would be the simplest approach. Given that MediaKeySystemConfiguration is already used in CDMInstance, the CDMInstance types could alias to the spec-defined ones. If ever the CDMInstance interface gets pushed into the platform layer, or is used from there, then this would require changing. 1273977 4 300808 zan 2017-02-07 06:53:46 -0800 Created attachment 300808 Patch 1274008 5 300808 sam 2017-02-07 08:47:38 -0800 Comment on attachment 300808 Patch Nice. 1274285 6 300808 zan 2017-02-08 01:36:16 -0800 Comment on attachment 300808 Patch Clearing flags on attachment: 300808 Committed r211855: <http://trac.webkit.org/changeset/211855> 1274286 7 zan 2017-02-08 01:36:24 -0800 All reviewed patches have been landed. Closing bug. 300743 2017-02-06 11:44:16 -0800 2017-02-07 06:53:40 -0800 Patch bug-167896-20170206114155.patch text/plain 10952 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjExNjc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWExM2U3ZjU5MTNiMzU2 NjcyYWE4OWYyODUwNzYzNjFkNTQ0NjhjMS4uNTMxZTAyYzU0NmUzN2Q1MjhkZDcyNzNiZjQ1ZTZm Mzc0YmZiYmUxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3LTAyLTA2ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbRU1FXSBVdGlsaXR5 IGZ1bmN0aW9ucyBmb3IgY29udmVyc2lvbnMgYmV0d2VlbiBDRE1JbnN0YW5jZSBhbmQgVzNDIEVN RSBlbnVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTY3ODk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkIENETVR5cGVDb252ZXJzaW9uOjpjb252ZXJ0KCkgb3ZlcmxvYWRzIGZvciBzaW1wbGUgY29u dmVyc2lvbnMgYmV0d2VlbgorICAgICAgICB0aGUgQ0RNSW5zdGFuY2UgZW51bXMgYW5kIHRoZSBz cGVjaWZpY2F0aW9uLWRlZmluZWQgZW51bXMuIFRoZSBjb252ZXJ0KCkKKyAgICAgICAgb3Zlcmxv YWRzIHdpbGwgYmUgYWRkZWQgYXMgbmVlZGVkLiBBdCB0aGUgbW9tZW50IG9ubHkgY29udmVyc2lv biBmdW5jdGlvbnMKKyAgICAgICAgZnJvbSBNZWRpYUtleVNlc3Npb25UeXBlIHRvIENETUluc3Rh bmNlOjpMaWNlbnNlVHlwZSBhbmQgZnJvbQorICAgICAgICBDRE1JbnN0YW5jZTo6TWVzc2FnZVR5 cGUgdG8gTWVkaWFLZXlNZXNzYWdlVHlwZSBhcmUgbmVjZXNzYXJ5LgorCisgICAgICAgICogTW9k dWxlcy9lbmNyeXB0ZWRtZWRpYS9DRE1UeXBlQ29udmVyc2lvbi5oOiBBZGRlZC4KKyAgICAgICAg KFdlYkNvcmU6OkNETVR5cGVDb252ZXJzaW9uOjpjb252ZXJ0KToKKyAgICAgICAgKiBNb2R1bGVz L2VuY3J5cHRlZG1lZGlhL01lZGlhS2V5U2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYUtleVNlc3Npb246OmdlbmVyYXRlUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRp YUtleVNlc3Npb246OnVwZGF0ZSk6CisKIDIwMTctMDItMDQgIEpvc2VwaCBQZWNvcmFybyAgPHBl Y29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBTdGF0aWMgQW5hbHl6ZXI6IFdlYkNvcmVOU1VS TEV4dHJhcy5tbTogUG90ZW50aWFsIGxlYWsgb2YgbWVtb3J5IHBvaW50ZWQgdG8gYnkgJ2FsbEJ5 dGVzQnVmZmVyJwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRt ZWRpYS9DRE1UeXBlQ29udmVyc2lvbi5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0 ZWRtZWRpYS9DRE1UeXBlQ29udmVyc2lvbi5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQwMjhlNmE3NmE2YjViZjUw OGYzNjhhYjZlYzcwZjA1ZDcwNTM1ZjkKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL0NETVR5cGVDb252ZXJzaW9uLmgKQEAgLTAsMCArMSw2 OSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxNyBNZXRyb2xvZ2ljYWwgR3JvdXAgQi5WLgor ICogQ29weXJpZ2h0IChDKSAyMDE3IElnYWxpYSBTLkwuCisgKgorICogUmVkaXN0cmlidXRpb24g YW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBt b2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNv bmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJj ZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIu IFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUK KyAqICAgIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nCisgKiAgICBkaXNjbGFpbWVyIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBv dGhlciBtYXRlcmlhbHMgcHJvdmlkZWQKKyAqICAgIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAq CisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBB TkQgQ09OVFJJQlVUT1JTCisgKiAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdB UlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgVEhFIElNUExJRUQg V0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SCisgKiBBIFBBUlRJ Q1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlS SUdIVAorICogSE9MREVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1Qs IElORElSRUNULCBJTkNJREVOVEFMLAorICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFV RU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgUFJPQ1VS RU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisgKiBE QVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VE IEFORCBPTiBBTlkKKyAqIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1Qs IFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBP VEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBT T0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFH RS4KKyAqLworCisjcHJhZ21hIG9uY2UKKworI2lmIEVOQUJMRShFTkNSWVBURURfTUVESUEpCisK KyNpbmNsdWRlICJDRE1JbnN0YW5jZS5oIgorI2luY2x1ZGUgIk1lZGlhS2V5TWVzc2FnZVR5cGUu aCIKKyNpbmNsdWRlICJNZWRpYUtleVNlc3Npb25UeXBlLmgiCisKK25hbWVzcGFjZSBXZWJDb3Jl IHsKK25hbWVzcGFjZSBDRE1UeXBlQ29udmVyc2lvbiB7CisKK0NETUluc3RhbmNlOjpMaWNlbnNl VHlwZSBjb252ZXJ0KE1lZGlhS2V5U2Vzc2lvblR5cGUgc2Vzc2lvblR5cGUpCit7CisgICAgc3dp dGNoIChzZXNzaW9uVHlwZSkgeworICAgIGNhc2UgTWVkaWFLZXlTZXNzaW9uVHlwZTo6VGVtcG9y YXJ5OgorICAgICAgICByZXR1cm4gQ0RNSW5zdGFuY2U6OkxpY2Vuc2VUeXBlOjpUZW1wb3Jhcnk7 CisgICAgY2FzZSBNZWRpYUtleVNlc3Npb25UeXBlOjpQZXJzaXN0ZW50VXNhZ2VSZWNvcmQ6Cisg ICAgICAgIHJldHVybiBDRE1JbnN0YW5jZTo6TGljZW5zZVR5cGU6OlVzYWdlUmVjb3JkOworICAg IGNhc2UgTWVkaWFLZXlTZXNzaW9uVHlwZTo6UGVyc2lzdGVudExpY2Vuc2U6CisgICAgICAgIHJl dHVybiBDRE1JbnN0YW5jZTo6TGljZW5zZVR5cGU6OlBlcnNpc3RhYmxlOworICAgIH0KK30KKwor TWVkaWFLZXlNZXNzYWdlVHlwZSBjb252ZXJ0KENETUluc3RhbmNlOjpNZXNzYWdlVHlwZSBtZXNz YWdlVHlwZSkKK3sKKyAgICBzd2l0Y2ggKG1lc3NhZ2VUeXBlKSB7CisgICAgY2FzZSBDRE1JbnN0 YW5jZTo6TWVzc2FnZVR5cGU6OkxpY2Vuc2VSZXF1ZXN0OgorICAgICAgICByZXR1cm4gTWVkaWFL ZXlNZXNzYWdlVHlwZTo6TGljZW5zZVJlcXVlc3Q7CisgICAgY2FzZSBDRE1JbnN0YW5jZTo6TWVz c2FnZVR5cGU6OkxpY2Vuc2VSZW5ld2FsOgorICAgICAgICByZXR1cm4gTWVkaWFLZXlNZXNzYWdl VHlwZTo6TGljZW5zZVJlbmV3YWw7CisgICAgY2FzZSBDRE1JbnN0YW5jZTo6TWVzc2FnZVR5cGU6 OkxpY2Vuc2VSZWxlYXNlOgorICAgICAgICByZXR1cm4gTWVkaWFLZXlNZXNzYWdlVHlwZTo6TGlj ZW5zZVJlbGVhc2U7CisgICAgY2FzZSBDRE1JbnN0YW5jZTo6TWVzc2FnZVR5cGU6OkluZGl2aWR1 YWxpemF0aW9uUmVxdWVzdDoKKyAgICAgICAgcmV0dXJuIE1lZGlhS2V5TWVzc2FnZVR5cGU6Oklu ZGl2aWR1YWxpemF0aW9uUmVxdWVzdDsKKyAgICB9Cit9CisKK30gLy8gbmFtZXNwYWNlIENETVR5 cGVDb252ZXJzaW9uCit9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCisKKyNlbmRpZiAvLyBFTkFCTEUo RU5DUllQVEVEX01FRElBKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNy eXB0ZWRtZWRpYS9NZWRpYUtleVNlc3Npb24uY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9l bmNyeXB0ZWRtZWRpYS9NZWRpYUtleVNlc3Npb24uY3BwCmluZGV4IDg3MmI5ZTFhY2I5M2NjMjli ZDkzMDE2NDA2Y2JmMTZlNWY5NWU5YWUuLjljMTVjMzg4MmI4MWIzN2IzOTdhNGEzMTNkNjBhY2Y5 NGYwNzYwN2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVk aWEvTWVkaWFLZXlTZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5 cHRlZG1lZGlhL01lZGlhS2V5U2Vzc2lvbi5jcHAKQEAgLTMzLDYgKzMzLDcgQEAKIAogI2luY2x1 ZGUgIkNETS5oIgogI2luY2x1ZGUgIkNETUluc3RhbmNlLmgiCisjaW5jbHVkZSAiQ0RNVHlwZUNv bnZlcnNpb24uaCIKICNpbmNsdWRlICJFdmVudE5hbWVzLmgiCiAjaW5jbHVkZSAiTWVkaWFLZXlN ZXNzYWdlRXZlbnQuaCIKICNpbmNsdWRlICJNZWRpYUtleU1lc3NhZ2VUeXBlLmgiCkBAIC0xNjUs MzQgKzE2NiwyMiBAQCB2b2lkIE1lZGlhS2V5U2Vzc2lvbjo6Z2VuZXJhdGVSZXF1ZXN0KGNvbnN0 IEF0b21pY1N0cmluZyYgaW5pdERhdGFUeXBlLCBjb25zdCBCdQogICAgICAgICB9CiAKICAgICAg ICAgLy8gMTAuOS4yIEZvbGxvdyB0aGUgc3RlcHMgZm9yIHRoZSB2YWx1ZSBvZiBzZXNzaW9uIHR5 cGUgZnJvbSB0aGUgZm9sbG93aW5nIGxpc3Q6Ci0gICAgICAgIENETUluc3RhbmNlOjpMaWNlbnNl VHlwZSByZXF1ZXN0ZWRMaWNlbnNlVHlwZTsKLSAgICAgICAgc3dpdGNoIChtX3Nlc3Npb25UeXBl KSB7Ci0gICAgICAgIGNhc2UgTWVkaWFLZXlTZXNzaW9uVHlwZTo6VGVtcG9yYXJ5OgotICAgICAg ICAgICAgLy8g4oazICJ0ZW1wb3JhcnkiCi0gICAgICAgICAgICAvLyBMZXQgcmVxdWVzdGVkIGxp Y2Vuc2UgdHlwZSBiZSBhIHRlbXBvcmFyeSBub24tcGVyc2lzdGFibGUgbGljZW5zZS4KLSAgICAg ICAgICAgIHJlcXVlc3RlZExpY2Vuc2VUeXBlID0gQ0RNSW5zdGFuY2U6OkxpY2Vuc2VUeXBlOjpU ZW1wb3Jhcnk7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBNZWRpYUtleVNlc3Np b25UeXBlOjpQZXJzaXN0ZW50TGljZW5zZToKLSAgICAgICAgICAgIC8vIOKGsyAicGVyc2lzdGVu dC1saWNlbnNlIgotICAgICAgICAgICAgLy8gTGV0IHJlcXVlc3RlZCBsaWNlbnNlIHR5cGUgYmUg YSBwZXJzaXN0YWJsZSBsaWNlbnNlLgotICAgICAgICAgICAgcmVxdWVzdGVkTGljZW5zZVR5cGUg PSBDRE1JbnN0YW5jZTo6TGljZW5zZVR5cGU6OlBlcnNpc3RhYmxlOwotICAgICAgICAgICAgYnJl YWs7Ci0gICAgICAgIGNhc2UgTWVkaWFLZXlTZXNzaW9uVHlwZTo6UGVyc2lzdGVudFVzYWdlUmVj b3JkOgotICAgICAgICAgICAgLy8g4oazICJwZXJzaXN0ZW50LXVzYWdlLXJlY29yZCIKLSAgICAg ICAgICAgIC8vIDEuIEluaXRpYWxpemUgdGhpcyBvYmplY3QncyByZWNvcmQgb2Yga2V5IHVzYWdl IGFzIGZvbGxvd3MuCi0gICAgICAgICAgICAvLyAgICBTZXQgdGhlIGxpc3Qgb2Yga2V5IElEcyBr bm93biB0byB0aGUgc2Vzc2lvbiB0byBhbiBlbXB0eSBsaXN0LgorICAgICAgICAvLyAgIOKGsyAi dGVtcG9yYXJ5IgorICAgICAgICAvLyAgICAgTGV0IHJlcXVlc3RlZCBsaWNlbnNlIHR5cGUgYmUg YSB0ZW1wb3Jhcnkgbm9uLXBlcnNpc3RhYmxlIGxpY2Vuc2UuCisgICAgICAgIC8vICAg4oazICJw ZXJzaXN0ZW50LWxpY2Vuc2UiCisgICAgICAgIC8vICAgICBMZXQgcmVxdWVzdGVkIGxpY2Vuc2Ug dHlwZSBiZSBhIHBlcnNpc3RhYmxlIGxpY2Vuc2UuCisgICAgICAgIC8vICAg4oazICJwZXJzaXN0 ZW50LXVzYWdlLXJlY29yZCIKKyAgICAgICAgLy8gICAgIDEuIEluaXRpYWxpemUgdGhpcyBvYmpl Y3QncyByZWNvcmQgb2Yga2V5IHVzYWdlIGFzIGZvbGxvd3MuCisgICAgICAgIC8vICAgICAgICBT ZXQgdGhlIGxpc3Qgb2Yga2V5IElEcyBrbm93biB0byB0aGUgc2Vzc2lvbiB0byBhbiBlbXB0eSBs aXN0LgorICAgICAgICAvLyAgICAgICAgU2V0IHRoZSBmaXJzdCBkZWNyeXB0IHRpbWUgdG8gbnVs bC4KKyAgICAgICAgLy8gICAgICAgIFNldCB0aGUgbGF0ZXN0IGRlY3J5cHQgdGltZSB0byBudWxs LgorICAgICAgICAvLyAgICAgMi4gTGV0IHJlcXVlc3RlZCBsaWNlbnNlIHR5cGUgYmUgYSBub24t cGVyc2lzdGFibGUgbGljZW5zZSB0aGF0IHdpbGwKKyAgICAgICAgLy8gICAgICAgIHBlcnNpc3Qg YSByZWNvcmQgb2Yga2V5IHVzYWdlLgorICAgICAgICBDRE1JbnN0YW5jZTo6TGljZW5zZVR5cGUg cmVxdWVzdGVkTGljZW5zZVR5cGUgPSBDRE1UeXBlQ29udmVyc2lvbjo6Y29udmVydChtX3Nlc3Np b25UeXBlKTsKKyAgICAgICAgaWYgKG1fc2Vzc2lvblR5cGUgPT0gTWVkaWFLZXlTZXNzaW9uVHlw ZTo6UGVyc2lzdGVudFVzYWdlUmVjb3JkKSB7CiAgICAgICAgICAgICBtX3JlY29yZE9mS2V5VXNh Z2UuY2xlYXIoKTsKLQotICAgICAgICAgICAgLy8gICAgU2V0IHRoZSBmaXJzdCBkZWNyeXB0IHRp bWUgdG8gbnVsbC4KICAgICAgICAgICAgIG1fZmlyc3REZWNyeXB0VGltZSA9IDA7Ci0KLSAgICAg ICAgICAgIC8vICAgIFNldCB0aGUgbGF0ZXN0IGRlY3J5cHQgdGltZSB0byBudWxsLgogICAgICAg ICAgICAgbV9sYXRlc3REZWNyeXB0VGltZSA9IDA7Ci0KLSAgICAgICAgICAgIC8vIDIuIExldCBy ZXF1ZXN0ZWQgbGljZW5zZSB0eXBlIGJlIGEgbm9uLXBlcnNpc3RhYmxlIGxpY2Vuc2UgdGhhdCB3 aWxsCi0gICAgICAgICAgICAvLyAgICBwZXJzaXN0IGEgcmVjb3JkIG9mIGtleSB1c2FnZS4KLSAg ICAgICAgICAgIHJlcXVlc3RlZExpY2Vuc2VUeXBlID0gQ0RNSW5zdGFuY2U6OkxpY2Vuc2VUeXBl OjpVc2FnZVJlY29yZDsKLSAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAKICAgICAgICAg bV9pbnN0YW5jZS0+cmVxdWVzdExpY2Vuc2UocmVxdWVzdGVkTGljZW5zZVR5cGUsIGluaXREYXRh VHlwZSwgV1RGTW92ZShpbml0RGF0YSksIFt0aGlzLCB3ZWFrVGhpcyA9IG1fd2Vha1B0ckZhY3Rv cnkuY3JlYXRlV2Vha1B0cigpLCBwcm9taXNlID0gV1RGTW92ZShwcm9taXNlKV0gKFJlZjxTaGFy ZWRCdWZmZXI+JiYgbWVzc2FnZSwgY29uc3QgU3RyaW5nJiBzZXNzaW9uSWQsIGJvb2wgbmVlZHNJ bmRpdmlkdWFsaXphdGlvbiwgQ0RNSW5zdGFuY2U6OlN1Y2Nlc3NWYWx1ZSBzdWNjZWVkZWQpIG11 dGFibGUgewpAQCAtMjc3LDI1ICsyNjYsMTIgQEAgdm9pZCBNZWRpYUtleVNlc3Npb246OnVwZGF0 ZShjb25zdCBCdWZmZXJTb3VyY2UmIHJlc3BvbnNlLCBSZWY8RGVmZXJyZWRQcm9taXNlPiYKICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIENETUluc3RhbmNlOjpMaWNl bnNlVHlwZSBsaWNlbnNlVHlwZTsKLSAgICAgICAgc3dpdGNoIChtX3Nlc3Npb25UeXBlKSB7Ci0g ICAgICAgIGNhc2UgTWVkaWFLZXlTZXNzaW9uVHlwZTo6VGVtcG9yYXJ5OgotICAgICAgICAgICAg bGljZW5zZVR5cGUgPSBDRE1JbnN0YW5jZTo6TGljZW5zZVR5cGU6OlRlbXBvcmFyeTsKLSAgICAg ICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIE1lZGlhS2V5U2Vzc2lvblR5cGU6OlBlcnNpc3Rl bnRMaWNlbnNlOgotICAgICAgICAgICAgbGljZW5zZVR5cGUgPSBDRE1JbnN0YW5jZTo6TGljZW5z ZVR5cGU6OlBlcnNpc3RhYmxlOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgTWVk aWFLZXlTZXNzaW9uVHlwZTo6UGVyc2lzdGVudFVzYWdlUmVjb3JkOgotICAgICAgICAgICAgbGlj ZW5zZVR5cGUgPSBDRE1JbnN0YW5jZTo6TGljZW5zZVR5cGU6OlVzYWdlUmVjb3JkOwotICAgICAg ICAgICAgYnJlYWs7Ci0gICAgICAgIH07Ci0KICAgICAgICAgLy8gNi4zLiBMZXQgbWVzc2FnZSBi ZSBudWxsLgogICAgICAgICAvLyA2LjQuIExldCBtZXNzYWdlIHR5cGUgYmUgbnVsbC4KICAgICAg ICAgLy8gNi41LiBMZXQgc2Vzc2lvbiBjbG9zZWQgYmUgZmFsc2UuCiAgICAgICAgIC8vIDYuNi4g TGV0IGNkbSBiZSB0aGUgQ0RNIGluc3RhbmNlIHJlcHJlc2VudGVkIGJ5IHRoaXMgb2JqZWN0J3Mg Y2RtIGluc3RhbmNlIHZhbHVlLgogICAgICAgICAvLyA2LjcuIFVzZSB0aGUgY2RtIHRvIGV4ZWN1 dGUgdGhlIGZvbGxvd2luZyBzdGVwczoKLSAgICAgICAgbV9pbnN0YW5jZS0+dXBkYXRlTGljZW5z ZShsaWNlbnNlVHlwZSwgKnNhbml0aXplZFJlc3BvbnNlLCBbdGhpcywgd2Vha1RoaXMgPSBtX3dl YWtQdHJGYWN0b3J5LmNyZWF0ZVdlYWtQdHIoKSwgcHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSld IChib29sIHNlc3Npb25XYXNDbG9zZWQsIHN0ZDo6b3B0aW9uYWw8Q0RNSW5zdGFuY2U6OktleVN0 YXR1c1ZlY3Rvcj4mJiBjaGFuZ2VkS2V5cywgc3RkOjpvcHRpb25hbDxkb3VibGU+JiYgY2hhbmdl ZEV4cGlyYXRpb24sIHN0ZDo6b3B0aW9uYWw8Q0RNSW5zdGFuY2U6Ok1lc3NhZ2U+JiYgbWVzc2Fn ZSwgQ0RNSW5zdGFuY2U6OlN1Y2Nlc3NWYWx1ZSBzdWNjZWVkZWQpIG11dGFibGUgeworICAgICAg ICBtX2luc3RhbmNlLT51cGRhdGVMaWNlbnNlKENETVR5cGVDb252ZXJzaW9uOjpjb252ZXJ0KG1f c2Vzc2lvblR5cGUpLCAqc2FuaXRpemVkUmVzcG9uc2UsIFt0aGlzLCB3ZWFrVGhpcyA9IG1fd2Vh a1B0ckZhY3RvcnkuY3JlYXRlV2Vha1B0cigpLCBwcm9taXNlID0gV1RGTW92ZShwcm9taXNlKV0g KGJvb2wgc2Vzc2lvbldhc0Nsb3NlZCwgc3RkOjpvcHRpb25hbDxDRE1JbnN0YW5jZTo6S2V5U3Rh dHVzVmVjdG9yPiYmIGNoYW5nZWRLZXlzLCBzdGQ6Om9wdGlvbmFsPGRvdWJsZT4mJiBjaGFuZ2Vk RXhwaXJhdGlvbiwgc3RkOjpvcHRpb25hbDxDRE1JbnN0YW5jZTo6TWVzc2FnZT4mJiBtZXNzYWdl LCBDRE1JbnN0YW5jZTo6U3VjY2Vzc1ZhbHVlIHN1Y2NlZWRlZCkgbXV0YWJsZSB7CiAgICAgICAg ICAgICBpZiAoIXdlYWtUaGlzKQogICAgICAgICAgICAgICAgIHJldHVybjsKIApAQCAtMzU0LDI1 ICszMzAsOCBAQCB2b2lkIE1lZGlhS2V5U2Vzc2lvbjo6dXBkYXRlKGNvbnN0IEJ1ZmZlclNvdXJj ZSYgcmVzcG9uc2UsIFJlZjxEZWZlcnJlZFByb21pc2U+JgogICAgICAgICAgICAgICAgICAgICAv LyBGSVhNRTogQXQgdGhpcyBwb2ludCB0aGUgaW1wbGVtZW50YXRpb25zIG9mIHByZWNlZGluZyBz dGVwcyBjYW4ndCBmYWlsLgogCiAgICAgICAgICAgICAgICAgICAgIC8vICAgICA2LjguMS40LiBJ ZiBtZXNzYWdlIGlzIG5vdCBudWxsLCBydW4gdGhlIFF1ZXVlIGEgIm1lc3NhZ2UiIEV2ZW50IGFs Z29yaXRobSBvbiB0aGUgc2Vzc2lvbiwgcHJvdmlkaW5nIG1lc3NhZ2UgdHlwZSBhbmQgbWVzc2Fn ZS4KLSAgICAgICAgICAgICAgICAgICAgaWYgKG1lc3NhZ2UpIHsKLSAgICAgICAgICAgICAgICAg ICAgICAgIE1lZGlhS2V5TWVzc2FnZVR5cGUgbWVzc2FnZVR5cGU7Ci0gICAgICAgICAgICAgICAg ICAgICAgICBzd2l0Y2ggKG1lc3NhZ2UtPmZpcnN0KSB7Ci0gICAgICAgICAgICAgICAgICAgICAg ICBjYXNlIENETUluc3RhbmNlOjpNZXNzYWdlVHlwZTo6TGljZW5zZVJlcXVlc3Q6Ci0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgbWVzc2FnZVR5cGUgPSBNZWRpYUtleU1lc3NhZ2VUeXBlOjpM aWNlbnNlUmVxdWVzdDsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAg ICAgICAgICAgICAgICAgICAgIGNhc2UgQ0RNSW5zdGFuY2U6Ok1lc3NhZ2VUeXBlOjpMaWNlbnNl UmVuZXdhbDoKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBtZXNzYWdlVHlwZSA9IE1lZGlh S2V5TWVzc2FnZVR5cGU6OkxpY2Vuc2VSZW5ld2FsOwotICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGJyZWFrOwotICAgICAgICAgICAgICAgICAgICAgICAgY2FzZSBDRE1JbnN0YW5jZTo6TWVz c2FnZVR5cGU6OkxpY2Vuc2VSZWxlYXNlOgotICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1l c3NhZ2VUeXBlID0gTWVkaWFLZXlNZXNzYWdlVHlwZTo6TGljZW5zZVJlbGVhc2U7Ci0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgICAgICAgICBjYXNl IENETUluc3RhbmNlOjpNZXNzYWdlVHlwZTo6SW5kaXZpZHVhbGl6YXRpb25SZXF1ZXN0OgotICAg ICAgICAgICAgICAgICAgICAgICAgICAgIG1lc3NhZ2VUeXBlID0gTWVkaWFLZXlNZXNzYWdlVHlw ZTo6SW5kaXZpZHVhbGl6YXRpb25SZXF1ZXN0OwotICAgICAgICAgICAgICAgICAgICAgICAgICAg IGJyZWFrOwotICAgICAgICAgICAgICAgICAgICAgICAgfQotCi0gICAgICAgICAgICAgICAgICAg ICAgICBlbnF1ZXVlTWVzc2FnZShtZXNzYWdlVHlwZSwgV1RGTW92ZShtZXNzYWdlLT5zZWNvbmQp KTsKLSAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICBpZiAobWVzc2Fn ZSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGVucXVldWVNZXNzYWdlKENETVR5cGVDb252ZXJz aW9uOjpjb252ZXJ0KG1lc3NhZ2UtPmZpcnN0KSwgV1RGTW92ZShtZXNzYWdlLT5zZWNvbmQpKTsK ICAgICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICAgICAvLyA2LjguMi4gUmVzb2x2ZSBw cm9taXNlLgo= 300808 2017-02-07 06:53:46 -0800 2017-02-08 01:36:16 -0800 Patch bug-167896-20170207065123.patch text/plain 9678 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjExNzc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWI5MmM3MmU4ZGVjODRj ZjgzYWM4NGJmMDc0MWI4MzZjOGU2ZmNmYi4uOTczMDBjYTBkN2EyMzAxNzAwZjZlOGU4ZGE0NjJi YTQ3NzMwMWU1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE3LTAyLTA3ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbRU1FXSBBbGlhcyBD RE1JbnN0YW5jZSBlbnVtcyB0byB0aGUgc3BlY2lmaWNhdGlvbi1kZWZpbmVkIGVudW1zCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjc4OTYKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaW1wbGlmeSB0aGUg ZW51bXMgaW4gdGhlIENETUluc3RhbmNlIGNsYXNzIGJ5IHNpbXBseSBhbGlhc2luZyB0aGVtCisg ICAgICAgIHRvIHRoZSBFTUUgc3BlY2lmaWNhdGlvbi1kZWZpbmVkIGVudW1zLiBDRE1JbnN0YW5j ZTo6S2V5U3RhdHVzIGFuZAorICAgICAgICBDRE1JbnN0YW5jZTo6TWVzc2FnZVR5cGUgd2VyZSBh bHJlYWR5IGRpcmVjdCBjb3BpZXMgb2YgdGhlCisgICAgICAgIE1lZGlhS2V5U3RhdHVzIGFuZCBN ZWRpYUtleU1lc3NhZ2VUeXBlIGVudW1zLCB3aGlsZSB0aGUKKyAgICAgICAgQ0RNSW5zdGFuY2U6 OkxpY2Vuc2VUeXBlIGhhZCB0aGUgbWVtYmVycyBhcyBNZWRpYUtleVNlc3Npb25UeXBlLAorICAg ICAgICBidXQgd2l0aCBzbGlnaHRseSBkaWZmZXJlbnQgbmFtZXMuCisKKyAgICAgICAgTm8gY2hh bmdlcyBpbiBiZWhhdmlvci4KKworICAgICAgICAqIE1vZHVsZXMvZW5jcnlwdGVkbWVkaWEvQ0RN SW5zdGFuY2UuaDoKKyAgICAgICAgKiBNb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlhS2V5U2Vz c2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUtleVNlc3Npb246OmdlbmVyYXRlUmVx dWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUtleVNlc3Npb246OnVwZGF0ZSk6CisgICAg ICAgICogdGVzdGluZy9Nb2NrQ0RNRmFjdG9yeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNb2Nr Q0RNSW5zdGFuY2U6OnJlcXVlc3RMaWNlbnNlKToKKwogMjAxNy0wMi0wNyAgUm9tYWluIEJlbGxl c3NvcnQgIDxyb21haW4uYmVsbGVzc29ydEBjcmYuY2Fub24uZnI+CiAKICAgICAgICAgW1JlYWRh YmxlIFN0cmVhbXMgQVBJXSBJbXBsZW1lbnQgUmVhZGFibGVCeXRlU3RyZWFtQ29udHJvbGxlciBl bnF1ZXVlKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVk aWEvQ0RNSW5zdGFuY2UuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEv Q0RNSW5zdGFuY2UuaAppbmRleCAxOTdjNWUxYTYyMGFkOWU2YTczYTkxNGNiMDc0YjFmMzUyNTVm YTlhLi43OGY0OGE2NjQ5MDk0ZDI0MzVkMDc3ZDIyMTA3MmM2NjE3MTZjNzQ3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL0NETUluc3RhbmNlLmgKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9DRE1JbnN0YW5jZS5oCkBA IC0yNyw2ICsyNyw5IEBACiAKICNpZiBFTkFCTEUoRU5DUllQVEVEX01FRElBKQogCisjaW5jbHVk ZSAiTWVkaWFLZXlNZXNzYWdlVHlwZS5oIgorI2luY2x1ZGUgIk1lZGlhS2V5U2Vzc2lvblR5cGUu aCIKKyNpbmNsdWRlICJNZWRpYUtleVN0YXR1cy5oIgogI2luY2x1ZGUgPHV0aWxpdHk+CiAjaW5j bHVkZSA8d3RmL0ZvcndhcmQuaD4KICNpbmNsdWRlIDx3dGYvT3B0aW9uYWwuaD4KQEAgLTQ3LDM3 ICs1MCwxOCBAQCBwdWJsaWM6CiAgICAgICAgIFN1Y2NlZWRlZCwKICAgICB9OwogCisgICAgdXNp bmcgTGljZW5zZVR5cGUgPSBNZWRpYUtleVNlc3Npb25UeXBlOworICAgIHVzaW5nIEtleVN0YXR1 cyA9IE1lZGlhS2V5U3RhdHVzOworICAgIHVzaW5nIE1lc3NhZ2VUeXBlID0gTWVkaWFLZXlNZXNz YWdlVHlwZTsKKwogICAgIHZpcnR1YWwgU3VjY2Vzc1ZhbHVlIGluaXRpYWxpemVXaXRoQ29uZmln dXJhdGlvbihjb25zdCBNZWRpYUtleVN5c3RlbUNvbmZpZ3VyYXRpb24mKSA9IDA7CiAgICAgdmly dHVhbCBTdWNjZXNzVmFsdWUgc2V0RGlzdGluY3RpdmVJZGVudGlmaWVyc0FsbG93ZWQoYm9vbCkg PSAwOwogICAgIHZpcnR1YWwgU3VjY2Vzc1ZhbHVlIHNldFBlcnNpc3RlbnRTdGF0ZUFsbG93ZWQo Ym9vbCkgPSAwOwogICAgIHZpcnR1YWwgU3VjY2Vzc1ZhbHVlIHNldFNlcnZlckNlcnRpZmljYXRl KFJlZjxTaGFyZWRCdWZmZXI+JiYpID0gMDsKIAotICAgIGVudW0gY2xhc3MgTGljZW5zZVR5cGUg ewotICAgICAgICBUZW1wb3JhcnksCi0gICAgICAgIFBlcnNpc3RhYmxlLAotICAgICAgICBVc2Fn ZVJlY29yZCwKLSAgICB9OwotCiAgICAgdXNpbmcgTGljZW5zZUNhbGxiYWNrID0gRnVuY3Rpb248 dm9pZChSZWY8U2hhcmVkQnVmZmVyPiYmIG1lc3NhZ2UsIGNvbnN0IFN0cmluZyYgc2Vzc2lvbklk LCBib29sIG5lZWRzSW5kaXZpZHVhbGl6YXRpb24sIFN1Y2Nlc3NWYWx1ZSBzdWNjZWVkZWQpPjsK ICAgICB2aXJ0dWFsIHZvaWQgcmVxdWVzdExpY2Vuc2UoTGljZW5zZVR5cGUsIGNvbnN0IEF0b21p Y1N0cmluZyYgaW5pdERhdGFUeXBlLCBSZWY8U2hhcmVkQnVmZmVyPiYmIGluaXREYXRhLCBMaWNl bnNlQ2FsbGJhY2spID0gMDsKIAotICAgIGVudW0gY2xhc3MgS2V5U3RhdHVzIHsKLSAgICAgICAg VXNhYmxlLAotICAgICAgICBFeHBpcmVkLAotICAgICAgICBSZWxlYXNlZCwKLSAgICAgICAgT3V0 cHV0UmVzdHJpY3RlZCwKLSAgICAgICAgT3V0cHV0RG93bnNjYWxlZCwKLSAgICAgICAgU3RhdHVz UGVuZGluZywKLSAgICAgICAgSW50ZXJuYWxFcnJvciwKLSAgICB9OwotCi0gICAgZW51bSBjbGFz cyBNZXNzYWdlVHlwZSB7Ci0gICAgICAgIExpY2Vuc2VSZXF1ZXN0LAotICAgICAgICBMaWNlbnNl UmVuZXdhbCwKLSAgICAgICAgTGljZW5zZVJlbGVhc2UsCi0gICAgICAgIEluZGl2aWR1YWxpemF0 aW9uUmVxdWVzdCwKLSAgICB9OwotCiAgICAgdXNpbmcgS2V5U3RhdHVzVmVjdG9yID0gVmVjdG9y PHN0ZDo6cGFpcjxSZWY8U2hhcmVkQnVmZmVyPiwgS2V5U3RhdHVzPj47CiAgICAgdXNpbmcgTWVz c2FnZSA9IHN0ZDo6cGFpcjxNZXNzYWdlVHlwZSwgUmVmPFNoYXJlZEJ1ZmZlcj4+OwogICAgIHVz aW5nIExpY2Vuc2VVcGRhdGVDYWxsYmFjayA9IEZ1bmN0aW9uPHZvaWQoYm9vbCBzZXNzaW9uV2Fz Q2xvc2VkLCBzdGQ6Om9wdGlvbmFsPEtleVN0YXR1c1ZlY3Rvcj4mJiBjaGFuZ2VkS2V5cywgc3Rk OjpvcHRpb25hbDxkb3VibGU+JiYgY2hhbmdlZEV4cGlyYXRpb24sIHN0ZDo6b3B0aW9uYWw8TWVz c2FnZT4mJiBtZXNzYWdlLCBTdWNjZXNzVmFsdWUgc3VjY2VlZGVkKT47CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlhS2V5U2Vzc2lvbi5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlhS2V5U2Vzc2lvbi5j cHAKaW5kZXggODcyYjllMWFjYjkzY2MyOWJkOTMwMTY0MDZjYmYxNmU1Zjk1ZTlhZS4uN2JhYzMw ZTVkNWZkZmM4MjE2ZjFhOTc3MGU0N2I4ZWJmNzM1NjYxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9NZWRpYUtleVNlc3Npb24uY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTWVkaWFLZXlTZXNzaW9uLmNwcApA QCAtMTY1LDM3ICsxNjUsMjUgQEAgdm9pZCBNZWRpYUtleVNlc3Npb246OmdlbmVyYXRlUmVxdWVz dChjb25zdCBBdG9taWNTdHJpbmcmIGluaXREYXRhVHlwZSwgY29uc3QgQnUKICAgICAgICAgfQog CiAgICAgICAgIC8vIDEwLjkuMiBGb2xsb3cgdGhlIHN0ZXBzIGZvciB0aGUgdmFsdWUgb2Ygc2Vz c2lvbiB0eXBlIGZyb20gdGhlIGZvbGxvd2luZyBsaXN0OgotICAgICAgICBDRE1JbnN0YW5jZTo6 TGljZW5zZVR5cGUgcmVxdWVzdGVkTGljZW5zZVR5cGU7Ci0gICAgICAgIHN3aXRjaCAobV9zZXNz aW9uVHlwZSkgewotICAgICAgICBjYXNlIE1lZGlhS2V5U2Vzc2lvblR5cGU6OlRlbXBvcmFyeToK LSAgICAgICAgICAgIC8vIOKGsyAidGVtcG9yYXJ5IgotICAgICAgICAgICAgLy8gTGV0IHJlcXVl c3RlZCBsaWNlbnNlIHR5cGUgYmUgYSB0ZW1wb3Jhcnkgbm9uLXBlcnNpc3RhYmxlIGxpY2Vuc2Uu Ci0gICAgICAgICAgICByZXF1ZXN0ZWRMaWNlbnNlVHlwZSA9IENETUluc3RhbmNlOjpMaWNlbnNl VHlwZTo6VGVtcG9yYXJ5OwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgTWVkaWFL ZXlTZXNzaW9uVHlwZTo6UGVyc2lzdGVudExpY2Vuc2U6Ci0gICAgICAgICAgICAvLyDihrMgInBl cnNpc3RlbnQtbGljZW5zZSIKLSAgICAgICAgICAgIC8vIExldCByZXF1ZXN0ZWQgbGljZW5zZSB0 eXBlIGJlIGEgcGVyc2lzdGFibGUgbGljZW5zZS4KLSAgICAgICAgICAgIHJlcXVlc3RlZExpY2Vu c2VUeXBlID0gQ0RNSW5zdGFuY2U6OkxpY2Vuc2VUeXBlOjpQZXJzaXN0YWJsZTsKLSAgICAgICAg ICAgIGJyZWFrOwotICAgICAgICBjYXNlIE1lZGlhS2V5U2Vzc2lvblR5cGU6OlBlcnNpc3RlbnRV c2FnZVJlY29yZDoKLSAgICAgICAgICAgIC8vIOKGsyAicGVyc2lzdGVudC11c2FnZS1yZWNvcmQi Ci0gICAgICAgICAgICAvLyAxLiBJbml0aWFsaXplIHRoaXMgb2JqZWN0J3MgcmVjb3JkIG9mIGtl eSB1c2FnZSBhcyBmb2xsb3dzLgotICAgICAgICAgICAgLy8gICAgU2V0IHRoZSBsaXN0IG9mIGtl eSBJRHMga25vd24gdG8gdGhlIHNlc3Npb24gdG8gYW4gZW1wdHkgbGlzdC4KKyAgICAgICAgLy8g ICDihrMgInRlbXBvcmFyeSIKKyAgICAgICAgLy8gICAgIExldCByZXF1ZXN0ZWQgbGljZW5zZSB0 eXBlIGJlIGEgdGVtcG9yYXJ5IG5vbi1wZXJzaXN0YWJsZSBsaWNlbnNlLgorICAgICAgICAvLyAg IOKGsyAicGVyc2lzdGVudC1saWNlbnNlIgorICAgICAgICAvLyAgICAgTGV0IHJlcXVlc3RlZCBs aWNlbnNlIHR5cGUgYmUgYSBwZXJzaXN0YWJsZSBsaWNlbnNlLgorICAgICAgICAvLyAgIOKGsyAi cGVyc2lzdGVudC11c2FnZS1yZWNvcmQiCisgICAgICAgIC8vICAgICAxLiBJbml0aWFsaXplIHRo aXMgb2JqZWN0J3MgcmVjb3JkIG9mIGtleSB1c2FnZSBhcyBmb2xsb3dzLgorICAgICAgICAvLyAg ICAgICAgU2V0IHRoZSBsaXN0IG9mIGtleSBJRHMga25vd24gdG8gdGhlIHNlc3Npb24gdG8gYW4g ZW1wdHkgbGlzdC4KKyAgICAgICAgLy8gICAgICAgIFNldCB0aGUgZmlyc3QgZGVjcnlwdCB0aW1l IHRvIG51bGwuCisgICAgICAgIC8vICAgICAgICBTZXQgdGhlIGxhdGVzdCBkZWNyeXB0IHRpbWUg dG8gbnVsbC4KKyAgICAgICAgLy8gICAgIDIuIExldCByZXF1ZXN0ZWQgbGljZW5zZSB0eXBlIGJl IGEgbm9uLXBlcnNpc3RhYmxlIGxpY2Vuc2UgdGhhdCB3aWxsCisgICAgICAgIC8vICAgICAgICBw ZXJzaXN0IGEgcmVjb3JkIG9mIGtleSB1c2FnZS4KKworICAgICAgICBpZiAobV9zZXNzaW9uVHlw ZSA9PSBNZWRpYUtleVNlc3Npb25UeXBlOjpQZXJzaXN0ZW50VXNhZ2VSZWNvcmQpIHsKICAgICAg ICAgICAgIG1fcmVjb3JkT2ZLZXlVc2FnZS5jbGVhcigpOwotCi0gICAgICAgICAgICAvLyAgICBT ZXQgdGhlIGZpcnN0IGRlY3J5cHQgdGltZSB0byBudWxsLgogICAgICAgICAgICAgbV9maXJzdERl Y3J5cHRUaW1lID0gMDsKLQotICAgICAgICAgICAgLy8gICAgU2V0IHRoZSBsYXRlc3QgZGVjcnlw dCB0aW1lIHRvIG51bGwuCiAgICAgICAgICAgICBtX2xhdGVzdERlY3J5cHRUaW1lID0gMDsKLQot ICAgICAgICAgICAgLy8gMi4gTGV0IHJlcXVlc3RlZCBsaWNlbnNlIHR5cGUgYmUgYSBub24tcGVy c2lzdGFibGUgbGljZW5zZSB0aGF0IHdpbGwKLSAgICAgICAgICAgIC8vICAgIHBlcnNpc3QgYSBy ZWNvcmQgb2Yga2V5IHVzYWdlLgotICAgICAgICAgICAgcmVxdWVzdGVkTGljZW5zZVR5cGUgPSBD RE1JbnN0YW5jZTo6TGljZW5zZVR5cGU6OlVzYWdlUmVjb3JkOwotICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgIH0KIAotICAgICAgICBtX2luc3RhbmNlLT5yZXF1ZXN0TGljZW5zZShyZXF1ZXN0 ZWRMaWNlbnNlVHlwZSwgaW5pdERhdGFUeXBlLCBXVEZNb3ZlKGluaXREYXRhKSwgW3RoaXMsIHdl YWtUaGlzID0gbV93ZWFrUHRyRmFjdG9yeS5jcmVhdGVXZWFrUHRyKCksIHByb21pc2UgPSBXVEZN b3ZlKHByb21pc2UpXSAoUmVmPFNoYXJlZEJ1ZmZlcj4mJiBtZXNzYWdlLCBjb25zdCBTdHJpbmcm IHNlc3Npb25JZCwgYm9vbCBuZWVkc0luZGl2aWR1YWxpemF0aW9uLCBDRE1JbnN0YW5jZTo6U3Vj Y2Vzc1ZhbHVlIHN1Y2NlZWRlZCkgbXV0YWJsZSB7CisgICAgICAgIG1faW5zdGFuY2UtPnJlcXVl c3RMaWNlbnNlKG1fc2Vzc2lvblR5cGUsIGluaXREYXRhVHlwZSwgV1RGTW92ZShpbml0RGF0YSks IFt0aGlzLCB3ZWFrVGhpcyA9IG1fd2Vha1B0ckZhY3RvcnkuY3JlYXRlV2Vha1B0cigpLCBwcm9t aXNlID0gV1RGTW92ZShwcm9taXNlKV0gKFJlZjxTaGFyZWRCdWZmZXI+JiYgbWVzc2FnZSwgY29u c3QgU3RyaW5nJiBzZXNzaW9uSWQsIGJvb2wgbmVlZHNJbmRpdmlkdWFsaXphdGlvbiwgQ0RNSW5z dGFuY2U6OlN1Y2Nlc3NWYWx1ZSBzdWNjZWVkZWQpIG11dGFibGUgewogICAgICAgICAgICAgaWYg KCF3ZWFrVGhpcykKICAgICAgICAgICAgICAgICByZXR1cm47CiAKQEAgLTI3NywyNSArMjY1LDEy IEBAIHZvaWQgTWVkaWFLZXlTZXNzaW9uOjp1cGRhdGUoY29uc3QgQnVmZmVyU291cmNlJiByZXNw b25zZSwgUmVmPERlZmVycmVkUHJvbWlzZT4mCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IH0KIAotICAgICAgICBDRE1JbnN0YW5jZTo6TGljZW5zZVR5cGUgbGljZW5zZVR5cGU7Ci0gICAg ICAgIHN3aXRjaCAobV9zZXNzaW9uVHlwZSkgewotICAgICAgICBjYXNlIE1lZGlhS2V5U2Vzc2lv blR5cGU6OlRlbXBvcmFyeToKLSAgICAgICAgICAgIGxpY2Vuc2VUeXBlID0gQ0RNSW5zdGFuY2U6 OkxpY2Vuc2VUeXBlOjpUZW1wb3Jhcnk7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2Fz ZSBNZWRpYUtleVNlc3Npb25UeXBlOjpQZXJzaXN0ZW50TGljZW5zZToKLSAgICAgICAgICAgIGxp Y2Vuc2VUeXBlID0gQ0RNSW5zdGFuY2U6OkxpY2Vuc2VUeXBlOjpQZXJzaXN0YWJsZTsKLSAgICAg ICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIE1lZGlhS2V5U2Vzc2lvblR5cGU6OlBlcnNpc3Rl bnRVc2FnZVJlY29yZDoKLSAgICAgICAgICAgIGxpY2Vuc2VUeXBlID0gQ0RNSW5zdGFuY2U6Okxp Y2Vuc2VUeXBlOjpVc2FnZVJlY29yZDsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Owot CiAgICAgICAgIC8vIDYuMy4gTGV0IG1lc3NhZ2UgYmUgbnVsbC4KICAgICAgICAgLy8gNi40LiBM ZXQgbWVzc2FnZSB0eXBlIGJlIG51bGwuCiAgICAgICAgIC8vIDYuNS4gTGV0IHNlc3Npb24gY2xv c2VkIGJlIGZhbHNlLgogICAgICAgICAvLyA2LjYuIExldCBjZG0gYmUgdGhlIENETSBpbnN0YW5j ZSByZXByZXNlbnRlZCBieSB0aGlzIG9iamVjdCdzIGNkbSBpbnN0YW5jZSB2YWx1ZS4KICAgICAg ICAgLy8gNi43LiBVc2UgdGhlIGNkbSB0byBleGVjdXRlIHRoZSBmb2xsb3dpbmcgc3RlcHM6Ci0g ICAgICAgIG1faW5zdGFuY2UtPnVwZGF0ZUxpY2Vuc2UobGljZW5zZVR5cGUsICpzYW5pdGl6ZWRS ZXNwb25zZSwgW3RoaXMsIHdlYWtUaGlzID0gbV93ZWFrUHRyRmFjdG9yeS5jcmVhdGVXZWFrUHRy KCksIHByb21pc2UgPSBXVEZNb3ZlKHByb21pc2UpXSAoYm9vbCBzZXNzaW9uV2FzQ2xvc2VkLCBz dGQ6Om9wdGlvbmFsPENETUluc3RhbmNlOjpLZXlTdGF0dXNWZWN0b3I+JiYgY2hhbmdlZEtleXMs IHN0ZDo6b3B0aW9uYWw8ZG91YmxlPiYmIGNoYW5nZWRFeHBpcmF0aW9uLCBzdGQ6Om9wdGlvbmFs PENETUluc3RhbmNlOjpNZXNzYWdlPiYmIG1lc3NhZ2UsIENETUluc3RhbmNlOjpTdWNjZXNzVmFs dWUgc3VjY2VlZGVkKSBtdXRhYmxlIHsKKyAgICAgICAgbV9pbnN0YW5jZS0+dXBkYXRlTGljZW5z ZShtX3Nlc3Npb25UeXBlLCAqc2FuaXRpemVkUmVzcG9uc2UsIFt0aGlzLCB3ZWFrVGhpcyA9IG1f d2Vha1B0ckZhY3RvcnkuY3JlYXRlV2Vha1B0cigpLCBwcm9taXNlID0gV1RGTW92ZShwcm9taXNl KV0gKGJvb2wgc2Vzc2lvbldhc0Nsb3NlZCwgc3RkOjpvcHRpb25hbDxDRE1JbnN0YW5jZTo6S2V5 U3RhdHVzVmVjdG9yPiYmIGNoYW5nZWRLZXlzLCBzdGQ6Om9wdGlvbmFsPGRvdWJsZT4mJiBjaGFu Z2VkRXhwaXJhdGlvbiwgc3RkOjpvcHRpb25hbDxDRE1JbnN0YW5jZTo6TWVzc2FnZT4mJiBtZXNz YWdlLCBDRE1JbnN0YW5jZTo6U3VjY2Vzc1ZhbHVlIHN1Y2NlZWRlZCkgbXV0YWJsZSB7CiAgICAg ICAgICAgICBpZiAoIXdlYWtUaGlzKQogICAgICAgICAgICAgICAgIHJldHVybjsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9Nb2NrQ0RNRmFjdG9yeS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS90ZXN0aW5nL01vY2tDRE1GYWN0b3J5LmNwcAppbmRleCA0NTFiYzFmNzZkM2RkMjNh NmQ0N2VhNzhlYjk1Y2JhNTE0MTI1MWVhLi40NzVmM2UzMjYxZjY0ZmMzOTE0NmY3NmNmY2E4NjNl ZjNkMmE3ZmE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL01vY2tDRE1GYWN0 b3J5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL01vY2tDRE1GYWN0b3J5LmNwcApA QCAtMjQ5LDEwICsyNDksNyBAQCB2b2lkIE1vY2tDRE1JbnN0YW5jZTo6cmVxdWVzdExpY2Vuc2Uo TGljZW5zZVR5cGUgbGljZW5zZVR5cGUsIGNvbnN0IEF0b21pY1N0cmluZwogICAgICAgICByZXR1 cm47CiAgICAgfQogCi0gICAgaWYgKChsaWNlbnNlVHlwZSA9PSBMaWNlbnNlVHlwZTo6VGVtcG9y YXJ5ICYmICFmYWN0b3J5LT5zdXBwb3J0ZWRTZXNzaW9uVHlwZXMoKS5jb250YWlucyhNZWRpYUtl eVNlc3Npb25UeXBlOjpUZW1wb3JhcnkpKQotICAgICAgICB8fCAobGljZW5zZVR5cGUgPT0gTGlj ZW5zZVR5cGU6OlBlcnNpc3RhYmxlICYmICFmYWN0b3J5LT5zdXBwb3J0ZWRTZXNzaW9uVHlwZXMo KS5jb250YWlucyhNZWRpYUtleVNlc3Npb25UeXBlOjpQZXJzaXN0ZW50TGljZW5zZSkpCi0gICAg ICAgIHx8IChsaWNlbnNlVHlwZSA9PSBMaWNlbnNlVHlwZTo6VXNhZ2VSZWNvcmQgJiYgIWZhY3Rv cnktPnN1cHBvcnRlZFNlc3Npb25UeXBlcygpLmNvbnRhaW5zKE1lZGlhS2V5U2Vzc2lvblR5cGU6 OlBlcnNpc3RlbnRVc2FnZVJlY29yZCkpCi0gICAgICAgIHx8ICFmYWN0b3J5LT5zdXBwb3J0ZWRE YXRhVHlwZXMoKS5jb250YWlucyhpbml0RGF0YVR5cGUpKSB7CisgICAgaWYgKCFmYWN0b3J5LT5z dXBwb3J0ZWRTZXNzaW9uVHlwZXMoKS5jb250YWlucyhsaWNlbnNlVHlwZSkgfHwgIWZhY3Rvcnkt PnN1cHBvcnRlZERhdGFUeXBlcygpLmNvbnRhaW5zKGluaXREYXRhVHlwZSkpIHsKICAgICAgICAg Y2FsbGJhY2soU2hhcmVkQnVmZmVyOjpjcmVhdGUoKSwgZW1wdHlTdHJpbmcoKSwgZmFsc2UsIFN1 Y2Nlc3NWYWx1ZTo6RmFpbGVkKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K