91330 2012-07-14 20:49:09 -0700 [Mac] Make WebPreferencesPrivate a simple struct 2012-07-15 19:21:08 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 benjamin benjamin joepeck rniwa oldest_to_newest 669912 0 benjamin 2012-07-14 20:49:09 -0700 Make WebPreferencesPrivate a simple struct 669915 1 152445 benjamin 2012-07-14 20:59:56 -0700 Created attachment 152445 Patch 670015 2 benjamin 2012-07-15 13:25:23 -0700 Committed r122682: <http://trac.webkit.org/changeset/122682> 670016 3 benjamin 2012-07-15 13:26:09 -0700 <rdar://problem/11877184> 670041 4 rniwa 2012-07-15 19:21:08 -0700 It seems like this patch caused a bunch of tests to crash: http://build.webkit.org/results/Apple%20Lion%20Debug%20WK1%20(Tests)/r122682%20(950)/results.html Blame list: http://build.webkit.org/builders/Apple%20Lion%20Debug%20WK1%20%28Tests%29/builds/950 152445 2012-07-14 20:59:56 -0700 2012-07-14 21:27:35 -0700 Patch bug-91330-20120714205955.patch text/plain 12172 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNjc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggMjVkZTExMjVl YWJkOGEwYmY5YTEwYzY5MmFhNTk0MjMzMzY0ODhiYi4uZDJiNzA3ZWJkNzExY2ZhY2YzNDRlYTAx NjkwNTY1MzZmZTY5ZjgxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDEy LTA3LTE0ICBCZW5qYW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KKworICAgICAg ICBNYWtlIFdlYlByZWZlcmVuY2VzUHJpdmF0ZSBhIHNpbXBsZSBzdHJ1Y3QKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkxMzMwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVG8gYXZvaWQgdGFraW5nIHRpbWUg Y3JlYXRpbmcgYSBuZXcgT2JqZWN0aXZlLUMgb2JqZWN0IGZvciBXZWJQcmVmZXJlbmNlc1ByaXZh dGUsIHdlIGNhbiBqdXN0IG1ha2UKKyAgICAgICAgaXQgYSBzaW1wbGUgc3RydWN0LgorCisgICAg ICAgICogV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5oOgorICAgICAgICAqIFdlYlZpZXcvV2ViUHJl ZmVyZW5jZXMubW06CisgICAgICAgIChXZWJQcmVmZXJlbmNlc1ByaXZhdGUpOgorICAgICAgICAo V2ViUHJlZmVyZW5jZXNQcml2YXRlOjpXZWJQcmVmZXJlbmNlc1ByaXZhdGUpOgorICAgICAgICBS ZXBsYWNlIHRoZSBPYmplY3RpdmUtQyBXZWJQcmVmZXJlbmNlc1ByaXZhdGUgYnkgYSBzdHJ1Y3Qu CisgICAgICAgIFJlbW92ZSBJQkNyZWF0b3JJRCBmcm9tIHRoZSBvYmplY3QgYXMgaXQgaXMgdW51 c2VkLgorICAgICAgICBVc2UgUmV0YWluUHRyIGZvciB0aGUgT2JqZWN0aXZlLUMgYXR0cmlidXRl IHRvIGF2b2lkIHRyYWNraW5nIHRoZWlyIG1lbW9yeSBtYW51YWxseS4KKworICAgICAgICAoLVtX ZWJQcmVmZXJlbmNlcyBpbml0V2l0aElkZW50aWZpZXI6XSk6CisgICAgICAgIENoYW5nZSB0aGUg b3JkZXIgb2YgdGhlIGluaXRpYWxpemF0aW9uIHRvIGF2b2lkIGFsbG9jYXRpbmcgYW55dGluZyBp ZiBhIFdlYlByZWZlcmVuY2VzIGV4aXN0cworICAgICAgICBmb3IgdGhlIGlkZW50aWZpZXIuCisg ICAgICAgIEJvdGggW05TT2JqZWN0IGluaXRdIGFuZCBXZWJQcmVmZXJlbmNlc1ByaXZhdGUgYWxs b2NhdGlvbiBhcmUgbW92ZWQgYWZ0ZXIgdGhlIGZhc3QgcGF0aC4KKworICAgICAgICAoLVtXZWJQ cmVmZXJlbmNlcyBpbml0V2l0aENvZGVyOl0pOgorICAgICAgICAoLVtXZWJQcmVmZXJlbmNlcyBl bmNvZGVXaXRoQ29kZXI6XSk6CisgICAgICAgICgtW1dlYlByZWZlcmVuY2VzIGRlYWxsb2NdKToK KyAgICAgICAgKC1bV2ViUHJlZmVyZW5jZXMgaWRlbnRpZmllcl0pOgorICAgICAgICAoLVtXZWJQ cmVmZXJlbmNlcyBfdmFsdWVGb3JLZXk6XSk6CisgICAgICAgICgtW1dlYlByZWZlcmVuY2VzIF9z ZXRTdHJpbmdWYWx1ZTpmb3JLZXk6XSk6CisgICAgICAgICgtW1dlYlByZWZlcmVuY2VzIF9zZXRJ bnRlZ2VyVmFsdWU6Zm9yS2V5Ol0pOgorICAgICAgICAoLVtXZWJQcmVmZXJlbmNlcyBfc2V0Rmxv YXRWYWx1ZTpmb3JLZXk6XSk6CisgICAgICAgICgtW1dlYlByZWZlcmVuY2VzIF9zZXRCb29sVmFs dWU6Zm9yS2V5Ol0pOgorICAgICAgICAoLVtXZWJQcmVmZXJlbmNlcyBfc2V0TG9uZ0xvbmdWYWx1 ZTpmb3JLZXk6XSk6CisgICAgICAgICgtW1dlYlByZWZlcmVuY2VzIF9zZXRVbnNpZ25lZExvbmdM b25nVmFsdWU6Zm9yS2V5Ol0pOgorCiAyMDEyLTA3LTE0ICBCZW5qYW1pbiBQb3VsYWluICA8YnBv dWxhaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNdIERvIG5vdCB0cnkgdG8gdXBkYXRlIHRo ZSBjYWNoZSBtb2RlbCBmb3IgZXZlcnkgV2ViUHJlZmVyZW5jZXMgY2hhbmdlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLmggYi9Tb3VyY2UvV2Vi S2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLmgKaW5kZXggNmUwMTcwOWYwODc3YzMzNTIy NWE1YmFlNjA3N2E1NTEzOWRhYzBkZi4uOTMyNjU2YjA3MGY4YzQzMjg1MTIzNWEzYjljNDdmZWRk MjM1MjY5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJl bmNlcy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMuaApA QCAtNjQsNyArNjQsNyBAQCBlbnVtIHsKIH07CiB0eXBlZGVmIE5TVUludGVnZXIgV2ViQ2FjaGVN b2RlbDsKIAotQGNsYXNzIFdlYlByZWZlcmVuY2VzUHJpdmF0ZTsKK3R5cGVkZWYgc3RydWN0IFdl YlByZWZlcmVuY2VzUHJpdmF0ZSBXZWJQcmVmZXJlbmNlc1ByaXZhdGU7CiAKIGV4dGVybiBOU1N0 cmluZyAqV2ViUHJlZmVyZW5jZXNDaGFuZ2VkTm90aWZpY2F0aW9uOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tIGIvU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbQppbmRleCAxZGVmYmY1ZWQ0ZDZjN2MzYmQz OWYzN2EyNjU5YThmNzYyY2JjN2ViLi40NzE3OTA3ZjY1NTg3OGRhMWM2NzVjNmU0MmI3ZTBjNTlm YTY5OWQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVu Y2VzLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0K QEAgLTQxLDYgKzQxLDcgQEAKICNpbXBvcnQgPFdlYkNvcmUvQXBwbGljYXRpb25DYWNoZVN0b3Jh Z2UuaD4KICNpbXBvcnQgPFdlYkNvcmUvQ29va2llU3RvcmFnZUNGTmV0Lmg+CiAjaW1wb3J0IDxX ZWJDb3JlL1Jlc291cmNlSGFuZGxlLmg+CisjaW1wb3J0IDxXVEYvUmV0YWluUHRyLmg+CiAKIHVz aW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCkBAIC00OSw3ICs1MCw3IEBAIE5TU3RyaW5nICpXZWJQ cmVmZXJlbmNlc1JlbW92ZWROb3RpZmljYXRpb24gPSBAIldlYlByZWZlcmVuY2VzUmVtb3ZlZE5v dGlmaWNhdGlvCiBOU1N0cmluZyAqV2ViUHJlZmVyZW5jZXNDaGFuZ2VkSW50ZXJuYWxOb3RpZmlj YXRpb24gPSBAIldlYlByZWZlcmVuY2VzQ2hhbmdlZEludGVybmFsTm90aWZpY2F0aW9uIjsKIE5T U3RyaW5nICpXZWJQcmVmZXJlbmNlc0NhY2hlTW9kZWxDaGFuZ2VkSW50ZXJuYWxOb3RpZmljYXRp b24gPSBAIldlYlByZWZlcmVuY2VzQ2FjaGVNb2RlbENoYW5nZWRJbnRlcm5hbE5vdGlmaWNhdGlv biI7CiAKLSNkZWZpbmUgS0VZKHgpIChfcHJpdmF0ZS0+aWRlbnRpZmllciA/IFtfcHJpdmF0ZS0+ aWRlbnRpZmllciBzdHJpbmdCeUFwcGVuZGluZ1N0cmluZzooeCldIDogKHgpKQorI2RlZmluZSBL RVkoeCkgKF9wcml2YXRlLT5pZGVudGlmaWVyID8gW19wcml2YXRlLT5pZGVudGlmaWVyLmdldCgp IHN0cmluZ0J5QXBwZW5kaW5nU3RyaW5nOih4KV0gOiAoeCkpCiAKIGVudW0geyBXZWJQcmVmZXJl bmNlc1ZlcnNpb24gPSAxIH07CiAKQEAgLTE0MiwyOCArMTQzLDYgQEAgc3RhdGljIFdlYkNhY2hl TW9kZWwgY2FjaGVNb2RlbEZvck1haW5CdW5kbGUodm9pZCkKICAgICByZXR1cm4gY2FjaGVNb2Rl bDsKIH0KIAotQGludGVyZmFjZSBXZWJQcmVmZXJlbmNlc1ByaXZhdGUgOiBOU09iamVjdAotewot QHB1YmxpYwotICAgIE5TTXV0YWJsZURpY3Rpb25hcnkgKnZhbHVlczsKLSAgICBOU1N0cmluZyAq aWRlbnRpZmllcjsKLSAgICBOU1N0cmluZyAqSUJDcmVhdG9ySUQ7Ci0gICAgQk9PTCBhdXRvc2F2 ZXM7Ci0gICAgQk9PTCBhdXRvbWF0aWNhbGx5RGV0ZWN0c0NhY2hlTW9kZWw7Ci0gICAgdW5zaWdu ZWQgbnVtV2ViVmlld3M7Ci19Ci1AZW5kCi0KLUBpbXBsZW1lbnRhdGlvbiBXZWJQcmVmZXJlbmNl c1ByaXZhdGUKLS0gKHZvaWQpZGVhbGxvYwotewotICAgIFt2YWx1ZXMgcmVsZWFzZV07Ci0gICAg W2lkZW50aWZpZXIgcmVsZWFzZV07Ci0gICAgW0lCQ3JlYXRvcklEIHJlbGVhc2VdOwotICAgIFtz dXBlciBkZWFsbG9jXTsKLX0KLUBlbmQKLQogQGludGVyZmFjZSBXZWJQcmVmZXJlbmNlcyAoKQog LSAodm9pZClfcG9zdENhY2hlTW9kZWxDaGFuZ2VkTm90aWZpY2F0aW9uOwogQGVuZApAQCAtMTcz LDYgKzE1MiwyMyBAQCBzdGF0aWMgV2ViQ2FjaGVNb2RlbCBjYWNoZU1vZGVsRm9yTWFpbkJ1bmRs ZSh2b2lkKQogKyAoTlNTdHJpbmcgKilfSUJDcmVhdG9ySUQ7CiBAZW5kCiAKK3N0cnVjdCBXZWJQ cmVmZXJlbmNlc1ByaXZhdGUKK3sKK3B1YmxpYzoKKyAgICBXZWJQcmVmZXJlbmNlc1ByaXZhdGUo KQorICAgIDogYXV0b3NhdmVzKE5PKQorICAgICwgYXV0b21hdGljYWxseURldGVjdHNDYWNoZU1v ZGVsKE5PKQorICAgICwgbnVtV2ViVmlld3MoMCkKKyAgICB7CisgICAgfQorCisgICAgUmV0YWlu UHRyPE5TTXV0YWJsZURpY3Rpb25hcnk+IHZhbHVlczsKKyAgICBSZXRhaW5QdHI8TlNTdHJpbmc+ IGlkZW50aWZpZXI7CisgICAgQk9PTCBhdXRvc2F2ZXM7CisgICAgQk9PTCBhdXRvbWF0aWNhbGx5 RGV0ZWN0c0NhY2hlTW9kZWw7CisgICAgdW5zaWduZWQgbnVtV2ViVmlld3M7Cit9OworCiBAaW50 ZXJmYWNlIFdlYlByZWZlcmVuY2VzIChXZWJGb3J3YXJkRGVjbGFyYXRpb25zKQogLy8gVGhpcyBw c2V1ZG8tY2F0ZWdvcnkgaXMgbmVlZGVkIHNvIHRoZXNlIG1ldGhvZHMgY2FuIGJlIHVzZWQgZnJv bSB3aXRoaW4gb3RoZXIgY2F0ZWdvcnkgaW1wbGVtZW50YXRpb25zCiAvLyB3aXRob3V0IGJlaW5n IGluIHRoZSBwdWJsaWMgaGVhZGVyIGZpbGUuCkBAIC0yMDcsMjQgKzIwMywyMiBAQCBzdGF0aWMg V2ViQ2FjaGVNb2RlbCBjYWNoZU1vZGVsRm9yTWFpbkJ1bmRsZSh2b2lkKQogCiAtIChpZClpbml0 V2l0aElkZW50aWZpZXI6KE5TU3RyaW5nICopYW5JZGVudGlmaWVyCiB7Ci0gICAgc2VsZiA9IFtz dXBlciBpbml0XTsKLSAgICBpZiAoIXNlbGYpCi0gICAgICAgIHJldHVybiBuaWw7Ci0KLSAgICBf cHJpdmF0ZSA9IFtbV2ViUHJlZmVyZW5jZXNQcml2YXRlIGFsbG9jXSBpbml0XTsKLSAgICBfcHJp dmF0ZS0+SUJDcmVhdG9ySUQgPSBbW1dlYlByZWZlcmVuY2VzIF9JQkNyZWF0b3JJRF0gcmV0YWlu XTsKLQogICAgIFdlYlByZWZlcmVuY2VzICppbnN0YW5jZSA9IFtbc2VsZiBjbGFzc10gX2dldElu c3RhbmNlRm9ySWRlbnRpZmllcjphbklkZW50aWZpZXJdOwotICAgIGlmIChpbnN0YW5jZSl7Cisg ICAgaWYgKGluc3RhbmNlKSB7CiAgICAgICAgIFtzZWxmIHJlbGVhc2VdOwogICAgICAgICByZXR1 cm4gW2luc3RhbmNlIHJldGFpbl07CiAgICAgfQogCi0gICAgX3ByaXZhdGUtPnZhbHVlcyA9IFtb TlNNdXRhYmxlRGljdGlvbmFyeSBhbGxvY10gaW5pdF07Ci0gICAgX3ByaXZhdGUtPmlkZW50aWZp ZXIgPSBbYW5JZGVudGlmaWVyIGNvcHldOworICAgIHNlbGYgPSBbc3VwZXIgaW5pdF07CisgICAg aWYgKCFzZWxmKQorICAgICAgICByZXR1cm4gbmlsOworCisgICAgX3ByaXZhdGUgPSBuZXcgV2Vi UHJlZmVyZW5jZXNQcml2YXRlOworICAgIF9wcml2YXRlLT52YWx1ZXMuYWRvcHROUyhbW05TTXV0 YWJsZURpY3Rpb25hcnkgYWxsb2NdIGluaXRdKTsKKyAgICBfcHJpdmF0ZS0+aWRlbnRpZmllci5h ZG9wdE5TKFthbklkZW50aWZpZXIgY29weV0pOwogICAgIF9wcml2YXRlLT5hdXRvbWF0aWNhbGx5 RGV0ZWN0c0NhY2hlTW9kZWwgPSBZRVM7CiAKLSAgICBbW3NlbGYgY2xhc3NdIF9zZXRJbnN0YW5j ZTpzZWxmIGZvcklkZW50aWZpZXI6X3ByaXZhdGUtPmlkZW50aWZpZXJdOworICAgIFtbc2VsZiBj bGFzc10gX3NldEluc3RhbmNlOnNlbGYgZm9ySWRlbnRpZmllcjpfcHJpdmF0ZS0+aWRlbnRpZmll ci5nZXQoKV07CiAKICAgICBbc2VsZiBfcG9zdFByZWZlcmVuY2VzQ2hhbmdlZE5vdGlmaWNhdGlv bl07CiAgICAgW3NlbGYgX3Bvc3RDYWNoZU1vZGVsQ2hhbmdlZE5vdGlmaWNhdGlvbl07CkBAIC0y MzgsOCArMjMyLDcgQEAgc3RhdGljIFdlYkNhY2hlTW9kZWwgY2FjaGVNb2RlbEZvck1haW5CdW5k bGUodm9pZCkKICAgICBpZiAoIXNlbGYpCiAgICAgICAgIHJldHVybiBuaWw7CiAKLSAgICBfcHJp dmF0ZSA9IFtbV2ViUHJlZmVyZW5jZXNQcml2YXRlIGFsbG9jXSBpbml0XTsKLSAgICBfcHJpdmF0 ZS0+SUJDcmVhdG9ySUQgPSBbW1dlYlByZWZlcmVuY2VzIF9JQkNyZWF0b3JJRF0gcmV0YWluXTsK KyAgICBfcHJpdmF0ZSA9IG5ldyBXZWJQcmVmZXJlbmNlc1ByaXZhdGU7CiAgICAgX3ByaXZhdGUt PmF1dG9tYXRpY2FsbHlEZXRlY3RzQ2FjaGVNb2RlbCA9IFlFUzsKIAogICAgIEB0cnkgewpAQCAt MjU4LDExICsyNTEsMTEgQEAgc3RhdGljIFdlYkNhY2hlTW9kZWwgY2FjaGVNb2RlbEZvck1haW5C dW5kbGUodm9pZCkKICAgICAgICAgfQogCiAgICAgICAgIGlmIChbaWRlbnRpZmllciBpc0tpbmRP ZkNsYXNzOltOU1N0cmluZyBjbGFzc11dKQotICAgICAgICAgICAgX3ByaXZhdGUtPmlkZW50aWZp ZXIgPSBbaWRlbnRpZmllciBjb3B5XTsKKyAgICAgICAgICAgIF9wcml2YXRlLT5pZGVudGlmaWVy LmFkb3B0TlMoW2lkZW50aWZpZXIgY29weV0pOwogICAgICAgICBpZiAoW3ZhbHVlcyBpc0tpbmRP ZkNsYXNzOltOU0RpY3Rpb25hcnkgY2xhc3NdXSkKLSAgICAgICAgICAgIF9wcml2YXRlLT52YWx1 ZXMgPSBbdmFsdWVzIG11dGFibGVDb3B5XTsgLy8gZW5zdXJlIGRpY3Rpb25hcnkgaXMgbXV0YWJs ZQorICAgICAgICAgICAgX3ByaXZhdGUtPnZhbHVlcy5hZG9wdE5TKFt2YWx1ZXMgbXV0YWJsZUNv cHldKTsgLy8gZW5zdXJlIGRpY3Rpb25hcnkgaXMgbXV0YWJsZQogCi0gICAgICAgIExPRyhFbmNv ZGluZywgIklkZW50aWZpZXIgPSAlQCwgVmFsdWVzID0gJUBcbiIsIF9wcml2YXRlLT5pZGVudGlm aWVyLCBfcHJpdmF0ZS0+dmFsdWVzKTsKKyAgICAgICAgTE9HKEVuY29kaW5nLCAiSWRlbnRpZmll ciA9ICVALCBWYWx1ZXMgPSAlQFxuIiwgX3ByaXZhdGUtPmlkZW50aWZpZXIuZ2V0KCksIF9wcml2 YXRlLT52YWx1ZXMuZ2V0KCkpOwogICAgIH0gQGNhdGNoKGlkKSB7CiAgICAgICAgIFtzZWxmIHJl bGVhc2VdOwogICAgICAgICByZXR1cm4gbmlsOwpAQCAtMjcwLDEyICsyNjMsMTIgQEAgc3RhdGlj IFdlYkNhY2hlTW9kZWwgY2FjaGVNb2RlbEZvck1haW5CdW5kbGUodm9pZCkKIAogICAgIC8vIElm IHdlIGxvYWQgYSBuaWIgbXVsdGlwbGUgdGltZXMsIG9yIGhhdmUgaW5zdGFuY2VzIGluIG11bHRp cGxlCiAgICAgLy8gbmlicyB3aXRoIHRoZSBzYW1lIG5hbWUsIHRoZSBmaXJzdCBndXkgdXAgd2lu cy4KLSAgICBXZWJQcmVmZXJlbmNlcyAqaW5zdGFuY2UgPSBbW3NlbGYgY2xhc3NdIF9nZXRJbnN0 YW5jZUZvcklkZW50aWZpZXI6X3ByaXZhdGUtPmlkZW50aWZpZXJdOworICAgIFdlYlByZWZlcmVu Y2VzICppbnN0YW5jZSA9IFtbc2VsZiBjbGFzc10gX2dldEluc3RhbmNlRm9ySWRlbnRpZmllcjpf cHJpdmF0ZS0+aWRlbnRpZmllci5nZXQoKV07CiAgICAgaWYgKGluc3RhbmNlKSB7CiAgICAgICAg IFtzZWxmIHJlbGVhc2VdOwogICAgICAgICBzZWxmID0gW2luc3RhbmNlIHJldGFpbl07CiAgICAg fSBlbHNlIHsKLSAgICAgICAgW1tzZWxmIGNsYXNzXSBfc2V0SW5zdGFuY2U6c2VsZiBmb3JJZGVu dGlmaWVyOl9wcml2YXRlLT5pZGVudGlmaWVyXTsKKyAgICAgICAgW1tzZWxmIGNsYXNzXSBfc2V0 SW5zdGFuY2U6c2VsZiBmb3JJZGVudGlmaWVyOl9wcml2YXRlLT5pZGVudGlmaWVyLmdldCgpXTsK ICAgICB9CiAKICAgICByZXR1cm4gc2VsZjsKQEAgLTI4NCwxNSArMjc3LDE1IEBAIHN0YXRpYyBX ZWJDYWNoZU1vZGVsIGNhY2hlTW9kZWxGb3JNYWluQnVuZGxlKHZvaWQpCiAtICh2b2lkKWVuY29k ZVdpdGhDb2RlcjooTlNDb2RlciAqKWVuY29kZXIKIHsKICAgICBpZiAoW2VuY29kZXIgYWxsb3dz S2V5ZWRDb2RpbmddKXsKLSAgICAgICAgW2VuY29kZXIgZW5jb2RlT2JqZWN0Ol9wcml2YXRlLT5p ZGVudGlmaWVyIGZvcktleTpAIklkZW50aWZpZXIiXTsKLSAgICAgICAgW2VuY29kZXIgZW5jb2Rl T2JqZWN0Ol9wcml2YXRlLT52YWx1ZXMgZm9yS2V5OkAiVmFsdWVzIl07Ci0gICAgICAgIExPRyAo RW5jb2RpbmcsICJJZGVudGlmaWVyID0gJUAsIFZhbHVlcyA9ICVAXG4iLCBfcHJpdmF0ZS0+aWRl bnRpZmllciwgX3ByaXZhdGUtPnZhbHVlcyk7CisgICAgICAgIFtlbmNvZGVyIGVuY29kZU9iamVj dDpfcHJpdmF0ZS0+aWRlbnRpZmllci5nZXQoKSBmb3JLZXk6QCJJZGVudGlmaWVyIl07CisgICAg ICAgIFtlbmNvZGVyIGVuY29kZU9iamVjdDpfcHJpdmF0ZS0+dmFsdWVzLmdldCgpIGZvcktleTpA IlZhbHVlcyJdOworICAgICAgICBMT0cgKEVuY29kaW5nLCAiSWRlbnRpZmllciA9ICVALCBWYWx1 ZXMgPSAlQFxuIiwgX3ByaXZhdGUtPmlkZW50aWZpZXIuZ2V0KCksIF9wcml2YXRlLT52YWx1ZXMu Z2V0KCkpOwogICAgIH0KICAgICBlbHNlIHsKICAgICAgICAgaW50IHZlcnNpb24gPSBXZWJQcmVm ZXJlbmNlc1ZlcnNpb247CiAgICAgICAgIFtlbmNvZGVyIGVuY29kZVZhbHVlT2ZPYmpDVHlwZTpA ZW5jb2RlKGludCkgYXQ6JnZlcnNpb25dOwotICAgICAgICBbZW5jb2RlciBlbmNvZGVPYmplY3Q6 X3ByaXZhdGUtPmlkZW50aWZpZXJdOwotICAgICAgICBbZW5jb2RlciBlbmNvZGVPYmplY3Q6X3By aXZhdGUtPnZhbHVlc107CisgICAgICAgIFtlbmNvZGVyIGVuY29kZU9iamVjdDpfcHJpdmF0ZS0+ aWRlbnRpZmllci5nZXQoKV07CisgICAgICAgIFtlbmNvZGVyIGVuY29kZU9iamVjdDpfcHJpdmF0 ZS0+dmFsdWVzLmdldCgpXTsKICAgICB9CiB9CiAKQEAgLTQxOCwxOSArNDExLDE5IEBAIHN0YXRp YyBXZWJDYWNoZU1vZGVsIGNhY2hlTW9kZWxGb3JNYWluQnVuZGxlKHZvaWQpCiAKIC0gKHZvaWQp ZGVhbGxvYwogewotICAgIFtfcHJpdmF0ZSByZWxlYXNlXTsKKyAgICBkZWxldGUgX3ByaXZhdGU7 CiAgICAgW3N1cGVyIGRlYWxsb2NdOwogfQogCiAtIChOU1N0cmluZyAqKWlkZW50aWZpZXIKIHsK LSAgICByZXR1cm4gX3ByaXZhdGUtPmlkZW50aWZpZXI7CisgICAgcmV0dXJuIF9wcml2YXRlLT5p ZGVudGlmaWVyLmdldCgpOwogfQogCiAtIChpZClfdmFsdWVGb3JLZXk6KE5TU3RyaW5nICopa2V5 CiB7CiAgICAgTlNTdHJpbmcgKl9rZXkgPSBLRVkoa2V5KTsKLSAgICBpZCBvID0gW19wcml2YXRl LT52YWx1ZXMgb2JqZWN0Rm9yS2V5Ol9rZXldOworICAgIGlkIG8gPSBbX3ByaXZhdGUtPnZhbHVl cy5nZXQoKSBvYmplY3RGb3JLZXk6X2tleV07CiAgICAgaWYgKG8pCiAgICAgICAgIHJldHVybiBv OwogICAgIG8gPSBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBvYmplY3RG b3JLZXk6X2tleV07CkBAIC00NTAsNyArNDQzLDcgQEAgc3RhdGljIFdlYkNhY2hlTW9kZWwgY2Fj aGVNb2RlbEZvck1haW5CdW5kbGUodm9pZCkKICAgICBpZiAoW1tzZWxmIF9zdHJpbmdWYWx1ZUZv cktleTprZXldIGlzRXF1YWxUb1N0cmluZzp2YWx1ZV0pCiAgICAgICAgIHJldHVybjsKICAgICBO U1N0cmluZyAqX2tleSA9IEtFWShrZXkpOwotICAgIFtfcHJpdmF0ZS0+dmFsdWVzIHNldE9iamVj dDp2YWx1ZSBmb3JLZXk6X2tleV07CisgICAgW19wcml2YXRlLT52YWx1ZXMuZ2V0KCkgc2V0T2Jq ZWN0OnZhbHVlIGZvcktleTpfa2V5XTsKICAgICBpZiAoX3ByaXZhdGUtPmF1dG9zYXZlcykKICAg ICAgICAgW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gc2V0T2JqZWN0OnZh bHVlIGZvcktleTpfa2V5XTsKICAgICBbc2VsZiBfcG9zdFByZWZlcmVuY2VzQ2hhbmdlZE5vdGlm aWNhdGlvbl07CkBAIC00NjcsNyArNDYwLDcgQEAgc3RhdGljIFdlYkNhY2hlTW9kZWwgY2FjaGVN b2RlbEZvck1haW5CdW5kbGUodm9pZCkKICAgICBpZiAoW3NlbGYgX2ludGVnZXJWYWx1ZUZvcktl eTprZXldID09IHZhbHVlKQogICAgICAgICByZXR1cm47CiAgICAgTlNTdHJpbmcgKl9rZXkgPSBL RVkoa2V5KTsKLSAgICBbX3ByaXZhdGUtPnZhbHVlcyBfd2Via2l0X3NldEludDp2YWx1ZSBmb3JL ZXk6X2tleV07CisgICAgW19wcml2YXRlLT52YWx1ZXMuZ2V0KCkgX3dlYmtpdF9zZXRJbnQ6dmFs dWUgZm9yS2V5Ol9rZXldOwogICAgIGlmIChfcHJpdmF0ZS0+YXV0b3NhdmVzKQogICAgICAgICBb W05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBzZXRJbnRlZ2VyOnZhbHVlIGZv cktleTpfa2V5XTsKICAgICBbc2VsZiBfcG9zdFByZWZlcmVuY2VzQ2hhbmdlZE5vdGlmaWNhdGlv bl07CkBAIC00ODQsNyArNDc3LDcgQEAgc3RhdGljIFdlYkNhY2hlTW9kZWwgY2FjaGVNb2RlbEZv ck1haW5CdW5kbGUodm9pZCkKICAgICBpZiAoW3NlbGYgX2Zsb2F0VmFsdWVGb3JLZXk6a2V5XSA9 PSB2YWx1ZSkKICAgICAgICAgcmV0dXJuOwogICAgIE5TU3RyaW5nICpfa2V5ID0gS0VZKGtleSk7 Ci0gICAgW19wcml2YXRlLT52YWx1ZXMgX3dlYmtpdF9zZXRGbG9hdDp2YWx1ZSBmb3JLZXk6X2tl eV07CisgICAgW19wcml2YXRlLT52YWx1ZXMuZ2V0KCkgX3dlYmtpdF9zZXRGbG9hdDp2YWx1ZSBm b3JLZXk6X2tleV07CiAgICAgaWYgKF9wcml2YXRlLT5hdXRvc2F2ZXMpCiAgICAgICAgIFtbTlNV c2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIHNldEZsb2F0OnZhbHVlIGZvcktleTpf a2V5XTsKICAgICBbc2VsZiBfcG9zdFByZWZlcmVuY2VzQ2hhbmdlZE5vdGlmaWNhdGlvbl07CkBA IC01MDAsNyArNDkzLDcgQEAgc3RhdGljIFdlYkNhY2hlTW9kZWwgY2FjaGVNb2RlbEZvck1haW5C dW5kbGUodm9pZCkKICAgICBpZiAoW3NlbGYgX2Jvb2xWYWx1ZUZvcktleTprZXldID09IHZhbHVl KQogICAgICAgICByZXR1cm47CiAgICAgTlNTdHJpbmcgKl9rZXkgPSBLRVkoa2V5KTsKLSAgICBb X3ByaXZhdGUtPnZhbHVlcyBfd2Via2l0X3NldEJvb2w6dmFsdWUgZm9yS2V5Ol9rZXldOworICAg IFtfcHJpdmF0ZS0+dmFsdWVzLmdldCgpIF93ZWJraXRfc2V0Qm9vbDp2YWx1ZSBmb3JLZXk6X2tl eV07CiAgICAgaWYgKF9wcml2YXRlLT5hdXRvc2F2ZXMpCiAgICAgICAgIFtbTlNVc2VyRGVmYXVs dHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIHNldEJvb2w6dmFsdWUgZm9yS2V5Ol9rZXldOwogICAg IFtzZWxmIF9wb3N0UHJlZmVyZW5jZXNDaGFuZ2VkTm90aWZpY2F0aW9uXTsKQEAgLTUxNyw3ICs1 MTAsNyBAQCBzdGF0aWMgV2ViQ2FjaGVNb2RlbCBjYWNoZU1vZGVsRm9yTWFpbkJ1bmRsZSh2b2lk KQogICAgIGlmIChbc2VsZiBfbG9uZ0xvbmdWYWx1ZUZvcktleTprZXldID09IHZhbHVlKQogICAg ICAgICByZXR1cm47CiAgICAgTlNTdHJpbmcgKl9rZXkgPSBLRVkoa2V5KTsKLSAgICBbX3ByaXZh dGUtPnZhbHVlcyBfd2Via2l0X3NldExvbmdMb25nOnZhbHVlIGZvcktleTpfa2V5XTsKKyAgICBb X3ByaXZhdGUtPnZhbHVlcy5nZXQoKSBfd2Via2l0X3NldExvbmdMb25nOnZhbHVlIGZvcktleTpf a2V5XTsKICAgICBpZiAoX3ByaXZhdGUtPmF1dG9zYXZlcykKICAgICAgICAgW1tOU1VzZXJEZWZh dWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gc2V0T2JqZWN0OltOU051bWJlciBudW1iZXJXaXRo TG9uZ0xvbmc6dmFsdWVdIGZvcktleTpfa2V5XTsKICAgICBbc2VsZiBfcG9zdFByZWZlcmVuY2Vz Q2hhbmdlZE5vdGlmaWNhdGlvbl07CkBAIC01MzQsNyArNTI3LDcgQEAgc3RhdGljIFdlYkNhY2hl TW9kZWwgY2FjaGVNb2RlbEZvck1haW5CdW5kbGUodm9pZCkKICAgICBpZiAoW3NlbGYgX3Vuc2ln bmVkTG9uZ0xvbmdWYWx1ZUZvcktleTprZXldID09IHZhbHVlKQogICAgICAgICByZXR1cm47CiAg ICAgTlNTdHJpbmcgKl9rZXkgPSBLRVkoa2V5KTsKLSAgICBbX3ByaXZhdGUtPnZhbHVlcyBfd2Vi a2l0X3NldFVuc2lnbmVkTG9uZ0xvbmc6dmFsdWUgZm9yS2V5Ol9rZXldOworICAgIFtfcHJpdmF0 ZS0+dmFsdWVzLmdldCgpIF93ZWJraXRfc2V0VW5zaWduZWRMb25nTG9uZzp2YWx1ZSBmb3JLZXk6 X2tleV07CiAgICAgaWYgKF9wcml2YXRlLT5hdXRvc2F2ZXMpCiAgICAgICAgIFtbTlNVc2VyRGVm YXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIHNldE9iamVjdDpbTlNOdW1iZXIgbnVtYmVyV2l0 aFVuc2lnbmVkTG9uZ0xvbmc6dmFsdWVdIGZvcktleTpfa2V5XTsKICAgICBbc2VsZiBfcG9zdFBy ZWZlcmVuY2VzQ2hhbmdlZE5vdGlmaWNhdGlvbl07Cg==