188173 2018-07-30 10:33:40 -0700 Rename some JSC API functions/types. 2018-07-30 13:14:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 keith_miller keith_miller commit-queue ews-watchlist ggaren mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1446255 0 keith_miller 2018-07-30 10:33:40 -0700 Rename some JSC API functions/types. 1446258 1 346068 keith_miller 2018-07-30 10:34:40 -0700 Created attachment 346068 Patch 1446260 2 ews-watchlist 2018-07-30 10:36:35 -0700 Attachment 346068 did not pass style-queue: ERROR: Source/JavaScriptCore/API/JSObjectRef.h:565: The parameter name "object" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/JavaScriptCore/API/JSObjectRef.h:577: The parameter name "object" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/JavaScriptCore/API/JSObjectRef.h:590: The parameter name "object" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/JavaScriptCore/API/JSObjectRef.h:590: The parameter name "value" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/JavaScriptCore/API/JSObjectRef.h:590: The parameter name "attributes" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/JavaScriptCore/API/JSObjectRef.h:602: The parameter name "object" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 6 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1446324 3 346068 commit-queue 2018-07-30 13:13:44 -0700 Comment on attachment 346068 Patch Clearing flags on attachment: 346068 Committed r234381: <https://trac.webkit.org/changeset/234381> 1446325 4 commit-queue 2018-07-30 13:13:45 -0700 All reviewed patches have been landed. Closing bug. 1446327 5 webkit-bug-importer 2018-07-30 13:14:18 -0700 <rdar://problem/42743967> 346068 2018-07-30 10:34:40 -0700 2018-07-30 13:13:44 -0700 Patch bug-188173-20180730103438.patch text/plain 18090 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0MzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj OWZmYTU5YWMxMmM1YjRiNWNjMzNhN2Y3MmI3YjBlNTJiZjdhNGFmLi5iOGE4MGNmMDQyMTFmMTA5 ZGY5Yzg2NTcxOGJmZjE0MmFjMzY0MmUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMCBAQAorMjAxOC0wNy0zMCAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBSZW5hbWUgc29tZSBKU0MgQVBJIGZ1bmN0aW9ucy90eXBlcy4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4ODE3MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQVBJL0pTT2Jq ZWN0UmVmLmNwcDoKKyAgICAgICAgKEpTT2JqZWN0SGFzUHJvcGVydHlGb3JLZXkpOgorICAgICAg ICAoSlNPYmplY3RHZXRQcm9wZXJ0eUZvcktleSk6CisgICAgICAgIChKU09iamVjdFNldFByb3Bl cnR5Rm9yS2V5KToKKyAgICAgICAgKEpTT2JqZWN0RGVsZXRlUHJvcGVydHlGb3JLZXkpOgorICAg ICAgICAoSlNPYmplY3RIYXNQcm9wZXJ0eUtleSk6IERlbGV0ZWQuCisgICAgICAgIChKU09iamVj dEdldFByb3BlcnR5S2V5KTogRGVsZXRlZC4KKyAgICAgICAgKEpTT2JqZWN0U2V0UHJvcGVydHlL ZXkpOiBEZWxldGVkLgorICAgICAgICAoSlNPYmplY3REZWxldGVQcm9wZXJ0eUtleSk6IERlbGV0 ZWQuCisgICAgICAgICogQVBJL0pTT2JqZWN0UmVmLmg6CisgICAgICAgICogQVBJL0pTVmFsdWUu aDoKKyAgICAgICAgKiBBUEkvSlNWYWx1ZS5tbToKKyAgICAgICAgKC1bSlNWYWx1ZSB2YWx1ZUZv clByb3BlcnR5Ol0pOgorICAgICAgICAoLVtKU1ZhbHVlIHNldFZhbHVlOmZvclByb3BlcnR5Ol0p OgorICAgICAgICAoLVtKU1ZhbHVlIGRlbGV0ZVByb3BlcnR5Ol0pOgorICAgICAgICAoLVtKU1Zh bHVlIGhhc1Byb3BlcnR5Ol0pOgorICAgICAgICAoLVtKU1ZhbHVlIGRlZmluZVByb3BlcnR5OmRl c2NyaXB0b3I6XSk6CisgICAgICAgICogQVBJL3Rlc3RzL3Rlc3RhcGkuY3BwOgorICAgICAgICAo VGVzdEFQSTo6cnVuKToKKwogMjAxOC0wNy0zMCAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5j b20+CiAKICAgICAgICAgQWRkIGEgZGVidWdnaW5nIHV0aWxpdHkgdG8gZHVtcCB0aGUgbWVtb3J5 IGxheW91dCBvZiBhIEpTQ2VsbC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9B UEkvSlNPYmplY3RSZWYuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU09iamVjdFJl Zi5jcHAKaW5kZXggNTQ1MWEyZjlhNTYxMzQ3YTkyNTgxZDVmM2U0NDI0NjI5NjlkNDBmZi4uNjk0 ZDE4NWZkNTA4NTAyNTBjMjdiMDE0NzQyOTQwODc1ZTRkZDJmNiAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL0FQSS9KU09iamVjdFJlZi5jcHAKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL0FQSS9KU09iamVjdFJlZi5jcHAKQEAgLTM2Niw3ICszNjYsNyBAQCB2b2lkIEpTT2Jq ZWN0U2V0UHJvcGVydHkoSlNDb250ZXh0UmVmIGN0eCwgSlNPYmplY3RSZWYgb2JqZWN0LCBKU1N0 cmluZ1JlZiBwcm9wZQogICAgIGhhbmRsZUV4Y2VwdGlvbklmTmVlZGVkKHNjb3BlLCBleGVjLCBl eGNlcHRpb24pOwogfQogCi1ib29sIEpTT2JqZWN0SGFzUHJvcGVydHlLZXkoSlNDb250ZXh0UmVm IGN0eCwgSlNPYmplY3RSZWYgb2JqZWN0LCBKU1ZhbHVlUmVmIGtleSwgSlNWYWx1ZVJlZiogZXhj ZXB0aW9uKQorYm9vbCBKU09iamVjdEhhc1Byb3BlcnR5Rm9yS2V5KEpTQ29udGV4dFJlZiBjdHgs IEpTT2JqZWN0UmVmIG9iamVjdCwgSlNWYWx1ZVJlZiBrZXksIEpTVmFsdWVSZWYqIGV4Y2VwdGlv bikKIHsKICAgICBpZiAoIWN0eCkgewogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKQEAg LTM4Nyw3ICszODcsNyBAQCBib29sIEpTT2JqZWN0SGFzUHJvcGVydHlLZXkoSlNDb250ZXh0UmVm IGN0eCwgSlNPYmplY3RSZWYgb2JqZWN0LCBKU1ZhbHVlUmVmIGtleQogICAgIHJldHVybiByZXN1 bHQ7CiB9CiAKLUpTVmFsdWVSZWYgSlNPYmplY3RHZXRQcm9wZXJ0eUtleShKU0NvbnRleHRSZWYg Y3R4LCBKU09iamVjdFJlZiBvYmplY3QsIEpTVmFsdWVSZWYga2V5LCBKU1ZhbHVlUmVmKiBleGNl cHRpb24pCitKU1ZhbHVlUmVmIEpTT2JqZWN0R2V0UHJvcGVydHlGb3JLZXkoSlNDb250ZXh0UmVm IGN0eCwgSlNPYmplY3RSZWYgb2JqZWN0LCBKU1ZhbHVlUmVmIGtleSwgSlNWYWx1ZVJlZiogZXhj ZXB0aW9uKQogewogICAgIGlmICghY3R4KSB7CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgp OwpAQCAtNDA4LDcgKzQwOCw3IEBAIEpTVmFsdWVSZWYgSlNPYmplY3RHZXRQcm9wZXJ0eUtleShK U0NvbnRleHRSZWYgY3R4LCBKU09iamVjdFJlZiBvYmplY3QsIEpTVmFsdWVSCiAgICAgcmV0dXJu IHRvUmVmKGV4ZWMsIGpzVmFsdWUpOwogfQogCi12b2lkIEpTT2JqZWN0U2V0UHJvcGVydHlLZXko SlNDb250ZXh0UmVmIGN0eCwgSlNPYmplY3RSZWYgb2JqZWN0LCBKU1ZhbHVlUmVmIGtleSwgSlNW YWx1ZVJlZiB2YWx1ZSwgSlNQcm9wZXJ0eUF0dHJpYnV0ZXMgYXR0cmlidXRlcywgSlNWYWx1ZVJl ZiogZXhjZXB0aW9uKQordm9pZCBKU09iamVjdFNldFByb3BlcnR5Rm9yS2V5KEpTQ29udGV4dFJl ZiBjdHgsIEpTT2JqZWN0UmVmIG9iamVjdCwgSlNWYWx1ZVJlZiBrZXksIEpTVmFsdWVSZWYgdmFs dWUsIEpTUHJvcGVydHlBdHRyaWJ1dGVzIGF0dHJpYnV0ZXMsIEpTVmFsdWVSZWYqIGV4Y2VwdGlv bikKIHsKICAgICBpZiAoIWN0eCkgewogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKQEAg LTQzOSw3ICs0MzksNyBAQCB2b2lkIEpTT2JqZWN0U2V0UHJvcGVydHlLZXkoSlNDb250ZXh0UmVm IGN0eCwgSlNPYmplY3RSZWYgb2JqZWN0LCBKU1ZhbHVlUmVmIGtleQogICAgIGhhbmRsZUV4Y2Vw dGlvbklmTmVlZGVkKHNjb3BlLCBleGVjLCBleGNlcHRpb24pOwogfQogCi1ib29sIEpTT2JqZWN0 RGVsZXRlUHJvcGVydHlLZXkoSlNDb250ZXh0UmVmIGN0eCwgSlNPYmplY3RSZWYgb2JqZWN0LCBK U1ZhbHVlUmVmIGtleSwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKQorYm9vbCBKU09iamVjdERlbGV0 ZVByb3BlcnR5Rm9yS2V5KEpTQ29udGV4dFJlZiBjdHgsIEpTT2JqZWN0UmVmIG9iamVjdCwgSlNW YWx1ZVJlZiBrZXksIEpTVmFsdWVSZWYqIGV4Y2VwdGlvbikKIHsKICAgICBpZiAoIWN0eCkgewog ICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9BUEkvSlNPYmplY3RSZWYuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNP YmplY3RSZWYuaAppbmRleCBkYjU1NjlhNmNiZDBlZTBiN2JjYmZjYzNlMjkyZjUzMjk3NWU2NzZl Li45NzNhYmMzYzRkODE5NjQxZmFjOTA5NmNlYjZiODEzODQ4ZDg3ODUyIDEwMDY0NAotLS0gYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTT2JqZWN0UmVmLmgKKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL0FQSS9KU09iamVjdFJlZi5oCkBAIC01NjIsNyArNTYyLDcgQEAgSlNfRVhQT1JU IGJvb2wgSlNPYmplY3REZWxldGVQcm9wZXJ0eShKU0NvbnRleHRSZWYgY3R4LCBKU09iamVjdFJl ZiBvYmplY3QsIEpTU3QKIEByZXN1bHQgdHJ1ZSBpZiB0aGUgb2JqZWN0IGhhcyBhIHByb3BlcnR5 IHdob3NlIG5hbWUgbWF0Y2hlcyBwcm9wZXJ0eUtleSwgb3RoZXJ3aXNlIGZhbHNlLgogQGRpc2N1 c3Npb24gVGhpcyBmdW5jdGlvbiBpcyB0aGUgc2FtZSBhcyBwZXJmb3JtaW5nICJwcm9wZXJ0eUtl eSBpbiBvYmplY3QiIGZyb20gSmF2YVNjcmlwdC4KICovCi1KU19FWFBPUlQgYm9vbCBKU09iamVj dEhhc1Byb3BlcnR5S2V5KEpTQ29udGV4dFJlZiBjdHgsIEpTT2JqZWN0UmVmIG9iamVjdCwgSlNW YWx1ZVJlZiBwcm9wZXJ0eUtleSwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKSBKU0NfQVBJX0FWQUlM QUJMRShtYWNvc3goSlNDX01BQ19UQkEpLCBpb3MoSlNDX0lPU19UQkEpKTsKK0pTX0VYUE9SVCBi b29sIEpTT2JqZWN0SGFzUHJvcGVydHlGb3JLZXkoSlNDb250ZXh0UmVmIGN0eCwgSlNPYmplY3RS ZWYgb2JqZWN0LCBKU1ZhbHVlUmVmIHByb3BlcnR5S2V5LCBKU1ZhbHVlUmVmKiBleGNlcHRpb24p IEpTQ19BUElfQVZBSUxBQkxFKG1hY29zeChKU0NfTUFDX1RCQSksIGlvcyhKU0NfSU9TX1RCQSkp OwogCiAvKiEKIEBmdW5jdGlvbgpAQCAtNTc0LDcgKzU3NCw3IEBAIEpTX0VYUE9SVCBib29sIEpT T2JqZWN0SGFzUHJvcGVydHlLZXkoSlNDb250ZXh0UmVmIGN0eCwgSlNPYmplY3RSZWYgb2JqZWN0 LCBKU1ZhCiBAcmVzdWx0IFRoZSBwcm9wZXJ0eSdzIHZhbHVlIGlmIG9iamVjdCBoYXMgdGhlIHBy b3BlcnR5IGtleSwgb3RoZXJ3aXNlIHRoZSB1bmRlZmluZWQgdmFsdWUuCiBAZGlzY3Vzc2lvbiBU aGlzIGZ1bmN0aW9uIGlzIHRoZSBzYW1lIGFzIHBlcmZvcm1pbmcgIm9iamVjdFtwcm9wZXJ0eUtl eV0iIGZyb20gSmF2YVNjcmlwdC4KICovCi1KU19FWFBPUlQgSlNWYWx1ZVJlZiBKU09iamVjdEdl dFByb3BlcnR5S2V5KEpTQ29udGV4dFJlZiBjdHgsIEpTT2JqZWN0UmVmIG9iamVjdCwgSlNWYWx1 ZVJlZiBwcm9wZXJ0eUtleSwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKSBKU0NfQVBJX0FWQUlMQUJM RShtYWNvc3goSlNDX01BQ19UQkEpLCBpb3MoSlNDX0lPU19UQkEpKTsKK0pTX0VYUE9SVCBKU1Zh bHVlUmVmIEpTT2JqZWN0R2V0UHJvcGVydHlGb3JLZXkoSlNDb250ZXh0UmVmIGN0eCwgSlNPYmpl Y3RSZWYgb2JqZWN0LCBKU1ZhbHVlUmVmIHByb3BlcnR5S2V5LCBKU1ZhbHVlUmVmKiBleGNlcHRp b24pIEpTQ19BUElfQVZBSUxBQkxFKG1hY29zeChKU0NfTUFDX1RCQSksIGlvcyhKU0NfSU9TX1RC QSkpOwogCiAvKiEKIEBmdW5jdGlvbgpAQCAtNTg3LDcgKzU4Nyw3IEBAIEpTX0VYUE9SVCBKU1Zh bHVlUmVmIEpTT2JqZWN0R2V0UHJvcGVydHlLZXkoSlNDb250ZXh0UmVmIGN0eCwgSlNPYmplY3RS ZWYgb2JqZWN0CiBAcGFyYW0gZXhjZXB0aW9uIEEgcG9pbnRlciB0byBhIEpTVmFsdWVSZWYgaW4g d2hpY2ggdG8gc3RvcmUgYW4gZXhjZXB0aW9uLCBpZiBhbnkuIFBhc3MgTlVMTCBpZiB5b3UgZG8g bm90IGNhcmUgdG8gc3RvcmUgYW4gZXhjZXB0aW9uLgogQGRpc2N1c3Npb24gVGhpcyBmdW5jdGlv biBpcyB0aGUgc2FtZSBhcyBwZXJmb3JtaW5nICJvYmplY3RbcHJvcGVydHlLZXldID0gdmFsdWUi IGZyb20gSmF2YVNjcmlwdC4KICovCi1KU19FWFBPUlQgdm9pZCBKU09iamVjdFNldFByb3BlcnR5 S2V5KEpTQ29udGV4dFJlZiBjdHgsIEpTT2JqZWN0UmVmIG9iamVjdCwgSlNWYWx1ZVJlZiBwcm9w ZXJ0eUtleSwgSlNWYWx1ZVJlZiB2YWx1ZSwgSlNQcm9wZXJ0eUF0dHJpYnV0ZXMgYXR0cmlidXRl cywgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKSBKU0NfQVBJX0FWQUlMQUJMRShtYWNvc3goSlNDX01B Q19UQkEpLCBpb3MoSlNDX0lPU19UQkEpKTsKK0pTX0VYUE9SVCB2b2lkIEpTT2JqZWN0U2V0UHJv cGVydHlGb3JLZXkoSlNDb250ZXh0UmVmIGN0eCwgSlNPYmplY3RSZWYgb2JqZWN0LCBKU1ZhbHVl UmVmIHByb3BlcnR5S2V5LCBKU1ZhbHVlUmVmIHZhbHVlLCBKU1Byb3BlcnR5QXR0cmlidXRlcyBh dHRyaWJ1dGVzLCBKU1ZhbHVlUmVmKiBleGNlcHRpb24pIEpTQ19BUElfQVZBSUxBQkxFKG1hY29z eChKU0NfTUFDX1RCQSksIGlvcyhKU0NfSU9TX1RCQSkpOwogCiAvKiEKIEBmdW5jdGlvbgpAQCAt NTk5LDcgKzU5OSw3IEBAIEpTX0VYUE9SVCB2b2lkIEpTT2JqZWN0U2V0UHJvcGVydHlLZXkoSlND b250ZXh0UmVmIGN0eCwgSlNPYmplY3RSZWYgb2JqZWN0LCBKU1ZhCiBAcmVzdWx0IHRydWUgaWYg dGhlIGRlbGV0ZSBvcGVyYXRpb24gc3VjY2VlZHMsIG90aGVyd2lzZSBmYWxzZSAoZm9yIGV4YW1w bGUsIGlmIHRoZSBwcm9wZXJ0eSBoYXMgdGhlIGtKU1Byb3BlcnR5QXR0cmlidXRlRG9udERlbGV0 ZSBhdHRyaWJ1dGUgc2V0KS4KIEBkaXNjdXNzaW9uIFRoaXMgZnVuY3Rpb24gaXMgdGhlIHNhbWUg YXMgcGVyZm9ybWluZyAiZGVsZXRlIG9iamVjdFtwcm9wZXJ0eUtleV0iIGZyb20gSmF2YVNjcmlw dC4KICovCi1KU19FWFBPUlQgYm9vbCBKU09iamVjdERlbGV0ZVByb3BlcnR5S2V5KEpTQ29udGV4 dFJlZiBjdHgsIEpTT2JqZWN0UmVmIG9iamVjdCwgSlNWYWx1ZVJlZiBwcm9wZXJ0eUtleSwgSlNW YWx1ZVJlZiogZXhjZXB0aW9uKSBKU0NfQVBJX0FWQUlMQUJMRShtYWNvc3goSlNDX01BQ19UQkEp LCBpb3MoSlNDX0lPU19UQkEpKTsKK0pTX0VYUE9SVCBib29sIEpTT2JqZWN0RGVsZXRlUHJvcGVy dHlGb3JLZXkoSlNDb250ZXh0UmVmIGN0eCwgSlNPYmplY3RSZWYgb2JqZWN0LCBKU1ZhbHVlUmVm IHByb3BlcnR5S2V5LCBKU1ZhbHVlUmVmKiBleGNlcHRpb24pIEpTQ19BUElfQVZBSUxBQkxFKG1h Y29zeChKU0NfTUFDX1RCQSksIGlvcyhKU0NfSU9TX1RCQSkpOwogCiAvKiEKIEBmdW5jdGlvbgpk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU1ZhbHVlLmggYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvQVBJL0pTVmFsdWUuaAppbmRleCAwMjRlYmIwYTc1NTBiM2VjZTY5NDQw NDEyN2FkY2MzZTZjYzk3ZGZhLi4yYzIwM2ZiMTczYzgyNmI0NmI0NzUxZmVlNzc0MGM1YTRkYzZl ODhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTVmFsdWUuaAorKysg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTVmFsdWUuaApAQCAtNDgsOSArNDgsOSBAQCBO U19DTEFTU19BVkFJTEFCTEUoMTBfOSwgN18wKQogQGludGVyZmFjZSBKU1ZhbHVlIDogTlNPYmpl Y3QKIAogI2lmIChkZWZpbmVkKF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQpICYmIF9f TUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPCBKU0NfTUFDX1ZFUlNJT05fVEJBKSB8fCAo ZGVmaW5lZChfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCkgJiYgX19JUEhPTkVfT1Nf VkVSU0lPTl9NSU5fUkVRVUlSRUQgPCBKU0NfSU9TX1ZFUlNJT05fVEJBKQotdHlwZWRlZiBOU1N0 cmluZyAqSlNWYWx1ZVByb3BlcnR5S2V5VHlwZTsKK3R5cGVkZWYgTlNTdHJpbmcgKkpTVmFsdWVQ cm9wZXJ0eTsKICNlbHNlCi10eXBlZGVmIGlkIEpTVmFsdWVQcm9wZXJ0eUtleVR5cGU7Cit0eXBl ZGVmIGlkIEpTVmFsdWVQcm9wZXJ0eTsKICNlbmRpZgogCiAvKiEKQEAgLTMyOCwxNCArMzI4LDE0 IEBAIHR5cGVkZWYgaWQgSlNWYWx1ZVByb3BlcnR5S2V5VHlwZTsKICBpZiB0aGUgcHJvcGVydHkg ZG9lcyBub3QgZXhpc3QuCiBAZGlzY3Vzc2lvbiBDb3JyZXNwb25kcyB0byB0aGUgSmF2YVNjcmlw dCBvcGVyYXRpb24gPGNvZGU+b2JqZWN0W3Byb3BlcnR5XTwvY29kZT4uIFBhc3MgYW4gTlNTdHJp bmcgKiB0byBhY2Nlc3MgYSBuYW1lZCBwcm9wZXJ0eS4gT3RoZXIgdmFsaWQgcHJvcGVydGllcyBp bmNsdWRlIHN5bWJvbHMsIG51bWJlcnMsIGFuZCBzdHJpbmdpZmlhYmxlIG9iamVjdHMuIEluIG1h Y09TIDEwLjEzIGFuZCBpT1MgMTEgYW5kIGJlbG93LCAncHJvcGVydHknIHdhcyBhbiBOU1N0cmlu ZyAqLgogKi8KLS0gKEpTVmFsdWUgKil2YWx1ZUZvclByb3BlcnR5OihKU1ZhbHVlUHJvcGVydHlL ZXlUeXBlKXByb3BlcnR5OworLSAoSlNWYWx1ZSAqKXZhbHVlRm9yUHJvcGVydHk6KEpTVmFsdWVQ cm9wZXJ0eSlwcm9wZXJ0eTsKIAogLyohCiBAbWV0aG9kCiBAYWJzdHJhY3QgU2V0IGEgcHJvcGVy dHkgb24gYSBKU1ZhbHVlLgogQGRpc2N1c3Npb24gQ29ycmVzcG9uZHMgdG8gdGhlIEphdmFTY3Jp cHQgb3BlcmF0aW9uIDxjb2RlPm9iamVjdFtwcm9wZXJ0eV0gPSB2YWx1ZTwvY29kZT4uIFBhc3Mg YW4gTlNTdHJpbmcgKiB0byBhY2Nlc3MgYSBuYW1lZCBwcm9wZXJ0eS4gT3RoZXIgdmFsaWQgcHJv cGVydGllcyBpbmNsdWRlIHN5bWJvbHMsIG51bWJlcnMsIGFuZCBzdHJpbmdpZmlhYmxlIG9iamVj dHMuIEluIG1hY09TIDEwLjEzIGFuZCBpT1MgMTEgYW5kIGJlbG93LCAncHJvcGVydHknIHdhcyBh biBOU1N0cmluZyAqLgogKi8KLS0gKHZvaWQpc2V0VmFsdWU6KGlkKXZhbHVlIGZvclByb3BlcnR5 OihKU1ZhbHVlUHJvcGVydHlLZXlUeXBlKXByb3BlcnR5OworLSAodm9pZClzZXRWYWx1ZTooaWQp dmFsdWUgZm9yUHJvcGVydHk6KEpTVmFsdWVQcm9wZXJ0eSlwcm9wZXJ0eTsKIAogLyohCiBAbWV0 aG9kCkBAIC0zNDMsNyArMzQzLDcgQEAgdHlwZWRlZiBpZCBKU1ZhbHVlUHJvcGVydHlLZXlUeXBl OwogQHJlc3VsdCBZRVMgaWYgZGVsZXRpb24gaXMgc3VjY2Vzc2Z1bCwgTk8gb3RoZXJ3aXNlLgog QGRpc2N1c3Npb24gQ29ycmVzcG9uZHMgdG8gdGhlIEphdmFTY3JpcHQgb3BlcmF0aW9uIDxjb2Rl PmRlbGV0ZSBvYmplY3RbcHJvcGVydHldPC9jb2RlPi4gUGFzcyBhbiBOU1N0cmluZyAqIHRvIGFj Y2VzcyBhIG5hbWVkIHByb3BlcnR5LiBPdGhlciB2YWxpZCBwcm9wZXJ0aWVzIGluY2x1ZGUgc3lt Ym9scywgbnVtYmVycywgYW5kIHN0cmluZ2lmaWFibGUgb2JqZWN0cy4gSW4gbWFjT1MgMTAuMTMg YW5kIGlPUyAxMSBhbmQgYmVsb3csICdwcm9wZXJ0eScgd2FzIGFuIE5TU3RyaW5nICouCiAqLwot LSAoQk9PTClkZWxldGVQcm9wZXJ0eTooSlNWYWx1ZVByb3BlcnR5S2V5VHlwZSlwcm9wZXJ0eTsK Ky0gKEJPT0wpZGVsZXRlUHJvcGVydHk6KEpTVmFsdWVQcm9wZXJ0eSlwcm9wZXJ0eTsKIAogLyoh CiBAbWV0aG9kCkBAIC0zNTIsNyArMzUyLDcgQEAgdHlwZWRlZiBpZCBKU1ZhbHVlUHJvcGVydHlL ZXlUeXBlOwogQHJlc3VsdCBSZXR1cm5zIFlFUyBpZiBwcm9wZXJ0eSBpcyBwcmVzZW50IG9uIHRo ZSB2YWx1ZS4KIEBkaXNjdXNzaW9uIENvcnJlc3BvbmRzIHRvIHRoZSBKYXZhU2NyaXB0IG9wZXJh dGlvbiA8Y29kZT5wcm9wZXJ0eSBpbiBvYmplY3Q8L2NvZGU+LiBQYXNzIGFuIE5TU3RyaW5nICog dG8gYWNjZXNzIGEgbmFtZWQgcHJvcGVydHkuIE90aGVyIHZhbGlkIHByb3BlcnRpZXMgaW5jbHVk ZSBzeW1ib2xzLCBudW1iZXJzLCBhbmQgc3RyaW5naWZpYWJsZSBvYmplY3RzLiBJbiBtYWNPUyAx MC4xMyBhbmQgaU9TIDExIGFuZCBiZWxvdywgJ3Byb3BlcnR5JyB3YXMgYW4gTlNTdHJpbmcgKi4K ICovCi0tIChCT09MKWhhc1Byb3BlcnR5OihKU1ZhbHVlUHJvcGVydHlLZXlUeXBlKXByb3BlcnR5 OworLSAoQk9PTCloYXNQcm9wZXJ0eTooSlNWYWx1ZVByb3BlcnR5KXByb3BlcnR5OwogCiAvKiEK IEBtZXRob2QKQEAgLTM2MSw3ICszNjEsNyBAQCB0eXBlZGVmIGlkIEpTVmFsdWVQcm9wZXJ0eUtl eVR5cGU7CiAgVGhpcyBtZXRob2Qgb3BlcmF0ZXMgaW4gYWNjb3JkYW5jZSB3aXRoIHRoZSBPYmpl Y3QuZGVmaW5lUHJvcGVydHkgbWV0aG9kIGluIHRoZSAKICBKYXZhU2NyaXB0IGxhbmd1YWdlLiBQ YXNzIGFuIE5TU3RyaW5nICogdG8gYWNjZXNzIGEgbmFtZWQgcHJvcGVydHkuIE90aGVyIHZhbGlk IHByb3BlcnRpZXMgaW5jbHVkZSBzeW1ib2xzLCBudW1iZXJzLCBhbmQgc3RyaW5naWZpYWJsZSBv YmplY3RzLiBJbiBtYWNPUyAxMC4xMyBhbmQgaU9TIDExIGFuZCBiZWxvdywgJ3Byb3BlcnR5JyB3 YXMgYW4gTlNTdHJpbmcgKi4KICovCi0tICh2b2lkKWRlZmluZVByb3BlcnR5OihKU1ZhbHVlUHJv cGVydHlLZXlUeXBlKXByb3BlcnR5IGRlc2NyaXB0b3I6KGlkKWRlc2NyaXB0b3I7CistICh2b2lk KWRlZmluZVByb3BlcnR5OihKU1ZhbHVlUHJvcGVydHkpcHJvcGVydHkgZGVzY3JpcHRvcjooaWQp ZGVzY3JpcHRvcjsKIAogLyohCiBAbWV0aG9kCkBAIC02MDIsOSArNjAyLDkgQEAgQ3JlYXRlIGEg SlNWYWx1ZSBmcm9tIGEgQ0dSZWN0LgogKi8KIEBpbnRlcmZhY2UgSlNWYWx1ZSAoU3Vic2NyaXB0 U3VwcG9ydCkKIAotLSAoSlNWYWx1ZSAqKW9iamVjdEZvcktleWVkU3Vic2NyaXB0OihKU1ZhbHVl UHJvcGVydHlLZXlUeXBlKWtleTsKKy0gKEpTVmFsdWUgKilvYmplY3RGb3JLZXllZFN1YnNjcmlw dDooSlNWYWx1ZVByb3BlcnR5KWtleTsKIC0gKEpTVmFsdWUgKilvYmplY3RBdEluZGV4ZWRTdWJz Y3JpcHQ6KE5TVUludGVnZXIpaW5kZXg7Ci0tICh2b2lkKXNldE9iamVjdDooaWQpb2JqZWN0IGZv cktleWVkU3Vic2NyaXB0OihKU1ZhbHVlUHJvcGVydHlLZXlUeXBlKWtleTsKKy0gKHZvaWQpc2V0 T2JqZWN0OihpZClvYmplY3QgZm9yS2V5ZWRTdWJzY3JpcHQ6KEpTVmFsdWVQcm9wZXJ0eSlrZXk7 CiAtICh2b2lkKXNldE9iamVjdDooaWQpb2JqZWN0IGF0SW5kZXhlZFN1YnNjcmlwdDooTlNVSW50 ZWdlcilpbmRleDsKIAogQGVuZApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQ SS9KU1ZhbHVlLm1tIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU1ZhbHVlLm1tCmluZGV4 IDNmZjVjNDc2ZDY4OTAyYzI2NDY2OWE5N2JmMjgyODUwNDY1ZTk3YjguLjU0MzUzMWJhNGI4YmY2 MjgwZTYzMjEwZjllNzZjMTBhZmU3Y2NiYjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9BUEkvSlNWYWx1ZS5tbQorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTVmFs dWUubW0KQEAgLTI2NCw3ICsyNjQsNyBAQCBpbmxpbmUgRXhwZWN0ZWQ8UmVzdWx0LCBKU1ZhbHVl UmVmPiBwZXJmb3JtUHJvcGVydHlPcGVyYXRpb24oTlNTdHJpbmdGdW5jdGlvbiBzdAogCiAtIChK U1ZhbHVlICopdmFsdWVGb3JQcm9wZXJ0eTooaWQpa2V5CiB7Ci0gICAgYXV0byByZXN1bHQgPSBw ZXJmb3JtUHJvcGVydHlPcGVyYXRpb248SlNWYWx1ZVJlZj4oSlNPYmplY3RHZXRQcm9wZXJ0eSwg SlNPYmplY3RHZXRQcm9wZXJ0eUtleSwgc2VsZiwga2V5KTsKKyAgICBhdXRvIHJlc3VsdCA9IHBl cmZvcm1Qcm9wZXJ0eU9wZXJhdGlvbjxKU1ZhbHVlUmVmPihKU09iamVjdEdldFByb3BlcnR5LCBK U09iamVjdEdldFByb3BlcnR5Rm9yS2V5LCBzZWxmLCBrZXkpOwogICAgIGlmICghcmVzdWx0KQog ICAgICAgICByZXR1cm4gW19jb250ZXh0IHZhbHVlRnJvbU5vdGlmeUV4Y2VwdGlvbjpyZXN1bHQu ZXJyb3IoKV07CiAKQEAgLTI3Miw3ICsyNzIsNyBAQCBpbmxpbmUgRXhwZWN0ZWQ8UmVzdWx0LCBK U1ZhbHVlUmVmPiBwZXJmb3JtUHJvcGVydHlPcGVyYXRpb24oTlNTdHJpbmdGdW5jdGlvbiBzdAog fQogCiAKLS0gKHZvaWQpc2V0VmFsdWU6KGlkKXZhbHVlIGZvclByb3BlcnR5OihKU1ZhbHVlUHJv cGVydHlLZXlUeXBlKWtleQorLSAodm9pZClzZXRWYWx1ZTooaWQpdmFsdWUgZm9yUHJvcGVydHk6 KEpTVmFsdWVQcm9wZXJ0eSlrZXkKIHsKICAgICAvLyBXZSBuZWVkIFVuaXQgYnVzaW5lc3MgYmVj YXVzZSB2b2lkIGNhbid0IGJlIGFzc2lnbmVkIHRvIGluIHBlcmZvcm1Qcm9wZXJ0eU9wZXJhdGlv biBhbmQgSSBkb24ndCB3YW50IHRvIGR1cGxpY2F0ZSB0aGUgY29kZS4uLgogICAgIHVzaW5nIFVu aXQgPSBzdGQ6OnR1cGxlPD47CkBAIC0yODIsNyArMjgyLDcgQEAgaW5saW5lIEV4cGVjdGVkPFJl c3VsdCwgSlNWYWx1ZVJlZj4gcGVyZm9ybVByb3BlcnR5T3BlcmF0aW9uKE5TU3RyaW5nRnVuY3Rp b24gc3QKICAgICB9OwogCiAgICAgYXV0byBqc1ZhbHVlU2V0UHJvcGVydHkgPSBbXSAoYXV0by4u LiBhcmdzKSAtPiBVbml0IHsKLSAgICAgICAgSlNPYmplY3RTZXRQcm9wZXJ0eUtleShhcmdzLi4u KTsKKyAgICAgICAgSlNPYmplY3RTZXRQcm9wZXJ0eUZvcktleShhcmdzLi4uKTsKICAgICAgICAg cmV0dXJuIHsgfTsKICAgICB9OwogCkBAIC0yOTMsMjggKzI5MywyOCBAQCBpbmxpbmUgRXhwZWN0 ZWQ8UmVzdWx0LCBKU1ZhbHVlUmVmPiBwZXJmb3JtUHJvcGVydHlPcGVyYXRpb24oTlNTdHJpbmdG dW5jdGlvbiBzdAogICAgIH0KIH0KIAotLSAoQk9PTClkZWxldGVQcm9wZXJ0eTooSlNWYWx1ZVBy b3BlcnR5S2V5VHlwZSlrZXkKKy0gKEJPT0wpZGVsZXRlUHJvcGVydHk6KEpTVmFsdWVQcm9wZXJ0 eSlrZXkKIHsKLSAgICBFeHBlY3RlZDxCT09MLCBKU1ZhbHVlUmVmPiByZXN1bHQgPSBwZXJmb3Jt UHJvcGVydHlPcGVyYXRpb248Qk9PTD4oSlNPYmplY3REZWxldGVQcm9wZXJ0eSwgSlNPYmplY3RE ZWxldGVQcm9wZXJ0eUtleSwgc2VsZiwga2V5KTsKKyAgICBFeHBlY3RlZDxCT09MLCBKU1ZhbHVl UmVmPiByZXN1bHQgPSBwZXJmb3JtUHJvcGVydHlPcGVyYXRpb248Qk9PTD4oSlNPYmplY3REZWxl dGVQcm9wZXJ0eSwgSlNPYmplY3REZWxldGVQcm9wZXJ0eUZvcktleSwgc2VsZiwga2V5KTsKICAg ICBpZiAoIXJlc3VsdCkKICAgICAgICAgcmV0dXJuIFtfY29udGV4dCBib29sRnJvbU5vdGlmeUV4 Y2VwdGlvbjpyZXN1bHQuZXJyb3IoKV07CiAgICAgcmV0dXJuIHJlc3VsdC52YWx1ZSgpOwogfQog Ci0tIChCT09MKWhhc1Byb3BlcnR5OihKU1ZhbHVlUHJvcGVydHlLZXlUeXBlKWtleQorLSAoQk9P TCloYXNQcm9wZXJ0eTooSlNWYWx1ZVByb3BlcnR5KWtleQogewogICAgIC8vIFRoZSBDLWFwaSBk b2Vzbid0IHJldHVybiBhbiBleGNlcHRpb24gdmFsdWUgZm9yIHRoZSBzdHJpbmcgdmVyc2lvbiBv ZiBoYXMgcHJvcGVydHkuCiAgICAgYXV0byBzdHJpbmdIYXNQcm9wZXJ0eSA9IFtdIChKU0NvbnRl eHRSZWYgY3R4LCBKU09iamVjdFJlZiBvYmplY3QsIEpTU3RyaW5nUmVmIHByb3BlcnR5TmFtZSwg SlNWYWx1ZVJlZiopIC0+IEJPT0wgewogICAgICAgICByZXR1cm4gSlNPYmplY3RIYXNQcm9wZXJ0 eShjdHgsIG9iamVjdCwgcHJvcGVydHlOYW1lKTsKICAgICB9OwogCi0gICAgRXhwZWN0ZWQ8Qk9P TCwgSlNWYWx1ZVJlZj4gcmVzdWx0ID0gcGVyZm9ybVByb3BlcnR5T3BlcmF0aW9uPEJPT0w+KHN0 cmluZ0hhc1Byb3BlcnR5LCBKU09iamVjdEhhc1Byb3BlcnR5S2V5LCBzZWxmLCBrZXkpOworICAg IEV4cGVjdGVkPEJPT0wsIEpTVmFsdWVSZWY+IHJlc3VsdCA9IHBlcmZvcm1Qcm9wZXJ0eU9wZXJh dGlvbjxCT09MPihzdHJpbmdIYXNQcm9wZXJ0eSwgSlNPYmplY3RIYXNQcm9wZXJ0eUZvcktleSwg c2VsZiwga2V5KTsKICAgICBpZiAoIXJlc3VsdCkKICAgICAgICAgcmV0dXJuIFtfY29udGV4dCBi b29sRnJvbU5vdGlmeUV4Y2VwdGlvbjpyZXN1bHQuZXJyb3IoKV07CiAgICAgcmV0dXJuIHJlc3Vs dC52YWx1ZSgpOwogfQogCi0tICh2b2lkKWRlZmluZVByb3BlcnR5OihKU1ZhbHVlUHJvcGVydHlL ZXlUeXBlKWtleSBkZXNjcmlwdG9yOihpZClkZXNjcmlwdG9yCistICh2b2lkKWRlZmluZVByb3Bl cnR5OihKU1ZhbHVlUHJvcGVydHkpa2V5IGRlc2NyaXB0b3I6KGlkKWRlc2NyaXB0b3IKIHsKICAg ICBbW19jb250ZXh0IGdsb2JhbE9iamVjdF1bQCJPYmplY3QiXSBpbnZva2VNZXRob2Q6QCJkZWZp bmVQcm9wZXJ0eSIgd2l0aEFyZ3VtZW50czpAWyBzZWxmLCBrZXksIGRlc2NyaXB0b3IgXV07CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL3Rlc3RzL3Rlc3RhcGkuY3Bw IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS90ZXN0cy90ZXN0YXBpLmNwcAppbmRleCA0NWMz NmY4OWVjMmNlZmU1MWU3ZGI1OWMzODU3MWE1ODAzMjYzMjg2Li44YTU3NzdjNTNkNWQyNjY5ZDY3 MTRkN2ZiNTE0YTJjMDg3NmQ2YWU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv QVBJL3Rlc3RzL3Rlc3RhcGkuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvdGVz dHMvdGVzdGFwaS5jcHAKQEAgLTI5Myw3ICsyOTMsNyBAQCBpbnQgVGVzdEFQSTo6cnVuKCkKICAg ICAgICAgICAgICAgICAgICAgWyZdIHsKICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBj YWxsRnVuY3Rpb24oZ2V0RnVuY3Rpb24sIG9iamVjdCwga2V5KTsKICAgICAgICAgICAgICAgICAg ICAgfSwgWyZdIChKU1ZhbHVlUmVmKiBleGNlcHRpb24pIHsKLSAgICAgICAgICAgICAgICAgICAg ICAgIHJldHVybiBKU09iamVjdEdldFByb3BlcnR5S2V5KGNvbnRleHQsIG9iamVjdCwga2V5LCBl eGNlcHRpb24pOworICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIEpTT2JqZWN0R2V0UHJv cGVydHlGb3JLZXkoY29udGV4dCwgb2JqZWN0LCBrZXksIGV4Y2VwdGlvbik7CiAgICAgICAgICAg ICAgICAgICAgIH0sICJjaGVja2luZyBnZXQgcHJvcGVydHkga2V5cyIpOwogICAgICAgICAgICAg fQogICAgICAgICB9CkBAIC0zMTMsNyArMzEzLDcgQEAgaW50IFRlc3RBUEk6OnJ1bigpCiAgICAg ICAgICAgICAgICAgICAgIFsmXSB7CiAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gY2Fs bEZ1bmN0aW9uKHNldEZ1bmN0aW9uLCBqc09iamVjdCwga2V5LCB0aGVBbnN3ZXIpOwogICAgICAg ICAgICAgICAgICAgICB9ICwgWyZdIChKU1ZhbHVlUmVmKiBleGNlcHRpb24pIHsKLSAgICAgICAg ICAgICAgICAgICAgICAgIEpTT2JqZWN0U2V0UHJvcGVydHlLZXkoY29udGV4dCwgYXBpT2JqZWN0 LCBrZXksIHRoZUFuc3dlciwga0pTUHJvcGVydHlBdHRyaWJ1dGVOb25lLCBleGNlcHRpb24pOwor ICAgICAgICAgICAgICAgICAgICAgICAgSlNPYmplY3RTZXRQcm9wZXJ0eUZvcktleShjb250ZXh0 LCBhcGlPYmplY3QsIGtleSwgdGhlQW5zd2VyLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZU5vbmUsIGV4 Y2VwdGlvbik7CiAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gSlNWYWx1ZU1ha2VVbmRl ZmluZWQoY29udGV4dCk7CiAgICAgICAgICAgICAgICAgICAgIH0sICJzZXR0aW5nIHByb3BlcnR5 IGtleXMgdG8gdGhlIGFuc3dlciIpOwogICAgICAgICAgICAgICAgIC8vIENoZWNrIGdldCBpcyB0 aGUgc2FtZSBvbiBBUEkgb2JqZWN0LgpAQCAtMzIxLDE0ICszMjEsMTQgQEAgaW50IFRlc3RBUEk6 OnJ1bigpCiAgICAgICAgICAgICAgICAgICAgIFsmXSB7CiAgICAgICAgICAgICAgICAgICAgICAg ICByZXR1cm4gY2FsbEZ1bmN0aW9uKGdldEZ1bmN0aW9uLCBhcGlPYmplY3QsIGtleSk7CiAgICAg ICAgICAgICAgICAgICAgIH0sIFsmXSAoSlNWYWx1ZVJlZiogZXhjZXB0aW9uKSB7Ci0gICAgICAg ICAgICAgICAgICAgICAgICByZXR1cm4gSlNPYmplY3RHZXRQcm9wZXJ0eUtleShjb250ZXh0LCBh cGlPYmplY3QsIGtleSwgZXhjZXB0aW9uKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVy biBKU09iamVjdEdldFByb3BlcnR5Rm9yS2V5KGNvbnRleHQsIGFwaU9iamVjdCwga2V5LCBleGNl cHRpb24pOwogICAgICAgICAgICAgICAgICAgICB9LCAiZ2V0dGluZyBwcm9wZXJ0eSBrZXlzIGZy b20gQVBJIG9iamVjdHMiKTsKICAgICAgICAgICAgICAgICAvLyBDaGVjayBnZXQgaXMgdGhlIHNh bWUgb24gcmVzcGVjdGl2ZSBvYmplY3RzLgogICAgICAgICAgICAgICAgIGNoZWNrSlNBbmRBUElN YXRjaCgKICAgICAgICAgICAgICAgICAgICAgWyZdIHsKICAgICAgICAgICAgICAgICAgICAgICAg IHJldHVybiBjYWxsRnVuY3Rpb24oZ2V0RnVuY3Rpb24sIGpzT2JqZWN0LCBrZXkpOwogICAgICAg ICAgICAgICAgICAgICB9LCBbJl0gKEpTVmFsdWVSZWYqIGV4Y2VwdGlvbikgewotICAgICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIEpTT2JqZWN0R2V0UHJvcGVydHlLZXkoY29udGV4dCwgYXBp T2JqZWN0LCBrZXksIGV4Y2VwdGlvbik7CisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4g SlNPYmplY3RHZXRQcm9wZXJ0eUZvcktleShjb250ZXh0LCBhcGlPYmplY3QsIGtleSwgZXhjZXB0 aW9uKTsKICAgICAgICAgICAgICAgICAgICAgfSwgImdldHRpbmcgcHJvcGVydHkga2V5cyBmcm9t IHJlc3BlY3RpdmUgb2JqZWN0cyIpOwogICAgICAgICAgICAgfQogICAgICAgICB9CkBAIC0zNDcs NyArMzQ3LDcgQEAgaW50IFRlc3RBUEk6OnJ1bigpCiAgICAgICAgICAgICAgICAgICAgIFsmXSB7 CiAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gY2FsbEZ1bmN0aW9uKGhhc0Z1bmN0aW9u LCBvYmplY3QsIGtleSk7CiAgICAgICAgICAgICAgICAgICAgIH0sIFsmXSAoSlNWYWx1ZVJlZiog ZXhjZXB0aW9uKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gSlNWYWx1ZU1ha2VC b29sZWFuKGNvbnRleHQsIEpTT2JqZWN0SGFzUHJvcGVydHlLZXkoY29udGV4dCwgb2JqZWN0LCBr ZXksIGV4Y2VwdGlvbikpOworICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIEpTVmFsdWVN YWtlQm9vbGVhbihjb250ZXh0LCBKU09iamVjdEhhc1Byb3BlcnR5Rm9yS2V5KGNvbnRleHQsIG9i amVjdCwga2V5LCBleGNlcHRpb24pKTsKICAgICAgICAgICAgICAgICAgICAgfSwgImNoZWNraW5n IGhhcyBwcm9wZXJ0eSBrZXlzIHVuc2V0Iik7CiAKICAgICAgICAgICAgICAgICBjaGVjayghIWNh bGxGdW5jdGlvbihzZXRGdW5jdGlvbiwgb2JqZWN0LCBrZXksIHRoZUFuc3dlciksICJzZXQgcHJv cGVydHkgdG8gdGhlIGFuc3dlciIpOwpAQCAtMzU2LDcgKzM1Niw3IEBAIGludCBUZXN0QVBJOjpy dW4oKQogICAgICAgICAgICAgICAgICAgICBbJl0gewogICAgICAgICAgICAgICAgICAgICAgICAg cmV0dXJuIGNhbGxGdW5jdGlvbihoYXNGdW5jdGlvbiwgb2JqZWN0LCBrZXkpOwogICAgICAgICAg ICAgICAgICAgICB9LCBbJl0gKEpTVmFsdWVSZWYqIGV4Y2VwdGlvbikgewotICAgICAgICAgICAg ICAgICAgICAgICAgcmV0dXJuIEpTVmFsdWVNYWtlQm9vbGVhbihjb250ZXh0LCBKU09iamVjdEhh c1Byb3BlcnR5S2V5KGNvbnRleHQsIG9iamVjdCwga2V5LCBleGNlcHRpb24pKTsKKyAgICAgICAg ICAgICAgICAgICAgICAgIHJldHVybiBKU1ZhbHVlTWFrZUJvb2xlYW4oY29udGV4dCwgSlNPYmpl Y3RIYXNQcm9wZXJ0eUZvcktleShjb250ZXh0LCBvYmplY3QsIGtleSwgZXhjZXB0aW9uKSk7CiAg ICAgICAgICAgICAgICAgICAgIH0sICJjaGVja2luZyBoYXMgcHJvcGVydHkga2V5cyBzZXQiKTsK ICAgICAgICAgICAgIH0KICAgICAgICAgfQpAQCAtMzc1LDcgKzM3NSw3IEBAIGludCBUZXN0QVBJ OjpydW4oKQogICAgICAgICAgICAgICAgICAgICBbJl0gewogICAgICAgICAgICAgICAgICAgICAg ICAgcmV0dXJuIGNhbGxGdW5jdGlvbihkZWxldGVGdW5jdGlvbiwgb2JqZWN0LCBrZXkpOwogICAg ICAgICAgICAgICAgICAgICB9LCBbJl0gKEpTVmFsdWVSZWYqIGV4Y2VwdGlvbikgewotICAgICAg ICAgICAgICAgICAgICAgICAgcmV0dXJuIEpTVmFsdWVNYWtlQm9vbGVhbihjb250ZXh0LCBKU09i amVjdERlbGV0ZVByb3BlcnR5S2V5KGNvbnRleHQsIG9iamVjdCwga2V5LCBleGNlcHRpb24pKTsK KyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBKU1ZhbHVlTWFrZUJvb2xlYW4oY29udGV4 dCwgSlNPYmplY3REZWxldGVQcm9wZXJ0eUZvcktleShjb250ZXh0LCBvYmplY3QsIGtleSwgZXhj ZXB0aW9uKSk7CiAgICAgICAgICAgICAgICAgICAgIH0sICJjaGVja2luZyBoYXMgcHJvcGVydHkg a2V5cyB1bnNldCIpOwogCiAgICAgICAgICAgICAgICAgY2hlY2soISFjYWxsRnVuY3Rpb24oc2V0 RnVuY3Rpb24sIG9iamVjdCwga2V5LCB0aGVBbnN3ZXIpLCAic2V0IHByb3BlcnR5IHRvIHRoZSBh bnN3ZXIiKTsKQEAgLTM4NCw3ICszODQsNyBAQCBpbnQgVGVzdEFQSTo6cnVuKCkKICAgICAgICAg ICAgICAgICAgICAgWyZdIHsKICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBjYWxsRnVu Y3Rpb24oZGVsZXRlRnVuY3Rpb24sIG9iamVjdCwga2V5KTsKICAgICAgICAgICAgICAgICAgICAg fSwgWyZdIChKU1ZhbHVlUmVmKiBleGNlcHRpb24pIHsKLSAgICAgICAgICAgICAgICAgICAgICAg IHJldHVybiBKU1ZhbHVlTWFrZUJvb2xlYW4oY29udGV4dCwgSlNPYmplY3REZWxldGVQcm9wZXJ0 eUtleShjb250ZXh0LCBvYmplY3QsIGtleSwgZXhjZXB0aW9uKSk7CisgICAgICAgICAgICAgICAg ICAgICAgICByZXR1cm4gSlNWYWx1ZU1ha2VCb29sZWFuKGNvbnRleHQsIEpTT2JqZWN0RGVsZXRl UHJvcGVydHlGb3JLZXkoY29udGV4dCwgb2JqZWN0LCBrZXksIGV4Y2VwdGlvbikpOwogICAgICAg ICAgICAgICAgICAgICB9LCAiY2hlY2tpbmcgaGFzIHByb3BlcnR5IGtleXMgc2V0Iik7CiAgICAg ICAgICAgICB9CiAgICAgICAgIH0K