207415 2020-02-07 16:07:15 -0800 Harden HashTable IPC decoders 2020-02-07 16:45:26 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen benjamin cdumez cmarcelo dbates ews-watchlist webkit-bug-importer oldest_to_newest 1616436 0 achristensen 2020-02-07 16:07:15 -0800 Harden HashTable IPC decoders 1616437 1 390142 achristensen 2020-02-07 16:07:44 -0800 Created attachment 390142 Patch 1616442 2 390144 achristensen 2020-02-07 16:15:04 -0800 Created attachment 390144 Patch 1616446 3 390144 cdumez 2020-02-07 16:23:53 -0800 Comment on attachment 390144 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390144&action=review > Source/WebKit/Platform/IPC/ArgumentCoders.h:392 > + if (UNLIKELY(!HashMapType::isValidValue(*key) || !hashMap.add(WTFMove(*key), WTFMove(*value)).isNewEntry)) { I thought it was isValidKey() for HashMap and isValidValue() for HashSet? > Source/WebKit/Platform/IPC/ArgumentCoders.h:447 > + if (UNLIKELY(!HashSetType::isValidKey(*key) || !hashSet.add(WTFMove(*key)).isNewEntry)) { ditto. 1616447 4 390145 achristensen 2020-02-07 16:23:56 -0800 Created attachment 390145 Patch 1616448 5 390145 cdumez 2020-02-07 16:25:35 -0800 Comment on attachment 390145 Patch r=me 1616461 6 achristensen 2020-02-07 16:44:16 -0800 http://trac.webkit.org/r256081 1616463 7 webkit-bug-importer 2020-02-07 16:45:26 -0800 <rdar://problem/59278838> 390142 2020-02-07 16:07:44 -0800 2020-02-07 16:15:03 -0800 Patch bug-207415-20200207160743.patch text/plain 2233 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTYwNzYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDIwLTAyLTA3ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgSGFyZGVuIEhhc2hU YWJsZSBJUEMgZGVjb2RlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwNzQxNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogUGxhdGZvcm0vSVBDL0FyZ3VtZW50Q29kZXJzLmg6CisKIDIwMjAtMDItMDcg IENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBbSGFyZGVuaW5nXSBW YWxpZGF0ZSBHZW9sb2NhdGlvbiBhY2Nlc3MgcGVybWlzc2lvbiBvbiBVSVByb2Nlc3Mgc2lkZQpJ bmRleDogU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvQXJndW1lbnRDb2RlcnMuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9Bcmd1bWVudENvZGVycy5oCShyZXZp c2lvbiAyNTU5NjQpCisrKyBTb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9Bcmd1bWVudENvZGVy cy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zODksNyArMzg5LDcgQEAgdGVtcGxhdGU8dHlwZW5hbWUg S2V5QXJnLCB0eXBlbmFtZSBNYXBwZQogICAgICAgICAgICAgaWYgKFVOTElLRUxZKCF2YWx1ZSkp CiAgICAgICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAotICAgICAgICAgICAgaWYg KFVOTElLRUxZKCFoYXNoTWFwLmFkZChXVEZNb3ZlKCprZXkpLCBXVEZNb3ZlKCp2YWx1ZSkpLmlz TmV3RW50cnkpKSB7CisgICAgICAgICAgICBpZiAoVU5MSUtFTFkoIUhhc2hNYXBUeXBlOjppc1Zh bGlkS2V5KGtleSkgfHwgIWhhc2hNYXAuYWRkKFdURk1vdmUoKmtleSksIFdURk1vdmUoKnZhbHVl KSkuaXNOZXdFbnRyeSkpIHsKICAgICAgICAgICAgICAgICAvLyBUaGUgaGFzaCBtYXAgYWxyZWFk eSBoYXMgdGhlIHNwZWNpZmllZCBrZXksIGJhaWwuCiAgICAgICAgICAgICAgICAgZGVjb2Rlci5t YXJrSW52YWxpZCgpOwogICAgICAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CkBAIC00 NDQsNyArNDQ0LDcgQEAgdGVtcGxhdGU8dHlwZW5hbWUgS2V5QXJnLCB0eXBlbmFtZSBIYXNoQQog ICAgICAgICAgICAgaWYgKCFrZXkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9w dDsKIAotICAgICAgICAgICAgaWYgKCFoYXNoU2V0LmFkZChXVEZNb3ZlKGtleS52YWx1ZSgpKSku aXNOZXdFbnRyeSkgeworICAgICAgICAgICAgaWYgKFVOTElLRUxZKCFIYXNoU2V0VHlwZTo6aXNW YWxpZEtleShrZXkpIHx8ICFoYXNoU2V0LmFkZChXVEZNb3ZlKGtleS52YWx1ZSgpKSkuaXNOZXdF bnRyeSkpIHsKICAgICAgICAgICAgICAgICAvLyBUaGUgaGFzaCBzZXQgYWxyZWFkeSBoYXMgdGhl IHNwZWNpZmllZCBrZXksIGJhaWwuCiAgICAgICAgICAgICAgICAgZGVjb2Rlci5tYXJrSW52YWxp ZCgpOwogICAgICAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CkBAIC00ODQsNyArNDg0 LDcgQEAgdGVtcGxhdGU8dHlwZW5hbWUgS2V5QXJnLCB0eXBlbmFtZSBIYXNoQQogICAgICAgICAg ICAgaWYgKCFkZWNvZGVyLmRlY29kZShjb3VudCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZh bHNlOwogICAgICAgICAgICAgCi0gICAgICAgICAgICBpZiAoIXRlbXBIYXNoQ291bnRlZFNldC5h ZGQoa2V5LCBjb3VudCkuaXNOZXdFbnRyeSkgeworICAgICAgICAgICAgaWYgKFVOTElLRUxZKCFI YXNoQ291bnRlZFNldFR5cGU6OmlzVmFsaWRLZXkoa2V5KSB8fCAhdGVtcEhhc2hDb3VudGVkU2V0 LmFkZChrZXksIGNvdW50KS5pc05ld0VudHJ5KSkgewogICAgICAgICAgICAgICAgIC8vIFRoZSBo YXNoIGNvdW50ZWQgc2V0IGFscmVhZHkgaGFzIHRoZSBzcGVjaWZpZWQga2V5LCBiYWlsLgogICAg ICAgICAgICAgICAgIGRlY29kZXIubWFya0ludmFsaWQoKTsKICAgICAgICAgICAgICAgICByZXR1 cm4gZmFsc2U7Cg== 390144 2020-02-07 16:15:04 -0800 2020-02-07 16:23:55 -0800 Patch bug-207415-20200207161503.patch text/plain 3414 achristensen SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNTYwNzYpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDIwLTAyLTA3ICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgSGFyZGVuIEhhc2hUYWJsZSBJUEMg ZGVjb2RlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwNzQxNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogd3RmL0hhc2hDb3VudGVkU2V0Lmg6CisKIDIwMjAtMDItMDcgIFJ5YW4gSGFkZGFkICA8cnlh bmhhZGRhZEBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjI1 NjA1MS4KSW5kZXg6IFNvdXJjZS9XVEYvd3RmL0hhc2hDb3VudGVkU2V0LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dURi93dGYvSGFzaENvdW50ZWRTZXQuaAkocmV2aXNpb24gMjU1OTY0KQorKysg U291cmNlL1dURi93dGYvSGFzaENvdW50ZWRTZXQuaAkod29ya2luZyBjb3B5KQpAQCAtMTEwLDYg KzExMCw4IEBAIHB1YmxpYzoKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBWID0gVmFsdWVUeXBlPiB0 eXBlbmFtZSBzdGQ6OmVuYWJsZV9pZjxJc1NtYXJ0UHRyPFY+Ojp2YWx1ZSwgdW5zaWduZWQ+Ojp0 eXBlIGNvdW50KHR5cGVuYW1lIEdldFB0ckhlbHBlcjxWPjo6UHRyVHlwZSkgY29uc3Q7CiAgICAg dGVtcGxhdGU8dHlwZW5hbWUgViA9IFZhbHVlVHlwZT4gdHlwZW5hbWUgc3RkOjplbmFibGVfaWY8 SXNTbWFydFB0cjxWPjo6dmFsdWUsIGJvb2w+Ojp0eXBlIHJlbW92ZSh0eXBlbmFtZSBHZXRQdHJI ZWxwZXI8Vj46OlB0clR5cGUpOwogCisgICAgc3RhdGljIGJvb2wgaXNWYWxpZFZhbHVlKGNvbnN0 IFZhbHVlVHlwZSYgdmFsdWUpIHsgcmV0dXJuIEltcGxUeXBlOjppc1ZhbGlkVmFsdWUodmFsdWUp OyB9CisKIHByaXZhdGU6CiAgICAgSW1wbFR5cGUgbV9pbXBsOwogfTsKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCShy ZXZpc2lvbiAyNTYwNzYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5 KQpAQCAtMSwzICsxLDEyIEBACisyMDIwLTAyLTA3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlz dGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgSGFyZGVuIEhhc2hUYWJsZSBJUEMgZGVjb2Rl cnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNzQx NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogUGxh dGZvcm0vSVBDL0FyZ3VtZW50Q29kZXJzLmg6CisKIDIwMjAtMDItMDcgIENocmlzIER1bWV6ICA8 Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBbSGFyZGVuaW5nXSBWYWxpZGF0ZSBHZW9sb2Nh dGlvbiBhY2Nlc3MgcGVybWlzc2lvbiBvbiBVSVByb2Nlc3Mgc2lkZQpJbmRleDogU291cmNlL1dl YktpdC9QbGF0Zm9ybS9JUEMvQXJndW1lbnRDb2RlcnMuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L1BsYXRmb3JtL0lQQy9Bcmd1bWVudENvZGVycy5oCShyZXZpc2lvbiAyNTU5NjQpCisr KyBTb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9Bcmd1bWVudENvZGVycy5oCSh3b3JraW5nIGNv cHkpCkBAIC0zODksNyArMzg5LDcgQEAgdGVtcGxhdGU8dHlwZW5hbWUgS2V5QXJnLCB0eXBlbmFt ZSBNYXBwZQogICAgICAgICAgICAgaWYgKFVOTElLRUxZKCF2YWx1ZSkpCiAgICAgICAgICAgICAg ICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAotICAgICAgICAgICAgaWYgKFVOTElLRUxZKCFoYXNo TWFwLmFkZChXVEZNb3ZlKCprZXkpLCBXVEZNb3ZlKCp2YWx1ZSkpLmlzTmV3RW50cnkpKSB7Cisg ICAgICAgICAgICBpZiAoVU5MSUtFTFkoIUhhc2hNYXBUeXBlOjppc1ZhbGlkVmFsdWUoKmtleSkg fHwgIWhhc2hNYXAuYWRkKFdURk1vdmUoKmtleSksIFdURk1vdmUoKnZhbHVlKSkuaXNOZXdFbnRy eSkpIHsKICAgICAgICAgICAgICAgICAvLyBUaGUgaGFzaCBtYXAgYWxyZWFkeSBoYXMgdGhlIHNw ZWNpZmllZCBrZXksIGJhaWwuCiAgICAgICAgICAgICAgICAgZGVjb2Rlci5tYXJrSW52YWxpZCgp OwogICAgICAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CkBAIC00NDQsNyArNDQ0LDcg QEAgdGVtcGxhdGU8dHlwZW5hbWUgS2V5QXJnLCB0eXBlbmFtZSBIYXNoQQogICAgICAgICAgICAg aWYgKCFrZXkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAotICAgICAg ICAgICAgaWYgKCFoYXNoU2V0LmFkZChXVEZNb3ZlKGtleS52YWx1ZSgpKSkuaXNOZXdFbnRyeSkg eworICAgICAgICAgICAgaWYgKFVOTElLRUxZKCFIYXNoU2V0VHlwZTo6aXNWYWxpZEtleSgqa2V5 KSB8fCAhaGFzaFNldC5hZGQoV1RGTW92ZSgqa2V5KSkuaXNOZXdFbnRyeSkpIHsKICAgICAgICAg ICAgICAgICAvLyBUaGUgaGFzaCBzZXQgYWxyZWFkeSBoYXMgdGhlIHNwZWNpZmllZCBrZXksIGJh aWwuCiAgICAgICAgICAgICAgICAgZGVjb2Rlci5tYXJrSW52YWxpZCgpOwogICAgICAgICAgICAg ICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CkBAIC00ODQsNyArNDg0LDcgQEAgdGVtcGxhdGU8dHlw ZW5hbWUgS2V5QXJnLCB0eXBlbmFtZSBIYXNoQQogICAgICAgICAgICAgaWYgKCFkZWNvZGVyLmRl Y29kZShjb3VudCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAg Ci0gICAgICAgICAgICBpZiAoIXRlbXBIYXNoQ291bnRlZFNldC5hZGQoa2V5LCBjb3VudCkuaXNO ZXdFbnRyeSkgeworICAgICAgICAgICAgaWYgKFVOTElLRUxZKCFIYXNoQ291bnRlZFNldFR5cGU6 OmlzVmFsaWRWYWx1ZShrZXkpIHx8ICF0ZW1wSGFzaENvdW50ZWRTZXQuYWRkKGtleSwgY291bnQp LmlzTmV3RW50cnkpKSB7CiAgICAgICAgICAgICAgICAgLy8gVGhlIGhhc2ggY291bnRlZCBzZXQg YWxyZWFkeSBoYXMgdGhlIHNwZWNpZmllZCBrZXksIGJhaWwuCiAgICAgICAgICAgICAgICAgZGVj b2Rlci5tYXJrSW52YWxpZCgpOwogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK 390145 2020-02-07 16:23:56 -0800 2020-02-07 16:25:35 -0800 Patch bug-207415-20200207162355.patch text/plain 3683 achristensen SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNTYwNzYpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDIwLTAyLTA3ICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgSGFyZGVuIEhhc2hUYWJsZSBJUEMg ZGVjb2RlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwNzQxNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogd3RmL0hhc2hDb3VudGVkU2V0Lmg6CisKIDIwMjAtMDItMDcgIFJ5YW4gSGFkZGFkICA8cnlh bmhhZGRhZEBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjI1 NjA1MS4KSW5kZXg6IFNvdXJjZS9XVEYvd3RmL0hhc2hDb3VudGVkU2V0LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dURi93dGYvSGFzaENvdW50ZWRTZXQuaAkocmV2aXNpb24gMjU1OTY0KQorKysg U291cmNlL1dURi93dGYvSGFzaENvdW50ZWRTZXQuaAkod29ya2luZyBjb3B5KQpAQCAtMTEwLDYg KzExMCw4IEBAIHB1YmxpYzoKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBWID0gVmFsdWVUeXBlPiB0 eXBlbmFtZSBzdGQ6OmVuYWJsZV9pZjxJc1NtYXJ0UHRyPFY+Ojp2YWx1ZSwgdW5zaWduZWQ+Ojp0 eXBlIGNvdW50KHR5cGVuYW1lIEdldFB0ckhlbHBlcjxWPjo6UHRyVHlwZSkgY29uc3Q7CiAgICAg dGVtcGxhdGU8dHlwZW5hbWUgViA9IFZhbHVlVHlwZT4gdHlwZW5hbWUgc3RkOjplbmFibGVfaWY8 SXNTbWFydFB0cjxWPjo6dmFsdWUsIGJvb2w+Ojp0eXBlIHJlbW92ZSh0eXBlbmFtZSBHZXRQdHJI ZWxwZXI8Vj46OlB0clR5cGUpOwogCisgICAgc3RhdGljIGJvb2wgaXNWYWxpZFZhbHVlKGNvbnN0 IFZhbHVlVHlwZSYgdmFsdWUpIHsgcmV0dXJuIEltcGxUeXBlOjppc1ZhbGlkVmFsdWUodmFsdWUp OyB9CisKIHByaXZhdGU6CiAgICAgSW1wbFR5cGUgbV9pbXBsOwogfTsKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCShy ZXZpc2lvbiAyNTYwNzYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5 KQpAQCAtMSwzICsxLDEyIEBACisyMDIwLTAyLTA3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlz dGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgSGFyZGVuIEhhc2hUYWJsZSBJUEMgZGVjb2Rl cnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNzQx NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogUGxh dGZvcm0vSVBDL0FyZ3VtZW50Q29kZXJzLmg6CisKIDIwMjAtMDItMDcgIENocmlzIER1bWV6ICA8 Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBbSGFyZGVuaW5nXSBWYWxpZGF0ZSBHZW9sb2Nh dGlvbiBhY2Nlc3MgcGVybWlzc2lvbiBvbiBVSVByb2Nlc3Mgc2lkZQpJbmRleDogU291cmNlL1dl YktpdC9QbGF0Zm9ybS9JUEMvQXJndW1lbnRDb2RlcnMuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L1BsYXRmb3JtL0lQQy9Bcmd1bWVudENvZGVycy5oCShyZXZpc2lvbiAyNTU5NjQpCisr KyBTb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9Bcmd1bWVudENvZGVycy5oCSh3b3JraW5nIGNv cHkpCkBAIC0zODksNiArMzg5LDExIEBAIHRlbXBsYXRlPHR5cGVuYW1lIEtleUFyZywgdHlwZW5h bWUgTWFwcGUKICAgICAgICAgICAgIGlmIChVTkxJS0VMWSghdmFsdWUpKQogICAgICAgICAgICAg ICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKKyAgICAgICAgICAgIGlmIChVTkxJS0VMWSghSGFz aE1hcFR5cGU6OmlzVmFsaWRLZXkoKmtleSkpKSB7CisgICAgICAgICAgICAgICAgZGVjb2Rlci5t YXJrSW52YWxpZCgpOworICAgICAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CisgICAg ICAgICAgICB9CisKICAgICAgICAgICAgIGlmIChVTkxJS0VMWSghaGFzaE1hcC5hZGQoV1RGTW92 ZSgqa2V5KSwgV1RGTW92ZSgqdmFsdWUpKS5pc05ld0VudHJ5KSkgewogICAgICAgICAgICAgICAg IC8vIFRoZSBoYXNoIG1hcCBhbHJlYWR5IGhhcyB0aGUgc3BlY2lmaWVkIGtleSwgYmFpbC4KICAg ICAgICAgICAgICAgICBkZWNvZGVyLm1hcmtJbnZhbGlkKCk7CkBAIC00NDQsNyArNDQ5LDEyIEBA IHRlbXBsYXRlPHR5cGVuYW1lIEtleUFyZywgdHlwZW5hbWUgSGFzaEEKICAgICAgICAgICAgIGlm ICgha2V5KQogICAgICAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKLSAgICAgICAg ICAgIGlmICghaGFzaFNldC5hZGQoV1RGTW92ZShrZXkudmFsdWUoKSkpLmlzTmV3RW50cnkpIHsK KyAgICAgICAgICAgIGlmIChVTkxJS0VMWSghSGFzaFNldFR5cGU6OmlzVmFsaWRWYWx1ZSgqa2V5 KSkpIHsKKyAgICAgICAgICAgICAgICBkZWNvZGVyLm1hcmtJbnZhbGlkKCk7CisgICAgICAgICAg ICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAg aWYgKFVOTElLRUxZKCFoYXNoU2V0LmFkZChXVEZNb3ZlKCprZXkpKS5pc05ld0VudHJ5KSkgewog ICAgICAgICAgICAgICAgIC8vIFRoZSBoYXNoIHNldCBhbHJlYWR5IGhhcyB0aGUgc3BlY2lmaWVk IGtleSwgYmFpbC4KICAgICAgICAgICAgICAgICBkZWNvZGVyLm1hcmtJbnZhbGlkKCk7CiAgICAg ICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKQEAgLTQ4Myw4ICs0OTMsMTMgQEAgdGVt cGxhdGU8dHlwZW5hbWUgS2V5QXJnLCB0eXBlbmFtZSBIYXNoQQogICAgICAgICAgICAgdW5zaWdu ZWQgY291bnQ7CiAgICAgICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGNvdW50KSkKICAgICAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICAKLSAgICAgICAgICAgIGlmICgh dGVtcEhhc2hDb3VudGVkU2V0LmFkZChrZXksIGNvdW50KS5pc05ld0VudHJ5KSB7CisKKyAgICAg ICAgICAgIGlmIChVTkxJS0VMWSghSGFzaENvdW50ZWRTZXRUeXBlOjppc1ZhbGlkVmFsdWUoa2V5 KSkpIHsKKyAgICAgICAgICAgICAgICBkZWNvZGVyLm1hcmtJbnZhbGlkKCk7CisgICAgICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBpZiAoVU5M SUtFTFkoIXRlbXBIYXNoQ291bnRlZFNldC5hZGQoa2V5LCBjb3VudCkuaXNOZXdFbnRyeSkpIHsK ICAgICAgICAgICAgICAgICAvLyBUaGUgaGFzaCBjb3VudGVkIHNldCBhbHJlYWR5IGhhcyB0aGUg c3BlY2lmaWVkIGtleSwgYmFpbC4KICAgICAgICAgICAgICAgICBkZWNvZGVyLm1hcmtJbnZhbGlk KCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwo=