123811 2013-11-05 11:07:39 -0800 Clean up the WKRemoteObjectEncoder code 2013-11-05 11:23:04 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 947262 0 andersca 2013-11-05 11:07:39 -0800 Clean up the WKRemoteObjectEncoder code 947263 1 216053 andersca 2013-11-05 11:12:30 -0800 Created attachment 216053 Patch 947267 2 216053 mitz 2013-11-05 11:20:24 -0800 Comment on attachment 216053 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=216053&action=review > Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm:41 > +static RefPtr<ImmutableDictionary> createEncodedObject(WKRemoteObjectEncoder *, id); Not PassRefPtr<>? 947269 3 andersca 2013-11-05 11:23:04 -0800 Committed r158683: <http://trac.webkit.org/changeset/158683> 216053 2013-11-05 11:12:30 -0800 2013-11-05 11:20:23 -0800 Patch bug-123811-20131105111230.patch text/plain 9426 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4Njc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMGQ4YmRlMDc5ZmQ3MWZi ODcxZjZlYTMzMGQ5OTIxOTUyZTRhZTI5MS4uMjBlYTg4M2EyYjg2ZDJjODhhMmMyY2QxNjMxNTk4 ZWVmZTE3ZTg3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEzLTExLTA1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAgdGhl IFdLUmVtb3RlT2JqZWN0RW5jb2RlciBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjM4MTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgYSBuZXcgb2JqZWN0IHN0cmVhbSBhcnJheSB0byBiZSB1 c2VkIGZvciB0aGUgbm9uLWtleWVkIGVuY29kaW5nIHZhbHVlcworICAgICAgICBhbmQgZnJlZSBm dW5jdGlvbnMgZm9yIGVuY29kaW5nIHZhbHVlcyB0byB0aGUgb2JqZWN0IHN0cmVhbS4gU2ltcGxp Znkgb2JqZWN0IGVuY29kaW5nCisgICAgICAgIGJ5IG1vdmluZyB0aGUgRGljdGlvbmFyeSBjcmVh dGlvbiBvdXQgaW50byBhIHNlcGFyYXRlIGZ1bmN0aW9uIGFuZCBkaXRjaGluZyB0aGUgYmxvY2sg YmFzZWQgbWV0aG9kcy4KKworICAgICAgICAqIFNoYXJlZC9BUEkvQ29jb2EvV0tSZW1vdGVPYmpl Y3RDb2Rlci5tbToKKyAgICAgICAgKGVuc3VyZU9iamVjdFN0cmVhbSk6CisgICAgICAgIEFkZCBo ZWxwZXIgZnVuY3Rpb24gdG8gY3JlYXRlIGFuIG9iamVjdCBzdHJlYW0uCisKKyAgICAgICAgKGVu Y29kZVRvT2JqZWN0U3RyZWFtKToKKyAgICAgICAgQWRkIG92ZXJsb2FkcyBmb3IgZW5jb2Rpbmcg dmFsdWVzIGludG8gdGhlIG9iamVjdCBzdHJlYW1zLgorCisgICAgICAgIChlbmNvZGVJbnZvY2F0 aW9uKToKKyAgICAgICAgQWRkIGhlbHBlciBmdW5jdGlvbiBmb3IgZW5jb2RpbmcgYW4gTlNJbnZv Y2F0aW9uLgorCisgICAgICAgIChlbmNvZGVPYmplY3QpOgorICAgICAgICBDYWxsIGVuY29kZUlu dm9jYXRpb24gaWYgbmVlZGVkLCBvdGhlcndpc2UganVzdCB1c2UgZW5jb2RlV2l0aENvZGVyOi4K KworICAgICAgICAoY3JlYXRlRW5jb2RlZE9iamVjdCk6CisgICAgICAgIEhlbHBlciBmdW5jdGlv biB0aGF0IHNldHMgdXAgYSBkaWN0aW9uYXJ5LCBlbmNvZGVzIHRoZSBvYmplY3QgaW50byB0aGUg ZGljdGlvbmFyeSBhbmQgdGhlbiByZXR1cm5zIHRoZSBkaWN0aW9uYXJ5LgorCisgICAgICAgICgt W1dLUmVtb3RlT2JqZWN0RW5jb2RlciBlbmNvZGVPYmplY3Q6Zm9yS2V5Ol0pOgorICAgICAgICBD YWxsIGNyZWF0ZUVuY29kZWRPYmplY3QuICAgIAorCiAyMDEzLTExLTA0ICBCcmFkeSBFaWRzb24g IDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBJREI6IFNwbGl0IGJhY2tlbmQgQ3Vyc29y cyBhbmQgVHJhbnNhY3Rpb25zIGludG8gdGhlaXIgb3duIGZpbGVzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvQVBJL0NvY29hL1dLUmVtb3RlT2JqZWN0Q29kZXIubW0gYi9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvQVBJL0NvY29hL1dLUmVtb3RlT2JqZWN0Q29kZXIubW0KaW5kZXgg YjE5NTE5ZTI2ZDk5NjcwZDA5ODk3NzI4OGE2N2YxYjRkOTY4MDg2OC4uZTlhOTY2ZTZiMWQ4NTIy MzhkNWVjZWU5NGZiYTYyMTc3ZmJiZDY4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hh cmVkL0FQSS9Db2NvYS9XS1JlbW90ZU9iamVjdENvZGVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9BUEkvQ29jb2EvV0tSZW1vdGVPYmplY3RDb2Rlci5tbQpAQCAtMzQsMTQgKzM0LDIw IEBACiAKICNpZiBXS19BUElfRU5BQkxFRAogCitjb25zdCBjaGFyKiBjb25zdCBvYmplY3RTdHJl YW1LZXkgPSAiJG9iamVjdFN0cmVhbSI7CisKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKK3N0 YXRpYyBSZWZQdHI8SW1tdXRhYmxlRGljdGlvbmFyeT4gY3JlYXRlRW5jb2RlZE9iamVjdChXS1Jl bW90ZU9iamVjdEVuY29kZXIgKiwgaWQpOworCiBAaW50ZXJmYWNlIE5TTWV0aG9kU2lnbmF0dXJl IChEZXRhaWxzKQogLSAoTlNTdHJpbmcgKilfdHlwZVN0cmluZzsKIEBlbmQKIAogQGltcGxlbWVu dGF0aW9uIFdLUmVtb3RlT2JqZWN0RW5jb2RlciB7CiAgICAgUmVmUHRyPE11dGFibGVEaWN0aW9u YXJ5PiBfcm9vdERpY3Rpb25hcnk7CisgICAgTXV0YWJsZUFycmF5KiBfb2JqZWN0U3RyZWFtOwor CiAgICAgTXV0YWJsZURpY3Rpb25hcnkqIF9jdXJyZW50RGljdGlvbmFyeTsKIH0KIApAQCAtNzAs MTEwICs3NiwxMzIgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKICAgICByZXR1cm4gX3Jvb3RE aWN0aW9uYXJ5LmdldCgpOwogfQogCi0tIChCT09MKWFsbG93c0tleWVkQ29kaW5nCitzdGF0aWMg dm9pZCBlbnN1cmVPYmplY3RTdHJlYW0oV0tSZW1vdGVPYmplY3RFbmNvZGVyICplbmNvZGVyKQog ewotICAgIHJldHVybiBZRVM7CisgICAgaWYgKGVuY29kZXItPl9vYmplY3RTdHJlYW0pCisgICAg ICAgIHJldHVybjsKKworICAgIFJlZlB0cjxNdXRhYmxlQXJyYXk+IG9iamVjdFN0cmVhbSA9IE11 dGFibGVBcnJheTo6Y3JlYXRlKCk7CisgICAgZW5jb2Rlci0+X29iamVjdFN0cmVhbSA9IG9iamVj dFN0cmVhbS5nZXQoKTsKKworICAgIGVuY29kZXItPl9yb290RGljdGlvbmFyeS0+c2V0KG9iamVj dFN0cmVhbUtleSwgb2JqZWN0U3RyZWFtLnJlbGVhc2UoKSk7CiB9CiAKLS0gKHZvaWQpZW5jb2Rl T2JqZWN0OihpZClvYmplY3QgZm9yS2V5OihOU1N0cmluZyAqKWtleQorc3RhdGljIHZvaWQgZW5j b2RlVG9PYmplY3RTdHJlYW0oV0tSZW1vdGVPYmplY3RFbmNvZGVyICplbmNvZGVyLCBkb3VibGUg dmFsdWUpCiB7Ci0gICAgaWYgKFtvYmplY3QgaXNLaW5kT2ZDbGFzczpbTlNJbnZvY2F0aW9uIGNs YXNzXV0pIHsKLSAgICAgICAgLy8gV2UgaGF2ZSB0byBzcGVjaWFsIGNhc2UgTlNJbnZvY2F0aW9u IHNpbmNlIHdlIGRvbid0IHdhbnQgdG8gZW5jb2RlIHRoZSB0YXJnZXQuCi0gICAgICAgIFtzZWxm IF9lbmNvZGVJbnZvY2F0aW9uOm9iamVjdCBmb3JLZXk6a2V5XTsKLSAgICAgICAgcmV0dXJuOwot ICAgIH0KKyAgICBlbnN1cmVPYmplY3RTdHJlYW0oZW5jb2Rlcik7CiAKLSAgICBpZiAoIVtvYmpl Y3QgY29uZm9ybXNUb1Byb3RvY29sOkBwcm90b2NvbChOU1NlY3VyZUNvZGluZyldKQotICAgICAg ICBbTlNFeGNlcHRpb24gcmFpc2U6TlNJbnZhbGlkQXJndW1lbnRFeGNlcHRpb24gZm9ybWF0OkAi JUAgZG9lcyBub3QgY29uZm9ybSB0byBOU1NlY3VyZUNvZGluZyIsIG9iamVjdF07CisgICAgZW5j b2Rlci0+X29iamVjdFN0cmVhbS0+YXBwZW5kKFdlYkRvdWJsZTo6Y3JlYXRlKHZhbHVlKSk7Cit9 CiAKLSAgICBbc2VsZiBfZW5jb2RlT2JqZWN0Rm9yS2V5OmtleSB1c2luZ0Jsb2NrOl57Ci0gICAg ICAgIFtvYmplY3QgZW5jb2RlV2l0aENvZGVyOnNlbGZdOwotICAgIH1dOworc3RhdGljIHZvaWQg ZW5jb2RlVG9PYmplY3RTdHJlYW0oV0tSZW1vdGVPYmplY3RFbmNvZGVyICplbmNvZGVyLCBpbnQg dmFsdWUpCit7CisgICAgZW5zdXJlT2JqZWN0U3RyZWFtKGVuY29kZXIpOworCisgICAgZW5jb2Rl ci0+X29iamVjdFN0cmVhbS0+YXBwZW5kKFdlYlVJbnQ2NDo6Y3JlYXRlKHZhbHVlKSk7CiB9CiAK LXN0YXRpYyBOU1N0cmluZyAqZXNjYXBlS2V5KE5TU3RyaW5nICprZXkpCitzdGF0aWMgdm9pZCBl bmNvZGVUb09iamVjdFN0cmVhbShXS1JlbW90ZU9iamVjdEVuY29kZXIgKmVuY29kZXIsIGlkIHZh bHVlKQogewotICAgIGlmIChrZXkubGVuZ3RoICYmIFtrZXkgY2hhcmFjdGVyQXRJbmRleDowXSA9 PSAnJCcpCi0gICAgICAgIHJldHVybiBbQCIkIiBzdHJpbmdCeUFwcGVuZGluZ1N0cmluZzprZXld OworICAgIGVuc3VyZU9iamVjdFN0cmVhbShlbmNvZGVyKTsKIAotICAgIHJldHVybiBrZXk7Cisg ICAgZW5jb2Rlci0+X29iamVjdFN0cmVhbS0+YXBwZW5kKGNyZWF0ZUVuY29kZWRPYmplY3QoZW5j b2RlciwgdmFsdWUpKTsKIH0KIAotLSAodm9pZClfZW5jb2RlSW52b2NhdGlvbjooTlNJbnZvY2F0 aW9uICopaW52b2NhdGlvbiBmb3JLZXk6KE5TU3RyaW5nICopa2V5CitzdGF0aWMgdm9pZCBlbmNv ZGVJbnZvY2F0aW9uKFdLUmVtb3RlT2JqZWN0RW5jb2RlciAqZW5jb2RlciwgTlNJbnZvY2F0aW9u ICppbnZvY2F0aW9uKQogewotICAgIFtzZWxmIF9lbmNvZGVPYmplY3RGb3JLZXk6a2V5IHVzaW5n QmxvY2s6XnsKLSAgICAgICAgTlNNZXRob2RTaWduYXR1cmUgKm1ldGhvZFNpZ25hdHVyZSA9IGlu dm9jYXRpb24ubWV0aG9kU2lnbmF0dXJlOwotICAgICAgICBbc2VsZiBlbmNvZGVPYmplY3Q6bWV0 aG9kU2lnbmF0dXJlLl90eXBlU3RyaW5nIGZvcktleTpAInR5cGVTdHJpbmciXTsKLSAgICAgICAg W3NlbGYgZW5jb2RlT2JqZWN0Ok5TU3RyaW5nRnJvbVNlbGVjdG9yKGludm9jYXRpb24uc2VsZWN0 b3IpIGZvcktleTpAInNlbGVjdG9yIl07Ci0KLSAgICAgICAgTlNVSW50ZWdlciBhcmd1bWVudENv dW50ID0gbWV0aG9kU2lnbmF0dXJlLm51bWJlck9mQXJndW1lbnRzOwotCi0gICAgICAgIC8vIFRo ZSBpbnZvY2F0aW9uIHNob3VsZCBhbHdheXMgaGF2ZSBoYXZlIHNlbGYgYW5kIF9jbWQgYXJndW1l bnRzLgotICAgICAgICBBU1NFUlQoYXJndW1lbnRDb3VudCA+PSAyKTsKLQotICAgICAgICBSZWZQ dHI8TXV0YWJsZUFycmF5PiBhcmd1bWVudHMgPSBNdXRhYmxlQXJyYXk6OmNyZWF0ZSgpOwotCi0g ICAgICAgIC8vIFdlIGlnbm9yZSBzZWxmIGFuZCBfY21kLgotICAgICAgICBmb3IgKE5TVUludGVn ZXIgaSA9IDI7IGkgPCBhcmd1bWVudENvdW50OyArK2kpIHsKLSAgICAgICAgICAgIGNvbnN0IGNo YXIqIHR5cGUgPSBbbWV0aG9kU2lnbmF0dXJlIGdldEFyZ3VtZW50VHlwZUF0SW5kZXg6aV07Ci0K LSAgICAgICAgICAgIHN3aXRjaCAoKnR5cGUpIHsKLSAgICAgICAgICAgIC8vIGRvdWJsZQotICAg ICAgICAgICAgY2FzZSAnaSc6IHsKLSAgICAgICAgICAgICAgICBpbnQgdmFsdWU7Ci0gICAgICAg ICAgICAgICAgW2ludm9jYXRpb24gZ2V0QXJndW1lbnQ6JnZhbHVlIGF0SW5kZXg6aV07Ci0KLSAg ICAgICAgICAgICAgICBhcmd1bWVudHMtPmFwcGVuZChXZWJVSW50NjQ6OmNyZWF0ZSh2YWx1ZSkp OwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgfQotCi0gICAgICAgICAgICAv LyBpbnQKLSAgICAgICAgICAgIGNhc2UgJ2QnOiB7Ci0gICAgICAgICAgICAgICAgZG91YmxlIHZh bHVlOwotICAgICAgICAgICAgICAgIFtpbnZvY2F0aW9uIGdldEFyZ3VtZW50OiZ2YWx1ZSBhdElu ZGV4OmldOwotCi0gICAgICAgICAgICAgICAgYXJndW1lbnRzLT5hcHBlbmQoV2ViRG91YmxlOjpj cmVhdGUodmFsdWUpKTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLQot ICAgICAgICAgICAgLy8gT2JqZWN0aXZlLUMgb2JqZWN0Ci0gICAgICAgICAgICBjYXNlICdAJzog ewotICAgICAgICAgICAgICAgIGlkIHZhbHVlOwotICAgICAgICAgICAgICAgIFtpbnZvY2F0aW9u IGdldEFyZ3VtZW50OiZ2YWx1ZSBhdEluZGV4OmldOwotCi0gICAgICAgICAgICAgICAgYXJndW1l bnRzLT5hcHBlbmQoW3NlbGYgX2VuY29kZWRPYmplY3RVc2luZ0Jsb2NrOl57Ci0gICAgICAgICAg ICAgICAgICAgIFt2YWx1ZSBlbmNvZGVXaXRoQ29kZXI6c2VsZl07Ci0gICAgICAgICAgICAgICAg fV0pOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgfQotCi0gICAgICAgICAg ICBkZWZhdWx0OgotICAgICAgICAgICAgICAgIFtOU0V4Y2VwdGlvbiByYWlzZTpOU0ludmFsaWRB cmd1bWVudEV4Y2VwdGlvbiBmb3JtYXQ6QCJVbnN1cHBvcnRlZCBpbnZvY2F0aW9uIGFyZ3VtZW50 IHR5cGUgJyVzJyIsIHR5cGVdOwotICAgICAgICAgICAgfQorICAgIE5TTWV0aG9kU2lnbmF0dXJl ICptZXRob2RTaWduYXR1cmUgPSBpbnZvY2F0aW9uLm1ldGhvZFNpZ25hdHVyZTsKKyAgICBbZW5j b2RlciBlbmNvZGVPYmplY3Q6bWV0aG9kU2lnbmF0dXJlLl90eXBlU3RyaW5nIGZvcktleTpAInR5 cGVTdHJpbmciXTsKKyAgICBbZW5jb2RlciBlbmNvZGVPYmplY3Q6TlNTdHJpbmdGcm9tU2VsZWN0 b3IoaW52b2NhdGlvbi5zZWxlY3RvcikgZm9yS2V5OkAic2VsZWN0b3IiXTsKKworICAgIE5TVUlu dGVnZXIgYXJndW1lbnRDb3VudCA9IG1ldGhvZFNpZ25hdHVyZS5udW1iZXJPZkFyZ3VtZW50czsK KworICAgIC8vIFRoZSBpbnZvY2F0aW9uIHNob3VsZCBhbHdheXMgaGF2ZSBoYXZlIHNlbGYgYW5k IF9jbWQgYXJndW1lbnRzLgorICAgIEFTU0VSVChhcmd1bWVudENvdW50ID49IDIpOworCisgICAg Ly8gV2UgaWdub3JlIHNlbGYgYW5kIF9jbWQuCisgICAgZm9yIChOU1VJbnRlZ2VyIGkgPSAyOyBp IDwgYXJndW1lbnRDb3VudDsgKytpKSB7CisgICAgICAgIGNvbnN0IGNoYXIqIHR5cGUgPSBbbWV0 aG9kU2lnbmF0dXJlIGdldEFyZ3VtZW50VHlwZUF0SW5kZXg6aV07CisKKyAgICAgICAgc3dpdGNo ICgqdHlwZSkgeworICAgICAgICAvLyBkb3VibGUKKyAgICAgICAgY2FzZSAnZCc6IHsKKyAgICAg ICAgICAgIGRvdWJsZSB2YWx1ZTsKKyAgICAgICAgICAgIFtpbnZvY2F0aW9uIGdldEFyZ3VtZW50 OiZ2YWx1ZSBhdEluZGV4OmldOworCisgICAgICAgICAgICBlbmNvZGVUb09iamVjdFN0cmVhbShl bmNvZGVyLCB2YWx1ZSk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorCisgICAgICAg IC8vIGludAorICAgICAgICBjYXNlICdpJzogeworICAgICAgICAgICAgaW50IHZhbHVlOworICAg ICAgICAgICAgW2ludm9jYXRpb24gZ2V0QXJndW1lbnQ6JnZhbHVlIGF0SW5kZXg6aV07CisKKyAg ICAgICAgICAgIGVuY29kZVRvT2JqZWN0U3RyZWFtKGVuY29kZXIsIHZhbHVlKTsKKyAgICAgICAg ICAgIGJyZWFrOworICAgICAgICB9CisKKyAgICAgICAgLy8gT2JqZWN0aXZlLUMgb2JqZWN0Cisg ICAgICAgIGNhc2UgJ0AnOiB7CisgICAgICAgICAgICBpZCB2YWx1ZTsKKyAgICAgICAgICAgIFtp bnZvY2F0aW9uIGdldEFyZ3VtZW50OiZ2YWx1ZSBhdEluZGV4OmldOworCisgICAgICAgICAgICBl bmNvZGVUb09iamVjdFN0cmVhbShlbmNvZGVyLCB2YWx1ZSk7CisgICAgICAgICAgICBicmVhazsK ICAgICAgICAgfQogCi0gICAgICAgIF9jdXJyZW50RGljdGlvbmFyeS0+c2V0KCJhcmd1bWVudHMi LCBhcmd1bWVudHMucmVsZWFzZSgpKTsKLSAgICB9XTsKKyAgICAgICAgZGVmYXVsdDoKKyAgICAg ICAgICAgIFtOU0V4Y2VwdGlvbiByYWlzZTpOU0ludmFsaWRBcmd1bWVudEV4Y2VwdGlvbiBmb3Jt YXQ6QCJVbnN1cHBvcnRlZCBpbnZvY2F0aW9uIGFyZ3VtZW50IHR5cGUgJyVzJyIsIHR5cGVdOwor ICAgICAgICB9CisgICAgfQogfQogCi0tICh2b2lkKWVuY29kZUJ5dGVzOihjb25zdCB1aW50OF90 ICopYnl0ZXMgbGVuZ3RoOihOU1VJbnRlZ2VyKWxlbmd0aCBmb3JLZXk6KE5TU3RyaW5nICopa2V5 CitzdGF0aWMgdm9pZCBlbmNvZGVPYmplY3QoV0tSZW1vdGVPYmplY3RFbmNvZGVyICplbmNvZGVy LCBpZCBvYmplY3QpCiB7Ci0gICAgX2N1cnJlbnREaWN0aW9uYXJ5LT5zZXQoZXNjYXBlS2V5KGtl eSksIFdlYkRhdGE6OmNyZWF0ZShieXRlcywgbGVuZ3RoKSk7CisgICAgaWYgKFtvYmplY3QgaXNL aW5kT2ZDbGFzczpbTlNJbnZvY2F0aW9uIGNsYXNzXV0pIHsKKyAgICAgICAgLy8gV2UgaGF2ZSB0 byBzcGVjaWFsIGNhc2UgTlNJbnZvY2F0aW9uIHNpbmNlIHdlIGRvbid0IHdhbnQgdG8gZW5jb2Rl IHRoZSB0YXJnZXQuCisgICAgICAgIGVuY29kZUludm9jYXRpb24oZW5jb2Rlciwgb2JqZWN0KTsK KyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmICghW29iamVjdCBjb25mb3Jtc1RvUHJv dG9jb2w6QHByb3RvY29sKE5TU2VjdXJlQ29kaW5nKV0pCisgICAgICAgIFtOU0V4Y2VwdGlvbiBy YWlzZTpOU0ludmFsaWRBcmd1bWVudEV4Y2VwdGlvbiBmb3JtYXQ6QCIlQCBkb2VzIG5vdCBjb25m b3JtIHRvIE5TU2VjdXJlQ29kaW5nIiwgb2JqZWN0XTsKKworICAgIFtvYmplY3QgZW5jb2RlV2l0 aENvZGVyOmVuY29kZXJdOwogfQogCi0tIChSZWZQdHI8TXV0YWJsZURpY3Rpb25hcnk+KV9lbmNv ZGVkT2JqZWN0VXNpbmdCbG9jazoodm9pZCAoXikoKSlibG9jaworc3RhdGljIFJlZlB0cjxJbW11 dGFibGVEaWN0aW9uYXJ5PiBjcmVhdGVFbmNvZGVkT2JqZWN0KFdLUmVtb3RlT2JqZWN0RW5jb2Rl ciAqZW5jb2RlciwgaWQgb2JqZWN0KQogewogICAgIFJlZlB0cjxNdXRhYmxlRGljdGlvbmFyeT4g ZGljdGlvbmFyeSA9IE11dGFibGVEaWN0aW9uYXJ5OjpjcmVhdGUoKTsKKyAgICBUZW1wb3JhcnlD aGFuZ2U8TXV0YWJsZURpY3Rpb25hcnkqPiBkaWN0aW9uYXJ5Q2hhbmdlKGVuY29kZXItPl9jdXJy ZW50RGljdGlvbmFyeSwgZGljdGlvbmFyeS5nZXQoKSk7CiAKLSAgICBUZW1wb3JhcnlDaGFuZ2U8 TXV0YWJsZURpY3Rpb25hcnkqPiBkaWN0aW9uYXJ5Q2hhbmdlKF9jdXJyZW50RGljdGlvbmFyeSwg ZGljdGlvbmFyeS5nZXQoKSk7Ci0gICAgYmxvY2soKTsKKyAgICBlbmNvZGVPYmplY3QoZW5jb2Rl ciwgb2JqZWN0KTsKIAogICAgIHJldHVybiBkaWN0aW9uYXJ5OwogfQogCi0tICh2b2lkKV9lbmNv ZGVPYmplY3RGb3JLZXk6KE5TU3RyaW5nICopa2V5IHVzaW5nQmxvY2s6KHZvaWQgKF4pKCkpYmxv Y2sKKy0gKEJPT0wpYWxsb3dzS2V5ZWRDb2RpbmcKK3sKKyAgICByZXR1cm4gWUVTOworfQorCitz dGF0aWMgTlNTdHJpbmcgKmVzY2FwZUtleShOU1N0cmluZyAqa2V5KQoreworICAgIGlmIChrZXku bGVuZ3RoICYmIFtrZXkgY2hhcmFjdGVyQXRJbmRleDowXSA9PSAnJCcpCisgICAgICAgIHJldHVy biBbQCIkIiBzdHJpbmdCeUFwcGVuZGluZ1N0cmluZzprZXldOworCisgICAgcmV0dXJuIGtleTsK K30KKworLSAodm9pZCllbmNvZGVPYmplY3Q6KGlkKW9iamVjdCBmb3JLZXk6KE5TU3RyaW5nICop a2V5Cit7CisgICAgX2N1cnJlbnREaWN0aW9uYXJ5LT5zZXQoZXNjYXBlS2V5KGtleSksIGNyZWF0 ZUVuY29kZWRPYmplY3Qoc2VsZiwgb2JqZWN0KSk7Cit9CisKKy0gKHZvaWQpZW5jb2RlQnl0ZXM6 KGNvbnN0IHVpbnQ4X3QgKilieXRlcyBsZW5ndGg6KE5TVUludGVnZXIpbGVuZ3RoIGZvcktleToo TlNTdHJpbmcgKilrZXkKIHsKLSAgICBfY3VycmVudERpY3Rpb25hcnktPnNldChlc2NhcGVLZXko a2V5KSwgW3NlbGYgX2VuY29kZWRPYmplY3RVc2luZ0Jsb2NrOmJsb2NrXSk7CisgICAgX2N1cnJl bnREaWN0aW9uYXJ5LT5zZXQoZXNjYXBlS2V5KGtleSksIFdlYkRhdGE6OmNyZWF0ZShieXRlcywg bGVuZ3RoKSk7CiB9CiAKIEBlbmQK