156418 2016-04-08 13:30:49 -0700 Modern IDB: Use more IDBValue and IDBGetResult in IDBBackingStore 2016-04-08 15:05:15 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 149117 1 beidson beidson achristensen alecflett commit-queue jsbell oldest_to_newest 1182290 0 beidson 2016-04-08 13:30:49 -0700 Modern IDB: Use more IDBValue and IDBGetResult in IDBBackingStore 1182294 1 276037 beidson 2016-04-08 13:40:40 -0700 Created attachment 276037 Patch v1 Not for review yet, patch in 156416 has to land first. 1182320 2 commit-queue 2016-04-08 14:33:55 -0700 Attachment 276037 did not pass style-queue: ERROR: Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.h:76: The parameter name "value" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 12 files If any of these errors are false positives, please file a bug against check-webkit-style. 1182323 3 beidson 2016-04-08 15:05:15 -0700 https://trac.webkit.org/changeset/199250 276037 2016-04-08 13:40:40 -0700 2016-04-08 14:57:55 -0700 Patch v1 patch text/plain 20685 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxNTM1NjRkLi41YTUyY2UyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDEg QEAKIDIwMTYtMDQtMDggIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIE1vZGVybiBJREI6IFVzZSBtb3JlIElEQlZhbHVlIGFuZCBJREJHZXRSZXN1bHQgaW4gSURC QmFja2luZ1N0b3JlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTU2NDE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIChSZWZhY3Rvciwgbm8gY2hhbmdlIGluIGJlaGF2aW9yKS4KKwor ICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL0lEQlZhbHVlLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OklEQlZhbHVlOjpJREJWYWx1ZSk6CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURC VmFsdWUuaDoKKyAgICAgICAgCisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL0lE QkJhY2tpbmdTdG9yZS5oOgorICAgICAgICAKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9z ZXJ2ZXIvTWVtb3J5QmFja2luZ1N0b3JlVHJhbnNhY3Rpb24uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SURCU2VydmVyOjpNZW1vcnlCYWNraW5nU3RvcmVUcmFuc2FjdGlvbjo6YWJvcnQpOgorICAg ICAgICAKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5SURCQmFja2lu Z1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6TWVtb3J5SURCQmFja2lu Z1N0b3JlOjphZGRSZWNvcmQpOgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpNZW1vcnlJ REJCYWNraW5nU3RvcmU6OmdldFJlY29yZCk6CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIv c2VydmVyL01lbW9yeUlEQkJhY2tpbmdTdG9yZS5oOgorICAgICAgICAKKyAgICAgICAgKiBNb2R1 bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5T2JqZWN0U3RvcmUuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SURCU2VydmVyOjpNZW1vcnlPYmplY3RTdG9yZTo6YWRkUmVjb3JkKToKKyAgICAgICAg KiBNb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5T2JqZWN0U3RvcmUuaDoKKyAgICAgICAg CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9y ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlNRTGl0ZUlEQkJhY2tpbmdTdG9y ZTo6YWRkUmVjb3JkKToKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6U1FMaXRlSURCQmFj a2luZ1N0b3JlOjpnZXRSZWNvcmQpOgorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZl ci9TUUxpdGVJREJCYWNraW5nU3RvcmUuaDoKKyAgICAgICAgCisgICAgICAgICogTW9kdWxlcy9p bmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OklEQlNlcnZlcjo6VW5pcXVlSURCRGF0YWJhc2U6OnBlcmZvcm1QdXRPckFkZCk6CisgICAgICAg IChXZWJDb3JlOjpJREJTZXJ2ZXI6OlVuaXF1ZUlEQkRhdGFiYXNlOjpwZXJmb3JtR2V0UmVjb3Jk KToKKworMjAxNi0wNC0wOCAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKICAg ICAgICAgTW9kZXJuIElEQjogTWFrZSBJREJHZXRSZXN1bHQgY29udGFpbiBhbiBJREJWYWx1ZSBp bnN0ZWFkIG9mIGEgYnVmZmVyLCBhbmQgcmVtb3ZlIHVudXNlZCBtZXRob2RzLgogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2NDE2CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlZhbHVlLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlZhbHVlLmNwcAppbmRleCAxZDc3N2Y5Li41 MWNhOGVhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURC VmFsdWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlZhbHVl LmNwcApAQCAtNTQsNiArNTQsMTMgQEAgSURCVmFsdWU6OklEQlZhbHVlKGNvbnN0IFNlcmlhbGl6 ZWRTY3JpcHRWYWx1ZSYgc2NyaXB0VmFsdWUsIGNvbnN0IFZlY3RvcjxTdHJpbmcKIHsKIH0KIAor SURCVmFsdWU6OklEQlZhbHVlKGNvbnN0IFRocmVhZFNhZmVEYXRhQnVmZmVyJiB2YWx1ZSwgY29u c3QgVmVjdG9yPFN0cmluZz4mIGJsb2JVUkxzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgYmxvYkZp bGVQYXRocykKKyAgICA6IG1fZGF0YSh2YWx1ZSkKKyAgICAsIG1fYmxvYlVSTHMoYmxvYlVSTHMp CisgICAgLCBtX2Jsb2JGaWxlUGF0aHMoYmxvYkZpbGVQYXRocykKK3sKK30KKwogSURCVmFsdWUg SURCVmFsdWU6Omlzb2xhdGVkQ29weSgpIGNvbnN0CiB7CiAgICAgSURCVmFsdWUgcmVzdWx0Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCVmFsdWUuaCBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlZhbHVlLmgKaW5kZXggN2U3ODEz ZC4uMTk4YzQ0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIv SURCVmFsdWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJWYWx1 ZS5oCkBAIC0zOSw2ICszOSw3IEBAIHB1YmxpYzoKICAgICBJREJWYWx1ZShjb25zdCBTZXJpYWxp emVkU2NyaXB0VmFsdWUmKTsKICAgICBJREJWYWx1ZShjb25zdCBUaHJlYWRTYWZlRGF0YUJ1ZmZl ciYpOwogICAgIElEQlZhbHVlKGNvbnN0IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSYsIGNvbnN0IFZl Y3RvcjxTdHJpbmc+JiBibG9iVVJMcywgY29uc3QgVmVjdG9yPFN0cmluZz4mIGJsb2JGaWxlUGF0 aHMpOworICAgIElEQlZhbHVlKGNvbnN0IFRocmVhZFNhZmVEYXRhQnVmZmVyJiwgY29uc3QgVmVj dG9yPFN0cmluZz4mIGJsb2JVUkxzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgYmxvYkZpbGVQYXRo cyk7CiAKICAgICBJREJWYWx1ZSBpc29sYXRlZENvcHkoKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL0lEQkJhY2tpbmdTdG9yZS5o IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL0lEQkJhY2tpbmdTdG9y ZS5oCmluZGV4IGY5MGU0ZjguLmU0ZmFjZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9JREJCYWNraW5nU3RvcmUuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvSURCQmFja2luZ1N0b3JlLmgKQEAgLTQwLDYg KzQwLDcgQEAgY2xhc3MgSURCS2V5RGF0YTsKIGNsYXNzIElEQk9iamVjdFN0b3JlSW5mbzsKIGNs YXNzIElEQlJlc291cmNlSWRlbnRpZmllcjsKIGNsYXNzIElEQlRyYW5zYWN0aW9uSW5mbzsKK2Ns YXNzIElEQlZhbHVlOwogY2xhc3MgVGhyZWFkU2FmZURhdGFCdWZmZXI7CiAKIHN0cnVjdCBJREJL ZXlSYW5nZURhdGE7CkBAIC03NCw4ICs3NSw4IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIElEQkVy cm9yIGRlbGV0ZUluZGV4KGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNhY3Rpb25J ZGVudGlmaWVyLCB1aW50NjRfdCBvYmplY3RTdG9yZUlkZW50aWZpZXIsIHVpbnQ2NF90IGluZGV4 SWRlbnRpZmllcikgPSAwOwogICAgIHZpcnR1YWwgSURCRXJyb3Iga2V5RXhpc3RzSW5PYmplY3RT dG9yZShjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwg dWludDY0X3Qgb2JqZWN0U3RvcmVJZGVudGlmaWVyLCBjb25zdCBJREJLZXlEYXRhJiwgYm9vbCYg a2V5RXhpc3RzKSA9IDA7CiAgICAgdmlydHVhbCBJREJFcnJvciBkZWxldGVSYW5nZShjb25zdCBJ REJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgdWludDY0X3Qgb2Jq ZWN0U3RvcmVJZGVudGlmaWVyLCBjb25zdCBJREJLZXlSYW5nZURhdGEmKSA9IDA7Ci0gICAgdmly dHVhbCBJREJFcnJvciBhZGRSZWNvcmQoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVyJiB0cmFu c2FjdGlvbklkZW50aWZpZXIsIGNvbnN0IElEQk9iamVjdFN0b3JlSW5mbyYsIGNvbnN0IElEQktl eURhdGEmLCBjb25zdCBUaHJlYWRTYWZlRGF0YUJ1ZmZlciYgdmFsdWUsIGNvbnN0IFZlY3RvcjxT dHJpbmc+JiBibG9iVVJMcywgY29uc3QgVmVjdG9yPFN0cmluZz4mIGJsb2JGaWxlUGF0aHMpID0g MDsKLSAgICB2aXJ0dWFsIElEQkVycm9yIGdldFJlY29yZChjb25zdCBJREJSZXNvdXJjZUlkZW50 aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgdWludDY0X3Qgb2JqZWN0U3RvcmVJZGVudGlm aWVyLCBjb25zdCBJREJLZXlSYW5nZURhdGEmLCBUaHJlYWRTYWZlRGF0YUJ1ZmZlciYgb3V0VmFs dWUpID0gMDsKKyAgICB2aXJ0dWFsIElEQkVycm9yIGFkZFJlY29yZChjb25zdCBJREJSZXNvdXJj ZUlkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgY29uc3QgSURCT2JqZWN0U3RvcmVJ bmZvJiwgY29uc3QgSURCS2V5RGF0YSYsIGNvbnN0IElEQlZhbHVlJikgPSAwOworICAgIHZpcnR1 YWwgSURCRXJyb3IgZ2V0UmVjb3JkKGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNh Y3Rpb25JZGVudGlmaWVyLCB1aW50NjRfdCBvYmplY3RTdG9yZUlkZW50aWZpZXIsIGNvbnN0IElE QktleVJhbmdlRGF0YSYsIElEQkdldFJlc3VsdCYgb3V0VmFsdWUpID0gMDsKICAgICB2aXJ0dWFs IElEQkVycm9yIGdldEluZGV4UmVjb3JkKGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJh bnNhY3Rpb25JZGVudGlmaWVyLCB1aW50NjRfdCBvYmplY3RTdG9yZUlkZW50aWZpZXIsIHVpbnQ2 NF90IGluZGV4SWRlbnRpZmllciwgSW5kZXhlZERCOjpJbmRleFJlY29yZFR5cGUsIGNvbnN0IElE QktleVJhbmdlRGF0YSYsIElEQkdldFJlc3VsdCYgb3V0VmFsdWUpID0gMDsKICAgICB2aXJ0dWFs IElEQkVycm9yIGdldENvdW50KGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNhY3Rp b25JZGVudGlmaWVyLCB1aW50NjRfdCBvYmplY3RTdG9yZUlkZW50aWZpZXIsIHVpbnQ2NF90IGlu ZGV4SWRlbnRpZmllciwgY29uc3QgSURCS2V5UmFuZ2VEYXRhJiwgdWludDY0X3QmIG91dENvdW50 KSA9IDA7CiAgICAgdmlydHVhbCBJREJFcnJvciBnZW5lcmF0ZUtleU51bWJlcihjb25zdCBJREJS ZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgdWludDY0X3Qgb2JqZWN0 U3RvcmVJZGVudGlmaWVyLCB1aW50NjRfdCYga2V5TnVtYmVyKSA9IDA7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5QmFja2luZ1N0b3Jl VHJhbnNhY3Rpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVy L01lbW9yeUJhY2tpbmdTdG9yZVRyYW5zYWN0aW9uLmNwcAppbmRleCBlN2FiMDQwLi5hMGJkOGY3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVt b3J5QmFja2luZ1N0b3JlVHJhbnNhY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1vcnlCYWNraW5nU3RvcmVUcmFuc2FjdGlvbi5jcHAKQEAg LTI5LDYgKzI5LDcgQEAKICNpZiBFTkFCTEUoSU5ERVhFRF9EQVRBQkFTRSkKIAogI2luY2x1ZGUg IklEQktleVJhbmdlRGF0YS5oIgorI2luY2x1ZGUgIklEQlZhbHVlLmgiCiAjaW5jbHVkZSAiSW5k ZXhlZERCLmgiCiAjaW5jbHVkZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIk1lbW9yeUlEQkJhY2tp bmdTdG9yZS5oIgpAQCAtMjMwLDcgKzIzMSw3IEBAIHZvaWQgTWVtb3J5QmFja2luZ1N0b3JlVHJh bnNhY3Rpb246OmFib3J0KCkKIAogICAgICAgICBmb3IgKGF1dG8gZW50cnkgOiAqa2V5VmFsdWVN YXApIHsKICAgICAgICAgICAgIG9iamVjdFN0b3JlLT5kZWxldGVSZWNvcmQoZW50cnkua2V5KTsK LSAgICAgICAgICAgIG9iamVjdFN0b3JlLT5hZGRSZWNvcmQoKnRoaXMsIGVudHJ5LmtleSwgZW50 cnkudmFsdWUpOworICAgICAgICAgICAgb2JqZWN0U3RvcmUtPmFkZFJlY29yZCgqdGhpcywgZW50 cnkua2V5LCB7IGVudHJ5LnZhbHVlIH0pOwogICAgICAgICB9CiAgICAgfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5SURCQmFja2lu Z1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1v cnlJREJCYWNraW5nU3RvcmUuY3BwCmluZGV4IGRiNWI1ZTAuLmRjOGE0NzcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1vcnlJREJCYWNraW5n U3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9N ZW1vcnlJREJCYWNraW5nU3RvcmUuY3BwCkBAIC0yNjcsNyArMjY3LDcgQEAgSURCRXJyb3IgTWVt b3J5SURCQmFja2luZ1N0b3JlOjpkZWxldGVSYW5nZShjb25zdCBJREJSZXNvdXJjZUlkZW50aWZp ZXImIHRyYW5zYWMKICAgICByZXR1cm4gSURCRXJyb3IoKTsKIH0KIAotSURCRXJyb3IgTWVtb3J5 SURCQmFja2luZ1N0b3JlOjphZGRSZWNvcmQoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVyJiB0 cmFuc2FjdGlvbklkZW50aWZpZXIsIGNvbnN0IElEQk9iamVjdFN0b3JlSW5mbyYgb2JqZWN0U3Rv cmVJbmZvLCBjb25zdCBJREJLZXlEYXRhJiBrZXlEYXRhLCBjb25zdCBUaHJlYWRTYWZlRGF0YUJ1 ZmZlciYgdmFsdWUsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiwgY29uc3QgVmVjdG9yPFN0cmluZz4m KQorSURCRXJyb3IgTWVtb3J5SURCQmFja2luZ1N0b3JlOjphZGRSZWNvcmQoY29uc3QgSURCUmVz b3VyY2VJZGVudGlmaWVyJiB0cmFuc2FjdGlvbklkZW50aWZpZXIsIGNvbnN0IElEQk9iamVjdFN0 b3JlSW5mbyYgb2JqZWN0U3RvcmVJbmZvLCBjb25zdCBJREJLZXlEYXRhJiBrZXlEYXRhLCBjb25z dCBJREJWYWx1ZSYgdmFsdWUpCiB7CiAgICAgTE9HKEluZGV4ZWREQiwgIk1lbW9yeUlEQkJhY2tp bmdTdG9yZTo6YWRkUmVjb3JkIik7CiAKQEAgLTI4NCw3ICsyODQsNyBAQCBJREJFcnJvciBNZW1v cnlJREJCYWNraW5nU3RvcmU6OmFkZFJlY29yZChjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXIm IHRyYW5zYWN0aQogICAgIHJldHVybiBvYmplY3RTdG9yZS0+YWRkUmVjb3JkKCp0cmFuc2FjdGlv biwga2V5RGF0YSwgdmFsdWUpOwogfQogCi1JREJFcnJvciBNZW1vcnlJREJCYWNraW5nU3RvcmU6 OmdldFJlY29yZChjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRp ZmllciwgdWludDY0X3Qgb2JqZWN0U3RvcmVJZGVudGlmaWVyLCBjb25zdCBJREJLZXlSYW5nZURh dGEmIHJhbmdlLCBUaHJlYWRTYWZlRGF0YUJ1ZmZlciYgb3V0VmFsdWUpCitJREJFcnJvciBNZW1v cnlJREJCYWNraW5nU3RvcmU6OmdldFJlY29yZChjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXIm IHRyYW5zYWN0aW9uSWRlbnRpZmllciwgdWludDY0X3Qgb2JqZWN0U3RvcmVJZGVudGlmaWVyLCBj b25zdCBJREJLZXlSYW5nZURhdGEmIHJhbmdlLCBJREJHZXRSZXN1bHQmIG91dFZhbHVlKQogewog ICAgIExPRyhJbmRleGVkREIsICJNZW1vcnlJREJCYWNraW5nU3RvcmU6OmdldFJlY29yZCIpOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVt b3J5SURCQmFja2luZ1N0b3JlLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9z ZXJ2ZXIvTWVtb3J5SURCQmFja2luZ1N0b3JlLmgKaW5kZXggMjgyNmJiMS4uYWRmN2ViZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL01lbW9yeUlE QkJhY2tpbmdTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3Nl cnZlci9NZW1vcnlJREJCYWNraW5nU3RvcmUuaApAQCAtNTksOCArNTksOCBAQCBwdWJsaWM6CiAg ICAgSURCRXJyb3IgZGVsZXRlSW5kZXgoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVyJiB0cmFu c2FjdGlvbklkZW50aWZpZXIsIHVpbnQ2NF90IG9iamVjdFN0b3JlSWRlbnRpZmllciwgdWludDY0 X3QgaW5kZXhJZGVudGlmaWVyKSBmaW5hbDsKICAgICBJREJFcnJvciBrZXlFeGlzdHNJbk9iamVj dFN0b3JlKGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVy LCB1aW50NjRfdCBvYmplY3RTdG9yZUlkZW50aWZpZXIsIGNvbnN0IElEQktleURhdGEmLCBib29s JiBrZXlFeGlzdHMpIGZpbmFsOwogICAgIElEQkVycm9yIGRlbGV0ZVJhbmdlKGNvbnN0IElEQlJl c291cmNlSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCB1aW50NjRfdCBvYmplY3RT dG9yZUlkZW50aWZpZXIsIGNvbnN0IElEQktleVJhbmdlRGF0YSYpIGZpbmFsOwotICAgIElEQkVy cm9yIGFkZFJlY29yZChjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRl bnRpZmllciwgY29uc3QgSURCT2JqZWN0U3RvcmVJbmZvJiwgY29uc3QgSURCS2V5RGF0YSYsIGNv bnN0IFRocmVhZFNhZmVEYXRhQnVmZmVyJiB2YWx1ZSwgY29uc3QgVmVjdG9yPFN0cmluZz4mIGJs b2JVUkxzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgYmxvYkZpbGVQYXRocykgZmluYWw7Ci0gICAg SURCRXJyb3IgZ2V0UmVjb3JkKGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNhY3Rp b25JZGVudGlmaWVyLCB1aW50NjRfdCBvYmplY3RTdG9yZUlkZW50aWZpZXIsIGNvbnN0IElEQktl eVJhbmdlRGF0YSYsIFRocmVhZFNhZmVEYXRhQnVmZmVyJiBvdXRWYWx1ZSkgZmluYWw7CisgICAg SURCRXJyb3IgYWRkUmVjb3JkKGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNhY3Rp b25JZGVudGlmaWVyLCBjb25zdCBJREJPYmplY3RTdG9yZUluZm8mLCBjb25zdCBJREJLZXlEYXRh JiwgY29uc3QgSURCVmFsdWUmKSBmaW5hbDsKKyAgICBJREJFcnJvciBnZXRSZWNvcmQoY29uc3Qg SURCUmVzb3VyY2VJZGVudGlmaWVyJiB0cmFuc2FjdGlvbklkZW50aWZpZXIsIHVpbnQ2NF90IG9i amVjdFN0b3JlSWRlbnRpZmllciwgY29uc3QgSURCS2V5UmFuZ2VEYXRhJiwgSURCR2V0UmVzdWx0 JiBvdXRWYWx1ZSkgZmluYWw7CiAgICAgSURCRXJyb3IgZ2V0SW5kZXhSZWNvcmQoY29uc3QgSURC UmVzb3VyY2VJZGVudGlmaWVyJiB0cmFuc2FjdGlvbklkZW50aWZpZXIsIHVpbnQ2NF90IG9iamVj dFN0b3JlSWRlbnRpZmllciwgdWludDY0X3QgaW5kZXhJZGVudGlmaWVyLCBJbmRleGVkREI6Oklu ZGV4UmVjb3JkVHlwZSwgY29uc3QgSURCS2V5UmFuZ2VEYXRhJiwgSURCR2V0UmVzdWx0JiBvdXRW YWx1ZSkgZmluYWw7CiAgICAgSURCRXJyb3IgZ2V0Q291bnQoY29uc3QgSURCUmVzb3VyY2VJZGVu dGlmaWVyJiB0cmFuc2FjdGlvbklkZW50aWZpZXIsIHVpbnQ2NF90IG9iamVjdFN0b3JlSWRlbnRp ZmllciwgdWludDY0X3QgaW5kZXhJZGVudGlmaWVyLCBjb25zdCBJREJLZXlSYW5nZURhdGEmLCB1 aW50NjRfdCYgb3V0Q291bnQpIGZpbmFsOwogICAgIElEQkVycm9yIGdlbmVyYXRlS2V5TnVtYmVy KGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCB1aW50 NjRfdCBvYmplY3RTdG9yZUlkZW50aWZpZXIsIHVpbnQ2NF90JiBrZXlOdW1iZXIpIGZpbmFsOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL01lbW9y eU9iamVjdFN0b3JlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZl ci9NZW1vcnlPYmplY3RTdG9yZS5jcHAKaW5kZXggZmYxYzUzMy4uOGI4Y2Q3NSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL01lbW9yeU9iamVjdFN0 b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVt b3J5T2JqZWN0U3RvcmUuY3BwCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSAiSURCRGF0YWJh c2VFeGNlcHRpb24uaCIKICNpbmNsdWRlICJJREJFcnJvci5oIgogI2luY2x1ZGUgIklEQktleVJh bmdlRGF0YS5oIgorI2luY2x1ZGUgIklEQlZhbHVlLmgiCiAjaW5jbHVkZSAiSW5kZXhLZXkuaCIK ICNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiTWVtb3J5QmFja2luZ1N0b3JlVHJhbnNh Y3Rpb24uaCIKQEAgLTI0Nyw3ICsyNDgsNyBAQCB2b2lkIE1lbW9yeU9iamVjdFN0b3JlOjpkZWxl dGVSYW5nZShjb25zdCBJREJLZXlSYW5nZURhdGEmIGlucHV0UmFuZ2UpCiAgICAgfQogfQogCi1J REJFcnJvciBNZW1vcnlPYmplY3RTdG9yZTo6YWRkUmVjb3JkKE1lbW9yeUJhY2tpbmdTdG9yZVRy YW5zYWN0aW9uJiB0cmFuc2FjdGlvbiwgY29uc3QgSURCS2V5RGF0YSYga2V5RGF0YSwgY29uc3Qg VGhyZWFkU2FmZURhdGFCdWZmZXImIHZhbHVlKQorSURCRXJyb3IgTWVtb3J5T2JqZWN0U3RvcmU6 OmFkZFJlY29yZChNZW1vcnlCYWNraW5nU3RvcmVUcmFuc2FjdGlvbiYgdHJhbnNhY3Rpb24sIGNv bnN0IElEQktleURhdGEmIGtleURhdGEsIGNvbnN0IElEQlZhbHVlJiB2YWx1ZSkKIHsKICAgICBM T0coSW5kZXhlZERCLCAiTWVtb3J5T2JqZWN0U3RvcmU6OmFkZFJlY29yZCIpOwogCkBAIC0yNjIs MTMgKzI2MywxMyBAQCBJREJFcnJvciBNZW1vcnlPYmplY3RTdG9yZTo6YWRkUmVjb3JkKE1lbW9y eUJhY2tpbmdTdG9yZVRyYW5zYWN0aW9uJiB0cmFuc2FjdGlvbgogICAgICAgICBtX29yZGVyZWRL ZXlzID0gc3RkOjptYWtlX3VuaXF1ZTxzdGQ6OnNldDxJREJLZXlEYXRhPj4oKTsKICAgICB9CiAK LSAgICBhdXRvIG1hcFJlc3VsdCA9IG1fa2V5VmFsdWVTdG9yZS0+c2V0KGtleURhdGEsIHZhbHVl KTsKKyAgICBhdXRvIG1hcFJlc3VsdCA9IG1fa2V5VmFsdWVTdG9yZS0+c2V0KGtleURhdGEsIHZh bHVlLmRhdGEoKSk7CiAgICAgQVNTRVJUKG1hcFJlc3VsdC5pc05ld0VudHJ5KTsKICAgICBhdXRv IGxpc3RSZXN1bHQgPSBtX29yZGVyZWRLZXlzLT5pbnNlcnQoa2V5RGF0YSk7CiAgICAgQVNTRVJU KGxpc3RSZXN1bHQuc2Vjb25kKTsKIAogICAgIC8vIElmIHRoZXJlIHdhcyBhbiBlcnJvciBpbmRl eGluZyB0aGlzIGFkZGl0aW9uLCB0aGVuIHJldmVydCBpdC4KLSAgICBhdXRvIGVycm9yID0gdXBk YXRlSW5kZXhlc0ZvclB1dFJlY29yZChrZXlEYXRhLCB2YWx1ZSk7CisgICAgYXV0byBlcnJvciA9 IHVwZGF0ZUluZGV4ZXNGb3JQdXRSZWNvcmQoa2V5RGF0YSwgdmFsdWUuZGF0YSgpKTsKICAgICBp ZiAoIWVycm9yLmlzTnVsbCgpKSB7CiAgICAgICAgIG1fa2V5VmFsdWVTdG9yZS0+cmVtb3ZlKG1h cFJlc3VsdC5pdGVyYXRvcik7CiAgICAgICAgIG1fb3JkZXJlZEtleXMtPmVyYXNlKGxpc3RSZXN1 bHQuZmlyc3QpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIv c2VydmVyL01lbW9yeU9iamVjdFN0b3JlLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4 ZWRkYi9zZXJ2ZXIvTWVtb3J5T2JqZWN0U3RvcmUuaAppbmRleCA1NmUwZjhhLi44NDY0Y2IyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5 T2JqZWN0U3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2 ZXIvTWVtb3J5T2JqZWN0U3RvcmUuaApAQCAtNzMsNyArNzMsNyBAQCBwdWJsaWM6CiAgICAgYm9v bCBjb250YWluc1JlY29yZChjb25zdCBJREJLZXlEYXRhJik7CiAgICAgdm9pZCBkZWxldGVSZWNv cmQoY29uc3QgSURCS2V5RGF0YSYpOwogICAgIHZvaWQgZGVsZXRlUmFuZ2UoY29uc3QgSURCS2V5 UmFuZ2VEYXRhJik7Ci0gICAgSURCRXJyb3IgYWRkUmVjb3JkKE1lbW9yeUJhY2tpbmdTdG9yZVRy YW5zYWN0aW9uJiwgY29uc3QgSURCS2V5RGF0YSYsIGNvbnN0IFRocmVhZFNhZmVEYXRhQnVmZmVy JiB2YWx1ZSk7CisgICAgSURCRXJyb3IgYWRkUmVjb3JkKE1lbW9yeUJhY2tpbmdTdG9yZVRyYW5z YWN0aW9uJiwgY29uc3QgSURCS2V5RGF0YSYsIGNvbnN0IElEQlZhbHVlJiB2YWx1ZSk7CiAKICAg ICB1aW50NjRfdCBjdXJyZW50S2V5R2VuZXJhdG9yVmFsdWUoKSBjb25zdCB7IHJldHVybiBtX2tl eUdlbmVyYXRvclZhbHVlOyB9CiAgICAgdm9pZCBzZXRLZXlHZW5lcmF0b3JWYWx1ZSh1aW50NjRf dCB2YWx1ZSkgeyBtX2tleUdlbmVyYXRvclZhbHVlID0gdmFsdWU7IH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3Rv cmUuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlE QkJhY2tpbmdTdG9yZS5jcHAKaW5kZXggNjJlZDI5YS4uZTllMTZmMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9y ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0 ZUlEQkJhY2tpbmdTdG9yZS5jcHAKQEAgLTM2LDYgKzM2LDcgQEAKICNpbmNsdWRlICJJREJPYmpl Y3RTdG9yZUluZm8uaCIKICNpbmNsdWRlICJJREJTZXJpYWxpemF0aW9uLmgiCiAjaW5jbHVkZSAi SURCVHJhbnNhY3Rpb25JbmZvLmgiCisjaW5jbHVkZSAiSURCVmFsdWUuaCIKICNpbmNsdWRlICJJ bmRleEtleS5oIgogI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJTUUxpdGVEYXRhYmFz ZS5oIgpAQCAtMTQxMiwxNCArMTQxMywxNCBAQCBJREJFcnJvciBTUUxpdGVJREJCYWNraW5nU3Rv cmU6OnVwZGF0ZUFsbEluZGV4ZXNGb3JBZGRSZWNvcmQoY29uc3QgSURCT2JqZWN0U3RvcgogICAg IHJldHVybiBlcnJvcjsKIH0KIAotSURCRXJyb3IgU1FMaXRlSURCQmFja2luZ1N0b3JlOjphZGRS ZWNvcmQoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVyJiB0cmFuc2FjdGlvbklkZW50aWZpZXIs IGNvbnN0IElEQk9iamVjdFN0b3JlSW5mbyYgb2JqZWN0U3RvcmVJbmZvLCBjb25zdCBJREJLZXlE YXRhJiBrZXlEYXRhLCBjb25zdCBUaHJlYWRTYWZlRGF0YUJ1ZmZlciYgdmFsdWUsIGNvbnN0IFZl Y3RvcjxTdHJpbmc+JiBibG9iVVJMcywgY29uc3QgVmVjdG9yPFN0cmluZz4mIGJsb2JGaWxlcykK K0lEQkVycm9yIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6YWRkUmVjb3JkKGNvbnN0IElEQlJlc291 cmNlSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCBjb25zdCBJREJPYmplY3RTdG9y ZUluZm8mIG9iamVjdFN0b3JlSW5mbywgY29uc3QgSURCS2V5RGF0YSYga2V5RGF0YSwgY29uc3Qg SURCVmFsdWUmIHZhbHVlKQogewogICAgIExPRyhJbmRleGVkREIsICJTUUxpdGVJREJCYWNraW5n U3RvcmU6OmFkZFJlY29yZCAtIGtleSAlcywgb2JqZWN0IHN0b3JlICUiIFBSSXU2NCwga2V5RGF0 YS5sb2dnaW5nU3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgb2JqZWN0U3RvcmVJbmZvLmlkZW50aWZp ZXIoKSk7CiAKICAgICBBU1NFUlQobV9zcWxpdGVEQik7CiAgICAgQVNTRVJUKG1fc3FsaXRlREIt PmlzT3BlbigpKTsKLSAgICBBU1NFUlQodmFsdWUuZGF0YSgpKTsKLSAgICBBU1NFUlQoYmxvYlVS THMuc2l6ZSgpID09IGJsb2JGaWxlcy5zaXplKCkpOworICAgIEFTU0VSVCh2YWx1ZS5kYXRhKCku ZGF0YSgpKTsKKyAgICBBU1NFUlQodmFsdWUuYmxvYlVSTHMoKS5zaXplKCkgPT0gdmFsdWUuYmxv YkZpbGVQYXRocygpLnNpemUoKSk7CiAKICAgICBhdXRvKiB0cmFuc2FjdGlvbiA9IG1fdHJhbnNh Y3Rpb25zLmdldCh0cmFuc2FjdGlvbklkZW50aWZpZXIpOwogICAgIGlmICghdHJhbnNhY3Rpb24g fHwgIXRyYW5zYWN0aW9uLT5pblByb2dyZXNzKCkpIHsKQEAgLTE0NDMsNyArMTQ0NCw3IEBAIElE QkVycm9yIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6YWRkUmVjb3JkKGNvbnN0IElEQlJlc291cmNl SWRlbnRpZmllciYgdHJhbnNhY3RpCiAgICAgICAgIGlmIChzcWwucHJlcGFyZSgpICE9IFNRTElU RV9PSwogICAgICAgICAgICAgfHwgc3FsLmJpbmRJbnQ2NCgxLCBvYmplY3RTdG9yZUluZm8uaWRl bnRpZmllcigpKSAhPSBTUUxJVEVfT0sKICAgICAgICAgICAgIHx8IHNxbC5iaW5kQmxvYigyLCBr ZXlCdWZmZXItPmRhdGEoKSwga2V5QnVmZmVyLT5zaXplKCkpICE9IFNRTElURV9PSwotICAgICAg ICAgICAgfHwgc3FsLmJpbmRCbG9iKDMsIHZhbHVlLmRhdGEoKS0+ZGF0YSgpLCB2YWx1ZS5kYXRh KCktPnNpemUoKSkgIT0gU1FMSVRFX09LCisgICAgICAgICAgICB8fCBzcWwuYmluZEJsb2IoMywg dmFsdWUuZGF0YSgpLmRhdGEoKS0+ZGF0YSgpLCB2YWx1ZS5kYXRhKCkuZGF0YSgpLT5zaXplKCkp ICE9IFNRTElURV9PSwogICAgICAgICAgICAgfHwgc3FsLnN0ZXAoKSAhPSBTUUxJVEVfRE9ORSkg ewogICAgICAgICAgICAgTE9HX0VSUk9SKCJDb3VsZCBub3QgcHV0IHJlY29yZCBmb3Igb2JqZWN0 IHN0b3JlICUiIFBSSWk2NCAiIGluIFJlY29yZHMgdGFibGUgKCVpKSAtICVzIiwgb2JqZWN0U3Rv cmVJbmZvLmlkZW50aWZpZXIoKSwgbV9zcWxpdGVEQi0+bGFzdEVycm9yKCksIG1fc3FsaXRlREIt Pmxhc3RFcnJvck1zZygpKTsKICAgICAgICAgICAgIHJldHVybiB7IElEQkRhdGFiYXNlRXhjZXB0 aW9uOjpVbmtub3duRXJyb3IsIEFTQ0lJTGl0ZXJhbCgiVW5hYmxlIHRvIHN0b3JlIHJlY29yZCBp biBvYmplY3Qgc3RvcmUiKSB9OwpAQCAtMTQ1Miw3ICsxNDUzLDcgQEAgSURCRXJyb3IgU1FMaXRl SURCQmFja2luZ1N0b3JlOjphZGRSZWNvcmQoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVyJiB0 cmFuc2FjdGkKICAgICAgICAgcmVjb3JkSUQgPSBtX3NxbGl0ZURCLT5sYXN0SW5zZXJ0Um93SUQo KTsKICAgICB9CiAKLSAgICBhdXRvIGVycm9yID0gdXBkYXRlQWxsSW5kZXhlc0ZvckFkZFJlY29y ZChvYmplY3RTdG9yZUluZm8sIGtleURhdGEsIHZhbHVlKTsKKyAgICBhdXRvIGVycm9yID0gdXBk YXRlQWxsSW5kZXhlc0ZvckFkZFJlY29yZChvYmplY3RTdG9yZUluZm8sIGtleURhdGEsIHZhbHVl LmRhdGEoKSk7CiAKICAgICBpZiAoIWVycm9yLmlzTnVsbCgpKSB7CiAgICAgICAgIFNRTGl0ZVN0 YXRlbWVudCBzcWwoKm1fc3FsaXRlREIsIEFTQ0lJTGl0ZXJhbCgiREVMRVRFIEZST00gUmVjb3Jk cyBXSEVSRSBvYmplY3RTdG9yZUlEID0gPyBBTkQga2V5ID0gQ0FTVCg/IEFTIFRFWFQpOyIpKTsK QEAgLTE0NjUsNiArMTQ2Niw4IEBAIElEQkVycm9yIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6YWRk UmVjb3JkKGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNhY3RpCiAgICAgICAgIH0K ICAgICB9CiAKKyAgICBjb25zdCBWZWN0b3I8U3RyaW5nPiYgYmxvYlVSTHMgPSB2YWx1ZS5ibG9i VVJMcygpOworICAgIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBibG9iRmlsZXMgPSB2YWx1ZS5ibG9i RmlsZVBhdGhzKCk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBibG9iVVJMcy5zaXplKCk7 ICsraSkgewogICAgICAgICBhdXRvJiB1cmwgPSBibG9iVVJMc1tpXTsKICAgICAgICAgewpAQCAt MTUxOSw3ICsxNTIyLDcgQEAgSURCRXJyb3IgU1FMaXRlSURCQmFja2luZ1N0b3JlOjphZGRSZWNv cmQoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVyJiB0cmFuc2FjdGkKICAgICByZXR1cm4gZXJy b3I7CiB9CiAKLUlEQkVycm9yIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6Z2V0UmVjb3JkKGNvbnN0 IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCB1aW50NjRfdCBv YmplY3RTdG9yZUlELCBjb25zdCBJREJLZXlSYW5nZURhdGEmIGtleVJhbmdlLCBUaHJlYWRTYWZl RGF0YUJ1ZmZlciYgcmVzdWx0VmFsdWUpCitJREJFcnJvciBTUUxpdGVJREJCYWNraW5nU3RvcmU6 OmdldFJlY29yZChjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRp ZmllciwgdWludDY0X3Qgb2JqZWN0U3RvcmVJRCwgY29uc3QgSURCS2V5UmFuZ2VEYXRhJiBrZXlS YW5nZSwgSURCR2V0UmVzdWx0JiByZXN1bHRWYWx1ZSkKIHsKICAgICBMT0coSW5kZXhlZERCLCAi U1FMaXRlSURCQmFja2luZ1N0b3JlOjpnZXRSZWNvcmQgLSBrZXkgcmFuZ2UgJXMsIG9iamVjdCBz dG9yZSAlIiBQUkl1NjQsIGtleVJhbmdlLmxvZ2dpbmdTdHJpbmcoKS51dGY4KCkuZGF0YSgpLCBv YmplY3RTdG9yZUlEKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRl eGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5oIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5oCmluZGV4IDhlOTE1 MTYuLmUyMmQ3ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRi L3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmgKQEAgLTYzLDggKzYz LDggQEAgcHVibGljOgogICAgIElEQkVycm9yIGRlbGV0ZUluZGV4KGNvbnN0IElEQlJlc291cmNl SWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCB1aW50NjRfdCBvYmplY3RTdG9yZUlk ZW50aWZpZXIsIHVpbnQ2NF90IGluZGV4SWRlbnRpZmllcikgZmluYWw7CiAgICAgSURCRXJyb3Ig a2V5RXhpc3RzSW5PYmplY3RTdG9yZShjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5z YWN0aW9uSWRlbnRpZmllciwgdWludDY0X3Qgb2JqZWN0U3RvcmVJZGVudGlmaWVyLCBjb25zdCBJ REJLZXlEYXRhJiwgYm9vbCYga2V5RXhpc3RzKSBmaW5hbDsKICAgICBJREJFcnJvciBkZWxldGVS YW5nZShjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwg dWludDY0X3Qgb2JqZWN0U3RvcmVJZGVudGlmaWVyLCBjb25zdCBJREJLZXlSYW5nZURhdGEmKSBm aW5hbDsKLSAgICBJREJFcnJvciBhZGRSZWNvcmQoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVy JiB0cmFuc2FjdGlvbklkZW50aWZpZXIsIGNvbnN0IElEQk9iamVjdFN0b3JlSW5mbyYsIGNvbnN0 IElEQktleURhdGEmLCBjb25zdCBUaHJlYWRTYWZlRGF0YUJ1ZmZlciYgdmFsdWUsIGNvbnN0IFZl Y3RvcjxTdHJpbmc+JiBibG9iVVJMcywgY29uc3QgVmVjdG9yPFN0cmluZz4mIGJsb2JGaWxlUGF0 aHMpIGZpbmFsOwotICAgIElEQkVycm9yIGdldFJlY29yZChjb25zdCBJREJSZXNvdXJjZUlkZW50 aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgdWludDY0X3Qgb2JqZWN0U3RvcmVJZGVudGlm aWVyLCBjb25zdCBJREJLZXlSYW5nZURhdGEmLCBUaHJlYWRTYWZlRGF0YUJ1ZmZlciYgb3V0VmFs dWUpIGZpbmFsOworICAgIElEQkVycm9yIGFkZFJlY29yZChjb25zdCBJREJSZXNvdXJjZUlkZW50 aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgY29uc3QgSURCT2JqZWN0U3RvcmVJbmZvJiwg Y29uc3QgSURCS2V5RGF0YSYsIGNvbnN0IElEQlZhbHVlJikgZmluYWw7CisgICAgSURCRXJyb3Ig Z2V0UmVjb3JkKGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlm aWVyLCB1aW50NjRfdCBvYmplY3RTdG9yZUlkZW50aWZpZXIsIGNvbnN0IElEQktleVJhbmdlRGF0 YSYsIElEQkdldFJlc3VsdCYgb3V0VmFsdWUpIGZpbmFsOwogICAgIElEQkVycm9yIGdldEluZGV4 UmVjb3JkKGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVy LCB1aW50NjRfdCBvYmplY3RTdG9yZUlkZW50aWZpZXIsIHVpbnQ2NF90IGluZGV4SWRlbnRpZmll ciwgSW5kZXhlZERCOjpJbmRleFJlY29yZFR5cGUsIGNvbnN0IElEQktleVJhbmdlRGF0YSYsIElE QkdldFJlc3VsdCYgb3V0VmFsdWUpIGZpbmFsOwogICAgIElEQkVycm9yIGdldENvdW50KGNvbnN0 IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCB1aW50NjRfdCBv YmplY3RTdG9yZUlkZW50aWZpZXIsIHVpbnQ2NF90IGluZGV4SWRlbnRpZmllciwgY29uc3QgSURC S2V5UmFuZ2VEYXRhJiwgdWludDY0X3QmIG91dENvdW50KSBmaW5hbDsKICAgICBJREJFcnJvciBn ZW5lcmF0ZUtleU51bWJlcihjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWN0aW9u SWRlbnRpZmllciwgdWludDY0X3Qgb2JqZWN0U3RvcmVJZGVudGlmaWVyLCB1aW50NjRfdCYga2V5 TnVtYmVyKSBmaW5hbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuY3BwCmluZGV4IGY1MGRlNTguLjYy MzIyN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZl ci9VbmlxdWVJREJEYXRhYmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRl eGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcApAQCAtNzk1LDcgKzc5NSwxMSBAQCB2 b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpwZXJmb3JtUHV0T3JBZGQodWludDY0X3QgY2FsbGJhY2tJ ZGVudGlmaWVyLCBjb25zdCBJREJSZQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgZXJy b3IgPSBtX2JhY2tpbmdTdG9yZS0+YWRkUmVjb3JkKHRyYW5zYWN0aW9uSWRlbnRpZmllciwgKm9i amVjdFN0b3JlSW5mbywgdXNlZEtleSwgaW5qZWN0ZWRSZWNvcmRWYWx1ZS5kYXRhKCkgPyBpbmpl Y3RlZFJlY29yZFZhbHVlIDogb3JpZ2luYWxSZWNvcmRWYWx1ZS5kYXRhKCksIG9yaWdpbmFsUmVj b3JkVmFsdWUuYmxvYlVSTHMoKSwgb3JpZ2luYWxSZWNvcmRWYWx1ZS5ibG9iRmlsZVBhdGhzKCkp OworICAgIGlmIChpbmplY3RlZFJlY29yZFZhbHVlLmRhdGEoKSkKKyAgICAgICAgZXJyb3IgPSBt X2JhY2tpbmdTdG9yZS0+YWRkUmVjb3JkKHRyYW5zYWN0aW9uSWRlbnRpZmllciwgKm9iamVjdFN0 b3JlSW5mbywgdXNlZEtleSwgeyBpbmplY3RlZFJlY29yZFZhbHVlLCBvcmlnaW5hbFJlY29yZFZh bHVlLmJsb2JVUkxzKCksIG9yaWdpbmFsUmVjb3JkVmFsdWUuYmxvYkZpbGVQYXRocygpIH0pOwor ICAgIGVsc2UKKyAgICAgICAgZXJyb3IgPSBtX2JhY2tpbmdTdG9yZS0+YWRkUmVjb3JkKHRyYW5z YWN0aW9uSWRlbnRpZmllciwgKm9iamVjdFN0b3JlSW5mbywgdXNlZEtleSwgb3JpZ2luYWxSZWNv cmRWYWx1ZSk7CisKICAgICBpZiAoIWVycm9yLmlzTnVsbCgpKSB7CiAgICAgICAgIG1fc2VydmVy LnBvc3REYXRhYmFzZVRhc2tSZXBseShjcmVhdGVDcm9zc1RocmVhZFRhc2soKnRoaXMsICZVbmlx dWVJREJEYXRhYmFzZTo6ZGlkUGVyZm9ybVB1dE9yQWRkLCBjYWxsYmFja0lkZW50aWZpZXIsIGVy cm9yLCB1c2VkS2V5KSk7CiAgICAgICAgIHJldHVybjsKQEAgLTgzNiwxMCArODQwLDEwIEBAIHZv aWQgVW5pcXVlSURCRGF0YWJhc2U6OnBlcmZvcm1HZXRSZWNvcmQodWludDY0X3QgY2FsbGJhY2tJ ZGVudGlmaWVyLCBjb25zdCBJREJSCiAKICAgICBBU1NFUlQobV9iYWNraW5nU3RvcmUpOwogCi0g ICAgVGhyZWFkU2FmZURhdGFCdWZmZXIgdmFsdWVEYXRhOwotICAgIElEQkVycm9yIGVycm9yID0g bV9iYWNraW5nU3RvcmUtPmdldFJlY29yZCh0cmFuc2FjdGlvbklkZW50aWZpZXIsIG9iamVjdFN0 b3JlSWRlbnRpZmllciwga2V5UmFuZ2VEYXRhLCB2YWx1ZURhdGEpOworICAgIElEQkdldFJlc3Vs dCByZXN1bHQ7CisgICAgSURCRXJyb3IgZXJyb3IgPSBtX2JhY2tpbmdTdG9yZS0+Z2V0UmVjb3Jk KHRyYW5zYWN0aW9uSWRlbnRpZmllciwgb2JqZWN0U3RvcmVJZGVudGlmaWVyLCBrZXlSYW5nZURh dGEsIHJlc3VsdCk7CiAKLSAgICBtX3NlcnZlci5wb3N0RGF0YWJhc2VUYXNrUmVwbHkoY3JlYXRl Q3Jvc3NUaHJlYWRUYXNrKCp0aGlzLCAmVW5pcXVlSURCRGF0YWJhc2U6OmRpZFBlcmZvcm1HZXRS ZWNvcmQsIGNhbGxiYWNrSWRlbnRpZmllciwgZXJyb3IsIHZhbHVlRGF0YSkpOworICAgIG1fc2Vy dmVyLnBvc3REYXRhYmFzZVRhc2tSZXBseShjcmVhdGVDcm9zc1RocmVhZFRhc2soKnRoaXMsICZV bmlxdWVJREJEYXRhYmFzZTo6ZGlkUGVyZm9ybUdldFJlY29yZCwgY2FsbGJhY2tJZGVudGlmaWVy LCBlcnJvciwgcmVzdWx0KSk7CiB9CiAKIHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OnBlcmZvcm1H ZXRJbmRleFJlY29yZCh1aW50NjRfdCBjYWxsYmFja0lkZW50aWZpZXIsIGNvbnN0IElEQlJlc291 cmNlSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCB1aW50NjRfdCBvYmplY3RTdG9y ZUlkZW50aWZpZXIsIHVpbnQ2NF90IGluZGV4SWRlbnRpZmllciwgSW5kZXhlZERCOjpJbmRleFJl Y29yZFR5cGUgcmVjb3JkVHlwZSwgY29uc3QgSURCS2V5UmFuZ2VEYXRhJiByYW5nZSkK