128702 2014-02-12 16:11:46 -0800 [WK2] Add a C API to get WebCrypto master key from a client 2014-02-12 16:34:28 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap andersca sam oldest_to_newest 980064 0 ap 2014-02-12 16:11:46 -0800 WebCrypto key serialization needs a master key, and WebKit2 clients should have a say in what it is. 980069 1 224024 ap 2014-02-12 16:15:54 -0800 Created attachment 224024 proposed patch 980075 2 224024 andersca 2014-02-12 16:27:26 -0800 Comment on attachment 224024 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=224024&action=review > Source/WebKit2/UIProcess/API/C/WKContext.h:89 > + // Version 1. > + WKContextCopyWebCryptoMasterKeyCallback copyWebCryptoMasterKey; I don't think you need to update this struct. 980080 3 ap 2014-02-12 16:34:28 -0800 Committed <http://trac.webkit.org/r163999>. 224024 2014-02-12 16:15:54 -0800 2014-02-12 16:27:26 -0800 proposed patch wk2.txt text/plain 9462 ap SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2Mzk5NikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE0LTAyLTEyICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFtXSzJdIEFkZCBhIEMgQVBJ IHRvIGdldCBXZWJDcnlwdG8gbWFzdGVyIGtleSBmcm9tIGEgY2xpZW50CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg3MDIKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBhIG5ldyB2ZXJzaW9uIG9m IFdLQ29udGV4dENsaWVudCwgd2l0aCBhIGZ1bmN0aW9uIHRoYXQgcmV0dXJucyB0aGUga2V5Lgor CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dC5oOgorICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJDb250ZXh0Q2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dENs aWVudDo6Y29weVdlYkNyeXB0b01hc3RlcktleSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkNv bnRleHRDbGllbnQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp3cmFwQ3J5cHRvS2V5KToKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5Ojp1bndyYXBDcnlwdG9LZXkpOgorICAgICAgICAqIFVJUHJvY2Vz cy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tOgorCiAyMDE0LTAyLTEyICBBbmRlcnMgQ2FybHNzb24g IDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgRm9yd2FyZCBkZWNsYXJlIFdLTmF2aWdh dGlvbiBpbiBXS05hdmlnYXRpb25EZWxlZ2F0ZS5oCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViQ29udGV4dENsaWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYkNvbnRleHRDbGllbnQuY3BwCShyZXZpc2lvbiAxNjM5OTIpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dENsaWVudC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTU4LDQgKzU4LDEyIEBAIHZvaWQgV2ViQ29udGV4dENsaWVudDo6cGx1Z0luSW5mb3JtYXRp b24KICAgICBtX2NsaWVudC5wbHVnSW5JbmZvcm1hdGlvbkJlY2FtZUF2YWlsYWJsZSh0b0FQSShj b250ZXh0KSwgdG9BUEkocGx1Z0luSW5mbyksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CiB9 CiAKK1Bhc3NSZWZQdHI8QVBJOjpEYXRhPiBXZWJDb250ZXh0Q2xpZW50Ojpjb3B5V2ViQ3J5cHRv TWFzdGVyS2V5KFdlYkNvbnRleHQqIGNvbnRleHQpCit7CisgICAgaWYgKCFtX2NsaWVudC5jb3B5 V2ViQ3J5cHRvTWFzdGVyS2V5KQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIHJldHVy biBhZG9wdFJlZih0b0ltcGwobV9jbGllbnQuY29weVdlYkNyeXB0b01hc3RlcktleSh0b0FQSShj b250ZXh0KSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKSkpOworfQorCiB9IC8vIG5hbWVzcGFj ZSBXZWJLaXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0Q2xpZW50 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHRDbGll bnQuaAkocmV2aXNpb24gMTYzOTkyKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNv bnRleHRDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5 cmlnaHQgKEMpIDIwMTIgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJp Z2h0IChDKSAyMDEyLCAyMDE0IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAg KiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRo IG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0 IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMjcsMTMgKzI3LDE0IEBACiAjZGVmaW5lIFdl YkNvbnRleHRDbGllbnRfaAogCiAjaW5jbHVkZSAiQVBJQ2xpZW50LmgiCisjaW5jbHVkZSAiQVBJ RGF0YS5oIgogI2luY2x1ZGUgIldLQ29udGV4dC5oIgogCiBuYW1lc3BhY2UgQVBJIHsKIGNsYXNz IEFycmF5OwogCiB0ZW1wbGF0ZTw+IHN0cnVjdCBDbGllbnRUcmFpdHM8V0tDb250ZXh0Q2xpZW50 QmFzZT4gewotICAgIHR5cGVkZWYgc3RkOjp0dXBsZTxXS0NvbnRleHRDbGllbnRWMD4gVmVyc2lv bnM7CisgICAgdHlwZWRlZiBzdGQ6OnR1cGxlPFdLQ29udGV4dENsaWVudFYwLCBXS0NvbnRleHRD bGllbnRWMT4gVmVyc2lvbnM7CiB9OwogfQogCkBAIC00Niw2ICs0Nyw3IEBAIHB1YmxpYzoKICAg ICB2b2lkIHBsdWdJbkF1dG9TdGFydE9yaWdpbkhhc2hlc0NoYW5nZWQoV2ViQ29udGV4dCopOwog ICAgIHZvaWQgbmV0d29ya1Byb2Nlc3NEaWRDcmFzaChXZWJDb250ZXh0Kik7CiAgICAgdm9pZCBw bHVnSW5JbmZvcm1hdGlvbkJlY2FtZUF2YWlsYWJsZShXZWJDb250ZXh0KiwgQVBJOjpBcnJheSop OworICAgIFBhc3NSZWZQdHI8QVBJOjpEYXRhPiBjb3B5V2ViQ3J5cHRvTWFzdGVyS2V5KFdlYkNv bnRleHQqKTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDE2Mzk5MikKKysrIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00 NDgzLDE1ICs0NDgzLDI1IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzZXRTY3JvbGxQaW5uaW5nQmVo YXYKICNpZiBFTkFCTEUoU1VCVExFX0NSWVBUTykKIHZvaWQgV2ViUGFnZVByb3h5Ojp3cmFwQ3J5 cHRvS2V5KGNvbnN0IFZlY3Rvcjx1aW50OF90PiYga2V5LCBib29sJiBzdWNjZWVkZWQsIFZlY3Rv cjx1aW50OF90PiYgd3JhcHBlZEtleSkKIHsKLSAgICBWZWN0b3I8dWludDhfdD4gbWFzdGVyS2V5 KDE2KTsKLSAgICBtZW1zZXQobWFzdGVyS2V5LmRhdGEoKSwgMCwgbWFzdGVyS2V5LnNpemUoKSk7 IC8vIEZJWE1FOiBOb3QgaW1wbGVtZW50ZWQgeWV0LCB3aWxsIGJlIGdldHRpbmcgYSBrZXkgZnJv bSBjbGllbnQuCisgICAgUmVmUHRyPEFQSTo6RGF0YT4ga2V5RGF0YSA9IG1fcHJvY2Vzcy0+Y29u dGV4dCgpLmNsaWVudCgpLmNvcHlXZWJDcnlwdG9NYXN0ZXJLZXkoJm1fcHJvY2Vzcy0+Y29udGV4 dCgpKTsKKyAgICBpZiAoIWtleURhdGEpIHsKKyAgICAgICAgc3VjY2VlZGVkID0gZmFsc2U7Cisg ICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBWZWN0b3I8dWludDhfdD4gbWFzdGVyS2V5ID0g a2V5RGF0YS0+ZGF0YVJlZmVyZW5jZSgpLnZlY3RvcigpOwogICAgIHN1Y2NlZWRlZCA9IHdyYXBT ZXJpYWxpemVkQ3J5cHRvS2V5KG1hc3RlcktleSwga2V5LCB3cmFwcGVkS2V5KTsKIH0KIAogdm9p ZCBXZWJQYWdlUHJveHk6OnVud3JhcENyeXB0b0tleShjb25zdCBWZWN0b3I8dWludDhfdD4mIHdy YXBwZWRLZXksIGJvb2wmIHN1Y2NlZWRlZCwgVmVjdG9yPHVpbnQ4X3Q+JiBrZXkpCiB7Ci0gICAg VmVjdG9yPHVpbnQ4X3Q+IG1hc3RlcktleSgxNik7Ci0gICAgbWVtc2V0KG1hc3RlcktleS5kYXRh KCksIDAsIG1hc3RlcktleS5zaXplKCkpOyAvLyBGSVhNRTogTm90IGltcGxlbWVudGVkIHlldCwg d2lsbCBiZSBnZXR0aW5nIGEga2V5IGZyb20gY2xpZW50LgorICAgIFJlZlB0cjxBUEk6OkRhdGE+ IGtleURhdGEgPSBtX3Byb2Nlc3MtPmNvbnRleHQoKS5jbGllbnQoKS5jb3B5V2ViQ3J5cHRvTWFz dGVyS2V5KCZtX3Byb2Nlc3MtPmNvbnRleHQoKSk7CisgICAgaWYgKCFrZXlEYXRhKSB7CisgICAg ICAgIHN1Y2NlZWRlZCA9IGZhbHNlOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgVmVj dG9yPHVpbnQ4X3Q+IG1hc3RlcktleSA9IGtleURhdGEtPmRhdGFSZWZlcmVuY2UoKS52ZWN0b3Io KTsKICAgICBzdWNjZWVkZWQgPSB1bndyYXBTZXJpYWxpemVkQ3J5cHRvS2V5KG1hc3RlcktleSwg d3JhcHBlZEtleSwga2V5KTsKIH0KICNlbmRpZgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL1dLQ29udGV4dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQy9XS0NvbnRleHQuaAkocmV2aXNpb24gMTYzOTkyKQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dC5oCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw2ICs0 Nyw3IEBAIHR5cGVkZWYgdWludDMyX3QgV0tDYWNoZU1vZGVsOwogdHlwZWRlZiB2b2lkICgqV0tD b250ZXh0UGx1Z0luQXV0b1N0YXJ0T3JpZ2luSGFzaGVzQ2hhbmdlZENhbGxiYWNrKShXS0NvbnRl eHRSZWYgY29udGV4dCwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpX S0NvbnRleHROZXR3b3JrUHJvY2Vzc0RpZENyYXNoQ2FsbGJhY2spKFdLQ29udGV4dFJlZiBjb250 ZXh0LCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKIHR5cGVkZWYgdm9pZCAoKldLQ29udGV4dFBs dWdJbkluZm9ybWF0aW9uQmVjYW1lQXZhaWxhYmxlQ2FsbGJhY2spKFdLQ29udGV4dFJlZiBjb250 ZXh0LCBXS0FycmF5UmVmIHBsdWdJbiwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7Cit0eXBlZGVm IFdLRGF0YVJlZiAoKldLQ29udGV4dENvcHlXZWJDcnlwdG9NYXN0ZXJLZXlDYWxsYmFjaykoV0tD b250ZXh0UmVmIGNvbnRleHQsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOwogCiB0eXBlZGVmIHN0 cnVjdCBXS0NvbnRleHRDbGllbnRCYXNlIHsKICAgICBpbnQgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZlcnNpb247CkBAIC02 Miw3ICs2MywxOSBAQCB0eXBlZGVmIHN0cnVjdCBXS0NvbnRleHRDbGllbnRWMCB7CiAgICAgV0tD b250ZXh0UGx1Z0luSW5mb3JtYXRpb25CZWNhbWVBdmFpbGFibGVDYWxsYmFjayAgICAgICAgICAg ICAgICAgICBwbHVnSW5JbmZvcm1hdGlvbkJlY2FtZUF2YWlsYWJsZTsKIH0gV0tDb250ZXh0Q2xp ZW50VjA7CiAKLWVudW0geyBrV0tDb250ZXh0Q2xpZW50Q3VycmVudFZlcnNpb24gV0tfRU5VTV9E RVBSRUNBVEVEKCJVc2UgYW4gZXhwbGljaXQgdmVyc2lvbiBudW1iZXIgaW5zdGVhZCIpID0gMCB9 OwordHlwZWRlZiBzdHJ1Y3QgV0tDb250ZXh0Q2xpZW50VjEgeworICAgIFdLQ29udGV4dENsaWVu dEJhc2UgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYmFz ZTsKKworICAgIC8vIFZlcnNpb24gMC4KKyAgICBXS0NvbnRleHRQbHVnSW5BdXRvU3RhcnRPcmln aW5IYXNoZXNDaGFuZ2VkQ2FsbGJhY2sgICAgICAgICAgICAgICAgIHBsdWdJbkF1dG9TdGFydE9y aWdpbkhhc2hlc0NoYW5nZWQ7CisgICAgV0tDb250ZXh0TmV0d29ya1Byb2Nlc3NEaWRDcmFzaENh bGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICBuZXR3b3JrUHJvY2Vzc0RpZENyYXNo OworICAgIFdLQ29udGV4dFBsdWdJbkluZm9ybWF0aW9uQmVjYW1lQXZhaWxhYmxlQ2FsbGJhY2sg ICAgICAgICAgICAgICAgICAgcGx1Z0luSW5mb3JtYXRpb25CZWNhbWVBdmFpbGFibGU7CisKKyAg ICAvLyBWZXJzaW9uIDEuCisgICAgV0tDb250ZXh0Q29weVdlYkNyeXB0b01hc3RlcktleUNhbGxi YWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb3B5V2ViQ3J5cHRvTWFzdGVyS2V5Owor fSBXS0NvbnRleHRDbGllbnRWMTsKKworZW51bSB7IGtXS0NvbnRleHRDbGllbnRDdXJyZW50VmVy c2lvbiBXS19FTlVNX0RFUFJFQ0FURUQoIlVzZSBhbiBleHBsaWNpdCB2ZXJzaW9uIG51bWJlciBp bnN0ZWFkIikgPSAxIH07CiB0eXBlZGVmIHN0cnVjdCBXS0NvbnRleHRDbGllbnQgewogICAgIGlu dCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgdmVyc2lvbjsKICAgICBjb25zdCB2b2lkICogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNsaWVudEluZm87CkBAIC03MSw2ICs4 NCw5IEBAIHR5cGVkZWYgc3RydWN0IFdLQ29udGV4dENsaWVudCB7CiAgICAgV0tDb250ZXh0UGx1 Z0luQXV0b1N0YXJ0T3JpZ2luSGFzaGVzQ2hhbmdlZENhbGxiYWNrICAgICAgICAgICAgICAgICBw bHVnSW5BdXRvU3RhcnRPcmlnaW5IYXNoZXNDaGFuZ2VkOwogICAgIFdLQ29udGV4dE5ldHdvcmtQ cm9jZXNzRGlkQ3Jhc2hDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbmV0d29y a1Byb2Nlc3NEaWRDcmFzaDsKICAgICBXS0NvbnRleHRQbHVnSW5JbmZvcm1hdGlvbkJlY2FtZUF2 YWlsYWJsZUNhbGxiYWNrICAgICAgICAgICAgICAgICAgIHBsdWdJbkluZm9ybWF0aW9uQmVjYW1l QXZhaWxhYmxlOworCisgICAgLy8gVmVyc2lvbiAxLgorICAgIFdLQ29udGV4dENvcHlXZWJDcnlw dG9NYXN0ZXJLZXlDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29weVdlYkNy eXB0b01hc3RlcktleTsKIH0gV0tDb250ZXh0Q2xpZW50IFdLX0RFUFJFQ0FURUQoIlVzZSBhbiBl eHBsaWNpdCB2ZXJzaW9uZWQgc3RydWN0IGluc3RlYWQiKTsKIAogZW51bSB7CkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbQkocmV2aXNp b24gMTYzOTkyKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlN YWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTM5LDYgKzM5LDcgQEAKICNpbXBvcnQgIlN0cmluZ1V0 aWxpdGllcy5oIgogI2ltcG9ydCAiVGV4dENoZWNrZXIuaCIKICNpbXBvcnQgIldLQnJvd3NpbmdD b250ZXh0Q29udHJvbGxlckludGVybmFsLmgiCisjaW1wb3J0ICJXZWJDb250ZXh0LmgiCiAjaW1w b3J0ICJXZWJQYWdlTWVzc2FnZXMuaCIKICNpbXBvcnQgIldlYlByb2Nlc3NQcm94eS5oIgogI2lt cG9ydCA8V2ViQ29yZS9EaWN0YXRpb25BbHRlcm5hdGl2ZS5oPgpJbmRleDogVG9vbHMvQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMTYzOTk2KQorKysg VG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTQtMDIt MTIgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgW1dLMl0g QWRkIGEgQyBBUEkgdG8gZ2V0IFdlYkNyeXB0byBtYXN0ZXIga2V5IGZyb20gYSBjbGllbnQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODcwMgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0VGVz dFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXVFI6OmNvcHlXZWJDcnlwdG9N YXN0ZXJLZXkpOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6aW5pdGlhbGl6ZSk6Cisg ICAgICAgIFJldHVybiBhIGhhcmRjb2RlZCBrZXkuCisKIDIwMTQtMDItMTIgIE1hcmsgSGFobmVu YmVyZyAgPG1oYWhuZW5iZXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBCYXNpYyBmcmFtZXdvcmsg Zm9yIGEgbW9kZXJuIGpzYyBDTEkKSW5kZXg6IFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENv bnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENv bnRyb2xsZXIuY3BwCShyZXZpc2lvbiAxNjM5OTIpCisrKyBUb29scy9XZWJLaXRUZXN0UnVubmVy L1Rlc3RDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODEsNiArODEsMTIgQEAgc3Rh dGljIFdLVVJMUmVmIGJsYW5rVVJMKCkKICAgICByZXR1cm4gc3RhdGljQmxhbmtVUkw7CiB9CiAK K3N0YXRpYyBXS0RhdGFSZWYgY29weVdlYkNyeXB0b01hc3RlcktleShXS0NvbnRleHRSZWYsIGNv bnN0IHZvaWQqKQoreworICAgIC8vIEFueSAxMjggYml0IGtleSB3b3VsZCBkbywgYWxsIHdlIG5l ZWQgZm9yIHRlc3RpbmcgaXMgdG8gaW1wbGVtZW50IHRoZSBjYWxsYmFjay4KKyAgICByZXR1cm4g V0tEYXRhQ3JlYXRlKChjb25zdCB1aW50OF90KikiXHgwMFx4MDFceDAyXHgwM1x4MDRceDA1XHgw Nlx4MDdceDA4XHgwOVx4MGFceDBiXHgwY1x4MGRceDBlXHgwZiIsIDE2KTsKK30KKwogc3RhdGlj IFRlc3RDb250cm9sbGVyKiBjb250cm9sbGVyOwogCiBUZXN0Q29udHJvbGxlciYgVGVzdENvbnRy b2xsZXI6OnNoYXJlZCgpCkBAIC0zMzYsNiArMzQyLDE1IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6 OmluaXRpYWxpemUoaW50IGFyZ2MKIAogICAgIHBsYXRmb3JtSW5pdGlhbGl6ZUNvbnRleHQoKTsK IAorICAgIFdLQ29udGV4dENsaWVudFYxIGNvbnRleHRDbGllbnQgPSB7CisgICAgICAgIHsgMSwg dGhpcyB9LAorICAgICAgICBudWxscHRyLCAvLyBwbHVnSW5BdXRvU3RhcnRPcmlnaW5IYXNoZXND aGFuZ2VkCisgICAgICAgIG51bGxwdHIsIC8vIG5ldHdvcmtQcm9jZXNzRGlkQ3Jhc2gsCisgICAg ICAgIG51bGxwdHIsIC8vIHBsdWdJbkluZm9ybWF0aW9uQmVjYW1lQXZhaWxhYmxlLAorICAgICAg ICBjb3B5V2ViQ3J5cHRvTWFzdGVyS2V5CisgICAgfTsKKyAgICBXS0NvbnRleHRTZXRDbGllbnQo bV9jb250ZXh0LmdldCgpLCAmY29udGV4dENsaWVudC5iYXNlKTsKKwogICAgIFdLQ29udGV4dElu amVjdGVkQnVuZGxlQ2xpZW50VjEgaW5qZWN0ZWRCdW5kbGVDbGllbnQgPSB7CiAgICAgICAgIHsg MSwgdGhpcyB9LAogICAgICAgICBkaWRSZWNlaXZlTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZSwK