190435 2018-10-10 12:12:01 -0700 [iOS] Add typedef for WebEvent keyboard flags 2018-10-14 22:02:16 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build iPhone / iPad iOS 12 RESOLVED FIXED InRadar P2 Normal --- 190571 1 dbates dbates ews-watchlist webkit-bug-importer wenson_hsieh oldest_to_newest 1467794 0 dbates 2018-10-10 12:12:01 -0700 Segregate WebEvent SPI from UIKit SPI by introducing a typedef for the keyboard flags associated with a WebEvent. This avoids the need for call sites to have knowledge of both WebEvent and UIKit SPI in order to make use of keyboard flags. 1467797 1 351980 dbates 2018-10-10 12:17:11 -0700 Created attachment 351980 Patch 1467801 2 ews-watchlist 2018-10-10 12:18:55 -0700 Attachment 351980 did not pass style-queue: ERROR: Source/WebCore/platform/ios/WebEvent.h:142: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/platform/ios/WebEvent.h:153: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/platform/ios/WebEvent.h:171: Should have space between @property and attributes. [whitespace/property] [4] ERROR: Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:3811: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 4 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1467872 3 351996 dbates 2018-10-10 15:52:22 -0700 Created attachment 351996 Patch 1467875 4 ews-watchlist 2018-10-10 15:55:06 -0700 Attachment 351996 did not pass style-queue: ERROR: Source/WebCore/platform/ios/WebEvent.h:142: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/platform/ios/WebEvent.h:153: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/platform/ios/WebEvent.h:171: Should have space between @property and attributes. [whitespace/property] [4] Total errors found: 3 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1468136 5 351996 dbates 2018-10-11 13:30:02 -0700 Comment on attachment 351996 Patch Clearing flags on attachment: 351996 Committed r237045: <https://trac.webkit.org/changeset/237045> 1468137 6 dbates 2018-10-11 13:30:03 -0700 All reviewed patches have been landed. Closing bug. 1468140 7 webkit-bug-importer 2018-10-11 13:31:36 -0700 <rdar://problem/45203651> 351980 2018-10-10 12:17:11 -0700 2018-10-10 15:52:20 -0700 Patch bug-190435-20181010121711.patch text/plain 7047 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2OTU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzYyY2UwZTc1NzUwZTNi NGM1ZTI5YzQyZmZiNzU1NDBkOGZiZTJiNC4uOGQ3YTQ1NDNjMDZlZDFlMzliMjE3ODhhMTFlZWRk ODNjMmEwNGU1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE4LTEwLTEwICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBBZGQgdHlwZWRl ZiBmb3IgV2ViRXZlbnQga2V5Ym9hcmQgZmxhZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDQzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnRseSBXZWJFdmVudCBhbmQgVUlLaXQgU1BJIGFy ZSBpbnRlcnR3aW5lZCB3aGVuIGl0IGNvbWVzIHRvIGtleWJvYXJkIGZsYWdzLiBJdCBzZWVtcyBz dWZmaWNpZW50CisgICAgICAgIHRvIGhhdmUgV2ViRXZlbnQgZGVmaW5lZCBpdHMgb3duIGtleWJv YXJkIGZsYWdzIHNvIHRoYXQgY2FsbGVycyBkbyBub3QgbmVlZCB0byBiZSBhd2FyZSBvZiBVSUtp dCBTUEkuCisKKyAgICAgICAgTm8gZnVuY3Rpb25hbGl0eSBjaGFuZ2VkLiBTbywgbm8gbmV3IHRl c3RzLgorCisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYkV2ZW50Lmg6CisgICAgICAgICogcGxh dGZvcm0vaW9zL1dlYkV2ZW50Lm1tOgorICAgICAgICAoLVtXZWJFdmVudCBrZXlib2FyZEZsYWdz XSk6CisKIDIwMTgtMTAtMDkgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAg ICAgICAgIFtpT1NdIENsZWFudXAgLVtXQUtWaWV3IF9zZWxmSGFuZGxlRXZlbnQ6XSBhbmQgLVtX QUtXaW5kb3cgc2VuZEV2ZW50U3luY2hyb25vdXNseTpdCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJlZTg5M2FlZTM4 NzMyNWQwYjFiYzRjNTFhNjI2YzllYTliMDE4YTkuLmZhOGJjNDk3NGM5NjI2ZmU3Y2MzODA0ZTU5 NDRhNTllNjc4NTgxM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTgtMTAtMTAgIERh bmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEFkZCB0eXBl ZGVmIGZvciBXZWJFdmVudCBrZXlib2FyZCBmbGFncworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkwNDM1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgU3Vic3RpdHV0ZSBXZWJFdmVudEtleWJvYXJkSW5wdXRS ZXBlYXQgZm9yIGtVSUtleWJvYXJkSW5wdXRSZXBlYXQuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9z cGkvaW9zL1VJS2l0U1BJLmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgaGFuZGxlS2V5RXZlbnQ6 XSk6CisKIDIwMTgtMTAtMDggIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAg ICAgICAgIFtpT1NdIEhhbmRsZSBzcGVjaWFsIGZ1bmN0aW9uIGtleXMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJFdmVudC5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vaW9zL1dlYkV2ZW50LmgKaW5kZXggOWYzNjI1NTBmZDQ5NTljYWQxODZiMWUxNzg5OWZh OWM1NDYwZGY3Zi4uZTBlMmExMDljY2ZhZTJjMWMxZjNkN2RhNGZkMTVlZGMzYjIyMmUxMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYkV2ZW50LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYkV2ZW50LmgKQEAgLTc1LDYgKzc1LDEyIEBAIHR5 cGVkZWYgZW51bSB7CiAgICAgV2ViRXZlbnRDaGFyYWN0ZXJTZXRGdW5jdGlvbktleXMgICAgPSAy NTQsCiB9IFdlYkV2ZW50Q2hhcmFjdGVyU2V0OwogCisvLyBUaGVzZSBlbnVtIHZhbHVlcyBhcmUg Y29waWVkIGRpcmVjdGx5IGZyb20gVUlLaXQgZm9yIGNvbXBhdGliaWxpdHkuCit0eXBlZGVmIGVu dW0geworICAgIFdlYkV2ZW50S2V5Ym9hcmRJbnB1dFJlcGVhdCA9IDEgPDwgMCwKK30gV2ViS2V5 Ym9hcmRJbnB1dEZsYWdWYWx1ZXM7Cit0eXBlZGVmIE5TVUludGVnZXIgV2ViS2V5Ym9hcmRJbnB1 dEZsYWdzOworCiBXRUJDT1JFX0VYUE9SVCBAaW50ZXJmYWNlIFdlYkV2ZW50IDogTlNPYmplY3Qg ewogQHByaXZhdGUKICAgICBXZWJFdmVudFR5cGUgX3R5cGU7CkBAIC04Niw3ICs5Miw3IEBAIFdF QkNPUkVfRVhQT1JUIEBpbnRlcmZhY2UgV2ViRXZlbnQgOiBOU09iamVjdCB7CiAgICAgTlNTdHJp bmcgKl9jaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnM7CiAgICAgV2ViRXZlbnRGbGFncyBfbW9k aWZpZXJGbGFnczsKICAgICBCT09MIF9rZXlSZXBlYXRpbmc7Ci0gICAgTlNVSW50ZWdlciBfa2V5 Ym9hcmRGbGFnczsKKyAgICBXZWJLZXlib2FyZElucHV0RmxhZ3MgX2tleWJvYXJkRmxhZ3M7CiAg ICAgTlNTdHJpbmcgKl9pbnB1dE1hbmFnZXJIaW50OwogICAgIHVpbnQxNl90IF9rZXlDb2RlOwog ICAgIEJPT0wgX3RhYktleTsKQEAgLTEzMyw3ICsxMzksNyBAQCBXRUJDT1JFX0VYUE9SVCBAaW50 ZXJmYWNlIFdlYkV2ZW50IDogTlNPYmplY3QgewogICAgICAgIGNoYXJhY3RlcnNJZ25vcmluZ01v ZGlmaWVyczooTlNTdHJpbmcgKiljaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnMKICAgICAgICAg ICAgICAgICAgICAgICAgICBtb2RpZmllcnM6KFdlYkV2ZW50RmxhZ3MpbW9kaWZpZXJzCiAgICAg ICAgICAgICAgICAgICAgICAgIGlzUmVwZWF0aW5nOihCT09MKXJlcGVhdGluZwotICAgICAgICAg ICAgICAgICAgICAgICAgIHdpdGhGbGFnczooTlNVSW50ZWdlcilmbGFncworICAgICAgICAgICAg ICAgICAgICAgICAgIHdpdGhGbGFnczooV2ViS2V5Ym9hcmRJbnB1dEZsYWdzKWZsYWdzCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICBrZXlDb2RlOih1aW50MTZfdClrZXlDb2RlCiAgICAgICAg ICAgICAgICAgICAgICAgICAgIGlzVGFiS2V5OihCT09MKXRhYktleQogICAgICAgICAgICAgICAg ICAgICAgIGNoYXJhY3RlclNldDooV2ViRXZlbnRDaGFyYWN0ZXJTZXQpY2hhcmFjdGVyU2V0OwpA QCAtMTQ0LDcgKzE1MCw3IEBAIFdFQkNPUkVfRVhQT1JUIEBpbnRlcmZhY2UgV2ViRXZlbnQgOiBO U09iamVjdCB7CiAgICAgICAgY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzOihOU1N0cmluZyAq KWNoYXJhY3RlcnNJZ25vcmluZ01vZGlmaWVycwogICAgICAgICAgICAgICAgICAgICAgICAgIG1v ZGlmaWVyczooV2ViRXZlbnRGbGFncyltb2RpZmllcnMKICAgICAgICAgICAgICAgICAgICAgICAg aXNSZXBlYXRpbmc6KEJPT0wpcmVwZWF0aW5nCi0gICAgICAgICAgICAgICAgICAgICAgICAgd2l0 aEZsYWdzOihOU1VJbnRlZ2VyKWZsYWdzCisgICAgICAgICAgICAgICAgICAgICAgICAgd2l0aEZs YWdzOihXZWJLZXlib2FyZElucHV0RmxhZ3MpZmxhZ3MKICAgICAgICAgICAgICAgd2l0aElucHV0 TWFuYWdlckhpbnQ6KE5TU3RyaW5nICopaGludAogICAgICAgICAgICAgICAgICAgICAgICAgICAg a2V5Q29kZToodWludDE2X3Qpa2V5Q29kZQogICAgICAgICAgICAgICAgICAgICAgICAgICBpc1Rh YktleTooQk9PTCl0YWJLZXk7CkBAIC0xNjIsNyArMTY4LDcgQEAgV0VCQ09SRV9FWFBPUlQgQGlu dGVyZmFjZSBXZWJFdmVudCA6IE5TT2JqZWN0IHsKIEBwcm9wZXJ0eShub25hdG9taWMsIHJlYWRv bmx5LCBnZXR0ZXIgPSBpc0tleVJlcGVhdGluZykgQk9PTCBrZXlSZXBlYXRpbmc7CiBAcHJvcGVy dHkobm9uYXRvbWljLCByZWFkb25seSwgcmV0YWluKSBOU1N0cmluZyAqaW5wdXRNYW5hZ2VySGlu dDsKIAotQHByb3BlcnR5KG5vbmF0b21pYywgcmVhZG9ubHkpIE5TVUludGVnZXIga2V5Ym9hcmRG bGFnczsKK0Bwcm9wZXJ0eShub25hdG9taWMsIHJlYWRvbmx5KSBXZWJLZXlib2FyZElucHV0Rmxh Z3Mga2V5Ym9hcmRGbGFnczsKIEBwcm9wZXJ0eShub25hdG9taWMsIHJlYWRvbmx5KSB1aW50MTZf dCBrZXlDb2RlOwogQHByb3BlcnR5KG5vbmF0b21pYywgcmVhZG9ubHksIGdldHRlciA9IGlzVGFi S2V5KSBCT09MIHRhYktleTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v aW9zL1dlYkV2ZW50Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYkV2ZW50Lm1t CmluZGV4IGJjZTI0MmQzZTZmM2IzZjUxODFlMzRkNjM3ZGU2Y2JmN2M1MzQ0ZTQuLmJkNmQwNTBj ZDI5MzU0NWU2NjM3Nzc3ZWZhYWU0NTQ0OWRiZGUwYjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2lvcy9XZWJFdmVudC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9pb3MvV2ViRXZlbnQubW0KQEAgLTQyNyw3ICs0MjcsNyBAQCAtIChCT09MKWlzS2V5UmVwZWF0 aW5nCiAgICAgcmV0dXJuIF9rZXlSZXBlYXRpbmc7CiB9CiAKLS0gKE5TVUludGVnZXIpa2V5Ym9h cmRGbGFncworLSAoV2ViS2V5Ym9hcmRJbnB1dEZsYWdzKWtleWJvYXJkRmxhZ3MKIHsKICAgICBB U1NFUlQoX3R5cGUgPT0gV2ViRXZlbnRLZXlEb3duIHx8IF90eXBlID09IFdlYkV2ZW50S2V5VXAp OwogICAgIHJldHVybiBfa2V5Ym9hcmRGbGFnczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv UGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkv aW9zL1VJS2l0U1BJLmgKaW5kZXggOTY3Njc4MTFhMjY5M2U3ZDliOGIxYWI3Y2EwNjQzMzgwZjcz OWE1YS4uNzcxMzAwM2I2ZWUzNDNjZjE1M2YzNGE2MDM0N2NlODNjZjI1YzkwMyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgKKysrIGIvU291cmNl L1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgKQEAgLTE3NCwxNyArMTc0LDYgQEAg dHlwZWRlZiBOU19FTlVNKE5TSW50ZWdlciwgVUlEYXRlUGlja2VyUHJpdmF0ZU1vZGUpICB7CiBA cHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHksIHJldGFpbikgTlNTdHJpbmcgKmJ1aWxkVmVy c2lvbjsKIEBlbmQKIAotdHlwZWRlZiBlbnVtIHsKLSAgICBrVUlLZXlib2FyZElucHV0UmVwZWF0 ICAgICAgICAgICAgICAgICA9IDEgPDwgMCwKLSAgICBrVUlLZXlib2FyZElucHV0UG9wdXBWYXJp YW50ICAgICAgICAgICA9IDEgPDwgMSwKLSAgICBrVUlLZXlib2FyZElucHV0TXVsdGl0YXAgICAg ICAgICAgICAgICA9IDEgPDwgMiwKLSAgICBrVUlLZXlib2FyZElucHV0U2tpcENhbmRpZGF0ZVNl bGVjdGlvbiA9IDEgPDwgMywKLSAgICBrVUlLZXlib2FyZElucHV0RGVhZEtleSAgICAgICAgICAg ICAgICA9IDEgPDwgNCwKLSAgICBrVUlLZXlib2FyZElucHV0TW9kaWZpZXJGbGFnc0NoYW5nZWQg ICA9IDEgPDwgNSwKLSAgICBrVUlLZXlib2FyZElucHV0RmxpY2sgICAgICAgICAgICAgICAgICA9 IDEgPDwgNiwKLSAgICBrVUlLZXlib2FyZElucHV0UHJlUHJvY2Vzc2VkICAgICAgICAgICA9IDEg PDwgNywKLX0gVUlLZXlib2FyZElucHV0RmxhZ3M7Ci0KIEBpbnRlcmZhY2UgVUlFdmVudCAoKQog QHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBVSUtleWJvYXJkSW5wdXRGbGFncyBfaW5w dXRGbGFnczsKIC0gKHZvaWQgKilfaGlkRXZlbnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCBkN2I3NjM0 MjRmNWE4ZTU4N2ViY2RlOTlhZmYwMWM5MTU0ODZjYmRhLi4yOTg5MTMyM2ExMmY3MDkxNTEwMGJi MzAxMzdhNmRkNjNkOGYyNGRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTM4MDcsNyArMzgwNyw3IEBA IC0gKHZvaWQpaGFuZGxlS2V5RXZlbnQ6KDo6VUlFdmVudCAqKWV2ZW50CiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2hhcmFjdGVyczpl dmVudC5fbW9kaWZpZWRJbnB1dAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnM6ZXZlbnQuX3VubW9kaWZpZWRJbnB1dAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBtb2RpZmllcnM6ZXZlbnQuX21vZGlmaWVyRmxhZ3MKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlzUmVwZWF0aW5nOihldmVudC5faW5w dXRGbGFncyAmIGtVSUtleWJvYXJkSW5wdXRSZXBlYXQpCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpc1JlcGVhdGluZzooZXZlbnQuX2lu cHV0RmxhZ3MgJiBXZWJFdmVudEtleWJvYXJkSW5wdXRSZXBlYXQpCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHdpdGhGbGFnczpldmVu dC5faW5wdXRGbGFncwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGtleUNvZGU6a2V5Q29kZQogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaXNUYWJLZXk6W2V2ZW50Ll9t b2RpZmllZElucHV0IGlzRXF1YWxUb1N0cmluZzpAIlx0Il0K 351996 2018-10-10 15:52:22 -0700 2018-10-11 13:30:02 -0700 Patch bug-190435-20181010155221.patch text/plain 4027 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3MDIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzRiMjlmM2M2OTJmODY0 ZWNiN2ZhOWI4ZmNkNDE3MWE0YzhhZTQxNC4uYTQ4NjE4ZWQ3MjRjN2YzNjZiZWJiZTZiY2QzYzE3 M2E4MGZmOGI0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE4LTEwLTEwICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBBZGQgdHlwZWRl ZiBmb3IgV2ViRXZlbnQga2V5Ym9hcmQgZmxhZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDQzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnRseSBXZWJFdmVudCBhbmQgVUlLaXQgU1BJIGFy ZSBpbnRlcnR3aW5lZCB3aGVuIGl0IGNvbWVzIHRvIGtleWJvYXJkIGZsYWdzLiBJdCBzZWVtcyBz dWZmaWNpZW50CisgICAgICAgIHRvIGhhdmUgV2ViRXZlbnQgZGVmaW5lZCBpdHMgb3duIGtleWJv YXJkIGZsYWdzIHNvIHRoYXQgY2FsbGVycyBkbyBub3QgbmVlZCB0byBiZSBhd2FyZSBvZiBVSUtp dCBTUEkuCisKKyAgICAgICAgTm8gZnVuY3Rpb25hbGl0eSBjaGFuZ2VkLiBTbywgbm8gbmV3IHRl c3RzLgorCisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYkV2ZW50Lmg6CisgICAgICAgICogcGxh dGZvcm0vaW9zL1dlYkV2ZW50Lm1tOgorICAgICAgICAoLVtXZWJFdmVudCBrZXlib2FyZEZsYWdz XSk6CisKIDIwMTgtMTAtMTAgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAK ICAgICAgICAgT25seSByZXBvcnQgdGhlIHN1cHBvcnRlZCBXZWJHTCB2ZXJzaW9uCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViRXZlbnQuaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2lvcy9XZWJFdmVudC5oCmluZGV4IDlmMzYyNTUwZmQ0OTU5Y2FkMTg2YjFl MTc4OTlmYTljNTQ2MGRmN2YuLmUwZTJhMTA5Y2NmYWUyYzFjMWYzZDdkYTRmZDE1ZWRjM2IyMjJl MTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJFdmVudC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJFdmVudC5oCkBAIC03NSw2ICs3NSwx MiBAQCB0eXBlZGVmIGVudW0gewogICAgIFdlYkV2ZW50Q2hhcmFjdGVyU2V0RnVuY3Rpb25LZXlz ICAgID0gMjU0LAogfSBXZWJFdmVudENoYXJhY3RlclNldDsKIAorLy8gVGhlc2UgZW51bSB2YWx1 ZXMgYXJlIGNvcGllZCBkaXJlY3RseSBmcm9tIFVJS2l0IGZvciBjb21wYXRpYmlsaXR5LgordHlw ZWRlZiBlbnVtIHsKKyAgICBXZWJFdmVudEtleWJvYXJkSW5wdXRSZXBlYXQgPSAxIDw8IDAsCit9 IFdlYktleWJvYXJkSW5wdXRGbGFnVmFsdWVzOwordHlwZWRlZiBOU1VJbnRlZ2VyIFdlYktleWJv YXJkSW5wdXRGbGFnczsKKwogV0VCQ09SRV9FWFBPUlQgQGludGVyZmFjZSBXZWJFdmVudCA6IE5T T2JqZWN0IHsKIEBwcml2YXRlCiAgICAgV2ViRXZlbnRUeXBlIF90eXBlOwpAQCAtODYsNyArOTIs NyBAQCBXRUJDT1JFX0VYUE9SVCBAaW50ZXJmYWNlIFdlYkV2ZW50IDogTlNPYmplY3QgewogICAg IE5TU3RyaW5nICpfY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzOwogICAgIFdlYkV2ZW50Rmxh Z3MgX21vZGlmaWVyRmxhZ3M7CiAgICAgQk9PTCBfa2V5UmVwZWF0aW5nOwotICAgIE5TVUludGVn ZXIgX2tleWJvYXJkRmxhZ3M7CisgICAgV2ViS2V5Ym9hcmRJbnB1dEZsYWdzIF9rZXlib2FyZEZs YWdzOwogICAgIE5TU3RyaW5nICpfaW5wdXRNYW5hZ2VySGludDsKICAgICB1aW50MTZfdCBfa2V5 Q29kZTsKICAgICBCT09MIF90YWJLZXk7CkBAIC0xMzMsNyArMTM5LDcgQEAgV0VCQ09SRV9FWFBP UlQgQGludGVyZmFjZSBXZWJFdmVudCA6IE5TT2JqZWN0IHsKICAgICAgICBjaGFyYWN0ZXJzSWdu b3JpbmdNb2RpZmllcnM6KE5TU3RyaW5nICopY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzCiAg ICAgICAgICAgICAgICAgICAgICAgICAgbW9kaWZpZXJzOihXZWJFdmVudEZsYWdzKW1vZGlmaWVy cwogICAgICAgICAgICAgICAgICAgICAgICBpc1JlcGVhdGluZzooQk9PTClyZXBlYXRpbmcKLSAg ICAgICAgICAgICAgICAgICAgICAgICB3aXRoRmxhZ3M6KE5TVUludGVnZXIpZmxhZ3MKKyAgICAg ICAgICAgICAgICAgICAgICAgICB3aXRoRmxhZ3M6KFdlYktleWJvYXJkSW5wdXRGbGFncylmbGFn cwogICAgICAgICAgICAgICAgICAgICAgICAgICAga2V5Q29kZToodWludDE2X3Qpa2V5Q29kZQog ICAgICAgICAgICAgICAgICAgICAgICAgICBpc1RhYktleTooQk9PTCl0YWJLZXkKICAgICAgICAg ICAgICAgICAgICAgICBjaGFyYWN0ZXJTZXQ6KFdlYkV2ZW50Q2hhcmFjdGVyU2V0KWNoYXJhY3Rl clNldDsKQEAgLTE0NCw3ICsxNTAsNyBAQCBXRUJDT1JFX0VYUE9SVCBAaW50ZXJmYWNlIFdlYkV2 ZW50IDogTlNPYmplY3QgewogICAgICAgIGNoYXJhY3RlcnNJZ25vcmluZ01vZGlmaWVyczooTlNT dHJpbmcgKiljaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnMKICAgICAgICAgICAgICAgICAgICAg ICAgICBtb2RpZmllcnM6KFdlYkV2ZW50RmxhZ3MpbW9kaWZpZXJzCiAgICAgICAgICAgICAgICAg ICAgICAgIGlzUmVwZWF0aW5nOihCT09MKXJlcGVhdGluZwotICAgICAgICAgICAgICAgICAgICAg ICAgIHdpdGhGbGFnczooTlNVSW50ZWdlcilmbGFncworICAgICAgICAgICAgICAgICAgICAgICAg IHdpdGhGbGFnczooV2ViS2V5Ym9hcmRJbnB1dEZsYWdzKWZsYWdzCiAgICAgICAgICAgICAgIHdp dGhJbnB1dE1hbmFnZXJIaW50OihOU1N0cmluZyAqKWhpbnQKICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGtleUNvZGU6KHVpbnQxNl90KWtleUNvZGUKICAgICAgICAgICAgICAgICAgICAgICAg ICAgaXNUYWJLZXk6KEJPT0wpdGFiS2V5OwpAQCAtMTYyLDcgKzE2OCw3IEBAIFdFQkNPUkVfRVhQ T1JUIEBpbnRlcmZhY2UgV2ViRXZlbnQgOiBOU09iamVjdCB7CiBAcHJvcGVydHkobm9uYXRvbWlj LCByZWFkb25seSwgZ2V0dGVyID0gaXNLZXlSZXBlYXRpbmcpIEJPT0wga2V5UmVwZWF0aW5nOwog QHByb3BlcnR5KG5vbmF0b21pYywgcmVhZG9ubHksIHJldGFpbikgTlNTdHJpbmcgKmlucHV0TWFu YWdlckhpbnQ7CiAKLUBwcm9wZXJ0eShub25hdG9taWMsIHJlYWRvbmx5KSBOU1VJbnRlZ2VyIGtl eWJvYXJkRmxhZ3M7CitAcHJvcGVydHkobm9uYXRvbWljLCByZWFkb25seSkgV2ViS2V5Ym9hcmRJ bnB1dEZsYWdzIGtleWJvYXJkRmxhZ3M7CiBAcHJvcGVydHkobm9uYXRvbWljLCByZWFkb25seSkg dWludDE2X3Qga2V5Q29kZTsKIEBwcm9wZXJ0eShub25hdG9taWMsIHJlYWRvbmx5LCBnZXR0ZXIg PSBpc1RhYktleSkgQk9PTCB0YWJLZXk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2lvcy9XZWJFdmVudC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJF dmVudC5tbQppbmRleCA1MmJmOGI1YWY0ZTNiYjAxNjVjMDNkMjI0ZmE4NTYyNmI2Njk5NmZmLi5l OTgwZjAwNmJiZDlmZDQ0ZTNhMTRjY2JiZDBhYmRmNTQ2NzA3ZDUwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViRXZlbnQubW0KKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vaW9zL1dlYkV2ZW50Lm1tCkBAIC00MjcsNyArNDI3LDcgQEAgLSAoQk9PTClpc0tl eVJlcGVhdGluZwogICAgIHJldHVybiBfa2V5UmVwZWF0aW5nOwogfQogCi0tIChOU1VJbnRlZ2Vy KWtleWJvYXJkRmxhZ3MKKy0gKFdlYktleWJvYXJkSW5wdXRGbGFncylrZXlib2FyZEZsYWdzCiB7 CiAgICAgQVNTRVJUKF90eXBlID09IFdlYkV2ZW50S2V5RG93biB8fCBfdHlwZSA9PSBXZWJFdmVu dEtleVVwKTsKICAgICByZXR1cm4gX2tleWJvYXJkRmxhZ3M7Cg==