128725 2014-02-12 22:13:30 -0800 [Mac] Add a WebKit1 SPI to get WebCrypto master key from a client 2014-02-13 11:27:29 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap andersca commit-queue sam timothy oldest_to_newest 980169 0 ap 2014-02-12 22:13:30 -0800 WebKit1 variant of bug 128702. 980170 1 224047 ap 2014-02-12 22:18:52 -0800 Created attachment 224047 proposed patch I'm not yet quite sure whether we need this, or if we should just have code in WebKit that puts the master key into Keychain. Would like some feedback as to whether I did this correctly. 980183 2 ap 2014-02-12 23:34:21 -0800 OK, I think that we need this, if only to make DumpRenderTree work regardless of whether keychain is locked. 980371 3 224047 commit-queue 2014-02-13 11:27:27 -0800 Comment on attachment 224047 proposed patch Clearing flags on attachment: 224047 Committed r164042: <http://trac.webkit.org/changeset/164042> 980372 4 commit-queue 2014-02-13 11:27:29 -0800 All reviewed patches have been landed. Closing bug. 224047 2014-02-12 22:18:52 -0800 2014-02-13 11:27:27 -0800 proposed patch wk1_spi.txt text/plain 4221 ap SW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NDAxNSkKKysrIFNvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE0LTAyLTEy ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIEFk ZCBhIFdlYktpdDEgU1BJIHRvIGdldCBXZWJDcnlwdG8gbWFzdGVyIGtleSBmcm9tIGEgY2xpZW50 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg3MjUK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNv cmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5tbToKKyAgICAgICAgKFdlYkNocm9tZUNsaWVudDo6 d3JhcENyeXB0b0tleSk6CisgICAgICAgIChXZWJDaHJvbWVDbGllbnQ6OnVud3JhcENyeXB0b0tl eSk6CisgICAgICAgICogV2ViVmlldy9XZWJVSURlbGVnYXRlUHJpdmF0ZS5oOgorICAgICAgICBM b29rcyBsaWtlIFVJRGVsZWdhdGUgaXMgdGhlIGNsb3Nlc3Qgd2UgaGF2ZSB0byBhIHJlYXNvbmFi bGUgcGxhY2UuCisKIDIwMTQtMDItMTIgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5j b20+CiAKICAgICAgICAgV3JhcCBXZWJDcnlwdG8ga2V5cyBpbiBTZXJpYWxpemVkU2NyaXB0VmFs dWUKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVu dC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJD aHJvbWVDbGllbnQubW0JKHJldmlzaW9uIDE2NDAwNykKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dl YkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5tbQkod29ya2luZyBjb3B5KQpAQCAtMTAwMiwx NSArMTAwMiwyNyBAQCB2b2lkIFdlYkNocm9tZUNsaWVudDo6ZXhpdEZ1bGxTY3JlZW5Gb3JFCiAj aWYgRU5BQkxFKFNVQlRMRV9DUllQVE8pCiBib29sIFdlYkNocm9tZUNsaWVudDo6d3JhcENyeXB0 b0tleShjb25zdCBWZWN0b3I8dWludDhfdD4mIGtleSwgVmVjdG9yPHVpbnQ4X3Q+JiB3cmFwcGVk S2V5KSBjb25zdAogewotICAgIFZlY3Rvcjx1aW50OF90PiBtYXN0ZXJLZXkoMTYpOwotICAgIG1l bXNldChtYXN0ZXJLZXkuZGF0YSgpLCAwLCBtYXN0ZXJLZXkuc2l6ZSgpKTsgLy8gRklYTUU6IE5v dCBpbXBsZW1lbnRlZCB5ZXQsIHdpbGwgYmUgZ2V0dGluZyBhIGtleSBmcm9tIGNsaWVudC4KKyAg ICBTRUwgc2VsZWN0b3IgPSBAc2VsZWN0b3Iod2ViQ3J5cHRvTWFzdGVyS2V5Rm9yV2ViVmlldzop OworICAgIGlmICghW1ttX3dlYlZpZXcgVUlEZWxlZ2F0ZV0gcmVzcG9uZHNUb1NlbGVjdG9yOnNl bGVjdG9yXSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgTlNEYXRhKiBrZXlEYXRhID0g Q2FsbFVJRGVsZWdhdGUobV93ZWJWaWV3LCBzZWxlY3Rvcik7CisKKyAgICBWZWN0b3I8dWludDhf dD4gbWFzdGVyS2V5OworICAgIG1hc3RlcktleS5hcHBlbmQoKHVpbnQ4X3QqKVtrZXlEYXRhIGJ5 dGVzXSwgW2tleURhdGEgbGVuZ3RoXSk7CiAgICAgcmV0dXJuIHdyYXBTZXJpYWxpemVkQ3J5cHRv S2V5KG1hc3RlcktleSwga2V5LCB3cmFwcGVkS2V5KTsKIH0KIAogYm9vbCBXZWJDaHJvbWVDbGll bnQ6OnVud3JhcENyeXB0b0tleShjb25zdCBWZWN0b3I8dWludDhfdD4mIHdyYXBwZWRLZXksIFZl Y3Rvcjx1aW50OF90PiYga2V5KSBjb25zdAogewotICAgIFZlY3Rvcjx1aW50OF90PiBtYXN0ZXJL ZXkoMTYpOwotICAgIG1lbXNldChtYXN0ZXJLZXkuZGF0YSgpLCAwLCBtYXN0ZXJLZXkuc2l6ZSgp KTsgLy8gRklYTUU6IE5vdCBpbXBsZW1lbnRlZCB5ZXQsIHdpbGwgYmUgZ2V0dGluZyBhIGtleSBm cm9tIGNsaWVudC4KKyAgICBTRUwgc2VsZWN0b3IgPSBAc2VsZWN0b3Iod2ViQ3J5cHRvTWFzdGVy S2V5Rm9yV2ViVmlldzopOworICAgIGlmICghW1ttX3dlYlZpZXcgVUlEZWxlZ2F0ZV0gcmVzcG9u ZHNUb1NlbGVjdG9yOnNlbGVjdG9yXSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgTlNE YXRhICprZXlEYXRhID0gQ2FsbFVJRGVsZWdhdGUobV93ZWJWaWV3LCBzZWxlY3Rvcik7CisKKyAg ICBWZWN0b3I8dWludDhfdD4gbWFzdGVyS2V5OworICAgIG1hc3RlcktleS5hcHBlbmQoKHVpbnQ4 X3QqKVtrZXlEYXRhIGJ5dGVzXSwgW2tleURhdGEgbGVuZ3RoXSk7CiAgICAgcmV0dXJuIHVud3Jh cFNlcmlhbGl6ZWRDcnlwdG9LZXkobWFzdGVyS2V5LCB3cmFwcGVkS2V5LCBrZXkpOwogfQogI2Vu ZGlmCkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlVJRGVsZWdhdGVQcml2YXRl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJVSURlbGVnYXRl UHJpdmF0ZS5oCShyZXZpc2lvbiAxNjQwMDcpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3 L1dlYlVJRGVsZWdhdGVQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI2Nyw0ICsyNjcsNiBA QCBAaW50ZXJmYWNlIE5TT2JqZWN0IChXZWJVSURlbGVnYXRlUHJpdmF0CiAtIChCT09MKXdlYlZp ZXdDYW5DaGVja0dlb2xvY2F0aW9uQXV0aG9yaXphdGlvblN0YXR1czooV2ViVmlldyAqKXNlbmRl cjsKICNlbmRpZgogCistIChOU0RhdGEgKil3ZWJDcnlwdG9NYXN0ZXJLZXlGb3JXZWJWaWV3OihX ZWJWaWV3ICopc2VuZGVyOworCiBAZW5kCkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNjQwMTUpCisrKyBUb29scy9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxNC0wMi0xMiAgQWxleGV5IFBy b3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFjXSBBZGQgYSBXZWJLaXQx IFNQSSB0byBnZXQgV2ViQ3J5cHRvIG1hc3RlciBrZXkgZnJvbSBhIGNsaWVudAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4NzI1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9t YWMvVUlEZWxlZ2F0ZS5tbTogKC1bVUlEZWxlZ2F0ZSB3ZWJDcnlwdG9NYXN0ZXJLZXlGb3JXZWJW aWV3Ol0pOgorICAgICAgICBVc2UgdGhlIFNQSSB0byBzcGVjaWZ5IGEga2V5LgorCiAyMDE0LTAy LTEyICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIFtXSzJd IEFkZCBhIEMgQVBJIHRvIGdldCBXZWJDcnlwdG8gbWFzdGVyIGtleSBmcm9tIGEgY2xpZW50Cklu ZGV4OiBUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvVUlEZWxlZ2F0ZS5tbQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvVUlEZWxlZ2F0ZS5tbQkocmV2aXNpb24gMTY0MDA3 KQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL1VJRGVsZWdhdGUubW0JKHdvcmtpbmcgY29w eSkKQEAgLTM0OSw2ICszNDksMTIgQEAgLSAodm9pZCl3ZWJWaWV3OihXZWJWaWV3ICopd2ViVmll dyBkZWNpZAogICAgIFtsaXN0ZW5lciBhbGxvd107CiB9CiAKKy0gKE5TRGF0YSAqKXdlYkNyeXB0 b01hc3RlcktleUZvcldlYlZpZXc6KFdlYlZpZXcgKilzZW5kZXIKK3sKKyAgICAvLyBBbnkgMTI4 IGJpdCBrZXkgd291bGQgZG8sIGFsbCB3ZSBuZWVkIGZvciB0ZXN0aW5nIGlzIHRvIGltcGxlbWVu dCB0aGUgY2FsbGJhY2suCisgICAgcmV0dXJuIFtOU0RhdGEgZGF0YVdpdGhCeXRlczoiXHgwMFx4 MDFceDAyXHgwM1x4MDRceDA1XHgwNlx4MDdceDA4XHgwOVx4MGFceDBiXHgwY1x4MGRceDBlXHgw ZiIgbGVuZ3RoOjE2XTsKK30KKwogLSAodm9pZClkZWFsbG9jCiB7CiAjaWYgIVBMQVRGT1JNKElP UykK