128938 2014-02-17 15:29:40 -0800 [iOS] All WebKit clients should encrypt WebCrypto keys automatically 2014-02-18 14:18:38 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ap ap andersca mitz oldest_to_newest 981665 0 ap 2014-02-17 15:29:40 -0800 We have a client call to get a WebCrypto master key, but most client won't implement it. WebKit should provide encryption by default. <rdar://problem/16075932> 981669 1 224434 ap 2014-02-17 15:32:51 -0800 Created attachment 224434 proposed patch 981692 2 224443 ap 2014-02-17 15:58:37 -0800 Created attachment 224443 added fallback to _NSGetProgname 982068 3 224443 mitz 2014-02-18 13:43:26 -0800 Comment on attachment 224443 added fallback to _NSGetProgname View in context: https://bugs.webkit.org/attachment.cgi?id=224443&action=review > Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm:78 > + NSString *applicationName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"]; Shouldn’t we try to get this from -localizedInfoDictionary first? Let’s use a local variable for [NSBundle mainBundle]. 982070 4 224443 thorton 2014-02-18 13:45:35 -0800 Comment on attachment 224443 added fallback to _NSGetProgname View in context: https://bugs.webkit.org/attachment.cgi?id=224443&action=review > Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm:81 > + NSString *applicationName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"]; > + if (!applicationName) > + applicationName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"]; > + if (!applicationName) plz use constants! 982073 5 mitz 2014-02-18 13:47:36 -0800 (In reply to comment #3) > (From update of attachment 224443 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=224443&action=review > > > Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm:78 > > + NSString *applicationName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"]; > > Shouldn’t we try to get this from -localizedInfoDictionary first? Ignore this. -objectForInfoDictionaryKey: returns a localized version. 982094 6 ap 2014-02-18 14:18:38 -0800 Committed <http://trac.webkit.org/r164317>. 224434 2014-02-17 15:32:51 -0800 2014-02-17 15:58:37 -0800 proposed patch DefaultKeychsinIOS.txt text/plain 4651 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NDI1MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE0LTAyLTE3ICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEFsbCBXZWJLaXQg Y2xpZW50cyBzaG91bGQgZW5jcnlwdCBXZWJDcnlwdG8ga2V5cyBhdXRvbWF0aWNhbGx5CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg5MzgKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEb24ndCBwYXNzIEFD THMgb24gaU9TLiBLZXkgd2lsbCBiZSBhZGRlZCB0byBhcHAncyBkZWZhdWx0IEtleWNoYWluIGFj Y2VzcyBncm91cC4KKworICAgICAgICBBbHNvLCBkb24ndCBwYXNzIGtTZWNBdHRySXNQZXJtYW5l bnQsIHdoaWNoIGlzIGlycmVsZXZhbnQgZm9yIHBhc3N3b3JkIGl0ZW1zLCBhbmQKKyAgICAgICAg Y2F1c2VkIGVycm9yIC01MCBpbiBEdW1wUmVuZGVyVHJlZSBmb3IgbWUgd2hlbiBwYXNzZWQuCisK KyAgICAgICAgKiBjcnlwdG8vbWFjL1NlcmlhbGl6ZWRDcnlwdG9LZXlXcmFwTWFjLm1tOgorICAg ICAgICAoV2ViQ29yZTo6bWFzdGVyS2V5QWNjb3VudE5hbWVGb3JDdXJyZW50QXBwbGljYXRpb24p OgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlQW5kU3RvcmVNYXN0ZXJLZXkpOgorCiAyMDE0LTAy LTE3ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBNYWtlIFRy ZWVTY29wZTo6cm9vdE5vZGUgcmV0dXJuIGEgcmVmZXJlbmNlCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9jcnlwdG8vbWFjL1NlcmlhbGl6ZWRDcnlwdG9LZXlXcmFwTWFjLm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2NyeXB0by9tYWMvU2VyaWFsaXplZENyeXB0b0tleVdyYXBNYWMubW0J KHJldmlzaW9uIDE2NDIyNCkKKysrIFNvdXJjZS9XZWJDb3JlL2NyeXB0by9tYWMvU2VyaWFsaXpl ZENyeXB0b0tleVdyYXBNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTM2LDYgKzM2LDggQEAKICNp bmNsdWRlIDx3dGYvQ3J5cHRvZ3JhcGhpY1V0aWxpdGllcy5oPgogI2luY2x1ZGUgPHd0Zi9SZXRh aW5QdHIuaD4KIAorI2RlZmluZSBXVEZfVVNFX0tFWUNIQUlOX0FDQ0VTU19DT05UUk9MX0xJU1RT ICghUExBVEZPUk0oSU9TKSkKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjb25zdCBOU1VJbnRl Z2VyIGN1cnJlbnRTZXJpYWxpemF0aW9uVmVyc2lvbiA9IDE7CkBAIC01NCwyMSArNTYsMTQgQEAg aW5saW5lIFZlY3Rvcjx1aW50OF90PiB2ZWN0b3JGcm9tTlNEYXRhKAogICAgIHJldHVybiByZXN1 bHQ7CiB9CiAKLSNpZiBQTEFURk9STShJT1MpCi0KLWJvb2wgZ2V0RGVmYXVsdFdlYkNyeXB0b01h c3RlcktleShWZWN0b3I8dWludDhfdD4mIG1hc3RlcktleSkKLXsKLSAgICAvLyBGSVhNRTogSW1w bGVtZW50LgotICAgIG1hc3RlcktleS5yZXNpemUobWFzdGVyS2V5U2l6ZUluQnl0ZXMpOwotICAg IG1lbXNldChtYXN0ZXJLZXkuZGF0YSgpLCAwLCBtYXN0ZXJLZXkuc2l6ZSgpKTsKLSAgICByZXR1 cm4gdHJ1ZTsKLX0KLQotI2Vsc2UKLQogc3RhdGljIE5TU3RyaW5nKiBtYXN0ZXJLZXlBY2NvdW50 TmFtZUZvckN1cnJlbnRBcHBsaWNhdGlvbigpCiB7Ci0gICAgcmV0dXJuIFtOU1N0cmluZyBzdHJp bmdXaXRoRm9ybWF0OkAiY29tLmFwcGxlLldlYktpdC5XZWJDcnlwdG8ubWFzdGVyKyVAIiwgW1tO U1J1bm5pbmdBcHBsaWNhdGlvbiBjdXJyZW50QXBwbGljYXRpb25dIGJ1bmRsZUlkZW50aWZpZXJd XTsKKyNpZiBQTEFURk9STShJT1MpCisgICAgTlNTdHJpbmcgKmJ1bmRsZUlkZW50aWZpZXIgPSBb W05TQnVuZGxlIG1haW5CdW5kbGVdIGJ1bmRsZUlkZW50aWZpZXJdOworI2Vsc2UKKyAgICBOU1N0 cmluZyAqYnVuZGxlSWRlbnRpZmllciA9IFtbTlNSdW5uaW5nQXBwbGljYXRpb24gY3VycmVudEFw cGxpY2F0aW9uXSBidW5kbGVJZGVudGlmaWVyXTsKKyNlbmRpZgorICAgIHJldHVybiBbTlNTdHJp bmcgc3RyaW5nV2l0aEZvcm1hdDpAImNvbS5hcHBsZS5XZWJLaXQuV2ViQ3J5cHRvLm1hc3Rlcisl QCIsIGJ1bmRsZUlkZW50aWZpZXJdOwogfQogCiBzdGF0aWMgYm9vbCBjcmVhdGVBbmRTdG9yZU1h c3RlcktleShWZWN0b3I8dWludDhfdD4mIG1hc3RlcktleURhdGEpCkBAIC03NiwxMCArNzEsMjIg QEAgc3RhdGljIGJvb2wgY3JlYXRlQW5kU3RvcmVNYXN0ZXJLZXkoVmVjdAogICAgIG1hc3Rlcktl eURhdGEucmVzaXplKG1hc3RlcktleVNpemVJbkJ5dGVzKTsKICAgICBDQ1JhbmRvbUNvcHlCeXRl cyhrQ0NSYW5kb21EZWZhdWx0LCBtYXN0ZXJLZXlEYXRhLmRhdGEoKSwgbWFzdGVyS2V5RGF0YS5z aXplKCkpOwogCisjaWYgUExBVEZPUk0oSU9TKQorICAgIE5TU3RyaW5nICphcHBsaWNhdGlvbk5h bWUgPSBbW05TQnVuZGxlIG1haW5CdW5kbGVdIG9iamVjdEZvckluZm9EaWN0aW9uYXJ5S2V5OkAi Q0ZCdW5kbGVEaXNwbGF5TmFtZSJdOworICAgIGlmICghYXBwbGljYXRpb25OYW1lKQorICAgICAg ICBhcHBsaWNhdGlvbk5hbWUgPSBbW05TQnVuZGxlIG1haW5CdW5kbGVdIG9iamVjdEZvckluZm9E aWN0aW9uYXJ5S2V5OkAiQ0ZCdW5kbGVOYW1lIl07CisgICAgaWYgKCFhcHBsaWNhdGlvbk5hbWUp CisgICAgICAgIGFwcGxpY2F0aW9uTmFtZSA9IFtbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gYnVuZGxl SWRlbnRpZmllcl07CisgICAgTlNTdHJpbmcgKmxvY2FsaXplZEl0ZW1OYW1lID0gd2ViQ3J5cHRv TWFzdGVyS2V5S2V5Y2hhaW5MYWJlbChhcHBsaWNhdGlvbk5hbWUpOworI2Vsc2UKICAgICBOU1N0 cmluZyAqbG9jYWxpemVkSXRlbU5hbWUgPSB3ZWJDcnlwdG9NYXN0ZXJLZXlLZXljaGFpbkxhYmVs KFtbTlNSdW5uaW5nQXBwbGljYXRpb24gY3VycmVudEFwcGxpY2F0aW9uXSBsb2NhbGl6ZWROYW1l XSk7CisjZW5kaWYKIAorICAgIE9TU3RhdHVzIHN0YXR1czsKKworI2lmIFVTRShLRVlDSEFJTl9B Q0NFU1NfQ09OVFJPTF9MSVNUUykKICAgICBTZWNBY2Nlc3NSZWYgYWNjZXNzUmVmOwotICAgIE9T U3RhdHVzIHN0YXR1cyA9IFNlY0FjY2Vzc0NyZWF0ZSgoQ0ZTdHJpbmdSZWYpbG9jYWxpemVkSXRl bU5hbWUsIG51bGxwdHIsICZhY2Nlc3NSZWYpOworICAgIHN0YXR1cyA9IFNlY0FjY2Vzc0NyZWF0 ZSgoQ0ZTdHJpbmdSZWYpbG9jYWxpemVkSXRlbU5hbWUsIG51bGxwdHIsICZhY2Nlc3NSZWYpOwog ICAgIGlmIChzdGF0dXMpIHsKICAgICAgICAgV1RGTG9nQWx3YXlzKCJDYW5ub3QgY3JlYXRlIGEg c2VjdXJpdHkgYWNjZXNzIG9iamVjdCBmb3Igc3RvcmluZyBXZWJDcnlwdG8gbWFzdGVyIGtleSwg ZXJyb3IgJWQiLCAoaW50KXN0YXR1cyk7CiAgICAgICAgIHJldHVybiBudWxscHRyOwpAQCAtMTAy LDYgKzEwOSw3IEBAIHN0YXRpYyBib29sIGNyZWF0ZUFuZFN0b3JlTWFzdGVyS2V5KFZlY3QKICAg ICAgICAgV1RGTG9nQWx3YXlzKCJDYW5ub3Qgc2V0IEFDTCBmb3IgV2ViQ3J5cHRvIG1hc3RlciBr ZXksIGVycm9yICVkIiwgKGludClzdGF0dXMpOwogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAg ICB9CisjZW5kaWYKIAogICAgIFZlY3RvcjxjaGFyPiBiYXNlNjRFbmNvZGVkTWFzdGVyS2V5RGF0 YTsKICAgICBiYXNlNjRFbmNvZGUobWFzdGVyS2V5RGF0YSwgYmFzZTY0RW5jb2RlZE1hc3Rlcktl eURhdGEpOwpAQCAtMTEwLDggKzExOCw5IEBAIHN0YXRpYyBib29sIGNyZWF0ZUFuZFN0b3JlTWFz dGVyS2V5KFZlY3QKICAgICBOU0RpY3Rpb25hcnkgKmF0dHJpYnV0ZXMgPSBAewogICAgICAgICAo aWQpa1NlY0NsYXNzIDogKGlkKWtTZWNDbGFzc0dlbmVyaWNQYXNzd29yZCwKICAgICAgICAgKGlk KWtTZWNBdHRyU3luY2hyb25pemFibGUgOiBATk8sCi0gICAgICAgIChpZClrU2VjQXR0cklzUGVy bWFuZW50IDogQFlFUywKKyNpZiBVU0UoS0VZQ0hBSU5fQUNDRVNTX0NPTlRST0xfTElTVFMpCiAg ICAgICAgIChpZClrU2VjQXR0ckFjY2VzcyA6IChpZClhY2Nlc3MuZ2V0KCksCisjZW5kaWYKICAg ICAgICAgKGlkKWtTZWNBdHRyQ29tbWVudCA6IHdlYkNyeXB0b01hc3RlcktleUtleWNoYWluQ29t bWVudCgpLAogICAgICAgICAoaWQpa1NlY0F0dHJMYWJlbCA6IGxvY2FsaXplZEl0ZW1OYW1lLAog ICAgICAgICAoaWQpa1NlY0F0dHJBY2NvdW50IDogbWFzdGVyS2V5QWNjb3VudE5hbWVGb3JDdXJy ZW50QXBwbGljYXRpb24oKSwKQEAgLTE1NSw4ICsxNjQsNiBAQCBib29sIGdldERlZmF1bHRXZWJD cnlwdG9NYXN0ZXJLZXkoVmVjdG9yCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLSNlbmRpZgotCiBi b29sIHdyYXBTZXJpYWxpemVkQ3J5cHRvS2V5KGNvbnN0IFZlY3Rvcjx1aW50OF90PiYgbWFzdGVy S2V5LCBjb25zdCBWZWN0b3I8dWludDhfdD4mIGtleSwgVmVjdG9yPHVpbnQ4X3Q+JiByZXN1bHQp CiB7CiAgICAgVmVjdG9yPHVpbnQ4X3Q+IGtlaygxNik7Cg== 224443 2014-02-17 15:58:37 -0800 2014-02-18 13:45:35 -0800 added fallback to _NSGetProgname DefaultKeychsinIOS.txt text/plain 5147 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NDI1MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE0LTAyLTE3ICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEFsbCBXZWJLaXQg Y2xpZW50cyBzaG91bGQgZW5jcnlwdCBXZWJDcnlwdG8ga2V5cyBhdXRvbWF0aWNhbGx5CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg5MzgKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEb24ndCBwYXNzIEFD THMgb24gaU9TLiBLZXkgd2lsbCBiZSBhZGRlZCB0byBhcHAncyBkZWZhdWx0IEtleWNoYWluIGFj Y2VzcyBncm91cC4KKworICAgICAgICBBbHNvLCBkb24ndCBwYXNzIGtTZWNBdHRySXNQZXJtYW5l bnQsIHdoaWNoIGlzIGlycmVsZXZhbnQgZm9yIHBhc3N3b3JkIGl0ZW1zLCBhbmQKKyAgICAgICAg Y2F1c2VkIGVycm9yIC01MCBpbiBEdW1wUmVuZGVyVHJlZSBmb3IgbWUgd2hlbiBwYXNzZWQuCisK KyAgICAgICAgQWRkZWQgZmFsbGJhY2sgdG8gX05TR2V0UHJvZ25hbWUgZm9yIGFjY291bnQgbmFt ZSwgdG8gYWNjb3VudCBmb3IgdG9vbHMgc3VjaCBhcworICAgICAgICBNYWMgRHVtcFJlbmRlclRy ZWUgdGhhdCBkb24ndCBoYXZlIGJ1bmRsZSBpZGVudGlmaWVycy4KKworICAgICAgICAqIGNyeXB0 by9tYWMvU2VyaWFsaXplZENyeXB0b0tleVdyYXBNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpt YXN0ZXJLZXlBY2NvdW50TmFtZUZvckN1cnJlbnRBcHBsaWNhdGlvbik6CisgICAgICAgIChXZWJD b3JlOjpjcmVhdGVBbmRTdG9yZU1hc3RlcktleSk6CisKIDIwMTQtMDItMTcgIEFudHRpIEtvaXZp c3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgVHJlZVNjb3BlOjpyb290Tm9k ZSByZXR1cm4gYSByZWZlcmVuY2UKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2NyeXB0by9tYWMvU2Vy aWFsaXplZENyeXB0b0tleVdyYXBNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv Y3J5cHRvL21hYy9TZXJpYWxpemVkQ3J5cHRvS2V5V3JhcE1hYy5tbQkocmV2aXNpb24gMTY0MjI0 KQorKysgU291cmNlL1dlYkNvcmUvY3J5cHRvL21hYy9TZXJpYWxpemVkQ3J5cHRvS2V5V3JhcE1h Yy5tbQkod29ya2luZyBjb3B5KQpAQCAtMzEsMTEgKzMxLDE0IEBACiAjaW5jbHVkZSAiQ29tbW9u Q3J5cHRvVXRpbGl0aWVzLmgiCiAjaW5jbHVkZSAiTG9jYWxpemVkU3RyaW5ncy5oIgogI2luY2x1 ZGUgPENvbW1vbkNyeXB0by9Db21tb25TeW1tZXRyaWNLZXl3cmFwLmg+CisjaW5jbHVkZSA8Y3J0 X2V4dGVybnMuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9CYXNlNjQuaD4KICNpbmNsdWRlIDx3dGYv dGV4dC9DU3RyaW5nLmg+CiAjaW5jbHVkZSA8d3RmL0NyeXB0b2dyYXBoaWNVdGlsaXRpZXMuaD4K ICNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+CiAKKyNkZWZpbmUgV1RGX1VTRV9LRVlDSEFJTl9B Q0NFU1NfQ09OVFJPTF9MSVNUUyAoIVBMQVRGT1JNKElPUykpCisKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAogY29uc3QgTlNVSW50ZWdlciBjdXJyZW50U2VyaWFsaXphdGlvblZlcnNpb24gPSAxOwpA QCAtNTQsMjEgKzU3LDE2IEBAIGlubGluZSBWZWN0b3I8dWludDhfdD4gdmVjdG9yRnJvbU5TRGF0 YSgKICAgICByZXR1cm4gcmVzdWx0OwogfQogCi0jaWYgUExBVEZPUk0oSU9TKQotCi1ib29sIGdl dERlZmF1bHRXZWJDcnlwdG9NYXN0ZXJLZXkoVmVjdG9yPHVpbnQ4X3Q+JiBtYXN0ZXJLZXkpCi17 Ci0gICAgLy8gRklYTUU6IEltcGxlbWVudC4KLSAgICBtYXN0ZXJLZXkucmVzaXplKG1hc3Rlcktl eVNpemVJbkJ5dGVzKTsKLSAgICBtZW1zZXQobWFzdGVyS2V5LmRhdGEoKSwgMCwgbWFzdGVyS2V5 LnNpemUoKSk7Ci0gICAgcmV0dXJuIHRydWU7Ci19Ci0KLSNlbHNlCi0KIHN0YXRpYyBOU1N0cmlu ZyogbWFzdGVyS2V5QWNjb3VudE5hbWVGb3JDdXJyZW50QXBwbGljYXRpb24oKQogewotICAgIHJl dHVybiBbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAImNvbS5hcHBsZS5XZWJLaXQuV2ViQ3J5 cHRvLm1hc3RlcislQCIsIFtbTlNSdW5uaW5nQXBwbGljYXRpb24gY3VycmVudEFwcGxpY2F0aW9u XSBidW5kbGVJZGVudGlmaWVyXV07CisjaWYgUExBVEZPUk0oSU9TKQorICAgIE5TU3RyaW5nICpi dW5kbGVJZGVudGlmaWVyID0gW1tOU0J1bmRsZSBtYWluQnVuZGxlXSBidW5kbGVJZGVudGlmaWVy XTsKKyNlbHNlCisgICAgTlNTdHJpbmcgKmJ1bmRsZUlkZW50aWZpZXIgPSBbW05TUnVubmluZ0Fw cGxpY2F0aW9uIGN1cnJlbnRBcHBsaWNhdGlvbl0gYnVuZGxlSWRlbnRpZmllcl07CisjZW5kaWYK KyAgICBpZiAoIWJ1bmRsZUlkZW50aWZpZXIpCisgICAgICAgIGJ1bmRsZUlkZW50aWZpZXIgPSBb TlNTdHJpbmcgc3RyaW5nV2l0aENTdHJpbmc6Kl9OU0dldFByb2duYW1lKCkgZW5jb2Rpbmc6TlNB U0NJSVN0cmluZ0VuY29kaW5nXTsKKyAgICByZXR1cm4gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3Jt YXQ6QCJjb20uYXBwbGUuV2ViS2l0LldlYkNyeXB0by5tYXN0ZXIrJUAiLCBidW5kbGVJZGVudGlm aWVyXTsKIH0KIAogc3RhdGljIGJvb2wgY3JlYXRlQW5kU3RvcmVNYXN0ZXJLZXkoVmVjdG9yPHVp bnQ4X3Q+JiBtYXN0ZXJLZXlEYXRhKQpAQCAtNzYsMTAgKzc0LDIyIEBAIHN0YXRpYyBib29sIGNy ZWF0ZUFuZFN0b3JlTWFzdGVyS2V5KFZlY3QKICAgICBtYXN0ZXJLZXlEYXRhLnJlc2l6ZShtYXN0 ZXJLZXlTaXplSW5CeXRlcyk7CiAgICAgQ0NSYW5kb21Db3B5Qnl0ZXMoa0NDUmFuZG9tRGVmYXVs dCwgbWFzdGVyS2V5RGF0YS5kYXRhKCksIG1hc3RlcktleURhdGEuc2l6ZSgpKTsKIAorI2lmIFBM QVRGT1JNKElPUykKKyAgICBOU1N0cmluZyAqYXBwbGljYXRpb25OYW1lID0gW1tOU0J1bmRsZSBt YWluQnVuZGxlXSBvYmplY3RGb3JJbmZvRGljdGlvbmFyeUtleTpAIkNGQnVuZGxlRGlzcGxheU5h bWUiXTsKKyAgICBpZiAoIWFwcGxpY2F0aW9uTmFtZSkKKyAgICAgICAgYXBwbGljYXRpb25OYW1l ID0gW1tOU0J1bmRsZSBtYWluQnVuZGxlXSBvYmplY3RGb3JJbmZvRGljdGlvbmFyeUtleTpAIkNG QnVuZGxlTmFtZSJdOworICAgIGlmICghYXBwbGljYXRpb25OYW1lKQorICAgICAgICBhcHBsaWNh dGlvbk5hbWUgPSBbW05TQnVuZGxlIG1haW5CdW5kbGVdIGJ1bmRsZUlkZW50aWZpZXJdOworICAg IE5TU3RyaW5nICpsb2NhbGl6ZWRJdGVtTmFtZSA9IHdlYkNyeXB0b01hc3RlcktleUtleWNoYWlu TGFiZWwoYXBwbGljYXRpb25OYW1lKTsKKyNlbHNlCiAgICAgTlNTdHJpbmcgKmxvY2FsaXplZEl0 ZW1OYW1lID0gd2ViQ3J5cHRvTWFzdGVyS2V5S2V5Y2hhaW5MYWJlbChbW05TUnVubmluZ0FwcGxp Y2F0aW9uIGN1cnJlbnRBcHBsaWNhdGlvbl0gbG9jYWxpemVkTmFtZV0pOworI2VuZGlmCiAKKyAg ICBPU1N0YXR1cyBzdGF0dXM7CisKKyNpZiBVU0UoS0VZQ0hBSU5fQUNDRVNTX0NPTlRST0xfTElT VFMpCiAgICAgU2VjQWNjZXNzUmVmIGFjY2Vzc1JlZjsKLSAgICBPU1N0YXR1cyBzdGF0dXMgPSBT ZWNBY2Nlc3NDcmVhdGUoKENGU3RyaW5nUmVmKWxvY2FsaXplZEl0ZW1OYW1lLCBudWxscHRyLCAm YWNjZXNzUmVmKTsKKyAgICBzdGF0dXMgPSBTZWNBY2Nlc3NDcmVhdGUoKENGU3RyaW5nUmVmKWxv Y2FsaXplZEl0ZW1OYW1lLCBudWxscHRyLCAmYWNjZXNzUmVmKTsKICAgICBpZiAoc3RhdHVzKSB7 CiAgICAgICAgIFdURkxvZ0Fsd2F5cygiQ2Fubm90IGNyZWF0ZSBhIHNlY3VyaXR5IGFjY2VzcyBv YmplY3QgZm9yIHN0b3JpbmcgV2ViQ3J5cHRvIG1hc3RlciBrZXksIGVycm9yICVkIiwgKGludClz dGF0dXMpOwogICAgICAgICByZXR1cm4gbnVsbHB0cjsKQEAgLTEwMiw2ICsxMTIsNyBAQCBzdGF0 aWMgYm9vbCBjcmVhdGVBbmRTdG9yZU1hc3RlcktleShWZWN0CiAgICAgICAgIFdURkxvZ0Fsd2F5 cygiQ2Fubm90IHNldCBBQ0wgZm9yIFdlYkNyeXB0byBtYXN0ZXIga2V5LCBlcnJvciAlZCIsIChp bnQpc3RhdHVzKTsKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQorI2VuZGlmCiAKICAg ICBWZWN0b3I8Y2hhcj4gYmFzZTY0RW5jb2RlZE1hc3RlcktleURhdGE7CiAgICAgYmFzZTY0RW5j b2RlKG1hc3RlcktleURhdGEsIGJhc2U2NEVuY29kZWRNYXN0ZXJLZXlEYXRhKTsKQEAgLTExMCw4 ICsxMjEsOSBAQCBzdGF0aWMgYm9vbCBjcmVhdGVBbmRTdG9yZU1hc3RlcktleShWZWN0CiAgICAg TlNEaWN0aW9uYXJ5ICphdHRyaWJ1dGVzID0gQHsKICAgICAgICAgKGlkKWtTZWNDbGFzcyA6IChp ZClrU2VjQ2xhc3NHZW5lcmljUGFzc3dvcmQsCiAgICAgICAgIChpZClrU2VjQXR0clN5bmNocm9u aXphYmxlIDogQE5PLAotICAgICAgICAoaWQpa1NlY0F0dHJJc1Blcm1hbmVudCA6IEBZRVMsCisj aWYgVVNFKEtFWUNIQUlOX0FDQ0VTU19DT05UUk9MX0xJU1RTKQogICAgICAgICAoaWQpa1NlY0F0 dHJBY2Nlc3MgOiAoaWQpYWNjZXNzLmdldCgpLAorI2VuZGlmCiAgICAgICAgIChpZClrU2VjQXR0 ckNvbW1lbnQgOiB3ZWJDcnlwdG9NYXN0ZXJLZXlLZXljaGFpbkNvbW1lbnQoKSwKICAgICAgICAg KGlkKWtTZWNBdHRyTGFiZWwgOiBsb2NhbGl6ZWRJdGVtTmFtZSwKICAgICAgICAgKGlkKWtTZWNB dHRyQWNjb3VudCA6IG1hc3RlcktleUFjY291bnROYW1lRm9yQ3VycmVudEFwcGxpY2F0aW9uKCks CkBAIC0xNTUsOCArMTY3LDYgQEAgYm9vbCBnZXREZWZhdWx0V2ViQ3J5cHRvTWFzdGVyS2V5KFZl Y3RvcgogICAgIHJldHVybiB0cnVlOwogfQogCi0jZW5kaWYKLQogYm9vbCB3cmFwU2VyaWFsaXpl ZENyeXB0b0tleShjb25zdCBWZWN0b3I8dWludDhfdD4mIG1hc3RlcktleSwgY29uc3QgVmVjdG9y PHVpbnQ4X3Q+JiBrZXksIFZlY3Rvcjx1aW50OF90PiYgcmVzdWx0KQogewogICAgIFZlY3Rvcjx1 aW50OF90PiBrZWsoMTYpOwo=