130978 2014-03-31 12:23:33 -0700 [GTK] Readonly attributes installed as readwrite in GObject DOM bindings 2014-04-01 00:28:39 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mrobinson mrobinson alecflett cdumez cgarcia commit-queue jsbell oldest_to_newest 995935 0 mrobinson 2014-03-31 12:23:33 -0700 We get this error when generating the GIR file: GLib-GObject-CRITICAL **: g_object_class_install_property: assertion 'class->set_property != NULL' failed This happens because even though an attribute is read-only, it is installed as read-write. This is a problem when there are no other read-write attributes and the code generator does not generate a set_property vmethod. 995936 1 228185 mrobinson 2014-03-31 12:30:03 -0700 Created attachment 228185 Patch 996152 2 228185 cgarcia 2014-04-01 00:10:03 -0700 Comment on attachment 228185 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228185&action=review Thanks for fixing this, I always wondered where that warning came from. Please, consider my comments before landing. > Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm:424 > +sub IsPropertyWriteable { > + my $property = shift; > + if ($property->isReadOnly) { > + return 0; > + } I know we are not checking if the attribute is skipped, because this is always called for readable properties, but it's confusing, because the name IsPropertyWriteable, like IsPropertyReadable, sound like it could receive any property to check. Since all properties are readable in DOM, we consider non readable properties the ones we are skipping for other reasons, which is also confusing. So, I would remove IsPropertyReadable and use SkipAttribute directly, so that it's more obvious that IsPropertyWriteable is called only for non skipped properties. > Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm:640 > + my @attributes = $interface->attributes; > + my @readableProperties = grep { IsPropertyReadable($_) } @{$interface->attributes}; You are adding @attributes but using @{$interface->attributes} directly here. I would use only attributes as the list of properties not skipped, and then use those only. > Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm:641 > + my @writeableProperties = grep { IsPropertyWriteable($_) } @readableProperties;; double trailing ; 996162 3 mrobinson 2014-04-01 00:28:28 -0700 (In reply to comment #2) > (From update of attachment 228185 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=228185&action=review > > Thanks for fixing this, I always wondered where that warning came from. Please, consider my comments before landing. > > > Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm:424 > > +sub IsPropertyWriteable { > > + my $property = shift; > > + if ($property->isReadOnly) { > > + return 0; > > + } > > I know we are not checking if the attribute is skipped, because this is always called for readable properties, but it's confusing, because the name IsPropertyWriteable, like IsPropertyReadable, sound like it could receive any property to check. Since all properties are readable in DOM, we consider non readable properties the ones we are skipping for other reasons, which is also confusing. So, I would remove IsPropertyReadable and use SkipAttribute directly, so that it's more obvious that IsPropertyWriteable is called only for non skipped properties. Okay. I will make IsPropertyReadable and IsPropertyWriteable completely independent. IsPropertyWriteable will return false if IsPropertyReadable returns false. I'll keep IsPropertyReadable, because I think it's a bit clearer what's going on and if we need to add more conditions everything should work without changes except to IsPropertyReadable. > > Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm:640 > > + my @attributes = $interface->attributes; > > + my @readableProperties = grep { IsPropertyReadable($_) } @{$interface->attributes}; > > You are adding @attributes but using @{$interface->attributes} directly here. I would use only attributes as the list of properties not skipped, and then use those only. I'll get rid of @attributes. It was left over from a previous version. 996163 4 mrobinson 2014-04-01 00:28:39 -0700 Committed r166568: <http://trac.webkit.org/changeset/166568> 228185 2014-03-31 12:30:03 -0700 2014-04-01 00:10:01 -0700 Patch bug-130978-20140331122943.patch text/plain 31544 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2NDU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjFmZjc5ZGJhYjk2MjVj NjBmOWIzMTU0ZWE5ZjFjYzMyNDhlMjA0My4uYjJiMmQxZTcxYjUyYzk4NWE1NmY4ZWNmNGI5ODk0 YWNiZWZiNjM0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE0LTAzLTMxICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBSZWFk b25seSBhdHRyaWJ1dGVzIGluc3RhbGxlZCBhcyByZWFkd3JpdGUgaW4gR09iamVjdCBET00gYmlu ZGluZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEz MDk3OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVu aWZ5IGhvdyB3ZSBkZWNpZGUgaWYgYW4gYXR0cmlidXRlIGlzIHJlYWRhYmxlIG9yIHdyaXRlYWJs ZSBhbmQgaW1wcm92ZSB0aGUgY29kZS4KKyAgICAgICAgVGhpcyByZXN1bHRzIGluIHNvbWUgYXR0 cmlidXRlcyBub3cgYmVpbmcgbWFya2VkIGFzIHJlYWQtb25seSB3aGljaCBkaWRuJ3QgaGF2ZQor ICAgICAgICBjb3JyZXNwb25kaW5nIGNhc2Ugc3RhdGVtZW50cyBpbiB0aGUgc2V0X3Byb3BlcnR5 IHN3aXRjaCBzdGF0ZW1lbnRzIGFuZCBhbHNvIGNvcnJlY3RseQorICAgICAgICBpbnN0YWxscyBz ZXRfcHJvcGVydHkgc3VwcG9ydCBmb3Igc29tZSBtb3JlIFBPRCB0eXBlcy4KKworICAgICAgICAq IGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckdPYmplY3QucG06CisgICAgICAgIChJc1By b3BlcnR5UmVhZGFibGUpOiBBZGRlZCB0aGlzIGhlbHBlciB0byBzaW1wbGlmeSBkZWNpZGluZyBp ZiBhbiBhdHRyaWJ1dGUgaXMgcmVhZGFibGUuCisgICAgICAgIChJc1Byb3BlcnR5V3JpdGVhYmxl KTogQWRkZWQgdGhpcyBoZWxwZXIgdG8gc2ltcGxpZnkgZGVjaWRpbmcgaWYgYW4gYXR0cmlidXRl IGlzIHdyaXRlYWJsZS4gQWxzbworICAgICAgICB1cGRhdGUgdGhlIGxpc3Qgb2YgdHlwZXMgdG8g cmVmbGVjdCB0aGUgZnVsbCBsaXN0IG9mIHR5cGVzIHdlIGNhbiBnZW5lcmF0ZSBzZXR0ZXJzIGZv ci4KKyAgICAgICAgKEdlbmVyYXRlUHJvcGVydHkpOiBVc2UgdGhlIElzUHJvcGVydHlXcml0ZWFi bGUgaGVscGVyIGluc3RlYWQgb2YgY2hlY2tpbmcgd2hldGhlciB0aGUgYXR0cmlidXRlIGlzIHJl YWQtb25seS4KKyAgICAgICAgQWxzbyBmaXggZ2VuZXJhdGlvbiBvZiB0aGUgYmx1cmIgYnkgdXNp bmcgJG11dGFibGVTdHJpbmcgaW5zdGVhZCBvZiAkbXV0YWJsZVN0cmluZ2NvbnN0IHdoaWNoIGlz bid0IHVzZWQuCisgICAgICAgIChHZW5lcmF0ZVByb3BlcnRpZXMpOiBVc2UgZ3JlcCBhbmQgdGhl IG5ldyBoZWxwZXJzIHRvIHNpbXBsaWZ5IHRoZSBjb2RlLgorICAgICAgICAoR2V0UmVhZGFibGVQ cm9wZXJ0aWVzKTogRGVsZXRlZC4KKyAgICAgICAgKEdldFdyaXRlYWJsZVByb3BlcnRpZXMpOiBE ZWxldGVkLgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9HT2JqZWN0OiBVcGRhdGUg cmVzdWx0cworCiAyMDE0LTAzLTI5ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgU3VicGl4ZWwgcmVuZGVyaW5nOiBNYWtlIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0lt YWdlQnVmZmVyKiBmdW5jdGlvbnMgZmxvYXQgYmFzZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JHT2JqZWN0LnBtIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yR09iamVjdC5wbQppbmRleCBmZTdh OGZiY2FjODQzYWQ2Y2QzNTZkZDJiMjhlNmZhMzIwYjQwNjdmLi44NGExOGQwMjU5Y2RlZDJlNDk4 MjczNTlhZjFlNDM0NjNhMGQ0MzlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JHT2JqZWN0LnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckdPYmplY3QucG0KQEAgLTQxMiw0MSArNDEyLDQw IEBAIHN1YiBJc0dET01DbGFzc1R5cGUgewogICAgIHJldHVybiAxOwogfQogCi1zdWIgR2V0UmVh ZGFibGVQcm9wZXJ0aWVzIHsKLSAgICBteSAkcHJvcGVydGllcyA9IHNoaWZ0Oworc3ViIElzUHJv cGVydHlSZWFkYWJsZSB7CisgICAgbXkgJHByb3BlcnR5ID0gc2hpZnQ7CisgICAgcmV0dXJuICFT a2lwQXR0cmlidXRlKCRwcm9wZXJ0eSk7Cit9CiAKLSAgICBteSBAcmVzdWx0ID0gKCk7CitzdWIg SXNQcm9wZXJ0eVdyaXRlYWJsZSB7CisgICAgbXkgJHByb3BlcnR5ID0gc2hpZnQ7CisgICAgaWYg KCRwcm9wZXJ0eS0+aXNSZWFkT25seSkgeworICAgICAgICByZXR1cm4gMDsKKyAgICB9CiAKLSAg ICBmb3JlYWNoIG15ICRwcm9wZXJ0eSAoQHskcHJvcGVydGllc30pIHsKLSAgICAgICAgaWYgKCFT a2lwQXR0cmlidXRlKCRwcm9wZXJ0eSkpIHsKLSAgICAgICAgICAgIHB1c2goQHJlc3VsdCwgJHBy b3BlcnR5KTsKLSAgICAgICAgfQorICAgIG15ICRndHlwZSA9IEdldEdWYWx1ZVR5cGVOYW1lKCRw cm9wZXJ0eS0+c2lnbmF0dXJlLT50eXBlKTsKKyAgICBteSAkaGFzR3R5cGVTaWduYXR1cmUgPSAk Z3R5cGUgZXEgImJvb2xlYW4iIHx8ICRndHlwZSBlcSAiZmxvYXQiIHx8ICRndHlwZSBlcSAiZG91 YmxlIiB8fAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICRndHlwZSBlcSAiaW50NjQiIHx8 ICRndHlwZSBlcSAidWludDY0IiB8fAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICRndHlw ZSBlcSAibG9uZyIgfHwgJGd0eXBlIGVxICJ1bG9uZyIgfHwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAkZ3R5cGUgZXEgImludCIgfHwgJGd0eXBlIGVxICJ1aW50IiB8fAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICRndHlwZSBlcSAic2hvcnQiIHx8ICRndHlwZSBlcSAidXNob3J0 IiB8fAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICRndHlwZSBlcSAiaW50OCIgfHwgJGd0 eXBlIGVxICJ1aW50OCIgfHwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAkZ3R5cGUgZXEg ImNoYXIiIHx8ICRndHlwZSBlcSAidWNoYXIiIHx8CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgJGd0eXBlIGVxICJzdHJpbmciOworICAgIGlmICghJGhhc0d0eXBlU2lnbmF0dXJlKSB7Cisg ICAgICAgIHJldHVybiAwOwogICAgIH0KIAotICAgIHJldHVybiBAcmVzdWx0OwotfQorICAgICMg RklYTUU6IFdlIGFyZSBub3QgZ2VuZXJhdGluZyBzZXR0ZXJzIGZvciAnUmVwbGFjZWFibGUnIGF0 dHJpYnV0ZXMgbm93LCBidXQgd2Ugc2hvdWxkIHNvbWVob3cuCisgICAgaWYgKCRwcm9wZXJ0eS0+ c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiUmVwbGFjZWFibGUifSkgeworICAgICAg ICByZXR1cm4gMDsKKyAgICB9CiAKLXN1YiBHZXRXcml0ZWFibGVQcm9wZXJ0aWVzIHsKLSAgICBt eSAkcHJvcGVydGllcyA9IHNoaWZ0OwotICAgIG15IEByZXN1bHQgPSAoKTsKLQotICAgIGZvcmVh Y2ggbXkgJHByb3BlcnR5IChAeyRwcm9wZXJ0aWVzfSkgewotICAgICAgICBteSAkZ3R5cGUgPSBH ZXRHVmFsdWVUeXBlTmFtZSgkcHJvcGVydHktPnNpZ25hdHVyZS0+dHlwZSk7Ci0gICAgICAgIG15 ICRoYXNHdHlwZVNpZ25hdHVyZSA9ICgkZ3R5cGUgZXEgImJvb2xlYW4iIHx8ICRndHlwZSBlcSAi ZmxvYXQiIHx8ICRndHlwZSBlcSAiZG91YmxlIiB8fAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgJGd0eXBlIGVxICJ1aW50NjQiIHx8ICRndHlwZSBlcSAidWxvbmciIHx8ICRndHlw ZSBlcSAibG9uZyIgfHwgCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAkZ3R5cGUg ZXEgInVpbnQiIHx8ICRndHlwZSBlcSAidXNob3J0IiB8fCAkZ3R5cGUgZXEgImludDgiIHx8Ci0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAkZ3R5cGUgZXEgInVpbnQ4IiB8fCAkZ3R5 cGUgZXEgInVjaGFyIiB8fCAkZ3R5cGUgZXEgImNoYXIiIHx8Ci0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAkZ3R5cGUgZXEgInN0cmluZyIpOwotICAgICAgICAjIEZJWE1FOiBXZSBh cmUgbm90IGdlbmVyYXRpbmcgc2V0dGVycyBmb3IgJ1JlcGxhY2VhYmxlJwotICAgICAgICAjIGF0 dHJpYnV0ZXMgbm93LCBidXQgd2Ugc2hvdWxkIHNvbWVob3cuCi0gICAgICAgIG15ICRyZXBsYWNl YWJsZSA9ICRwcm9wZXJ0eS0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiUmVwbGFj ZWFibGUifTsKLSAgICAgICAgbXkgJGN1c3RvbSA9ICRwcm9wZXJ0eS0+c2lnbmF0dXJlLT5leHRl bmRlZEF0dHJpYnV0ZXMtPnsiQ3VzdG9tU2V0dGVyIn07Ci0gICAgICAgIGlmICghJHByb3BlcnR5 LT5pc1JlYWRPbmx5ICYmICRoYXNHdHlwZVNpZ25hdHVyZSAmJiAhJHJlcGxhY2VhYmxlICYmICEk Y3VzdG9tKSB7Ci0gICAgICAgICAgICBwdXNoKEByZXN1bHQsICRwcm9wZXJ0eSk7Ci0gICAgICAg IH0KKyAgICBpZiAoJHByb3BlcnR5LT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJD dXN0b21TZXR0ZXIifSkgeworICAgICAgICByZXR1cm4gMDsKICAgICB9CiAKLSAgICByZXR1cm4g QHJlc3VsdDsKKyAgICByZXR1cm4gMTsKIH0KIAogc3ViIEdlbmVyYXRlQ29uZGl0aW9uYWxXYXJu aW5nCkBAIC01MDgsMTUgKzUwNywxNSBAQCBzdWIgR2VuZXJhdGVQcm9wZXJ0eSB7CiAKICAgICBt eSAkZ3R5cGUgPSBHZXRHVmFsdWVUeXBlTmFtZSgkcHJvcFR5cGUpOwogICAgIG15ICRncGFyYW1m bGFnID0gIldFQktJVF9QQVJBTV9SRUFEQUJMRSI7Ci0gICAgbXkgJHdyaXRlYWJsZSA9ICEkYXR0 cmlidXRlLT5pc1JlYWRPbmx5OworICAgIG15ICR3cml0ZWFibGUgPSBJc1Byb3BlcnR5V3JpdGVh YmxlKCRhdHRyaWJ1dGUpOwogCiAgICAgbXkgJG11dGFibGVTdHJpbmcgPSAicmVhZC1vbmx5IjsK ICAgICBteSAkaGFzQ3VzdG9tU2V0dGVyID0gJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5leHRlbmRl ZEF0dHJpYnV0ZXMtPnsiQ3VzdG9tU2V0dGVyIn07CiAgICAgaWYgKCR3cml0ZWFibGUgJiYgJGhh c0N1c3RvbVNldHRlcikgewotICAgICAgICAkbXV0YWJsZVN0cmluZ2NvbnN0ID0gInJlYWQtb25s eSAoZHVlIHRvIGN1c3RvbSBmdW5jdGlvbnMgbmVlZGVkIGluIHdlYmtpdGRvbSkiOworICAgICAg ICAkbXV0YWJsZVN0cmluZyA9ICJyZWFkLW9ubHkgKGR1ZSB0byBjdXN0b20gZnVuY3Rpb25zIG5l ZWRlZCBpbiB3ZWJraXRkb20pIjsKICAgICB9IGVsc2lmICgkd3JpdGVhYmxlKSB7CiAgICAgICAg ICRncGFyYW1mbGFnID0gIldFQktJVF9QQVJBTV9SRUFEV1JJVEUiOwotICAgICAgICAkbXV0YWJs ZVN0cmluZ2NvbnN0ID0gInJlYWQtd3JpdGUiOworICAgICAgICAkbXV0YWJsZVN0cmluZyA9ICJy ZWFkLXdyaXRlIjsKICAgICB9CiAKICAgICBteSAkY29udmVydEZ1bmN0aW9uID0gIiI7CkBAIC02 MzcsOCArNjM2LDkgQEAgc3ViIEdlbmVyYXRlUHJvcGVydGllcyB7CiAKICAgICAjIFByb3BlcnRp ZXMKICAgICBteSAkaW1wbENvbnRlbnQgPSAiIjsKLSAgICBteSBAcmVhZGFibGVQcm9wZXJ0aWVz ID0gR2V0UmVhZGFibGVQcm9wZXJ0aWVzKCRpbnRlcmZhY2UtPmF0dHJpYnV0ZXMpOwotICAgIG15 IEB3cml0ZWFibGVQcm9wZXJ0aWVzID0gR2V0V3JpdGVhYmxlUHJvcGVydGllcyhcQHJlYWRhYmxl UHJvcGVydGllcyk7CisgICAgbXkgQGF0dHJpYnV0ZXMgPSAkaW50ZXJmYWNlLT5hdHRyaWJ1dGVz OworICAgIG15IEByZWFkYWJsZVByb3BlcnRpZXMgPSBncmVwIHsgSXNQcm9wZXJ0eVJlYWRhYmxl KCRfKSB9IEB7JGludGVyZmFjZS0+YXR0cmlidXRlc307CisgICAgbXkgQHdyaXRlYWJsZVByb3Bl cnRpZXMgPSBncmVwIHsgSXNQcm9wZXJ0eVdyaXRlYWJsZSgkXykgfSBAcmVhZGFibGVQcm9wZXJ0 aWVzOzsKICAgICBteSAkbnVtUHJvcGVydGllcyA9IHNjYWxhciBAcmVhZGFibGVQcm9wZXJ0aWVz OwogCiAgICAgIyBQcm9wZXJ0aWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL3Rlc3QvR09iamVjdC9XZWJLaXRET01UZXN0SW50ZXJmYWNlLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9HT2JqZWN0L1dlYktpdERPTVRlc3RJbnRl cmZhY2UuY3BwCmluZGV4IDc5ZDA4NDExOGIxMTMzNWQ3ODY0Zjk2MWQ5MGJjZjE3ZTQ4Yjg5N2Mu LjI4YjM0NGMxNWRmOTcxMzhlNmNkY2I5Nzg0NGRkZThmN2IxNWRlZGQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9HT2JqZWN0L1dlYktpdERPTVRlc3RJ bnRlcmZhY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9H T2JqZWN0L1dlYktpdERPTVRlc3RJbnRlcmZhY2UuY3BwCkBAIC0yNzksNyArMjc5LDcgQEAgc3Rh dGljIHZvaWQgd2Via2l0X2RvbV90ZXN0X2ludGVyZmFjZV9jbGFzc19pbml0KFdlYktpdERPTVRl c3RJbnRlcmZhY2VDbGFzcyogcmUKICAgICAgICAgZ19wYXJhbV9zcGVjX3N0cmluZygKICAgICAg ICAgICAgICJpbXBsZW1lbnRzLXN0cjIiLAogICAgICAgICAgICAgIlRlc3RJbnRlcmZhY2U6aW1w bGVtZW50cy1zdHIyIiwKLSAgICAgICAgICAgICJyZWFkLW9ubHkgZ2NoYXIqIFRlc3RJbnRlcmZh Y2U6aW1wbGVtZW50cy1zdHIyIiwKKyAgICAgICAgICAgICJyZWFkLXdyaXRlIGdjaGFyKiBUZXN0 SW50ZXJmYWNlOmltcGxlbWVudHMtc3RyMiIsCiAgICAgICAgICAgICAiIiwKICAgICAgICAgICAg IFdFQktJVF9QQVJBTV9SRUFEV1JJVEUpKTsKIApAQCAtMjkxLDcgKzI5MSw3IEBAIHN0YXRpYyB2 b2lkIHdlYmtpdF9kb21fdGVzdF9pbnRlcmZhY2VfY2xhc3NfaW5pdChXZWJLaXRET01UZXN0SW50 ZXJmYWNlQ2xhc3MqIHJlCiAgICAgICAgICAgICAiVGVzdEludGVyZmFjZTppbXBsZW1lbnRzLW5v ZGUiLAogICAgICAgICAgICAgInJlYWQtb25seSBXZWJLaXRET01Ob2RlKiBUZXN0SW50ZXJmYWNl OmltcGxlbWVudHMtbm9kZSIsCiAgICAgICAgICAgICBXRUJLSVRfVFlQRV9ET01fTk9ERSwKLSAg ICAgICAgICAgIFdFQktJVF9QQVJBTV9SRUFEV1JJVEUpKTsKKyAgICAgICAgICAgIFdFQktJVF9Q QVJBTV9SRUFEQUJMRSkpOwogCiAgICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9wcm9wZXJ0eSgK ICAgICAgICAgZ29iamVjdENsYXNzLApAQCAtMzA5LDcgKzMwOSw3IEBAIHN0YXRpYyB2b2lkIHdl YmtpdF9kb21fdGVzdF9pbnRlcmZhY2VfY2xhc3NfaW5pdChXZWJLaXRET01UZXN0SW50ZXJmYWNl Q2xhc3MqIHJlCiAgICAgICAgIGdfcGFyYW1fc3BlY19zdHJpbmcoCiAgICAgICAgICAgICAic3Vw cGxlbWVudGFsLXN0cjIiLAogICAgICAgICAgICAgIlRlc3RJbnRlcmZhY2U6c3VwcGxlbWVudGFs LXN0cjIiLAotICAgICAgICAgICAgInJlYWQtb25seSBnY2hhciogVGVzdEludGVyZmFjZTpzdXBw bGVtZW50YWwtc3RyMiIsCisgICAgICAgICAgICAicmVhZC13cml0ZSBnY2hhciogVGVzdEludGVy ZmFjZTpzdXBwbGVtZW50YWwtc3RyMiIsCiAgICAgICAgICAgICAiIiwKICAgICAgICAgICAgIFdF QktJVF9QQVJBTV9SRUFEV1JJVEUpKTsKIApAQCAtMzIxLDcgKzMyMSw3IEBAIHN0YXRpYyB2b2lk IHdlYmtpdF9kb21fdGVzdF9pbnRlcmZhY2VfY2xhc3NfaW5pdChXZWJLaXRET01UZXN0SW50ZXJm YWNlQ2xhc3MqIHJlCiAgICAgICAgICAgICAiVGVzdEludGVyZmFjZTpzdXBwbGVtZW50YWwtbm9k ZSIsCiAgICAgICAgICAgICAicmVhZC1vbmx5IFdlYktpdERPTU5vZGUqIFRlc3RJbnRlcmZhY2U6 c3VwcGxlbWVudGFsLW5vZGUiLAogICAgICAgICAgICAgV0VCS0lUX1RZUEVfRE9NX05PREUsCi0g ICAgICAgICAgICBXRUJLSVRfUEFSQU1fUkVBRFdSSVRFKSk7CisgICAgICAgICAgICBXRUJLSVRf UEFSQU1fUkVBREFCTEUpKTsKIAogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL3Rlc3QvR09iamVjdC9XZWJLaXRET01UZXN0T2JqLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9HT2JqZWN0L1dlYktpdERPTVRlc3RPYmouY3Bw CmluZGV4IGE2MGU3YzFlYWUyNjlkZWYwMWYwYTIxNzU2NjQ1ZWU3MjI3MmZlNDYuLmMxMjRiZmY4 YjM1MTMxYjUyYjc2YThmYjQ2YTdkMjlkMzVjNTIwM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9HT2JqZWN0L1dlYktpdERPTVRlc3RPYmouY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9HT2JqZWN0L1dlYktpdERP TVRlc3RPYmouY3BwCkBAIC0xNTksNiArMTU5LDEwIEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9kb21f dGVzdF9vYmpfc2V0X3Byb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3VpbnQgcHJvcGVydHlJZCwK ICAgICAgICAgY29yZVNlbGYtPnNldE9jdGV0QXR0cigoZ192YWx1ZV9nZXRfdWludDgodmFsdWUp KSk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KKyAgICBjYXNlIFBST1BfU0hPUlRfQVRUUjogewor ICAgICAgICBjb3JlU2VsZi0+c2V0U2hvcnRBdHRyKChnX3ZhbHVlX2dldF9pbnQodmFsdWUpKSk7 CisgICAgICAgIGJyZWFrOworICAgIH0KICAgICBjYXNlIFBST1BfVU5TSUdORURfU0hPUlRfQVRU UjogewogICAgICAgICBjb3JlU2VsZi0+c2V0VW5zaWduZWRTaG9ydEF0dHIoKGdfdmFsdWVfZ2V0 X3VpbnQodmFsdWUpKSk7CiAgICAgICAgIGJyZWFrOwpAQCAtMTY3LDYgKzE3MSwxMCBAQCBzdGF0 aWMgdm9pZCB3ZWJraXRfZG9tX3Rlc3Rfb2JqX3NldF9wcm9wZXJ0eShHT2JqZWN0KiBvYmplY3Qs IGd1aW50IHByb3BlcnR5SWQsCiAgICAgICAgIGNvcmVTZWxmLT5zZXRMb25nQXR0cigoZ192YWx1 ZV9nZXRfbG9uZyh2YWx1ZSkpKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQorICAgIGNhc2UgUFJP UF9MT05HX0xPTkdfQVRUUjogeworICAgICAgICBjb3JlU2VsZi0+c2V0TG9uZ0xvbmdBdHRyKChn X3ZhbHVlX2dldF9pbnQ2NCh2YWx1ZSkpKTsKKyAgICAgICAgYnJlYWs7CisgICAgfQogICAgIGNh c2UgUFJPUF9VTlNJR05FRF9MT05HX0xPTkdfQVRUUjogewogICAgICAgICBjb3JlU2VsZi0+c2V0 VW5zaWduZWRMb25nTG9uZ0F0dHIoKGdfdmFsdWVfZ2V0X3VpbnQ2NCh2YWx1ZSkpKTsKICAgICAg ICAgYnJlYWs7CkBAIC02MjYsNyArNjM0LDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X2RvbV90ZXN0 X29ial9jbGFzc19pbml0KFdlYktpdERPTVRlc3RPYmpDbGFzcyogcmVxdWVzdENsYXNzKQogICAg ICAgICBnX3BhcmFtX3NwZWNfaW50OCgKICAgICAgICAgICAgICJieXRlLWF0dHIiLAogICAgICAg ICAgICAgIlRlc3RPYmo6Ynl0ZS1hdHRyIiwKLSAgICAgICAgICAgICJyZWFkLW9ubHkgZ2ludDgg VGVzdE9iajpieXRlLWF0dHIiLAorICAgICAgICAgICAgInJlYWQtd3JpdGUgZ2ludDggVGVzdE9i ajpieXRlLWF0dHIiLAogICAgICAgICAgICAgR19NSU5JTlQ4LCBHX01BWElOVDgsIDAsCiAgICAg ICAgICAgICBXRUJLSVRfUEFSQU1fUkVBRFdSSVRFKSk7CiAKQEAgLTYzNiw3ICs2NDQsNyBAQCBz dGF0aWMgdm9pZCB3ZWJraXRfZG9tX3Rlc3Rfb2JqX2NsYXNzX2luaXQoV2ViS2l0RE9NVGVzdE9i akNsYXNzKiByZXF1ZXN0Q2xhc3MpCiAgICAgICAgIGdfcGFyYW1fc3BlY191aW50OCgKICAgICAg ICAgICAgICJvY3RldC1hdHRyIiwKICAgICAgICAgICAgICJUZXN0T2JqOm9jdGV0LWF0dHIiLAot ICAgICAgICAgICAgInJlYWQtb25seSBndWludDggVGVzdE9iajpvY3RldC1hdHRyIiwKKyAgICAg ICAgICAgICJyZWFkLXdyaXRlIGd1aW50OCBUZXN0T2JqOm9jdGV0LWF0dHIiLAogICAgICAgICAg ICAgMCwgR19NQVhVSU5UOCwgMCwKICAgICAgICAgICAgIFdFQktJVF9QQVJBTV9SRUFEV1JJVEUp KTsKIApAQCAtNjQ2LDcgKzY1NCw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9kb21fdGVzdF9vYmpf Y2xhc3NfaW5pdChXZWJLaXRET01UZXN0T2JqQ2xhc3MqIHJlcXVlc3RDbGFzcykKICAgICAgICAg Z19wYXJhbV9zcGVjX2ludCgKICAgICAgICAgICAgICJzaG9ydC1hdHRyIiwKICAgICAgICAgICAg ICJUZXN0T2JqOnNob3J0LWF0dHIiLAotICAgICAgICAgICAgInJlYWQtb25seSBnc2hvcnQgVGVz dE9iajpzaG9ydC1hdHRyIiwKKyAgICAgICAgICAgICJyZWFkLXdyaXRlIGdzaG9ydCBUZXN0T2Jq OnNob3J0LWF0dHIiLAogICAgICAgICAgICAgR19NSU5JTlQsIEdfTUFYSU5ULCAwLAogICAgICAg ICAgICAgV0VCS0lUX1BBUkFNX1JFQURXUklURSkpOwogCkBAIC02NTYsNyArNjY0LDcgQEAgc3Rh dGljIHZvaWQgd2Via2l0X2RvbV90ZXN0X29ial9jbGFzc19pbml0KFdlYktpdERPTVRlc3RPYmpD bGFzcyogcmVxdWVzdENsYXNzKQogICAgICAgICBnX3BhcmFtX3NwZWNfdWludCgKICAgICAgICAg ICAgICJ1bnNpZ25lZC1zaG9ydC1hdHRyIiwKICAgICAgICAgICAgICJUZXN0T2JqOnVuc2lnbmVk LXNob3J0LWF0dHIiLAotICAgICAgICAgICAgInJlYWQtb25seSBndXNob3J0IFRlc3RPYmo6dW5z aWduZWQtc2hvcnQtYXR0ciIsCisgICAgICAgICAgICAicmVhZC13cml0ZSBndXNob3J0IFRlc3RP Ymo6dW5zaWduZWQtc2hvcnQtYXR0ciIsCiAgICAgICAgICAgICAwLCBHX01BWFVJTlQsIDAsCiAg ICAgICAgICAgICBXRUJLSVRfUEFSQU1fUkVBRFdSSVRFKSk7CiAKQEAgLTY2Niw3ICs2NzQsNyBA QCBzdGF0aWMgdm9pZCB3ZWJraXRfZG9tX3Rlc3Rfb2JqX2NsYXNzX2luaXQoV2ViS2l0RE9NVGVz dE9iakNsYXNzKiByZXF1ZXN0Q2xhc3MpCiAgICAgICAgIGdfcGFyYW1fc3BlY19sb25nKAogICAg ICAgICAgICAgImxvbmctYXR0ciIsCiAgICAgICAgICAgICAiVGVzdE9iajpsb25nLWF0dHIiLAot ICAgICAgICAgICAgInJlYWQtb25seSBnbG9uZyBUZXN0T2JqOmxvbmctYXR0ciIsCisgICAgICAg ICAgICAicmVhZC13cml0ZSBnbG9uZyBUZXN0T2JqOmxvbmctYXR0ciIsCiAgICAgICAgICAgICBH X01JTkxPTkcsIEdfTUFYTE9ORywgMCwKICAgICAgICAgICAgIFdFQktJVF9QQVJBTV9SRUFEV1JJ VEUpKTsKIApAQCAtNjc2LDcgKzY4NCw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9kb21fdGVzdF9v YmpfY2xhc3NfaW5pdChXZWJLaXRET01UZXN0T2JqQ2xhc3MqIHJlcXVlc3RDbGFzcykKICAgICAg ICAgZ19wYXJhbV9zcGVjX2ludDY0KAogICAgICAgICAgICAgImxvbmctbG9uZy1hdHRyIiwKICAg ICAgICAgICAgICJUZXN0T2JqOmxvbmctbG9uZy1hdHRyIiwKLSAgICAgICAgICAgICJyZWFkLW9u bHkgZ2ludDY0IFRlc3RPYmo6bG9uZy1sb25nLWF0dHIiLAorICAgICAgICAgICAgInJlYWQtd3Jp dGUgZ2ludDY0IFRlc3RPYmo6bG9uZy1sb25nLWF0dHIiLAogICAgICAgICAgICAgR19NSU5JTlQ2 NCwgR19NQVhJTlQ2NCwgMCwKICAgICAgICAgICAgIFdFQktJVF9QQVJBTV9SRUFEV1JJVEUpKTsK IApAQCAtNjg2LDcgKzY5NCw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9kb21fdGVzdF9vYmpfY2xh c3NfaW5pdChXZWJLaXRET01UZXN0T2JqQ2xhc3MqIHJlcXVlc3RDbGFzcykKICAgICAgICAgZ19w YXJhbV9zcGVjX3VpbnQ2NCgKICAgICAgICAgICAgICJ1bnNpZ25lZC1sb25nLWxvbmctYXR0ciIs CiAgICAgICAgICAgICAiVGVzdE9iajp1bnNpZ25lZC1sb25nLWxvbmctYXR0ciIsCi0gICAgICAg ICAgICAicmVhZC1vbmx5IGd1aW50NjQgVGVzdE9iajp1bnNpZ25lZC1sb25nLWxvbmctYXR0ciIs CisgICAgICAgICAgICAicmVhZC13cml0ZSBndWludDY0IFRlc3RPYmo6dW5zaWduZWQtbG9uZy1s b25nLWF0dHIiLAogICAgICAgICAgICAgMCwgR19NQVhVSU5UNjQsIDAsCiAgICAgICAgICAgICBX RUJLSVRfUEFSQU1fUkVBRFdSSVRFKSk7CiAKQEAgLTY5Niw3ICs3MDQsNyBAQCBzdGF0aWMgdm9p ZCB3ZWJraXRfZG9tX3Rlc3Rfb2JqX2NsYXNzX2luaXQoV2ViS2l0RE9NVGVzdE9iakNsYXNzKiBy ZXF1ZXN0Q2xhc3MpCiAgICAgICAgIGdfcGFyYW1fc3BlY19zdHJpbmcoCiAgICAgICAgICAgICAi c3RyaW5nLWF0dHIiLAogICAgICAgICAgICAgIlRlc3RPYmo6c3RyaW5nLWF0dHIiLAotICAgICAg ICAgICAgInJlYWQtb25seSBnY2hhciogVGVzdE9iajpzdHJpbmctYXR0ciIsCisgICAgICAgICAg ICAicmVhZC13cml0ZSBnY2hhciogVGVzdE9iajpzdHJpbmctYXR0ciIsCiAgICAgICAgICAgICAi IiwKICAgICAgICAgICAgIFdFQktJVF9QQVJBTV9SRUFEV1JJVEUpKTsKIApAQCAtNzA4LDcgKzcx Niw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9kb21fdGVzdF9vYmpfY2xhc3NfaW5pdChXZWJLaXRE T01UZXN0T2JqQ2xhc3MqIHJlcXVlc3RDbGFzcykKICAgICAgICAgICAgICJUZXN0T2JqOnRlc3Qt b2JqLWF0dHIiLAogICAgICAgICAgICAgInJlYWQtb25seSBXZWJLaXRET01UZXN0T2JqKiBUZXN0 T2JqOnRlc3Qtb2JqLWF0dHIiLAogICAgICAgICAgICAgV0VCS0lUX1RZUEVfRE9NX1RFU1RfT0JK LAotICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURXUklURSkpOworICAgICAgICAgICAgV0VC S0lUX1BBUkFNX1JFQURBQkxFKSk7CiAKICAgICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3Bl cnR5KAogICAgICAgICBnb2JqZWN0Q2xhc3MsCkBAIC03MTgsNyArNzI2LDcgQEAgc3RhdGljIHZv aWQgd2Via2l0X2RvbV90ZXN0X29ial9jbGFzc19pbml0KFdlYktpdERPTVRlc3RPYmpDbGFzcyog cmVxdWVzdENsYXNzKQogICAgICAgICAgICAgIlRlc3RPYmo6eG1sLW9iai1hdHRyIiwKICAgICAg ICAgICAgICJyZWFkLW9ubHkgV2ViS2l0RE9NVGVzdE9iaiogVGVzdE9iajp4bWwtb2JqLWF0dHIi LAogICAgICAgICAgICAgV0VCS0lUX1RZUEVfRE9NX1RFU1RfT0JKLAotICAgICAgICAgICAgV0VC S0lUX1BBUkFNX1JFQURXUklURSkpOworICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURBQkxF KSk7CiAKICAgICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KAogICAgICAgICBnb2Jq ZWN0Q2xhc3MsCkBAIC03MjYsNyArNzM0LDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X2RvbV90ZXN0 X29ial9jbGFzc19pbml0KFdlYktpdERPTVRlc3RPYmpDbGFzcyogcmVxdWVzdENsYXNzKQogICAg ICAgICBnX3BhcmFtX3NwZWNfYm9vbGVhbigKICAgICAgICAgICAgICJjcmVhdGUiLAogICAgICAg ICAgICAgIlRlc3RPYmo6Y3JlYXRlIiwKLSAgICAgICAgICAgICJyZWFkLW9ubHkgZ2Jvb2xlYW4g VGVzdE9iajpjcmVhdGUiLAorICAgICAgICAgICAgInJlYWQtd3JpdGUgZ2Jvb2xlYW4gVGVzdE9i ajpjcmVhdGUiLAogICAgICAgICAgICAgRkFMU0UsCiAgICAgICAgICAgICBXRUJLSVRfUEFSQU1f UkVBRFdSSVRFKSk7CiAKQEAgLTczNiw3ICs3NDQsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfZG9t X3Rlc3Rfb2JqX2NsYXNzX2luaXQoV2ViS2l0RE9NVGVzdE9iakNsYXNzKiByZXF1ZXN0Q2xhc3Mp CiAgICAgICAgIGdfcGFyYW1fc3BlY19zdHJpbmcoCiAgICAgICAgICAgICAicmVmbGVjdGVkLXN0 cmluZy1hdHRyIiwKICAgICAgICAgICAgICJUZXN0T2JqOnJlZmxlY3RlZC1zdHJpbmctYXR0ciIs Ci0gICAgICAgICAgICAicmVhZC1vbmx5IGdjaGFyKiBUZXN0T2JqOnJlZmxlY3RlZC1zdHJpbmct YXR0ciIsCisgICAgICAgICAgICAicmVhZC13cml0ZSBnY2hhciogVGVzdE9iajpyZWZsZWN0ZWQt c3RyaW5nLWF0dHIiLAogICAgICAgICAgICAgIiIsCiAgICAgICAgICAgICBXRUJLSVRfUEFSQU1f UkVBRFdSSVRFKSk7CiAKQEAgLTc0Niw3ICs3NTQsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfZG9t X3Rlc3Rfb2JqX2NsYXNzX2luaXQoV2ViS2l0RE9NVGVzdE9iakNsYXNzKiByZXF1ZXN0Q2xhc3Mp CiAgICAgICAgIGdfcGFyYW1fc3BlY19sb25nKAogICAgICAgICAgICAgInJlZmxlY3RlZC1pbnRl Z3JhbC1hdHRyIiwKICAgICAgICAgICAgICJUZXN0T2JqOnJlZmxlY3RlZC1pbnRlZ3JhbC1hdHRy IiwKLSAgICAgICAgICAgICJyZWFkLW9ubHkgZ2xvbmcgVGVzdE9iajpyZWZsZWN0ZWQtaW50ZWdy YWwtYXR0ciIsCisgICAgICAgICAgICAicmVhZC13cml0ZSBnbG9uZyBUZXN0T2JqOnJlZmxlY3Rl ZC1pbnRlZ3JhbC1hdHRyIiwKICAgICAgICAgICAgIEdfTUlOTE9ORywgR19NQVhMT05HLCAwLAog ICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURXUklURSkpOwogCkBAIC03NTYsNyArNzY0LDcg QEAgc3RhdGljIHZvaWQgd2Via2l0X2RvbV90ZXN0X29ial9jbGFzc19pbml0KFdlYktpdERPTVRl c3RPYmpDbGFzcyogcmVxdWVzdENsYXNzKQogICAgICAgICBnX3BhcmFtX3NwZWNfdWxvbmcoCiAg ICAgICAgICAgICAicmVmbGVjdGVkLXVuc2lnbmVkLWludGVncmFsLWF0dHIiLAogICAgICAgICAg ICAgIlRlc3RPYmo6cmVmbGVjdGVkLXVuc2lnbmVkLWludGVncmFsLWF0dHIiLAotICAgICAgICAg ICAgInJlYWQtb25seSBndWxvbmcgVGVzdE9iajpyZWZsZWN0ZWQtdW5zaWduZWQtaW50ZWdyYWwt YXR0ciIsCisgICAgICAgICAgICAicmVhZC13cml0ZSBndWxvbmcgVGVzdE9iajpyZWZsZWN0ZWQt dW5zaWduZWQtaW50ZWdyYWwtYXR0ciIsCiAgICAgICAgICAgICAwLCBHX01BWFVMT05HLCAwLAog ICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURXUklURSkpOwogCkBAIC03NjYsNyArNzc0LDcg QEAgc3RhdGljIHZvaWQgd2Via2l0X2RvbV90ZXN0X29ial9jbGFzc19pbml0KFdlYktpdERPTVRl c3RPYmpDbGFzcyogcmVxdWVzdENsYXNzKQogICAgICAgICBnX3BhcmFtX3NwZWNfYm9vbGVhbigK ICAgICAgICAgICAgICJyZWZsZWN0ZWQtYm9vbGVhbi1hdHRyIiwKICAgICAgICAgICAgICJUZXN0 T2JqOnJlZmxlY3RlZC1ib29sZWFuLWF0dHIiLAotICAgICAgICAgICAgInJlYWQtb25seSBnYm9v bGVhbiBUZXN0T2JqOnJlZmxlY3RlZC1ib29sZWFuLWF0dHIiLAorICAgICAgICAgICAgInJlYWQt d3JpdGUgZ2Jvb2xlYW4gVGVzdE9iajpyZWZsZWN0ZWQtYm9vbGVhbi1hdHRyIiwKICAgICAgICAg ICAgIEZBTFNFLAogICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURXUklURSkpOwogCkBAIC03 NzYsNyArNzg0LDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X2RvbV90ZXN0X29ial9jbGFzc19pbml0 KFdlYktpdERPTVRlc3RPYmpDbGFzcyogcmVxdWVzdENsYXNzKQogICAgICAgICBnX3BhcmFtX3Nw ZWNfc3RyaW5nKAogICAgICAgICAgICAgInJlZmxlY3RlZC11cmwtYXR0ciIsCiAgICAgICAgICAg ICAiVGVzdE9iajpyZWZsZWN0ZWQtdXJsLWF0dHIiLAotICAgICAgICAgICAgInJlYWQtb25seSBn Y2hhciogVGVzdE9iajpyZWZsZWN0ZWQtdXJsLWF0dHIiLAorICAgICAgICAgICAgInJlYWQtd3Jp dGUgZ2NoYXIqIFRlc3RPYmo6cmVmbGVjdGVkLXVybC1hdHRyIiwKICAgICAgICAgICAgICIiLAog ICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURXUklURSkpOwogCkBAIC03ODYsNyArNzk0LDcg QEAgc3RhdGljIHZvaWQgd2Via2l0X2RvbV90ZXN0X29ial9jbGFzc19pbml0KFdlYktpdERPTVRl c3RPYmpDbGFzcyogcmVxdWVzdENsYXNzKQogICAgICAgICBnX3BhcmFtX3NwZWNfc3RyaW5nKAog ICAgICAgICAgICAgInJlZmxlY3RlZC1zdHJpbmctYXR0ciIsCiAgICAgICAgICAgICAiVGVzdE9i ajpyZWZsZWN0ZWQtc3RyaW5nLWF0dHIiLAotICAgICAgICAgICAgInJlYWQtb25seSBnY2hhciog VGVzdE9iajpyZWZsZWN0ZWQtc3RyaW5nLWF0dHIiLAorICAgICAgICAgICAgInJlYWQtd3JpdGUg Z2NoYXIqIFRlc3RPYmo6cmVmbGVjdGVkLXN0cmluZy1hdHRyIiwKICAgICAgICAgICAgICIiLAog ICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURXUklURSkpOwogCkBAIC03OTYsNyArODA0LDcg QEAgc3RhdGljIHZvaWQgd2Via2l0X2RvbV90ZXN0X29ial9jbGFzc19pbml0KFdlYktpdERPTVRl c3RPYmpDbGFzcyogcmVxdWVzdENsYXNzKQogICAgICAgICBnX3BhcmFtX3NwZWNfbG9uZygKICAg ICAgICAgICAgICJyZWZsZWN0ZWQtY3VzdG9tLWludGVncmFsLWF0dHIiLAogICAgICAgICAgICAg IlRlc3RPYmo6cmVmbGVjdGVkLWN1c3RvbS1pbnRlZ3JhbC1hdHRyIiwKLSAgICAgICAgICAgICJy ZWFkLW9ubHkgZ2xvbmcgVGVzdE9iajpyZWZsZWN0ZWQtY3VzdG9tLWludGVncmFsLWF0dHIiLAor ICAgICAgICAgICAgInJlYWQtd3JpdGUgZ2xvbmcgVGVzdE9iajpyZWZsZWN0ZWQtY3VzdG9tLWlu dGVncmFsLWF0dHIiLAogICAgICAgICAgICAgR19NSU5MT05HLCBHX01BWExPTkcsIDAsCiAgICAg ICAgICAgICBXRUJLSVRfUEFSQU1fUkVBRFdSSVRFKSk7CiAKQEAgLTgwNiw3ICs4MTQsNyBAQCBz dGF0aWMgdm9pZCB3ZWJraXRfZG9tX3Rlc3Rfb2JqX2NsYXNzX2luaXQoV2ViS2l0RE9NVGVzdE9i akNsYXNzKiByZXF1ZXN0Q2xhc3MpCiAgICAgICAgIGdfcGFyYW1fc3BlY19ib29sZWFuKAogICAg ICAgICAgICAgInJlZmxlY3RlZC1jdXN0b20tYm9vbGVhbi1hdHRyIiwKICAgICAgICAgICAgICJU ZXN0T2JqOnJlZmxlY3RlZC1jdXN0b20tYm9vbGVhbi1hdHRyIiwKLSAgICAgICAgICAgICJyZWFk LW9ubHkgZ2Jvb2xlYW4gVGVzdE9iajpyZWZsZWN0ZWQtY3VzdG9tLWJvb2xlYW4tYXR0ciIsCisg ICAgICAgICAgICAicmVhZC13cml0ZSBnYm9vbGVhbiBUZXN0T2JqOnJlZmxlY3RlZC1jdXN0b20t Ym9vbGVhbi1hdHRyIiwKICAgICAgICAgICAgIEZBTFNFLAogICAgICAgICAgICAgV0VCS0lUX1BB UkFNX1JFQURXUklURSkpOwogCkBAIC04MTYsNyArODI0LDcgQEAgc3RhdGljIHZvaWQgd2Via2l0 X2RvbV90ZXN0X29ial9jbGFzc19pbml0KFdlYktpdERPTVRlc3RPYmpDbGFzcyogcmVxdWVzdENs YXNzKQogICAgICAgICBnX3BhcmFtX3NwZWNfc3RyaW5nKAogICAgICAgICAgICAgInJlZmxlY3Rl ZC1jdXN0b20tdXJsLWF0dHIiLAogICAgICAgICAgICAgIlRlc3RPYmo6cmVmbGVjdGVkLWN1c3Rv bS11cmwtYXR0ciIsCi0gICAgICAgICAgICAicmVhZC1vbmx5IGdjaGFyKiBUZXN0T2JqOnJlZmxl Y3RlZC1jdXN0b20tdXJsLWF0dHIiLAorICAgICAgICAgICAgInJlYWQtd3JpdGUgZ2NoYXIqIFRl c3RPYmo6cmVmbGVjdGVkLWN1c3RvbS11cmwtYXR0ciIsCiAgICAgICAgICAgICAiIiwKICAgICAg ICAgICAgIFdFQktJVF9QQVJBTV9SRUFEV1JJVEUpKTsKIApAQCAtODI2LDcgKzgzNCw3IEBAIHN0 YXRpYyB2b2lkIHdlYmtpdF9kb21fdGVzdF9vYmpfY2xhc3NfaW5pdChXZWJLaXRET01UZXN0T2Jq Q2xhc3MqIHJlcXVlc3RDbGFzcykKICAgICAgICAgZ19wYXJhbV9zcGVjX2xvbmcoCiAgICAgICAg ICAgICAiYXR0ci13aXRoLWdldHRlci1leGNlcHRpb24iLAogICAgICAgICAgICAgIlRlc3RPYmo6 YXR0ci13aXRoLWdldHRlci1leGNlcHRpb24iLAotICAgICAgICAgICAgInJlYWQtb25seSBnbG9u ZyBUZXN0T2JqOmF0dHItd2l0aC1nZXR0ZXItZXhjZXB0aW9uIiwKKyAgICAgICAgICAgICJyZWFk LXdyaXRlIGdsb25nIFRlc3RPYmo6YXR0ci13aXRoLWdldHRlci1leGNlcHRpb24iLAogICAgICAg ICAgICAgR19NSU5MT05HLCBHX01BWExPTkcsIDAsCiAgICAgICAgICAgICBXRUJLSVRfUEFSQU1f UkVBRFdSSVRFKSk7CiAKQEAgLTgzNiw3ICs4NDQsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfZG9t X3Rlc3Rfb2JqX2NsYXNzX2luaXQoV2ViS2l0RE9NVGVzdE9iakNsYXNzKiByZXF1ZXN0Q2xhc3Mp CiAgICAgICAgIGdfcGFyYW1fc3BlY19sb25nKAogICAgICAgICAgICAgImF0dHItd2l0aC1zZXR0 ZXItZXhjZXB0aW9uIiwKICAgICAgICAgICAgICJUZXN0T2JqOmF0dHItd2l0aC1zZXR0ZXItZXhj ZXB0aW9uIiwKLSAgICAgICAgICAgICJyZWFkLW9ubHkgZ2xvbmcgVGVzdE9iajphdHRyLXdpdGgt c2V0dGVyLWV4Y2VwdGlvbiIsCisgICAgICAgICAgICAicmVhZC13cml0ZSBnbG9uZyBUZXN0T2Jq OmF0dHItd2l0aC1zZXR0ZXItZXhjZXB0aW9uIiwKICAgICAgICAgICAgIEdfTUlOTE9ORywgR19N QVhMT05HLCAwLAogICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURXUklURSkpOwogCkBAIC04 NDYsNyArODU0LDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X2RvbV90ZXN0X29ial9jbGFzc19pbml0 KFdlYktpdERPTVRlc3RPYmpDbGFzcyogcmVxdWVzdENsYXNzKQogICAgICAgICBnX3BhcmFtX3Nw ZWNfc3RyaW5nKAogICAgICAgICAgICAgInN0cmluZy1hdHRyLXdpdGgtZ2V0dGVyLWV4Y2VwdGlv biIsCiAgICAgICAgICAgICAiVGVzdE9iajpzdHJpbmctYXR0ci13aXRoLWdldHRlci1leGNlcHRp b24iLAotICAgICAgICAgICAgInJlYWQtb25seSBnY2hhciogVGVzdE9iajpzdHJpbmctYXR0ci13 aXRoLWdldHRlci1leGNlcHRpb24iLAorICAgICAgICAgICAgInJlYWQtd3JpdGUgZ2NoYXIqIFRl c3RPYmo6c3RyaW5nLWF0dHItd2l0aC1nZXR0ZXItZXhjZXB0aW9uIiwKICAgICAgICAgICAgICIi LAogICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURXUklURSkpOwogCkBAIC04NTYsNyArODY0 LDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X2RvbV90ZXN0X29ial9jbGFzc19pbml0KFdlYktpdERP TVRlc3RPYmpDbGFzcyogcmVxdWVzdENsYXNzKQogICAgICAgICBnX3BhcmFtX3NwZWNfc3RyaW5n KAogICAgICAgICAgICAgInN0cmluZy1hdHRyLXdpdGgtc2V0dGVyLWV4Y2VwdGlvbiIsCiAgICAg ICAgICAgICAiVGVzdE9iajpzdHJpbmctYXR0ci13aXRoLXNldHRlci1leGNlcHRpb24iLAotICAg ICAgICAgICAgInJlYWQtb25seSBnY2hhciogVGVzdE9iajpzdHJpbmctYXR0ci13aXRoLXNldHRl ci1leGNlcHRpb24iLAorICAgICAgICAgICAgInJlYWQtd3JpdGUgZ2NoYXIqIFRlc3RPYmo6c3Ry aW5nLWF0dHItd2l0aC1zZXR0ZXItZXhjZXB0aW9uIiwKICAgICAgICAgICAgICIiLAogICAgICAg ICAgICAgV0VCS0lUX1BBUkFNX1JFQURXUklURSkpOwogCkBAIC04NjYsNyArODc0LDcgQEAgc3Rh dGljIHZvaWQgd2Via2l0X2RvbV90ZXN0X29ial9jbGFzc19pbml0KFdlYktpdERPTVRlc3RPYmpD bGFzcyogcmVxdWVzdENsYXNzKQogICAgICAgICBnX3BhcmFtX3NwZWNfbG9uZygKICAgICAgICAg ICAgICJ3aXRoLXNjcmlwdC1zdGF0ZS1hdHRyaWJ1dGUiLAogICAgICAgICAgICAgIlRlc3RPYmo6 d2l0aC1zY3JpcHQtc3RhdGUtYXR0cmlidXRlIiwKLSAgICAgICAgICAgICJyZWFkLW9ubHkgZ2xv bmcgVGVzdE9iajp3aXRoLXNjcmlwdC1zdGF0ZS1hdHRyaWJ1dGUiLAorICAgICAgICAgICAgInJl YWQtd3JpdGUgZ2xvbmcgVGVzdE9iajp3aXRoLXNjcmlwdC1zdGF0ZS1hdHRyaWJ1dGUiLAogICAg ICAgICAgICAgR19NSU5MT05HLCBHX01BWExPTkcsIDAsCiAgICAgICAgICAgICBXRUJLSVRfUEFS QU1fUkVBRFdSSVRFKSk7CiAKQEAgLTg3OCw3ICs4ODYsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRf ZG9tX3Rlc3Rfb2JqX2NsYXNzX2luaXQoV2ViS2l0RE9NVGVzdE9iakNsYXNzKiByZXF1ZXN0Q2xh c3MpCiAgICAgICAgICAgICAiVGVzdE9iajp3aXRoLXNjcmlwdC1leGVjdXRpb24tY29udGV4dC1h dHRyaWJ1dGUiLAogICAgICAgICAgICAgInJlYWQtb25seSBXZWJLaXRET01UZXN0T2JqKiBUZXN0 T2JqOndpdGgtc2NyaXB0LWV4ZWN1dGlvbi1jb250ZXh0LWF0dHJpYnV0ZSIsCiAgICAgICAgICAg ICBXRUJLSVRfVFlQRV9ET01fVEVTVF9PQkosCi0gICAgICAgICAgICBXRUJLSVRfUEFSQU1fUkVB RFdSSVRFKSk7CisgICAgICAgICAgICBXRUJLSVRfUEFSQU1fUkVBREFCTEUpKTsKIAogICAgIGdf b2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkoCiAgICAgICAgIGdvYmplY3RDbGFzcywKQEAg LTg4OCw3ICs4OTYsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfZG9tX3Rlc3Rfb2JqX2NsYXNzX2lu aXQoV2ViS2l0RE9NVGVzdE9iakNsYXNzKiByZXF1ZXN0Q2xhc3MpCiAgICAgICAgICAgICAiVGVz dE9iajp3aXRoLXNjcmlwdC1zdGF0ZS1hdHRyaWJ1dGUtcmFpc2VzIiwKICAgICAgICAgICAgICJy ZWFkLW9ubHkgV2ViS2l0RE9NVGVzdE9iaiogVGVzdE9iajp3aXRoLXNjcmlwdC1zdGF0ZS1hdHRy aWJ1dGUtcmFpc2VzIiwKICAgICAgICAgICAgIFdFQktJVF9UWVBFX0RPTV9URVNUX09CSiwKLSAg ICAgICAgICAgIFdFQktJVF9QQVJBTV9SRUFEV1JJVEUpKTsKKyAgICAgICAgICAgIFdFQktJVF9Q QVJBTV9SRUFEQUJMRSkpOwogCiAgICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9wcm9wZXJ0eSgK ICAgICAgICAgZ29iamVjdENsYXNzLApAQCAtODk4LDcgKzkwNiw3IEBAIHN0YXRpYyB2b2lkIHdl YmtpdF9kb21fdGVzdF9vYmpfY2xhc3NfaW5pdChXZWJLaXRET01UZXN0T2JqQ2xhc3MqIHJlcXVl c3RDbGFzcykKICAgICAgICAgICAgICJUZXN0T2JqOndpdGgtc2NyaXB0LWV4ZWN1dGlvbi1jb250 ZXh0LWF0dHJpYnV0ZS1yYWlzZXMiLAogICAgICAgICAgICAgInJlYWQtb25seSBXZWJLaXRET01U ZXN0T2JqKiBUZXN0T2JqOndpdGgtc2NyaXB0LWV4ZWN1dGlvbi1jb250ZXh0LWF0dHJpYnV0ZS1y YWlzZXMiLAogICAgICAgICAgICAgV0VCS0lUX1RZUEVfRE9NX1RFU1RfT0JKLAotICAgICAgICAg ICAgV0VCS0lUX1BBUkFNX1JFQURXUklURSkpOworICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JF QURBQkxFKSk7CiAKICAgICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KAogICAgICAg ICBnb2JqZWN0Q2xhc3MsCkBAIC05MDgsNyArOTE2LDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X2Rv bV90ZXN0X29ial9jbGFzc19pbml0KFdlYktpdERPTVRlc3RPYmpDbGFzcyogcmVxdWVzdENsYXNz KQogICAgICAgICAgICAgIlRlc3RPYmo6d2l0aC1zY3JpcHQtZXhlY3V0aW9uLWNvbnRleHQtYW5k LXNjcmlwdC1zdGF0ZS1hdHRyaWJ1dGUiLAogICAgICAgICAgICAgInJlYWQtb25seSBXZWJLaXRE T01UZXN0T2JqKiBUZXN0T2JqOndpdGgtc2NyaXB0LWV4ZWN1dGlvbi1jb250ZXh0LWFuZC1zY3Jp cHQtc3RhdGUtYXR0cmlidXRlIiwKICAgICAgICAgICAgIFdFQktJVF9UWVBFX0RPTV9URVNUX09C SiwKLSAgICAgICAgICAgIFdFQktJVF9QQVJBTV9SRUFEV1JJVEUpKTsKKyAgICAgICAgICAgIFdF QktJVF9QQVJBTV9SRUFEQUJMRSkpOwogCiAgICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9wcm9w ZXJ0eSgKICAgICAgICAgZ29iamVjdENsYXNzLApAQCAtOTE4LDcgKzkyNiw3IEBAIHN0YXRpYyB2 b2lkIHdlYmtpdF9kb21fdGVzdF9vYmpfY2xhc3NfaW5pdChXZWJLaXRET01UZXN0T2JqQ2xhc3Mq IHJlcXVlc3RDbGFzcykKICAgICAgICAgICAgICJUZXN0T2JqOndpdGgtc2NyaXB0LWV4ZWN1dGlv bi1jb250ZXh0LWFuZC1zY3JpcHQtc3RhdGUtYXR0cmlidXRlLXJhaXNlcyIsCiAgICAgICAgICAg ICAicmVhZC1vbmx5IFdlYktpdERPTVRlc3RPYmoqIFRlc3RPYmo6d2l0aC1zY3JpcHQtZXhlY3V0 aW9uLWNvbnRleHQtYW5kLXNjcmlwdC1zdGF0ZS1hdHRyaWJ1dGUtcmFpc2VzIiwKICAgICAgICAg ICAgIFdFQktJVF9UWVBFX0RPTV9URVNUX09CSiwKLSAgICAgICAgICAgIFdFQktJVF9QQVJBTV9S RUFEV1JJVEUpKTsKKyAgICAgICAgICAgIFdFQktJVF9QQVJBTV9SRUFEQUJMRSkpOwogCiAgICAg Z19vYmplY3RfY2xhc3NfaW5zdGFsbF9wcm9wZXJ0eSgKICAgICAgICAgZ29iamVjdENsYXNzLApA QCAtOTI4LDcgKzkzNiw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9kb21fdGVzdF9vYmpfY2xhc3Nf aW5pdChXZWJLaXRET01UZXN0T2JqQ2xhc3MqIHJlcXVlc3RDbGFzcykKICAgICAgICAgICAgICJU ZXN0T2JqOndpdGgtc2NyaXB0LWV4ZWN1dGlvbi1jb250ZXh0LWFuZC1zY3JpcHQtc3RhdGUtd2l0 aC1zcGFjZXMtYXR0cmlidXRlIiwKICAgICAgICAgICAgICJyZWFkLW9ubHkgV2ViS2l0RE9NVGVz dE9iaiogVGVzdE9iajp3aXRoLXNjcmlwdC1leGVjdXRpb24tY29udGV4dC1hbmQtc2NyaXB0LXN0 YXRlLXdpdGgtc3BhY2VzLWF0dHJpYnV0ZSIsCiAgICAgICAgICAgICBXRUJLSVRfVFlQRV9ET01f VEVTVF9PQkosCi0gICAgICAgICAgICBXRUJLSVRfUEFSQU1fUkVBRFdSSVRFKSk7CisgICAgICAg ICAgICBXRUJLSVRfUEFSQU1fUkVBREFCTEUpKTsKIAogICAgIGdfb2JqZWN0X2NsYXNzX2luc3Rh bGxfcHJvcGVydHkoCiAgICAgICAgIGdvYmplY3RDbGFzcywKQEAgLTkzOCw3ICs5NDYsNyBAQCBz dGF0aWMgdm9pZCB3ZWJraXRfZG9tX3Rlc3Rfb2JqX2NsYXNzX2luaXQoV2ViS2l0RE9NVGVzdE9i akNsYXNzKiByZXF1ZXN0Q2xhc3MpCiAgICAgICAgICAgICAiVGVzdE9iajp3aXRoLXNjcmlwdC1h cmd1bWVudHMtYW5kLWNhbGwtc3RhY2stYXR0cmlidXRlIiwKICAgICAgICAgICAgICJyZWFkLW9u bHkgV2ViS2l0RE9NVGVzdE9iaiogVGVzdE9iajp3aXRoLXNjcmlwdC1hcmd1bWVudHMtYW5kLWNh bGwtc3RhY2stYXR0cmlidXRlIiwKICAgICAgICAgICAgIFdFQktJVF9UWVBFX0RPTV9URVNUX09C SiwKLSAgICAgICAgICAgIFdFQktJVF9QQVJBTV9SRUFEV1JJVEUpKTsKKyAgICAgICAgICAgIFdF QktJVF9QQVJBTV9SRUFEQUJMRSkpOwogCiAgICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9wcm9w ZXJ0eSgKICAgICAgICAgZ29iamVjdENsYXNzLApAQCAtOTQ2LDcgKzk1NCw3IEBAIHN0YXRpYyB2 b2lkIHdlYmtpdF9kb21fdGVzdF9vYmpfY2xhc3NfaW5pdChXZWJLaXRET01UZXN0T2JqQ2xhc3Mq IHJlcXVlc3RDbGFzcykKICAgICAgICAgZ19wYXJhbV9zcGVjX2xvbmcoCiAgICAgICAgICAgICAi Y29uZGl0aW9uYWwtYXR0cjEiLAogICAgICAgICAgICAgIlRlc3RPYmo6Y29uZGl0aW9uYWwtYXR0 cjEiLAotICAgICAgICAgICAgInJlYWQtb25seSBnbG9uZyBUZXN0T2JqOmNvbmRpdGlvbmFsLWF0 dHIxIiwKKyAgICAgICAgICAgICJyZWFkLXdyaXRlIGdsb25nIFRlc3RPYmo6Y29uZGl0aW9uYWwt YXR0cjEiLAogICAgICAgICAgICAgR19NSU5MT05HLCBHX01BWExPTkcsIDAsCiAgICAgICAgICAg ICBXRUJLSVRfUEFSQU1fUkVBRFdSSVRFKSk7CiAKQEAgLTk1Niw3ICs5NjQsNyBAQCBzdGF0aWMg dm9pZCB3ZWJraXRfZG9tX3Rlc3Rfb2JqX2NsYXNzX2luaXQoV2ViS2l0RE9NVGVzdE9iakNsYXNz KiByZXF1ZXN0Q2xhc3MpCiAgICAgICAgIGdfcGFyYW1fc3BlY19sb25nKAogICAgICAgICAgICAg ImNvbmRpdGlvbmFsLWF0dHIyIiwKICAgICAgICAgICAgICJUZXN0T2JqOmNvbmRpdGlvbmFsLWF0 dHIyIiwKLSAgICAgICAgICAgICJyZWFkLW9ubHkgZ2xvbmcgVGVzdE9iajpjb25kaXRpb25hbC1h dHRyMiIsCisgICAgICAgICAgICAicmVhZC13cml0ZSBnbG9uZyBUZXN0T2JqOmNvbmRpdGlvbmFs LWF0dHIyIiwKICAgICAgICAgICAgIEdfTUlOTE9ORywgR19NQVhMT05HLCAwLAogICAgICAgICAg ICAgV0VCS0lUX1BBUkFNX1JFQURXUklURSkpOwogCkBAIC05NjYsNyArOTc0LDcgQEAgc3RhdGlj IHZvaWQgd2Via2l0X2RvbV90ZXN0X29ial9jbGFzc19pbml0KFdlYktpdERPTVRlc3RPYmpDbGFz cyogcmVxdWVzdENsYXNzKQogICAgICAgICBnX3BhcmFtX3NwZWNfbG9uZygKICAgICAgICAgICAg ICJjb25kaXRpb25hbC1hdHRyMyIsCiAgICAgICAgICAgICAiVGVzdE9iajpjb25kaXRpb25hbC1h dHRyMyIsCi0gICAgICAgICAgICAicmVhZC1vbmx5IGdsb25nIFRlc3RPYmo6Y29uZGl0aW9uYWwt YXR0cjMiLAorICAgICAgICAgICAgInJlYWQtd3JpdGUgZ2xvbmcgVGVzdE9iajpjb25kaXRpb25h bC1hdHRyMyIsCiAgICAgICAgICAgICBHX01JTkxPTkcsIEdfTUFYTE9ORywgMCwKICAgICAgICAg ICAgIFdFQktJVF9QQVJBTV9SRUFEV1JJVEUpKTsKIApAQCAtOTc4LDcgKzk4Niw3IEBAIHN0YXRp YyB2b2lkIHdlYmtpdF9kb21fdGVzdF9vYmpfY2xhc3NfaW5pdChXZWJLaXRET01UZXN0T2JqQ2xh c3MqIHJlcXVlc3RDbGFzcykKICAgICAgICAgICAgICJUZXN0T2JqOmFueS1hdHRyaWJ1dGUiLAog ICAgICAgICAgICAgInJlYWQtb25seSBXZWJLaXRET01hbnkqIFRlc3RPYmo6YW55LWF0dHJpYnV0 ZSIsCiAgICAgICAgICAgICBXRUJLSVRfVFlQRV9ET01fQU5ZLAotICAgICAgICAgICAgV0VCS0lU X1BBUkFNX1JFQURXUklURSkpOworICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURBQkxFKSk7 CiAKICAgICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KAogICAgICAgICBnb2JqZWN0 Q2xhc3MsCkBAIC05OTgsNyArMTAwNiw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9kb21fdGVzdF9v YmpfY2xhc3NfaW5pdChXZWJLaXRET01UZXN0T2JqQ2xhc3MqIHJlcXVlc3RDbGFzcykKICAgICAg ICAgICAgICJUZXN0T2JqOm11dGFibGUtcG9pbnQiLAogICAgICAgICAgICAgInJlYWQtb25seSBX ZWJLaXRET01TVkdQb2ludCogVGVzdE9iajptdXRhYmxlLXBvaW50IiwKICAgICAgICAgICAgIFdF QktJVF9UWVBFX0RPTV9TVkdfUE9JTlQsCi0gICAgICAgICAgICBXRUJLSVRfUEFSQU1fUkVBRFdS SVRFKSk7CisgICAgICAgICAgICBXRUJLSVRfUEFSQU1fUkVBREFCTEUpKTsKIAogICAgIGdfb2Jq ZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkoCiAgICAgICAgIGdvYmplY3RDbGFzcywKQEAgLTEw MDgsNyArMTAxNiw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9kb21fdGVzdF9vYmpfY2xhc3NfaW5p dChXZWJLaXRET01UZXN0T2JqQ2xhc3MqIHJlcXVlc3RDbGFzcykKICAgICAgICAgICAgICJUZXN0 T2JqOmltbXV0YWJsZS1wb2ludCIsCiAgICAgICAgICAgICAicmVhZC1vbmx5IFdlYktpdERPTVNW R1BvaW50KiBUZXN0T2JqOmltbXV0YWJsZS1wb2ludCIsCiAgICAgICAgICAgICBXRUJLSVRfVFlQ RV9ET01fU1ZHX1BPSU5ULAotICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURXUklURSkpOwor ICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURBQkxFKSk7CiAKICAgICBnX29iamVjdF9jbGFz c19pbnN0YWxsX3Byb3BlcnR5KAogICAgICAgICBnb2JqZWN0Q2xhc3MsCkBAIC0xMDE2LDcgKzEw MjQsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfZG9tX3Rlc3Rfb2JqX2NsYXNzX2luaXQoV2ViS2l0 RE9NVGVzdE9iakNsYXNzKiByZXF1ZXN0Q2xhc3MpCiAgICAgICAgIGdfcGFyYW1fc3BlY19sb25n KAogICAgICAgICAgICAgInN0cmF3YmVycnkiLAogICAgICAgICAgICAgIlRlc3RPYmo6c3RyYXdi ZXJyeSIsCi0gICAgICAgICAgICAicmVhZC1vbmx5IGdsb25nIFRlc3RPYmo6c3RyYXdiZXJyeSIs CisgICAgICAgICAgICAicmVhZC13cml0ZSBnbG9uZyBUZXN0T2JqOnN0cmF3YmVycnkiLAogICAg ICAgICAgICAgR19NSU5MT05HLCBHX01BWExPTkcsIDAsCiAgICAgICAgICAgICBXRUJLSVRfUEFS QU1fUkVBRFdSSVRFKSk7CiAKQEAgLTEwMjYsNyArMTAzNCw3IEBAIHN0YXRpYyB2b2lkIHdlYmtp dF9kb21fdGVzdF9vYmpfY2xhc3NfaW5pdChXZWJLaXRET01UZXN0T2JqQ2xhc3MqIHJlcXVlc3RD bGFzcykKICAgICAgICAgZ19wYXJhbV9zcGVjX2Zsb2F0KAogICAgICAgICAgICAgInN0cmljdC1m bG9hdCIsCiAgICAgICAgICAgICAiVGVzdE9iajpzdHJpY3QtZmxvYXQiLAotICAgICAgICAgICAg InJlYWQtb25seSBnZmxvYXQgVGVzdE9iajpzdHJpY3QtZmxvYXQiLAorICAgICAgICAgICAgInJl YWQtd3JpdGUgZ2Zsb2F0IFRlc3RPYmo6c3RyaWN0LWZsb2F0IiwKICAgICAgICAgICAgIC1HX01B WEZMT0FULCBHX01BWEZMT0FULCAwLAogICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURXUklU RSkpOwogCkBAIC0xMDQ2LDcgKzEwNTQsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfZG9tX3Rlc3Rf b2JqX2NsYXNzX2luaXQoV2ViS2l0RE9NVGVzdE9iakNsYXNzKiByZXF1ZXN0Q2xhc3MpCiAgICAg ICAgIGdfcGFyYW1fc3BlY19sb25nKAogICAgICAgICAgICAgImlkIiwKICAgICAgICAgICAgICJU ZXN0T2JqOmlkIiwKLSAgICAgICAgICAgICJyZWFkLW9ubHkgZ2xvbmcgVGVzdE9iajppZCIsCisg ICAgICAgICAgICAicmVhZC13cml0ZSBnbG9uZyBUZXN0T2JqOmlkIiwKICAgICAgICAgICAgIEdf TUlOTE9ORywgR19NQVhMT05HLCAwLAogICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURXUklU RSkpOwogCkBAIC0xMTE2LDcgKzExMjQsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfZG9tX3Rlc3Rf b2JqX2NsYXNzX2luaXQoV2ViS2l0RE9NVGVzdE9iakNsYXNzKiByZXF1ZXN0Q2xhc3MpCiAgICAg ICAgIGdfcGFyYW1fc3BlY19sb25nKAogICAgICAgICAgICAgIm51bGxhYmxlLWxvbmctc2V0dGFi bGUtYXR0cmlidXRlIiwKICAgICAgICAgICAgICJUZXN0T2JqOm51bGxhYmxlLWxvbmctc2V0dGFi bGUtYXR0cmlidXRlIiwKLSAgICAgICAgICAgICJyZWFkLW9ubHkgZ2xvbmcgVGVzdE9iajpudWxs YWJsZS1sb25nLXNldHRhYmxlLWF0dHJpYnV0ZSIsCisgICAgICAgICAgICAicmVhZC13cml0ZSBn bG9uZyBUZXN0T2JqOm51bGxhYmxlLWxvbmctc2V0dGFibGUtYXR0cmlidXRlIiwKICAgICAgICAg ICAgIEdfTUlOTE9ORywgR19NQVhMT05HLCAwLAogICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JF QURXUklURSkpOwogCkBAIC0xMTI2LDcgKzExMzQsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfZG9t X3Rlc3Rfb2JqX2NsYXNzX2luaXQoV2ViS2l0RE9NVGVzdE9iakNsYXNzKiByZXF1ZXN0Q2xhc3Mp CiAgICAgICAgIGdfcGFyYW1fc3BlY19sb25nKAogICAgICAgICAgICAgIm51bGxhYmxlLXN0cmlu Zy12YWx1ZSIsCiAgICAgICAgICAgICAiVGVzdE9iajpudWxsYWJsZS1zdHJpbmctdmFsdWUiLAot ICAgICAgICAgICAgInJlYWQtb25seSBnbG9uZyBUZXN0T2JqOm51bGxhYmxlLXN0cmluZy12YWx1 ZSIsCisgICAgICAgICAgICAicmVhZC13cml0ZSBnbG9uZyBUZXN0T2JqOm51bGxhYmxlLXN0cmlu Zy12YWx1ZSIsCiAgICAgICAgICAgICBHX01JTkxPTkcsIEdfTUFYTE9ORywgMCwKICAgICAgICAg ICAgIFdFQktJVF9QQVJBTV9SRUFEV1JJVEUpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0dPYmplY3QvV2ViS2l0RE9NVGVzdFNlcmlhbGl6ZWRT Y3JpcHRWYWx1ZUludGVyZmFjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRz L3Rlc3QvR09iamVjdC9XZWJLaXRET01UZXN0U2VyaWFsaXplZFNjcmlwdFZhbHVlSW50ZXJmYWNl LmNwcAppbmRleCBjODU5ODU2MTdjOTkxYTM1Mjc2OGNjMjlkMWQ2YzQwNDA1NWIyN2NlLi5mM2Fh NjY5MDE5ZmY5YzkzOTkzMWQyYTlhMmM4ODRjMDE5Mzg3MzkxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvR09iamVjdC9XZWJLaXRET01UZXN0U2VyaWFs aXplZFNjcmlwdFZhbHVlSW50ZXJmYWNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL3Rlc3QvR09iamVjdC9XZWJLaXRET01UZXN0U2VyaWFsaXplZFNjcmlwdFZhbHVl SW50ZXJmYWNlLmNwcApAQCAtMTc1LDcgKzE3NSw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9kb21f dGVzdF9zZXJpYWxpemVkX3NjcmlwdF92YWx1ZV9pbnRlcmZhY2VfY2xhc3NfaW5pdChXZWJLaXRE CiAgICAgICAgICAgICAiVGVzdFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZUludGVyZmFjZTp2YWx1ZSIs CiAgICAgICAgICAgICAicmVhZC1vbmx5IFdlYktpdERPTVNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSog VGVzdFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZUludGVyZmFjZTp2YWx1ZSIsCiAgICAgICAgICAgICBX RUJLSVRfVFlQRV9ET01fU0VSSUFMSVpFRF9TQ1JJUFRfVkFMVUUsCi0gICAgICAgICAgICBXRUJL SVRfUEFSQU1fUkVBRFdSSVRFKSk7CisgICAgICAgICAgICBXRUJLSVRfUEFSQU1fUkVBREFCTEUp KTsKIAogICAgIGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkoCiAgICAgICAgIGdvYmpl Y3RDbGFzcywKQEAgLTE5NSw3ICsxOTUsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfZG9tX3Rlc3Rf c2VyaWFsaXplZF9zY3JpcHRfdmFsdWVfaW50ZXJmYWNlX2NsYXNzX2luaXQoV2ViS2l0RAogICAg ICAgICAgICAgIlRlc3RTZXJpYWxpemVkU2NyaXB0VmFsdWVJbnRlcmZhY2U6Y2FjaGVkLXZhbHVl IiwKICAgICAgICAgICAgICJyZWFkLW9ubHkgV2ViS2l0RE9NU2VyaWFsaXplZFNjcmlwdFZhbHVl KiBUZXN0U2VyaWFsaXplZFNjcmlwdFZhbHVlSW50ZXJmYWNlOmNhY2hlZC12YWx1ZSIsCiAgICAg ICAgICAgICBXRUJLSVRfVFlQRV9ET01fU0VSSUFMSVpFRF9TQ1JJUFRfVkFMVUUsCi0gICAgICAg ICAgICBXRUJLSVRfUEFSQU1fUkVBRFdSSVRFKSk7CisgICAgICAgICAgICBXRUJLSVRfUEFSQU1f UkVBREFCTEUpKTsKIAogICAgIGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkoCiAgICAg ICAgIGdvYmplY3RDbGFzcywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvdGVzdC9HT2JqZWN0L1dlYktpdERPTVRlc3RUeXBlZGVmcy5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvR09iamVjdC9XZWJLaXRET01UZXN0VHlwZWRlZnMu Y3BwCmluZGV4IDBiMjg3YmVjNmUwMzMzMjI1OGYzMjUzYWRmYjhkOTNjODlhZWU5NTEuLmY5YWFh NjlmNGI4OGUwNzBiYjY1MDE3OGRhNzI0YjU5MTJiNTAyOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9HT2JqZWN0L1dlYktpdERPTVRlc3RUeXBlZGVm cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0dPYmplY3Qv V2ViS2l0RE9NVGVzdFR5cGVkZWZzLmNwcApAQCAtMTkxLDcgKzE5MSw3IEBAIHN0YXRpYyB2b2lk IHdlYmtpdF9kb21fdGVzdF90eXBlZGVmc19jbGFzc19pbml0KFdlYktpdERPTVRlc3RUeXBlZGVm c0NsYXNzKiByZXF1CiAgICAgICAgIGdfcGFyYW1fc3BlY191aW50NjQoCiAgICAgICAgICAgICAi dW5zaWduZWQtbG9uZy1sb25nLWF0dHIiLAogICAgICAgICAgICAgIlRlc3RUeXBlZGVmczp1bnNp Z25lZC1sb25nLWxvbmctYXR0ciIsCi0gICAgICAgICAgICAicmVhZC1vbmx5IGd1aW50NjQgVGVz dFR5cGVkZWZzOnVuc2lnbmVkLWxvbmctbG9uZy1hdHRyIiwKKyAgICAgICAgICAgICJyZWFkLXdy aXRlIGd1aW50NjQgVGVzdFR5cGVkZWZzOnVuc2lnbmVkLWxvbmctbG9uZy1hdHRyIiwKICAgICAg ICAgICAgIDAsIEdfTUFYVUlOVDY0LCAwLAogICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURX UklURSkpOwogCkBAIC0yMDMsNyArMjAzLDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X2RvbV90ZXN0 X3R5cGVkZWZzX2NsYXNzX2luaXQoV2ViS2l0RE9NVGVzdFR5cGVkZWZzQ2xhc3MqIHJlcXUKICAg ICAgICAgICAgICJUZXN0VHlwZWRlZnM6aW1tdXRhYmxlLXNlcmlhbGl6ZWQtc2NyaXB0LXZhbHVl IiwKICAgICAgICAgICAgICJyZWFkLW9ubHkgV2ViS2l0RE9NU2VyaWFsaXplZFNjcmlwdFZhbHVl KiBUZXN0VHlwZWRlZnM6aW1tdXRhYmxlLXNlcmlhbGl6ZWQtc2NyaXB0LXZhbHVlIiwKICAgICAg ICAgICAgIFdFQktJVF9UWVBFX0RPTV9TRVJJQUxJWkVEX1NDUklQVF9WQUxVRSwKLSAgICAgICAg ICAgIFdFQktJVF9QQVJBTV9SRUFEV1JJVEUpKTsKKyAgICAgICAgICAgIFdFQktJVF9QQVJBTV9S RUFEQUJMRSkpOwogCiAgICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9wcm9wZXJ0eSgKICAgICAg ICAgZ29iamVjdENsYXNzLApAQCAtMjExLDcgKzIxMSw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9k b21fdGVzdF90eXBlZGVmc19jbGFzc19pbml0KFdlYktpdERPTVRlc3RUeXBlZGVmc0NsYXNzKiBy ZXF1CiAgICAgICAgIGdfcGFyYW1fc3BlY19sb25nKAogICAgICAgICAgICAgImF0dHItd2l0aC1n ZXR0ZXItZXhjZXB0aW9uIiwKICAgICAgICAgICAgICJUZXN0VHlwZWRlZnM6YXR0ci13aXRoLWdl dHRlci1leGNlcHRpb24iLAotICAgICAgICAgICAgInJlYWQtb25seSBnbG9uZyBUZXN0VHlwZWRl ZnM6YXR0ci13aXRoLWdldHRlci1leGNlcHRpb24iLAorICAgICAgICAgICAgInJlYWQtd3JpdGUg Z2xvbmcgVGVzdFR5cGVkZWZzOmF0dHItd2l0aC1nZXR0ZXItZXhjZXB0aW9uIiwKICAgICAgICAg ICAgIEdfTUlOTE9ORywgR19NQVhMT05HLCAwLAogICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JF QURXUklURSkpOwogCkBAIC0yMjEsNyArMjIxLDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X2RvbV90 ZXN0X3R5cGVkZWZzX2NsYXNzX2luaXQoV2ViS2l0RE9NVGVzdFR5cGVkZWZzQ2xhc3MqIHJlcXUK ICAgICAgICAgZ19wYXJhbV9zcGVjX2xvbmcoCiAgICAgICAgICAgICAiYXR0ci13aXRoLXNldHRl ci1leGNlcHRpb24iLAogICAgICAgICAgICAgIlRlc3RUeXBlZGVmczphdHRyLXdpdGgtc2V0dGVy LWV4Y2VwdGlvbiIsCi0gICAgICAgICAgICAicmVhZC1vbmx5IGdsb25nIFRlc3RUeXBlZGVmczph dHRyLXdpdGgtc2V0dGVyLWV4Y2VwdGlvbiIsCisgICAgICAgICAgICAicmVhZC13cml0ZSBnbG9u ZyBUZXN0VHlwZWRlZnM6YXR0ci13aXRoLXNldHRlci1leGNlcHRpb24iLAogICAgICAgICAgICAg R19NSU5MT05HLCBHX01BWExPTkcsIDAsCiAgICAgICAgICAgICBXRUJLSVRfUEFSQU1fUkVBRFdS SVRFKSk7CiAKQEAgLTIzMSw3ICsyMzEsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfZG9tX3Rlc3Rf dHlwZWRlZnNfY2xhc3NfaW5pdChXZWJLaXRET01UZXN0VHlwZWRlZnNDbGFzcyogcmVxdQogICAg ICAgICBnX3BhcmFtX3NwZWNfc3RyaW5nKAogICAgICAgICAgICAgInN0cmluZy1hdHRyLXdpdGgt Z2V0dGVyLWV4Y2VwdGlvbiIsCiAgICAgICAgICAgICAiVGVzdFR5cGVkZWZzOnN0cmluZy1hdHRy LXdpdGgtZ2V0dGVyLWV4Y2VwdGlvbiIsCi0gICAgICAgICAgICAicmVhZC1vbmx5IGdjaGFyKiBU ZXN0VHlwZWRlZnM6c3RyaW5nLWF0dHItd2l0aC1nZXR0ZXItZXhjZXB0aW9uIiwKKyAgICAgICAg ICAgICJyZWFkLXdyaXRlIGdjaGFyKiBUZXN0VHlwZWRlZnM6c3RyaW5nLWF0dHItd2l0aC1nZXR0 ZXItZXhjZXB0aW9uIiwKICAgICAgICAgICAgICIiLAogICAgICAgICAgICAgV0VCS0lUX1BBUkFN X1JFQURXUklURSkpOwogCkBAIC0yNDEsNyArMjQxLDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X2Rv bV90ZXN0X3R5cGVkZWZzX2NsYXNzX2luaXQoV2ViS2l0RE9NVGVzdFR5cGVkZWZzQ2xhc3MqIHJl cXUKICAgICAgICAgZ19wYXJhbV9zcGVjX3N0cmluZygKICAgICAgICAgICAgICJzdHJpbmctYXR0 ci13aXRoLXNldHRlci1leGNlcHRpb24iLAogICAgICAgICAgICAgIlRlc3RUeXBlZGVmczpzdHJp bmctYXR0ci13aXRoLXNldHRlci1leGNlcHRpb24iLAotICAgICAgICAgICAgInJlYWQtb25seSBn Y2hhciogVGVzdFR5cGVkZWZzOnN0cmluZy1hdHRyLXdpdGgtc2V0dGVyLWV4Y2VwdGlvbiIsCisg ICAgICAgICAgICAicmVhZC13cml0ZSBnY2hhciogVGVzdFR5cGVkZWZzOnN0cmluZy1hdHRyLXdp dGgtc2V0dGVyLWV4Y2VwdGlvbiIsCiAgICAgICAgICAgICAiIiwKICAgICAgICAgICAgIFdFQktJ VF9QQVJBTV9SRUFEV1JJVEUpKTsKIAo=