175671 2017-08-17 07:16:08 -0700 [EME] MediaKeySession has to initiate playback resume on HTMLMediaElement 2017-08-18 09:24:20 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zan zan calvaris darin webkit-bug-importer oldest_to_newest 1339537 0 zan 2017-08-17 07:16:08 -0700 [EME] MediaKeySession has to initiate playback resume on HTMLMediaElement 1339542 1 318365 zan 2017-08-17 07:26:55 -0700 Created attachment 318365 Patch 1340006 2 318365 zan 2017-08-18 00:45:52 -0700 Comment on attachment 318365 Patch Clearing flags on attachment: 318365 Committed r220905: <http://trac.webkit.org/changeset/220905> 1340007 3 zan 2017-08-18 00:45:56 -0700 All reviewed patches have been landed. Closing bug. 1340008 4 webkit-bug-importer 2017-08-18 00:47:26 -0700 <rdar://problem/33958693> 1340104 5 318365 darin 2017-08-18 09:24:20 -0700 Comment on attachment 318365 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=318365&action=review > Source/WebCore/html/HTMLMediaElement.h:640 > + void cdmClientAttemptToResumePlaybackIfNecessary() override; Slightly better to write "final" here rather than override. Not important at all in this patch, just a general style thing. We should start things both "as private as possible" and "as final as possible" and make them less private and less final as needed. 318365 2017-08-17 07:26:55 -0700 2017-08-18 00:45:52 -0700 Patch bug-175671-20170817162654.patch text/plain 14988 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwODUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTBiODJlOTk1NmM0MTk2 ODQ4YmMyZDM1NGIwNjQ2YjdiYjA1ZjA2Ny4uMDc4YzlmMTNjOWYzODU3YWI2Y2EyY2E4NWE5ZjY5 ZjhjZWM1MGE2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUwIEBACisyMDE3LTA4LTE3ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbRU1FXSBNZWRpYUtl eVNlc3Npb24gaGFzIHRvIGluaXRpYXRlIHBsYXliYWNrIHJlc3VtZSBvbiBIVE1MTWVkaWFFbGVt ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzU2 NzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBN ZWRpYUtleVNlc3Npb246OnVwZGF0ZUtleVN0YXR1c2VzKCksIEhUTUxNZWRpYUVsZW1lbnQgb2Jq ZWN0cyB0aGF0IGFyZQorICAgICAgICBhc3NvY2lhdGVkIHdpdGggdGhlIE1lZGlhS2V5cyBpbnN0 YW5jZSB0aGF0IGNyZWF0ZWQgdGhpcyBzZXNzaW9uIGhhdmUgdG8KKyAgICAgICAgYmUgbm90aWZp ZWQgaW4gb3JkZXIgdG8gcnVuIHRoZSAnQXR0ZW1wdCB0byBSZXN1bWUgUGxheWJhY2sgSWYgTmVj ZXNzYXJ5JworICAgICAgICBhbGdvcml0aG0uCisKKyAgICAgICAgTWVkaWFLZXlzIG9iamVjdCBu b3cgdHJhY2tzIHRoZSBzZXNzaW9ucyB0aGF0IHdlcmUgY3JlYXRlZCB0aHJvdWdoIGl0LgorICAg ICAgICBNZWRpYUtleVNlc3Npb24gb2JqZWN0IGlzIHBhc3NlZCBhIE1lZGlhS2V5cyByZWZlcmVu Y2UsIGFuZCBoYXMgdGhhdAorICAgICAgICByZWZlcmVuY2UgaW52YWxpZGF0ZWQgaWYvd2hlbiB0 aGUgTWVkaWFLZXlzIG9iamVjdCBpcyBkZXN0cm95ZWQuCisKKyAgICAgICAgSW4gTWVkaWFLZXlT ZXNzaW9uOjp1cGRhdGVLZXlTdGF0dXNlcygpLCBhIHRhc2sgaXMgbm93IHF1ZXVlZCwgbm90aWZ5 aW5nCisgICAgICAgIHRoZSBNZWRpYUtleXMgb2JqZWN0LCBpZiBhbnksIHRoYXQgdGhlIGFzc29j aWF0ZWQgSFRNTE1lZGlhRWxlbWVudAorICAgICAgICBpbnN0YW5jZXMgaGF2ZSB0byBydW4gdGhl IG1lbnRpb25lZCBhbGdvcml0aG0uIFRoZSBhc3NvY2lhdGVkIG1lZGlhCisgICAgICAgIGVsZW1l bnRzIGFyZSBzdG9yZWQgdGhyb3VnaCBDRE1DbGllbnQgcG9pbnRlcnMsIHdpdGggSFRNTE1lZGlh RWxlbWVudAorICAgICAgICBjbGFzcyBpbmhlcml0aW5nIGZyb20gdGhlIG5ld2x5LWludHJvZHVj ZWQgQ0RNQ2xpZW50IGludGVyZmFjZS4KKworICAgICAgICBIVE1MTWVkaWFFbGVtZW50OjpjZG1D bGllbnRBdHRlbXB0VG9SZXN1bWVQbGF5YmFja0lmTmVjZXNzYXJ5KCkgaXMgbGVmdAorICAgICAg ICB1bmltcGxlbWVudGVkIGZvciBub3cuIFRoZSBvYmplY3Qgd2lsbCBhdHRhY2ggaXRzZWxmIHRv IGFuZCBkZXRhY2ggZnJvbQorICAgICAgICB0aGUgYXNzb2NpYXRlZCBNZWRpYUtleXMgb2JqZWN0 IGluIHNldE1lZGlhS2V5cygpIGFuZCB0aGUgZGVzdHJ1Y3RvciwKKyAgICAgICAgZW5hYmxpbmcg dGhlIE1lZGlhS2V5cyBvYmplY3QgdG8gcHJvcGVybHkgZGlzcGF0Y2ggdGhlIHBsYXliYWNrIHJl c3VtZQorICAgICAgICByZXF1ZXN0cyBmb3IgdGhlIGF0dGFjaGVkIGNsaWVudHMuCisKKyAgICAg ICAgKiBNb2R1bGVzL2VuY3J5cHRlZG1lZGlhL0NETUNsaWVudC5oOiBDb3BpZWQgZnJvbSBTb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlhS2V5cy5oLgorICAgICAgICAo V2ViQ29yZTo6Q0RNQ2xpZW50Ojp+Q0RNQ2xpZW50KToKKyAgICAgICAgKiBNb2R1bGVzL2VuY3J5 cHRlZG1lZGlhL01lZGlhS2V5U2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUtl eVNlc3Npb246OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUtleVNlc3Npb246Ok1l ZGlhS2V5U2Vzc2lvbik6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUtleVNlc3Npb246OmRldGFj aEtleXMpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFLZXlTZXNzaW9uOjp1cGRhdGVLZXlTdGF0 dXNlcyk6CisgICAgICAgICogTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9NZWRpYUtleVNlc3Npb24u aDoKKyAgICAgICAgKiBNb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlhS2V5cy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpNZWRpYUtleXM6On5NZWRpYUtleXMpOgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFLZXlzOjpjcmVhdGVTZXNzaW9uKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhS2V5czo6 YXR0YWNoQ0RNQ2xpZW50KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhS2V5czo6ZGV0YWNoQ0RN Q2xpZW50KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhS2V5czo6YXR0ZW1wdFRvUmVzdW1lUGxh eWJhY2tPbkNsaWVudHMpOgorICAgICAgICAqIE1vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTWVkaWFL ZXlzLmg6CisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OmNkbUNsaWVudEF0dGVtcHRUb1Jlc3VtZVBsYXliYWNr SWZOZWNlc3NhcnkpOgorICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5oOgorCiAyMDE3 LTA4LTE2ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCB0 aGUgc3VwcG9ydCBmb3IgbXV0YXRpbmcgY2xpcGJvYXJkIGRhdGEgdmlhIERhdGFUcmFuc2Zlckl0 ZW1MaXN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlh L0NETUNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9DRE1D bGllbnQuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi4wZjUzNWY5NTQ4OGYyZDNhZWE5ZDJkYmJmNGFlZWJjYjJhOWNl MGJjCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRt ZWRpYS9DRE1DbGllbnQuaApAQCAtMCwwICsxLDQ2IEBACisvKgorICogQ29weXJpZ2h0IChDKSAy MDE3IE1ldHJvbG9naWNhbCBHcm91cCBCLlYuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTcgSWdhbGlh IFMuTC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5 IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBw cm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqCisg KiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3Zl IGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhl IGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBm b3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorICogICAgY29weXJpZ2h0IG5vdGljZSwgdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcKKyAqICAgIGRpc2NsYWltZXIg aW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZAorICog ICAgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklE RUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyAqICJBUyBJUyIg QU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9U CisgKiBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElU WSBBTkQgRklUTkVTUyBGT1IKKyAqIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVE LiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisgKiBIT0xERVIgT1IgQ09OVFJJQlVU T1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisgKiBT UEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBC VVQgTk9UCisgKiBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9S IFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwKKyAqIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNT IElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWQorICogVEhFT1JZIE9GIExJ QUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAor ICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZ IE9VVCBPRiBUSEUgVVNFCisgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0Yg VEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNwcmFnbWEgb25jZQorCisj aWYgRU5BQkxFKEVOQ1JZUFRFRF9NRURJQSkKKworbmFtZXNwYWNlIFdlYkNvcmUgeworCitjbGFz cyBDRE1JbnN0YW5jZTsKKworY2xhc3MgQ0RNQ2xpZW50IHsKK3B1YmxpYzoKKyAgICB2aXJ0dWFs IH5DRE1DbGllbnQoKSB7IH0KKworICAgIHZpcnR1YWwgdm9pZCBjZG1DbGllbnRBdHRlbXB0VG9S ZXN1bWVQbGF5YmFja0lmTmVjZXNzYXJ5KCkgPSAwOworfTsKKworfSAvLyBuYW1lc3BhY2UgV2Vi Q29yZQorCisjZW5kaWYgLy8gRU5BQkxFKEVOQ1JZUFRFRF9NRURJQSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTWVkaWFLZXlTZXNzaW9uLmNwcCBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTWVkaWFLZXlTZXNzaW9uLmNw cAppbmRleCBiNjFjNjI3Njg4YjMxNWUzOTcwNDQ1MTljOTQ2YTFiMDE0Y2U3MmZiLi4xZmUzNjFh MzUwMzViMTlhOTk0NWQ4OWE2NGZhOGY4NjhlNTQzOGE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlhS2V5U2Vzc2lvbi5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9NZWRpYUtleVNlc3Npb24uY3BwCkBA IC0zOCwyMSArMzgsMjMgQEAKICNpbmNsdWRlICJNZWRpYUtleU1lc3NhZ2VFdmVudC5oIgogI2lu Y2x1ZGUgIk1lZGlhS2V5TWVzc2FnZVR5cGUuaCIKICNpbmNsdWRlICJNZWRpYUtleVN0YXR1c01h cC5oIgorI2luY2x1ZGUgIk1lZGlhS2V5cy5oIgogI2luY2x1ZGUgIk5vdEltcGxlbWVudGVkLmgi CiAjaW5jbHVkZSAiU2VjdXJpdHlPcmlnaW4uaCIKICNpbmNsdWRlICJTaGFyZWRCdWZmZXIuaCIK IAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1SZWY8TWVkaWFLZXlTZXNzaW9uPiBNZWRpYUtleVNl c3Npb246OmNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0LCBNZWRpYUtleVNl c3Npb25UeXBlIHNlc3Npb25UeXBlLCBib29sIHVzZURpc3RpbmN0aXZlSWRlbnRpZmllciwgUmVm PENETT4mJiBpbXBsZW1lbnRhdGlvbiwgUmVmPENETUluc3RhbmNlPiYmIGluc3RhbmNlKQorUmVm PE1lZGlhS2V5U2Vzc2lvbj4gTWVkaWFLZXlTZXNzaW9uOjpjcmVhdGUoU2NyaXB0RXhlY3V0aW9u Q29udGV4dCYgY29udGV4dCwgTWVkaWFLZXlzJiBrZXlzLCBNZWRpYUtleVNlc3Npb25UeXBlIHNl c3Npb25UeXBlLCBib29sIHVzZURpc3RpbmN0aXZlSWRlbnRpZmllciwgUmVmPENETT4mJiBpbXBs ZW1lbnRhdGlvbiwgUmVmPENETUluc3RhbmNlPiYmIGluc3RhbmNlKQogewotICAgIGF1dG8gc2Vz c2lvbiA9IGFkb3B0UmVmKCpuZXcgTWVkaWFLZXlTZXNzaW9uKGNvbnRleHQsIHNlc3Npb25UeXBl LCB1c2VEaXN0aW5jdGl2ZUlkZW50aWZpZXIsIFdURk1vdmUoaW1wbGVtZW50YXRpb24pLCBXVEZN b3ZlKGluc3RhbmNlKSkpOworICAgIGF1dG8gc2Vzc2lvbiA9IGFkb3B0UmVmKCpuZXcgTWVkaWFL ZXlTZXNzaW9uKGNvbnRleHQsIGtleXMsIHNlc3Npb25UeXBlLCB1c2VEaXN0aW5jdGl2ZUlkZW50 aWZpZXIsIFdURk1vdmUoaW1wbGVtZW50YXRpb24pLCBXVEZNb3ZlKGluc3RhbmNlKSkpOwogICAg IHNlc3Npb24tPnN1c3BlbmRJZk5lZWRlZCgpOwogICAgIHJldHVybiBzZXNzaW9uOwogfQogCi1N ZWRpYUtleVNlc3Npb246Ok1lZGlhS2V5U2Vzc2lvbihTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBj b250ZXh0LCBNZWRpYUtleVNlc3Npb25UeXBlIHNlc3Npb25UeXBlLCBib29sIHVzZURpc3RpbmN0 aXZlSWRlbnRpZmllciwgUmVmPENETT4mJiBpbXBsZW1lbnRhdGlvbiwgUmVmPENETUluc3RhbmNl PiYmIGluc3RhbmNlKQorTWVkaWFLZXlTZXNzaW9uOjpNZWRpYUtleVNlc3Npb24oU2NyaXB0RXhl Y3V0aW9uQ29udGV4dCYgY29udGV4dCwgTWVkaWFLZXlzJiBrZXlzLCBNZWRpYUtleVNlc3Npb25U eXBlIHNlc3Npb25UeXBlLCBib29sIHVzZURpc3RpbmN0aXZlSWRlbnRpZmllciwgUmVmPENETT4m JiBpbXBsZW1lbnRhdGlvbiwgUmVmPENETUluc3RhbmNlPiYmIGluc3RhbmNlKQogICAgIDogQWN0 aXZlRE9NT2JqZWN0KCZjb250ZXh0KQorICAgICwgbV9rZXlzKCZrZXlzKQogICAgICwgbV9leHBp cmF0aW9uKHN0ZDo6bnVtZXJpY19saW1pdHM8ZG91YmxlPjo6cXVpZXRfTmFOKCkpCiAgICAgLCBt X2tleVN0YXR1c2VzKE1lZGlhS2V5U3RhdHVzTWFwOjpjcmVhdGUoKnRoaXMpKQogICAgICwgbV91 c2VEaXN0aW5jdGl2ZUlkZW50aWZpZXIodXNlRGlzdGluY3RpdmVJZGVudGlmaWVyKQpAQCAtOTAs NiArOTIsMTEgQEAgTWVkaWFLZXlTZXNzaW9uOjp+TWVkaWFLZXlTZXNzaW9uKCkKICAgICBtX2tl eVN0YXR1c2VzLT5kZXRhY2hTZXNzaW9uKCk7CiB9CiAKK3ZvaWQgTWVkaWFLZXlTZXNzaW9uOjpk ZXRhY2hLZXlzKCkKK3sKKyAgICBtX2tleXMgPSBudWxscHRyOworfQorCiBjb25zdCBTdHJpbmcm IE1lZGlhS2V5U2Vzc2lvbjo6c2Vzc2lvbklkKCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9zZXNz aW9uSWQ7CkBAIC02MzcsNyArNjQ0LDExIEBAIHZvaWQgTWVkaWFLZXlTZXNzaW9uOjp1cGRhdGVL ZXlTdGF0dXNlcyhDRE1JbnN0YW5jZTo6S2V5U3RhdHVzVmVjdG9yJiYgaW5wdXRTdGF0CiAgICAg bV9ldmVudFF1ZXVlLmVucXVldWVFdmVudChFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5rZXlz dGF0dXNlc2NoYW5nZUV2ZW50LCBmYWxzZSwgZmFsc2UpKTsKIAogICAgIC8vIDYuIFF1ZXVlIGEg dGFzayB0byBydW4gdGhlIEF0dGVtcHQgdG8gUmVzdW1lIFBsYXliYWNrIElmIE5lY2Vzc2FyeSBh bGdvcml0aG0gb24gZWFjaCBvZiB0aGUgbWVkaWEgZWxlbWVudChzKSB3aG9zZSBtZWRpYUtleXMg YXR0cmlidXRlIGlzIHRoZSBNZWRpYUtleXMgb2JqZWN0IHRoYXQgY3JlYXRlZCB0aGUgc2Vzc2lv bi4KLSAgICAvLyBGSVhNRTogSW1wbGVtZW50LgorICAgIG1fdGFza1F1ZXVlLmVucXVldWVUYXNr KAorICAgICAgICBbdGhpc10gKCkgbXV0YWJsZSB7CisgICAgICAgICAgICBpZiAobV9rZXlzKQor ICAgICAgICAgICAgICAgIG1fa2V5cy0+YXR0ZW1wdFRvUmVzdW1lUGxheWJhY2tPbkNsaWVudHMo KTsKKyAgICAgICAgfSk7CiB9CiAKIHZvaWQgTWVkaWFLZXlTZXNzaW9uOjp1cGRhdGVFeHBpcmF0 aW9uKGRvdWJsZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVk bWVkaWEvTWVkaWFLZXlTZXNzaW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRl ZG1lZGlhL01lZGlhS2V5U2Vzc2lvbi5oCmluZGV4IDdiYzc5Mzg4NTY0ODg0OTQ5ZTBmNGViNWM4 N2I1MzU5MzJjZGI4MDguLmRkNTFjMDVjZTE2Y2ZiNWNkNmNhNGM5ZGJmM2Y3MWZjNGMwMzczMDQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTWVkaWFL ZXlTZXNzaW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9N ZWRpYUtleVNlc3Npb24uaApAQCAtNTQsMTIgKzU0LDE0IEBAIGNsYXNzIFNoYXJlZEJ1ZmZlcjsK IAogY2xhc3MgTWVkaWFLZXlTZXNzaW9uIGZpbmFsIDogcHVibGljIFJlZkNvdW50ZWQ8TWVkaWFL ZXlTZXNzaW9uPiwgcHVibGljIEV2ZW50VGFyZ2V0V2l0aElubGluZURhdGEsIHB1YmxpYyBBY3Rp dmVET01PYmplY3QgewogcHVibGljOgotICAgIHN0YXRpYyBSZWY8TWVkaWFLZXlTZXNzaW9uPiBj cmVhdGUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYsIE1lZGlhS2V5U2Vzc2lvblR5cGUsIGJvb2wg dXNlRGlzdGluY3RpdmVJZGVudGlmaWVyLCBSZWY8Q0RNPiYmLCBSZWY8Q0RNSW5zdGFuY2U+JiYp OworICAgIHN0YXRpYyBSZWY8TWVkaWFLZXlTZXNzaW9uPiBjcmVhdGUoU2NyaXB0RXhlY3V0aW9u Q29udGV4dCYsIE1lZGlhS2V5cyYsIE1lZGlhS2V5U2Vzc2lvblR5cGUsIGJvb2wgdXNlRGlzdGlu Y3RpdmVJZGVudGlmaWVyLCBSZWY8Q0RNPiYmLCBSZWY8Q0RNSW5zdGFuY2U+JiYpOwogICAgIHZp cnR1YWwgfk1lZGlhS2V5U2Vzc2lvbigpOwogCiAgICAgdXNpbmcgUmVmQ291bnRlZDxNZWRpYUtl eVNlc3Npb24+OjpyZWY7CiAgICAgdXNpbmcgUmVmQ291bnRlZDxNZWRpYUtleVNlc3Npb24+Ojpk ZXJlZjsKIAorICAgIHZvaWQgZGV0YWNoS2V5cygpOworCiAgICAgY29uc3QgU3RyaW5nJiBzZXNz aW9uSWQoKSBjb25zdDsKICAgICBkb3VibGUgZXhwaXJhdGlvbigpIGNvbnN0OwogICAgIFJlZjxN ZWRpYUtleVN0YXR1c01hcD4ga2V5U3RhdHVzZXMoKSBjb25zdDsKQEAgLTc2LDcgKzc4LDcgQEAg cHVibGljOgogICAgIGNvbnN0IFZlY3RvcjxzdGQ6OnBhaXI8UmVmPFNoYXJlZEJ1ZmZlcj4sIE1l ZGlhS2V5U3RhdHVzPj4mIHN0YXR1c2VzKCkgY29uc3QgeyByZXR1cm4gbV9zdGF0dXNlczsgfQog CiBwcml2YXRlOgotICAgIE1lZGlhS2V5U2Vzc2lvbihTY3JpcHRFeGVjdXRpb25Db250ZXh0Jiwg TWVkaWFLZXlTZXNzaW9uVHlwZSwgYm9vbCB1c2VEaXN0aW5jdGl2ZUlkZW50aWZpZXIsIFJlZjxD RE0+JiYsIFJlZjxDRE1JbnN0YW5jZT4mJik7CisgICAgTWVkaWFLZXlTZXNzaW9uKFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQmLCBNZWRpYUtleXMmLCBNZWRpYUtleVNlc3Npb25UeXBlLCBib29sIHVz ZURpc3RpbmN0aXZlSWRlbnRpZmllciwgUmVmPENETT4mJiwgUmVmPENETUluc3RhbmNlPiYmKTsK ICAgICB2b2lkIGVucXVldWVNZXNzYWdlKE1lZGlhS2V5TWVzc2FnZVR5cGUsIGNvbnN0IFNoYXJl ZEJ1ZmZlciYpOwogICAgIHZvaWQgdXBkYXRlS2V5U3RhdHVzZXMoQ0RNSW5zdGFuY2U6OktleVN0 YXR1c1ZlY3RvciYmKTsKICAgICB2b2lkIHVwZGF0ZUV4cGlyYXRpb24oZG91YmxlKTsKQEAgLTk0 LDYgKzk2LDcgQEAgcHJpdmF0ZToKICAgICBib29sIGNhblN1c3BlbmRGb3JEb2N1bWVudFN1c3Bl bnNpb24oKSBjb25zdCBvdmVycmlkZTsKICAgICB2b2lkIHN0b3AoKSBvdmVycmlkZTsKIAorICAg IE1lZGlhS2V5cyogbV9rZXlzOwogICAgIFN0cmluZyBtX3Nlc3Npb25JZDsKICAgICBkb3VibGUg bV9leHBpcmF0aW9uOwogICAgIENsb3NlZFByb21pc2UgbV9jbG9zZWRQcm9taXNlOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9NZWRpYUtleXMuY3Bw IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9NZWRpYUtleXMuY3BwCmlu ZGV4IGI4NzEwM2M0OWJmODQ1YWVjZTBmM2Q2YTYzYjE1NmZlYmI3YjNmMzUuLjQ1NjRkOGRmNDZk ZjA4NjQ0ZmFkMGRmNDlkMTRjYzZjZDQ0ZjM2YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTWVkaWFLZXlzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlhS2V5cy5jcHAKQEAgLTMyLDYgKzMyLDcgQEAK ICNpZiBFTkFCTEUoRU5DUllQVEVEX01FRElBKQogCiAjaW5jbHVkZSAiQ0RNLmgiCisjaW5jbHVk ZSAiQ0RNQ2xpZW50LmgiCiAjaW5jbHVkZSAiQ0RNSW5zdGFuY2UuaCIKICNpbmNsdWRlICJNZWRp YUtleVNlc3Npb24uaCIKICNpbmNsdWRlICJTaGFyZWRCdWZmZXIuaCIKQEAgLTQ3LDcgKzQ4LDEx IEBAIE1lZGlhS2V5czo6TWVkaWFLZXlzKGJvb2wgdXNlRGlzdGluY3RpdmVJZGVudGlmaWVyLCBi b29sIHBlcnNpc3RlbnRTdGF0ZUFsbG93ZWQsCiB7CiB9CiAKLU1lZGlhS2V5czo6fk1lZGlhS2V5 cygpID0gZGVmYXVsdDsKK01lZGlhS2V5czo6fk1lZGlhS2V5cygpCit7CisgICAgZm9yIChhdXRv JiBzZXNzaW9uIDogbV9zZXNzaW9ucykKKyAgICAgICAgc2Vzc2lvbi0+ZGV0YWNoS2V5cygpOwor fQogCiBFeGNlcHRpb25PcjxSZWY8TWVkaWFLZXlTZXNzaW9uPj4gTWVkaWFLZXlzOjpjcmVhdGVT ZXNzaW9uKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQsIE1lZGlhS2V5U2Vzc2lvblR5 cGUgc2Vzc2lvblR5cGUpCiB7CkBAIC02Niw3ICs3MSw5IEBAIEV4Y2VwdGlvbk9yPFJlZjxNZWRp YUtleVNlc3Npb24+PiBNZWRpYUtleXM6OmNyZWF0ZVNlc3Npb24oU2NyaXB0RXhlY3V0aW9uQ29u dGV4CiAgICAgLy8gMy4gTGV0IHNlc3Npb24gYmUgYSBuZXcgTWVkaWFLZXlTZXNzaW9uIG9iamVj dCwgYW5kIGluaXRpYWxpemUgaXQgYXMgZm9sbG93czoKICAgICAvLyBOT1RFOiBDb250aW51ZWQg aW4gTWVkaWFLZXlTZXNzaW9uLgogICAgIC8vIDQuIFJldHVybiBzZXNzaW9uLgotICAgIHJldHVy biBNZWRpYUtleVNlc3Npb246OmNyZWF0ZShjb250ZXh0LCBzZXNzaW9uVHlwZSwgbV91c2VEaXN0 aW5jdGl2ZUlkZW50aWZpZXIsIG1faW1wbGVtZW50YXRpb24uY29weVJlZigpLCBtX2luc3RhbmNl LmNvcHlSZWYoKSk7CisgICAgYXV0byBzZXNzaW9uID0gTWVkaWFLZXlTZXNzaW9uOjpjcmVhdGUo Y29udGV4dCwgKnRoaXMsIHNlc3Npb25UeXBlLCBtX3VzZURpc3RpbmN0aXZlSWRlbnRpZmllciwg bV9pbXBsZW1lbnRhdGlvbi5jb3B5UmVmKCksIG1faW5zdGFuY2UuY29weVJlZigpKTsKKyAgICBt X3Nlc3Npb25zLmFwcGVuZChzZXNzaW9uLmNvcHlSZWYoKSk7CisgICAgcmV0dXJuIFdURk1vdmUo c2Vzc2lvbik7CiB9CiAKIHZvaWQgTWVkaWFLZXlzOjpzZXRTZXJ2ZXJDZXJ0aWZpY2F0ZShjb25z dCBCdWZmZXJTb3VyY2UmIHNlcnZlckNlcnRpZmljYXRlLCBSZWY8RGVmZXJyZWRQcm9taXNlPiYm IHByb21pc2UpCkBAIC0xMDksNiArMTE2LDI0IEBAIHZvaWQgTWVkaWFLZXlzOjpzZXRTZXJ2ZXJD ZXJ0aWZpY2F0ZShjb25zdCBCdWZmZXJTb3VyY2UmIHNlcnZlckNlcnRpZmljYXRlLCBSZWY8CiAg ICAgLy8gNi4gUmV0dXJuIHByb21pc2UuCiB9CiAKK3ZvaWQgTWVkaWFLZXlzOjphdHRhY2hDRE1D bGllbnQoQ0RNQ2xpZW50JiBjbGllbnQpCit7CisgICAgQVNTRVJUKCFtX2NkbUNsaWVudHMuY29u dGFpbnMoJmNsaWVudCkpOworICAgIG1fY2RtQ2xpZW50cy5hcHBlbmQoJmNsaWVudCk7Cit9CisK K3ZvaWQgTWVkaWFLZXlzOjpkZXRhY2hDRE1DbGllbnQoQ0RNQ2xpZW50JiBjbGllbnQpCit7Cisg ICAgQVNTRVJUKG1fY2RtQ2xpZW50cy5jb250YWlucygmY2xpZW50KSk7CisgICAgbV9jZG1DbGll bnRzLnJlbW92ZUZpcnN0KCZjbGllbnQpOworfQorCit2b2lkIE1lZGlhS2V5czo6YXR0ZW1wdFRv UmVzdW1lUGxheWJhY2tPbkNsaWVudHMoKQoreworICAgIGZvciAoYXV0byogY2RtQ2xpZW50IDog bV9jZG1DbGllbnRzKQorICAgICAgICBjZG1DbGllbnQtPmNkbUNsaWVudEF0dGVtcHRUb1Jlc3Vt ZVBsYXliYWNrSWZOZWNlc3NhcnkoKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAj ZW5kaWYgLy8gRU5BQkxFKEVOQ1JZUFRFRF9NRURJQSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTWVkaWFLZXlzLmggYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlhS2V5cy5oCmluZGV4IDlhNTlkMTcxMTRlYzNlZGJh NjE0NzE3MDk4YWEyZDRmYmZlMzA4M2UuLjJlOTVhNTMxZGY3ZTE0MDFkZWEyYTYzOTFmYzM5NmM3 ZTU4YjIxMjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVk aWEvTWVkaWFLZXlzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRp YS9NZWRpYUtleXMuaApAQCAtNDAsNiArNDAsNyBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBj bGFzcyBDRE07CitjbGFzcyBDRE1DbGllbnQ7CiBjbGFzcyBDRE1JbnN0YW5jZTsKIGNsYXNzIEJ1 ZmZlclNvdXJjZTsKIGNsYXNzIE1lZGlhS2V5U2Vzc2lvbjsKQEAgLTU2LDkgKzU3LDEyIEBAIHB1 YmxpYzoKICAgICB+TWVkaWFLZXlzKCk7CiAKICAgICBFeGNlcHRpb25PcjxSZWY8TWVkaWFLZXlT ZXNzaW9uPj4gY3JlYXRlU2Vzc2lvbihTY3JpcHRFeGVjdXRpb25Db250ZXh0JiwgTWVkaWFLZXlT ZXNzaW9uVHlwZSk7Ci0KICAgICB2b2lkIHNldFNlcnZlckNlcnRpZmljYXRlKGNvbnN0IEJ1ZmZl clNvdXJjZSYsIFJlZjxEZWZlcnJlZFByb21pc2U+JiYpOwogCisgICAgdm9pZCBhdHRhY2hDRE1D bGllbnQoQ0RNQ2xpZW50Jik7CisgICAgdm9pZCBkZXRhY2hDRE1DbGllbnQoQ0RNQ2xpZW50Jik7 CisgICAgdm9pZCBhdHRlbXB0VG9SZXN1bWVQbGF5YmFja09uQ2xpZW50cygpOworCiBwcm90ZWN0 ZWQ6CiAgICAgTWVkaWFLZXlzKGJvb2wgdXNlRGlzdGluY3RpdmVJZGVudGlmaWVyLCBib29sIHBl cnNpc3RlbnRTdGF0ZUFsbG93ZWQsIGNvbnN0IFZlY3RvcjxNZWRpYUtleVNlc3Npb25UeXBlPiYs IFJlZjxDRE0+JiYsIFJlZjxDRE1JbnN0YW5jZT4mJik7CiAKQEAgLTY3LDYgKzcxLDkgQEAgcHJv dGVjdGVkOgogICAgIFZlY3RvcjxNZWRpYUtleVNlc3Npb25UeXBlPiBtX3N1cHBvcnRlZFNlc3Np b25UeXBlczsKICAgICBSZWY8Q0RNPiBtX2ltcGxlbWVudGF0aW9uOwogICAgIFJlZjxDRE1JbnN0 YW5jZT4gbV9pbnN0YW5jZTsKKworICAgIFZlY3RvcjxSZWY8TWVkaWFLZXlTZXNzaW9uPj4gbV9z ZXNzaW9uczsKKyAgICBWZWN0b3I8Q0RNQ2xpZW50Kj4gbV9jZG1DbGllbnRzOwogICAgIEdlbmVy aWNUYXNrUXVldWU8VGltZXI+IG1fdGFza1F1ZXVlOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTE1lZGlhRWxlbWVudC5jcHAKaW5kZXggZGFmMjFmNzQzNmFhNWE1MWQwMzA4NTNmZDNmMTM3 YjNhOGU2NDg3Mi4uNTgyZDUwNGFlOWY2YTk2ZjcwYTUwYzVlZTE5ZmE1MGZlODdjZGY2NCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC0yNTY1LDYgKzI1NjUs MTEgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzZXRNZWRpYUtleXMoTWVkaWFLZXlzKiwgUmVm PERlZmVycmVkUHJvbWlzZT4mJikKICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQogCit2b2lkIEhU TUxNZWRpYUVsZW1lbnQ6OmNkbUNsaWVudEF0dGVtcHRUb1Jlc3VtZVBsYXliYWNrSWZOZWNlc3Nh cnkoKQoreworICAgIG5vdEltcGxlbWVudGVkKCk7Cit9CisKICNlbmRpZiAvLyBFTkFCTEUoRU5D UllQVEVEX01FRElBKQogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnByb2dyZXNzRXZlbnRUaW1l ckZpcmVkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVu dC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgKaW5kZXggZWE2NDk2 YmYyZjRhMmFjZTU5ZTg3MjUyM2Y4ZDJiYTgyZDI5MzM3OS4uMGJkMWIzYjIxNGYyODMyNDZlZDM1 OGVlZTQ3NWNmYjJiODUyNDQyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M TWVkaWFFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50 LmgKQEAgLTU1LDYgKzU1LDEwIEBACiAjaW5jbHVkZSAiQXVkaW9TZXNzaW9uLmgiCiAjZW5kaWYK IAorI2lmIEVOQUJMRShFTkNSWVBURURfTUVESUEpCisjaW5jbHVkZSAiQ0RNQ2xpZW50LmgiCisj ZW5kaWYKKwogI2lmbmRlZiBOREVCVUcKICNpbmNsdWRlIDx3dGYvU3RyaW5nUHJpbnRTdHJlYW0u aD4KICNlbmRpZgpAQCAtMTMxLDYgKzEzNSw5IEBAIGNsYXNzIEhUTUxNZWRpYUVsZW1lbnQKICNp ZiBVU0UoQVVESU9fU0VTU0lPTikgJiYgUExBVEZPUk0oTUFDKQogICAgICwgcHJpdmF0ZSBBdWRp b1Nlc3Npb246Ok11dGVkU3RhdGVPYnNlcnZlcgogI2VuZGlmCisjaWYgRU5BQkxFKEVOQ1JZUFRF RF9NRURJQSkKKyAgICAsIHByaXZhdGUgQ0RNQ2xpZW50CisjZW5kaWYKIHsKIHB1YmxpYzoKICAg ICBXZWFrUHRyPEhUTUxNZWRpYUVsZW1lbnQ+IGNyZWF0ZVdlYWtQdHIoKSB7IHJldHVybiBtX3dl YWtGYWN0b3J5LmNyZWF0ZVdlYWtQdHIoKTsgfQpAQCAtNjI3LDYgKzYzNCwxMSBAQCBwcml2YXRl OgogICAgIGJvb2wgbWVkaWFQbGF5ZXJLZXlOZWVkZWQoTWVkaWFQbGF5ZXIqLCBVaW50OEFycmF5 Kikgb3ZlcnJpZGU7CiAgICAgU3RyaW5nIG1lZGlhUGxheWVyTWVkaWFLZXlzU3RvcmFnZURpcmVj dG9yeSgpIGNvbnN0IG92ZXJyaWRlOwogI2VuZGlmCisKKyNpZiBFTkFCTEUoRU5DUllQVEVEX01F RElBKQorICAgIC8vIENETUNsaWVudAorICAgIHZvaWQgY2RtQ2xpZW50QXR0ZW1wdFRvUmVzdW1l UGxheWJhY2tJZk5lY2Vzc2FyeSgpIG92ZXJyaWRlOworI2VuZGlmCiAgICAgCiAjaWYgRU5BQkxF KFdJUkVMRVNTX1BMQVlCQUNLX1RBUkdFVCkKICAgICB2b2lkIG1lZGlhUGxheWVyQ3VycmVudFBs YXliYWNrVGFyZ2V0SXNXaXJlbGVzc0NoYW5nZWQoTWVkaWFQbGF5ZXIqKSBvdmVycmlkZTsK