121195 2013-09-11 17:45:03 -0700 Use the new C++11 function declaration syntax throughout our hash collection classes 2013-09-11 19:16:38 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca benjamin cmarcelo commit-queue darin oldest_to_newest 928067 0 andersca 2013-09-11 17:45:03 -0700 Use the new C++11 function declaration syntax throughout our hash collection classes 928069 1 211372 andersca 2013-09-11 17:46:27 -0700 Created attachment 211372 Patch 928075 2 commit-queue 2013-09-11 17:49:25 -0700 Attachment 211372 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WTF/ChangeLog', u'Source/WTF/wtf/HashMap.h', u'Source/WTF/wtf/HashSet.h', u'Source/WTF/wtf/HashTable.h']" exit_code: 1 Source/WTF/wtf/HashMap.h:333: Missing spaces around >> [whitespace/operators] [3] Source/WTF/wtf/HashMap.h:339: Missing spaces around >> [whitespace/operators] [3] Source/WTF/wtf/HashMap.h:357: Missing spaces around >> [whitespace/operators] [3] Total errors found: 3 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 928098 3 andersca 2013-09-11 19:16:38 -0700 Committed r155585: <http://trac.webkit.org/changeset/155585> 211372 2013-09-11 17:46:27 -0700 2013-09-11 19:14:58 -0700 Patch bug-121195-20130911174627.patch text/plain 16690 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU1NTgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGQ5YWY2ZDQ5MzEwYjdiZjI0MjNmNzcw MDc0MWI3ZmM0NDUwMThmNzIuLmUzYTU1ZTVkZjVjZGQ0NjhlNzU1NzEyZjBiNDk2NTJlZDQ2Yjhi ZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAKIDIwMTMtMDktMTEgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KIAorICAgICAgICBVc2UgdGhlIG5ldyBDKysxMSBmdW5jdGlvbiBk ZWNsYXJhdGlvbiBzeW50YXggdGhyb3VnaG91dCBvdXIgaGFzaCBjb2xsZWN0aW9uIGNsYXNzZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTE5NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd3RmL0hh c2hNYXAuaDoKKyAgICAgICAgKiB3dGYvSGFzaFNldC5oOgorICAgICAgICAqIHd0Zi9IYXNoVGFi bGUuaDoKKworMjAxMy0wOS0xMSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29t PgorCiAgICAgICAgIEFkZCBIYXNoU2V0Ojp0YWtlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjExOTIKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93 dGYvSGFzaE1hcC5oIGIvU291cmNlL1dURi93dGYvSGFzaE1hcC5oCmluZGV4IGU3MGQzYmRhMjRk MjU4YjBjOGY5ODBiODdlZTAyNmRjZTQ5ZjZmMjYuLjNmOGMzNzhkNzA3MjU3M2U3MjljMTVmOTVh NzZjMDgyMGI5YmM5ZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0hhc2hNYXAuaAorKysg Yi9Tb3VyY2UvV1RGL3d0Zi9IYXNoTWFwLmgKQEAgLTE3MCwxMSArMTcwLDEwIEBAIG5hbWVzcGFj ZSBXVEYgewogICAgICAgICBwcml2YXRlOgogICAgICAgICAgICAgZnJpZW5kIGNsYXNzIEhhc2hN YXA7CiAKLSAgICAgICAgICAgIC8vIFRoZXNlIGFyZSBpbnRlbnRpb25hbGx5IG5vdCBpbXBsZW1l bnRlZC4KLSAgICAgICAgICAgIEhhc2hNYXBLZXlzUHJveHkoKTsKLSAgICAgICAgICAgIEhhc2hN YXBLZXlzUHJveHkoY29uc3QgSGFzaE1hcEtleXNQcm94eSYpOwotICAgICAgICAgICAgSGFzaE1h cEtleXNQcm94eSYgb3BlcmF0b3I9KGNvbnN0IEhhc2hNYXBLZXlzUHJveHkmKTsKLSAgICAgICAg ICAgIH5IYXNoTWFwS2V5c1Byb3h5KCk7CisgICAgICAgICAgICBIYXNoTWFwS2V5c1Byb3h5KCkg V1RGX0RFTEVURURfRlVOQ1RJT047CisgICAgICAgICAgICBIYXNoTWFwS2V5c1Byb3h5KGNvbnN0 IEhhc2hNYXBLZXlzUHJveHkmKSBXVEZfREVMRVRFRF9GVU5DVElPTjsKKyAgICAgICAgICAgIEhh c2hNYXBLZXlzUHJveHkmIG9wZXJhdG9yPShjb25zdCBIYXNoTWFwS2V5c1Byb3h5JikgV1RGX0RF TEVURURfRlVOQ1RJT047CisgICAgICAgICAgICB+SGFzaE1hcEtleXNQcm94eSgpIFdURl9ERUxF VEVEX0ZVTkNUSU9OOwogICAgIH07CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBLZXlBcmcsIHR5 cGVuYW1lIE1hcHBlZEFyZywgdHlwZW5hbWUgSGFzaEFyZywgIHR5cGVuYW1lIEtleVRyYWl0c0Fy ZywgdHlwZW5hbWUgTWFwcGVkVHJhaXRzQXJnPgpAQCAtMjA5LDEwICsyMDgsMTAgQEAgbmFtZXNw YWNlIFdURiB7CiAgICAgICAgICAgICBmcmllbmQgY2xhc3MgSGFzaE1hcDsKIAogICAgICAgICAg ICAgLy8gVGhlc2UgYXJlIGludGVudGlvbmFsbHkgbm90IGltcGxlbWVudGVkLgotICAgICAgICAg ICAgSGFzaE1hcFZhbHVlc1Byb3h5KCk7Ci0gICAgICAgICAgICBIYXNoTWFwVmFsdWVzUHJveHko Y29uc3QgSGFzaE1hcFZhbHVlc1Byb3h5Jik7Ci0gICAgICAgICAgICBIYXNoTWFwVmFsdWVzUHJv eHkmIG9wZXJhdG9yPShjb25zdCBIYXNoTWFwVmFsdWVzUHJveHkmKTsKLSAgICAgICAgICAgIH5I YXNoTWFwVmFsdWVzUHJveHkoKTsKKyAgICAgICAgICAgIEhhc2hNYXBWYWx1ZXNQcm94eSgpIFdU Rl9ERUxFVEVEX0ZVTkNUSU9OOworICAgICAgICAgICAgSGFzaE1hcFZhbHVlc1Byb3h5KGNvbnN0 IEhhc2hNYXBWYWx1ZXNQcm94eSYpIFdURl9ERUxFVEVEX0ZVTkNUSU9OOworICAgICAgICAgICAg SGFzaE1hcFZhbHVlc1Byb3h5JiBvcGVyYXRvcj0oY29uc3QgSGFzaE1hcFZhbHVlc1Byb3h5Jikg V1RGX0RFTEVURURfRlVOQ1RJT047CisgICAgICAgICAgICB+SGFzaE1hcFZhbHVlc1Byb3h5KCkg V1RGX0RFTEVURURfRlVOQ1RJT047CiAgICAgfTsKIAogICAgIHRlbXBsYXRlPHR5cGVuYW1lIEtl eVRyYWl0cywgdHlwZW5hbWUgTWFwcGVkVHJhaXRzPiBzdHJ1Y3QgSGFzaE1hcFZhbHVlVHJhaXRz IDogS2V5VmFsdWVQYWlySGFzaFRyYWl0czxLZXlUcmFpdHMsIE1hcHBlZFRyYWl0cz4gewpAQCAt MjcwLDM3ICsyNjksMzcgQEAgbmFtZXNwYWNlIFdURiB7CiAgICAgfQogCiAgICAgdGVtcGxhdGU8 dHlwZW5hbWUgVCwgdHlwZW5hbWUgVSwgdHlwZW5hbWUgViwgdHlwZW5hbWUgVywgdHlwZW5hbWUg WD4KLSAgICBpbmxpbmUgdHlwZW5hbWUgSGFzaE1hcDxULCBVLCBWLCBXLCBYPjo6aXRlcmF0b3Ig SGFzaE1hcDxULCBVLCBWLCBXLCBYPjo6YmVnaW4oKQorICAgIGlubGluZSBhdXRvIEhhc2hNYXA8 VCwgVSwgViwgVywgWD46OmJlZ2luKCkgLT4gaXRlcmF0b3IKICAgICB7CiAgICAgICAgIHJldHVy biBtX2ltcGwuYmVnaW4oKTsKICAgICB9CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBl bmFtZSBVLCB0eXBlbmFtZSBWLCB0eXBlbmFtZSBXLCB0eXBlbmFtZSBYPgotICAgIGlubGluZSB0 eXBlbmFtZSBIYXNoTWFwPFQsIFUsIFYsIFcsIFg+OjppdGVyYXRvciBIYXNoTWFwPFQsIFUsIFYs IFcsIFg+OjplbmQoKQorICAgIGlubGluZSBhdXRvIEhhc2hNYXA8VCwgVSwgViwgVywgWD46OmVu ZCgpIC0+IGl0ZXJhdG9yCiAgICAgewogICAgICAgICByZXR1cm4gbV9pbXBsLmVuZCgpOwogICAg IH0KIAogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHR5cGVuYW1lIFUsIHR5cGVuYW1lIFYsIHR5 cGVuYW1lIFcsIHR5cGVuYW1lIFg+Ci0gICAgaW5saW5lIHR5cGVuYW1lIEhhc2hNYXA8VCwgVSwg ViwgVywgWD46OmNvbnN0X2l0ZXJhdG9yIEhhc2hNYXA8VCwgVSwgViwgVywgWD46OmJlZ2luKCkg Y29uc3QKKyAgICBpbmxpbmUgYXV0byBIYXNoTWFwPFQsIFUsIFYsIFcsIFg+OjpiZWdpbigpIGNv bnN0IC0+IGNvbnN0X2l0ZXJhdG9yCiAgICAgewogICAgICAgICByZXR1cm4gbV9pbXBsLmJlZ2lu KCk7CiAgICAgfQogCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUgVSwgdHlwZW5h bWUgViwgdHlwZW5hbWUgVywgdHlwZW5hbWUgWD4KLSAgICBpbmxpbmUgdHlwZW5hbWUgSGFzaE1h cDxULCBVLCBWLCBXLCBYPjo6Y29uc3RfaXRlcmF0b3IgSGFzaE1hcDxULCBVLCBWLCBXLCBYPjo6 ZW5kKCkgY29uc3QKKyAgICBpbmxpbmUgYXV0byBIYXNoTWFwPFQsIFUsIFYsIFcsIFg+OjplbmQo KSBjb25zdCAtPiBjb25zdF9pdGVyYXRvcgogICAgIHsKICAgICAgICAgcmV0dXJuIG1faW1wbC5l bmQoKTsKICAgICB9CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFtZSBVLCB0eXBl bmFtZSBWLCB0eXBlbmFtZSBXLCB0eXBlbmFtZSBYPgotICAgIGlubGluZSB0eXBlbmFtZSBIYXNo TWFwPFQsIFUsIFYsIFcsIFg+OjppdGVyYXRvciBIYXNoTWFwPFQsIFUsIFYsIFcsIFg+OjpmaW5k KGNvbnN0IEtleVR5cGUmIGtleSkKKyAgICBpbmxpbmUgYXV0byBIYXNoTWFwPFQsIFUsIFYsIFcs IFg+OjpmaW5kKGNvbnN0IEtleVR5cGUmIGtleSkgLT4gaXRlcmF0b3IKICAgICB7CiAgICAgICAg IHJldHVybiBtX2ltcGwuZmluZChrZXkpOwogICAgIH0KIAogICAgIHRlbXBsYXRlPHR5cGVuYW1l IFQsIHR5cGVuYW1lIFUsIHR5cGVuYW1lIFYsIHR5cGVuYW1lIFcsIHR5cGVuYW1lIFg+Ci0gICAg aW5saW5lIHR5cGVuYW1lIEhhc2hNYXA8VCwgVSwgViwgVywgWD46OmNvbnN0X2l0ZXJhdG9yIEhh c2hNYXA8VCwgVSwgViwgVywgWD46OmZpbmQoY29uc3QgS2V5VHlwZSYga2V5KSBjb25zdAorICAg IGlubGluZSBhdXRvIEhhc2hNYXA8VCwgVSwgViwgVywgWD46OmZpbmQoY29uc3QgS2V5VHlwZSYg a2V5KSBjb25zdCAtPiBjb25zdF9pdGVyYXRvcgogICAgIHsKICAgICAgICAgcmV0dXJuIG1faW1w bC5maW5kKGtleSk7CiAgICAgfQpAQCAtMzI5LDIyICszMjgsMTkgQEAgbmFtZXNwYWNlIFdURiB7 CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFtZSBVLCB0eXBlbmFtZSBWLCB0eXBl bmFtZSBXLCB0eXBlbmFtZSBYPgogICAgIHRlbXBsYXRlPHR5cGVuYW1lIEhhc2hUcmFuc2xhdG9y LCB0eXBlbmFtZSBUWVBFPgotICAgIGlubGluZSBib29sCi0gICAgSGFzaE1hcDxULCBVLCBWLCBX LCBYPjo6Y29udGFpbnMoY29uc3QgVFlQRSYgdmFsdWUpIGNvbnN0CisgICAgaW5saW5lIGJvb2wg SGFzaE1hcDxULCBVLCBWLCBXLCBYPjo6Y29udGFpbnMoY29uc3QgVFlQRSYgdmFsdWUpIGNvbnN0 CiAgICAgewotICAgICAgICByZXR1cm4gbV9pbXBsLnRlbXBsYXRlIGNvbnRhaW5zPEhhc2hNYXBU cmFuc2xhdG9yQWRhcHRlcjxWYWx1ZVRyYWl0cywgSGFzaFRyYW5zbGF0b3I+ID4odmFsdWUpOwor ICAgICAgICByZXR1cm4gbV9pbXBsLnRlbXBsYXRlIGNvbnRhaW5zPEhhc2hNYXBUcmFuc2xhdG9y QWRhcHRlcjxWYWx1ZVRyYWl0cywgSGFzaFRyYW5zbGF0b3I+Pih2YWx1ZSk7CiAgICAgfQogCiAg ICAgdGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUgVSwgdHlwZW5hbWUgViwgdHlwZW5hbWUg VywgdHlwZW5hbWUgWD4KLSAgICB0eXBlbmFtZSBIYXNoTWFwPFQsIFUsIFYsIFcsIFg+OjpBZGRS ZXN1bHQKLSAgICBIYXNoTWFwPFQsIFUsIFYsIFcsIFg+OjppbmxpbmVBZGQoY29uc3QgS2V5VHlw ZSYga2V5LCBNYXBwZWRQYXNzSW5SZWZlcmVuY2VUeXBlIG1hcHBlZCkgCisgICAgYXV0byBIYXNo TWFwPFQsIFUsIFYsIFcsIFg+OjppbmxpbmVBZGQoY29uc3QgS2V5VHlwZSYga2V5LCBNYXBwZWRQ YXNzSW5SZWZlcmVuY2VUeXBlIG1hcHBlZCkgLT4gQWRkUmVzdWx0CiAgICAgewotICAgICAgICBy ZXR1cm4gbV9pbXBsLnRlbXBsYXRlIGFkZDxIYXNoTWFwVHJhbnNsYXRvcjxWYWx1ZVRyYWl0cywg SGFzaEZ1bmN0aW9ucz4gPihrZXksIG1hcHBlZCk7CisgICAgICAgIHJldHVybiBtX2ltcGwudGVt cGxhdGUgYWRkPEhhc2hNYXBUcmFuc2xhdG9yPFZhbHVlVHJhaXRzLCBIYXNoRnVuY3Rpb25zPj4o a2V5LCBtYXBwZWQpOwogICAgIH0KIAogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHR5cGVuYW1l IFUsIHR5cGVuYW1lIFYsIHR5cGVuYW1lIFcsIHR5cGVuYW1lIFg+Ci0gICAgdHlwZW5hbWUgSGFz aE1hcDxULCBVLCBWLCBXLCBYPjo6QWRkUmVzdWx0Ci0gICAgSGFzaE1hcDxULCBVLCBWLCBXLCBY Pjo6c2V0KGNvbnN0IEtleVR5cGUmIGtleSwgTWFwcGVkUGFzc0luVHlwZSBtYXBwZWQpIAorICAg IGF1dG8gSGFzaE1hcDxULCBVLCBWLCBXLCBYPjo6c2V0KGNvbnN0IEtleVR5cGUmIGtleSwgTWFw cGVkUGFzc0luVHlwZSBtYXBwZWQpIC0+IEFkZFJlc3VsdAogICAgIHsKICAgICAgICAgQWRkUmVz dWx0IHJlc3VsdCA9IGlubGluZUFkZChrZXksIG1hcHBlZCk7CiAgICAgICAgIGlmICghcmVzdWx0 LmlzTmV3RW50cnkpIHsKQEAgLTM1NiwyMiArMzUyLDE5IEBAIG5hbWVzcGFjZSBXVEYgewogCiAg ICAgdGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUgVSwgdHlwZW5hbWUgViwgdHlwZW5hbWUg VywgdHlwZW5hbWUgWD4KICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBIYXNoVHJhbnNsYXRvciwgdHlw ZW5hbWUgVFlQRT4KLSAgICB0eXBlbmFtZSBIYXNoTWFwPFQsIFUsIFYsIFcsIFg+OjpBZGRSZXN1 bHQKLSAgICBIYXNoTWFwPFQsIFUsIFYsIFcsIFg+OjphZGQoY29uc3QgVFlQRSYga2V5LCBNYXBw ZWRQYXNzSW5UeXBlIHZhbHVlKQorICAgIGF1dG8gSGFzaE1hcDxULCBVLCBWLCBXLCBYPjo6YWRk KGNvbnN0IFRZUEUmIGtleSwgTWFwcGVkUGFzc0luVHlwZSB2YWx1ZSkgLT4gQWRkUmVzdWx0CiAg ICAgewotICAgICAgICByZXR1cm4gbV9pbXBsLnRlbXBsYXRlIGFkZFBhc3NpbmdIYXNoQ29kZTxI YXNoTWFwVHJhbnNsYXRvckFkYXB0ZXI8VmFsdWVUcmFpdHMsIEhhc2hUcmFuc2xhdG9yPiA+KGtl eSwgdmFsdWUpOworICAgICAgICByZXR1cm4gbV9pbXBsLnRlbXBsYXRlIGFkZFBhc3NpbmdIYXNo Q29kZTxIYXNoTWFwVHJhbnNsYXRvckFkYXB0ZXI8VmFsdWVUcmFpdHMsIEhhc2hUcmFuc2xhdG9y Pj4oa2V5LCB2YWx1ZSk7CiAgICAgfQogCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5h bWUgVSwgdHlwZW5hbWUgViwgdHlwZW5hbWUgVywgdHlwZW5hbWUgWD4KLSAgICB0eXBlbmFtZSBI YXNoTWFwPFQsIFUsIFYsIFcsIFg+OjpBZGRSZXN1bHQKLSAgICBIYXNoTWFwPFQsIFUsIFYsIFcs IFg+OjphZGQoY29uc3QgS2V5VHlwZSYga2V5LCBNYXBwZWRQYXNzSW5UeXBlIG1hcHBlZCkKKyAg ICBhdXRvIEhhc2hNYXA8VCwgVSwgViwgVywgWD46OmFkZChjb25zdCBLZXlUeXBlJiBrZXksIE1h cHBlZFBhc3NJblR5cGUgbWFwcGVkKSAtPiBBZGRSZXN1bHQKICAgICB7CiAgICAgICAgIHJldHVy biBpbmxpbmVBZGQoa2V5LCBtYXBwZWQpOwogICAgIH0KIAogICAgIHRlbXBsYXRlPHR5cGVuYW1l IFQsIHR5cGVuYW1lIFUsIHR5cGVuYW1lIFYsIHR5cGVuYW1lIFcsIHR5cGVuYW1lIE1hcHBlZFRy YWl0cz4KLSAgICB0eXBlbmFtZSBIYXNoTWFwPFQsIFUsIFYsIFcsIE1hcHBlZFRyYWl0cz46Ok1h cHBlZFBlZWtUeXBlCi0gICAgSGFzaE1hcDxULCBVLCBWLCBXLCBNYXBwZWRUcmFpdHM+OjpnZXQo Y29uc3QgS2V5VHlwZSYga2V5KSBjb25zdAorICAgIGF1dG8gSGFzaE1hcDxULCBVLCBWLCBXLCBN YXBwZWRUcmFpdHM+OjpnZXQoY29uc3QgS2V5VHlwZSYga2V5KSBjb25zdCAtPiBNYXBwZWRQZWVr VHlwZQogICAgIHsKICAgICAgICAgVmFsdWVUeXBlKiBlbnRyeSA9IGNvbnN0X2Nhc3Q8SGFzaFRh YmxlVHlwZSY+KG1faW1wbCkubG9va3VwKGtleSk7CiAgICAgICAgIGlmICghZW50cnkpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9IYXNoU2V0LmggYi9Tb3VyY2UvV1RGL3d0Zi9IYXNoU2V0 LmgKaW5kZXggODc3MjEyNmYyZmMxYjE0NzBmYzViZGU0NzVhODM5M2MwZTg5NTY2ZS4uMDJkYmUw NmRjMmMyMDMxNDc1YjM2MDdiZmEzNTU0ZWM3ZjIzY2VjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dU Ri93dGYvSGFzaFNldC5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL0hhc2hTZXQuaApAQCAtMTQ0LDE5 ICsxNDQsMTkgQEAgbmFtZXNwYWNlIFdURiB7CiAgICAgfQogCiAgICAgdGVtcGxhdGU8dHlwZW5h bWUgVCwgdHlwZW5hbWUgVSwgdHlwZW5hbWUgVj4KLSAgICBpbmxpbmUgdHlwZW5hbWUgSGFzaFNl dDxULCBVLCBWPjo6aXRlcmF0b3IgSGFzaFNldDxULCBVLCBWPjo6YmVnaW4oKSBjb25zdAorICAg IGlubGluZSBhdXRvIEhhc2hTZXQ8VCwgVSwgVj46OmJlZ2luKCkgY29uc3QgLT4gaXRlcmF0b3IK ICAgICB7CiAgICAgICAgIHJldHVybiBtX2ltcGwuYmVnaW4oKTsgCiAgICAgfQogCiAgICAgdGVt cGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUgVSwgdHlwZW5hbWUgVj4KLSAgICBpbmxpbmUgdHlw ZW5hbWUgSGFzaFNldDxULCBVLCBWPjo6aXRlcmF0b3IgSGFzaFNldDxULCBVLCBWPjo6ZW5kKCkg Y29uc3QKKyAgICBpbmxpbmUgYXV0byBIYXNoU2V0PFQsIFUsIFY+OjplbmQoKSBjb25zdCAtPiBp dGVyYXRvcgogICAgIHsKICAgICAgICAgcmV0dXJuIG1faW1wbC5lbmQoKTsgCiAgICAgfQogCiAg ICAgdGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUgVSwgdHlwZW5hbWUgVj4KLSAgICBpbmxp bmUgdHlwZW5hbWUgSGFzaFNldDxULCBVLCBWPjo6aXRlcmF0b3IgSGFzaFNldDxULCBVLCBWPjo6 ZmluZChjb25zdCBWYWx1ZVR5cGUmIHZhbHVlKSBjb25zdAorICAgIGlubGluZSBhdXRvIEhhc2hT ZXQ8VCwgVSwgVj46OmZpbmQoY29uc3QgVmFsdWVUeXBlJiB2YWx1ZSkgY29uc3QgLT4gaXRlcmF0 b3IKICAgICB7CiAgICAgICAgIHJldHVybiBtX2ltcGwuZmluZCh2YWx1ZSk7IAogICAgIH0KQEAg LTE2OSw4ICsxNjksNyBAQCBuYW1lc3BhY2UgV1RGIHsKIAogICAgIHRlbXBsYXRlPHR5cGVuYW1l IFZhbHVlLCB0eXBlbmFtZSBIYXNoRnVuY3Rpb25zLCB0eXBlbmFtZSBUcmFpdHM+CiAgICAgdGVt cGxhdGU8dHlwZW5hbWUgSGFzaFRyYW5zbGF0b3IsIHR5cGVuYW1lIFQ+Ci0gICAgdHlwZW5hbWUg SGFzaFNldDxWYWx1ZSwgSGFzaEZ1bmN0aW9ucywgVHJhaXRzPjo6aXRlcmF0b3IKLSAgICBpbmxp bmUgSGFzaFNldDxWYWx1ZSwgSGFzaEZ1bmN0aW9ucywgVHJhaXRzPjo6ZmluZChjb25zdCBUJiB2 YWx1ZSkgY29uc3QKKyAgICBpbmxpbmUgYXV0byBIYXNoU2V0PFZhbHVlLCBIYXNoRnVuY3Rpb25z LCBUcmFpdHM+OjpmaW5kKGNvbnN0IFQmIHZhbHVlKSBjb25zdCAtPiBpdGVyYXRvcgogICAgIHsK ICAgICAgICAgcmV0dXJuIG1faW1wbC50ZW1wbGF0ZSBmaW5kPEhhc2hTZXRUcmFuc2xhdG9yQWRh cHRlcjxIYXNoVHJhbnNsYXRvcj4gPih2YWx1ZSk7CiAgICAgfQpAQCAtMTgzLDIxICsxODIsMjAg QEAgbmFtZXNwYWNlIFdURiB7CiAgICAgfQogCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlw ZW5hbWUgVSwgdHlwZW5hbWUgVj4KLSAgICBpbmxpbmUgdHlwZW5hbWUgSGFzaFNldDxULCBVLCBW Pjo6QWRkUmVzdWx0IEhhc2hTZXQ8VCwgVSwgVj46OmFkZChjb25zdCBWYWx1ZVR5cGUmIHZhbHVl KQorICAgIGlubGluZSBhdXRvIEhhc2hTZXQ8VCwgVSwgVj46OmFkZChjb25zdCBWYWx1ZVR5cGUm IHZhbHVlKSAtPiBBZGRSZXN1bHQKICAgICB7CiAgICAgICAgIHJldHVybiBtX2ltcGwuYWRkKHZh bHVlKTsKICAgICB9CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFtZSBVLCB0eXBl bmFtZSBWPgotICAgIGlubGluZSB0eXBlbmFtZSBIYXNoU2V0PFQsIFUsIFY+OjpBZGRSZXN1bHQg SGFzaFNldDxULCBVLCBWPjo6YWRkKFZhbHVlVHlwZSYmIHZhbHVlKQorICAgIGlubGluZSBhdXRv IEhhc2hTZXQ8VCwgVSwgVj46OmFkZChWYWx1ZVR5cGUmJiB2YWx1ZSkgLT4gQWRkUmVzdWx0CiAg ICAgewogICAgICAgICByZXR1cm4gbV9pbXBsLmFkZChzdGQ6Om1vdmUodmFsdWUpKTsKICAgICB9 CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBWYWx1ZSwgdHlwZW5hbWUgSGFzaEZ1bmN0aW9ucywg dHlwZW5hbWUgVHJhaXRzPgogICAgIHRlbXBsYXRlPHR5cGVuYW1lIEhhc2hUcmFuc2xhdG9yLCB0 eXBlbmFtZSBUPgotICAgIGlubGluZSB0eXBlbmFtZSBIYXNoU2V0PFZhbHVlLCBIYXNoRnVuY3Rp b25zLCBUcmFpdHM+OjpBZGRSZXN1bHQKLSAgICBIYXNoU2V0PFZhbHVlLCBIYXNoRnVuY3Rpb25z LCBUcmFpdHM+OjphZGQoY29uc3QgVCYgdmFsdWUpCisgICAgaW5saW5lIGF1dG8gSGFzaFNldDxW YWx1ZSwgSGFzaEZ1bmN0aW9ucywgVHJhaXRzPjo6YWRkKGNvbnN0IFQmIHZhbHVlKSAtPiBBZGRS ZXN1bHQKICAgICB7CiAgICAgICAgIHJldHVybiBtX2ltcGwudGVtcGxhdGUgYWRkUGFzc2luZ0hh c2hDb2RlPEhhc2hTZXRUcmFuc2xhdG9yQWRhcHRlcjxIYXNoVHJhbnNsYXRvcj4gPih2YWx1ZSwg dmFsdWUpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0hhc2hUYWJsZS5oIGIv U291cmNlL1dURi93dGYvSGFzaFRhYmxlLmgKaW5kZXggMTQzZjI1YTMxMWVlYTk0M2QyMmFhYzE2 OTVkZjFhYjJhZWJhOThmMy4uZGM5Yzc1NDVlY2ZjZDMxNGRjZjkzMmE3M2FlNzY3ZGQ1YWFjODBl ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvSGFzaFRhYmxlLmgKKysrIGIvU291cmNlL1dU Ri93dGYvSGFzaFRhYmxlLmgKQEAgLTYwMyw3ICs2MDMsNyBAQCBuYW1lc3BhY2UgV1RGIHsKIAog ICAgIHRlbXBsYXRlPHR5cGVuYW1lIEtleSwgdHlwZW5hbWUgVmFsdWUsIHR5cGVuYW1lIEV4dHJh Y3RvciwgdHlwZW5hbWUgSGFzaEZ1bmN0aW9ucywgdHlwZW5hbWUgVHJhaXRzLCB0eXBlbmFtZSBL ZXlUcmFpdHM+CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgSGFzaFRyYW5zbGF0b3IsIHR5cGVuYW1l IFQ+Ci0gICAgaW5saW5lIFZhbHVlKiBIYXNoVGFibGU8S2V5LCBWYWx1ZSwgRXh0cmFjdG9yLCBI YXNoRnVuY3Rpb25zLCBUcmFpdHMsIEtleVRyYWl0cz46Omxvb2t1cChjb25zdCBUJiBrZXkpCisg ICAgaW5saW5lIGF1dG8gSGFzaFRhYmxlPEtleSwgVmFsdWUsIEV4dHJhY3RvciwgSGFzaEZ1bmN0 aW9ucywgVHJhaXRzLCBLZXlUcmFpdHM+Ojpsb29rdXAoY29uc3QgVCYga2V5KSAtPiBWYWx1ZVR5 cGUqCiAgICAgewogICAgICAgICBjaGVja0tleTxIYXNoVHJhbnNsYXRvcj4oa2V5KTsKIApAQCAt NjYxLDcgKzY2MSw3IEBAIG5hbWVzcGFjZSBXVEYgewogCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUg S2V5LCB0eXBlbmFtZSBWYWx1ZSwgdHlwZW5hbWUgRXh0cmFjdG9yLCB0eXBlbmFtZSBIYXNoRnVu Y3Rpb25zLCB0eXBlbmFtZSBUcmFpdHMsIHR5cGVuYW1lIEtleVRyYWl0cz4KICAgICB0ZW1wbGF0 ZTx0eXBlbmFtZSBIYXNoVHJhbnNsYXRvciwgdHlwZW5hbWUgVD4KLSAgICBpbmxpbmUgdHlwZW5h bWUgSGFzaFRhYmxlPEtleSwgVmFsdWUsIEV4dHJhY3RvciwgSGFzaEZ1bmN0aW9ucywgVHJhaXRz LCBLZXlUcmFpdHM+OjpMb29rdXBUeXBlIEhhc2hUYWJsZTxLZXksIFZhbHVlLCBFeHRyYWN0b3Is IEhhc2hGdW5jdGlvbnMsIFRyYWl0cywgS2V5VHJhaXRzPjo6bG9va3VwRm9yV3JpdGluZyhjb25z dCBUJiBrZXkpCisgICAgaW5saW5lIGF1dG8gSGFzaFRhYmxlPEtleSwgVmFsdWUsIEV4dHJhY3Rv ciwgSGFzaEZ1bmN0aW9ucywgVHJhaXRzLCBLZXlUcmFpdHM+Ojpsb29rdXBGb3JXcml0aW5nKGNv bnN0IFQmIGtleSkgLT4gTG9va3VwVHlwZQogICAgIHsKICAgICAgICAgQVNTRVJUKG1fdGFibGUp OwogICAgICAgICBjaGVja0tleTxIYXNoVHJhbnNsYXRvcj4oa2V5KTsKQEAgLTcyNCw3ICs3MjQs NyBAQCBuYW1lc3BhY2UgV1RGIHsKIAogICAgIHRlbXBsYXRlPHR5cGVuYW1lIEtleSwgdHlwZW5h bWUgVmFsdWUsIHR5cGVuYW1lIEV4dHJhY3RvciwgdHlwZW5hbWUgSGFzaEZ1bmN0aW9ucywgdHlw ZW5hbWUgVHJhaXRzLCB0eXBlbmFtZSBLZXlUcmFpdHM+CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUg SGFzaFRyYW5zbGF0b3IsIHR5cGVuYW1lIFQ+Ci0gICAgaW5saW5lIHR5cGVuYW1lIEhhc2hUYWJs ZTxLZXksIFZhbHVlLCBFeHRyYWN0b3IsIEhhc2hGdW5jdGlvbnMsIFRyYWl0cywgS2V5VHJhaXRz Pjo6RnVsbExvb2t1cFR5cGUgSGFzaFRhYmxlPEtleSwgVmFsdWUsIEV4dHJhY3RvciwgSGFzaEZ1 bmN0aW9ucywgVHJhaXRzLCBLZXlUcmFpdHM+OjpmdWxsTG9va3VwRm9yV3JpdGluZyhjb25zdCBU JiBrZXkpCisgICAgaW5saW5lIGF1dG8gSGFzaFRhYmxlPEtleSwgVmFsdWUsIEV4dHJhY3Rvciwg SGFzaEZ1bmN0aW9ucywgVHJhaXRzLCBLZXlUcmFpdHM+OjpmdWxsTG9va3VwRm9yV3JpdGluZyhj b25zdCBUJiBrZXkpIC0+IEZ1bGxMb29rdXBUeXBlCiAgICAgewogICAgICAgICBBU1NFUlQobV90 YWJsZSk7CiAgICAgICAgIGNoZWNrS2V5PEhhc2hUcmFuc2xhdG9yPihrZXkpOwpAQCAtODEyLDcg KzgxMiw3IEBAIG5hbWVzcGFjZSBXVEYgewogCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgS2V5LCB0 eXBlbmFtZSBWYWx1ZSwgdHlwZW5hbWUgRXh0cmFjdG9yLCB0eXBlbmFtZSBIYXNoRnVuY3Rpb25z LCB0eXBlbmFtZSBUcmFpdHMsIHR5cGVuYW1lIEtleVRyYWl0cz4KICAgICB0ZW1wbGF0ZTx0eXBl bmFtZSBIYXNoVHJhbnNsYXRvciwgdHlwZW5hbWUgVCwgdHlwZW5hbWUgRXh0cmE+Ci0gICAgaW5s aW5lIHR5cGVuYW1lIEhhc2hUYWJsZTxLZXksIFZhbHVlLCBFeHRyYWN0b3IsIEhhc2hGdW5jdGlv bnMsIFRyYWl0cywgS2V5VHJhaXRzPjo6QWRkUmVzdWx0IEhhc2hUYWJsZTxLZXksIFZhbHVlLCBF eHRyYWN0b3IsIEhhc2hGdW5jdGlvbnMsIFRyYWl0cywgS2V5VHJhaXRzPjo6YWRkKFQmJiBrZXks IEV4dHJhJiYgZXh0cmEpCisgICAgaW5saW5lIGF1dG8gSGFzaFRhYmxlPEtleSwgVmFsdWUsIEV4 dHJhY3RvciwgSGFzaEZ1bmN0aW9ucywgVHJhaXRzLCBLZXlUcmFpdHM+OjphZGQoVCYmIGtleSwg RXh0cmEmJiBleHRyYSkgLT4gQWRkUmVzdWx0CiAgICAgewogICAgICAgICBjaGVja0tleTxIYXNo VHJhbnNsYXRvcj4oa2V5KTsKIApAQCAtODk5LDcgKzg5OSw3IEBAIG5hbWVzcGFjZSBXVEYgewog CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgS2V5LCB0eXBlbmFtZSBWYWx1ZSwgdHlwZW5hbWUgRXh0 cmFjdG9yLCB0eXBlbmFtZSBIYXNoRnVuY3Rpb25zLCB0eXBlbmFtZSBUcmFpdHMsIHR5cGVuYW1l IEtleVRyYWl0cz4KICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBIYXNoVHJhbnNsYXRvciwgdHlwZW5h bWUgVCwgdHlwZW5hbWUgRXh0cmE+Ci0gICAgaW5saW5lIHR5cGVuYW1lIEhhc2hUYWJsZTxLZXks IFZhbHVlLCBFeHRyYWN0b3IsIEhhc2hGdW5jdGlvbnMsIFRyYWl0cywgS2V5VHJhaXRzPjo6QWRk UmVzdWx0IEhhc2hUYWJsZTxLZXksIFZhbHVlLCBFeHRyYWN0b3IsIEhhc2hGdW5jdGlvbnMsIFRy YWl0cywgS2V5VHJhaXRzPjo6YWRkUGFzc2luZ0hhc2hDb2RlKGNvbnN0IFQmIGtleSwgY29uc3Qg RXh0cmEmIGV4dHJhKQorICAgIGlubGluZSBhdXRvIEhhc2hUYWJsZTxLZXksIFZhbHVlLCBFeHRy YWN0b3IsIEhhc2hGdW5jdGlvbnMsIFRyYWl0cywgS2V5VHJhaXRzPjo6YWRkUGFzc2luZ0hhc2hD b2RlKGNvbnN0IFQmIGtleSwgY29uc3QgRXh0cmEmIGV4dHJhKSAtPiBBZGRSZXN1bHQKICAgICB7 CiAgICAgICAgIGNoZWNrS2V5PEhhc2hUcmFuc2xhdG9yPihrZXkpOwogCkBAIC05MzYsNyArOTM2 LDcgQEAgbmFtZXNwYWNlIFdURiB7CiAgICAgfQogCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgS2V5 LCB0eXBlbmFtZSBWYWx1ZSwgdHlwZW5hbWUgRXh0cmFjdG9yLCB0eXBlbmFtZSBIYXNoRnVuY3Rp b25zLCB0eXBlbmFtZSBUcmFpdHMsIHR5cGVuYW1lIEtleVRyYWl0cz4KLSAgICBpbmxpbmUgVmFs dWUqIEhhc2hUYWJsZTxLZXksIFZhbHVlLCBFeHRyYWN0b3IsIEhhc2hGdW5jdGlvbnMsIFRyYWl0 cywgS2V5VHJhaXRzPjo6cmVpbnNlcnQoVmFsdWVUeXBlJiBlbnRyeSkKKyAgICBpbmxpbmUgYXV0 byBIYXNoVGFibGU8S2V5LCBWYWx1ZSwgRXh0cmFjdG9yLCBIYXNoRnVuY3Rpb25zLCBUcmFpdHMs IEtleVRyYWl0cz46OnJlaW5zZXJ0KFZhbHVlVHlwZSYgZW50cnkpIC0+IFZhbHVlVHlwZSoKICAg ICB7CiAgICAgICAgIEFTU0VSVChtX3RhYmxlKTsKICAgICAgICAgQVNTRVJUKCFsb29rdXBGb3JX cml0aW5nKEV4dHJhY3Rvcjo6ZXh0cmFjdChlbnRyeSkpLnNlY29uZCk7CkBAIC05NTYsNyArOTU2 LDcgQEAgbmFtZXNwYWNlIFdURiB7CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBLZXksIHR5cGVu YW1lIFZhbHVlLCB0eXBlbmFtZSBFeHRyYWN0b3IsIHR5cGVuYW1lIEhhc2hGdW5jdGlvbnMsIHR5 cGVuYW1lIFRyYWl0cywgdHlwZW5hbWUgS2V5VHJhaXRzPgogICAgIHRlbXBsYXRlIDx0eXBlbmFt ZSBIYXNoVHJhbnNsYXRvciwgdHlwZW5hbWUgVD4gCi0gICAgdHlwZW5hbWUgSGFzaFRhYmxlPEtl eSwgVmFsdWUsIEV4dHJhY3RvciwgSGFzaEZ1bmN0aW9ucywgVHJhaXRzLCBLZXlUcmFpdHM+Ojpp dGVyYXRvciBIYXNoVGFibGU8S2V5LCBWYWx1ZSwgRXh0cmFjdG9yLCBIYXNoRnVuY3Rpb25zLCBU cmFpdHMsIEtleVRyYWl0cz46OmZpbmQoY29uc3QgVCYga2V5KQorICAgIGF1dG8gSGFzaFRhYmxl PEtleSwgVmFsdWUsIEV4dHJhY3RvciwgSGFzaEZ1bmN0aW9ucywgVHJhaXRzLCBLZXlUcmFpdHM+ OjpmaW5kKGNvbnN0IFQmIGtleSkgLT4gaXRlcmF0b3IKICAgICB7CiAgICAgICAgIGlmICghbV90 YWJsZSkKICAgICAgICAgICAgIHJldHVybiBlbmQoKTsKQEAgLTk3MCw3ICs5NzAsNyBAQCBuYW1l c3BhY2UgV1RGIHsKIAogICAgIHRlbXBsYXRlPHR5cGVuYW1lIEtleSwgdHlwZW5hbWUgVmFsdWUs IHR5cGVuYW1lIEV4dHJhY3RvciwgdHlwZW5hbWUgSGFzaEZ1bmN0aW9ucywgdHlwZW5hbWUgVHJh aXRzLCB0eXBlbmFtZSBLZXlUcmFpdHM+CiAgICAgdGVtcGxhdGUgPHR5cGVuYW1lIEhhc2hUcmFu c2xhdG9yLCB0eXBlbmFtZSBUPiAKLSAgICB0eXBlbmFtZSBIYXNoVGFibGU8S2V5LCBWYWx1ZSwg RXh0cmFjdG9yLCBIYXNoRnVuY3Rpb25zLCBUcmFpdHMsIEtleVRyYWl0cz46OmNvbnN0X2l0ZXJh dG9yIEhhc2hUYWJsZTxLZXksIFZhbHVlLCBFeHRyYWN0b3IsIEhhc2hGdW5jdGlvbnMsIFRyYWl0 cywgS2V5VHJhaXRzPjo6ZmluZChjb25zdCBUJiBrZXkpIGNvbnN0CisgICAgYXV0byBIYXNoVGFi bGU8S2V5LCBWYWx1ZSwgRXh0cmFjdG9yLCBIYXNoRnVuY3Rpb25zLCBUcmFpdHMsIEtleVRyYWl0 cz46OmZpbmQoY29uc3QgVCYga2V5KSBjb25zdCAtPiBjb25zdF9pdGVyYXRvcgogICAgIHsKICAg ICAgICAgaWYgKCFtX3RhYmxlKQogICAgICAgICAgICAgcmV0dXJuIGVuZCgpOwpAQCAtMTA2MSw3 ICsxMDYxLDcgQEAgbmFtZXNwYWNlIFdURiB7CiAgICAgfQogCiAgICAgdGVtcGxhdGU8dHlwZW5h bWUgS2V5LCB0eXBlbmFtZSBWYWx1ZSwgdHlwZW5hbWUgRXh0cmFjdG9yLCB0eXBlbmFtZSBIYXNo RnVuY3Rpb25zLCB0eXBlbmFtZSBUcmFpdHMsIHR5cGVuYW1lIEtleVRyYWl0cz4KLSAgICBWYWx1 ZSogSGFzaFRhYmxlPEtleSwgVmFsdWUsIEV4dHJhY3RvciwgSGFzaEZ1bmN0aW9ucywgVHJhaXRz LCBLZXlUcmFpdHM+OjphbGxvY2F0ZVRhYmxlKGludCBzaXplKQorICAgIGF1dG8gSGFzaFRhYmxl PEtleSwgVmFsdWUsIEV4dHJhY3RvciwgSGFzaEZ1bmN0aW9ucywgVHJhaXRzLCBLZXlUcmFpdHM+ OjphbGxvY2F0ZVRhYmxlKGludCBzaXplKSAtPiBWYWx1ZVR5cGUqCiAgICAgewogICAgICAgICAv LyB3b3VsZCB1c2UgYSB0ZW1wbGF0ZSBtZW1iZXIgZnVuY3Rpb24gd2l0aCBleHBsaWNpdCBzcGVj aWFsaXphdGlvbnMgaGVyZSwgYnV0CiAgICAgICAgIC8vIGdjYyBkb2Vzbid0IGFwcGVhciB0byBz dXBwb3J0IHRoYXQKQEAgLTEwODYsNyArMTA4Niw3IEBAIG5hbWVzcGFjZSBXVEYgewogICAgIH0K IAogICAgIHRlbXBsYXRlPHR5cGVuYW1lIEtleSwgdHlwZW5hbWUgVmFsdWUsIHR5cGVuYW1lIEV4 dHJhY3RvciwgdHlwZW5hbWUgSGFzaEZ1bmN0aW9ucywgdHlwZW5hbWUgVHJhaXRzLCB0eXBlbmFt ZSBLZXlUcmFpdHM+Ci0gICAgVmFsdWUqIEhhc2hUYWJsZTxLZXksIFZhbHVlLCBFeHRyYWN0b3Is IEhhc2hGdW5jdGlvbnMsIFRyYWl0cywgS2V5VHJhaXRzPjo6ZXhwYW5kKFZhbHVlKiBlbnRyeSkK KyAgICBhdXRvIEhhc2hUYWJsZTxLZXksIFZhbHVlLCBFeHRyYWN0b3IsIEhhc2hGdW5jdGlvbnMs IFRyYWl0cywgS2V5VHJhaXRzPjo6ZXhwYW5kKFZhbHVlVHlwZSogZW50cnkpIC0+IFZhbHVlVHlw ZSoKICAgICB7CiAgICAgICAgIGludCBuZXdTaXplOwogICAgICAgICBpZiAobV90YWJsZVNpemUg PT0gMCkKQEAgLTExMDAsNyArMTEwMCw3IEBAIG5hbWVzcGFjZSBXVEYgewogICAgIH0KIAogICAg IHRlbXBsYXRlPHR5cGVuYW1lIEtleSwgdHlwZW5hbWUgVmFsdWUsIHR5cGVuYW1lIEV4dHJhY3Rv ciwgdHlwZW5hbWUgSGFzaEZ1bmN0aW9ucywgdHlwZW5hbWUgVHJhaXRzLCB0eXBlbmFtZSBLZXlU cmFpdHM+Ci0gICAgVmFsdWUqIEhhc2hUYWJsZTxLZXksIFZhbHVlLCBFeHRyYWN0b3IsIEhhc2hG dW5jdGlvbnMsIFRyYWl0cywgS2V5VHJhaXRzPjo6cmVoYXNoKGludCBuZXdUYWJsZVNpemUsIFZh bHVlICplbnRyeSkKKyAgICBhdXRvIEhhc2hUYWJsZTxLZXksIFZhbHVlLCBFeHRyYWN0b3IsIEhh c2hGdW5jdGlvbnMsIFRyYWl0cywgS2V5VHJhaXRzPjo6cmVoYXNoKGludCBuZXdUYWJsZVNpemUs IFZhbHVlVHlwZSogZW50cnkpIC0+IFZhbHVlVHlwZSoKICAgICB7CiAgICAgICAgIGludGVybmFs Q2hlY2tUYWJsZUNvbnNpc3RlbmN5RXhjZXB0U2l6ZSgpOwogCkBAIC0xMjEzLDcgKzEyMTMsNyBA QCBuYW1lc3BhY2UgV1RGIHsKICAgICB9CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBLZXksIHR5 cGVuYW1lIFZhbHVlLCB0eXBlbmFtZSBFeHRyYWN0b3IsIHR5cGVuYW1lIEhhc2hGdW5jdGlvbnMs IHR5cGVuYW1lIFRyYWl0cywgdHlwZW5hbWUgS2V5VHJhaXRzPgotICAgIEhhc2hUYWJsZTxLZXks IFZhbHVlLCBFeHRyYWN0b3IsIEhhc2hGdW5jdGlvbnMsIFRyYWl0cywgS2V5VHJhaXRzPiYgSGFz aFRhYmxlPEtleSwgVmFsdWUsIEV4dHJhY3RvciwgSGFzaEZ1bmN0aW9ucywgVHJhaXRzLCBLZXlU cmFpdHM+OjpvcGVyYXRvcj0oY29uc3QgSGFzaFRhYmxlJiBvdGhlcikKKyAgICBhdXRvIEhhc2hU YWJsZTxLZXksIFZhbHVlLCBFeHRyYWN0b3IsIEhhc2hGdW5jdGlvbnMsIFRyYWl0cywgS2V5VHJh aXRzPjo6b3BlcmF0b3I9KGNvbnN0IEhhc2hUYWJsZSYgb3RoZXIpIC0+IEhhc2hUYWJsZSYKICAg ICB7CiAgICAgICAgIC8vIEZJWE1FOiBJdCdzIGxpa2VseSB0aGF0IHRoaXMgY2FuIGJlIGltcHJv dmVkLCBmb3Igc3RhdGljIGFuYWx5c2VzIHRoYXQgdXNlCiAgICAgICAgIC8vIEhhc2hTZXRzLiBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4NDU1Cg==