124376 2013-11-14 12:57:43 -0800 Implement raw format for WebCrypto key export 2013-11-14 13:42:32 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 122679 1 ap ap cdumez commit-queue esprehn+autocc kondapallykalyan mkwst oldest_to_newest 950807 0 ap 2013-11-14 12:57:43 -0800 Export HMAC and AES keys as raw. 950808 1 216969 ap 2013-11-14 13:03:43 -0800 Created attachment 216969 proposed patch 950828 2 ap 2013-11-14 13:42:32 -0800 Committed <http://trac.webkit.org/r159310>. 216969 2013-11-14 13:03:43 -0800 2013-11-14 13:37:59 -0800 proposed patch ExportRaw.txt text/plain 15708 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1OTMwNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDEzLTExLTE0ICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIEltcGxlbWVudCByYXcgZm9y bWF0IGZvciBXZWJDcnlwdG8ga2V5IGV4cG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0Mzc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGVzdHM6IGNyeXB0by9zdWJ0bGUvYWVzLWV4cG9ydC1rZXku aHRtbAorICAgICAgICAgICAgICAgY3J5cHRvL3N1YnRsZS9obWFjLWV4cG9ydC1rZXkuaHRtbAor CisgICAgICAgIEEgQ3J5cHRvS2V5IGp1c3QgZXhwb3J0cyBpdHMgbmF0aXZlIENyeXB0b0tleURh dGEsIHdoaWNoIHdpbGwgYWxzbyB3b3JrIG5pY2VseSBmb3IKKyAgICAgICAgSldLIGZvcm1hdCBz b29uLiBGb3Igc3BraSBhbmQgcGtjczgsIHdlJ2xsIG5lZWQgdG8gZmlndXJlIG91dCB0aGUgYmVz dCB3YXkgdG8KKyAgICAgICAgdXRpbGl6ZSBwbGF0Zm9ybSBsaWJyYXJ5IHN1cHBvcnQgZm9yIEFT Ti4xLCBidXQgd2UgYXJlIG5vdCB0aGVyZSB5ZXQuCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9K U1N1YnRsZUNyeXB0b0N1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU1N1YnRsZUNyeXB0 bzo6ZXhwb3J0S2V5KToKKyAgICAgICAgKiBjcnlwdG8vQ3J5cHRvS2V5Lmg6CisgICAgICAgICog Y3J5cHRvL1N1YnRsZUNyeXB0by5pZGw6CisgICAgICAgICogY3J5cHRvL2tleXMvQ3J5cHRvS2V5 QUVTLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNyeXB0b0tleUFFUzo6ZXhwb3J0RGF0YSk6Cisg ICAgICAgICogY3J5cHRvL2tleXMvQ3J5cHRvS2V5QUVTLmg6CisgICAgICAgICogY3J5cHRvL2tl eXMvQ3J5cHRvS2V5SE1BQy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDcnlwdG9LZXlITUFDOjpl eHBvcnREYXRhKToKKyAgICAgICAgKiBjcnlwdG8va2V5cy9DcnlwdG9LZXlITUFDLmg6CisKKyAg ICAgICAgKiBjcnlwdG8va2V5cy9DcnlwdG9LZXlSU0EuaDoKKyAgICAgICAgKiBjcnlwdG8vbWFj L0NyeXB0b0tleVJTQU1hYy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDcnlwdG9LZXlSU0E6OmV4 cG9ydERhdGEpOgorICAgICAgICBBZGRlZCBhIGR1bW15IGltcGxlbWVudGF0aW9uIGZvciBSU0Eu CisKIDIwMTMtMTEtMTQgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgogCiAgICAgICAg IFJ1YmJlci1zdGFtcGVkIGJ5IFRpbSBIb3J0b24uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9KU1N1YnRsZUNyeXB0b0N1c3RvbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvYmluZGluZ3MvanMvSlNTdWJ0bGVDcnlwdG9DdXN0b20uY3BwCShyZXZpc2lvbiAxNTky OTUpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1N1YnRsZUNyeXB0b0N1c3RvbS5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTMyLDYgKzMyLDggQEAKICNpbmNsdWRlICJDcnlwdG9BbGdv cml0aG1QYXJhbWV0ZXJzLmgiCiAjaW5jbHVkZSAiQ3J5cHRvQWxnb3JpdGhtUmVnaXN0cnkuaCIK ICNpbmNsdWRlICJDcnlwdG9LZXlEYXRhLmgiCisjaW5jbHVkZSAiQ3J5cHRvS2V5RGF0YU9jdGV0 U2VxdWVuY2UuaCIKKyNpbmNsdWRlICJDcnlwdG9LZXlEYXRhUlNBQ29tcG9uZW50cy5oIgogI2lu Y2x1ZGUgIkNyeXB0b0tleVNlcmlhbGl6YXRpb25SYXcuaCIKICNpbmNsdWRlICJEb2N1bWVudC5o IgogI2luY2x1ZGUgIkV4Y2VwdGlvbkNvZGUuaCIKQEAgLTUwNiw2ICs1MDgsNTYgQEAgSlNWYWx1 ZSBKU1N1YnRsZUNyeXB0bzo6aW1wb3J0S2V5KEpTQzo6RQogICAgIHJldHVybiBwcm9taXNlOwog fQogCitKU1ZhbHVlIEpTU3VidGxlQ3J5cHRvOjpleHBvcnRLZXkoSlNDOjpFeGVjU3RhdGUqIGV4 ZWMpCit7CisgICAgaWYgKGV4ZWMtPmFyZ3VtZW50Q291bnQoKSA8IDIpCisgICAgICAgIHJldHVy biBleGVjLT52bSgpLnRocm93RXhjZXB0aW9uKGV4ZWMsIGNyZWF0ZU5vdEVub3VnaEFyZ3VtZW50 c0Vycm9yKGV4ZWMpKTsKKworICAgIENyeXB0b0tleUZvcm1hdCBrZXlGb3JtYXQ7CisgICAgaWYg KCFjcnlwdG9LZXlGb3JtYXRGcm9tSlNWYWx1ZShleGVjLCBleGVjLT5hcmd1bWVudCgwKSwga2V5 Rm9ybWF0KSkgeworICAgICAgICBBU1NFUlQoZXhlYy0+aGFkRXhjZXB0aW9uKCkpOworICAgICAg ICByZXR1cm4ganNVbmRlZmluZWQoKTsKKyAgICB9CisKKyAgICBSZWZQdHI8Q3J5cHRvS2V5PiBr ZXkgPSB0b0NyeXB0b0tleShleGVjLT51bmNoZWNrZWRBcmd1bWVudCgxKSk7CisgICAgaWYgKCFr ZXkpCisgICAgICAgIHJldHVybiB0aHJvd1R5cGVFcnJvcihleGVjKTsKKworICAgIEpTUHJvbWlz ZSogcHJvbWlzZSA9IEpTUHJvbWlzZTo6Y3JlYXRlV2l0aFJlc29sdmVyKGV4ZWMtPnZtKCksIGds b2JhbE9iamVjdCgpKTsKKyAgICBhdXRvIHByb21pc2VXcmFwcGVyID0gUHJvbWlzZVdyYXBwZXI6 OmNyZWF0ZShnbG9iYWxPYmplY3QoKSwgcHJvbWlzZSk7CisKKyAgICBpZiAoIWtleS0+ZXh0cmFj dGFibGUoKSkgeworICAgICAgICBtX2ltcGwtPmRvY3VtZW50KCktPmFkZENvbnNvbGVNZXNzYWdl KEpTTWVzc2FnZVNvdXJjZSwgRXJyb3JNZXNzYWdlTGV2ZWwsICJLZXkgaXMgbm90IGV4dHJhY3Rh YmxlIik7CisgICAgICAgIHByb21pc2VXcmFwcGVyLT5yZWplY3QobnVsbHB0cik7CisgICAgICAg IHJldHVybiBwcm9taXNlOworICAgIH0KKworICAgIHN0ZDo6dW5pcXVlX3B0cjxDcnlwdG9LZXlE YXRhPiBrZXlEYXRhID0ga2V5LT5leHBvcnREYXRhKCk7CisgICAgaWYgKCFrZXlEYXRhKSB7Cisg ICAgICAgIC8vIEZJWE1FOiBTaG91bGRuJ3QgaGFwcGVuIG9uY2UgYWxsIGtleSB0eXBlcyBpbXBs ZW1lbnQgZXhwb3J0RGF0YSgpLgorICAgICAgICBwcm9taXNlV3JhcHBlci0+cmVqZWN0KG51bGxw dHIpOworICAgICAgICByZXR1cm4gcHJvbWlzZTsKKyAgICB9CisKKyAgICBzd2l0Y2ggKGtleUZv cm1hdCkgeworICAgIGNhc2UgQ3J5cHRvS2V5Rm9ybWF0OjpSYXc6CisgICAgICAgIGlmIChpc0Ny eXB0b0tleURhdGFPY3RldFNlcXVlbmNlKCprZXlEYXRhKSkgeworICAgICAgICAgICAgVmVjdG9y PHVuc2lnbmVkIGNoYXI+IHJlc3VsdDsKKyAgICAgICAgICAgIHJlc3VsdC5hcHBlbmRWZWN0b3Io dG9DcnlwdG9LZXlEYXRhT2N0ZXRTZXF1ZW5jZSgqa2V5RGF0YSkub2N0ZXRTZXF1ZW5jZSgpKTsK KyAgICAgICAgICAgIHByb21pc2VXcmFwcGVyLT5mdWxmaWxsKHJlc3VsdCk7CisgICAgICAgIH0g ZWxzZSB7CisgICAgICAgICAgICBtX2ltcGwtPmRvY3VtZW50KCktPmFkZENvbnNvbGVNZXNzYWdl KEpTTWVzc2FnZVNvdXJjZSwgRXJyb3JNZXNzYWdlTGV2ZWwsICJLZXkgY2Fubm90IGJlIGV4cG9y dGVkIHRvIHJhdyBmb3JtYXQiKTsKKyAgICAgICAgICAgIHByb21pc2VXcmFwcGVyLT5yZWplY3Qo bnVsbHB0cik7CisgICAgICAgIH0KKyAgICAgICAgYnJlYWs7CisgICAgZGVmYXVsdDoKKyAgICAg ICAgdGhyb3dUeXBlRXJyb3IoZXhlYywgIlVuc3VwcG9ydGVkIGtleSBmb3JtYXQiKTsKKyAgICAg ICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7CisgICAgfQorCisgICAgcmV0dXJuIHByb21pc2U7Cit9 CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9jcnlwdG8vQ3J5cHRvS2V5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3J5cHRv L0NyeXB0b0tleS5oCShyZXZpc2lvbiAxNTkyOTUpCisrKyBTb3VyY2UvV2ViQ29yZS9jcnlwdG8v Q3J5cHRvS2V5LmgJKHdvcmtpbmcgY29weSkKQEAgLTM4LDYgKzM4LDcgQEAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAogY2xhc3MgQ3J5cHRvQWxnb3JpdGhtRGVzY3JpcHRpb25CdWlsZGVyOworY2xh c3MgQ3J5cHRvS2V5RGF0YTsKIAogRU5VTV9DTEFTUyhDcnlwdG9LZXlDbGFzcykgewogICAgIEhN QUMsCkBAIC01OSw2ICs2MCw4IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgYWxsb3dzKENyeXB0b0tl eVVzYWdlIHVzYWdlKSBjb25zdCB7IHJldHVybiB1c2FnZSA9PSAobV91c2FnZXMgJiB1c2FnZSk7 IH0KIAorICAgIHZpcnR1YWwgc3RkOjp1bmlxdWVfcHRyPENyeXB0b0tleURhdGE+IGV4cG9ydERh dGEoKSBjb25zdCA9IDA7CisKICAgICBzdGF0aWMgVmVjdG9yPGNoYXI+IHJhbmRvbURhdGEoc2l6 ZV90KTsKIAogcHJpdmF0ZToKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2NyeXB0by9TdWJ0bGVDcnlw dG8uaWRsCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2NyeXB0by9TdWJ0bGVDcnlwdG8u aWRsCShyZXZpc2lvbiAxNTkyOTUpCisrKyBTb3VyY2UvV2ViQ29yZS9jcnlwdG8vU3VidGxlQ3J5 cHRvLmlkbAkod29ya2luZyBjb3B5KQpAQCAtMzYsNCArMzYsNSBAQAogICAgIFtDdXN0b21dIFBy b21pc2UgZGlnZXN0KEFsZ29yaXRobUlkZW50aWZpZXIgYWxnb3JpdGhtLCBzZXF1ZW5jZTxDcnlw dG9PcGVyYXRpb25EYXRhPiBkYXRhKTsKICAgICBbQ3VzdG9tXSBQcm9taXNlIGdlbmVyYXRlS2V5 KEFsZ29yaXRobUlkZW50aWZpZXIgYWxnb3JpdGhtLCBvcHRpb25hbCBib29sZWFuIGV4dHJhY3Rh YmxlLCBvcHRpb25hbCBLZXlVc2FnZVtdIGtleVVzYWdlcyk7CiAgICAgW0N1c3RvbV0gUHJvbWlz ZSBpbXBvcnRLZXkoS2V5Rm9ybWF0IGZvcm1hdCwgQ3J5cHRvT3BlcmF0aW9uRGF0YSBrZXlEYXRh LCBBbGdvcml0aG1JZGVudGlmaWVyPyBhbGdvcml0aG0sIG9wdGlvbmFsIGJvb2xlYW4gZXh0cmFj dGFibGUsIG9wdGlvbmFsIEtleVVzYWdlW10ga2V5VXNhZ2VzKTsKKyAgICBbQ3VzdG9tXSBQcm9t aXNlIGV4cG9ydEtleShLZXlGb3JtYXQgZm9ybWF0LCBLZXkga2V5KTsKIH07CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9jcnlwdG8va2V5cy9DcnlwdG9LZXlBRVMuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2NyeXB0by9rZXlzL0NyeXB0b0tleUFFUy5jcHAJKHJldmlzaW9uIDE1OTI5 NSkKKysrIFNvdXJjZS9XZWJDb3JlL2NyeXB0by9rZXlzL0NyeXB0b0tleUFFUy5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTMwLDYgKzMwLDcgQEAKIAogI2luY2x1ZGUgIkNyeXB0b0FsZ29yaXRobURl c2NyaXB0aW9uQnVpbGRlci5oIgogI2luY2x1ZGUgIkNyeXB0b0FsZ29yaXRobVJlZ2lzdHJ5Lmgi CisjaW5jbHVkZSAiQ3J5cHRvS2V5RGF0YU9jdGV0U2VxdWVuY2UuaCIKICNpbmNsdWRlIDx3dGYv dGV4dC9XVEZTdHJpbmcuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNjIsNiArNjMsMTIg QEAgdm9pZCBDcnlwdG9LZXlBRVM6OmJ1aWxkQWxnb3JpdGhtRGVzY3JpcAogICAgIGJ1aWxkZXIu YWRkKCJsZW5ndGgiLCBtX2tleS5zaXplKCkgKiA4KTsKIH0KIAorc3RkOjp1bmlxdWVfcHRyPENy eXB0b0tleURhdGE+IENyeXB0b0tleUFFUzo6ZXhwb3J0RGF0YSgpIGNvbnN0Cit7CisgICAgQVNT RVJUKGV4dHJhY3RhYmxlKCkpOworICAgIHJldHVybiBDcnlwdG9LZXlEYXRhT2N0ZXRTZXF1ZW5j ZTo6Y3JlYXRlKG1fa2V5KTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYg Ly8gRU5BQkxFKFNVQlRMRV9DUllQVE8pCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jcnlwdG8va2V5 cy9DcnlwdG9LZXlBRVMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jcnlwdG8va2V5 cy9DcnlwdG9LZXlBRVMuaAkocmV2aXNpb24gMTU5Mjk1KQorKysgU291cmNlL1dlYkNvcmUvY3J5 cHRvL2tleXMvQ3J5cHRvS2V5QUVTLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ4LDExICs0OCwxMiBA QCBwdWJsaWM6CiAKICAgICBjb25zdCBWZWN0b3I8Y2hhcj4mIGtleSgpIGNvbnN0IHsgcmV0dXJu IG1fa2V5OyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgYnVpbGRBbGdvcml0aG1EZXNjcmlwdGlvbihD cnlwdG9BbGdvcml0aG1EZXNjcmlwdGlvbkJ1aWxkZXImKSBjb25zdCBPVkVSUklERTsKLQogcHJp dmF0ZToKICAgICBDcnlwdG9LZXlBRVMoQ3J5cHRvQWxnb3JpdGhtSWRlbnRpZmllciwgY29uc3Qg VmVjdG9yPGNoYXI+JiBrZXksIGJvb2wgZXh0cmFjdGFibGUsIENyeXB0b0tleVVzYWdlKTsKIAor ICAgIHZpcnR1YWwgdm9pZCBidWlsZEFsZ29yaXRobURlc2NyaXB0aW9uKENyeXB0b0FsZ29yaXRo bURlc2NyaXB0aW9uQnVpbGRlciYpIGNvbnN0IE9WRVJSSURFOworICAgIHZpcnR1YWwgc3RkOjp1 bmlxdWVfcHRyPENyeXB0b0tleURhdGE+IGV4cG9ydERhdGEoKSBjb25zdCBPVkVSUklERTsKKwog ICAgIFZlY3RvcjxjaGFyPiBtX2tleTsKIH07CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2NyeXB0 by9rZXlzL0NyeXB0b0tleUhNQUMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Ny eXB0by9rZXlzL0NyeXB0b0tleUhNQUMuY3BwCShyZXZpc2lvbiAxNTkyOTUpCisrKyBTb3VyY2Uv V2ViQ29yZS9jcnlwdG8va2V5cy9DcnlwdG9LZXlITUFDLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MzAsNiArMzAsNyBAQAogCiAjaW5jbHVkZSAiQ3J5cHRvQWxnb3JpdGhtRGVzY3JpcHRpb25CdWls ZGVyLmgiCiAjaW5jbHVkZSAiQ3J5cHRvQWxnb3JpdGhtUmVnaXN0cnkuaCIKKyNpbmNsdWRlICJD cnlwdG9LZXlEYXRhT2N0ZXRTZXF1ZW5jZS5oIgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmlu Zy5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC03Nyw2ICs3OCwxMiBAQCB2b2lkIENyeXB0 b0tleUhNQUM6OmJ1aWxkQWxnb3JpdGhtRGVzY3JpCiAgICAgYnVpbGRlci5hZGQoImxlbmd0aCIs IG1fa2V5LnNpemUoKSk7CiB9CiAKK3N0ZDo6dW5pcXVlX3B0cjxDcnlwdG9LZXlEYXRhPiBDcnlw dG9LZXlITUFDOjpleHBvcnREYXRhKCkgY29uc3QKK3sKKyAgICBBU1NFUlQoZXh0cmFjdGFibGUo KSk7CisgICAgcmV0dXJuIENyeXB0b0tleURhdGFPY3RldFNlcXVlbmNlOjpjcmVhdGUobV9rZXkp OworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBFTkFCTEUoU1VCVExF X0NSWVBUTykKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2NyeXB0by9rZXlzL0NyeXB0b0tleUhNQUMu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jcnlwdG8va2V5cy9DcnlwdG9LZXlITUFD LmgJKHJldmlzaW9uIDE1OTI5NSkKKysrIFNvdXJjZS9XZWJDb3JlL2NyeXB0by9rZXlzL0NyeXB0 b0tleUhNQUMuaAkod29ya2luZyBjb3B5KQpAQCAtNDgsMTEgKzQ4LDEyIEBAIHB1YmxpYzoKIAog ICAgIGNvbnN0IFZlY3RvcjxjaGFyPiYga2V5KCkgY29uc3QgeyByZXR1cm4gbV9rZXk7IH0KIAot ICAgIHZpcnR1YWwgdm9pZCBidWlsZEFsZ29yaXRobURlc2NyaXB0aW9uKENyeXB0b0FsZ29yaXRo bURlc2NyaXB0aW9uQnVpbGRlciYpIGNvbnN0IE9WRVJSSURFOwotCiBwcml2YXRlOgogICAgIENy eXB0b0tleUhNQUMoY29uc3QgVmVjdG9yPGNoYXI+JiBrZXksIENyeXB0b0FsZ29yaXRobUlkZW50 aWZpZXIgaGFzaCwgYm9vbCBleHRyYWN0YWJsZSwgQ3J5cHRvS2V5VXNhZ2UpOwogCisgICAgdmly dHVhbCB2b2lkIGJ1aWxkQWxnb3JpdGhtRGVzY3JpcHRpb24oQ3J5cHRvQWxnb3JpdGhtRGVzY3Jp cHRpb25CdWlsZGVyJikgY29uc3QgT1ZFUlJJREU7CisgICAgdmlydHVhbCBzdGQ6OnVuaXF1ZV9w dHI8Q3J5cHRvS2V5RGF0YT4gZXhwb3J0RGF0YSgpIGNvbnN0IE9WRVJSSURFOworCiAgICAgQ3J5 cHRvQWxnb3JpdGhtSWRlbnRpZmllciBtX2hhc2g7CiAgICAgVmVjdG9yPGNoYXI+IG1fa2V5Owog fTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2NyeXB0by9rZXlzL0NyeXB0b0tleVJTQS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2NyeXB0by9rZXlzL0NyeXB0b0tleVJTQS5oCShyZXZp c2lvbiAxNTkyOTUpCisrKyBTb3VyY2UvV2ViQ29yZS9jcnlwdG8va2V5cy9DcnlwdG9LZXlSU0Eu aAkod29ya2luZyBjb3B5KQpAQCAtNTgsMTEgKzU4LDEyIEBAIHB1YmxpYzoKIAogICAgIFBsYXRm b3JtUlNBS2V5IHBsYXRmb3JtS2V5KCkgY29uc3QgeyByZXR1cm4gbV9wbGF0Zm9ybUtleTsgfQog Ci0gICAgdmlydHVhbCB2b2lkIGJ1aWxkQWxnb3JpdGhtRGVzY3JpcHRpb24oQ3J5cHRvQWxnb3Jp dGhtRGVzY3JpcHRpb25CdWlsZGVyJikgY29uc3QgT1ZFUlJJREU7Ci0KIHByaXZhdGU6CiAgICAg Q3J5cHRvS2V5UlNBKENyeXB0b0FsZ29yaXRobUlkZW50aWZpZXIsIENyeXB0b0tleVR5cGUsIFBs YXRmb3JtUlNBS2V5LCBib29sIGV4dHJhY3RhYmxlLCBDcnlwdG9LZXlVc2FnZSk7CiAKKyAgICB2 aXJ0dWFsIHZvaWQgYnVpbGRBbGdvcml0aG1EZXNjcmlwdGlvbihDcnlwdG9BbGdvcml0aG1EZXNj cmlwdGlvbkJ1aWxkZXImKSBjb25zdCBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHN0ZDo6dW5pcXVl X3B0cjxDcnlwdG9LZXlEYXRhPiBleHBvcnREYXRhKCkgY29uc3QgT1ZFUlJJREU7CisKICAgICBQ bGF0Zm9ybVJTQUtleSBtX3BsYXRmb3JtS2V5OwogCiAgICAgYm9vbCBtX3Jlc3RyaWN0ZWRUb1Nw ZWNpZmljSGFzaDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2NyeXB0by9tYWMvQ3J5cHRvS2V5UlNB TWFjLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jcnlwdG8vbWFjL0NyeXB0b0tl eVJTQU1hYy5jcHAJKHJldmlzaW9uIDE1OTI5NSkKKysrIFNvdXJjZS9XZWJDb3JlL2NyeXB0by9t YWMvQ3J5cHRvS2V5UlNBTWFjLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQzLDYgKzE0MywxMyBA QCB2b2lkIENyeXB0b0tleVJTQTo6YnVpbGRBbGdvcml0aG1EZXNjcmlwCiAgICAgfQogfQogCitz dGQ6OnVuaXF1ZV9wdHI8Q3J5cHRvS2V5RGF0YT4gQ3J5cHRvS2V5UlNBOjpleHBvcnREYXRhKCkg Y29uc3QKK3sKKyAgICAvLyBOb3QgaW1wbGVtZW50ZWQgeWV0LgorICAgIEFTU0VSVChleHRyYWN0 YWJsZSgpKTsKKyAgICByZXR1cm4gbnVsbHB0cjsKK30KKwogc3RhdGljIGJvb2wgYmlnSW50ZWdl clRvVUludDMyKGNvbnN0IFZlY3RvcjxjaGFyPiYgYmlnSW50ZWdlciwgdWludDMyX3QmIHJlc3Vs dCkKIHsKICAgICByZXN1bHQgPSAwOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTU5MzA0KQorKysgTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMt MTEtMTQgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgSW1w bGVtZW50IHJhdyBmb3JtYXQgZm9yIFdlYkNyeXB0byBrZXkgZXhwb3J0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQzNzYKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGNyeXB0by9zdWJ0bGUvYWVzLWV4 cG9ydC1rZXktZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBjcnlwdG8vc3VidGxlL2Fl cy1leHBvcnQta2V5Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIGNyeXB0by9zdWJ0bGUvaG1hYy1l eHBvcnQta2V5LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogY3J5cHRvL3N1YnRsZS9o bWFjLWV4cG9ydC1rZXkuaHRtbDogQWRkZWQuCisKIDIwMTMtMTEtMTQgIFRpbSBIb3J0b24gIDx0 aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgZnVsbHNjcmVlbi9hbm9ueW1vdXMt YmxvY2stbWVyZ2UtY3Jhc2guaHRtbCBvZnRlbiB0aW1lcyBvdXQgaW4gV2ViS2l0MQpJbmRleDog TGF5b3V0VGVzdHMvY3J5cHRvL3N1YnRsZS9hZXMtZXhwb3J0LWtleS1leHBlY3RlZC50eHQKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gTGF5b3V0VGVzdHMvY3J5cHRvL3N1YnRsZS9hZXMtZXhwb3J0LWtleS1leHBl Y3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9jcnlwdG8vc3VidGxlL2Flcy1l eHBvcnQta2V5LWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDEyIEBACitU ZXN0IGV4cG9ydGluZyBhbiBBRVMga2V5LgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBz ZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisK KworSW1wb3J0aW5nIGEgSldLIGtleS4uLgorRXhwb3J0aW5nIHRoZSBrZXkgYXMgcmF3IGRhdGEu Li4KK1BBU1MgYnl0ZUFycmF5VG9IZXhTdHJpbmcobmV3IFVpbnQ4QXJyYXkoZXhwb3J0ZWREYXRh KSkgaXMgJ1s4ZSA3MyBiMCBmNyBkYSAwZSA2NCA1MiBjOCAxMCBmMyAyYiA4MCA5MCA3OSBlNSA2 MiBmOCBlYSBkMiA1MiAyYyA2YiA3Yl0nCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVl CisKK1RFU1QgQ09NUExFVEUKKwoKUHJvcGVydHkgY2hhbmdlcyBvbjogTGF5b3V0VGVzdHMvY3J5 cHRvL3N1YnRsZS9hZXMtZXhwb3J0LWtleS1leHBlY3RlZC50eHQKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpBZGRlZDog c3ZuOm1pbWUtdHlwZQojIyAtMCwwICsxICMjCit0ZXh0L3BsYWluClwgTm8gbmV3bGluZSBhdCBl bmQgb2YgcHJvcGVydHkKQWRkZWQ6IHN2bjplb2wtc3R5bGUKIyMgLTAsMCArMSAjIworbmF0aXZl ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgcHJvcGVydHkKSW5kZXg6IExheW91dFRlc3RzL2NyeXB0 by9zdWJ0bGUvYWVzLWV4cG9ydC1rZXkuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9j cnlwdG8vc3VidGxlL2Flcy1leHBvcnQta2V5Lmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRU ZXN0cy9jcnlwdG8vc3VidGxlL2Flcy1leHBvcnQta2V5Lmh0bWwJKHdvcmtpbmcgY29weSkKQEAg LTAsMCArMSw0NCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBz cmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNy Yz0icmVzb3VyY2VzL2NvbW1vbi5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxwIGlk PSJkZXNjcmlwdGlvbiI+PC9wPgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+CisKKzxzY3JpcHQ+ CitkZXNjcmlwdGlvbigiVGVzdCBleHBvcnRpbmcgYW4gQUVTIGtleS4iKTsKKworanNUZXN0SXNB c3luYyA9IHRydWU7CisKK2lmICghd2luZG93LnN1YnRsZSkKKyAgICB3aW5kb3cuY3J5cHRvLnN1 YnRsZSA9IHdpbmRvdy5jcnlwdG8ud2Via2l0U3VidGxlOworCit2YXIgZXh0cmFjdGFibGUgPSB0 cnVlOworCit2YXIgandrS2V5ID0geworICAgICJrdHkiOiAib2N0IiwKKyAgICAiayI6ICJqbk93 OTlvT1pGTElFUE1yZ0pCNTVXTDQ2dEpTTEd0NyIKK307CisKK3ZhciBqd2tLZXlBc0FycmF5QnVm ZmVyID0gYXNjaWlUb0FycmF5QnVmZmVyKEpTT04uc3RyaW5naWZ5KGp3a0tleSkpOworCitkZWJ1 ZygiSW1wb3J0aW5nIGEgSldLIGtleS4uLiIpOworY3J5cHRvLnN1YnRsZS5pbXBvcnRLZXkoImp3 ayIsIGp3a0tleUFzQXJyYXlCdWZmZXIsICJBRVMtQ0JDIiwgZXh0cmFjdGFibGUsIFtdKS50aGVu KGZ1bmN0aW9uKHJlc3VsdCkgeworICAgIGtleSA9IHJlc3VsdDsKKworICAgIGRlYnVnKCJFeHBv cnRpbmcgdGhlIGtleSBhcyByYXcgZGF0YS4uLiIpOworICAgIHJldHVybiBjcnlwdG8uc3VidGxl LmV4cG9ydEtleSgicmF3Iiwga2V5KTsKK30pLnRoZW4oZnVuY3Rpb24ocmVzdWx0KSB7CisgICAg ZXhwb3J0ZWREYXRhID0gcmVzdWx0OworICAgIHNob3VsZEJlKCJieXRlQXJyYXlUb0hleFN0cmlu ZyhuZXcgVWludDhBcnJheShleHBvcnRlZERhdGEpKSIsICInWzhlIDczIGIwIGY3IGRhIDBlIDY0 IDUyIGM4IDEwIGYzIDJiIDgwIDkwIDc5IGU1IDYyIGY4IGVhIGQyIDUyIDJjIDZiIDdiXSciKTsK KworICAgIGZpbmlzaEpTVGVzdCgpOworfSk7Cis8L3NjcmlwdD4KKworPHNjcmlwdCBzcmM9Ii4u Ly4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1s PgoKUHJvcGVydHkgY2hhbmdlcyBvbjogTGF5b3V0VGVzdHMvY3J5cHRvL3N1YnRsZS9hZXMtZXhw b3J0LWtleS5odG1sCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KQWRkZWQ6IHN2bjptaW1lLXR5cGUKIyMgLTAsMCArMSAj IwordGV4dC9odG1sClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgcHJvcGVydHkKSW5kZXg6IExheW91 dFRlc3RzL2NyeXB0by9zdWJ0bGUvaG1hYy1leHBvcnQta2V5LWV4cGVjdGVkLnR4dAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy9jcnlwdG8vc3VidGxlL2htYWMtZXhwb3J0LWtleS1leHBlY3Rl ZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9jcnlwdG8vc3VidGxlL2htYWMtZXhw b3J0LWtleS1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwxMiBAQAorVGVz dCBleHBvcnRpbmcgYW4gQUVTIGtleS4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2Vy aWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisK K0ltcG9ydGluZyBhIEpXSyBrZXkuLi4KK0V4cG9ydGluZyB0aGUga2V5IGFzIHJhdyBkYXRhLi4u CitQQVNTIGJ5dGVBcnJheVRvSGV4U3RyaW5nKG5ldyBVaW50OEFycmF5KGV4cG9ydGVkRGF0YSkp IGlzICdbNmEgMTggZTQgOWYgZWYgZjcgZjMgYjcgZTAgOWUgYzggOWIgN2YgNmQgZWEgYjIgZjYg YTEgOGUgNDkgZmUgZmYgN2YgM2IgN2UgMDkgZWMgODkgYjcgZjYgZGUgYWJdJworUEFTUyBzdWNj ZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKClByb3BlcnR5IGNoYW5n ZXMgb246IExheW91dFRlc3RzL2NyeXB0by9zdWJ0bGUvaG1hYy1leHBvcnQta2V5LWV4cGVjdGVk LnR4dApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkFkZGVkOiBzdm46bWltZS10eXBlCiMjIC0wLDAgKzEgIyMKK3RleHQv cGxhaW4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBwcm9wZXJ0eQpBZGRlZDogc3ZuOmVvbC1zdHls ZQojIyAtMCwwICsxICMjCituYXRpdmUKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBwcm9wZXJ0eQpJ bmRleDogTGF5b3V0VGVzdHMvY3J5cHRvL3N1YnRsZS9obWFjLWV4cG9ydC1rZXkuaHRtbAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9jcnlwdG8vc3VidGxlL2htYWMtZXhwb3J0LWtleS5odG1s CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvY3J5cHRvL3N1YnRsZS9obWFjLWV4cG9ydC1r ZXkuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDQ0IEBACis8IURPQ1RZUEUgaHRtbD4K KzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcHJl LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSJyZXNvdXJjZXMvY29tbW9uLmpzIj48L3Njcmlw dD4KKzwvaGVhZD4KKzxib2R5PgorPHAgaWQ9ImRlc2NyaXB0aW9uIj48L3A+Cis8ZGl2IGlkPSJj b25zb2xlIj48L2Rpdj4KKworPHNjcmlwdD4KK2Rlc2NyaXB0aW9uKCJUZXN0IGV4cG9ydGluZyBh biBBRVMga2V5LiIpOworCitqc1Rlc3RJc0FzeW5jID0gdHJ1ZTsKKworaWYgKCF3aW5kb3cuc3Vi dGxlKQorICAgIHdpbmRvdy5jcnlwdG8uc3VidGxlID0gd2luZG93LmNyeXB0by53ZWJraXRTdWJ0 bGU7CisKK3ZhciBleHRyYWN0YWJsZSA9IHRydWU7CisKK3ZhciBqd2tLZXkgPSB7CisgICAgImt0 eSI6ICJvY3QiLAorICAgICJrIjogImFoamtuLV8zODdmZ25zaWJmMjNxc3ZhaGprbi1fMzg3Zmdu c2liZjIzcXMiCit9OworCit2YXIgandrS2V5QXNBcnJheUJ1ZmZlciA9IGFzY2lpVG9BcnJheUJ1 ZmZlcihKU09OLnN0cmluZ2lmeShqd2tLZXkpKTsKKworZGVidWcoIkltcG9ydGluZyBhIEpXSyBr ZXkuLi4iKTsKK2NyeXB0by5zdWJ0bGUuaW1wb3J0S2V5KCJqd2siLCBqd2tLZXlBc0FycmF5QnVm ZmVyLCB7IG5hbWU6ICJITUFDIiwgaGFzaDogIlNIQS01MTIiIH0sIGV4dHJhY3RhYmxlLCBbInNp Z24iLCAidmVyaWZ5Il0pLnRoZW4oZnVuY3Rpb24ocmVzdWx0KSB7CisgICAga2V5ID0gcmVzdWx0 OworCisgICAgZGVidWcoIkV4cG9ydGluZyB0aGUga2V5IGFzIHJhdyBkYXRhLi4uIik7CisgICAg cmV0dXJuIGNyeXB0by5zdWJ0bGUuZXhwb3J0S2V5KCJyYXciLCBrZXkpOworfSkudGhlbihmdW5j dGlvbihyZXN1bHQpIHsKKyAgICBleHBvcnRlZERhdGEgPSByZXN1bHQ7CisgICAgc2hvdWxkQmUo ImJ5dGVBcnJheVRvSGV4U3RyaW5nKG5ldyBVaW50OEFycmF5KGV4cG9ydGVkRGF0YSkpIiwgIidb NmEgMTggZTQgOWYgZWYgZjcgZjMgYjcgZTAgOWUgYzggOWIgN2YgNmQgZWEgYjIgZjYgYTEgOGUg NDkgZmUgZmYgN2YgM2IgN2UgMDkgZWMgODkgYjcgZjYgZGUgYWJdJyIpOworCisgICAgZmluaXNo SlNUZXN0KCk7Cit9KTsKKzwvc2NyaXB0PgorCis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2Vz L2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CgpQcm9wZXJ0eSBj aGFuZ2VzIG9uOiBMYXlvdXRUZXN0cy9jcnlwdG8vc3VidGxlL2htYWMtZXhwb3J0LWtleS5odG1s Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KQWRkZWQ6IHN2bjptaW1lLXR5cGUKIyMgLTAsMCArMSAjIwordGV4dC9odG1s ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgcHJvcGVydHkK