225336 2021-05-03 16:40:20 -0700 Inclusive terminology: Change 'master key' to 'main key' 2021-09-20 09:51:13 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED INVALID InRadar P2 Normal --- 1 bfulgham bfulgham bdakin bfulgham ews-watchlist jiewen_tan webkit-bug-importer oldest_to_newest 1756361 0 bfulgham 2021-05-03 16:40:20 -0700 In support of using more inclusive language in WebKit, we should switch the term 'Master Key' to 'Main Key'. 1756366 1 bfulgham 2021-05-03 16:44:07 -0700 <rdar://problem/70995449> 1756369 2 427618 bfulgham 2021-05-03 16:45:24 -0700 Created attachment 427618 Patch 1756387 3 427618 ap 2021-05-03 17:21:49 -0700 Comment on attachment 427618 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427618&action=review > Source/WebCore/ChangeLog:9 > + Change the text 'Master Key' to 'Main Key' in messages and labels. Will this invalidate all data encrypted with this key? What exactly will the user impact be? 1756391 4 427618 bfulgham 2021-05-03 17:31:48 -0700 Comment on attachment 427618 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427618&action=review >> Source/WebCore/ChangeLog:9 >> + Change the text 'Master Key' to 'Main Key' in messages and labels. > > Will this invalidate all data encrypted with this key? What exactly will the user impact be? I don't think this will invalidate the key data, but looking further it does seem like we would lose access to the existing keychain, so we probably need a migration step. 1795120 5 bfulgham 2021-09-20 09:50:57 -0700 After review, it was decided that this change was not needed. 427618 2021-05-03 16:45:24 -0700 2021-05-03 17:31:48 -0700 Patch bug-225336-20210503164523.patch text/plain 8591 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2ODUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzExODQwZTQzYmIzZWM0 MmJkNDIwNGJhZTI5ZjBjYTZhNDk0M2I5NC4uZDUxZmMzNDc4MTE2MmEwMTYxMGMyNjE5NTAyYTcz ZjViNGZkNzIzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA1LTAzICBCcmVu dCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIEluY2x1c2l2ZSB0ZXJt aW5vbG9neTogQ2hhbmdlICdtYXN0ZXIga2V5JyB0byAnbWFpbiBrZXknCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUzMzYKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzcwOTk1NDQ5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIENoYW5nZSB0aGUgdGV4dCAnTWFzdGVyIEtleScgdG8gJ01haW4gS2V5JyBp biBtZXNzYWdlcyBhbmQgbGFiZWxzLgorCisgICAgICAgICogY3J5cHRvL21hYy9TZXJpYWxpemVk Q3J5cHRvS2V5V3JhcE1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZUFuZFN0b3JlTWFz dGVyS2V5KToKKyAgICAgICAgKFdlYkNvcmU6OmZpbmRNYXN0ZXJLZXkpOgorICAgICAgICAoV2Vi Q29yZTo6ZGVsZXRlRGVmYXVsdFdlYkNyeXB0b01hc3RlcktleSk6CisgICAgICAgICogZW4ubHBy b2ovTG9jYWxpemFibGUuc3RyaW5nczoKKyAgICAgICAgKiBwbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJp bmdzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OndlYkNyeXB0b01hc3RlcktleUtleWNoYWluTGFi ZWwpOgorICAgICAgICAoV2ViQ29yZTo6d2ViQ3J5cHRvTWFzdGVyS2V5S2V5Y2hhaW5Db21tZW50 KToKKwogMjAyMS0wNC0zMCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAg ICAgICAgUkVHUkVTU0lPTiAoaU9TIDE0LjUpOiBQV0EncyAvIEhvbWUgU2NyZWVuIEFwcHMgd2l0 aCBTZXJ2aWNlIFdvcmtlcnMgaW50ZXJtaXR0ZW5seSBmYWlsIHRvIG9wZW4gb2ZmbGluZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3J5cHRvL21hYy9TZXJpYWxpemVkQ3J5cHRvS2V5V3Jh cE1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9tYWMvU2VyaWFsaXplZENyeXB0b0tleVdy YXBNYWMubW0KaW5kZXggM2I0OGNjZmU0ZGI3YzJlYTM0MmY1OTUzNTk2YjZlMzRkZDBmZTBlYi4u NTU3YjQ2Yzk2OGQ4N2FkOWQ2OThjNjg0YzcxYWEyN2ViZGRmMDQ1NyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvY3J5cHRvL21hYy9TZXJpYWxpemVkQ3J5cHRvS2V5V3JhcE1hYy5tbQorKysg Yi9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vbWFjL1NlcmlhbGl6ZWRDcnlwdG9LZXlXcmFwTWFjLm1t CkBAIC0xMDYsNyArMTA2LDcgQEAgc3RhdGljIGJvb2wgY3JlYXRlQW5kU3RvcmVNYXN0ZXJLZXko VmVjdG9yPHVpbnQ4X3Q+JiBtYXN0ZXJLZXlEYXRhKQogICAgIFNlY0FjY2Vzc1JlZiBhY2Nlc3NS ZWY7CiAgICAgc3RhdHVzID0gU2VjQWNjZXNzQ3JlYXRlKChfX2JyaWRnZSBDRlN0cmluZ1JlZils b2NhbGl6ZWRJdGVtTmFtZSwgbnVsbHB0ciwgJmFjY2Vzc1JlZik7CiAgICAgaWYgKHN0YXR1cykg ewotICAgICAgICBXVEZMb2dBbHdheXMoIkNhbm5vdCBjcmVhdGUgYSBzZWN1cml0eSBhY2Nlc3Mg b2JqZWN0IGZvciBzdG9yaW5nIFdlYkNyeXB0byBtYXN0ZXIga2V5LCBlcnJvciAlZCIsIChpbnQp c3RhdHVzKTsKKyAgICAgICAgV1RGTG9nQWx3YXlzKCJDYW5ub3QgY3JlYXRlIGEgc2VjdXJpdHkg YWNjZXNzIG9iamVjdCBmb3Igc3RvcmluZyBXZWJDcnlwdG8gbWFpbiBrZXksIGVycm9yICVkIiwg KGludClzdGF0dXMpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogICAgIFJldGFpblB0 cjxTZWNBY2Nlc3NSZWY+IGFjY2VzcyA9IGFkb3B0Q0YoYWNjZXNzUmVmKTsKQEAgLTExOSwxNCAr MTE5LDE0IEBAIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JFR0lOCiAgICAgc3RhdHVz ID0gU2VjVHJ1c3RlZEFwcGxpY2F0aW9uQ3JlYXRlRnJvbVBhdGgoMCwgJnRydXN0ZWRBcHBSZWYp OwogQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECiAgICAgaWYgKHN0YXR1cykgewot ICAgICAgICBXVEZMb2dBbHdheXMoIkNhbm5vdCBjcmVhdGUgYSB0cnVzdGVkIGFwcGxpY2F0aW9u IG9iamVjdCBmb3Igc3RvcmluZyBXZWJDcnlwdG8gbWFzdGVyIGtleSwgZXJyb3IgJWQiLCAoaW50 KXN0YXR1cyk7CisgICAgICAgIFdURkxvZ0Fsd2F5cygiQ2Fubm90IGNyZWF0ZSBhIHRydXN0ZWQg YXBwbGljYXRpb24gb2JqZWN0IGZvciBzdG9yaW5nIFdlYkNyeXB0byBtYWluIGtleSwgZXJyb3Ig JWQiLCAoaW50KXN0YXR1cyk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAgICAgUmV0 YWluUHRyPFNlY1RydXN0ZWRBcHBsaWNhdGlvblJlZj4gdHJ1c3RlZEFwcCA9IGFkb3B0Q0YodHJ1 c3RlZEFwcFJlZik7CiAKICAgICBzdGF0dXMgPSBTZWNBQ0xTZXRDb250ZW50cyhhY2wsIChfX2Jy aWRnZSBDRkFycmF5UmVmKUBbIChfX2JyaWRnZSBpZCl0cnVzdGVkQXBwLmdldCgpIF0sIChfX2Jy aWRnZSBDRlN0cmluZ1JlZilsb2NhbGl6ZWRJdGVtTmFtZSwga1NlY0tleWNoYWluUHJvbXB0UmVx dWlyZVBhc3NwaGFzZSk7CiAgICAgaWYgKHN0YXR1cykgewotICAgICAgICBXVEZMb2dBbHdheXMo IkNhbm5vdCBzZXQgQUNMIGZvciBXZWJDcnlwdG8gbWFzdGVyIGtleSwgZXJyb3IgJWQiLCAoaW50 KXN0YXR1cyk7CisgICAgICAgIFdURkxvZ0Fsd2F5cygiQ2Fubm90IHNldCBBQ0wgZm9yIFdlYkNy eXB0byBtYWluIGtleSwgZXJyb3IgJWQiLCAoaW50KXN0YXR1cyk7CiAgICAgICAgIHJldHVybiBm YWxzZTsKICAgICB9CiAjZW5kaWYKQEAgLTE0OSw3ICsxNDksNyBAQCBBTExPV19ERVBSRUNBVEVE X0RFQ0xBUkFUSU9OU19FTkQKIAogICAgIHN0YXR1cyA9IFNlY0l0ZW1BZGQoKENGRGljdGlvbmFy eVJlZilhdHRyaWJ1dGVzLCBudWxscHRyKTsKICAgICBpZiAoc3RhdHVzKSB7Ci0gICAgICAgIFdU RkxvZ0Fsd2F5cygiQ2Fubm90IHN0b3JlIFdlYkNyeXB0byBtYXN0ZXIga2V5LCBlcnJvciAlZCIs IChpbnQpc3RhdHVzKTsKKyAgICAgICAgV1RGTG9nQWx3YXlzKCJDYW5ub3Qgc3RvcmUgV2ViQ3J5 cHRvIG1haW4ga2V5LCBlcnJvciAlZCIsIChpbnQpc3RhdHVzKTsKICAgICAgICAgcmV0dXJuIGZh bHNlOwogICAgIH0KICAgICByZXR1cm4gdHJ1ZTsKQEAgLTE2OSw3ICsxNjksNyBAQCBzdGF0aWMg Ym9vbCBmaW5kTWFzdGVyS2V5KFZlY3Rvcjx1aW50OF90PiYgbWFzdGVyS2V5RGF0YSkKICAgICBP U1N0YXR1cyBzdGF0dXMgPSBTZWNJdGVtQ29weU1hdGNoaW5nKChDRkRpY3Rpb25hcnlSZWYpcXVl cnksIChDRlR5cGVSZWYqKSZrZXlEYXRhUmVmKTsKICAgICBpZiAoc3RhdHVzKSB7CiAgICAgICAg IGlmIChzdGF0dXMgIT0gZXJyU2VjSXRlbU5vdEZvdW5kICYmIHN0YXR1cyAhPSBlcnJTZWNVc2Vy Q2FuY2VsZWQpCi0gICAgICAgICAgICBXVEZMb2dBbHdheXMoIkNvdWxkIG5vdCBmaW5kIFdlYkNy eXB0byBtYXN0ZXIga2V5IGluIEtleWNoYWluLCBlcnJvciAlZCIsIChpbnQpc3RhdHVzKTsKKyAg ICAgICAgICAgIFdURkxvZ0Fsd2F5cygiQ291bGQgbm90IGZpbmQgV2ViQ3J5cHRvIG1haW4ga2V5 IGluIEtleWNoYWluLCBlcnJvciAlZCIsIChpbnQpc3RhdHVzKTsKICAgICAgICAgcmV0dXJuIGZh bHNlOwogICAgIH0KICAgICBSZXRhaW5QdHI8Q0ZEYXRhUmVmPiBrZXlEYXRhID0gYWRvcHRDRihr ZXlEYXRhUmVmKTsKQEAgLTE5OCw3ICsxOTgsNyBAQCBib29sIGRlbGV0ZURlZmF1bHRXZWJDcnlw dG9NYXN0ZXJLZXkoKQogICAgIE9TU3RhdHVzIHN0YXR1cyA9IFNlY0l0ZW1EZWxldGUoKENGRGlj dGlvbmFyeVJlZilxdWVyeSk7CiAgICAgaWYgKHN0YXR1cykgewogICAgICAgICBpZiAoc3RhdHVz ICE9IGVyclNlY0l0ZW1Ob3RGb3VuZCAmJiBzdGF0dXMgIT0gZXJyU2VjVXNlckNhbmNlbGVkKQot ICAgICAgICAgICAgV1RGTG9nQWx3YXlzKCJDb3VsZCBub3QgZGVsZXRlIFdlYkNyeXB0byBtYXN0 ZXIga2V5IGluIEtleWNoYWluLCBlcnJvciAlZCIsIChpbnQpc3RhdHVzKTsKKyAgICAgICAgICAg IFdURkxvZ0Fsd2F5cygiQ291bGQgbm90IGRlbGV0ZSBXZWJDcnlwdG8gbWFpbiBrZXkgaW4gS2V5 Y2hhaW4sIGVycm9yICVkIiwgKGludClzdGF0dXMpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgfQogICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZW4ubHBy b2ovTG9jYWxpemFibGUuc3RyaW5ncyBiL1NvdXJjZS9XZWJDb3JlL2VuLmxwcm9qL0xvY2FsaXph YmxlLnN0cmluZ3MKaW5kZXggOWFlNDEzNzE1Mjg4YTYyOTk5ZjVkYzRjM2U2NmYxNWMyZWRjNWQx My4uNzZjOWU1MmYwZjNhYTA4MjJhMGZiYzQzNTgzNWY0MDc2Y2MwYTA4MyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5ncworKysgYi9Tb3VyY2Uv V2ViQ29yZS9lbi5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzCkBAIC02MSw4ICs2MSw4IEBACiAv KiBWaXNpYmxlIG5hbWUgb2YgV2ViIEluc3BlY3RvcidzIHdlYiBwcm9jZXNzLiBUaGUgYXJndW1l bnQgaXMgdGhlIGFwcGxpY2F0aW9uIG5hbWUuICovCiAiJUAgV2ViIEluc3BlY3RvciIgPSAiJUAg V2ViIEluc3BlY3RvciI7CiAKLS8qIE5hbWUgb2YgYXBwbGljYXRpb24ncyBzaW5nbGUgV2ViQ3J5 cHRvIG1hc3RlciBrZXkgaW4gS2V5Y2hhaW4gKi8KLSIlQCBXZWJDcnlwdG8gTWFzdGVyIEtleSIg PSAiJUAgV2ViQ3J5cHRvIE1hc3RlciBLZXkiOworLyogTmFtZSBvZiBhcHBsaWNhdGlvbidzIHNp bmdsZSBXZWJDcnlwdG8gbWFpbiBrZXkgaW4gS2V5Y2hhaW4gKi8KKyIlQCBXZWJDcnlwdG8gTWFp biBLZXkiID0gIiVAIFdlYkNyeXB0byBNYWluIEtleSI7CiAKIC8qIExhYmVsIHRvIGRlc2NyaWJl IHRoZSBudW1iZXIgb2YgZmlsZXMgc2VsZWN0ZWQgaW4gYSBmaWxlIHVwbG9hZCBjb250cm9sIHRo YXQgYWxsb3dzIG11bHRpcGxlIGZpbGVzICovCiAiJWQgZmlsZXMiID0gIiVkIGZpbGVzIjsKQEAg LTc2LDggKzc2LDggQEAKIC8qIHdpbmRvdyB0aXRsZSBmb3IgYSBzdGFuZGFsb25lIGltYWdlICh1 c2VzIG11bHRpcGxpY2F0aW9uIHN5bWJvbCwgbm90IHgpICovCiAiJXMgJWTDlyVkIHBpeGVscyIg PSAiJXMgJWTDlyVkIHBpeGVscyI7CiAKLS8qIE5hbWUgb2YgYXBwbGljYXRpb24ncyBzaW5nbGUg V2ViQ3J5cHRvIG1hc3RlciBrZXkgaW4gS2V5Y2hhaW4gKi8KLSIlcyBXZWJDcnlwdG8gTWFzdGVy IEtleSIgPSAiJXMgV2ViQ3J5cHRvIE1hc3RlciBLZXkiOworLyogTmFtZSBvZiBhcHBsaWNhdGlv bidzIHNpbmdsZSBXZWJDcnlwdG8gbWFpbiBrZXkgaW4gS2V5Y2hhaW4gKi8KKyIlcyBXZWJDcnlw dG8gTWFpbiBLZXkiID0gIiVzIFdlYkNyeXB0byBNYWluIEtleSI7CiAKIC8qIFByZXNlbnQgdGhl IG51bWJlciBvZiBzZWxlY3RlZCA8b3B0aW9uPiBpdGVtcyBpbiBhIDxzZWxlY3QgbXVsdGlwbGU+ IGVsZW1lbnQgKGlPUyBvbmx5KSAqLwogIiV6dSBJdGVtcyIgPSAiJXp1IEl0ZW1zIjsKQEAgLTk1 LDcgKzk1LDcgQEAKICIyMDQ4IChIaWdoIEdyYWRlKSIgPSAiMjA0OCAoSGlnaCBHcmFkZSkiOwog CiAvKiBOYW1lIG9mIGFwcGxpY2F0aW9uJ3Mgc2luZ2xlIFdlYkNyeXB0byBtYXN0ZXIga2V5IGlu IEtleWNoYWluICovCi0iPGFwcGxpY2F0aW9uPiBXZWJDcnlwdG8gTWFzdGVyIEtleSIgPSAiPGFw cGxpY2F0aW9uPiBXZWJDcnlwdG8gTWFzdGVyIEtleSI7CisiPGFwcGxpY2F0aW9uPiBXZWJDcnlw dG8gTWFpbiBLZXkiID0gIjxhcHBsaWNhdGlvbj4gV2ViQ3J5cHRvIE1haW4gS2V5IjsKIAogLyog d2luZG93IHRpdGxlIGZvciBhIHN0YW5kYWxvbmUgaW1hZ2UgKHVzZXMgbXVsdGlwbGljYXRpb24g c3ltYm9sLCBub3QgeCkgKi8KICI8ZmlsZW5hbWU+ICVkw5clZCBwaXhlbHMiID0gIjxmaWxlbmFt ZT4gJWTDlyVkIHBpeGVscyI7CkBAIC0xMDMzLDcgKzEwMzMsNyBAQAogLyogVmFsaWRhdGlvbiBt ZXNzYWdlIGZvciBmb3JtIGNvbnRyb2wgZWxlbWVudHMgd2l0aCBhIHZhbHVlIHNob3J0ZXIgdGhh biBtYXhpbXVtIGFsbG93ZWQgbGVuZ3RoICovCiAiVXNlIG5vIG1vcmUgdGhhbiAlZCBjaGFyYWN0 ZXJzIiA9ICJVc2Ugbm8gbW9yZSB0aGFuICVkIGNoYXJhY3RlcnMiOwogCi0vKiBEZXNjcmlwdGlv biBvZiBXZWJDcnlwdG8gbWFzdGVyIGtleXMgaW4gS2V5Y2hhaW4gKi8KKy8qIERlc2NyaXB0aW9u IG9mIFdlYkNyeXB0byBtYWluIGtleXMgaW4gS2V5Y2hhaW4gKi8KICJVc2VkIHRvIGVuY3J5cHQg V2ViQ3J5cHRvIGtleXMgaW4gcGVyc2lzdGVudCBzdG9yYWdlLCBzdWNoIGFzIEluZGV4ZWREQiIg PSAiVXNlZCB0byBlbmNyeXB0IFdlYkNyeXB0byBrZXlzIGluIHBlcnNpc3RlbnQgc3RvcmFnZSwg c3VjaCBhcyBJbmRleGVkREIiOwogCiAvKiBUaGUgZG93bmxvYWQgd2FzIGNhbmNlbGxlZCBieSB0 aGUgdXNlciAqLwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9jYWxpemVk U3RyaW5ncy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmNw cAppbmRleCBjYzM1NTNmZmI5NzNmOTI4MGY3YjU3ZDQ0ZThmNDVhM2FjYmE1OGQ2Li5jYzAwMTUy Nzk5M2VlNDU0OWNlYmU0MjIzNGVhYjc0ZDEwODM4N2MxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmNwcApAQCAtMTE2NywxNyArMTE2NywxNyBAQCBTdHJp bmcgdXNlQmxvY2tlZFBsdWdJbkNvbnRleHRNZW51VGl0bGUoKQogU3RyaW5nIHdlYkNyeXB0b01h c3RlcktleUtleWNoYWluTGFiZWwoY29uc3QgU3RyaW5nJiBsb2NhbGl6ZWRBcHBsaWNhdGlvbk5h bWUpCiB7CiAjaWYgVVNFKENGKQotICAgIHJldHVybiBmb3JtYXRMb2NhbGl6ZWRTdHJpbmcoV0VC X1VJX0NGU1RSSU5HKCIlQCBXZWJDcnlwdG8gTWFzdGVyIEtleSIsICJOYW1lIG9mIGFwcGxpY2F0 aW9uJ3Mgc2luZ2xlIFdlYkNyeXB0byBtYXN0ZXIga2V5IGluIEtleWNoYWluIiksIGxvY2FsaXpl ZEFwcGxpY2F0aW9uTmFtZS5jcmVhdGVDRlN0cmluZygpLmdldCgpKTsKKyAgICByZXR1cm4gZm9y bWF0TG9jYWxpemVkU3RyaW5nKFdFQl9VSV9DRlNUUklORygiJUAgV2ViQ3J5cHRvIE1haW4gS2V5 IiwgIk5hbWUgb2YgYXBwbGljYXRpb24ncyBzaW5nbGUgV2ViQ3J5cHRvIG1haW4ga2V5IGluIEtl eWNoYWluIiksIGxvY2FsaXplZEFwcGxpY2F0aW9uTmFtZS5jcmVhdGVDRlN0cmluZygpLmdldCgp KTsKICNlbGlmIFVTRShHTElCKQotICAgIHJldHVybiBmb3JtYXRMb2NhbGl6ZWRTdHJpbmcoV0VC X1VJX1NUUklORygiJXMgV2ViQ3J5cHRvIE1hc3RlciBLZXkiLCAiTmFtZSBvZiBhcHBsaWNhdGlv bidzIHNpbmdsZSBXZWJDcnlwdG8gbWFzdGVyIGtleSBpbiBLZXljaGFpbiIpLCBsb2NhbGl6ZWRB cHBsaWNhdGlvbk5hbWUudXRmOCgpLmRhdGEoKSk7CisgICAgcmV0dXJuIGZvcm1hdExvY2FsaXpl ZFN0cmluZyhXRUJfVUlfU1RSSU5HKCIlcyBXZWJDcnlwdG8gTWFpbiBLZXkiLCAiTmFtZSBvZiBh cHBsaWNhdGlvbidzIHNpbmdsZSBXZWJDcnlwdG8gbWFpbiBrZXkgaW4gS2V5Y2hhaW4iKSwgbG9j YWxpemVkQXBwbGljYXRpb25OYW1lLnV0ZjgoKS5kYXRhKCkpOwogI2Vsc2UKLSAgICByZXR1cm4g V0VCX1VJX1NUUklORygiPGFwcGxpY2F0aW9uPiBXZWJDcnlwdG8gTWFzdGVyIEtleSIsICJOYW1l IG9mIGFwcGxpY2F0aW9uJ3Mgc2luZ2xlIFdlYkNyeXB0byBtYXN0ZXIga2V5IGluIEtleWNoYWlu IikucmVwbGFjZSgiPGFwcGxpY2F0aW9uPiIsIGxvY2FsaXplZEFwcGxpY2F0aW9uTmFtZSk7Cisg ICAgcmV0dXJuIFdFQl9VSV9TVFJJTkcoIjxhcHBsaWNhdGlvbj4gV2ViQ3J5cHRvIE1haW4gS2V5 IiwgIk5hbWUgb2YgYXBwbGljYXRpb24ncyBzaW5nbGUgV2ViQ3J5cHRvIG1haW4ga2V5IGluIEtl eWNoYWluIikucmVwbGFjZSgiPGFwcGxpY2F0aW9uPiIsIGxvY2FsaXplZEFwcGxpY2F0aW9uTmFt ZSk7CiAjZW5kaWYKIH0KIAogU3RyaW5nIHdlYkNyeXB0b01hc3RlcktleUtleWNoYWluQ29tbWVu dCgpCiB7Ci0gICAgcmV0dXJuIFdFQl9VSV9TVFJJTkcoIlVzZWQgdG8gZW5jcnlwdCBXZWJDcnlw dG8ga2V5cyBpbiBwZXJzaXN0ZW50IHN0b3JhZ2UsIHN1Y2ggYXMgSW5kZXhlZERCIiwgIkRlc2Ny aXB0aW9uIG9mIFdlYkNyeXB0byBtYXN0ZXIga2V5cyBpbiBLZXljaGFpbiIpOworICAgIHJldHVy biBXRUJfVUlfU1RSSU5HKCJVc2VkIHRvIGVuY3J5cHQgV2ViQ3J5cHRvIGtleXMgaW4gcGVyc2lz dGVudCBzdG9yYWdlLCBzdWNoIGFzIEluZGV4ZWREQiIsICJEZXNjcmlwdGlvbiBvZiBXZWJDcnlw dG8gbWFpbiBrZXlzIGluIEtleWNoYWluIik7CiB9CiAKICNlbmRpZgo=