165835 2016-12-13 18:48:24 -0800 Handle key generation with empty challenge string 2016-12-14 12:31:26 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wilander wilander andersca conrad_shultz webkit-bug-importer wilander oldest_to_newest 1259610 0 wilander 2016-12-13 18:48:24 -0800 https://bugs.webkit.org/show_bug.cgi?id=160945 introduced an ASSERT(challenge.data()) that didn't catch empty challenge strings. Also, empty challenge strings are allowed: "If the element has a challenge attribute, then let challenge be that attribute's value. Otherwise, let challenge be the empty string." https://www.w3.org/TR/html5/forms.html#the-keygen-element Email certificate generation at https://www.comodo.com/home/email-security/free-email-certificate.php broke because of https://bugs.webkit.org/show_bug.cgi?id=160945. 1259611 1 wilander 2016-12-13 18:49:21 -0800 rdar://problem/29128710 1259612 2 297057 wilander 2016-12-13 18:57:28 -0800 Created attachment 297057 Patch 1259772 3 297057 conrad_shultz 2016-12-14 09:29:26 -0800 Comment on attachment 297057 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=297057&action=review > Source/WebCore/platform/mac/SSLKeyGeneratorMac.mm:180 > + signedPublicKeyAndChallenge.publicKeyAndChallenge.challenge.Data = (uint8 *)strdup("\0"); Does this need to be freed at some point? 1259822 4 297104 wilander 2016-12-14 11:20:47 -0800 Created attachment 297104 Patch 1259824 5 wilander 2016-12-14 11:23:09 -0800 (In reply to comment #3) > Comment on attachment 297057 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=297057&action=review > > > Source/WebCore/platform/mac/SSLKeyGeneratorMac.mm:180 > > + signedPublicKeyAndChallenge.publicKeyAndChallenge.challenge.Data = (uint8 *)strdup("\0"); > > Does this need to be freed at some point? Thanks! You're right. The old deallocation strategy was very different and covered this part too. But after a conversation with Anders Carlsson I found a simpler fix that doesn't require string duplication. See new patch. 1259836 6 297104 andersca 2016-12-14 12:03:59 -0800 Comment on attachment 297104 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=297104&action=review > Source/WebCore/platform/mac/SSLKeyGeneratorMac.mm:184 > + if (!challenge.length()) { > + // Needed to account for the null terminator > + signedPublicKeyAndChallenge.publicKeyAndChallenge.challenge.Length = 1; > + } else > + signedPublicKeyAndChallenge.publicKeyAndChallenge.challenge.Length = challenge.length(); I'm wondering whether this can just be signedPublicKeyAndChallenge.publicKeyAndChallenge.challenge.Length = challenge.length() + 1; always? 1259839 7 297109 wilander 2016-12-14 12:18:33 -0800 Created attachment 297109 Patch 1259840 8 wilander 2016-12-14 12:21:38 -0800 (In reply to comment #6) > Comment on attachment 297104 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=297104&action=review > > > Source/WebCore/platform/mac/SSLKeyGeneratorMac.mm:184 > > + if (!challenge.length()) { > > + // Needed to account for the null terminator > > + signedPublicKeyAndChallenge.publicKeyAndChallenge.challenge.Length = 1; > > + } else > > + signedPublicKeyAndChallenge.publicKeyAndChallenge.challenge.Length = challenge.length(); > > I'm wondering whether this can just be > > signedPublicKeyAndChallenge.publicKeyAndChallenge.challenge.Length = > challenge.length() + 1; > > always? Seems to work. And it is aligned with the other place where we set the Length in a CSSM_DATA struct: uint8 encodeNull[2] { SEC_ASN1_NULL, 0 }; ... signedPublicKeyAndChallenge.algorithmIdentifier.parameters.Data = (uint8 *)encodeNull; signedPublicKeyAndChallenge.algorithmIdentifier.parameters.Length = 2; See new patch. 1259841 9 297109 andersca 2016-12-14 12:26:12 -0800 Comment on attachment 297109 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=297109&action=review > Source/WebCore/platform/mac/SSLKeyGeneratorMac.mm:180 > + // Length needs to account for the null terminator Add a period to make this a proper sentence. 1259844 10 wilander 2016-12-14 12:31:26 -0800 Committed r209822: <http://trac.webkit.org/changeset/209822> 297057 2016-12-13 18:57:28 -0800 2016-12-14 11:20:44 -0800 Patch bug-165835-20161213185639.patch text/plain 3395 wilander SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwOTc4NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE2LTEyLTEzICBKb2huIFdp bGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIEhhbmRsZSBrZXkgZ2VuZXJh dGlvbiB3aXRoIGVtcHR5IGNoYWxsZW5nZSBzdHJpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NTgzNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v MjkxMjg3MTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MDk0NSBpbnRyb2R1 Y2VkIGFuCisgICAgICAgIEFTU0VSVChjaGFsbGVuZ2UuZGF0YSgpKSB0aGF0IGRpZG4ndCBjYXRj aCBlbXB0eSBjaGFsbGVuZ2Ugc3RyaW5ncy4gQWxzbywgZW1wdHkKKyAgICAgICAgY2hhbGxlbmdl IHN0cmluZ3MgYXJlIGFsbG93ZWQ6CisgICAgICAgICJJZiB0aGUgZWxlbWVudCBoYXMgYSBjaGFs bGVuZ2UgYXR0cmlidXRlLCB0aGVuIGxldCBjaGFsbGVuZ2UgYmUgdGhhdCBhdHRyaWJ1dGUncwor ICAgICAgICB2YWx1ZS4gT3RoZXJ3aXNlLCBsZXQgY2hhbGxlbmdlIGJlIHRoZSBlbXB0eSBzdHJp bmcuIgorICAgICAgICBodHRwczovL3d3dy53My5vcmcvVFIvaHRtbDUvZm9ybXMuaHRtbCN0aGUt a2V5Z2VuLWVsZW1lbnQgKGZldGNoZWQgMjAxNi0xMi0xMykKKworICAgICAgICBFbWFpbCBjZXJ0 aWZpY2F0ZSBnZW5lcmF0aW9uIGF0CisgICAgICAgIGh0dHBzOi8vd3d3LmNvbW9kby5jb20vaG9t ZS9lbWFpbC1zZWN1cml0eS9mcmVlLWVtYWlsLWNlcnRpZmljYXRlLnBocCBicm9rZQorICAgICAg ICBiZWNhdXNlIG9mIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjA5 NDUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGUgb3JpZ2luYWwgcGF0Y2ggZGlkIG5vdCBo YXZlIHRlc3RzIGFuZCB0aGUgYnJlYWthZ2Ugd2FzIGluIHRoZQorICAgICAgICBwcm9kdWNlZCBr ZXkgbWF0ZXJpYWwgc28gYSB0ZXN0IHdvdWxkIGhhdmUgdG8gdmFsaWRhdGUgdGhlIGNyeXB0byBv dXRwdXQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvU1NMS2V5R2VuZXJhdG9yTWFjLm1tOgor ICAgICAgICAoV2ViQ29yZTo6c2lnbmVkUHVibGljS2V5QW5kQ2hhbGxlbmdlU3RyaW5nKToKKyAg ICAgICAgICAgIE5vdyBjaGVja3MgaWYgdGhlIGNoYWxsZW5nZSBzdHJpbmcgaXMgZW1wdHkgYW5k IGlmIHNvIHNldHMgdXAgdGhlIGNoYWxsZW5nZQorICAgICAgICAgICAgaW5wdXQgdG8gaGF2ZSBs ZW5ndGggMSBhbmQgZGF0YSAnXDAnLiBUaGlzIHdhcyB0aGUgb2xkIGJlaGF2aW9yLgorCiAyMDE2 LTEyLTEzICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBE b2N1bWVudCBhIEZyYW1lRGVzdHJ1Y3Rpb25PYnNlcnZlcgpJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWFjL1NTTEtleUdlbmVyYXRvck1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tYWMvU1NMS2V5R2VuZXJhdG9yTWFjLm1tCShyZXZpc2lvbiAyMDk3 MjYpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU1NMS2V5R2VuZXJhdG9yTWFjLm1t CSh3b3JraW5nIGNvcHkpCkBAIC0xNzUsMTAgKzE3NSwxMyBAQCBzdGF0aWMgU3RyaW5nIHNpZ25l ZFB1YmxpY0tleUFuZENoYWxsZW5nCiAgICAgaWYgKFNlY0FzbjFEZWNvZGVEYXRhKGNvZGVyLCAm c3ViamVjdFB1YmxpY0tleS5LZXlEYXRhLCBrU2VjQXNuMVN1YmplY3RQdWJsaWNLZXlJbmZvVGVt cGxhdGUsICZzaWduZWRQdWJsaWNLZXlBbmRDaGFsbGVuZ2UucHVibGljS2V5QW5kQ2hhbGxlbmdl LnN1YmplY3RQdWJsaWNLZXlJbmZvKSAhPSBub0VycikKICAgICAgICAgcmV0dXJuIFN0cmluZygp OwogCi0gICAgQVNTRVJUKGNoYWxsZW5nZS5kYXRhKCkpOwotCi0gICAgc2lnbmVkUHVibGljS2V5 QW5kQ2hhbGxlbmdlLnB1YmxpY0tleUFuZENoYWxsZW5nZS5jaGFsbGVuZ2UuTGVuZ3RoID0gY2hh bGxlbmdlLmxlbmd0aCgpOwotICAgIHNpZ25lZFB1YmxpY0tleUFuZENoYWxsZW5nZS5wdWJsaWNL ZXlBbmRDaGFsbGVuZ2UuY2hhbGxlbmdlLkRhdGEgPSAodWludDhfdCopY2hhbGxlbmdlLmRhdGEo KTsKKyAgICBpZiAoIWNoYWxsZW5nZS5sZW5ndGgoKSkgeworICAgICAgICBzaWduZWRQdWJsaWNL ZXlBbmRDaGFsbGVuZ2UucHVibGljS2V5QW5kQ2hhbGxlbmdlLmNoYWxsZW5nZS5MZW5ndGggPSAx OworICAgICAgICBzaWduZWRQdWJsaWNLZXlBbmRDaGFsbGVuZ2UucHVibGljS2V5QW5kQ2hhbGxl bmdlLmNoYWxsZW5nZS5EYXRhID0gKHVpbnQ4ICopc3RyZHVwKCJcMCIpOworICAgIH0gZWxzZSB7 CisgICAgICAgIHNpZ25lZFB1YmxpY0tleUFuZENoYWxsZW5nZS5wdWJsaWNLZXlBbmRDaGFsbGVu Z2UuY2hhbGxlbmdlLkxlbmd0aCA9IGNoYWxsZW5nZS5sZW5ndGgoKTsKKyAgICAgICAgc2lnbmVk UHVibGljS2V5QW5kQ2hhbGxlbmdlLnB1YmxpY0tleUFuZENoYWxsZW5nZS5jaGFsbGVuZ2UuRGF0 YSA9ICh1aW50OF90KiljaGFsbGVuZ2UuZGF0YSgpOworICAgIH0KIAogICAgIENTU01fREFUQSBl bmNvZGVkUHVibGljS2V5QW5kQ2hhbGxlbmdlIHsgMCwgbnVsbHB0ciB9OwogICAgIGlmIChTZWNB c24xRW5jb2RlSXRlbShjb2RlciwgJnNpZ25lZFB1YmxpY0tleUFuZENoYWxsZW5nZS5wdWJsaWNL ZXlBbmRDaGFsbGVuZ2UsIHB1YmxpY0tleUFuZENoYWxsZW5nZVRlbXBsYXRlLCAmZW5jb2RlZFB1 YmxpY0tleUFuZENoYWxsZW5nZSkgIT0gbm9FcnIpCkBAIC0yMjAsNyArMjIzLDcgQEAgdm9pZCBn ZXRTdXBwb3J0ZWRLZXlTaXplcyhWZWN0b3I8U3RyaW5nPgogfQogCiBTdHJpbmcgc2lnbmVkUHVi bGljS2V5QW5kQ2hhbGxlbmdlU3RyaW5nKHVuc2lnbmVkIGtleVNpemVJbmRleCwgY29uc3QgU3Ry aW5nJiBjaGFsbGVuZ2VTdHJpbmcsIGNvbnN0IFVSTCYgdXJsKQoteyAgIAorewogICAgIC8vIFRo aXMgc3dpdGNoIHN0YXRlbWVudCBtdXN0IGFsd2F5cyBiZSBzeW5jZWQgd2l0aCB0aGUgVUkgc3Ry aW5ncyByZXR1cm5lZCBieSBnZXRTdXBwb3J0ZWRLZXlTaXplcy4KICAgICBVSW50MzIga2V5U2l6 ZTsKICAgICBzd2l0Y2ggKGtleVNpemVJbmRleCkgewo= 297104 2016-12-14 11:20:47 -0800 2016-12-14 12:18:30 -0800 Patch bug-165835-20161214111956.patch text/plain 2929 wilander SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwOTc4NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE2LTEyLTE0ICBKb2huIFdp bGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIEhhbmRsZSBrZXkgZ2VuZXJh dGlvbiB3aXRoIGVtcHR5IGNoYWxsZW5nZSBzdHJpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NTgzNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v MjkxMjg3MTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MDk0NSBkaWRuJ3Qg c2V0IHRoZSBjaGFsbGVuZ2UgbGVuZ3RoIHRvCisgICAgICAgIDEgZm9yIGVtcHR5IGNoYWxsZW5n ZSBzdHJpbmdzLiBUaHVzIHRoZSBudWxsIHRlcm1pbmF0b3Igd2FzIG5vdCBpbmNsdWRlZC4gRW1w dHkKKyAgICAgICAgY2hhbGxlbmdlIHN0cmluZ3MgYXJlIGFsbG93ZWQ6CisgICAgICAgICJJZiB0 aGUgZWxlbWVudCBoYXMgYSBjaGFsbGVuZ2UgYXR0cmlidXRlLCB0aGVuIGxldCBjaGFsbGVuZ2Ug YmUgdGhhdCBhdHRyaWJ1dGUncworICAgICAgICB2YWx1ZS4gT3RoZXJ3aXNlLCBsZXQgY2hhbGxl bmdlIGJlIHRoZSBlbXB0eSBzdHJpbmcuIgorICAgICAgICBodHRwczovL3d3dy53My5vcmcvVFIv aHRtbDUvZm9ybXMuaHRtbCN0aGUta2V5Z2VuLWVsZW1lbnQgKGZldGNoZWQgMjAxNi0xMi0xMykK KworICAgICAgICBFbWFpbCBjZXJ0aWZpY2F0ZSBnZW5lcmF0aW9uIGF0CisgICAgICAgIGh0dHBz Oi8vd3d3LmNvbW9kby5jb20vaG9tZS9lbWFpbC1zZWN1cml0eS9mcmVlLWVtYWlsLWNlcnRpZmlj YXRlLnBocCBicm9rZQorICAgICAgICBiZWNhdXNlIG9mIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNjA5NDUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGUgb3Jp Z2luYWwgcGF0Y2ggZGlkIG5vdCBoYXZlIHRlc3RzIGFuZCB0aGUgYnJlYWthZ2Ugd2FzIGluIHRo ZQorICAgICAgICBwcm9kdWNlZCBrZXkgbWF0ZXJpYWwgc28gYSB0ZXN0IHdvdWxkIGhhdmUgdG8g dmFsaWRhdGUgdGhlIGNyeXB0byBvdXRwdXQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvU1NM S2V5R2VuZXJhdG9yTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6c2lnbmVkUHVibGljS2V5QW5k Q2hhbGxlbmdlU3RyaW5nKToKKyAgICAgICAgICAgIE5vdyBjaGVja3MgaWYgdGhlIGNoYWxsZW5n ZSBzdHJpbmcgaXMgZW1wdHkgYW5kIGlmIHNvIHNldHMgdXAgdGhlIGNoYWxsZW5nZQorICAgICAg ICAgICAgaW5wdXQgdG8gaGF2ZSBsZW5ndGggMSB0byBhY2NvdW50IGZvciBpdHMgbnVsbCB0ZXJt aW5hdG9yLiBUaGlzIG1hdGNoZXMgdGhlCisgICAgICAgICAgICBvbGQgYmVoYXZpb3IuCisKIDIw MTYtMTItMTMgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBNYWtl IERvY3VtZW50IGEgRnJhbWVEZXN0cnVjdGlvbk9ic2VydmVyCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tYWMvU1NMS2V5R2VuZXJhdG9yTWFjLm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TU0xLZXlHZW5lcmF0b3JNYWMubW0JKHJldmlzaW9uIDIw OTcyNikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TU0xLZXlHZW5lcmF0b3JNYWMu bW0JKHdvcmtpbmcgY29weSkKQEAgLTE3Nyw3ICsxNzcsMTEgQEAgc3RhdGljIFN0cmluZyBzaWdu ZWRQdWJsaWNLZXlBbmRDaGFsbGVuZwogCiAgICAgQVNTRVJUKGNoYWxsZW5nZS5kYXRhKCkpOwog Ci0gICAgc2lnbmVkUHVibGljS2V5QW5kQ2hhbGxlbmdlLnB1YmxpY0tleUFuZENoYWxsZW5nZS5j aGFsbGVuZ2UuTGVuZ3RoID0gY2hhbGxlbmdlLmxlbmd0aCgpOworICAgIGlmICghY2hhbGxlbmdl Lmxlbmd0aCgpKSB7CisgICAgICAgIC8vIE5lZWRlZCB0byBhY2NvdW50IGZvciB0aGUgbnVsbCB0 ZXJtaW5hdG9yCisgICAgICAgIHNpZ25lZFB1YmxpY0tleUFuZENoYWxsZW5nZS5wdWJsaWNLZXlB bmRDaGFsbGVuZ2UuY2hhbGxlbmdlLkxlbmd0aCA9IDE7CisgICAgfSBlbHNlCisgICAgICAgIHNp Z25lZFB1YmxpY0tleUFuZENoYWxsZW5nZS5wdWJsaWNLZXlBbmRDaGFsbGVuZ2UuY2hhbGxlbmdl Lkxlbmd0aCA9IGNoYWxsZW5nZS5sZW5ndGgoKTsKICAgICBzaWduZWRQdWJsaWNLZXlBbmRDaGFs bGVuZ2UucHVibGljS2V5QW5kQ2hhbGxlbmdlLmNoYWxsZW5nZS5EYXRhID0gKHVpbnQ4X3QqKWNo YWxsZW5nZS5kYXRhKCk7CiAKICAgICBDU1NNX0RBVEEgZW5jb2RlZFB1YmxpY0tleUFuZENoYWxs ZW5nZSB7IDAsIG51bGxwdHIgfTsKQEAgLTIyMCw3ICsyMjQsNyBAQCB2b2lkIGdldFN1cHBvcnRl ZEtleVNpemVzKFZlY3RvcjxTdHJpbmc+CiB9CiAKIFN0cmluZyBzaWduZWRQdWJsaWNLZXlBbmRD aGFsbGVuZ2VTdHJpbmcodW5zaWduZWQga2V5U2l6ZUluZGV4LCBjb25zdCBTdHJpbmcmIGNoYWxs ZW5nZVN0cmluZywgY29uc3QgVVJMJiB1cmwpCi17ICAgCit7CiAgICAgLy8gVGhpcyBzd2l0Y2gg c3RhdGVtZW50IG11c3QgYWx3YXlzIGJlIHN5bmNlZCB3aXRoIHRoZSBVSSBzdHJpbmdzIHJldHVy bmVkIGJ5IGdldFN1cHBvcnRlZEtleVNpemVzLgogICAgIFVJbnQzMiBrZXlTaXplOwogICAgIHN3 aXRjaCAoa2V5U2l6ZUluZGV4KSB7Cg== 297109 2016-12-14 12:18:33 -0800 2016-12-14 12:26:12 -0800 Patch bug-165835-20161214121742.patch text/plain 2735 wilander SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwOTc4NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE2LTEyLTE0ICBKb2huIFdp bGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIEhhbmRsZSBrZXkgZ2VuZXJh dGlvbiB3aXRoIGVtcHR5IGNoYWxsZW5nZSBzdHJpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NTgzNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v MjkxMjg3MTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MDk0NSBkaWRuJ3Qg c2V0IHRoZSBjaGFsbGVuZ2UgbGVuZ3RoIHRvCisgICAgICAgIDEgZm9yIGVtcHR5IGNoYWxsZW5n ZSBzdHJpbmdzLiBUaHVzIHRoZSBudWxsIHRlcm1pbmF0b3Igd2FzIG5vdCBpbmNsdWRlZC4gRW1w dHkKKyAgICAgICAgY2hhbGxlbmdlIHN0cmluZ3MgYXJlIGFsbG93ZWQ6CisgICAgICAgICJJZiB0 aGUgZWxlbWVudCBoYXMgYSBjaGFsbGVuZ2UgYXR0cmlidXRlLCB0aGVuIGxldCBjaGFsbGVuZ2Ug YmUgdGhhdCBhdHRyaWJ1dGUncworICAgICAgICB2YWx1ZS4gT3RoZXJ3aXNlLCBsZXQgY2hhbGxl bmdlIGJlIHRoZSBlbXB0eSBzdHJpbmcuIgorICAgICAgICBodHRwczovL3d3dy53My5vcmcvVFIv aHRtbDUvZm9ybXMuaHRtbCN0aGUta2V5Z2VuLWVsZW1lbnQgKGZldGNoZWQgMjAxNi0xMi0xMykK KworICAgICAgICBFbWFpbCBjZXJ0aWZpY2F0ZSBnZW5lcmF0aW9uIGF0CisgICAgICAgIGh0dHBz Oi8vd3d3LmNvbW9kby5jb20vaG9tZS9lbWFpbC1zZWN1cml0eS9mcmVlLWVtYWlsLWNlcnRpZmlj YXRlLnBocCBicm9rZQorICAgICAgICBiZWNhdXNlIG9mIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNjA5NDUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGUgb3Jp Z2luYWwgcGF0Y2ggZGlkIG5vdCBoYXZlIHRlc3RzIGFuZCB0aGUgYnJlYWthZ2Ugd2FzIGluIHRo ZQorICAgICAgICBwcm9kdWNlZCBrZXkgbWF0ZXJpYWwgc28gYSB0ZXN0IHdvdWxkIGhhdmUgdG8g dmFsaWRhdGUgdGhlIGNyeXB0byBvdXRwdXQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvU1NM S2V5R2VuZXJhdG9yTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6c2lnbmVkUHVibGljS2V5QW5k Q2hhbGxlbmdlU3RyaW5nKToKKyAgICAgICAgICAgIE5vdyBhZGRzIDEgdG8gdGhlIGxlbmd0aCBv ZiB0aGUgY2hhbGxlbmdlIHRvIGFjY291bnQgZm9yIGl0cyBudWxsIHRlcm1pbmF0b3IuCisgICAg ICAgICAgICBUaGlzIG1hdGNoZXMgdGhlIG9sZCBiZWhhdmlvci4KKwogMjAxNi0xMi0xMyAgQ2hy aXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgRG9jdW1lbnQgYSBG cmFtZURlc3RydWN0aW9uT2JzZXJ2ZXIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21h Yy9TU0xLZXlHZW5lcmF0b3JNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWFjL1NTTEtleUdlbmVyYXRvck1hYy5tbQkocmV2aXNpb24gMjA5NzI2KQorKysgU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1NTTEtleUdlbmVyYXRvck1hYy5tbQkod29ya2luZyBj b3B5KQpAQCAtMTc3LDcgKzE3Nyw4IEBAIHN0YXRpYyBTdHJpbmcgc2lnbmVkUHVibGljS2V5QW5k Q2hhbGxlbmcKIAogICAgIEFTU0VSVChjaGFsbGVuZ2UuZGF0YSgpKTsKIAotICAgIHNpZ25lZFB1 YmxpY0tleUFuZENoYWxsZW5nZS5wdWJsaWNLZXlBbmRDaGFsbGVuZ2UuY2hhbGxlbmdlLkxlbmd0 aCA9IGNoYWxsZW5nZS5sZW5ndGgoKTsKKyAgICAvLyBMZW5ndGggbmVlZHMgdG8gYWNjb3VudCBm b3IgdGhlIG51bGwgdGVybWluYXRvcgorICAgIHNpZ25lZFB1YmxpY0tleUFuZENoYWxsZW5nZS5w dWJsaWNLZXlBbmRDaGFsbGVuZ2UuY2hhbGxlbmdlLkxlbmd0aCA9IGNoYWxsZW5nZS5sZW5ndGgo KSArIDE7CiAgICAgc2lnbmVkUHVibGljS2V5QW5kQ2hhbGxlbmdlLnB1YmxpY0tleUFuZENoYWxs ZW5nZS5jaGFsbGVuZ2UuRGF0YSA9ICh1aW50OF90KiljaGFsbGVuZ2UuZGF0YSgpOwogCiAgICAg Q1NTTV9EQVRBIGVuY29kZWRQdWJsaWNLZXlBbmRDaGFsbGVuZ2UgeyAwLCBudWxscHRyIH07CkBA IC0yMjAsNyArMjIxLDcgQEAgdm9pZCBnZXRTdXBwb3J0ZWRLZXlTaXplcyhWZWN0b3I8U3RyaW5n PgogfQogCiBTdHJpbmcgc2lnbmVkUHVibGljS2V5QW5kQ2hhbGxlbmdlU3RyaW5nKHVuc2lnbmVk IGtleVNpemVJbmRleCwgY29uc3QgU3RyaW5nJiBjaGFsbGVuZ2VTdHJpbmcsIGNvbnN0IFVSTCYg dXJsKQoteyAgIAorewogICAgIC8vIFRoaXMgc3dpdGNoIHN0YXRlbWVudCBtdXN0IGFsd2F5cyBi ZSBzeW5jZWQgd2l0aCB0aGUgVUkgc3RyaW5ncyByZXR1cm5lZCBieSBnZXRTdXBwb3J0ZWRLZXlT aXplcy4KICAgICBVSW50MzIga2V5U2l6ZTsKICAgICBzd2l0Y2ggKGtleVNpemVJbmRleCkgewo=