175162 2017-08-03 15:44:13 -0700 [EME][Mac] SecureStop left on disk in Private Browsing mode. 2017-08-03 18:13:12 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson webkit-bug-importer oldest_to_newest 1334990 0 jer.noble 2017-08-03 15:44:13 -0700 [EME][Mac] SecureStop left on disk in Private Browsing mode. 1334991 1 317169 jer.noble 2017-08-03 15:47:33 -0700 Created attachment 317169 Patch 1335010 2 jer.noble 2017-08-03 16:15:32 -0700 <rdar://problem/33663231> 1335012 3 317169 eric.carlson 2017-08-03 16:18:52 -0700 Comment on attachment 317169 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=317169&action=review > Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm:108 > + return pathByAppendingComponent(m_client->mediaKeysStorageDirectory(), "SecureStop.plist"); Nit: you can use “storageDirectory” here 1335046 4 317185 jer.noble 2017-08-03 17:32:42 -0700 Created attachment 317185 Patch for landing 1335066 5 317185 commit-queue 2017-08-03 18:13:10 -0700 Comment on attachment 317185 Patch for landing Clearing flags on attachment: 317185 Committed r220247: <http://trac.webkit.org/changeset/220247> 1335067 6 commit-queue 2017-08-03 18:13:12 -0700 All reviewed patches have been landed. Closing bug. 317169 2017-08-03 15:47:33 -0700 2017-08-03 17:32:40 -0700 Patch bug-175162-20170803154733.patch text/plain 10078 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwMTUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTFhOTZjOTYzZWIzN2Ri MDczOWI3MDFkMjVjYjIzZjlkMDFjODY0MC4uNDQxYjhjODBhNzU2YWU0ZGU0ZDdjNmYwNDdlNDc2 YjZlNjFkMTIzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE3LTA4LTAzICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtFTUVdW01hY10gU2VjdXJl U3RvcCBsZWZ0IG9uIGRpc2sgaW4gUHJpdmF0ZSBCcm93c2luZyBtb2RlLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc1MTYyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmV0dXJuIGFuIGVtcHR5IHN0cmlu ZyBmcm9tIG1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoKSB3aGVuIHRoZSBwYWdlIGluZGljYXRl cyB0aGF0IHN0b3JhZ2Ugc2hvdWxkCisgICAgICAgIGJlIGVwaGVtZXJhbCgpLiBQcmV2aW91c2x5 LCBhbiBlbXB0eSBzdHJpbmcgaW4gdGhpcyBjYXNlIHdvdWxkIGJlIHRyZWF0ZWQgYXMgYW4gZXJy b3IuIEluc3RlYWQsIHRyZWF0CisgICAgICAgIGFuIGVtcHR5IHN0cmluZyBhcyB2YWxpZCwgYW5k IGRvIG5vdCB0cnkgdG8gc3RvcmUgb3IgcmV0cmlldmUgc2Vzc2lvbiBpbmZvcm1hdGlvbiB0byBk aXNrIGluIHRoYXQgY2FzZS4KKworICAgICAgICAqIE1vZHVsZXMvZW5jcnlwdGVkbWVkaWEvbGVn YWN5L1dlYktpdE1lZGlhS2V5U2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJLaXRN ZWRpYUtleVNlc3Npb246Om1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkgY29uc3QpOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETVNlc3Npb25BVkNvbnRl bnRLZXlTZXNzaW9uLm1tOgorICAgICAgICAoV2ViQ29yZTo6Q0RNU2Vzc2lvbkFWQ29udGVudEtl eVNlc3Npb246OnJlbGVhc2VLZXlzKToKKyAgICAgICAgKFdlYkNvcmU6OkNETVNlc3Npb25BVkNv bnRlbnRLZXlTZXNzaW9uOjp1cGRhdGUpOgorICAgICAgICAoV2ViQ29yZTo6Q0RNU2Vzc2lvbkFW Q29udGVudEtleVNlc3Npb246OmdlbmVyYXRlS2V5UmVsZWFzZU1lc3NhZ2UpOgorICAgICAgICAo V2ViQ29yZTo6Q0RNU2Vzc2lvbkFWQ29udGVudEtleVNlc3Npb246OmNvbnRlbnRLZXlTZXNzaW9u KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1TZXNz aW9uTWVkaWFTb3VyY2VBVkZPYmpDLm1tOgorICAgICAgICAoV2ViQ29yZTo6Q0RNU2Vzc2lvbk1l ZGlhU291cmNlQVZGT2JqQzo6c3RvcmFnZVBhdGggY29uc3QpOgorCiAyMDE3LTA4LTAyICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFtNU0VdIFJlbW92aW5nIHNh bXBsZXMgd2hlbiBwcmVzZW50YXRpb24gb3JkZXIgZG9lcyBub3QgbWF0Y2ggZGVjb2RlIG9yZGVy IGNhbiBjYXVzZSBiYWQgYmVoYXZpb3IuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2VuY3J5cHRlZG1lZGlhL2xlZ2FjeS9XZWJLaXRNZWRpYUtleVNlc3Npb24uY3BwIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9sZWdhY3kvV2ViS2l0TWVkaWFLZXlT ZXNzaW9uLmNwcAppbmRleCAyODUxNTA2NTA3NDNkZGQ3MWUyYTdmNWMxZGI0YjJhNDcxM2JiNGMy Li42YWViYjFmZDQwNGUwMzAwMDU1YjBmMDQ2YzUwMzNkZmNjMGMwNzBmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL2xlZ2FjeS9XZWJLaXRNZWRpYUtl eVNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEv bGVnYWN5L1dlYktpdE1lZGlhS2V5U2Vzc2lvbi5jcHAKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNs dWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIkV2ZW50TmFtZXMuaCIKICNpbmNsdWRlICJGaWxl U3lzdGVtLmgiCisjaW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2luRGF0 YS5oIgogI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAjaW5jbHVkZSAiV2ViS2l0TWVkaWFLZXlFcnJv ci5oIgpAQCAtMjIyLDYgKzIyMywxMCBAQCBTdHJpbmcgV2ViS2l0TWVkaWFLZXlTZXNzaW9uOjpt ZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KCkgY29uc3QKICAgICBpZiAoIWRvY3VtZW50KQogICAg ICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKIAorICAgIGF1dG8qIHBhZ2UgPSBkb2N1bWVudC0+ cGFnZSgpOworICAgIGlmICghcGFnZSB8fCBwYWdlLT51c2VzRXBoZW1lcmFsU2Vzc2lvbigpKQor ICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKKwogICAgIGF1dG8gc3RvcmFnZURpcmVjdG9y eSA9IGRvY3VtZW50LT5zZXR0aW5ncygpLm1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoKTsKICAg ICBpZiAoc3RvcmFnZURpcmVjdG9yeS5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBlbXB0eVN0 cmluZygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvQ0RNU2Vzc2lvbkFWQ29udGVudEtleVNlc3Npb24ubW0gYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1TZXNzaW9uQVZD b250ZW50S2V5U2Vzc2lvbi5tbQppbmRleCAwMWQ2OGY5ZjdjODIwZDEzMDA2M2QyOGRiNGVkZWU2 YjRlYTAxNTlkLi5iZmQwNGExZjhmNGNmZGM5OGYzYmQ2NjM3YTVjMWNhNjY3M2M3NWM1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq Yy9DRE1TZXNzaW9uQVZDb250ZW50S2V5U2Vzc2lvbi5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1TZXNzaW9uQVZDb250ZW50S2V5 U2Vzc2lvbi5tbQpAQCAtNDUsOCArNDUsMTIgQEAgU09GVF9MSU5LX0ZSQU1FV09SS19PUFRJT05B TChBVkZvdW5kYXRpb24pCiBTT0ZUX0xJTktfQ0xBU1MoQVZGb3VuZGF0aW9uLCBBVlN0cmVhbURh dGFQYXJzZXIpOwogU09GVF9MSU5LX0NMQVNTX09QVElPTkFMKEFWRm91bmRhdGlvbiwgQVZDb250 ZW50S2V5U2Vzc2lvbik7CiBTT0ZUX0xJTktfQ09OU1RBTlRfTUFZX0ZBSUwoQVZGb3VuZGF0aW9u LCBBVkNvbnRlbnRLZXlSZXF1ZXN0UHJvdG9jb2xWZXJzaW9uc0tleSwgTlNTdHJpbmcgKikKK1NP RlRfTElOS19DT05TVEFOVF9NQVlfRkFJTChBVkZvdW5kYXRpb24sIEFWQ29udGVudEtleVN5c3Rl bUZhaXJQbGF5U3RyZWFtaW5nLCBOU1N0cmluZyAqKQorCit0eXBlZGVmIE5TU3RyaW5nICpBVkNv bnRlbnRLZXlTeXN0ZW07CiAKIEBpbnRlcmZhY2UgQVZDb250ZW50S2V5U2Vzc2lvbiA6IE5TT2Jq ZWN0CisrIChpbnN0YW5jZXR5cGUpY29udGVudEtleVNlc3Npb25XaXRoS2V5U3lzdGVtOihBVkNv bnRlbnRLZXlTeXN0ZW0pa2V5U3lzdGVtOwogLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoU3RvcmFn ZURpcmVjdG9yeUF0VVJMOihOU1VSTCAqKXN0b3JhZ2VVUkw7CiBAcHJvcGVydHkgKGFzc2lnbikg aWQgZGVsZWdhdGU7CiAtICh2b2lkKWFkZFN0cmVhbURhdGFQYXJzZXI6KEFWU3RyZWFtRGF0YVBh cnNlciAqKXN0cmVhbURhdGFQYXJzZXI7CkBAIC0xOTEsOCArMTk1LDEyIEBAIHZvaWQgQ0RNU2Vz c2lvbkFWQ29udGVudEtleVNlc3Npb246OnJlbGVhc2VLZXlzKCkKICAgICAgICAgaWYgKCFbZ2V0 QVZDb250ZW50S2V5U2Vzc2lvbkNsYXNzKCkgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihw ZW5kaW5nRXhwaXJlZFNlc3Npb25SZXBvcnRzV2l0aEFwcElkZW50aWZpZXI6c3RvcmFnZURpcmVj dG9yeUF0VVJMOildKQogICAgICAgICAgICAgcmV0dXJuOwogCisgICAgICAgIGF1dG8gc3RvcmFn ZVBhdGggPSB0aGlzLT5zdG9yYWdlUGF0aCgpOworICAgICAgICBpZiAoc3RvcmFnZVBhdGguaXNF bXB0eSgpKQorICAgICAgICAgICAgcmV0dXJuOworCiAgICAgICAgIFJldGFpblB0cjxOU0RhdGE+ IGNlcnRpZmljYXRlRGF0YSA9IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQnl0ZXM6 bV9jZXJ0aWZpY2F0ZS0+ZGF0YSgpIGxlbmd0aDptX2NlcnRpZmljYXRlLT5sZW5ndGgoKV0pOwot ICAgICAgICBOU0FycmF5KiBleHBpcmVkU2Vzc2lvbnMgPSBbZ2V0QVZDb250ZW50S2V5U2Vzc2lv bkNsYXNzKCkgcGVuZGluZ0V4cGlyZWRTZXNzaW9uUmVwb3J0c1dpdGhBcHBJZGVudGlmaWVyOmNl cnRpZmljYXRlRGF0YS5nZXQoKSBzdG9yYWdlRGlyZWN0b3J5QXRVUkw6W05TVVJMIGZpbGVVUkxX aXRoUGF0aDpzdG9yYWdlUGF0aCgpXV07CisgICAgICAgIE5TQXJyYXkqIGV4cGlyZWRTZXNzaW9u cyA9IFtnZXRBVkNvbnRlbnRLZXlTZXNzaW9uQ2xhc3MoKSBwZW5kaW5nRXhwaXJlZFNlc3Npb25S ZXBvcnRzV2l0aEFwcElkZW50aWZpZXI6Y2VydGlmaWNhdGVEYXRhLmdldCgpIHN0b3JhZ2VEaXJl Y3RvcnlBdFVSTDpbTlNVUkwgZmlsZVVSTFdpdGhQYXRoOnN0b3JhZ2VQYXRoXV07CiAgICAgICAg IGZvciAoTlNEYXRhKiBleHBpcmVkU2Vzc2lvbkRhdGEgaW4gZXhwaXJlZFNlc3Npb25zKSB7CiAg ICAgICAgICAgICBOU0RpY3Rpb25hcnkgKmV4cGlyZWRTZXNzaW9uID0gW05TUHJvcGVydHlMaXN0 U2VyaWFsaXphdGlvbiBwcm9wZXJ0eUxpc3RXaXRoRGF0YTpleHBpcmVkU2Vzc2lvbkRhdGEgb3B0 aW9uczprQ0ZQcm9wZXJ0eUxpc3RJbW11dGFibGUgZm9ybWF0Om51bGxwdHIgZXJyb3I6bnVsbHB0 cl07CiAgICAgICAgICAgICBOU1N0cmluZyAqcGxheWJhY2tTZXNzaW9uSWRWYWx1ZSA9IChOU1N0 cmluZyAqKVtleHBpcmVkU2Vzc2lvbiBvYmplY3RGb3JLZXk6UGxheWJhY2tTZXNzaW9uSWRLZXld OwpAQCAtMjM5LDcgKzI0Nyw4IEBAIGJvb2wgQ0RNU2Vzc2lvbkFWQ29udGVudEtleVNlc3Npb246 OnVwZGF0ZShVaW50OEFycmF5KiBrZXksIFJlZlB0cjxVaW50OEFycmF5PiYKICAgICBpZiAoaXNF cXVhbChrZXksICJhY2tub3dsZWRnZWQiKSkgewogICAgICAgICBMT0coTWVkaWEsICJDRE1TZXNz aW9uQVZDb250ZW50S2V5U2Vzc2lvbjo6dXBkYXRlKCVwKSAtIGFja25vd2xlZGluZyBzZWN1cmUg c3RvcCBtZXNzYWdlIiwgdGhpcyk7CiAKLSAgICAgICAgaWYgKCFtX2V4cGlyZWRTZXNzaW9uKSB7 CisgICAgICAgIFN0cmluZyBzdG9yYWdlUGF0aCA9IHRoaXMtPnN0b3JhZ2VQYXRoKCk7CisgICAg ICAgIGlmICghbV9leHBpcmVkU2Vzc2lvbiB8fCBzdG9yYWdlUGF0aC5pc0VtcHR5KCkpIHsKICAg ICAgICAgICAgIGVycm9yQ29kZSA9IE1lZGlhUGxheWVyOjpJbnZhbGlkUGxheWVyU3RhdGU7CiAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KQEAgLTI0Nyw3ICsyNTYsNyBAQCBi b29sIENETVNlc3Npb25BVkNvbnRlbnRLZXlTZXNzaW9uOjp1cGRhdGUoVWludDhBcnJheSoga2V5 LCBSZWZQdHI8VWludDhBcnJheT4mCiAgICAgICAgIFJldGFpblB0cjxOU0RhdGE+IGNlcnRpZmlj YXRlRGF0YSA9IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQnl0ZXM6bV9jZXJ0aWZp Y2F0ZS0+ZGF0YSgpIGxlbmd0aDptX2NlcnRpZmljYXRlLT5sZW5ndGgoKV0pOwogCiAgICAgICAg IGlmIChbZ2V0QVZDb250ZW50S2V5U2Vzc2lvbkNsYXNzKCkgcmVzcG9uZHNUb1NlbGVjdG9yOkBz ZWxlY3RvcihyZW1vdmVQZW5kaW5nRXhwaXJlZFNlc3Npb25SZXBvcnRzOndpdGhBcHBJZGVudGlm aWVyOnN0b3JhZ2VEaXJlY3RvcnlBdFVSTDopXSkKLSAgICAgICAgICAgIFtnZXRBVkNvbnRlbnRL ZXlTZXNzaW9uQ2xhc3MoKSByZW1vdmVQZW5kaW5nRXhwaXJlZFNlc3Npb25SZXBvcnRzOkBbbV9l eHBpcmVkU2Vzc2lvbi5nZXQoKV0gd2l0aEFwcElkZW50aWZpZXI6Y2VydGlmaWNhdGVEYXRhLmdl dCgpIHN0b3JhZ2VEaXJlY3RvcnlBdFVSTDpbTlNVUkwgZmlsZVVSTFdpdGhQYXRoOnN0b3JhZ2VQ YXRoKCldXTsKKyAgICAgICAgICAgIFtnZXRBVkNvbnRlbnRLZXlTZXNzaW9uQ2xhc3MoKSByZW1v dmVQZW5kaW5nRXhwaXJlZFNlc3Npb25SZXBvcnRzOkBbbV9leHBpcmVkU2Vzc2lvbi5nZXQoKV0g d2l0aEFwcElkZW50aWZpZXI6Y2VydGlmaWNhdGVEYXRhLmdldCgpIHN0b3JhZ2VEaXJlY3RvcnlB dFVSTDpbTlNVUkwgZmlsZVVSTFdpdGhQYXRoOnN0b3JhZ2VQYXRoXV07CiAgICAgICAgIG1fZXhw aXJlZFNlc3Npb24gPSBudWxscHRyOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CkBAIC0z MTUsMTMgKzMyNCwxNCBAQCBSZWZQdHI8VWludDhBcnJheT4gQ0RNU2Vzc2lvbkFWQ29udGVudEtl eVNlc3Npb246OmdlbmVyYXRlS2V5UmVsZWFzZU1lc3NhZ2UodW5zaQogICAgIG1fY2VydGlmaWNh dGUgPSBtX2luaXREYXRhOwogICAgIFJldGFpblB0cjxOU0RhdGE+IGNlcnRpZmljYXRlRGF0YSA9 IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQnl0ZXM6bV9jZXJ0aWZpY2F0ZS0+ZGF0 YSgpIGxlbmd0aDptX2NlcnRpZmljYXRlLT5sZW5ndGgoKV0pOwogCi0gICAgaWYgKCFbZ2V0QVZD b250ZW50S2V5U2Vzc2lvbkNsYXNzKCkgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihwZW5k aW5nRXhwaXJlZFNlc3Npb25SZXBvcnRzV2l0aEFwcElkZW50aWZpZXI6c3RvcmFnZURpcmVjdG9y eUF0VVJMOildKSB7CisgICAgU3RyaW5nIHN0b3JhZ2VQYXRoID0gdGhpcy0+c3RvcmFnZVBhdGgo KTsKKyAgICBpZiAoc3RvcmFnZVBhdGguaXNFbXB0eSgpIHx8ICFbZ2V0QVZDb250ZW50S2V5U2Vz c2lvbkNsYXNzKCkgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihwZW5kaW5nRXhwaXJlZFNl c3Npb25SZXBvcnRzV2l0aEFwcElkZW50aWZpZXI6c3RvcmFnZURpcmVjdG9yeUF0VVJMOildKSB7 CiAgICAgICAgIGVycm9yQ29kZSA9IE1lZGlhUGxheWVyOjpLZXlTeXN0ZW1Ob3RTdXBwb3J0ZWQ7 CiAgICAgICAgIHN5c3RlbUNvZGUgPSAnIW1vcic7CiAgICAgICAgIHJldHVybiBudWxscHRyOwog ICAgIH0KIAotICAgIE5TQXJyYXkqIGV4cGlyZWRTZXNzaW9ucyA9IFtnZXRBVkNvbnRlbnRLZXlT ZXNzaW9uQ2xhc3MoKSBwZW5kaW5nRXhwaXJlZFNlc3Npb25SZXBvcnRzV2l0aEFwcElkZW50aWZp ZXI6Y2VydGlmaWNhdGVEYXRhLmdldCgpIHN0b3JhZ2VEaXJlY3RvcnlBdFVSTDpbTlNVUkwgZmls ZVVSTFdpdGhQYXRoOnN0b3JhZ2VQYXRoKCldXTsKKyAgICBOU0FycmF5KiBleHBpcmVkU2Vzc2lv bnMgPSBbZ2V0QVZDb250ZW50S2V5U2Vzc2lvbkNsYXNzKCkgcGVuZGluZ0V4cGlyZWRTZXNzaW9u UmVwb3J0c1dpdGhBcHBJZGVudGlmaWVyOmNlcnRpZmljYXRlRGF0YS5nZXQoKSBzdG9yYWdlRGly ZWN0b3J5QXRVUkw6W05TVVJMIGZpbGVVUkxXaXRoUGF0aDpzdG9yYWdlUGF0aF1dOwogICAgIGlm ICghW2V4cGlyZWRTZXNzaW9ucyBjb3VudF0pIHsKICAgICAgICAgTE9HKE1lZGlhLCAiQ0RNU2Vz c2lvbkFWQ29udGVudEtleVNlc3Npb246OmdlbmVyYXRlS2V5UmVsZWFzZU1lc3NhZ2UoJXApIC0g bm8gZXhwaXJlZCBzZXNzaW9ucyBmb3VuZCIsIHRoaXMpOwogCkBAIC0zNDUsMTIgKzM1NSwxNiBA QCB2b2lkIENETVNlc3Npb25BVkNvbnRlbnRLZXlTZXNzaW9uOjpkaWRQcm92aWRlQ29udGVudEtl eVJlcXVlc3QoQVZDb250ZW50S2V5UmVxdQogCiBBVkNvbnRlbnRLZXlTZXNzaW9uKiBDRE1TZXNz aW9uQVZDb250ZW50S2V5U2Vzc2lvbjo6Y29udGVudEtleVNlc3Npb24oKQogewotICAgIGlmICgh bV9jb250ZW50S2V5U2Vzc2lvbikgeworICAgIGlmIChtX2NvbnRlbnRLZXlTZXNzaW9uKQorICAg ICAgICByZXR1cm4gbV9jb250ZW50S2V5U2Vzc2lvbi5nZXQoKTsKIAotICAgICAgICBTdHJpbmcg c3RvcmFnZVBhdGggPSB0aGlzLT5zdG9yYWdlUGF0aCgpOwotICAgICAgICBpZiAoc3RvcmFnZVBh dGguaXNFbXB0eSgpKQorICAgIFN0cmluZyBzdG9yYWdlUGF0aCA9IHRoaXMtPnN0b3JhZ2VQYXRo KCk7CisgICAgaWYgKHN0b3JhZ2VQYXRoLmlzRW1wdHkoKSkgeworICAgICAgICBpZiAoIVtnZXRB VkNvbnRlbnRLZXlTZXNzaW9uQ2xhc3MoKSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKGNv bnRlbnRLZXlTZXNzaW9uV2l0aEtleVN5c3RlbTopXSB8fCAhY2FuTG9hZEFWQ29udGVudEtleVN5 c3RlbUZhaXJQbGF5U3RyZWFtaW5nKCkpCiAgICAgICAgICAgICByZXR1cm4gbmlsOwogCisgICAg ICAgIG1fY29udGVudEtleVNlc3Npb24gPSBbZ2V0QVZDb250ZW50S2V5U2Vzc2lvbkNsYXNzKCkg Y29udGVudEtleVNlc3Npb25XaXRoS2V5U3lzdGVtOmdldEFWQ29udGVudEtleVN5c3RlbUZhaXJQ bGF5U3RyZWFtaW5nKCldOworICAgIH0gZWxzZSB7CiAgICAgICAgIFN0cmluZyBzdG9yYWdlRGly ZWN0b3J5ID0gZGlyZWN0b3J5TmFtZShzdG9yYWdlUGF0aCk7CiAKICAgICAgICAgaWYgKCFmaWxl RXhpc3RzKHN0b3JhZ2VEaXJlY3RvcnkpKSB7CkBAIC0zNTksOSArMzczLDkgQEAgQVZDb250ZW50 S2V5U2Vzc2lvbiogQ0RNU2Vzc2lvbkFWQ29udGVudEtleVNlc3Npb246OmNvbnRlbnRLZXlTZXNz aW9uKCkKICAgICAgICAgfQogCiAgICAgICAgIG1fY29udGVudEtleVNlc3Npb24gPSBhZG9wdE5T KFthbGxvY0FWQ29udGVudEtleVNlc3Npb25JbnN0YW5jZSgpIGluaXRXaXRoU3RvcmFnZURpcmVj dG9yeUF0VVJMOltOU1VSTCBmaWxlVVJMV2l0aFBhdGg6c3RvcmFnZVBhdGhdXSk7Ci0gICAgICAg IG1fY29udGVudEtleVNlc3Npb24uZ2V0KCkuZGVsZWdhdGUgPSBtX2NvbnRlbnRLZXlTZXNzaW9u RGVsZWdhdGUuZ2V0KCk7CiAgICAgfQogCisgICAgbV9jb250ZW50S2V5U2Vzc2lvbi5nZXQoKS5k ZWxlZ2F0ZSA9IG1fY29udGVudEtleVNlc3Npb25EZWxlZ2F0ZS5nZXQoKTsKICAgICByZXR1cm4g bV9jb250ZW50S2V5U2Vzc2lvbi5nZXQoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNU2Vzc2lvbk1lZGlhU291 cmNlQVZGT2JqQy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9vYmpjL0NETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakMubW0KaW5kZXggZDMxY2FmZjQw YTg3MzEwNjY4MTBiMzNmMGVhNTIwMzRlZjIxMjg0Ny4uOTI0YTNkOTEzZjE3ZGIzODQyODYwNDlk NTM3ZjY4NjFhYzEzMDIyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQy5tbQor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9D RE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDLm1tCkBAIC05OCw3ICs5OCwxNCBAQCB2b2lkIENE TVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakM6OnJlbW92ZVNvdXJjZUJ1ZmZlcihTb3VyY2VCdWZm ZXJQcml2YXRlQVZGT2JqQwogCiBTdHJpbmcgQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQzo6 c3RvcmFnZVBhdGgoKSBjb25zdAogewotICAgIHJldHVybiBtX2NsaWVudCA/IHBhdGhCeUFwcGVu ZGluZ0NvbXBvbmVudChtX2NsaWVudC0+bWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSgpLCAiU2Vj dXJlU3RvcC5wbGlzdCIpIDogZW1wdHlTdHJpbmcoKTsKKyAgICBpZiAoIW1fY2xpZW50KQorICAg ICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKKworICAgIFN0cmluZyBzdG9yYWdlRGlyZWN0b3J5 ID0gbV9jbGllbnQtPm1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoKTsKKyAgICBpZiAoc3RvcmFn ZURpcmVjdG9yeS5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiBlbXB0eVN0cmluZygpOworCisg ICAgcmV0dXJuIHBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChtX2NsaWVudC0+bWVkaWFLZXlzU3Rv cmFnZURpcmVjdG9yeSgpLCAiU2VjdXJlU3RvcC5wbGlzdCIpOwogfQogCiB9Cg== 317185 2017-08-03 17:32:42 -0700 2017-08-03 18:13:10 -0700 Patch for landing bug-175162-20170803173241.patch text/plain 10055 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwMTUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTFhOTZjOTYzZWIzN2Ri MDczOWI3MDFkMjVjYjIzZjlkMDFjODY0MC4uNmZhMTQ4MTcyM2U5ZjhlMzNkNGZjMGQ5YmE3MTI5 YTI5NzU3MDE0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE3LTA4LTAzICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtFTUVdW01hY10gU2VjdXJl U3RvcCBsZWZ0IG9uIGRpc2sgaW4gUHJpdmF0ZSBCcm93c2luZyBtb2RlLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc1MTYyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgorCisgICAgICAgIFJldHVybiBhbiBlbXB0eSBzdHJpbmcg ZnJvbSBtZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KCkgd2hlbiB0aGUgcGFnZSBpbmRpY2F0ZXMg dGhhdCBzdG9yYWdlIHNob3VsZAorICAgICAgICBiZSBlcGhlbWVyYWwoKS4gUHJldmlvdXNseSwg YW4gZW1wdHkgc3RyaW5nIGluIHRoaXMgY2FzZSB3b3VsZCBiZSB0cmVhdGVkIGFzIGFuIGVycm9y LiBJbnN0ZWFkLCB0cmVhdAorICAgICAgICBhbiBlbXB0eSBzdHJpbmcgYXMgdmFsaWQsIGFuZCBk byBub3QgdHJ5IHRvIHN0b3JlIG9yIHJldHJpZXZlIHNlc3Npb24gaW5mb3JtYXRpb24gdG8gZGlz ayBpbiB0aGF0IGNhc2UuCisKKyAgICAgICAgKiBNb2R1bGVzL2VuY3J5cHRlZG1lZGlhL2xlZ2Fj eS9XZWJLaXRNZWRpYUtleVNlc3Npb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViS2l0TWVk aWFLZXlTZXNzaW9uOjptZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5IGNvbnN0KToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1TZXNzaW9uQVZDb250ZW50 S2V5U2Vzc2lvbi5tbToKKyAgICAgICAgKFdlYkNvcmU6OkNETVNlc3Npb25BVkNvbnRlbnRLZXlT ZXNzaW9uOjpyZWxlYXNlS2V5cyk6CisgICAgICAgIChXZWJDb3JlOjpDRE1TZXNzaW9uQVZDb250 ZW50S2V5U2Vzc2lvbjo6dXBkYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkNETVNlc3Npb25BVkNv bnRlbnRLZXlTZXNzaW9uOjpnZW5lcmF0ZUtleVJlbGVhc2VNZXNzYWdlKToKKyAgICAgICAgKFdl YkNvcmU6OkNETVNlc3Npb25BVkNvbnRlbnRLZXlTZXNzaW9uOjpjb250ZW50S2V5U2Vzc2lvbik6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNU2Vzc2lv bk1lZGlhU291cmNlQVZGT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6OkNETVNlc3Npb25NZWRp YVNvdXJjZUFWRk9iakM6OnN0b3JhZ2VQYXRoIGNvbnN0KToKKwogMjAxNy0wOC0wMiAgSmVyIE5v YmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbTVNFXSBSZW1vdmluZyBzYW1w bGVzIHdoZW4gcHJlc2VudGF0aW9uIG9yZGVyIGRvZXMgbm90IG1hdGNoIGRlY29kZSBvcmRlciBj YW4gY2F1c2UgYmFkIGJlaGF2aW9yLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9lbmNyeXB0ZWRtZWRpYS9sZWdhY3kvV2ViS2l0TWVkaWFLZXlTZXNzaW9uLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvbGVnYWN5L1dlYktpdE1lZGlhS2V5U2Vz c2lvbi5jcHAKaW5kZXggMjg1MTUwNjUwNzQzZGRkNzFlMmE3ZjVjMWRiNGIyYTQ3MTNiYjRjMi4u NmFlYmIxZmQ0MDRlMDMwMDA1NWIwZjA0NmM1MDMzZGZjYzBjMDcwZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9sZWdhY3kvV2ViS2l0TWVkaWFLZXlT ZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL2xl Z2FjeS9XZWJLaXRNZWRpYUtleVNlc3Npb24uY3BwCkBAIC0zMSw2ICszMSw3IEBACiAjaW5jbHVk ZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJFdmVudE5hbWVzLmgiCiAjaW5jbHVkZSAiRmlsZVN5 c3RlbS5oIgorI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJTZWN1cml0eU9yaWdpbkRhdGEu aCIKICNpbmNsdWRlICJTZXR0aW5ncy5oIgogI2luY2x1ZGUgIldlYktpdE1lZGlhS2V5RXJyb3Iu aCIKQEAgLTIyMiw2ICsyMjMsMTAgQEAgU3RyaW5nIFdlYktpdE1lZGlhS2V5U2Vzc2lvbjo6bWVk aWFLZXlzU3RvcmFnZURpcmVjdG9yeSgpIGNvbnN0CiAgICAgaWYgKCFkb2N1bWVudCkKICAgICAg ICAgcmV0dXJuIGVtcHR5U3RyaW5nKCk7CiAKKyAgICBhdXRvKiBwYWdlID0gZG9jdW1lbnQtPnBh Z2UoKTsKKyAgICBpZiAoIXBhZ2UgfHwgcGFnZS0+dXNlc0VwaGVtZXJhbFNlc3Npb24oKSkKKyAg ICAgICAgcmV0dXJuIGVtcHR5U3RyaW5nKCk7CisKICAgICBhdXRvIHN0b3JhZ2VEaXJlY3Rvcnkg PSBkb2N1bWVudC0+c2V0dGluZ3MoKS5tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KCk7CiAgICAg aWYgKHN0b3JhZ2VEaXJlY3RvcnkuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gZW1wdHlTdHJp bmcoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9vYmpjL0NETVNlc3Npb25BVkNvbnRlbnRLZXlTZXNzaW9uLm1tIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNU2Vzc2lvbkFWQ29u dGVudEtleVNlc3Npb24ubW0KaW5kZXggMDFkNjhmOWY3YzgyMGQxMzAwNjNkMjhkYjRlZGVlNmI0 ZWEwMTU5ZC4uYmZkMDRhMWY4ZjRjZmRjOThmM2JkNjYzN2E1YzFjYTY2NzNjNzVjNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMv Q0RNU2Vzc2lvbkFWQ29udGVudEtleVNlc3Npb24ubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNU2Vzc2lvbkFWQ29udGVudEtleVNl c3Npb24ubW0KQEAgLTQ1LDggKzQ1LDEyIEBAIFNPRlRfTElOS19GUkFNRVdPUktfT1BUSU9OQUwo QVZGb3VuZGF0aW9uKQogU09GVF9MSU5LX0NMQVNTKEFWRm91bmRhdGlvbiwgQVZTdHJlYW1EYXRh UGFyc2VyKTsKIFNPRlRfTElOS19DTEFTU19PUFRJT05BTChBVkZvdW5kYXRpb24sIEFWQ29udGVu dEtleVNlc3Npb24pOwogU09GVF9MSU5LX0NPTlNUQU5UX01BWV9GQUlMKEFWRm91bmRhdGlvbiwg QVZDb250ZW50S2V5UmVxdWVzdFByb3RvY29sVmVyc2lvbnNLZXksIE5TU3RyaW5nICopCitTT0ZU X0xJTktfQ09OU1RBTlRfTUFZX0ZBSUwoQVZGb3VuZGF0aW9uLCBBVkNvbnRlbnRLZXlTeXN0ZW1G YWlyUGxheVN0cmVhbWluZywgTlNTdHJpbmcgKikKKwordHlwZWRlZiBOU1N0cmluZyAqQVZDb250 ZW50S2V5U3lzdGVtOwogCiBAaW50ZXJmYWNlIEFWQ29udGVudEtleVNlc3Npb24gOiBOU09iamVj dAorKyAoaW5zdGFuY2V0eXBlKWNvbnRlbnRLZXlTZXNzaW9uV2l0aEtleVN5c3RlbTooQVZDb250 ZW50S2V5U3lzdGVtKWtleVN5c3RlbTsKIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aFN0b3JhZ2VE aXJlY3RvcnlBdFVSTDooTlNVUkwgKilzdG9yYWdlVVJMOwogQHByb3BlcnR5IChhc3NpZ24pIGlk IGRlbGVnYXRlOwogLSAodm9pZClhZGRTdHJlYW1EYXRhUGFyc2VyOihBVlN0cmVhbURhdGFQYXJz ZXIgKilzdHJlYW1EYXRhUGFyc2VyOwpAQCAtMTkxLDggKzE5NSwxMiBAQCB2b2lkIENETVNlc3Np b25BVkNvbnRlbnRLZXlTZXNzaW9uOjpyZWxlYXNlS2V5cygpCiAgICAgICAgIGlmICghW2dldEFW Q29udGVudEtleVNlc3Npb25DbGFzcygpIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IocGVu ZGluZ0V4cGlyZWRTZXNzaW9uUmVwb3J0c1dpdGhBcHBJZGVudGlmaWVyOnN0b3JhZ2VEaXJlY3Rv cnlBdFVSTDopXSkKICAgICAgICAgICAgIHJldHVybjsKIAorICAgICAgICBhdXRvIHN0b3JhZ2VQ YXRoID0gdGhpcy0+c3RvcmFnZVBhdGgoKTsKKyAgICAgICAgaWYgKHN0b3JhZ2VQYXRoLmlzRW1w dHkoKSkKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICBSZXRhaW5QdHI8TlNEYXRhPiBj ZXJ0aWZpY2F0ZURhdGEgPSBhZG9wdE5TKFtbTlNEYXRhIGFsbG9jXSBpbml0V2l0aEJ5dGVzOm1f Y2VydGlmaWNhdGUtPmRhdGEoKSBsZW5ndGg6bV9jZXJ0aWZpY2F0ZS0+bGVuZ3RoKCldKTsKLSAg ICAgICAgTlNBcnJheSogZXhwaXJlZFNlc3Npb25zID0gW2dldEFWQ29udGVudEtleVNlc3Npb25D bGFzcygpIHBlbmRpbmdFeHBpcmVkU2Vzc2lvblJlcG9ydHNXaXRoQXBwSWRlbnRpZmllcjpjZXJ0 aWZpY2F0ZURhdGEuZ2V0KCkgc3RvcmFnZURpcmVjdG9yeUF0VVJMOltOU1VSTCBmaWxlVVJMV2l0 aFBhdGg6c3RvcmFnZVBhdGgoKV1dOworICAgICAgICBOU0FycmF5KiBleHBpcmVkU2Vzc2lvbnMg PSBbZ2V0QVZDb250ZW50S2V5U2Vzc2lvbkNsYXNzKCkgcGVuZGluZ0V4cGlyZWRTZXNzaW9uUmVw b3J0c1dpdGhBcHBJZGVudGlmaWVyOmNlcnRpZmljYXRlRGF0YS5nZXQoKSBzdG9yYWdlRGlyZWN0 b3J5QXRVUkw6W05TVVJMIGZpbGVVUkxXaXRoUGF0aDpzdG9yYWdlUGF0aF1dOwogICAgICAgICBm b3IgKE5TRGF0YSogZXhwaXJlZFNlc3Npb25EYXRhIGluIGV4cGlyZWRTZXNzaW9ucykgewogICAg ICAgICAgICAgTlNEaWN0aW9uYXJ5ICpleHBpcmVkU2Vzc2lvbiA9IFtOU1Byb3BlcnR5TGlzdFNl cmlhbGl6YXRpb24gcHJvcGVydHlMaXN0V2l0aERhdGE6ZXhwaXJlZFNlc3Npb25EYXRhIG9wdGlv bnM6a0NGUHJvcGVydHlMaXN0SW1tdXRhYmxlIGZvcm1hdDpudWxscHRyIGVycm9yOm51bGxwdHJd OwogICAgICAgICAgICAgTlNTdHJpbmcgKnBsYXliYWNrU2Vzc2lvbklkVmFsdWUgPSAoTlNTdHJp bmcgKilbZXhwaXJlZFNlc3Npb24gb2JqZWN0Rm9yS2V5OlBsYXliYWNrU2Vzc2lvbklkS2V5XTsK QEAgLTIzOSw3ICsyNDcsOCBAQCBib29sIENETVNlc3Npb25BVkNvbnRlbnRLZXlTZXNzaW9uOjp1 cGRhdGUoVWludDhBcnJheSoga2V5LCBSZWZQdHI8VWludDhBcnJheT4mCiAgICAgaWYgKGlzRXF1 YWwoa2V5LCAiYWNrbm93bGVkZ2VkIikpIHsKICAgICAgICAgTE9HKE1lZGlhLCAiQ0RNU2Vzc2lv bkFWQ29udGVudEtleVNlc3Npb246OnVwZGF0ZSglcCkgLSBhY2tub3dsZWRpbmcgc2VjdXJlIHN0 b3AgbWVzc2FnZSIsIHRoaXMpOwogCi0gICAgICAgIGlmICghbV9leHBpcmVkU2Vzc2lvbikgewor ICAgICAgICBTdHJpbmcgc3RvcmFnZVBhdGggPSB0aGlzLT5zdG9yYWdlUGF0aCgpOworICAgICAg ICBpZiAoIW1fZXhwaXJlZFNlc3Npb24gfHwgc3RvcmFnZVBhdGguaXNFbXB0eSgpKSB7CiAgICAg ICAgICAgICBlcnJvckNvZGUgPSBNZWRpYVBsYXllcjo6SW52YWxpZFBsYXllclN0YXRlOwogICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CkBAIC0yNDcsNyArMjU2LDcgQEAgYm9v bCBDRE1TZXNzaW9uQVZDb250ZW50S2V5U2Vzc2lvbjo6dXBkYXRlKFVpbnQ4QXJyYXkqIGtleSwg UmVmUHRyPFVpbnQ4QXJyYXk+JgogICAgICAgICBSZXRhaW5QdHI8TlNEYXRhPiBjZXJ0aWZpY2F0 ZURhdGEgPSBhZG9wdE5TKFtbTlNEYXRhIGFsbG9jXSBpbml0V2l0aEJ5dGVzOm1fY2VydGlmaWNh dGUtPmRhdGEoKSBsZW5ndGg6bV9jZXJ0aWZpY2F0ZS0+bGVuZ3RoKCldKTsKIAogICAgICAgICBp ZiAoW2dldEFWQ29udGVudEtleVNlc3Npb25DbGFzcygpIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2Vs ZWN0b3IocmVtb3ZlUGVuZGluZ0V4cGlyZWRTZXNzaW9uUmVwb3J0czp3aXRoQXBwSWRlbnRpZmll cjpzdG9yYWdlRGlyZWN0b3J5QXRVUkw6KV0pCi0gICAgICAgICAgICBbZ2V0QVZDb250ZW50S2V5 U2Vzc2lvbkNsYXNzKCkgcmVtb3ZlUGVuZGluZ0V4cGlyZWRTZXNzaW9uUmVwb3J0czpAW21fZXhw aXJlZFNlc3Npb24uZ2V0KCldIHdpdGhBcHBJZGVudGlmaWVyOmNlcnRpZmljYXRlRGF0YS5nZXQo KSBzdG9yYWdlRGlyZWN0b3J5QXRVUkw6W05TVVJMIGZpbGVVUkxXaXRoUGF0aDpzdG9yYWdlUGF0 aCgpXV07CisgICAgICAgICAgICBbZ2V0QVZDb250ZW50S2V5U2Vzc2lvbkNsYXNzKCkgcmVtb3Zl UGVuZGluZ0V4cGlyZWRTZXNzaW9uUmVwb3J0czpAW21fZXhwaXJlZFNlc3Npb24uZ2V0KCldIHdp dGhBcHBJZGVudGlmaWVyOmNlcnRpZmljYXRlRGF0YS5nZXQoKSBzdG9yYWdlRGlyZWN0b3J5QXRV Ukw6W05TVVJMIGZpbGVVUkxXaXRoUGF0aDpzdG9yYWdlUGF0aF1dOwogICAgICAgICBtX2V4cGly ZWRTZXNzaW9uID0gbnVsbHB0cjsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQpAQCAtMzE1 LDEzICszMjQsMTQgQEAgUmVmUHRyPFVpbnQ4QXJyYXk+IENETVNlc3Npb25BVkNvbnRlbnRLZXlT ZXNzaW9uOjpnZW5lcmF0ZUtleVJlbGVhc2VNZXNzYWdlKHVuc2kKICAgICBtX2NlcnRpZmljYXRl ID0gbV9pbml0RGF0YTsKICAgICBSZXRhaW5QdHI8TlNEYXRhPiBjZXJ0aWZpY2F0ZURhdGEgPSBh ZG9wdE5TKFtbTlNEYXRhIGFsbG9jXSBpbml0V2l0aEJ5dGVzOm1fY2VydGlmaWNhdGUtPmRhdGEo KSBsZW5ndGg6bV9jZXJ0aWZpY2F0ZS0+bGVuZ3RoKCldKTsKIAotICAgIGlmICghW2dldEFWQ29u dGVudEtleVNlc3Npb25DbGFzcygpIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IocGVuZGlu Z0V4cGlyZWRTZXNzaW9uUmVwb3J0c1dpdGhBcHBJZGVudGlmaWVyOnN0b3JhZ2VEaXJlY3RvcnlB dFVSTDopXSkgeworICAgIFN0cmluZyBzdG9yYWdlUGF0aCA9IHRoaXMtPnN0b3JhZ2VQYXRoKCk7 CisgICAgaWYgKHN0b3JhZ2VQYXRoLmlzRW1wdHkoKSB8fCAhW2dldEFWQ29udGVudEtleVNlc3Np b25DbGFzcygpIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IocGVuZGluZ0V4cGlyZWRTZXNz aW9uUmVwb3J0c1dpdGhBcHBJZGVudGlmaWVyOnN0b3JhZ2VEaXJlY3RvcnlBdFVSTDopXSkgewog ICAgICAgICBlcnJvckNvZGUgPSBNZWRpYVBsYXllcjo6S2V5U3lzdGVtTm90U3VwcG9ydGVkOwog ICAgICAgICBzeXN0ZW1Db2RlID0gJyFtb3InOwogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAg ICB9CiAKLSAgICBOU0FycmF5KiBleHBpcmVkU2Vzc2lvbnMgPSBbZ2V0QVZDb250ZW50S2V5U2Vz c2lvbkNsYXNzKCkgcGVuZGluZ0V4cGlyZWRTZXNzaW9uUmVwb3J0c1dpdGhBcHBJZGVudGlmaWVy OmNlcnRpZmljYXRlRGF0YS5nZXQoKSBzdG9yYWdlRGlyZWN0b3J5QXRVUkw6W05TVVJMIGZpbGVV UkxXaXRoUGF0aDpzdG9yYWdlUGF0aCgpXV07CisgICAgTlNBcnJheSogZXhwaXJlZFNlc3Npb25z ID0gW2dldEFWQ29udGVudEtleVNlc3Npb25DbGFzcygpIHBlbmRpbmdFeHBpcmVkU2Vzc2lvblJl cG9ydHNXaXRoQXBwSWRlbnRpZmllcjpjZXJ0aWZpY2F0ZURhdGEuZ2V0KCkgc3RvcmFnZURpcmVj dG9yeUF0VVJMOltOU1VSTCBmaWxlVVJMV2l0aFBhdGg6c3RvcmFnZVBhdGhdXTsKICAgICBpZiAo IVtleHBpcmVkU2Vzc2lvbnMgY291bnRdKSB7CiAgICAgICAgIExPRyhNZWRpYSwgIkNETVNlc3Np b25BVkNvbnRlbnRLZXlTZXNzaW9uOjpnZW5lcmF0ZUtleVJlbGVhc2VNZXNzYWdlKCVwKSAtIG5v IGV4cGlyZWQgc2Vzc2lvbnMgZm91bmQiLCB0aGlzKTsKIApAQCAtMzQ1LDEyICszNTUsMTYgQEAg dm9pZCBDRE1TZXNzaW9uQVZDb250ZW50S2V5U2Vzc2lvbjo6ZGlkUHJvdmlkZUNvbnRlbnRLZXlS ZXF1ZXN0KEFWQ29udGVudEtleVJlcXUKIAogQVZDb250ZW50S2V5U2Vzc2lvbiogQ0RNU2Vzc2lv bkFWQ29udGVudEtleVNlc3Npb246OmNvbnRlbnRLZXlTZXNzaW9uKCkKIHsKLSAgICBpZiAoIW1f Y29udGVudEtleVNlc3Npb24pIHsKKyAgICBpZiAobV9jb250ZW50S2V5U2Vzc2lvbikKKyAgICAg ICAgcmV0dXJuIG1fY29udGVudEtleVNlc3Npb24uZ2V0KCk7CiAKLSAgICAgICAgU3RyaW5nIHN0 b3JhZ2VQYXRoID0gdGhpcy0+c3RvcmFnZVBhdGgoKTsKLSAgICAgICAgaWYgKHN0b3JhZ2VQYXRo LmlzRW1wdHkoKSkKKyAgICBTdHJpbmcgc3RvcmFnZVBhdGggPSB0aGlzLT5zdG9yYWdlUGF0aCgp OworICAgIGlmIChzdG9yYWdlUGF0aC5pc0VtcHR5KCkpIHsKKyAgICAgICAgaWYgKCFbZ2V0QVZD b250ZW50S2V5U2Vzc2lvbkNsYXNzKCkgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihjb250 ZW50S2V5U2Vzc2lvbldpdGhLZXlTeXN0ZW06KV0gfHwgIWNhbkxvYWRBVkNvbnRlbnRLZXlTeXN0 ZW1GYWlyUGxheVN0cmVhbWluZygpKQogICAgICAgICAgICAgcmV0dXJuIG5pbDsKIAorICAgICAg ICBtX2NvbnRlbnRLZXlTZXNzaW9uID0gW2dldEFWQ29udGVudEtleVNlc3Npb25DbGFzcygpIGNv bnRlbnRLZXlTZXNzaW9uV2l0aEtleVN5c3RlbTpnZXRBVkNvbnRlbnRLZXlTeXN0ZW1GYWlyUGxh eVN0cmVhbWluZygpXTsKKyAgICB9IGVsc2UgewogICAgICAgICBTdHJpbmcgc3RvcmFnZURpcmVj dG9yeSA9IGRpcmVjdG9yeU5hbWUoc3RvcmFnZVBhdGgpOwogCiAgICAgICAgIGlmICghZmlsZUV4 aXN0cyhzdG9yYWdlRGlyZWN0b3J5KSkgewpAQCAtMzU5LDkgKzM3Myw5IEBAIEFWQ29udGVudEtl eVNlc3Npb24qIENETVNlc3Npb25BVkNvbnRlbnRLZXlTZXNzaW9uOjpjb250ZW50S2V5U2Vzc2lv bigpCiAgICAgICAgIH0KIAogICAgICAgICBtX2NvbnRlbnRLZXlTZXNzaW9uID0gYWRvcHROUyhb YWxsb2NBVkNvbnRlbnRLZXlTZXNzaW9uSW5zdGFuY2UoKSBpbml0V2l0aFN0b3JhZ2VEaXJlY3Rv cnlBdFVSTDpbTlNVUkwgZmlsZVVSTFdpdGhQYXRoOnN0b3JhZ2VQYXRoXV0pOwotICAgICAgICBt X2NvbnRlbnRLZXlTZXNzaW9uLmdldCgpLmRlbGVnYXRlID0gbV9jb250ZW50S2V5U2Vzc2lvbkRl bGVnYXRlLmdldCgpOwogICAgIH0KIAorICAgIG1fY29udGVudEtleVNlc3Npb24uZ2V0KCkuZGVs ZWdhdGUgPSBtX2NvbnRlbnRLZXlTZXNzaW9uRGVsZWdhdGUuZ2V0KCk7CiAgICAgcmV0dXJuIG1f Y29udGVudEtleVNlc3Npb24uZ2V0KCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETVNlc3Npb25NZWRpYVNvdXJj ZUFWRk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vb2JqYy9DRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDLm1tCmluZGV4IGQzMWNhZmY0MGE4 NzMxMDY2ODEwYjMzZjBlYTUyMDM0ZWYyMTI4NDcuLjkwMjJmMTI5YjI4MjJkMTE2MmRmMzZlYmM1 YTFlNjI1NTAwNTQ5M2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakMubW0KKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RN U2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQy5tbQpAQCAtOTgsNyArOTgsMTQgQEAgdm9pZCBDRE1T ZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDOjpyZW1vdmVTb3VyY2VCdWZmZXIoU291cmNlQnVmZmVy UHJpdmF0ZUFWRk9iakMKIAogU3RyaW5nIENETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakM6OnN0 b3JhZ2VQYXRoKCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV9jbGllbnQgPyBwYXRoQnlBcHBlbmRp bmdDb21wb25lbnQobV9jbGllbnQtPm1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoKSwgIlNlY3Vy ZVN0b3AucGxpc3QiKSA6IGVtcHR5U3RyaW5nKCk7CisgICAgaWYgKCFtX2NsaWVudCkKKyAgICAg ICAgcmV0dXJuIGVtcHR5U3RyaW5nKCk7CisKKyAgICBTdHJpbmcgc3RvcmFnZURpcmVjdG9yeSA9 IG1fY2xpZW50LT5tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KCk7CisgICAgaWYgKHN0b3JhZ2VE aXJlY3RvcnkuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKKworICAg IHJldHVybiBwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQoc3RvcmFnZURpcmVjdG9yeSwgIlNlY3Vy ZVN0b3AucGxpc3QiKTsKIH0KIAogfQo=