151647 2015-11-29 11:41:46 -0800 Modern IDB: Support updating cursor values when the object store uses inline keys 2015-11-30 11:05:31 -0800 1 1 1 Unclassified WebKit WebCore Misc. Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 149117 150882 1 beidson beidson achristensen alecflett commit-queue jsbell oldest_to_newest 1144692 0 beidson 2015-11-29 11:41:46 -0800 Modern IDB: Support updating cursor values when the object store uses inline keys 1144693 1 266226 beidson 2015-11-29 11:44:25 -0800 Created attachment 266226 Patch v1 1144694 2 266226 beidson 2015-11-29 11:47:25 -0800 Comment on attachment 266226 Patch v1 This one relies on at least one of the other patches I have waiting in review, so unmarking for review at this time. 1144815 3 266249 beidson 2015-11-30 10:30:29 -0800 Created attachment 266249 Patch v1 (applies) 1144819 4 beidson 2015-11-30 10:35:40 -0800 Well, apparently this doesn't apply, even though I just made it from trunk! Other stuff have probably landed since I updated. 1144824 5 266252 beidson 2015-11-30 10:39:07 -0800 Created attachment 266252 Patch v1 (really applies) 1144826 6 266252 aestes 2015-11-30 10:43:16 -0800 Comment on attachment 266252 Patch v1 (really applies) View in context: https://bugs.webkit.org/attachment.cgi?id=266252&action=review > Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.cpp:228 > + auto idbKey = scriptValueToIDBKey(state, key); You don't need to use a local variable here. 1144838 7 beidson 2015-11-30 11:05:31 -0800 https://trac.webkit.org/changeset/192806 266226 2015-11-29 11:44:25 -0800 2015-11-30 10:30:29 -0800 Patch v1 patch text/plain 8494 beidson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2OTRmMGM1Li5iMTIxOTMzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTUtMTEt MjkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIE1vZGVybiBJ REI6IFN1cHBvcnQgdXBkYXRpbmcgY3Vyc29yIHZhbHVlcyB3aGVuIHRoZSBvYmplY3Qgc3RvcmUg dXNlcyBpbmxpbmUga2V5cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE1MTY0NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogcGxhdGZvcm0vbWFjLXdrMS9UZXN0RXhwZWN0YXRpb25zOgorCiAyMDE1LTEx LTE4ICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29udGVudCBG aWx0ZXJpbmddIENyYXNoIGluIERvY3VtZW50TG9hZGVyOjpub3RpZnlGaW5pc2hlZCgpIHdoZW4g YWxsb3dpbmcgYSBtZWRpYSBkb2N1bWVudCB0byBsb2FkCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9tYWMtd2sxL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMTE2YWFlNy4uZDcwZmU3NiAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMS9UZXN0RXhwZWN0YXRpb25zCisrKyBi L0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azEvVGVzdEV4cGVjdGF0aW9ucwpAQCAtODIsNiAr ODIsNyBAQCBzdG9yYWdlL2luZGV4ZWRkYi9tb3ppbGxhL2NyZWF0ZS1vYmplY3RzdG9yZS1iYXNp Y3MuaHRtbCBbIFBhc3MgXQogc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9jcmVhdGUtb2JqZWN0 c3RvcmUtbnVsbC1uYW1lLmh0bWwgWyBQYXNzIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL21vemlsbGEv Y3Vyc29yLW11dGF0aW9uLW9iamVjdHN0b3JlLW9ubHkuaHRtbCBbIFBhc3MgXQogc3RvcmFnZS9p bmRleGVkZGIvbW96aWxsYS9jdXJzb3ItbXV0YXRpb24uaHRtbCBbIFBhc3MgXQorc3RvcmFnZS9p bmRleGVkZGIvbW96aWxsYS9jdXJzb3ItdXBkYXRlLXVwZGF0ZXMtaW5kZXhlcy5odG1sIFsgUGFz cyBdCiBzdG9yYWdlL2luZGV4ZWRkYi9tb3ppbGxhL2RlbGV0ZS1yZXN1bHQuaHRtbCBbIFBhc3Mg XQogc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9ldmVudC1zb3VyY2UuaHRtbCBbIFBhc3MgXQog c3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9nbG9iYWwtZGF0YS5odG1sIFsgUGFzcyBdCkBAIC05 Miw2ICs5Myw3IEBAIHN0b3JhZ2UvaW5kZXhlZGRiL21vemlsbGEva2V5LXJlcXVpcmVtZW50cy1w dXQtbnVsbC1rZXkuaHRtbCBbIFBhc3MgXQogc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9rZXkt cmVxdWlyZW1lbnRzLmh0bWwgWyBQYXNzIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL21vemlsbGEvb2Jq ZWN0LWN1cnNvcnMuaHRtbCBbIFBhc3MgXQogc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9vYmpl Y3QtaWRlbnRpdHkuaHRtbCBbIFBhc3MgXQorc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9vYmpl Y3Qtc3RvcmUtaW5saW5lLWF1dG9pbmNyZW1lbnQta2V5LWFkZGVkLW9uLXB1dC5odG1sIFsgUGFz cyBdCiBzdG9yYWdlL2luZGV4ZWRkYi9tb3ppbGxhL29iamVjdC1zdG9yZS1yZW1vdmUtdmFsdWVz Lmh0bWwgWyBQYXNzIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL21vemlsbGEvb2JqZWN0c3RvcmVuYW1l cy5odG1sIFsgUGFzcyBdCiBzdG9yYWdlL2luZGV4ZWRkYi9tb3ppbGxhL29kZC1yZXN1bHQtb3Jk ZXIuaHRtbCBbIFBhc3MgXQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDUzZGM3YjMuLjlhYmI2MDEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwyMiBAQAorMjAxNS0xMS0yOSAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBh cHBsZS5jb20+CisKKyAgICAgICAgTW9kZXJuIElEQjogU3VwcG9ydCB1cGRhdGluZyBjdXJzb3Ig dmFsdWVzIHdoZW4gdGhlIG9iamVjdCBzdG9yZSB1c2VzIGlubGluZSBrZXlzLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxNjQ3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChBdCBs ZWFzdCB0d28gcHJldmlvdXNseSBmYWlsaW5nIHRlc3RzIG5vdyBwYXNzIGFuZCBhcmUgdW5za2lw cGVkKS4KKworICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJDdXJzb3JJbXBs LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQkNsaWVudDo6SURCQ3Vyc29yOjp1cGRhdGUpOiBV c2UgcHV0Rm9yQ3Vyc29yVXBkYXRlKCkgaW5zdGVhZCBvZiBwdXQoKQorICAgICAgICAKKyAgICAg ICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvSURCT2JqZWN0U3RvcmVJbXBsLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OklEQkNsaWVudDo6SURCT2JqZWN0U3RvcmU6OmFkZCk6CisgICAgICAg IChXZWJDb3JlOjpJREJDbGllbnQ6OklEQk9iamVjdFN0b3JlOjpwdXQpOgorICAgICAgICAoV2Vi Q29yZTo6SURCQ2xpZW50OjpJREJPYmplY3RTdG9yZTo6cHV0Rm9yQ3Vyc29yVXBkYXRlKTogVXNl IHRoZSBmbGFnIHRvIHNraXAgdGhlIGlubGluZS1rZXkgY2hlY2suCisgICAgICAgIChXZWJDb3Jl OjpJREJDbGllbnQ6OklEQk9iamVjdFN0b3JlOjpwdXRPckFkZCk6IEFkZCBhIGZsYWcgdG8gc2tp cCB0aGUgaW5saW5lLWtleSBjaGVjay4KKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9jbGll bnQvSURCT2JqZWN0U3RvcmVJbXBsLmg6CisKIDIwMTUtMTEtMjcgIEJyYWR5IEVpZHNvbiAgPGJl aWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIE1vZGVybiBJREI6IENsYXNzLWlmeSBJREJHZXRS ZXN1bHQgbWFraW5nIGl0IGltcG9zc2libGUgdG8gZ2V0IHRoZSBkYXRhIG1lbWJlcnMgd3Jvbmcu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvSURC Q3Vyc29ySW1wbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQv SURCQ3Vyc29ySW1wbC5jcHAKaW5kZXggNGM1ZTczZS4uMTA4ZmRjMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lEQkN1cnNvckltcGwuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJDdXJzb3JJbXBs LmNwcApAQCAtMTM5LDcgKzEzOSw3IEBAIFJlZlB0cjxXZWJDb3JlOjpJREJSZXF1ZXN0PiBJREJD dXJzb3I6OnVwZGF0ZShKU0M6OkV4ZWNTdGF0ZSYgZXhlYywgRGVwcmVjYXRlZDo6CiAgICAgICAg IHJldHVybiBudWxscHRyOwogICAgIH0KIAotICAgIHJldHVybiBlZmZlY3RpdmVPYmplY3RTdG9y ZSgpLnB1dChleGVjLCB2YWx1ZS5qc1ZhbHVlKCksIG1fZGVwcmVjYXRlZEN1cnJlbnRQcmltYXJ5 S2V5LmpzVmFsdWUoKSwgZWMpOworICAgIHJldHVybiBlZmZlY3RpdmVPYmplY3RTdG9yZSgpLnB1 dEZvckN1cnNvclVwZGF0ZShleGVjLCB2YWx1ZS5qc1ZhbHVlKCksIG1fZGVwcmVjYXRlZEN1cnJl bnRQcmltYXJ5S2V5LmpzVmFsdWUoKSwgZWMpOwogfQogCiB2b2lkIElEQkN1cnNvcjo6YWR2YW5j ZSh1bnNpZ25lZCBsb25nIGNvdW50LCBFeGNlcHRpb25Db2RlJiBlYykKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJPYmplY3RTdG9yZUltcGwu Y3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lEQk9iamVjdFN0 b3JlSW1wbC5jcHAKaW5kZXggMTA3MmFjMy4uZjAzMjU1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lEQk9iamVjdFN0b3JlSW1wbC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lEQk9iamVjdFN0b3Jl SW1wbC5jcHAKQEAgLTIwMywyNyArMjAzLDMzIEBAIFJlZlB0cjxXZWJDb3JlOjpJREJSZXF1ZXN0 PiBJREJPYmplY3RTdG9yZTo6Z2V0KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsCiAK IFJlZlB0cjxXZWJDb3JlOjpJREJSZXF1ZXN0PiBJREJPYmplY3RTdG9yZTo6YWRkKEpTQzo6RXhl Y1N0YXRlJiBzdGF0ZSwgSlNDOjpKU1ZhbHVlIHZhbHVlLCBFeGNlcHRpb25Db2RlJiBlYykKIHsK LSAgICByZXR1cm4gcHV0T3JBZGQoc3RhdGUsIHZhbHVlLCBudWxscHRyLCBJbmRleGVkREI6Ok9i amVjdFN0b3JlT3ZlcndyaXRlTW9kZTo6Tm9PdmVyd3JpdGUsIGVjKTsKKyAgICByZXR1cm4gcHV0 T3JBZGQoc3RhdGUsIHZhbHVlLCBudWxscHRyLCBJbmRleGVkREI6Ok9iamVjdFN0b3JlT3Zlcndy aXRlTW9kZTo6Tm9PdmVyd3JpdGUsIElubGluZUtleUNoZWNrOjpQZXJmb3JtLCBlYyk7CiB9CiAK IFJlZlB0cjxXZWJDb3JlOjpJREJSZXF1ZXN0PiBJREJPYmplY3RTdG9yZTo6YWRkKEpTQzo6RXhl Y1N0YXRlJiBleGVjU3RhdGUsIEpTQzo6SlNWYWx1ZSB2YWx1ZSwgSlNDOjpKU1ZhbHVlIGtleSwg RXhjZXB0aW9uQ29kZSYgZWMpCiB7CiAgICAgYXV0byBpZGJLZXkgPSBzY3JpcHRWYWx1ZVRvSURC S2V5KGV4ZWNTdGF0ZSwga2V5KTsKLSAgICByZXR1cm4gcHV0T3JBZGQoZXhlY1N0YXRlLCB2YWx1 ZSwgaWRiS2V5LCBJbmRleGVkREI6Ok9iamVjdFN0b3JlT3ZlcndyaXRlTW9kZTo6Tm9PdmVyd3Jp dGUsIGVjKTsKKyAgICByZXR1cm4gcHV0T3JBZGQoZXhlY1N0YXRlLCB2YWx1ZSwgaWRiS2V5LCBJ bmRleGVkREI6Ok9iamVjdFN0b3JlT3ZlcndyaXRlTW9kZTo6Tm9PdmVyd3JpdGUsIElubGluZUtl eUNoZWNrOjpQZXJmb3JtLCBlYyk7CiB9CiAKIFJlZlB0cjxXZWJDb3JlOjpJREJSZXF1ZXN0PiBJ REJPYmplY3RTdG9yZTo6cHV0KEpTQzo6RXhlY1N0YXRlJiBleGVjU3RhdGUsIEpTQzo6SlNWYWx1 ZSB2YWx1ZSwgSlNDOjpKU1ZhbHVlIGtleSwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7CiAgICAgYXV0 byBpZGJLZXkgPSBzY3JpcHRWYWx1ZVRvSURCS2V5KGV4ZWNTdGF0ZSwga2V5KTsKLSAgICByZXR1 cm4gcHV0T3JBZGQoZXhlY1N0YXRlLCB2YWx1ZSwgaWRiS2V5LCBJbmRleGVkREI6Ok9iamVjdFN0 b3JlT3ZlcndyaXRlTW9kZTo6T3ZlcndyaXRlLCBlYyk7CisgICAgcmV0dXJuIHB1dE9yQWRkKGV4 ZWNTdGF0ZSwgdmFsdWUsIGlkYktleSwgSW5kZXhlZERCOjpPYmplY3RTdG9yZU92ZXJ3cml0ZU1v ZGU6Ok92ZXJ3cml0ZSwgSW5saW5lS2V5Q2hlY2s6OlBlcmZvcm0sIGVjKTsKIH0KIAogUmVmUHRy PFdlYkNvcmU6OklEQlJlcXVlc3Q+IElEQk9iamVjdFN0b3JlOjpwdXQoSlNDOjpFeGVjU3RhdGUm IHN0YXRlLCBKU0M6OkpTVmFsdWUgdmFsdWUsIEV4Y2VwdGlvbkNvZGUmIGVjKQogewotICAgIHJl dHVybiBwdXRPckFkZChzdGF0ZSwgdmFsdWUsIG51bGxwdHIsIEluZGV4ZWREQjo6T2JqZWN0U3Rv cmVPdmVyd3JpdGVNb2RlOjpPdmVyd3JpdGUsIGVjKTsKKyAgICByZXR1cm4gcHV0T3JBZGQoc3Rh dGUsIHZhbHVlLCBudWxscHRyLCBJbmRleGVkREI6Ok9iamVjdFN0b3JlT3ZlcndyaXRlTW9kZTo6 T3ZlcndyaXRlLCBJbmxpbmVLZXlDaGVjazo6UGVyZm9ybSwgZWMpOwogfQogCi1SZWZQdHI8V2Vi Q29yZTo6SURCUmVxdWVzdD4gSURCT2JqZWN0U3RvcmU6OnB1dE9yQWRkKEpTQzo6RXhlY1N0YXRl JiBzdGF0ZSwgSlNDOjpKU1ZhbHVlIHZhbHVlLCBSZWZQdHI8SURCS2V5PiBrZXksIEluZGV4ZWRE Qjo6T2JqZWN0U3RvcmVPdmVyd3JpdGVNb2RlIG92ZXJ3cml0ZU1vZGUsIEV4Y2VwdGlvbkNvZGUm IGVjKQorUmVmUHRyPFdlYkNvcmU6OklEQlJlcXVlc3Q+IElEQk9iamVjdFN0b3JlOjpwdXRGb3JD dXJzb3JVcGRhdGUoSlNDOjpFeGVjU3RhdGUmIHN0YXRlLCBKU0M6OkpTVmFsdWUgdmFsdWUsIEpT Qzo6SlNWYWx1ZSBrZXksIEV4Y2VwdGlvbkNvZGUmIGVjKQoreworICAgIGF1dG8gaWRiS2V5ID0g c2NyaXB0VmFsdWVUb0lEQktleShzdGF0ZSwga2V5KTsKKyAgICByZXR1cm4gcHV0T3JBZGQoc3Rh dGUsIHZhbHVlLCBpZGJLZXksIEluZGV4ZWREQjo6T2JqZWN0U3RvcmVPdmVyd3JpdGVNb2RlOjpP dmVyd3JpdGUsIElubGluZUtleUNoZWNrOjpEb05vdFBlcmZvcm0sIGVjKTsKK30KKworUmVmUHRy PFdlYkNvcmU6OklEQlJlcXVlc3Q+IElEQk9iamVjdFN0b3JlOjpwdXRPckFkZChKU0M6OkV4ZWNT dGF0ZSYgc3RhdGUsIEpTQzo6SlNWYWx1ZSB2YWx1ZSwgUmVmUHRyPElEQktleT4ga2V5LCBJbmRl eGVkREI6Ok9iamVjdFN0b3JlT3ZlcndyaXRlTW9kZSBvdmVyd3JpdGVNb2RlLCBJbmxpbmVLZXlD aGVjayBpbmxpbmVLZXlDaGVjaywgRXhjZXB0aW9uQ29kZSYgZWMpCiB7CiAgICAgTE9HKEluZGV4 ZWREQiwgIklEQk9iamVjdFN0b3JlOjpwdXRPckFkZCIpOwogCkBAIC0yNjEsNyArMjY3LDcgQEAg UmVmUHRyPFdlYkNvcmU6OklEQlJlcXVlc3Q+IElEQk9iamVjdFN0b3JlOjpwdXRPckFkZChKU0M6 OkV4ZWNTdGF0ZSYgc3RhdGUsIEpTQzoKIAogICAgIGJvb2wgdXNlc0lubGluZUtleXMgPSAhbV9p bmZvLmtleVBhdGgoKS5pc051bGwoKTsKICAgICBib29sIHVzZXNLZXlHZW5lcmF0b3IgPSBhdXRv SW5jcmVtZW50KCk7Ci0gICAgaWYgKHVzZXNJbmxpbmVLZXlzKSB7CisgICAgaWYgKHVzZXNJbmxp bmVLZXlzICYmIGlubGluZUtleUNoZWNrID09IElubGluZUtleUNoZWNrOjpQZXJmb3JtKSB7CiAg ICAgICAgIGlmIChrZXkpIHsKICAgICAgICAgICAgIGVjID0gc3RhdGljX2Nhc3Q8RXhjZXB0aW9u Q29kZT4oSURCRXhjZXB0aW9uQ29kZTo6RGF0YUVycm9yKTsKICAgICAgICAgICAgIHJldHVybiBu dWxscHRyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xp ZW50L0lEQk9iamVjdFN0b3JlSW1wbC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVk ZGIvY2xpZW50L0lEQk9iamVjdFN0b3JlSW1wbC5oCmluZGV4IDczZDE2N2UuLmNkMjVlYWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJPYmpl Y3RTdG9yZUltcGwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGll bnQvSURCT2JqZWN0U3RvcmVJbXBsLmgKQEAgLTc4LDYgKzc4LDggQEAgcHVibGljOgogICAgIHZp cnR1YWwgUmVmUHRyPFdlYkNvcmU6OklEQlJlcXVlc3Q+IGNvdW50KFNjcmlwdEV4ZWN1dGlvbkNv bnRleHQqLCBJREJLZXlSYW5nZSosIEV4Y2VwdGlvbkNvZGUmKSBvdmVycmlkZSBmaW5hbDsKICAg ICB2aXJ0dWFsIFJlZlB0cjxXZWJDb3JlOjpJREJSZXF1ZXN0PiBjb3VudChTY3JpcHRFeGVjdXRp b25Db250ZXh0KiwgY29uc3QgRGVwcmVjYXRlZDo6U2NyaXB0VmFsdWUmIGtleSwgRXhjZXB0aW9u Q29kZSYpIG92ZXJyaWRlIGZpbmFsOwogCisgICAgUmVmUHRyPFdlYkNvcmU6OklEQlJlcXVlc3Q+ IHB1dEZvckN1cnNvclVwZGF0ZShKU0M6OkV4ZWNTdGF0ZSYsIEpTQzo6SlNWYWx1ZSwgSlNDOjpK U1ZhbHVlIGtleSwgRXhjZXB0aW9uQ29kZSYpOworCiAgICAgUmVmUHRyPFdlYkNvcmU6OklEQlJl cXVlc3Q+IGRlbGV0ZUZ1bmN0aW9uKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBKU0M6OkpTVmFs dWUga2V5LCBFeGNlcHRpb25Db2RlJik7CiAKICAgICB2b2lkIG1hcmtBc0RlbGV0ZWQoKTsKQEAg LTkyLDcgKzk0LDEyIEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgSURCT2JqZWN0U3RvcmUoY29u c3QgSURCT2JqZWN0U3RvcmVJbmZvJiwgSURCVHJhbnNhY3Rpb24mKTsKIAotICAgIFJlZlB0cjxX ZWJDb3JlOjpJREJSZXF1ZXN0PiBwdXRPckFkZChKU0M6OkV4ZWNTdGF0ZSYsIEpTQzo6SlNWYWx1 ZSwgUmVmUHRyPElEQktleT4sIEluZGV4ZWREQjo6T2JqZWN0U3RvcmVPdmVyd3JpdGVNb2RlLCBF eGNlcHRpb25Db2RlJik7CisgICAgZW51bSBjbGFzcyBJbmxpbmVLZXlDaGVjayB7CisgICAgICAg IFBlcmZvcm0sCisgICAgICAgIERvTm90UGVyZm9ybSwKKyAgICB9OworCisgICAgUmVmUHRyPFdl YkNvcmU6OklEQlJlcXVlc3Q+IHB1dE9yQWRkKEpTQzo6RXhlY1N0YXRlJiwgSlNDOjpKU1ZhbHVl LCBSZWZQdHI8SURCS2V5PiwgSW5kZXhlZERCOjpPYmplY3RTdG9yZU92ZXJ3cml0ZU1vZGUsIElu bGluZUtleUNoZWNrLCBFeGNlcHRpb25Db2RlJik7CiAgICAgUmVmUHRyPFdlYkNvcmU6OklEQlJl cXVlc3Q+IGRvQ291bnQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYsIGNvbnN0IElEQktleVJhbmdl RGF0YSYsIEV4Y2VwdGlvbkNvZGUmKTsKIAogICAgIElEQk9iamVjdFN0b3JlSW5mbyBtX2luZm87 Cg== 266249 2015-11-30 10:30:29 -0800 2015-11-30 10:39:07 -0800 Patch v1 (applies) patch text/plain 8557 beidson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlOGMzZmVjLi5iZmUyNTFjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTQgQEAKIDIwMTUtMTEt MzAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAgICAgIE1vZGVybiBJ REI6IFN1cHBvcnQgdXBkYXRpbmcgY3Vyc29yIHZhbHVlcyB3aGVuIHRoZSBvYmplY3Qgc3RvcmUg dXNlcyBpbmxpbmUga2V5cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE1MTY0NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogcGxhdGZvcm0vbWFjLXdrMS9UZXN0RXhwZWN0YXRpb25zOgorCisyMDE1LTEx LTMwICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKwogICAgICAgICBNb2Rlcm4g SURCOiBTdXBwb3J0IGtleVBhdGggaW5qZWN0aW9uIGludG8gb2JqZWN0IHN0b3JlIHJlY29yZHMu CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTE2NDAK IApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMS9UZXN0RXhwZWN0YXRp b25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMS9UZXN0RXhwZWN0YXRpb25zCmluZGV4 IDUyZjJjMTYuLmEyYjAxNDkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13 azEvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rl c3RFeHBlY3RhdGlvbnMKQEAgLTc5LDYgKzc5LDcgQEAgc3RvcmFnZS9pbmRleGVkZGIvbW96aWxs YS9jcmVhdGUtaW5kZXgtdW5pcXVlLmh0bWwgWyBQYXNzIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL21v emlsbGEvY3JlYXRlLWluZGV4LXdpdGgtaW50ZWdlci1rZXlzLmh0bWwgWyBQYXNzIF0KIHN0b3Jh Z2UvaW5kZXhlZGRiL21vemlsbGEvY3JlYXRlLW9iamVjdHN0b3JlLWJhc2ljcy5odG1sIFsgUGFz cyBdCiBzdG9yYWdlL2luZGV4ZWRkYi9tb3ppbGxhL2NyZWF0ZS1vYmplY3RzdG9yZS1udWxsLW5h bWUuaHRtbCBbIFBhc3MgXQorc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9jdXJzb3ItdXBkYXRl LXVwZGF0ZXMtaW5kZXhlcy5odG1sIFsgUGFzcyBdCiBzdG9yYWdlL2luZGV4ZWRkYi9tb3ppbGxh L2RlbGV0ZS1yZXN1bHQuaHRtbCBbIFBhc3MgXQogc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9l dmVudC1zb3VyY2UuaHRtbCBbIFBhc3MgXQogc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9nbG9i YWwtZGF0YS5odG1sIFsgUGFzcyBdCkBAIC04OSw2ICs5MCw3IEBAIHN0b3JhZ2UvaW5kZXhlZGRi L21vemlsbGEva2V5LXJlcXVpcmVtZW50cy1wdXQtbnVsbC1rZXkuaHRtbCBbIFBhc3MgXQogc3Rv cmFnZS9pbmRleGVkZGIvbW96aWxsYS9rZXktcmVxdWlyZW1lbnRzLmh0bWwgWyBQYXNzIF0KIHN0 b3JhZ2UvaW5kZXhlZGRiL21vemlsbGEvb2JqZWN0LWN1cnNvcnMuaHRtbCBbIFBhc3MgXQogc3Rv cmFnZS9pbmRleGVkZGIvbW96aWxsYS9vYmplY3QtaWRlbnRpdHkuaHRtbCBbIFBhc3MgXQorc3Rv cmFnZS9pbmRleGVkZGIvbW96aWxsYS9vYmplY3Qtc3RvcmUtaW5saW5lLWF1dG9pbmNyZW1lbnQt a2V5LWFkZGVkLW9uLXB1dC5odG1sIFsgUGFzcyBdCiBzdG9yYWdlL2luZGV4ZWRkYi9tb3ppbGxh L29iamVjdC1zdG9yZS1yZW1vdmUtdmFsdWVzLmh0bWwgWyBQYXNzIF0KIHN0b3JhZ2UvaW5kZXhl ZGRiL21vemlsbGEvb2JqZWN0c3RvcmVuYW1lcy5odG1sIFsgUGFzcyBdCiBzdG9yYWdlL2luZGV4 ZWRkYi9tb3ppbGxhL29kZC1yZXN1bHQtb3JkZXIuaHRtbCBbIFBhc3MgXQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4 IGIwZjFiYzQuLjQ3NTIxOWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNCBAQAogMjAxNS0xMS0z MCAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKKyAgICAgICAgTW9kZXJuIElE QjogU3VwcG9ydCB1cGRhdGluZyBjdXJzb3IgdmFsdWVzIHdoZW4gdGhlIG9iamVjdCBzdG9yZSB1 c2VzIGlubGluZSBrZXlzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTUxNjQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgTm8gbmV3IHRlc3RzIChBdCBsZWFzdCB0d28gcHJldmlvdXNseSBmYWlsaW5nIHRl c3RzIG5vdyBwYXNzIGFuZCBhcmUgdW5za2lwcGVkKS4KKworICAgICAgICAqIE1vZHVsZXMvaW5k ZXhlZGRiL2NsaWVudC9JREJDdXJzb3JJbXBsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQkNs aWVudDo6SURCQ3Vyc29yOjp1cGRhdGUpOiBVc2UgcHV0Rm9yQ3Vyc29yVXBkYXRlKCkgaW5zdGVh ZCBvZiBwdXQoKQorICAgICAgICAKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQv SURCT2JqZWN0U3RvcmVJbXBsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQkNsaWVudDo6SURC T2JqZWN0U3RvcmU6OmFkZCk6CisgICAgICAgIChXZWJDb3JlOjpJREJDbGllbnQ6OklEQk9iamVj dFN0b3JlOjpwdXQpOgorICAgICAgICAoV2ViQ29yZTo6SURCQ2xpZW50OjpJREJPYmplY3RTdG9y ZTo6cHV0Rm9yQ3Vyc29yVXBkYXRlKTogVXNlIHRoZSBmbGFnIHRvIHNraXAgdGhlIGlubGluZS1r ZXkgY2hlY2suCisgICAgICAgIChXZWJDb3JlOjpJREJDbGllbnQ6OklEQk9iamVjdFN0b3JlOjpw dXRPckFkZCk6IEFkZCBhIGZsYWcgdG8gc2tpcCB0aGUgaW5saW5lLWtleSBjaGVjay4KKyAgICAg ICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvSURCT2JqZWN0U3RvcmVJbXBsLmg6CisKKzIw MTUtMTEtMzAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCiAgICAgICAgIE1v ZGVybiBJREI6IFN1cHBvcnQga2V5UGF0aCBpbmplY3Rpb24gaW50byBvYmplY3Qgc3RvcmUgcmVj b3Jkcy4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1 MTY0MAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGll bnQvSURCQ3Vyc29ySW1wbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9j bGllbnQvSURCQ3Vyc29ySW1wbC5jcHAKaW5kZXggNGM1ZTczZS4uMTA4ZmRjMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lEQkN1cnNvckltcGwu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJDdXJz b3JJbXBsLmNwcApAQCAtMTM5LDcgKzEzOSw3IEBAIFJlZlB0cjxXZWJDb3JlOjpJREJSZXF1ZXN0 PiBJREJDdXJzb3I6OnVwZGF0ZShKU0M6OkV4ZWNTdGF0ZSYgZXhlYywgRGVwcmVjYXRlZDo6CiAg ICAgICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIAotICAgIHJldHVybiBlZmZlY3RpdmVPYmpl Y3RTdG9yZSgpLnB1dChleGVjLCB2YWx1ZS5qc1ZhbHVlKCksIG1fZGVwcmVjYXRlZEN1cnJlbnRQ cmltYXJ5S2V5LmpzVmFsdWUoKSwgZWMpOworICAgIHJldHVybiBlZmZlY3RpdmVPYmplY3RTdG9y ZSgpLnB1dEZvckN1cnNvclVwZGF0ZShleGVjLCB2YWx1ZS5qc1ZhbHVlKCksIG1fZGVwcmVjYXRl ZEN1cnJlbnRQcmltYXJ5S2V5LmpzVmFsdWUoKSwgZWMpOwogfQogCiB2b2lkIElEQkN1cnNvcjo6 YWR2YW5jZSh1bnNpZ25lZCBsb25nIGNvdW50LCBFeGNlcHRpb25Db2RlJiBlYykKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJPYmplY3RTdG9y ZUltcGwuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lEQk9i amVjdFN0b3JlSW1wbC5jcHAKaW5kZXggMTA3MmFjMy4uZjAzMjU1YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lEQk9iamVjdFN0b3JlSW1wbC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lEQk9iamVj dFN0b3JlSW1wbC5jcHAKQEAgLTIwMywyNyArMjAzLDMzIEBAIFJlZlB0cjxXZWJDb3JlOjpJREJS ZXF1ZXN0PiBJREJPYmplY3RTdG9yZTo6Z2V0KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRl eHQsCiAKIFJlZlB0cjxXZWJDb3JlOjpJREJSZXF1ZXN0PiBJREJPYmplY3RTdG9yZTo6YWRkKEpT Qzo6RXhlY1N0YXRlJiBzdGF0ZSwgSlNDOjpKU1ZhbHVlIHZhbHVlLCBFeGNlcHRpb25Db2RlJiBl YykKIHsKLSAgICByZXR1cm4gcHV0T3JBZGQoc3RhdGUsIHZhbHVlLCBudWxscHRyLCBJbmRleGVk REI6Ok9iamVjdFN0b3JlT3ZlcndyaXRlTW9kZTo6Tm9PdmVyd3JpdGUsIGVjKTsKKyAgICByZXR1 cm4gcHV0T3JBZGQoc3RhdGUsIHZhbHVlLCBudWxscHRyLCBJbmRleGVkREI6Ok9iamVjdFN0b3Jl T3ZlcndyaXRlTW9kZTo6Tm9PdmVyd3JpdGUsIElubGluZUtleUNoZWNrOjpQZXJmb3JtLCBlYyk7 CiB9CiAKIFJlZlB0cjxXZWJDb3JlOjpJREJSZXF1ZXN0PiBJREJPYmplY3RTdG9yZTo6YWRkKEpT Qzo6RXhlY1N0YXRlJiBleGVjU3RhdGUsIEpTQzo6SlNWYWx1ZSB2YWx1ZSwgSlNDOjpKU1ZhbHVl IGtleSwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7CiAgICAgYXV0byBpZGJLZXkgPSBzY3JpcHRWYWx1 ZVRvSURCS2V5KGV4ZWNTdGF0ZSwga2V5KTsKLSAgICByZXR1cm4gcHV0T3JBZGQoZXhlY1N0YXRl LCB2YWx1ZSwgaWRiS2V5LCBJbmRleGVkREI6Ok9iamVjdFN0b3JlT3ZlcndyaXRlTW9kZTo6Tm9P dmVyd3JpdGUsIGVjKTsKKyAgICByZXR1cm4gcHV0T3JBZGQoZXhlY1N0YXRlLCB2YWx1ZSwgaWRi S2V5LCBJbmRleGVkREI6Ok9iamVjdFN0b3JlT3ZlcndyaXRlTW9kZTo6Tm9PdmVyd3JpdGUsIElu bGluZUtleUNoZWNrOjpQZXJmb3JtLCBlYyk7CiB9CiAKIFJlZlB0cjxXZWJDb3JlOjpJREJSZXF1 ZXN0PiBJREJPYmplY3RTdG9yZTo6cHV0KEpTQzo6RXhlY1N0YXRlJiBleGVjU3RhdGUsIEpTQzo6 SlNWYWx1ZSB2YWx1ZSwgSlNDOjpKU1ZhbHVlIGtleSwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7CiAg ICAgYXV0byBpZGJLZXkgPSBzY3JpcHRWYWx1ZVRvSURCS2V5KGV4ZWNTdGF0ZSwga2V5KTsKLSAg ICByZXR1cm4gcHV0T3JBZGQoZXhlY1N0YXRlLCB2YWx1ZSwgaWRiS2V5LCBJbmRleGVkREI6Ok9i amVjdFN0b3JlT3ZlcndyaXRlTW9kZTo6T3ZlcndyaXRlLCBlYyk7CisgICAgcmV0dXJuIHB1dE9y QWRkKGV4ZWNTdGF0ZSwgdmFsdWUsIGlkYktleSwgSW5kZXhlZERCOjpPYmplY3RTdG9yZU92ZXJ3 cml0ZU1vZGU6Ok92ZXJ3cml0ZSwgSW5saW5lS2V5Q2hlY2s6OlBlcmZvcm0sIGVjKTsKIH0KIAog UmVmUHRyPFdlYkNvcmU6OklEQlJlcXVlc3Q+IElEQk9iamVjdFN0b3JlOjpwdXQoSlNDOjpFeGVj U3RhdGUmIHN0YXRlLCBKU0M6OkpTVmFsdWUgdmFsdWUsIEV4Y2VwdGlvbkNvZGUmIGVjKQogewot ICAgIHJldHVybiBwdXRPckFkZChzdGF0ZSwgdmFsdWUsIG51bGxwdHIsIEluZGV4ZWREQjo6T2Jq ZWN0U3RvcmVPdmVyd3JpdGVNb2RlOjpPdmVyd3JpdGUsIGVjKTsKKyAgICByZXR1cm4gcHV0T3JB ZGQoc3RhdGUsIHZhbHVlLCBudWxscHRyLCBJbmRleGVkREI6Ok9iamVjdFN0b3JlT3ZlcndyaXRl TW9kZTo6T3ZlcndyaXRlLCBJbmxpbmVLZXlDaGVjazo6UGVyZm9ybSwgZWMpOwogfQogCi1SZWZQ dHI8V2ViQ29yZTo6SURCUmVxdWVzdD4gSURCT2JqZWN0U3RvcmU6OnB1dE9yQWRkKEpTQzo6RXhl Y1N0YXRlJiBzdGF0ZSwgSlNDOjpKU1ZhbHVlIHZhbHVlLCBSZWZQdHI8SURCS2V5PiBrZXksIElu ZGV4ZWREQjo6T2JqZWN0U3RvcmVPdmVyd3JpdGVNb2RlIG92ZXJ3cml0ZU1vZGUsIEV4Y2VwdGlv bkNvZGUmIGVjKQorUmVmUHRyPFdlYkNvcmU6OklEQlJlcXVlc3Q+IElEQk9iamVjdFN0b3JlOjpw dXRGb3JDdXJzb3JVcGRhdGUoSlNDOjpFeGVjU3RhdGUmIHN0YXRlLCBKU0M6OkpTVmFsdWUgdmFs dWUsIEpTQzo6SlNWYWx1ZSBrZXksIEV4Y2VwdGlvbkNvZGUmIGVjKQoreworICAgIGF1dG8gaWRi S2V5ID0gc2NyaXB0VmFsdWVUb0lEQktleShzdGF0ZSwga2V5KTsKKyAgICByZXR1cm4gcHV0T3JB ZGQoc3RhdGUsIHZhbHVlLCBpZGJLZXksIEluZGV4ZWREQjo6T2JqZWN0U3RvcmVPdmVyd3JpdGVN b2RlOjpPdmVyd3JpdGUsIElubGluZUtleUNoZWNrOjpEb05vdFBlcmZvcm0sIGVjKTsKK30KKwor UmVmUHRyPFdlYkNvcmU6OklEQlJlcXVlc3Q+IElEQk9iamVjdFN0b3JlOjpwdXRPckFkZChKU0M6 OkV4ZWNTdGF0ZSYgc3RhdGUsIEpTQzo6SlNWYWx1ZSB2YWx1ZSwgUmVmUHRyPElEQktleT4ga2V5 LCBJbmRleGVkREI6Ok9iamVjdFN0b3JlT3ZlcndyaXRlTW9kZSBvdmVyd3JpdGVNb2RlLCBJbmxp bmVLZXlDaGVjayBpbmxpbmVLZXlDaGVjaywgRXhjZXB0aW9uQ29kZSYgZWMpCiB7CiAgICAgTE9H KEluZGV4ZWREQiwgIklEQk9iamVjdFN0b3JlOjpwdXRPckFkZCIpOwogCkBAIC0yNjEsNyArMjY3 LDcgQEAgUmVmUHRyPFdlYkNvcmU6OklEQlJlcXVlc3Q+IElEQk9iamVjdFN0b3JlOjpwdXRPckFk ZChKU0M6OkV4ZWNTdGF0ZSYgc3RhdGUsIEpTQzoKIAogICAgIGJvb2wgdXNlc0lubGluZUtleXMg PSAhbV9pbmZvLmtleVBhdGgoKS5pc051bGwoKTsKICAgICBib29sIHVzZXNLZXlHZW5lcmF0b3Ig PSBhdXRvSW5jcmVtZW50KCk7Ci0gICAgaWYgKHVzZXNJbmxpbmVLZXlzKSB7CisgICAgaWYgKHVz ZXNJbmxpbmVLZXlzICYmIGlubGluZUtleUNoZWNrID09IElubGluZUtleUNoZWNrOjpQZXJmb3Jt KSB7CiAgICAgICAgIGlmIChrZXkpIHsKICAgICAgICAgICAgIGVjID0gc3RhdGljX2Nhc3Q8RXhj ZXB0aW9uQ29kZT4oSURCRXhjZXB0aW9uQ29kZTo6RGF0YUVycm9yKTsKICAgICAgICAgICAgIHJl dHVybiBudWxscHRyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVk ZGIvY2xpZW50L0lEQk9iamVjdFN0b3JlSW1wbC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvY2xpZW50L0lEQk9iamVjdFN0b3JlSW1wbC5oCmluZGV4IDczZDE2N2UuLmNkMjVl YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9J REJPYmplY3RTdG9yZUltcGwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9jbGllbnQvSURCT2JqZWN0U3RvcmVJbXBsLmgKQEAgLTc4LDYgKzc4LDggQEAgcHVibGljOgog ICAgIHZpcnR1YWwgUmVmUHRyPFdlYkNvcmU6OklEQlJlcXVlc3Q+IGNvdW50KFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQqLCBJREJLZXlSYW5nZSosIEV4Y2VwdGlvbkNvZGUmKSBvdmVycmlkZSBmaW5h bDsKICAgICB2aXJ0dWFsIFJlZlB0cjxXZWJDb3JlOjpJREJSZXF1ZXN0PiBjb3VudChTY3JpcHRF eGVjdXRpb25Db250ZXh0KiwgY29uc3QgRGVwcmVjYXRlZDo6U2NyaXB0VmFsdWUmIGtleSwgRXhj ZXB0aW9uQ29kZSYpIG92ZXJyaWRlIGZpbmFsOwogCisgICAgUmVmUHRyPFdlYkNvcmU6OklEQlJl cXVlc3Q+IHB1dEZvckN1cnNvclVwZGF0ZShKU0M6OkV4ZWNTdGF0ZSYsIEpTQzo6SlNWYWx1ZSwg SlNDOjpKU1ZhbHVlIGtleSwgRXhjZXB0aW9uQ29kZSYpOworCiAgICAgUmVmUHRyPFdlYkNvcmU6 OklEQlJlcXVlc3Q+IGRlbGV0ZUZ1bmN0aW9uKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBKU0M6 OkpTVmFsdWUga2V5LCBFeGNlcHRpb25Db2RlJik7CiAKICAgICB2b2lkIG1hcmtBc0RlbGV0ZWQo KTsKQEAgLTkyLDcgKzk0LDEyIEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgSURCT2JqZWN0U3Rv cmUoY29uc3QgSURCT2JqZWN0U3RvcmVJbmZvJiwgSURCVHJhbnNhY3Rpb24mKTsKIAotICAgIFJl ZlB0cjxXZWJDb3JlOjpJREJSZXF1ZXN0PiBwdXRPckFkZChKU0M6OkV4ZWNTdGF0ZSYsIEpTQzo6 SlNWYWx1ZSwgUmVmUHRyPElEQktleT4sIEluZGV4ZWREQjo6T2JqZWN0U3RvcmVPdmVyd3JpdGVN b2RlLCBFeGNlcHRpb25Db2RlJik7CisgICAgZW51bSBjbGFzcyBJbmxpbmVLZXlDaGVjayB7Cisg ICAgICAgIFBlcmZvcm0sCisgICAgICAgIERvTm90UGVyZm9ybSwKKyAgICB9OworCisgICAgUmVm UHRyPFdlYkNvcmU6OklEQlJlcXVlc3Q+IHB1dE9yQWRkKEpTQzo6RXhlY1N0YXRlJiwgSlNDOjpK U1ZhbHVlLCBSZWZQdHI8SURCS2V5PiwgSW5kZXhlZERCOjpPYmplY3RTdG9yZU92ZXJ3cml0ZU1v ZGUsIElubGluZUtleUNoZWNrLCBFeGNlcHRpb25Db2RlJik7CiAgICAgUmVmUHRyPFdlYkNvcmU6 OklEQlJlcXVlc3Q+IGRvQ291bnQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYsIGNvbnN0IElEQktl eVJhbmdlRGF0YSYsIEV4Y2VwdGlvbkNvZGUmKTsKIAogICAgIElEQk9iamVjdFN0b3JlSW5mbyBt X2luZm87Cg== 266252 2015-11-30 10:39:07 -0800 2015-11-30 10:43:16 -0800 Patch v1 (really applies) patch text/plain 8567 beidson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5MjI5OTkzLi4wYjk2M2ZmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTQgQEAKIDIwMTUtMTEt MzAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAgICAgIE1vZGVybiBJ REI6IFN1cHBvcnQgdXBkYXRpbmcgY3Vyc29yIHZhbHVlcyB3aGVuIHRoZSBvYmplY3Qgc3RvcmUg dXNlcyBpbmxpbmUga2V5cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE1MTY0NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogcGxhdGZvcm0vbWFjLXdrMS9UZXN0RXhwZWN0YXRpb25zOgorCisyMDE1LTEx LTMwICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKwogICAgICAgICBNb2Rlcm4g SURCOiBvcGVuQ3Vyc29yKCkgZml4IHJlc3VsdGluZyBpbiBhdCBsZWFzdCA0IG1vcmUgcGFzc2lu ZyB0ZXN0cy4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE1MTYzMAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RF eHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBlY3RhdGlv bnMKaW5kZXggMTE2YWFlNy4uZDcwZmU3NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vbWFjLXdrMS9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21h Yy13azEvVGVzdEV4cGVjdGF0aW9ucwpAQCAtODIsNiArODIsNyBAQCBzdG9yYWdlL2luZGV4ZWRk Yi9tb3ppbGxhL2NyZWF0ZS1vYmplY3RzdG9yZS1iYXNpY3MuaHRtbCBbIFBhc3MgXQogc3RvcmFn ZS9pbmRleGVkZGIvbW96aWxsYS9jcmVhdGUtb2JqZWN0c3RvcmUtbnVsbC1uYW1lLmh0bWwgWyBQ YXNzIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL21vemlsbGEvY3Vyc29yLW11dGF0aW9uLW9iamVjdHN0 b3JlLW9ubHkuaHRtbCBbIFBhc3MgXQogc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9jdXJzb3It bXV0YXRpb24uaHRtbCBbIFBhc3MgXQorc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9jdXJzb3It dXBkYXRlLXVwZGF0ZXMtaW5kZXhlcy5odG1sIFsgUGFzcyBdCiBzdG9yYWdlL2luZGV4ZWRkYi9t b3ppbGxhL2RlbGV0ZS1yZXN1bHQuaHRtbCBbIFBhc3MgXQogc3RvcmFnZS9pbmRleGVkZGIvbW96 aWxsYS9ldmVudC1zb3VyY2UuaHRtbCBbIFBhc3MgXQogc3RvcmFnZS9pbmRleGVkZGIvbW96aWxs YS9nbG9iYWwtZGF0YS5odG1sIFsgUGFzcyBdCkBAIC05Miw2ICs5Myw3IEBAIHN0b3JhZ2UvaW5k ZXhlZGRiL21vemlsbGEva2V5LXJlcXVpcmVtZW50cy1wdXQtbnVsbC1rZXkuaHRtbCBbIFBhc3Mg XQogc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9rZXktcmVxdWlyZW1lbnRzLmh0bWwgWyBQYXNz IF0KIHN0b3JhZ2UvaW5kZXhlZGRiL21vemlsbGEvb2JqZWN0LWN1cnNvcnMuaHRtbCBbIFBhc3Mg XQogc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9vYmplY3QtaWRlbnRpdHkuaHRtbCBbIFBhc3Mg XQorc3RvcmFnZS9pbmRleGVkZGIvbW96aWxsYS9vYmplY3Qtc3RvcmUtaW5saW5lLWF1dG9pbmNy ZW1lbnQta2V5LWFkZGVkLW9uLXB1dC5odG1sIFsgUGFzcyBdCiBzdG9yYWdlL2luZGV4ZWRkYi9t b3ppbGxhL29iamVjdC1zdG9yZS1yZW1vdmUtdmFsdWVzLmh0bWwgWyBQYXNzIF0KIHN0b3JhZ2Uv aW5kZXhlZGRiL21vemlsbGEvb2JqZWN0c3RvcmVuYW1lcy5odG1sIFsgUGFzcyBdCiBzdG9yYWdl L2luZGV4ZWRkYi9tb3ppbGxhL29kZC1yZXN1bHQtb3JkZXIuaHRtbCBbIFBhc3MgXQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CmluZGV4IDNkZDU0Y2IuLjkyMmM0OWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNCBAQAogMjAx NS0xMS0zMCAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKKyAgICAgICAgTW9k ZXJuIElEQjogU3VwcG9ydCB1cGRhdGluZyBjdXJzb3IgdmFsdWVzIHdoZW4gdGhlIG9iamVjdCBz dG9yZSB1c2VzIGlubGluZSBrZXlzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTUxNjQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChBdCBsZWFzdCB0d28gcHJldmlvdXNseSBmYWls aW5nIHRlc3RzIG5vdyBwYXNzIGFuZCBhcmUgdW5za2lwcGVkKS4KKworICAgICAgICAqIE1vZHVs ZXMvaW5kZXhlZGRiL2NsaWVudC9JREJDdXJzb3JJbXBsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OklEQkNsaWVudDo6SURCQ3Vyc29yOjp1cGRhdGUpOiBVc2UgcHV0Rm9yQ3Vyc29yVXBkYXRlKCkg aW5zdGVhZCBvZiBwdXQoKQorICAgICAgICAKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9j bGllbnQvSURCT2JqZWN0U3RvcmVJbXBsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQkNsaWVu dDo6SURCT2JqZWN0U3RvcmU6OmFkZCk6CisgICAgICAgIChXZWJDb3JlOjpJREJDbGllbnQ6OklE Qk9iamVjdFN0b3JlOjpwdXQpOgorICAgICAgICAoV2ViQ29yZTo6SURCQ2xpZW50OjpJREJPYmpl Y3RTdG9yZTo6cHV0Rm9yQ3Vyc29yVXBkYXRlKTogVXNlIHRoZSBmbGFnIHRvIHNraXAgdGhlIGlu bGluZS1rZXkgY2hlY2suCisgICAgICAgIChXZWJDb3JlOjpJREJDbGllbnQ6OklEQk9iamVjdFN0 b3JlOjpwdXRPckFkZCk6IEFkZCBhIGZsYWcgdG8gc2tpcCB0aGUgaW5saW5lLWtleSBjaGVjay4K KyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvSURCT2JqZWN0U3RvcmVJbXBsLmg6 CisKKzIwMTUtMTEtMzAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCiAgICAg ICAgIE1vZGVybiBJREI6IFJlc29sdmUgZmxha3kgR0MtdnMtd3JhcHBlciBpc3N1ZSB3aXRoIElE Qk9wZW5EQlJlcXVlc3QuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNTE2NDUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRl eGVkZGIvY2xpZW50L0lEQkN1cnNvckltcGwuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvY2xpZW50L0lEQkN1cnNvckltcGwuY3BwCmluZGV4IDRjNWU3M2UuLjEwOGZkYzEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJD dXJzb3JJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGll bnQvSURCQ3Vyc29ySW1wbC5jcHAKQEAgLTEzOSw3ICsxMzksNyBAQCBSZWZQdHI8V2ViQ29yZTo6 SURCUmVxdWVzdD4gSURCQ3Vyc29yOjp1cGRhdGUoSlNDOjpFeGVjU3RhdGUmIGV4ZWMsIERlcHJl Y2F0ZWQ6OgogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAKLSAgICByZXR1cm4gZWZm ZWN0aXZlT2JqZWN0U3RvcmUoKS5wdXQoZXhlYywgdmFsdWUuanNWYWx1ZSgpLCBtX2RlcHJlY2F0 ZWRDdXJyZW50UHJpbWFyeUtleS5qc1ZhbHVlKCksIGVjKTsKKyAgICByZXR1cm4gZWZmZWN0aXZl T2JqZWN0U3RvcmUoKS5wdXRGb3JDdXJzb3JVcGRhdGUoZXhlYywgdmFsdWUuanNWYWx1ZSgpLCBt X2RlcHJlY2F0ZWRDdXJyZW50UHJpbWFyeUtleS5qc1ZhbHVlKCksIGVjKTsKIH0KIAogdm9pZCBJ REJDdXJzb3I6OmFkdmFuY2UodW5zaWduZWQgbG9uZyBjb3VudCwgRXhjZXB0aW9uQ29kZSYgZWMp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvSURC T2JqZWN0U3RvcmVJbXBsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2Ns aWVudC9JREJPYmplY3RTdG9yZUltcGwuY3BwCmluZGV4IDEwNzJhYzMuLmYwMzI1NWEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJPYmplY3RT dG9yZUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVu dC9JREJPYmplY3RTdG9yZUltcGwuY3BwCkBAIC0yMDMsMjcgKzIwMywzMyBAQCBSZWZQdHI8V2Vi Q29yZTo6SURCUmVxdWVzdD4gSURCT2JqZWN0U3RvcmU6OmdldChTY3JpcHRFeGVjdXRpb25Db250 ZXh0KiBjb250ZXh0LAogCiBSZWZQdHI8V2ViQ29yZTo6SURCUmVxdWVzdD4gSURCT2JqZWN0U3Rv cmU6OmFkZChKU0M6OkV4ZWNTdGF0ZSYgc3RhdGUsIEpTQzo6SlNWYWx1ZSB2YWx1ZSwgRXhjZXB0 aW9uQ29kZSYgZWMpCiB7Ci0gICAgcmV0dXJuIHB1dE9yQWRkKHN0YXRlLCB2YWx1ZSwgbnVsbHB0 ciwgSW5kZXhlZERCOjpPYmplY3RTdG9yZU92ZXJ3cml0ZU1vZGU6Ok5vT3ZlcndyaXRlLCBlYyk7 CisgICAgcmV0dXJuIHB1dE9yQWRkKHN0YXRlLCB2YWx1ZSwgbnVsbHB0ciwgSW5kZXhlZERCOjpP YmplY3RTdG9yZU92ZXJ3cml0ZU1vZGU6Ok5vT3ZlcndyaXRlLCBJbmxpbmVLZXlDaGVjazo6UGVy Zm9ybSwgZWMpOwogfQogCiBSZWZQdHI8V2ViQ29yZTo6SURCUmVxdWVzdD4gSURCT2JqZWN0U3Rv cmU6OmFkZChKU0M6OkV4ZWNTdGF0ZSYgZXhlY1N0YXRlLCBKU0M6OkpTVmFsdWUgdmFsdWUsIEpT Qzo6SlNWYWx1ZSBrZXksIEV4Y2VwdGlvbkNvZGUmIGVjKQogewogICAgIGF1dG8gaWRiS2V5ID0g c2NyaXB0VmFsdWVUb0lEQktleShleGVjU3RhdGUsIGtleSk7Ci0gICAgcmV0dXJuIHB1dE9yQWRk KGV4ZWNTdGF0ZSwgdmFsdWUsIGlkYktleSwgSW5kZXhlZERCOjpPYmplY3RTdG9yZU92ZXJ3cml0 ZU1vZGU6Ok5vT3ZlcndyaXRlLCBlYyk7CisgICAgcmV0dXJuIHB1dE9yQWRkKGV4ZWNTdGF0ZSwg dmFsdWUsIGlkYktleSwgSW5kZXhlZERCOjpPYmplY3RTdG9yZU92ZXJ3cml0ZU1vZGU6Ok5vT3Zl cndyaXRlLCBJbmxpbmVLZXlDaGVjazo6UGVyZm9ybSwgZWMpOwogfQogCiBSZWZQdHI8V2ViQ29y ZTo6SURCUmVxdWVzdD4gSURCT2JqZWN0U3RvcmU6OnB1dChKU0M6OkV4ZWNTdGF0ZSYgZXhlY1N0 YXRlLCBKU0M6OkpTVmFsdWUgdmFsdWUsIEpTQzo6SlNWYWx1ZSBrZXksIEV4Y2VwdGlvbkNvZGUm IGVjKQogewogICAgIGF1dG8gaWRiS2V5ID0gc2NyaXB0VmFsdWVUb0lEQktleShleGVjU3RhdGUs IGtleSk7Ci0gICAgcmV0dXJuIHB1dE9yQWRkKGV4ZWNTdGF0ZSwgdmFsdWUsIGlkYktleSwgSW5k ZXhlZERCOjpPYmplY3RTdG9yZU92ZXJ3cml0ZU1vZGU6Ok92ZXJ3cml0ZSwgZWMpOworICAgIHJl dHVybiBwdXRPckFkZChleGVjU3RhdGUsIHZhbHVlLCBpZGJLZXksIEluZGV4ZWREQjo6T2JqZWN0 U3RvcmVPdmVyd3JpdGVNb2RlOjpPdmVyd3JpdGUsIElubGluZUtleUNoZWNrOjpQZXJmb3JtLCBl Yyk7CiB9CiAKIFJlZlB0cjxXZWJDb3JlOjpJREJSZXF1ZXN0PiBJREJPYmplY3RTdG9yZTo6cHV0 KEpTQzo6RXhlY1N0YXRlJiBzdGF0ZSwgSlNDOjpKU1ZhbHVlIHZhbHVlLCBFeGNlcHRpb25Db2Rl JiBlYykKIHsKLSAgICByZXR1cm4gcHV0T3JBZGQoc3RhdGUsIHZhbHVlLCBudWxscHRyLCBJbmRl eGVkREI6Ok9iamVjdFN0b3JlT3ZlcndyaXRlTW9kZTo6T3ZlcndyaXRlLCBlYyk7CisgICAgcmV0 dXJuIHB1dE9yQWRkKHN0YXRlLCB2YWx1ZSwgbnVsbHB0ciwgSW5kZXhlZERCOjpPYmplY3RTdG9y ZU92ZXJ3cml0ZU1vZGU6Ok92ZXJ3cml0ZSwgSW5saW5lS2V5Q2hlY2s6OlBlcmZvcm0sIGVjKTsK IH0KIAotUmVmUHRyPFdlYkNvcmU6OklEQlJlcXVlc3Q+IElEQk9iamVjdFN0b3JlOjpwdXRPckFk ZChKU0M6OkV4ZWNTdGF0ZSYgc3RhdGUsIEpTQzo6SlNWYWx1ZSB2YWx1ZSwgUmVmUHRyPElEQktl eT4ga2V5LCBJbmRleGVkREI6Ok9iamVjdFN0b3JlT3ZlcndyaXRlTW9kZSBvdmVyd3JpdGVNb2Rl LCBFeGNlcHRpb25Db2RlJiBlYykKK1JlZlB0cjxXZWJDb3JlOjpJREJSZXF1ZXN0PiBJREJPYmpl Y3RTdG9yZTo6cHV0Rm9yQ3Vyc29yVXBkYXRlKEpTQzo6RXhlY1N0YXRlJiBzdGF0ZSwgSlNDOjpK U1ZhbHVlIHZhbHVlLCBKU0M6OkpTVmFsdWUga2V5LCBFeGNlcHRpb25Db2RlJiBlYykKK3sKKyAg ICBhdXRvIGlkYktleSA9IHNjcmlwdFZhbHVlVG9JREJLZXkoc3RhdGUsIGtleSk7CisgICAgcmV0 dXJuIHB1dE9yQWRkKHN0YXRlLCB2YWx1ZSwgaWRiS2V5LCBJbmRleGVkREI6Ok9iamVjdFN0b3Jl T3ZlcndyaXRlTW9kZTo6T3ZlcndyaXRlLCBJbmxpbmVLZXlDaGVjazo6RG9Ob3RQZXJmb3JtLCBl Yyk7Cit9CisKK1JlZlB0cjxXZWJDb3JlOjpJREJSZXF1ZXN0PiBJREJPYmplY3RTdG9yZTo6cHV0 T3JBZGQoSlNDOjpFeGVjU3RhdGUmIHN0YXRlLCBKU0M6OkpTVmFsdWUgdmFsdWUsIFJlZlB0cjxJ REJLZXk+IGtleSwgSW5kZXhlZERCOjpPYmplY3RTdG9yZU92ZXJ3cml0ZU1vZGUgb3ZlcndyaXRl TW9kZSwgSW5saW5lS2V5Q2hlY2sgaW5saW5lS2V5Q2hlY2ssIEV4Y2VwdGlvbkNvZGUmIGVjKQog ewogICAgIExPRyhJbmRleGVkREIsICJJREJPYmplY3RTdG9yZTo6cHV0T3JBZGQiKTsKIApAQCAt MjYxLDcgKzI2Nyw3IEBAIFJlZlB0cjxXZWJDb3JlOjpJREJSZXF1ZXN0PiBJREJPYmplY3RTdG9y ZTo6cHV0T3JBZGQoSlNDOjpFeGVjU3RhdGUmIHN0YXRlLCBKU0M6CiAKICAgICBib29sIHVzZXNJ bmxpbmVLZXlzID0gIW1faW5mby5rZXlQYXRoKCkuaXNOdWxsKCk7CiAgICAgYm9vbCB1c2VzS2V5 R2VuZXJhdG9yID0gYXV0b0luY3JlbWVudCgpOwotICAgIGlmICh1c2VzSW5saW5lS2V5cykgewor ICAgIGlmICh1c2VzSW5saW5lS2V5cyAmJiBpbmxpbmVLZXlDaGVjayA9PSBJbmxpbmVLZXlDaGVj azo6UGVyZm9ybSkgewogICAgICAgICBpZiAoa2V5KSB7CiAgICAgICAgICAgICBlYyA9IHN0YXRp Y19jYXN0PEV4Y2VwdGlvbkNvZGU+KElEQkV4Y2VwdGlvbkNvZGU6OkRhdGFFcnJvcik7CiAgICAg ICAgICAgICByZXR1cm4gbnVsbHB0cjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL2NsaWVudC9JREJPYmplY3RTdG9yZUltcGwuaCBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJPYmplY3RTdG9yZUltcGwuaAppbmRleCA3M2Qx NjdlLi5jZDI1ZWFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9jbGllbnQvSURCT2JqZWN0U3RvcmVJbXBsLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9pbmRleGVkZGIvY2xpZW50L0lEQk9iamVjdFN0b3JlSW1wbC5oCkBAIC03OCw2ICs3OCw4IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIFJlZlB0cjxXZWJDb3JlOjpJREJSZXF1ZXN0PiBjb3VudChT Y3JpcHRFeGVjdXRpb25Db250ZXh0KiwgSURCS2V5UmFuZ2UqLCBFeGNlcHRpb25Db2RlJikgb3Zl cnJpZGUgZmluYWw7CiAgICAgdmlydHVhbCBSZWZQdHI8V2ViQ29yZTo6SURCUmVxdWVzdD4gY291 bnQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIGNvbnN0IERlcHJlY2F0ZWQ6OlNjcmlwdFZhbHVl JiBrZXksIEV4Y2VwdGlvbkNvZGUmKSBvdmVycmlkZSBmaW5hbDsKIAorICAgIFJlZlB0cjxXZWJD b3JlOjpJREJSZXF1ZXN0PiBwdXRGb3JDdXJzb3JVcGRhdGUoSlNDOjpFeGVjU3RhdGUmLCBKU0M6 OkpTVmFsdWUsIEpTQzo6SlNWYWx1ZSBrZXksIEV4Y2VwdGlvbkNvZGUmKTsKKwogICAgIFJlZlB0 cjxXZWJDb3JlOjpJREJSZXF1ZXN0PiBkZWxldGVGdW5jdGlvbihTY3JpcHRFeGVjdXRpb25Db250 ZXh0KiwgSlNDOjpKU1ZhbHVlIGtleSwgRXhjZXB0aW9uQ29kZSYpOwogCiAgICAgdm9pZCBtYXJr QXNEZWxldGVkKCk7CkBAIC05Miw3ICs5NCwxMiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIElE Qk9iamVjdFN0b3JlKGNvbnN0IElEQk9iamVjdFN0b3JlSW5mbyYsIElEQlRyYW5zYWN0aW9uJik7 CiAKLSAgICBSZWZQdHI8V2ViQ29yZTo6SURCUmVxdWVzdD4gcHV0T3JBZGQoSlNDOjpFeGVjU3Rh dGUmLCBKU0M6OkpTVmFsdWUsIFJlZlB0cjxJREJLZXk+LCBJbmRleGVkREI6Ok9iamVjdFN0b3Jl T3ZlcndyaXRlTW9kZSwgRXhjZXB0aW9uQ29kZSYpOworICAgIGVudW0gY2xhc3MgSW5saW5lS2V5 Q2hlY2sgeworICAgICAgICBQZXJmb3JtLAorICAgICAgICBEb05vdFBlcmZvcm0sCisgICAgfTsK KworICAgIFJlZlB0cjxXZWJDb3JlOjpJREJSZXF1ZXN0PiBwdXRPckFkZChKU0M6OkV4ZWNTdGF0 ZSYsIEpTQzo6SlNWYWx1ZSwgUmVmUHRyPElEQktleT4sIEluZGV4ZWREQjo6T2JqZWN0U3RvcmVP dmVyd3JpdGVNb2RlLCBJbmxpbmVLZXlDaGVjaywgRXhjZXB0aW9uQ29kZSYpOwogICAgIFJlZlB0 cjxXZWJDb3JlOjpJREJSZXF1ZXN0PiBkb0NvdW50KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmLCBj b25zdCBJREJLZXlSYW5nZURhdGEmLCBFeGNlcHRpb25Db2RlJik7CiAKICAgICBJREJPYmplY3RT dG9yZUluZm8gbV9pbmZvOwo=