210902 2020-04-23 01:15:16 -0700 [OpenSSL] Implement WebCrypto APIs for HMAC 2020-04-24 10:58:15 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 206439 1 tomoki.imai webkit-unassigned basuke don.olmstead ews-watchlist fujii jiewen_tan tomoki.imai webkit-bug-importer yoshiaki.jitsukawa oldest_to_newest 1644708 0 tomoki.imai 2020-04-23 01:15:16 -0700 Support WebCrypto HMAC sign/verify with OpenSSL. 1644709 1 397327 tomoki.imai 2020-04-23 01:20:04 -0700 Created attachment 397327 patch 1645271 2 ews-feeder 2020-04-24 10:57:04 -0700 Committed r260655: <https://trac.webkit.org/changeset/260655> All reviewed patches have been landed. Closing bug and clearing flags on attachment 397327. 1645274 3 webkit-bug-importer 2020-04-24 10:58:15 -0700 <rdar://problem/62324683> 397327 2020-04-23 01:20:04 -0700 2020-04-24 10:57:04 -0700 patch hmac-1.patch text/plain 10810 tomoki.imai ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3NDQ2NTc4Y2FhNDcuLmViNDE5NmVmMWM1OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDIwLTA0LTIzICBUb21va2kgSW1haSAgPFRvbW9raS5JbWFpQHNvbnkuY29tPgorCisgICAg ICAgIFtPcGVuU1NMXSBJbXBsZW1lbnQgV2ViQ3J5cHRvIEFQSXMgZm9yIEhNQUMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDkwMgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuYWJsZWQgV2ViQ3J5cHRv IExheW91dFRlc3RzIGZvciBITUFDIGFsb25nIHdpdGggdGhlIGltcGxlbWVudGF0aW9uLgorCisg ICAgICAgICogcGxhdGZvcm0vd2luY2Fpcm8vVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMC0wNC0y MiAgRGllZ28gUGlubyBHYXJjaWEgIDxkcGlub0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtd IEdhcmRlbmluZywgdXBkYXRlIHRlc3QgZXhwZWN0YXRpb25zCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS93aW5jYWlyby9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxh dGZvcm0vd2luY2Fpcm8vVGVzdEV4cGVjdGF0aW9ucwppbmRleCBlMzRiN2VhMzIxMTcuLmNlMzI4 M2NlNWFiYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luY2Fpcm8vVGVzdEV4 cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW5jYWlyby9UZXN0RXhwZWN0 YXRpb25zCkBAIC05NDcsNDYgKzk0Nyw2IEBAIGNyeXB0by9zdWJ0bGUvaGtkZi1pbXBvcnQta2V5 Lmh0bWwgWyBTa2lwIF0KIGNyeXB0by9zdWJ0bGUvaGtkZi1pbXBvcnQta2V5LWRlcml2ZS1iaXRz Lmh0bWwgWyBTa2lwIF0KIGNyeXB0by9zdWJ0bGUvaGtkZi1pbXBvcnQta2V5LWRlcml2ZS1obWFj LWtleS5odG1sIFsgU2tpcCBdCiBjcnlwdG8vc3VidGxlL2hrZGYtaW1wb3J0LWtleS1tYWxmb3Jt ZWQtcGFyYW1ldGVycy5odG1sIFsgU2tpcCBdCi1jcnlwdG8vc3VidGxlL2htYWMtZXhwb3J0LWtl eS1tYWxmb3JtZWQtcGFyYW1ldGVycy5odG1sIFsgU2tpcCBdCi1jcnlwdG8vc3VidGxlL2htYWMt Z2VuZXJhdGUtZXhwb3J0LWtleS1qd2stc2hhMS5odG1sIFsgU2tpcCBdCi1jcnlwdG8vc3VidGxl L2htYWMtZ2VuZXJhdGUtZXhwb3J0LWtleS1qd2stc2hhMjI0Lmh0bWwgWyBTa2lwIF0KLWNyeXB0 by9zdWJ0bGUvaG1hYy1nZW5lcmF0ZS1leHBvcnQta2V5LWp3ay1zaGEyNTYuaHRtbCBbIFNraXAg XQotY3J5cHRvL3N1YnRsZS9obWFjLWdlbmVyYXRlLWV4cG9ydC1rZXktandrLXNoYTM4NC5odG1s IFsgU2tpcCBdCi1jcnlwdG8vc3VidGxlL2htYWMtZ2VuZXJhdGUtZXhwb3J0LWtleS1qd2stc2hh NTEyLmh0bWwgWyBTa2lwIF0KLWNyeXB0by9zdWJ0bGUvaG1hYy1nZW5lcmF0ZS1leHBvcnQtcmF3 LWtleS5odG1sIFsgU2tpcCBdCi1jcnlwdG8vc3VidGxlL2htYWMtZ2VuZXJhdGUta2V5LWN1c3Rv bWl6ZWQtbGVuZ3RoLmh0bWwgWyBTa2lwIF0KLWNyeXB0by9zdWJ0bGUvaG1hYy1nZW5lcmF0ZS1r ZXktaGFzaC1vYmplY3QuaHRtbCBbIFNraXAgXQotY3J5cHRvL3N1YnRsZS9obWFjLWdlbmVyYXRl LWtleS1tYWxmb3JtZWQtcGFyYW1ldGVycy5odG1sIFsgU2tpcCBdCi1jcnlwdG8vc3VidGxlL2ht YWMtZ2VuZXJhdGUta2V5LXNoYTEuaHRtbCBbIFNraXAgXQotY3J5cHRvL3N1YnRsZS9obWFjLWdl bmVyYXRlLWtleS1zaGEyMjQuaHRtbCBbIFNraXAgXQotY3J5cHRvL3N1YnRsZS9obWFjLWdlbmVy YXRlLWtleS1zaGEyNTYuaHRtbCBbIFNraXAgXQotY3J5cHRvL3N1YnRsZS9obWFjLWdlbmVyYXRl LWtleS1zaGEzODQuaHRtbCBbIFNraXAgXQotY3J5cHRvL3N1YnRsZS9obWFjLWdlbmVyYXRlLWtl eS1zaGE1MTIuaHRtbCBbIFNraXAgXQotY3J5cHRvL3N1YnRsZS9obWFjLWdlbmVyYXRlLWtleS1z aWduLXZlcmlmeS5odG1sIFsgU2tpcCBdCi1jcnlwdG8vc3VidGxlL2htYWMtaW1wb3J0LWp3ay1r ZXktZXhwb3J0LWp3ay1rZXkuaHRtbCBbIFNraXAgXQotY3J5cHRvL3N1YnRsZS9obWFjLWltcG9y dC1qd2sta2V5LWV4cG9ydC1yYXcta2V5Lmh0bWwgWyBTa2lwIF0KLWNyeXB0by9zdWJ0bGUvaG1h Yy1pbXBvcnQtandrLWtleS1taW5pbXVtLmh0bWwgWyBTa2lwIF0KLWNyeXB0by9zdWJ0bGUvaG1h Yy1pbXBvcnQtandrLWtleS1ub24tZXh0cmFjdGFibGUuaHRtbCBbIFNraXAgXQotY3J5cHRvL3N1 YnRsZS9obWFjLWltcG9ydC1qd2sta2V5LXNoYTEuaHRtbCBbIFNraXAgXQotY3J5cHRvL3N1YnRs ZS9obWFjLWltcG9ydC1qd2sta2V5LXNoYTIyNC5odG1sIFsgU2tpcCBdCi1jcnlwdG8vc3VidGxl L2htYWMtaW1wb3J0LWp3ay1rZXktc2hhMjU2Lmh0bWwgWyBTa2lwIF0KLWNyeXB0by9zdWJ0bGUv aG1hYy1pbXBvcnQtandrLWtleS1zaGEzODQuaHRtbCBbIFNraXAgXQotY3J5cHRvL3N1YnRsZS9o bWFjLWltcG9ydC1qd2sta2V5LXNoYTUxMi5odG1sIFsgU2tpcCBdCi1jcnlwdG8vc3VidGxlL2ht YWMtaW1wb3J0LWtleS1tYWxmb3JtZWQtcGFyYW1ldGVycy5odG1sIFsgU2tpcCBdCi1jcnlwdG8v c3VidGxlL2htYWMtaW1wb3J0LWtleS1zaWduLXNoYTEuaHRtbCBbIFNraXAgXQotY3J5cHRvL3N1 YnRsZS9obWFjLWltcG9ydC1rZXktc2lnbi1zaGEyMjQuaHRtbCBbIFNraXAgXQotY3J5cHRvL3N1 YnRsZS9obWFjLWltcG9ydC1rZXktc2lnbi1zaGEyNTYuaHRtbCBbIFNraXAgXQotY3J5cHRvL3N1 YnRsZS9obWFjLWltcG9ydC1rZXktc2lnbi1zaGEzODQuaHRtbCBbIFNraXAgXQotY3J5cHRvL3N1 YnRsZS9obWFjLWltcG9ydC1rZXktc2lnbi1zaGE1MTIuaHRtbCBbIFNraXAgXQotY3J5cHRvL3N1 YnRsZS9obWFjLWltcG9ydC1rZXktdmVyaWZ5LXNoYTEuaHRtbCBbIFNraXAgXQotY3J5cHRvL3N1 YnRsZS9obWFjLWltcG9ydC1rZXktdmVyaWZ5LXNoYTIyNC5odG1sIFsgU2tpcCBdCi1jcnlwdG8v c3VidGxlL2htYWMtaW1wb3J0LWtleS12ZXJpZnktc2hhMjU2Lmh0bWwgWyBTa2lwIF0KLWNyeXB0 by9zdWJ0bGUvaG1hYy1pbXBvcnQta2V5LXZlcmlmeS1zaGEzODQuaHRtbCBbIFNraXAgXQotY3J5 cHRvL3N1YnRsZS9obWFjLWltcG9ydC1rZXktdmVyaWZ5LXNoYTUxMi5odG1sIFsgU2tpcCBdCi1j cnlwdG8vc3VidGxlL2htYWMtaW1wb3J0LXJhdy1rZXkuaHRtbCBbIFNraXAgXQotY3J5cHRvL3N1 YnRsZS9obWFjLWltcG9ydC1yYXcta2V5LWN1c3RvbWl6ZWQtbGVuZ3RoLmh0bWwgWyBTa2lwIF0K LWNyeXB0by9zdWJ0bGUvaG1hYy1pbXBvcnQtcmF3LWtleS1leHBvcnQtandrLWtleS5odG1sIFsg U2tpcCBdCi1jcnlwdG8vc3VidGxlL2htYWMtaW1wb3J0LXJhdy1rZXktZXhwb3J0LXJhdy1rZXku aHRtbCBbIFNraXAgXQogY3J5cHRvL3N1YnRsZS9pbXBvcnQta2V5LW1hbGZvcm1lZC1wYXJhbWV0 ZXJzLmh0bWwgWyBTa2lwIF0KIGNyeXB0by9zdWJ0bGUvcGJrZGYyLWRlcml2ZS1iaXRzLW1hbGZv cm1lZC1wYXJhbWV0cnMuaHRtbCBbIFNraXAgXQogY3J5cHRvL3N1YnRsZS9wYmtkZjItaW1wb3J0 LWtleS5odG1sIFsgU2tpcCBdCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDQ2OGMyNjA2ZTUxLi44Y2YyNDMxYzJl MjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAyMC0wNC0yMyAgVG9tb2tpIEltYWkg IDxUb21va2kuSW1haUBzb255LmNvbT4KKworICAgICAgICBbT3BlblNTTF0gSW1wbGVtZW50IFdl YkNyeXB0byBBUElzIGZvciBITUFDCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTA5MDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBTdXBwb3J0IFdlYkNyeXB0byBITUFDIHNpZ24vdmVyaWZ5IHdpdGggT3Bl blNTTC4KKyAgICAgICAgVGhlIGRlc2lnbiBhbmQgc29tZSBmdW5jdGlvbnMgYXJlIGluaGVyaXRl ZCBmcm9tIHRoZSBvdGhlciBwb3J0cy4KKworICAgICAgICAqIGNyeXB0by9vcGVuc3NsL0NyeXB0 b0FsZ29yaXRobUhNQUNPcGVuU1NMLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhNQUNBbGdvcml0 aG0pOiBBZGRlZC4gSGVscGVyIGZ1bmN0aW9uIHRvIG1hcCBDcnlwdG9BbGdvcml0aG1JZGVudGlm aWVyIHRvIE9wZW5TU0wgRVZQX01EIHR5cGUuCisgICAgICAgIChXZWJDb3JlOjpjYWxjdWxhdGVT aWduYXR1cmUpOiBBZGRlZC4gSGVscGVyIGZ1bmN0aW9uIHRvIGNhbGN1bGF0ZSB0aGUgc2lnbmF0 dXJlIGZvciBzaWduL3ZlcmlmeS4KKyAgICAgICAgKFdlYkNvcmU6OkNyeXB0b0FsZ29yaXRobUhN QUM6OnBsYXRmb3JtU2lnbik6IEltcGxlbWVudGVkLCBtb3N0bHkgc2FtZSBhcyB0aGUgb3RoZXIg cG9ydHMuCisgICAgICAgIChXZWJDb3JlOjpDcnlwdG9BbGdvcml0aG1ITUFDOjpwbGF0Zm9ybVZl cmlmeSk6IEltcGxlbWVudGVkLCBtb3N0bHkgc2FtZSBhcyB0aGUgb3RoZXIgcG9ydHMuCisgICAg ICAgICogY3J5cHRvL29wZW5zc2wvQ3J5cHRvQWxnb3JpdGhtUmVnaXN0cnlPcGVuU1NMLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkNyeXB0b0FsZ29yaXRobVJlZ2lzdHJ5OjpwbGF0Zm9ybVJlZ2lz dGVyQWxnb3JpdGhtcyk6IEFkZGVkIENyeXB0b0FsZ29yaXRobUhNQUMgc3VwcG9ydC4KKyAgICAg ICAgKiBjcnlwdG8vb3BlbnNzbC9PcGVuU1NMQ3J5cHRvVW5pcXVlUHRyLmg6IEFkZGVkIHNwZWNp YWxpemVkIHVuaXF1ZV9wdHJzIGZvciBFVlBfTURfQ1RYIGFuZCBFVlBfUEtFWS4KKyAgICAgICAg KFdlYkNvcmU6Ok9wZW5TU0xDcnlwdG9QdHJEZWxldGVyPEVWUF9NRF9DVFg+OjpvcGVyYXRvcigp IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok9wZW5TU0xDcnlwdG9QdHJEZWxldGVyPEVWUF9Q S0VZPjo6b3BlcmF0b3IoKSBjb25zdCk6CisKIDIwMjAtMDQtMjEgIEFudG9pbmUgUXVpbnQgIDxn cmFvdXRzQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViIEFuaW1hdGlvbnNdIEFkZCBhIHN1cHBv cnRpbmcgb2JqZWN0IGZvciBEb2N1bWVudCB0byBtYW5hZ2UgdGltZWxpbmVzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vb3BlbnNzbC9DcnlwdG9BbGdvcml0aG1ITUFDT3BlblNT TC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vb3BlbnNzbC9DcnlwdG9BbGdvcml0aG1ITUFD T3BlblNTTC5jcHAKaW5kZXggMjc1NDYwZGFhOTJmLi5kM2FkOTRhYTZlNDEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2NyeXB0by9vcGVuc3NsL0NyeXB0b0FsZ29yaXRobUhNQUNPcGVuU1NM LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vb3BlbnNzbC9DcnlwdG9BbGdvcml0aG1I TUFDT3BlblNTTC5jcHAKQEAgLTI5LDIwICsyOSw4NSBAQAogI2lmIEVOQUJMRShXRUJfQ1JZUFRP KQogCiAjaW5jbHVkZSAiQ3J5cHRvS2V5SE1BQy5oIgotI2luY2x1ZGUgIk5vdEltcGxlbWVudGVk LmgiCisjaW5jbHVkZSAiT3BlblNTTENyeXB0b1VuaXF1ZVB0ci5oIgorI2luY2x1ZGUgPG9wZW5z c2wvZXZwLmg+CisjaW5jbHVkZSA8d3RmL0NyeXB0b2dyYXBoaWNVdGlsaXRpZXMuaD4KIAogbmFt ZXNwYWNlIFdlYkNvcmUgewogCi1FeGNlcHRpb25PcjxWZWN0b3I8dWludDhfdD4+IENyeXB0b0Fs Z29yaXRobUhNQUM6OnBsYXRmb3JtU2lnbihjb25zdCBDcnlwdG9LZXlITUFDJiwgY29uc3QgVmVj dG9yPHVpbnQ4X3Q+JikKK3N0YXRpYyBjb25zdCBFVlBfTUQqIEhNQUNBbGdvcml0aG0oQ3J5cHRv QWxnb3JpdGhtSWRlbnRpZmllciBoYXNoRnVuY3Rpb24pCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQo KTsKLSAgICByZXR1cm4gRXhjZXB0aW9uIHsgTm90U3VwcG9ydGVkRXJyb3IgfTsKKyAgICBzd2l0 Y2ggKGhhc2hGdW5jdGlvbikgeworICAgIGNhc2UgQ3J5cHRvQWxnb3JpdGhtSWRlbnRpZmllcjo6 U0hBXzE6CisgICAgICAgIHJldHVybiBFVlBfc2hhMSgpOworICAgIGNhc2UgQ3J5cHRvQWxnb3Jp dGhtSWRlbnRpZmllcjo6U0hBXzIyNDoKKyAgICAgICAgcmV0dXJuIEVWUF9zaGEyMjQoKTsKKyAg ICBjYXNlIENyeXB0b0FsZ29yaXRobUlkZW50aWZpZXI6OlNIQV8yNTY6CisgICAgICAgIHJldHVy biBFVlBfc2hhMjU2KCk7CisgICAgY2FzZSBDcnlwdG9BbGdvcml0aG1JZGVudGlmaWVyOjpTSEFf Mzg0OgorICAgICAgICByZXR1cm4gRVZQX3NoYTM4NCgpOworICAgIGNhc2UgQ3J5cHRvQWxnb3Jp dGhtSWRlbnRpZmllcjo6U0hBXzUxMjoKKyAgICAgICAgcmV0dXJuIEVWUF9zaGE1MTIoKTsKKyAg ICBkZWZhdWx0OgorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICB9CiB9CiAKLUV4Y2VwdGlv bk9yPGJvb2w+IENyeXB0b0FsZ29yaXRobUhNQUM6OnBsYXRmb3JtVmVyaWZ5KGNvbnN0IENyeXB0 b0tleUhNQUMmLCBjb25zdCBWZWN0b3I8dWludDhfdD4mLCBjb25zdCBWZWN0b3I8dWludDhfdD4m KQorc3RhdGljIE9wdGlvbmFsPFZlY3Rvcjx1aW50OF90Pj4gY2FsY3VsYXRlU2lnbmF0dXJlKGNv bnN0IEVWUF9NRCogYWxnb3JpdGhtLCBjb25zdCBWZWN0b3I8dWludDhfdD4mIGtleSwgY29uc3Qg dWludDhfdCogZGF0YSwgc2l6ZV90IGRhdGFMZW5ndGgpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQo KTsKLSAgICByZXR1cm4gRXhjZXB0aW9uIHsgTm90U3VwcG9ydGVkRXJyb3IgfTsKKyAgICAvLyBD cmVhdGUgdGhlIE1lc3NhZ2UgRGlnZXN0IENvbnRleHQKKyAgICBFdnBEaWdlc3RDdHhQdHIgY3R4 OworICAgIGlmICghKGN0eCA9IEV2cERpZ2VzdEN0eFB0cihFVlBfTURfQ1RYX2NyZWF0ZSgpKSkp CisgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CisKKyAgICAvLyBJbml0aWFsaXplIHRoZSBE aWdlc3RTaWduIG9wZXJhdGlvbgorICAgIEV2cFBLZXlQdHIgaGtleTsKKyAgICBpZiAoIShoa2V5 ID0gRXZwUEtleVB0cihFVlBfUEtFWV9uZXdfbWFjX2tleShFVlBfUEtFWV9ITUFDLCBudWxscHRy LCBrZXkuZGF0YSgpLCBrZXkuc2l6ZSgpKSkpKQorICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0 OworCisgICAgaWYgKDEgIT0gRVZQX0RpZ2VzdFNpZ25Jbml0KGN0eC5nZXQoKSwgbnVsbHB0ciwg YWxnb3JpdGhtLCBudWxscHRyLCBoa2V5LmdldCgpKSkKKyAgICAgICAgcmV0dXJuIFdURjo6bnVs bG9wdDsKKworICAgIC8vIENhbGwgdXBkYXRlIHdpdGggdGhlIG1lc3NhZ2UKKyAgICBpZiAoMSAh PSBFVlBfRGlnZXN0U2lnblVwZGF0ZShjdHguZ2V0KCksIGRhdGEsIGRhdGFMZW5ndGgpKQorICAg ICAgICByZXR1cm4gV1RGOjpudWxsb3B0OworCisgICAgLy8gRmluYWxpemUgdGhlIERpZ2VzdFNp Z24gb3BlcmF0aW9uCisgICAgc2l6ZV90IGxlbiA9IDA7CisgICAgaWYgKDEgIT0gRVZQX0RpZ2Vz dFNpZ25GaW5hbChjdHguZ2V0KCksIG51bGxwdHIsICZsZW4pKQorICAgICAgICByZXR1cm4gV1RG OjpudWxsb3B0OworCisgICAgLy8gT2J0YWluIHRoZSBzaWduYXR1cmUKKyAgICBWZWN0b3I8dWlu dDhfdD4gY2lwaGVyVGV4dChsZW4pOworICAgIGlmICgxICE9IEVWUF9EaWdlc3RTaWduRmluYWwo Y3R4LmdldCgpLCBjaXBoZXJUZXh0LmRhdGEoKSwgJmxlbikpCisgICAgICAgIHJldHVybiBXVEY6 Om51bGxvcHQ7CisKKyAgICByZXR1cm4gY2lwaGVyVGV4dDsKK30KKworRXhjZXB0aW9uT3I8VmVj dG9yPHVpbnQ4X3Q+PiBDcnlwdG9BbGdvcml0aG1ITUFDOjpwbGF0Zm9ybVNpZ24oY29uc3QgQ3J5 cHRvS2V5SE1BQyYga2V5LCBjb25zdCBWZWN0b3I8dWludDhfdD4mIGRhdGEpCit7CisgICAgYXV0 byBhbGdvcml0aG0gPSBITUFDQWxnb3JpdGhtKGtleS5oYXNoQWxnb3JpdGhtSWRlbnRpZmllcigp KTsKKyAgICBpZiAoIWFsZ29yaXRobSkKKyAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IE9wZXJh dGlvbkVycm9yIH07CisKKyAgICBhdXRvIHJlc3VsdCA9IGNhbGN1bGF0ZVNpZ25hdHVyZShhbGdv cml0aG0sIGtleS5rZXkoKSwgZGF0YS5kYXRhKCksIGRhdGEuc2l6ZSgpKTsKKyAgICBpZiAoIXJl c3VsdCkKKyAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IE9wZXJhdGlvbkVycm9yIH07CisgICAg cmV0dXJuIFdURk1vdmUoKnJlc3VsdCk7Cit9CisKK0V4Y2VwdGlvbk9yPGJvb2w+IENyeXB0b0Fs Z29yaXRobUhNQUM6OnBsYXRmb3JtVmVyaWZ5KGNvbnN0IENyeXB0b0tleUhNQUMmIGtleSwgY29u c3QgVmVjdG9yPHVpbnQ4X3Q+JiBzaWduYXR1cmUsIGNvbnN0IFZlY3Rvcjx1aW50OF90PiYgZGF0 YSkKK3sKKyAgICBhdXRvIGFsZ29yaXRobSA9IEhNQUNBbGdvcml0aG0oa2V5Lmhhc2hBbGdvcml0 aG1JZGVudGlmaWVyKCkpOworICAgIGlmICghYWxnb3JpdGhtKQorICAgICAgICByZXR1cm4gRXhj ZXB0aW9uIHsgT3BlcmF0aW9uRXJyb3IgfTsKKworICAgIGF1dG8gZXhwZWN0ZWRTaWduYXR1cmUg PSBjYWxjdWxhdGVTaWduYXR1cmUoYWxnb3JpdGhtLCBrZXkua2V5KCksIGRhdGEuZGF0YSgpLCBk YXRhLnNpemUoKSk7CisgICAgaWYgKCFleHBlY3RlZFNpZ25hdHVyZSkKKyAgICAgICAgcmV0dXJu IEV4Y2VwdGlvbiB7IE9wZXJhdGlvbkVycm9yIH07CisgICAgLy8gVXNpbmcgYSBjb25zdGFudCB0 aW1lIGNvbXBhcmlzb24gdG8gcHJldmVudCB0aW1pbmcgYXR0YWNrcy4KKyAgICByZXR1cm4gc2ln bmF0dXJlLnNpemUoKSA9PSBleHBlY3RlZFNpZ25hdHVyZS0+c2l6ZSgpICYmICFjb25zdGFudFRp bWVNZW1jbXAoZXhwZWN0ZWRTaWduYXR1cmUtPmRhdGEoKSwgc2lnbmF0dXJlLmRhdGEoKSwgZXhw ZWN0ZWRTaWduYXR1cmUtPnNpemUoKSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9vcGVuc3NsL0NyeXB0b0FsZ29yaXRobVJl Z2lzdHJ5T3BlblNTTC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vb3BlbnNzbC9DcnlwdG9B bGdvcml0aG1SZWdpc3RyeU9wZW5TU0wuY3BwCmluZGV4IGY4Zjc1MjczOTBiMS4uODFiNzBmNzc4 Njg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vb3BlbnNzbC9DcnlwdG9BbGdv cml0aG1SZWdpc3RyeU9wZW5TU0wuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9vcGVu c3NsL0NyeXB0b0FsZ29yaXRobVJlZ2lzdHJ5T3BlblNTTC5jcHAKQEAgLTMzLDYgKzMzLDcgQEAK ICNpbmNsdWRlICJDcnlwdG9BbGdvcml0aG1BRVNfQ1RSLmgiCiAjaW5jbHVkZSAiQ3J5cHRvQWxn b3JpdGhtQUVTX0dDTS5oIgogI2luY2x1ZGUgIkNyeXB0b0FsZ29yaXRobUFFU19LVy5oIgorI2lu Y2x1ZGUgIkNyeXB0b0FsZ29yaXRobUhNQUMuaCIKICNpbmNsdWRlICJDcnlwdG9BbGdvcml0aG1T SEExLmgiCiAjaW5jbHVkZSAiQ3J5cHRvQWxnb3JpdGhtU0hBMjI0LmgiCiAjaW5jbHVkZSAiQ3J5 cHRvQWxnb3JpdGhtU0hBMjU2LmgiCkBAIC00OCw2ICs0OSw3IEBAIHZvaWQgQ3J5cHRvQWxnb3Jp dGhtUmVnaXN0cnk6OnBsYXRmb3JtUmVnaXN0ZXJBbGdvcml0aG1zKCkKICAgICByZWdpc3RlckFs Z29yaXRobTxDcnlwdG9BbGdvcml0aG1BRVNfQ1RSPigpOwogICAgIHJlZ2lzdGVyQWxnb3JpdGht PENyeXB0b0FsZ29yaXRobUFFU19HQ00+KCk7CiAgICAgcmVnaXN0ZXJBbGdvcml0aG08Q3J5cHRv QWxnb3JpdGhtQUVTX0tXPigpOworICAgIHJlZ2lzdGVyQWxnb3JpdGhtPENyeXB0b0FsZ29yaXRo bUhNQUM+KCk7CiAgICAgcmVnaXN0ZXJBbGdvcml0aG08Q3J5cHRvQWxnb3JpdGhtU0hBMT4oKTsK ICAgICByZWdpc3RlckFsZ29yaXRobTxDcnlwdG9BbGdvcml0aG1TSEEyMjQ+KCk7CiAgICAgcmVn aXN0ZXJBbGdvcml0aG08Q3J5cHRvQWxnb3JpdGhtU0hBMjU2PigpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvY3J5cHRvL29wZW5zc2wvT3BlblNTTENyeXB0b1VuaXF1ZVB0ci5oIGIvU291 cmNlL1dlYkNvcmUvY3J5cHRvL29wZW5zc2wvT3BlblNTTENyeXB0b1VuaXF1ZVB0ci5oCmluZGV4 IDU2MWY4ODljOTFkOC4uZWUwYjk1ZGU4MzNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j cnlwdG8vb3BlbnNzbC9PcGVuU1NMQ3J5cHRvVW5pcXVlUHRyLmgKKysrIGIvU291cmNlL1dlYkNv cmUvY3J5cHRvL29wZW5zc2wvT3BlblNTTENyeXB0b1VuaXF1ZVB0ci5oCkBAIC00OSw0ICs0OSwy NCBAQCBzdHJ1Y3QgT3BlblNTTENyeXB0b1B0ckRlbGV0ZXI8RVZQX0NJUEhFUl9DVFg+IHsKIAog dXNpbmcgRXZwQ2lwaGVyQ3R4UHRyID0gT3BlblNTTENyeXB0b1B0cjxFVlBfQ0lQSEVSX0NUWD47 CiAKK3RlbXBsYXRlIDw+CitzdHJ1Y3QgT3BlblNTTENyeXB0b1B0ckRlbGV0ZXI8RVZQX01EX0NU WD4geworICAgIHZvaWQgb3BlcmF0b3IoKShFVlBfTURfQ1RYKiBwdHIpIGNvbnN0CisgICAgewor ICAgICAgICBFVlBfTURfQ1RYX2ZyZWUocHRyKTsKKyAgICB9Cit9OworCit1c2luZyBFdnBEaWdl c3RDdHhQdHIgPSBPcGVuU1NMQ3J5cHRvUHRyPEVWUF9NRF9DVFg+OworCit0ZW1wbGF0ZSA8Pgor c3RydWN0IE9wZW5TU0xDcnlwdG9QdHJEZWxldGVyPEVWUF9QS0VZPiB7CisgICAgdm9pZCBvcGVy YXRvcigpKEVWUF9QS0VZKiBwdHIpIGNvbnN0CisgICAgeworICAgICAgICBFVlBfUEtFWV9mcmVl KHB0cik7CisgICAgfQorfTsKKwordXNpbmcgRXZwUEtleVB0ciA9IE9wZW5TU0xDcnlwdG9QdHI8 RVZQX1BLRVk+OworCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg==