229443 2021-08-24 08:06:59 -0700 WebCrypto uses deprecated CCKeyDerivationHMac 2021-08-25 06:50:14 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney bfulgham eric.carlson ews-watchlist jiewen_tan youennf oldest_to_newest 1786738 0 katherine_cheney 2021-08-24 08:06:59 -0700 WebCrypto uses deprecated CCKeyDerivationHMac 1786739 1 436287 katherine_cheney 2021-08-24 08:08:53 -0700 Created attachment 436287 Patch 1786740 2 katherine_cheney 2021-08-24 08:09:26 -0700 rdar://48896021 1786747 3 436291 katherine_cheney 2021-08-24 08:51:38 -0700 Created attachment 436291 Patch 1786835 4 436291 bfulgham 2021-08-24 11:21:04 -0700 Comment on attachment 436291 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=436291&action=review r=me > Source/WebCore/crypto/mac/CryptoUtilitiesCocoa.cpp:119 > + return rv; Does an unsuccessful call to CCKDFParametersCreateHkdf guarantee that the params are properly cleaned up? > Source/WebCore/crypto/mac/CryptoUtilitiesCocoa.cpp:133 > + if (keyDerivationHMAC(digestAlgorithm, key, keySize, info, infoSize, salt, saltSize, result.data(), result.size())) Should this be a check for != kCCSuccess? 1786856 5 katherine_cheney 2021-08-24 11:39:25 -0700 (In reply to Brent Fulgham from comment #4) > Comment on attachment 436291 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=436291&action=review > > r=me > > > Source/WebCore/crypto/mac/CryptoUtilitiesCocoa.cpp:119 > > + return rv; > > Does an unsuccessful call to CCKDFParametersCreateHkdf guarantee that the > params are properly cleaned up? > Yes, params are not set in CCKDFParametersCreateHkdf unless it is returning kCCSuccess. > > Source/WebCore/crypto/mac/CryptoUtilitiesCocoa.cpp:133 > > + if (keyDerivationHMAC(digestAlgorithm, key, keySize, info, infoSize, salt, saltSize, result.data(), result.size())) > > Should this be a check for != kCCSuccess? Yes, probably easier to read that way. I'll fix before landing. Thanks for the review! 1786858 6 436314 katherine_cheney 2021-08-24 11:46:08 -0700 Created attachment 436314 Patch 1787156 7 ews-feeder 2021-08-25 06:50:12 -0700 Committed r281554 (240921@main): <https://commits.webkit.org/240921@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 436314. 436287 2021-08-24 08:08:53 -0700 2021-08-24 08:56:07 -0700 Patch bug-229443-20210824080852.patch text/plain 6468 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNDU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzhkZmZiYjE2NzliYTMy NDJlOWY2ZmJhYTljNzdlY2JjNzIzNjc1OC4uZGRkYWE3OTFjZTM4NWRjNTFlZGE2MDVkMzU4NDIx MzZkNTcwMTZiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA4LTI0ICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIFdlYkNyeXB0 byB1c2VzIGRlcHJlY2F0ZWQgQ0NLZXlEZXJpdmF0aW9uSE1hYworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5NDQzCisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS80ODg5NjAyMT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSBubyBiZWhhdmlvciBjaGFuZ2UuIFRoaXMgc2hv dWxkIGJlIGNvdmVyZWQgYnkKKyAgICAgICAgZXhpc3Rpbmcgd2VicnRjIHRlc3RzIHdoaWNoIHVz ZSB0aGlzIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgUmVwbGFjZSBkZXByZWNhdGVkIENDS2V5 RGVyaXZhdGlvbkhNYWMgd2l0aCBDQ0Rlcml2ZUtleS4KKworICAgICAgICAqIGNyeXB0by9tYWMv Q3J5cHRvVXRpbGl0aWVzQ29jb2EuY3BwOgorICAgICAgICAoV2ViQ29yZTo6a2V5RGVyaXZhdGlv bkhNQUMpOgorICAgICAgICAoV2ViQ29yZTo6ZGVyaXZlSERLRkJpdHMpOgorICAgICAgICAqIGNy eXB0by9tYWMvQ3J5cHRvVXRpbGl0aWVzQ29jb2EuaDoKKwogMjAyMS0wOC0yMyAgTWFydGluIFJv Ymluc29uICA8bXJvYmluc29uQHdlYmtpdC5vcmc+CiAKICAgICAgICAgU3RpY2t5IHBvc2l0aW9u IHNob3VsZCBub3QgdXNlIHRyYW5zZm9ybWVkIHBvc2l0aW9uIHRvIGNvbXB1dGUgc3RpY2t5IG9m ZnNldC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViQ29yZS9QQUwvQ2hhbmdlTG9nCmluZGV4IGYxYjdjOGZmMDg0NWVlZGI0MzVjMTFhZWIyMWZk Y2U4NDE5MjY1M2EuLjYyMWUyZWJjZjk2ZjY2ZGRjZjFkYjU1MzZhOWRhOTRlZWNmYTJkZDkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNv cmUvUEFML0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTA4LTI0ICBLYXRlIENoZW5l eSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIFdlYkNyeXB0byB1c2Vz IGRlcHJlY2F0ZWQgQ0NLZXlEZXJpdmF0aW9uSE1hYworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5NDQzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80 ODg5NjAyMT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIHBhbC9zcGkvY29jb2EvQ29tbW9uQ3J5cHRvU1BJLmg6CisKIDIwMjEtMDgtMTAgIFRpbSBI b3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBi dWlsZCBmaXguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9D b21tb25DcnlwdG9TUEkuaCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvbW1v bkNyeXB0b1NQSS5oCmluZGV4IGNmMTEzODE5NzhhMDg2ZTI1MWEzYmFhNDg3MzE0MGFiMjJiMzFj YjEuLmRhNjFjNTE0NzgyZjZjODMzMWY2M2Q0YzhmMjEzNzk0NjVhZDk2YjAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvbW1vbkNyeXB0b1NQSS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvbW1vbkNyeXB0b1NQSS5oCkBAIC0x MTEsNiArMTExLDcgQEAgdHlwZWRlZiB1aW50MzJfdCBDQ0tERkFsZ29yaXRobTsKIAogZXh0ZXJu ICJDIiBDQ1N0YXR1cyBDQ0tleURlcml2YXRpb25ITWFjKENDS0RGQWxnb3JpdGhtIGFsZ29yaXRo bSwgQ0NEaWdlc3RBbGdvcml0aG0gZGlnZXN0LCB1bnNpZ25lZCByb3VuZHMsIGNvbnN0IHZvaWQg KmtleURlcml2YXRpb25LZXksIHNpemVfdCBrZXlEZXJpdmF0aW9uS2V5TGVuLCBjb25zdCB2b2lk ICpsYWJlbCwgc2l6ZV90IGxhYmVsTGVuLCBjb25zdCB2b2lkICpjb250ZXh0LCBzaXplX3QgY29u dGV4dExlbiwgY29uc3Qgdm9pZCAqaXYsIHNpemVfdCBpdkxlbiwgY29uc3Qgdm9pZCAqc2FsdCwg c2l6ZV90IHNhbHRMZW4sIHZvaWQgKmRlcml2ZWRLZXksIHNpemVfdCBkZXJpdmVkS2V5TGVuKTsK IAorZXh0ZXJuICJDIiBDQ1N0YXR1cyBDQ0Rlcml2ZUtleShjb25zdCBDQ0tERlBhcmFtZXRlcnNS ZWYgcGFyYW1zLCBDQ0RpZ2VzdEFsZ29yaXRobSBkaWdlc3QsIGNvbnN0IHZvaWQgKmtleURlcml2 YXRpb25LZXksIHNpemVfdCBrZXlEZXJpdmF0aW9uS2V5TGVuLCB2b2lkICpkZXJpdmVkS2V5LCBz aXplX3QgZGVyaXZlZEtleUxlbik7CiBleHRlcm4gIkMiIENDQ3J5cHRvclN0YXR1cyBDQ0NyeXB0 b3JHQ00oQ0NPcGVyYXRpb24gb3AsIENDQWxnb3JpdGhtIGFsZywgY29uc3Qgdm9pZCoga2V5LCBz aXplX3Qga2V5TGVuZ3RoLCBjb25zdCB2b2lkKiBpdiwgc2l6ZV90IGl2TGVuLCBjb25zdCB2b2lk KiBhRGF0YSwgc2l6ZV90IGFEYXRhTGVuLCBjb25zdCB2b2lkKiBkYXRhSW4sIHNpemVfdCBkYXRh SW5MZW5ndGgsIHZvaWQqIGRhdGFPdXQsIHZvaWQqIHRhZywgc2l6ZV90KiB0YWdMZW5ndGgpOwog ZXh0ZXJuICJDIiBDQ0NyeXB0b3JTdGF0dXMgQ0NSU0FDcnlwdG9yQ3JlYXRlRnJvbURhdGEoQ0NS U0FLZXlUeXBlIGtleVR5cGUsIGNvbnN0IHVpbnQ4X3QgKm1vZHVsdXMsIHNpemVfdCBtb2R1bHVz TGVuZ3RoLCBjb25zdCB1aW50OF90ICpleHBvbmVudCwgc2l6ZV90IGV4cG9uZW50TGVuZ3RoLCBj b25zdCB1aW50OF90ICpwLCBzaXplX3QgcExlbmd0aCwgY29uc3QgdWludDhfdCAqcSwgc2l6ZV90 IHFMZW5ndGgsIENDUlNBQ3J5cHRvclJlZiAqcmVmKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY3J5cHRvL21hYy9DcnlwdG9VdGlsaXRpZXNDb2NvYS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9jcnlwdG8vbWFjL0NyeXB0b1V0aWxpdGllc0NvY29hLmNwcAppbmRleCA3MTFhODk2ZDU0OWEz NWIzZThlYmEzMTI4ODZhNjBjNjRjN2U0NjE4Li5hNmQzMmUyMDJiNzE0Y2M0ODE1MjQ3YzFjMDk5 YmIzYWI1NTY1NzRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vbWFjL0NyeXB0 b1V0aWxpdGllc0NvY29hLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vbWFjL0NyeXB0 b1V0aWxpdGllc0NvY29hLmNwcApAQCAtMTExLDE3ICsxMTEsMjggQEAgRXhjZXB0aW9uT3I8VmVj dG9yPHVpbnQ4X3Q+PiB0cmFuc2Zvcm1BRVNfQ1RSKENDT3BlcmF0aW9uIG9wZXJhdGlvbiwgY29u c3QgVmVjdG8KICAgICByZXR1cm4gV1RGTW92ZShoZWFkKTsKIH0KIAorQ0NTdGF0dXMga2V5RGVy aXZhdGlvbkhNQUMoQ0NEaWdlc3RBbGdvcml0aG0gZGlnZXN0LCBjb25zdCB2b2lkICprZXlEZXJp dmF0aW9uS2V5LCBzaXplX3Qga2V5RGVyaXZhdGlvbktleUxlbiwgY29uc3Qgdm9pZCAqY29udGV4 dCwgc2l6ZV90IGNvbnRleHRMZW4sIGNvbnN0IHZvaWQgKnNhbHQsIHNpemVfdCBzYWx0TGVuLCB2 b2lkICpkZXJpdmVkS2V5LCBzaXplX3QgZGVyaXZlZEtleUxlbikKK3sKKyAgICBDQ0tERlBhcmFt ZXRlcnNSZWYgcGFyYW1zOworICAgIENDU3RhdHVzIHJ2ID0gQ0NLREZQYXJhbWV0ZXJzQ3JlYXRl SGtkZigmcGFyYW1zLCBzYWx0LCBzYWx0TGVuLCBjb250ZXh0LCBjb250ZXh0TGVuKTsKKyAgICBp ZiAocnYgIT0ga0NDU3VjY2VzcykKKyAgICAgICAgcmV0dXJuIHJ2OworCisgICAgcnYgPSBDQ0Rl cml2ZUtleShwYXJhbXMsIGRpZ2VzdCwga2V5RGVyaXZhdGlvbktleSwga2V5RGVyaXZhdGlvbktl eUxlbiwgZGVyaXZlZEtleSwgZGVyaXZlZEtleUxlbik7CisgICAgQ0NLREZQYXJhbWV0ZXJzRGVz dHJveShwYXJhbXMpOworCisgICAgcmV0dXJuIHJ2OworfQorCiBFeGNlcHRpb25PcjxWZWN0b3I8 dWludDhfdD4+IGRlcml2ZUhES0ZCaXRzKENDRGlnZXN0QWxnb3JpdGhtIGRpZ2VzdEFsZ29yaXRo bSwgY29uc3QgdWludDhfdCoga2V5LCBzaXplX3Qga2V5U2l6ZSwgY29uc3QgdWludDhfdCogc2Fs dCwgc2l6ZV90IHNhbHRTaXplLCBjb25zdCB1aW50OF90KiBpbmZvLCBzaXplX3QgaW5mb1NpemUs IHNpemVfdCBsZW5ndGgpCiB7CiAgICAgVmVjdG9yPHVpbnQ4X3Q+IHJlc3VsdChsZW5ndGggLyA4 KTsKICAgICBWZWN0b3I8dWludDhfdD4gaW5mb1ZlY3RvcjsKIAotICAgIEFMTE9XX0RFUFJFQ0FU RURfREVDTEFSQVRJT05TX0JFR0lOCiAgICAgLy8gPHJkYXI6Ly9wcm9ibGVtLzMyNDM5NDU1PiBD dXJyZW50bHksIHdoZW4ga2V5IGRhdGEgaXMgZW1wdHksIENDS2V5RGVyaXZhdGlvbkhNYWMgd2ls bCBiYWlsIG91dC4KLSAgICAvLyA8cmRhcjovL3Byb2JsZW0vNDg4OTYwMjE+IFJlbWluZGVyOiBT d2l0Y2ggdG8gQ0NEZXJpdmVLZXkgbm93IHRoYXQgQ0NLZXlEZXJpdmF0aW9uSE1hYyBpcyBkZXBy ZWNhdGVkLgotICAgIGlmIChDQ0tleURlcml2YXRpb25ITWFjKGtDQ0tERkFsZ29yaXRobUhLREYs IGRpZ2VzdEFsZ29yaXRobSwgMCwga2V5LCBrZXlTaXplLCAwLCAwLCBpbmZvLCBpbmZvU2l6ZSwg MCwgMCwgc2FsdCwgc2FsdFNpemUsIHJlc3VsdC5kYXRhKCksIHJlc3VsdC5zaXplKCkpKQorICAg IGlmIChrZXlEZXJpdmF0aW9uSE1BQyhkaWdlc3RBbGdvcml0aG0sIGtleSwga2V5U2l6ZSwgaW5m bywgaW5mb1NpemUsIHNhbHQsIHNhbHRTaXplLCByZXN1bHQuZGF0YSgpLCByZXN1bHQuc2l6ZSgp KSkKICAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IE9wZXJhdGlvbkVycm9yIH07Ci0gICAgQUxM T1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECisKICAgICByZXR1cm4gV1RGTW92ZShyZXN1 bHQpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vbWFjL0NyeXB0b1V0 aWxpdGllc0NvY29hLmggYi9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vbWFjL0NyeXB0b1V0aWxpdGll c0NvY29hLmgKaW5kZXggMjk1ZTM5NGZlMzMzZmRhYzAzNzBmOTNiYzhiYzhkMTUzMGQ2NzIwMi4u MTBmNjc3YjlkMDk5OTc0YzYxZjA5NjJmZmJkN2I1NzE5ZTUzMzczMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvY3J5cHRvL21hYy9DcnlwdG9VdGlsaXRpZXNDb2NvYS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2NyeXB0by9tYWMvQ3J5cHRvVXRpbGl0aWVzQ29jb2EuaApAQCAtMjgsNiArMjgs NyBAQAogI2lmIEVOQUJMRShXRUJfQ1JZUFRPKSB8fCBFTkFCTEUoV0VCX1JUQykKIAogI2luY2x1 ZGUgIkV4Y2VwdGlvbk9yLmgiCisjaW5jbHVkZSA8Q29tbW9uQ3J5cHRvL0NvbW1vbkNyeXB0b0Vy cm9yLmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCiB0eXBlZGVmIHVpbnQzMl90IENDRGln ZXN0QWxnb3JpdGhtOwpAQCAtMzcsNiArMzgsNyBAQCB0eXBlZGVmIHVpbnQzMl90IENDT3BlcmF0 aW9uOwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBFeGNlcHRpb25PcjxWZWN0b3I8dWludDhfdD4+ IHRyYW5zZm9ybUFFU19DVFIoQ0NPcGVyYXRpb24sIGNvbnN0IFZlY3Rvcjx1aW50OF90PiYgY291 bnRlciwgc2l6ZV90IGNvdW50ZXJMZW5ndGgsIGNvbnN0IFZlY3Rvcjx1aW50OF90PiYga2V5LCBj b25zdCB1aW50OF90KiBkYXRhLCBzaXplX3QgZGF0YVNpemUpOworQ0NTdGF0dXMga2V5RGVyaXZh dGlvbkhNQUMoQ0NEaWdlc3RBbGdvcml0aG0sIGNvbnN0IHZvaWQgKiwgc2l6ZV90LCBjb25zdCB2 b2lkICosIHNpemVfdCwgY29uc3Qgdm9pZCAqLCBzaXplX3QsIHZvaWQgKiwgc2l6ZV90KTsKIEV4 Y2VwdGlvbk9yPFZlY3Rvcjx1aW50OF90Pj4gZGVyaXZlSERLRkJpdHMoQ0NEaWdlc3RBbGdvcml0 aG0sIGNvbnN0IHVpbnQ4X3QqIGtleSwgc2l6ZV90IGtleVNpemUsIGNvbnN0IHVpbnQ4X3QqIHNh bHQsIHNpemVfdCBzYWx0U2l6ZSwgY29uc3QgdWludDhfdCogaW5mbywgc2l6ZV90IGluZm9TaXpl LCBzaXplX3QgbGVuZ3RoKTsKIEV4Y2VwdGlvbk9yPFZlY3Rvcjx1aW50OF90Pj4gZGVyaXZlSERL RlNIQTI1NkJpdHMoY29uc3QgdWludDhfdCoga2V5LCBzaXplX3Qga2V5U2l6ZSwgY29uc3QgdWlu dDhfdCogc2FsdCwgc2l6ZV90IHNhbHRTaXplLCBjb25zdCB1aW50OF90KiBpbmZvLCBzaXplX3Qg aW5mb1NpemUsIHNpemVfdCBsZW5ndGgpOwogVmVjdG9yPHVpbnQ4X3Q+IGNhbGN1bGF0ZUhNQUNT aWduYXR1cmUoQ0NIbWFjQWxnb3JpdGhtLCBjb25zdCBWZWN0b3I8dWludDhfdD4mIGtleSwgY29u c3QgdWludDhfdCogZGF0YSwgc2l6ZV90KTsK 436291 2021-08-24 08:51:38 -0700 2021-08-24 11:46:07 -0700 Patch bug-229443-20210824085137.patch text/plain 6897 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNDU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzhkZmZiYjE2NzliYTMy NDJlOWY2ZmJhYTljNzdlY2JjNzIzNjc1OC4uZGRkYWE3OTFjZTM4NWRjNTFlZGE2MDVkMzU4NDIx MzZkNTcwMTZiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA4LTI0ICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIFdlYkNyeXB0 byB1c2VzIGRlcHJlY2F0ZWQgQ0NLZXlEZXJpdmF0aW9uSE1hYworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5NDQzCisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS80ODg5NjAyMT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSBubyBiZWhhdmlvciBjaGFuZ2UuIFRoaXMgc2hv dWxkIGJlIGNvdmVyZWQgYnkKKyAgICAgICAgZXhpc3Rpbmcgd2VicnRjIHRlc3RzIHdoaWNoIHVz ZSB0aGlzIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgUmVwbGFjZSBkZXByZWNhdGVkIENDS2V5 RGVyaXZhdGlvbkhNYWMgd2l0aCBDQ0Rlcml2ZUtleS4KKworICAgICAgICAqIGNyeXB0by9tYWMv Q3J5cHRvVXRpbGl0aWVzQ29jb2EuY3BwOgorICAgICAgICAoV2ViQ29yZTo6a2V5RGVyaXZhdGlv bkhNQUMpOgorICAgICAgICAoV2ViQ29yZTo6ZGVyaXZlSERLRkJpdHMpOgorICAgICAgICAqIGNy eXB0by9tYWMvQ3J5cHRvVXRpbGl0aWVzQ29jb2EuaDoKKwogMjAyMS0wOC0yMyAgTWFydGluIFJv Ymluc29uICA8bXJvYmluc29uQHdlYmtpdC5vcmc+CiAKICAgICAgICAgU3RpY2t5IHBvc2l0aW9u IHNob3VsZCBub3QgdXNlIHRyYW5zZm9ybWVkIHBvc2l0aW9uIHRvIGNvbXB1dGUgc3RpY2t5IG9m ZnNldC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViQ29yZS9QQUwvQ2hhbmdlTG9nCmluZGV4IGYxYjdjOGZmMDg0NWVlZGI0MzVjMTFhZWIyMWZk Y2U4NDE5MjY1M2EuLjYyMWUyZWJjZjk2ZjY2ZGRjZjFkYjU1MzZhOWRhOTRlZWNmYTJkZDkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNv cmUvUEFML0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTA4LTI0ICBLYXRlIENoZW5l eSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIFdlYkNyeXB0byB1c2Vz IGRlcHJlY2F0ZWQgQ0NLZXlEZXJpdmF0aW9uSE1hYworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5NDQzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80 ODg5NjAyMT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIHBhbC9zcGkvY29jb2EvQ29tbW9uQ3J5cHRvU1BJLmg6CisKIDIwMjEtMDgtMTAgIFRpbSBI b3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBi dWlsZCBmaXguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9D b21tb25DcnlwdG9TUEkuaCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvbW1v bkNyeXB0b1NQSS5oCmluZGV4IGNmMTEzODE5NzhhMDg2ZTI1MWEzYmFhNDg3MzE0MGFiMjJiMzFj YjEuLmU1ZGFiZTBmMGYyMWEwMjViNjQyOTIzZTMzYjc0YjllYWFhNDQ3ODkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvbW1vbkNyeXB0b1NQSS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL0NvbW1vbkNyeXB0b1NQSS5oCkBAIC01 OSw2ICs1OSw5IEBAIGVudW0gewogICAgIGNjUlNBUFNTUGFkZGluZyA9IDEwMDUKIH07CiB0eXBl ZGVmIHVpbnQzMl90IENDQXN5bW1ldHJpY1BhZGRpbmc7CisKK3R5cGVkZWYgc3RydWN0IENDS0RG UGFyYW1ldGVycyAqQ0NLREZQYXJhbWV0ZXJzUmVmOworCiAjZW5kaWYKIAogdHlwZWRlZiBzdHJ1 Y3QgX0NDUlNBQ3J5cHRvciAqQ0NSU0FDcnlwdG9yUmVmOwpAQCAtMTExLDYgKzExNCw5IEBAIHR5 cGVkZWYgdWludDMyX3QgQ0NLREZBbGdvcml0aG07CiAKIGV4dGVybiAiQyIgQ0NTdGF0dXMgQ0NL ZXlEZXJpdmF0aW9uSE1hYyhDQ0tERkFsZ29yaXRobSBhbGdvcml0aG0sIENDRGlnZXN0QWxnb3Jp dGhtIGRpZ2VzdCwgdW5zaWduZWQgcm91bmRzLCBjb25zdCB2b2lkICprZXlEZXJpdmF0aW9uS2V5 LCBzaXplX3Qga2V5RGVyaXZhdGlvbktleUxlbiwgY29uc3Qgdm9pZCAqbGFiZWwsIHNpemVfdCBs YWJlbExlbiwgY29uc3Qgdm9pZCAqY29udGV4dCwgc2l6ZV90IGNvbnRleHRMZW4sIGNvbnN0IHZv aWQgKml2LCBzaXplX3QgaXZMZW4sIGNvbnN0IHZvaWQgKnNhbHQsIHNpemVfdCBzYWx0TGVuLCB2 b2lkICpkZXJpdmVkS2V5LCBzaXplX3QgZGVyaXZlZEtleUxlbik7CiAKK2V4dGVybiAiQyIgQ0NT dGF0dXMgQ0NEZXJpdmVLZXkoY29uc3QgQ0NLREZQYXJhbWV0ZXJzUmVmIHBhcmFtcywgQ0NEaWdl c3RBbGdvcml0aG0gZGlnZXN0LCBjb25zdCB2b2lkICprZXlEZXJpdmF0aW9uS2V5LCBzaXplX3Qg a2V5RGVyaXZhdGlvbktleUxlbiwgdm9pZCAqZGVyaXZlZEtleSwgc2l6ZV90IGRlcml2ZWRLZXlM ZW4pOworZXh0ZXJuICJDIiBDQ1N0YXR1cyBDQ0tERlBhcmFtZXRlcnNDcmVhdGVIa2RmKENDS0RG UGFyYW1ldGVyc1JlZiAqcGFyYW1zLCBjb25zdCB2b2lkICpzYWx0LCBzaXplX3Qgc2FsdExlbiwg Y29uc3Qgdm9pZCAqY29udGV4dCwgc2l6ZV90IGNvbnRleHRMZW4pOworZXh0ZXJuICJDIiB2b2lk IENDS0RGUGFyYW1ldGVyc0Rlc3Ryb3koQ0NLREZQYXJhbWV0ZXJzUmVmIHBhcmFtcyk7CiBleHRl cm4gIkMiIENDQ3J5cHRvclN0YXR1cyBDQ0NyeXB0b3JHQ00oQ0NPcGVyYXRpb24gb3AsIENDQWxn b3JpdGhtIGFsZywgY29uc3Qgdm9pZCoga2V5LCBzaXplX3Qga2V5TGVuZ3RoLCBjb25zdCB2b2lk KiBpdiwgc2l6ZV90IGl2TGVuLCBjb25zdCB2b2lkKiBhRGF0YSwgc2l6ZV90IGFEYXRhTGVuLCBj b25zdCB2b2lkKiBkYXRhSW4sIHNpemVfdCBkYXRhSW5MZW5ndGgsIHZvaWQqIGRhdGFPdXQsIHZv aWQqIHRhZywgc2l6ZV90KiB0YWdMZW5ndGgpOwogZXh0ZXJuICJDIiBDQ0NyeXB0b3JTdGF0dXMg Q0NSU0FDcnlwdG9yQ3JlYXRlRnJvbURhdGEoQ0NSU0FLZXlUeXBlIGtleVR5cGUsIGNvbnN0IHVp bnQ4X3QgKm1vZHVsdXMsIHNpemVfdCBtb2R1bHVzTGVuZ3RoLCBjb25zdCB1aW50OF90ICpleHBv bmVudCwgc2l6ZV90IGV4cG9uZW50TGVuZ3RoLCBjb25zdCB1aW50OF90ICpwLCBzaXplX3QgcExl bmd0aCwgY29uc3QgdWludDhfdCAqcSwgc2l6ZV90IHFMZW5ndGgsIENDUlNBQ3J5cHRvclJlZiAq cmVmKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3J5cHRvL21hYy9DcnlwdG9VdGls aXRpZXNDb2NvYS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vbWFjL0NyeXB0b1V0aWxpdGll c0NvY29hLmNwcAppbmRleCA3MTFhODk2ZDU0OWEzNWIzZThlYmEzMTI4ODZhNjBjNjRjN2U0NjE4 Li5hNmQzMmUyMDJiNzE0Y2M0ODE1MjQ3YzFjMDk5YmIzYWI1NTY1NzRmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9jcnlwdG8vbWFjL0NyeXB0b1V0aWxpdGllc0NvY29hLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9jcnlwdG8vbWFjL0NyeXB0b1V0aWxpdGllc0NvY29hLmNwcApAQCAtMTEx LDE3ICsxMTEsMjggQEAgRXhjZXB0aW9uT3I8VmVjdG9yPHVpbnQ4X3Q+PiB0cmFuc2Zvcm1BRVNf Q1RSKENDT3BlcmF0aW9uIG9wZXJhdGlvbiwgY29uc3QgVmVjdG8KICAgICByZXR1cm4gV1RGTW92 ZShoZWFkKTsKIH0KIAorQ0NTdGF0dXMga2V5RGVyaXZhdGlvbkhNQUMoQ0NEaWdlc3RBbGdvcml0 aG0gZGlnZXN0LCBjb25zdCB2b2lkICprZXlEZXJpdmF0aW9uS2V5LCBzaXplX3Qga2V5RGVyaXZh dGlvbktleUxlbiwgY29uc3Qgdm9pZCAqY29udGV4dCwgc2l6ZV90IGNvbnRleHRMZW4sIGNvbnN0 IHZvaWQgKnNhbHQsIHNpemVfdCBzYWx0TGVuLCB2b2lkICpkZXJpdmVkS2V5LCBzaXplX3QgZGVy aXZlZEtleUxlbikKK3sKKyAgICBDQ0tERlBhcmFtZXRlcnNSZWYgcGFyYW1zOworICAgIENDU3Rh dHVzIHJ2ID0gQ0NLREZQYXJhbWV0ZXJzQ3JlYXRlSGtkZigmcGFyYW1zLCBzYWx0LCBzYWx0TGVu LCBjb250ZXh0LCBjb250ZXh0TGVuKTsKKyAgICBpZiAocnYgIT0ga0NDU3VjY2VzcykKKyAgICAg ICAgcmV0dXJuIHJ2OworCisgICAgcnYgPSBDQ0Rlcml2ZUtleShwYXJhbXMsIGRpZ2VzdCwga2V5 RGVyaXZhdGlvbktleSwga2V5RGVyaXZhdGlvbktleUxlbiwgZGVyaXZlZEtleSwgZGVyaXZlZEtl eUxlbik7CisgICAgQ0NLREZQYXJhbWV0ZXJzRGVzdHJveShwYXJhbXMpOworCisgICAgcmV0dXJu IHJ2OworfQorCiBFeGNlcHRpb25PcjxWZWN0b3I8dWludDhfdD4+IGRlcml2ZUhES0ZCaXRzKEND RGlnZXN0QWxnb3JpdGhtIGRpZ2VzdEFsZ29yaXRobSwgY29uc3QgdWludDhfdCoga2V5LCBzaXpl X3Qga2V5U2l6ZSwgY29uc3QgdWludDhfdCogc2FsdCwgc2l6ZV90IHNhbHRTaXplLCBjb25zdCB1 aW50OF90KiBpbmZvLCBzaXplX3QgaW5mb1NpemUsIHNpemVfdCBsZW5ndGgpCiB7CiAgICAgVmVj dG9yPHVpbnQ4X3Q+IHJlc3VsdChsZW5ndGggLyA4KTsKICAgICBWZWN0b3I8dWludDhfdD4gaW5m b1ZlY3RvcjsKIAotICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JFR0lOCiAgICAg Ly8gPHJkYXI6Ly9wcm9ibGVtLzMyNDM5NDU1PiBDdXJyZW50bHksIHdoZW4ga2V5IGRhdGEgaXMg ZW1wdHksIENDS2V5RGVyaXZhdGlvbkhNYWMgd2lsbCBiYWlsIG91dC4KLSAgICAvLyA8cmRhcjov L3Byb2JsZW0vNDg4OTYwMjE+IFJlbWluZGVyOiBTd2l0Y2ggdG8gQ0NEZXJpdmVLZXkgbm93IHRo YXQgQ0NLZXlEZXJpdmF0aW9uSE1hYyBpcyBkZXByZWNhdGVkLgotICAgIGlmIChDQ0tleURlcml2 YXRpb25ITWFjKGtDQ0tERkFsZ29yaXRobUhLREYsIGRpZ2VzdEFsZ29yaXRobSwgMCwga2V5LCBr ZXlTaXplLCAwLCAwLCBpbmZvLCBpbmZvU2l6ZSwgMCwgMCwgc2FsdCwgc2FsdFNpemUsIHJlc3Vs dC5kYXRhKCksIHJlc3VsdC5zaXplKCkpKQorICAgIGlmIChrZXlEZXJpdmF0aW9uSE1BQyhkaWdl c3RBbGdvcml0aG0sIGtleSwga2V5U2l6ZSwgaW5mbywgaW5mb1NpemUsIHNhbHQsIHNhbHRTaXpl LCByZXN1bHQuZGF0YSgpLCByZXN1bHQuc2l6ZSgpKSkKICAgICAgICAgcmV0dXJuIEV4Y2VwdGlv biB7IE9wZXJhdGlvbkVycm9yIH07Ci0gICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNf RU5ECisKICAgICByZXR1cm4gV1RGTW92ZShyZXN1bHQpOwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9jcnlwdG8vbWFjL0NyeXB0b1V0aWxpdGllc0NvY29hLmggYi9Tb3VyY2UvV2Vi Q29yZS9jcnlwdG8vbWFjL0NyeXB0b1V0aWxpdGllc0NvY29hLmgKaW5kZXggMjk1ZTM5NGZlMzMz ZmRhYzAzNzBmOTNiYzhiYzhkMTUzMGQ2NzIwMi4uMTBmNjc3YjlkMDk5OTc0YzYxZjA5NjJmZmJk N2I1NzE5ZTUzMzczMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3J5cHRvL21hYy9Dcnlw dG9VdGlsaXRpZXNDb2NvYS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9tYWMvQ3J5cHRv VXRpbGl0aWVzQ29jb2EuaApAQCAtMjgsNiArMjgsNyBAQAogI2lmIEVOQUJMRShXRUJfQ1JZUFRP KSB8fCBFTkFCTEUoV0VCX1JUQykKIAogI2luY2x1ZGUgIkV4Y2VwdGlvbk9yLmgiCisjaW5jbHVk ZSA8Q29tbW9uQ3J5cHRvL0NvbW1vbkNyeXB0b0Vycm9yLmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rv ci5oPgogCiB0eXBlZGVmIHVpbnQzMl90IENDRGlnZXN0QWxnb3JpdGhtOwpAQCAtMzcsNiArMzgs NyBAQCB0eXBlZGVmIHVpbnQzMl90IENDT3BlcmF0aW9uOwogbmFtZXNwYWNlIFdlYkNvcmUgewog CiBFeGNlcHRpb25PcjxWZWN0b3I8dWludDhfdD4+IHRyYW5zZm9ybUFFU19DVFIoQ0NPcGVyYXRp b24sIGNvbnN0IFZlY3Rvcjx1aW50OF90PiYgY291bnRlciwgc2l6ZV90IGNvdW50ZXJMZW5ndGgs IGNvbnN0IFZlY3Rvcjx1aW50OF90PiYga2V5LCBjb25zdCB1aW50OF90KiBkYXRhLCBzaXplX3Qg ZGF0YVNpemUpOworQ0NTdGF0dXMga2V5RGVyaXZhdGlvbkhNQUMoQ0NEaWdlc3RBbGdvcml0aG0s IGNvbnN0IHZvaWQgKiwgc2l6ZV90LCBjb25zdCB2b2lkICosIHNpemVfdCwgY29uc3Qgdm9pZCAq LCBzaXplX3QsIHZvaWQgKiwgc2l6ZV90KTsKIEV4Y2VwdGlvbk9yPFZlY3Rvcjx1aW50OF90Pj4g ZGVyaXZlSERLRkJpdHMoQ0NEaWdlc3RBbGdvcml0aG0sIGNvbnN0IHVpbnQ4X3QqIGtleSwgc2l6 ZV90IGtleVNpemUsIGNvbnN0IHVpbnQ4X3QqIHNhbHQsIHNpemVfdCBzYWx0U2l6ZSwgY29uc3Qg dWludDhfdCogaW5mbywgc2l6ZV90IGluZm9TaXplLCBzaXplX3QgbGVuZ3RoKTsKIEV4Y2VwdGlv bk9yPFZlY3Rvcjx1aW50OF90Pj4gZGVyaXZlSERLRlNIQTI1NkJpdHMoY29uc3QgdWludDhfdCog a2V5LCBzaXplX3Qga2V5U2l6ZSwgY29uc3QgdWludDhfdCogc2FsdCwgc2l6ZV90IHNhbHRTaXpl LCBjb25zdCB1aW50OF90KiBpbmZvLCBzaXplX3QgaW5mb1NpemUsIHNpemVfdCBsZW5ndGgpOwog VmVjdG9yPHVpbnQ4X3Q+IGNhbGN1bGF0ZUhNQUNTaWduYXR1cmUoQ0NIbWFjQWxnb3JpdGhtLCBj b25zdCBWZWN0b3I8dWludDhfdD4mIGtleSwgY29uc3QgdWludDhfdCogZGF0YSwgc2l6ZV90KTsK 436314 2021-08-24 11:46:08 -0700 2021-08-25 06:50:13 -0700 Patch bug-229443-20210824114608.patch text/plain 6909 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNDU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzhkZmZiYjE2NzliYTMy NDJlOWY2ZmJhYTljNzdlY2JjNzIzNjc1OC4uZTYxNzRjODkwYjE4NDBhZjhhZWRhMjdiODM1NTRm MjBhYzkyNjRkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA4LTI0ICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIFdlYkNyeXB0 byB1c2VzIGRlcHJlY2F0ZWQgQ0NLZXlEZXJpdmF0aW9uSE1hYworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5NDQzCisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS80ODg5NjAyMT4KKworICAgICAgICBSZXZpZXdlZCBieSBCcmVudCBGdWxnaGFtLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIG5vIGJlaGF2aW9yIGNoYW5nZS4gVGhpcyBzaG91 bGQgYmUgY292ZXJlZCBieQorICAgICAgICBleGlzdGluZyB3ZWJydGMgdGVzdHMgd2hpY2ggdXNl IHRoaXMgZnVuY3Rpb25hbGl0eS4KKworICAgICAgICBSZXBsYWNlIGRlcHJlY2F0ZWQgQ0NLZXlE ZXJpdmF0aW9uSE1hYyB3aXRoIENDRGVyaXZlS2V5LgorCisgICAgICAgICogY3J5cHRvL21hYy9D cnlwdG9VdGlsaXRpZXNDb2NvYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjprZXlEZXJpdmF0aW9u SE1BQyk6CisgICAgICAgIChXZWJDb3JlOjpkZXJpdmVIREtGQml0cyk6CisgICAgICAgICogY3J5 cHRvL21hYy9DcnlwdG9VdGlsaXRpZXNDb2NvYS5oOgorCiAyMDIxLTA4LTIzICBNYXJ0aW4gUm9i aW5zb24gIDxtcm9iaW5zb25Ad2Via2l0Lm9yZz4KIAogICAgICAgICBTdGlja3kgcG9zaXRpb24g c2hvdWxkIG5vdCB1c2UgdHJhbnNmb3JtZWQgcG9zaXRpb24gdG8gY29tcHV0ZSBzdGlja3kgb2Zm c2V0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJDb3JlL1BBTC9DaGFuZ2VMb2cKaW5kZXggZjFiN2M4ZmYwODQ1ZWVkYjQzNWMxMWFlYjIxZmRj ZTg0MTkyNjUzYS4uMTYwODJhMzdkZmQ5N2ZlMWM1YTBiNGQ5NmJhM2Y3NmRjZjAxNjY2MiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29y ZS9QQUwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMDgtMjQgIEthdGUgQ2hlbmV5 ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViQ3J5cHRvIHVzZXMg ZGVwcmVjYXRlZCBDQ0tleURlcml2YXRpb25ITWFjCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjk0NDMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ4 ODk2MDIxPgorCisgICAgICAgIFJldmlld2VkIGJ5IEJyZW50IEZ1bGdoYW0uCisKKyAgICAgICAg KiBwYWwvc3BpL2NvY29hL0NvbW1vbkNyeXB0b1NQSS5oOgorCiAyMDIxLTA4LTEwICBUaW0gSG9y dG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVp bGQgZml4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvQ29t bW9uQ3J5cHRvU1BJLmggYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9Db21tb25D cnlwdG9TUEkuaAppbmRleCBjZjExMzgxOTc4YTA4NmUyNTFhM2JhYTQ4NzMxNDBhYjIyYjMxY2Ix Li5lNWRhYmUwZjBmMjFhMDI1YjY0MjkyM2UzM2I3NGI5ZWFhYTQ0Nzg5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9Db21tb25DcnlwdG9TUEkuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9Db21tb25DcnlwdG9TUEkuaApAQCAtNTks NiArNTksOSBAQCBlbnVtIHsKICAgICBjY1JTQVBTU1BhZGRpbmcgPSAxMDA1CiB9OwogdHlwZWRl ZiB1aW50MzJfdCBDQ0FzeW1tZXRyaWNQYWRkaW5nOworCit0eXBlZGVmIHN0cnVjdCBDQ0tERlBh cmFtZXRlcnMgKkNDS0RGUGFyYW1ldGVyc1JlZjsKKwogI2VuZGlmCiAKIHR5cGVkZWYgc3RydWN0 IF9DQ1JTQUNyeXB0b3IgKkNDUlNBQ3J5cHRvclJlZjsKQEAgLTExMSw2ICsxMTQsOSBAQCB0eXBl ZGVmIHVpbnQzMl90IENDS0RGQWxnb3JpdGhtOwogCiBleHRlcm4gIkMiIENDU3RhdHVzIENDS2V5 RGVyaXZhdGlvbkhNYWMoQ0NLREZBbGdvcml0aG0gYWxnb3JpdGhtLCBDQ0RpZ2VzdEFsZ29yaXRo bSBkaWdlc3QsIHVuc2lnbmVkIHJvdW5kcywgY29uc3Qgdm9pZCAqa2V5RGVyaXZhdGlvbktleSwg c2l6ZV90IGtleURlcml2YXRpb25LZXlMZW4sIGNvbnN0IHZvaWQgKmxhYmVsLCBzaXplX3QgbGFi ZWxMZW4sIGNvbnN0IHZvaWQgKmNvbnRleHQsIHNpemVfdCBjb250ZXh0TGVuLCBjb25zdCB2b2lk ICppdiwgc2l6ZV90IGl2TGVuLCBjb25zdCB2b2lkICpzYWx0LCBzaXplX3Qgc2FsdExlbiwgdm9p ZCAqZGVyaXZlZEtleSwgc2l6ZV90IGRlcml2ZWRLZXlMZW4pOwogCitleHRlcm4gIkMiIENDU3Rh dHVzIENDRGVyaXZlS2V5KGNvbnN0IENDS0RGUGFyYW1ldGVyc1JlZiBwYXJhbXMsIENDRGlnZXN0 QWxnb3JpdGhtIGRpZ2VzdCwgY29uc3Qgdm9pZCAqa2V5RGVyaXZhdGlvbktleSwgc2l6ZV90IGtl eURlcml2YXRpb25LZXlMZW4sIHZvaWQgKmRlcml2ZWRLZXksIHNpemVfdCBkZXJpdmVkS2V5TGVu KTsKK2V4dGVybiAiQyIgQ0NTdGF0dXMgQ0NLREZQYXJhbWV0ZXJzQ3JlYXRlSGtkZihDQ0tERlBh cmFtZXRlcnNSZWYgKnBhcmFtcywgY29uc3Qgdm9pZCAqc2FsdCwgc2l6ZV90IHNhbHRMZW4sIGNv bnN0IHZvaWQgKmNvbnRleHQsIHNpemVfdCBjb250ZXh0TGVuKTsKK2V4dGVybiAiQyIgdm9pZCBD Q0tERlBhcmFtZXRlcnNEZXN0cm95KENDS0RGUGFyYW1ldGVyc1JlZiBwYXJhbXMpOwogZXh0ZXJu ICJDIiBDQ0NyeXB0b3JTdGF0dXMgQ0NDcnlwdG9yR0NNKENDT3BlcmF0aW9uIG9wLCBDQ0FsZ29y aXRobSBhbGcsIGNvbnN0IHZvaWQqIGtleSwgc2l6ZV90IGtleUxlbmd0aCwgY29uc3Qgdm9pZCog aXYsIHNpemVfdCBpdkxlbiwgY29uc3Qgdm9pZCogYURhdGEsIHNpemVfdCBhRGF0YUxlbiwgY29u c3Qgdm9pZCogZGF0YUluLCBzaXplX3QgZGF0YUluTGVuZ3RoLCB2b2lkKiBkYXRhT3V0LCB2b2lk KiB0YWcsIHNpemVfdCogdGFnTGVuZ3RoKTsKIGV4dGVybiAiQyIgQ0NDcnlwdG9yU3RhdHVzIEND UlNBQ3J5cHRvckNyZWF0ZUZyb21EYXRhKENDUlNBS2V5VHlwZSBrZXlUeXBlLCBjb25zdCB1aW50 OF90ICptb2R1bHVzLCBzaXplX3QgbW9kdWx1c0xlbmd0aCwgY29uc3QgdWludDhfdCAqZXhwb25l bnQsIHNpemVfdCBleHBvbmVudExlbmd0aCwgY29uc3QgdWludDhfdCAqcCwgc2l6ZV90IHBMZW5n dGgsIGNvbnN0IHVpbnQ4X3QgKnEsIHNpemVfdCBxTGVuZ3RoLCBDQ1JTQUNyeXB0b3JSZWYgKnJl Zik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9tYWMvQ3J5cHRvVXRpbGl0 aWVzQ29jb2EuY3BwIGIvU291cmNlL1dlYkNvcmUvY3J5cHRvL21hYy9DcnlwdG9VdGlsaXRpZXND b2NvYS5jcHAKaW5kZXggNzExYTg5NmQ1NDlhMzViM2U4ZWJhMzEyODg2YTYwYzY0YzdlNDYxOC4u ODY1ZjAwYjdmZDJhYTQ0NmMxNTBiZjg5MTRmNDI2Y2U0NDdjMjcwNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvY3J5cHRvL21hYy9DcnlwdG9VdGlsaXRpZXNDb2NvYS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvY3J5cHRvL21hYy9DcnlwdG9VdGlsaXRpZXNDb2NvYS5jcHAKQEAgLTExMSwx NyArMTExLDI4IEBAIEV4Y2VwdGlvbk9yPFZlY3Rvcjx1aW50OF90Pj4gdHJhbnNmb3JtQUVTX0NU UihDQ09wZXJhdGlvbiBvcGVyYXRpb24sIGNvbnN0IFZlY3RvCiAgICAgcmV0dXJuIFdURk1vdmUo aGVhZCk7CiB9CiAKK0NDU3RhdHVzIGtleURlcml2YXRpb25ITUFDKENDRGlnZXN0QWxnb3JpdGht IGRpZ2VzdCwgY29uc3Qgdm9pZCAqa2V5RGVyaXZhdGlvbktleSwgc2l6ZV90IGtleURlcml2YXRp b25LZXlMZW4sIGNvbnN0IHZvaWQgKmNvbnRleHQsIHNpemVfdCBjb250ZXh0TGVuLCBjb25zdCB2 b2lkICpzYWx0LCBzaXplX3Qgc2FsdExlbiwgdm9pZCAqZGVyaXZlZEtleSwgc2l6ZV90IGRlcml2 ZWRLZXlMZW4pCit7CisgICAgQ0NLREZQYXJhbWV0ZXJzUmVmIHBhcmFtczsKKyAgICBDQ1N0YXR1 cyBydiA9IENDS0RGUGFyYW1ldGVyc0NyZWF0ZUhrZGYoJnBhcmFtcywgc2FsdCwgc2FsdExlbiwg Y29udGV4dCwgY29udGV4dExlbik7CisgICAgaWYgKHJ2ICE9IGtDQ1N1Y2Nlc3MpCisgICAgICAg IHJldHVybiBydjsKKworICAgIHJ2ID0gQ0NEZXJpdmVLZXkocGFyYW1zLCBkaWdlc3QsIGtleURl cml2YXRpb25LZXksIGtleURlcml2YXRpb25LZXlMZW4sIGRlcml2ZWRLZXksIGRlcml2ZWRLZXlM ZW4pOworICAgIENDS0RGUGFyYW1ldGVyc0Rlc3Ryb3kocGFyYW1zKTsKKworICAgIHJldHVybiBy djsKK30KKwogRXhjZXB0aW9uT3I8VmVjdG9yPHVpbnQ4X3Q+PiBkZXJpdmVIREtGQml0cyhDQ0Rp Z2VzdEFsZ29yaXRobSBkaWdlc3RBbGdvcml0aG0sIGNvbnN0IHVpbnQ4X3QqIGtleSwgc2l6ZV90 IGtleVNpemUsIGNvbnN0IHVpbnQ4X3QqIHNhbHQsIHNpemVfdCBzYWx0U2l6ZSwgY29uc3QgdWlu dDhfdCogaW5mbywgc2l6ZV90IGluZm9TaXplLCBzaXplX3QgbGVuZ3RoKQogewogICAgIFZlY3Rv cjx1aW50OF90PiByZXN1bHQobGVuZ3RoIC8gOCk7CiAgICAgVmVjdG9yPHVpbnQ4X3Q+IGluZm9W ZWN0b3I7CiAKLSAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgogICAgIC8v IDxyZGFyOi8vcHJvYmxlbS8zMjQzOTQ1NT4gQ3VycmVudGx5LCB3aGVuIGtleSBkYXRhIGlzIGVt cHR5LCBDQ0tleURlcml2YXRpb25ITWFjIHdpbGwgYmFpbCBvdXQuCi0gICAgLy8gPHJkYXI6Ly9w cm9ibGVtLzQ4ODk2MDIxPiBSZW1pbmRlcjogU3dpdGNoIHRvIENDRGVyaXZlS2V5IG5vdyB0aGF0 IENDS2V5RGVyaXZhdGlvbkhNYWMgaXMgZGVwcmVjYXRlZC4KLSAgICBpZiAoQ0NLZXlEZXJpdmF0 aW9uSE1hYyhrQ0NLREZBbGdvcml0aG1IS0RGLCBkaWdlc3RBbGdvcml0aG0sIDAsIGtleSwga2V5 U2l6ZSwgMCwgMCwgaW5mbywgaW5mb1NpemUsIDAsIDAsIHNhbHQsIHNhbHRTaXplLCByZXN1bHQu ZGF0YSgpLCByZXN1bHQuc2l6ZSgpKSkKKyAgICBpZiAoa2V5RGVyaXZhdGlvbkhNQUMoZGlnZXN0 QWxnb3JpdGhtLCBrZXksIGtleVNpemUsIGluZm8sIGluZm9TaXplLCBzYWx0LCBzYWx0U2l6ZSwg cmVzdWx0LmRhdGEoKSwgcmVzdWx0LnNpemUoKSkgIT0ga0NDU3VjY2VzcykKICAgICAgICAgcmV0 dXJuIEV4Y2VwdGlvbiB7IE9wZXJhdGlvbkVycm9yIH07Ci0gICAgQUxMT1dfREVQUkVDQVRFRF9E RUNMQVJBVElPTlNfRU5ECisKICAgICByZXR1cm4gV1RGTW92ZShyZXN1bHQpOwogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vbWFjL0NyeXB0b1V0aWxpdGllc0NvY29hLmgg Yi9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vbWFjL0NyeXB0b1V0aWxpdGllc0NvY29hLmgKaW5kZXgg Mjk1ZTM5NGZlMzMzZmRhYzAzNzBmOTNiYzhiYzhkMTUzMGQ2NzIwMi4uMTBmNjc3YjlkMDk5OTc0 YzYxZjA5NjJmZmJkN2I1NzE5ZTUzMzczMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3J5 cHRvL21hYy9DcnlwdG9VdGlsaXRpZXNDb2NvYS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2NyeXB0 by9tYWMvQ3J5cHRvVXRpbGl0aWVzQ29jb2EuaApAQCAtMjgsNiArMjgsNyBAQAogI2lmIEVOQUJM RShXRUJfQ1JZUFRPKSB8fCBFTkFCTEUoV0VCX1JUQykKIAogI2luY2x1ZGUgIkV4Y2VwdGlvbk9y LmgiCisjaW5jbHVkZSA8Q29tbW9uQ3J5cHRvL0NvbW1vbkNyeXB0b0Vycm9yLmg+CiAjaW5jbHVk ZSA8d3RmL1ZlY3Rvci5oPgogCiB0eXBlZGVmIHVpbnQzMl90IENDRGlnZXN0QWxnb3JpdGhtOwpA QCAtMzcsNiArMzgsNyBAQCB0eXBlZGVmIHVpbnQzMl90IENDT3BlcmF0aW9uOwogbmFtZXNwYWNl IFdlYkNvcmUgewogCiBFeGNlcHRpb25PcjxWZWN0b3I8dWludDhfdD4+IHRyYW5zZm9ybUFFU19D VFIoQ0NPcGVyYXRpb24sIGNvbnN0IFZlY3Rvcjx1aW50OF90PiYgY291bnRlciwgc2l6ZV90IGNv dW50ZXJMZW5ndGgsIGNvbnN0IFZlY3Rvcjx1aW50OF90PiYga2V5LCBjb25zdCB1aW50OF90KiBk YXRhLCBzaXplX3QgZGF0YVNpemUpOworQ0NTdGF0dXMga2V5RGVyaXZhdGlvbkhNQUMoQ0NEaWdl c3RBbGdvcml0aG0sIGNvbnN0IHZvaWQgKiwgc2l6ZV90LCBjb25zdCB2b2lkICosIHNpemVfdCwg Y29uc3Qgdm9pZCAqLCBzaXplX3QsIHZvaWQgKiwgc2l6ZV90KTsKIEV4Y2VwdGlvbk9yPFZlY3Rv cjx1aW50OF90Pj4gZGVyaXZlSERLRkJpdHMoQ0NEaWdlc3RBbGdvcml0aG0sIGNvbnN0IHVpbnQ4 X3QqIGtleSwgc2l6ZV90IGtleVNpemUsIGNvbnN0IHVpbnQ4X3QqIHNhbHQsIHNpemVfdCBzYWx0 U2l6ZSwgY29uc3QgdWludDhfdCogaW5mbywgc2l6ZV90IGluZm9TaXplLCBzaXplX3QgbGVuZ3Ro KTsKIEV4Y2VwdGlvbk9yPFZlY3Rvcjx1aW50OF90Pj4gZGVyaXZlSERLRlNIQTI1NkJpdHMoY29u c3QgdWludDhfdCoga2V5LCBzaXplX3Qga2V5U2l6ZSwgY29uc3QgdWludDhfdCogc2FsdCwgc2l6 ZV90IHNhbHRTaXplLCBjb25zdCB1aW50OF90KiBpbmZvLCBzaXplX3QgaW5mb1NpemUsIHNpemVf dCBsZW5ndGgpOwogVmVjdG9yPHVpbnQ4X3Q+IGNhbGN1bGF0ZUhNQUNTaWduYXR1cmUoQ0NIbWFj QWxnb3JpdGhtLCBjb25zdCBWZWN0b3I8dWludDhfdD4mIGtleSwgY29uc3QgdWludDhfdCogZGF0 YSwgc2l6ZV90KTsK