191120 2018-10-31 10:40:26 -0700 [iOS] Normalize character string based on key code 2018-11-02 10:21:46 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build iPhone / iPad iOS 12 RESOLVED FIXED InRadar P2 Normal --- 189604 190487 190571 1 dbates dbates megan_gardner thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1473772 0 dbates 2018-10-31 10:40:26 -0700 Following the fix for bug #189604, WebKit always has a key code for special keyboard keys (e.g. page up) and hence we can remove the need to perform string comparison when normalizing character strings. 1473775 1 353503 dbates 2018-10-31 10:47:38 -0700 Created attachment 353503 Patch 1473777 2 353504 dbates 2018-10-31 10:49:01 -0700 Created attachment 353504 Patch 1474122 3 dbates 2018-11-01 09:27:54 -0700 Patch does not apply because it depends on the patch for bug #190487. 1474321 4 353504 thorton 2018-11-01 16:25:20 -0700 Comment on attachment 353504 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=353504&action=review > Source/WebCore/platform/ios/WebEvent.mm:127 > +static NSString* normalizedStringWithAppKitCompatibilityMapping(NSString *characters, uint16_t keyCode) Not new, but star's on the wrong side. 1474543 5 dbates 2018-11-02 10:20:36 -0700 Committed r237739: <https://trac.webkit.org/changeset/237739> 1474544 6 webkit-bug-importer 2018-11-02 10:21:46 -0700 <rdar://problem/45765479> 353503 2018-10-31 10:47:38 -0700 2018-10-31 10:49:00 -0700 Patch bug-191120-20181031104737.patch text/plain 7481 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3NjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjI3MjJhMzZhMTE1MmIz MTU5ZDM1ODMxMTdkYmJiYzk5MmY0MmZiMC4uOGJmMTAxZmUxZGI3MjNjZDhjMDNhZWU2NDk3OGQz NTEzZmNmZTI2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTEwLTMxICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBOb3JtYWxpemUg Y2hhcmFjdGVyIHN0cmluZyBiYXNlZCBvbiBrZXkgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxMTIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRm9sbG93aW5nIHIyMzY0MTcgKGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODk2MDQpIHdlIGFsd2F5cyBoYXZlIGEgdmFs aWQga2V5IGNvZGUKKyAgICAgICAgZm9yIGEgc3BlY2lhbCBrZXkgKGUuZy4gcGFnZSB1cCkgYW5k IGNhbiBzaW1wbGlmeSB0aGUgY2hhcmFjdGVyIHN0cmluZyBub3JtYWxpemF0aW9uIGNvZGUuCisK KyAgICAgICAgTm8gZnVuY3Rpb25hbGl0eSBjaGFuZ2VkLiBTbywgbm8gbmV3IHRlc3RzLgorCisg ICAgICAgICogcGxhdGZvcm0vaW9zL1dlYkV2ZW50Lm1tOgorICAgICAgICAobm9ybWFsaXplZFN0 cmluZ1dpdGhBcHBLaXRDb21wYXRpYmlsaXR5TWFwcGluZyk6IE1vZGlmaWVkIHRvIHRha2UgYSBr ZXkgY29kZSBhbmQgd3JvdGUgYWxnb3JpdGhtCisgICAgICAgIGluIHRlcm1zIG9mIGl0LgorCisg ICAgICAgICgtW1dlYkV2ZW50IGluaXRXaXRoS2V5RXZlbnRUeXBlOnRpbWVTdGFtcDpjaGFyYWN0 ZXJzOmNoYXJhY3RlcnNJZ25vcmluZ01vZGlmaWVyczptb2RpZmllcnM6aXNSZXBlYXRpbmc6d2l0 aEZsYWdzOmtleUNvZGU6aXNUYWJLZXk6Y2hhcmFjdGVyU2V0Ol0pOgorICAgICAgICAoLVtXZWJF dmVudCBpbml0V2l0aEtleUV2ZW50VHlwZTp0aW1lU3RhbXA6Y2hhcmFjdGVyczpjaGFyYWN0ZXJz SWdub3JpbmdNb2RpZmllcnM6bW9kaWZpZXJzOmlzUmVwZWF0aW5nOndpdGhGbGFnczp3aXRoSW5w dXRNYW5hZ2VySGludDprZXlDb2RlOmlzVGFiS2V5Ol0pOgorICAgICAgICBQYXNzIHRoZSBrZXkg Y29kZSBmb3IgdGhlIGV2ZW50IHRvIG5vcm1hbGl6ZWRTdHJpbmdXaXRoQXBwS2l0Q29tcGF0aWJp bGl0eU1hcHBpbmcoKS4KKwogMjAxOC0xMC0zMCAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBs ZS5jb20+CiAKICAgICAgICAgW2lPU10gV2ViS2l0IHNob3VsZCBkaXNwYXRjaCBET00gZXZlbnRz IHdoZW4gYSBtb2RpZmllciBrZXkgaXMgcHJlc3NlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvUEFML0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKaW5kZXggMDVj M2YyODQ0MDNjNzY5YjhjMWJhYWJkYWQxNjRiYzg0MTY0MjZkNC4uMjQ4MDMzZGRiMWZjOTRkNWM2 NzE3ODg2NTM2MjVkMDA3ZGJmY2U1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMTgtMTAtMzEgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAg ICAgIFtpT1NdIE5vcm1hbGl6ZSBjaGFyYWN0ZXIgc3RyaW5nIGJhc2VkIG9uIGtleSBjb2RlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTExMjAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgZm9y d2FyZCBkZWNsYXJhdGlvbnMgdGhhdCBhcmUgbm8gbG9uZ2VyIG5lZWRlZCBub3cgdGhhdCB3ZSBj aGVjayBrZXkgY29kZS4KKworICAgICAgICAqIHBhbC9zcGkvaW9zL1VJS2l0U1BJLmg6CisKIDIw MTgtMTAtMzAgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAg Q2xlYW4gdXAgc29tZSBvYnNvbGV0ZSBNQVhfQUxMT1dFRCBtYWNyb3MKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2lvcy9VSUtpdFNQSS5oIGIvU291cmNlL1dlYkNvcmUv UEFML3BhbC9zcGkvaW9zL1VJS2l0U1BJLmgKaW5kZXggYzVlM2NjYmU4MWIwYWIyZDE4NTI4MGMx YzIyODY3NGEzOWQyMjRkOS4uN2M5NDcxNDg2NWRkYTE5Y2ZhOWZjZTcwYzNiYmU3MmEyYjM1NTk2 OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvaW9zL1VJS2l0U1BJLmgK KysrIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvaW9zL1VJS2l0U1BJLmgKQEAgLTMxLDcg KzMxLDYgQEAKICNpbXBvcnQgPFVJS2l0L1VJQXBwbGljYXRpb25fUHJpdmF0ZS5oPgogI2ltcG9y dCA8VUlLaXQvVUlDb2xvcl9Qcml2YXRlLmg+CiAjaW1wb3J0IDxVSUtpdC9VSUludGVyZmFjZV9Q cml2YXRlLmg+Ci0jaW1wb3J0IDxVSUtpdC9VSVJlc3BvbmRlcl9Qcml2YXRlLmg+CiAjaW1wb3J0 IDxVSUtpdC9VSVNjcmVlbl9Qcml2YXRlLmg+CiAjaW1wb3J0IDxVSUtpdC9VSVZpZXdDb250cm9s bGVyX1ByaXZhdGUuaD4KIApAQCAtMTUzLDE2ICsxNTIsNCBAQCBOU19BU1NVTUVfTk9OTlVMTF9F TkQKIAogI2VuZGlmCiAKLU5TX0FTU1VNRV9OT05OVUxMX0JFR0lOCi0KLVdURl9FWFRFUk5fQ19C RUdJTgotCi1leHRlcm4gTlNTdHJpbmcgKmNvbnN0IFVJS2V5SW5wdXRQYWdlVXA7Ci1leHRlcm4g TlNTdHJpbmcgKmNvbnN0IFVJS2V5SW5wdXRQYWdlRG93bjsKLWV4dGVybiBOU1N0cmluZyAqY29u c3QgVUlLZXlJbnB1dEVzY2FwZTsKLQotV1RGX0VYVEVSTl9DX0VORAotCi1OU19BU1NVTUVfTk9O TlVMTF9FTkQKLQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9p b3MvV2ViRXZlbnQubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViRXZlbnQubW0K aW5kZXggMGJhYjJjOTYwNzQxMjIzNGRkOTE0ZTQ1YTJkYjdhNTM2MmY1ZTdiZS4uYzg5M2U0MzQ4 MjVjZGFmNGIzMDFiYjQzZTc4NDU4MjZiNmZiYTZhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vaW9zL1dlYkV2ZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2lvcy9XZWJFdmVudC5tbQpAQCAtMzUsMjUgKzM1LDggQEAKIAogI2ltcG9ydCAiS2V5RXZlbnRD b2Rlc0lPUy5oIgogI2ltcG9ydCAiV0FLQXBwS2l0U3R1YnMuaCIKKyNpbXBvcnQgPHBhbC9zcGkv Y29jb2EvSU9LaXRTUEkuaD4KICNpbXBvcnQgPHBhbC9zcGkvaW9zL1VJS2l0U1BJLmg+Ci0jaW1w b3J0IDx3dGYvU29mdExpbmtpbmcuaD4KLQotU09GVF9MSU5LX0ZSQU1FV09SSyhVSUtpdCkKLVNP RlRfTElOS19DT05TVEFOVChVSUtpdCwgVUlLZXlJbnB1dFVwQXJyb3csIE5TU3RyaW5nICopCi1T T0ZUX0xJTktfQ09OU1RBTlQoVUlLaXQsIFVJS2V5SW5wdXREb3duQXJyb3csIE5TU3RyaW5nICop Ci1TT0ZUX0xJTktfQ09OU1RBTlQoVUlLaXQsIFVJS2V5SW5wdXRMZWZ0QXJyb3csIE5TU3RyaW5n ICopCi1TT0ZUX0xJTktfQ09OU1RBTlQoVUlLaXQsIFVJS2V5SW5wdXRSaWdodEFycm93LCBOU1N0 cmluZyAqKQotU09GVF9MSU5LX0NPTlNUQU5UKFVJS2l0LCBVSUtleUlucHV0UGFnZVVwLCBOU1N0 cmluZyAqKQotU09GVF9MSU5LX0NPTlNUQU5UKFVJS2l0LCBVSUtleUlucHV0UGFnZURvd24sIE5T U3RyaW5nICopCi1TT0ZUX0xJTktfQ09OU1RBTlQoVUlLaXQsIFVJS2V5SW5wdXRFc2NhcGUsIE5T U3RyaW5nICopCi0KLSNkZWZpbmUgVUlLZXlJbnB1dFVwQXJyb3cgZ2V0VUlLZXlJbnB1dFVwQXJy b3coKQotI2RlZmluZSBVSUtleUlucHV0RG93bkFycm93IGdldFVJS2V5SW5wdXREb3duQXJyb3co KQotI2RlZmluZSBVSUtleUlucHV0TGVmdEFycm93IGdldFVJS2V5SW5wdXRMZWZ0QXJyb3coKQot I2RlZmluZSBVSUtleUlucHV0UmlnaHRBcnJvdyBnZXRVSUtleUlucHV0UmlnaHRBcnJvdygpCi0j ZGVmaW5lIFVJS2V5SW5wdXRQYWdlVXAgZ2V0VUlLZXlJbnB1dFBhZ2VVcCgpCi0jZGVmaW5lIFVJ S2V5SW5wdXRQYWdlRG93biBnZXRVSUtleUlucHV0UGFnZURvd24oKQotI2RlZmluZSBVSUtleUlu cHV0RXNjYXBlIGdldFVJS2V5SW5wdXRFc2NhcGUoKQogCiB1c2luZyBXZWJDb3JlOjp3aW5kb3dz S2V5Q29kZUZvcktleUNvZGU7CiB1c2luZyBXZWJDb3JlOjp3aW5kb3dzS2V5Q29kZUZvckNoYXJD b2RlOwpAQCAtMTQyLDI2ICsxMjUsMjggQEAgc3RhdGljIGludCB3aW5kb3dzS2V5Q29kZUZvckNo YXJDb2RlSU9TKHVuaWNoYXIgY2hhckNvZGUpCiAgICAgcmV0dXJuIHdpbmRvd3NLZXlDb2RlRm9y Q2hhckNvZGUoY2hhckNvZGUpOwogfQogCi1zdGF0aWMgTlNTdHJpbmcqIG5vcm1hbGl6ZWRTdHJp bmdXaXRoQXBwS2l0Q29tcGF0aWJpbGl0eU1hcHBpbmcoTlNTdHJpbmcgKmNoYXJhY3RlcnMpCitz dGF0aWMgTlNTdHJpbmcqIG5vcm1hbGl6ZWRTdHJpbmdXaXRoQXBwS2l0Q29tcGF0aWJpbGl0eU1h cHBpbmcoTlNTdHJpbmcgKmNoYXJhY3RlcnMsIHVpbnQxNl90IGtleUNvZGUpCiB7CiAgICAgYXV0 byBtYWtlTlNTdHJpbmdXaXRoQ2hhcmFjdGVyID0gW10gKHVuaWNoYXIgYykgeyByZXR1cm4gW05T U3RyaW5nIHN0cmluZ1dpdGhDaGFyYWN0ZXJzOiZjIGxlbmd0aDoxXTsgfTsKIAotICAgIGlmIChb Y2hhcmFjdGVycyBpc0VxdWFsVG9TdHJpbmc6VUlLZXlJbnB1dFVwQXJyb3ddKQorICAgIHN3aXRj aCAoa2V5Q29kZSkgeworICAgIGNhc2Uga0hJRFVzYWdlX0tleWJvYXJkVXBBcnJvdzoKICAgICAg ICAgcmV0dXJuIG1ha2VOU1N0cmluZ1dpdGhDaGFyYWN0ZXIoTlNVcEFycm93RnVuY3Rpb25LZXkp OwotICAgIGlmIChbY2hhcmFjdGVycyBpc0VxdWFsVG9TdHJpbmc6VUlLZXlJbnB1dERvd25BcnJv d10pCisgICAgY2FzZSBrSElEVXNhZ2VfS2V5Ym9hcmREb3duQXJyb3c6CiAgICAgICAgIHJldHVy biBtYWtlTlNTdHJpbmdXaXRoQ2hhcmFjdGVyKE5TRG93bkFycm93RnVuY3Rpb25LZXkpOwotICAg IGlmIChbY2hhcmFjdGVycyBpc0VxdWFsVG9TdHJpbmc6VUlLZXlJbnB1dExlZnRBcnJvd10pCisg ICAgY2FzZSBrSElEVXNhZ2VfS2V5Ym9hcmRMZWZ0QXJyb3c6CiAgICAgICAgIHJldHVybiBtYWtl TlNTdHJpbmdXaXRoQ2hhcmFjdGVyKE5TTGVmdEFycm93RnVuY3Rpb25LZXkpOwotICAgIGlmIChb Y2hhcmFjdGVycyBpc0VxdWFsVG9TdHJpbmc6VUlLZXlJbnB1dFJpZ2h0QXJyb3ddKQorICAgIGNh c2Uga0hJRFVzYWdlX0tleWJvYXJkUmlnaHRBcnJvdzoKICAgICAgICAgcmV0dXJuIG1ha2VOU1N0 cmluZ1dpdGhDaGFyYWN0ZXIoTlNSaWdodEFycm93RnVuY3Rpb25LZXkpOwotICAgIGlmIChbY2hh cmFjdGVycyBpc0VxdWFsVG9TdHJpbmc6VUlLZXlJbnB1dFBhZ2VVcF0pCisgICAgY2FzZSBrSElE VXNhZ2VfS2V5Ym9hcmRQYWdlVXA6CiAgICAgICAgIHJldHVybiBtYWtlTlNTdHJpbmdXaXRoQ2hh cmFjdGVyKE5TUGFnZVVwRnVuY3Rpb25LZXkpOwotICAgIGlmIChbY2hhcmFjdGVycyBpc0VxdWFs VG9TdHJpbmc6VUlLZXlJbnB1dFBhZ2VEb3duXSkKKyAgICBjYXNlIGtISURVc2FnZV9LZXlib2Fy ZFBhZ2VEb3duOgogICAgICAgICByZXR1cm4gbWFrZU5TU3RyaW5nV2l0aENoYXJhY3RlcihOU1Bh Z2VEb3duRnVuY3Rpb25LZXkpOwotICAgIGlmIChbY2hhcmFjdGVycyBpc0VxdWFsVG9TdHJpbmc6 VUlLZXlJbnB1dEVzY2FwZV0pCisgICAgY2FzZSBrSElEVXNhZ2VfS2V5Ym9hcmRFc2NhcGU6CiAg ICAgICAgIHJldHVybiBAIlx4MUIiOwotICAgIGlmIChbY2hhcmFjdGVycyBpc0VxdWFsVG9TdHJp bmc6QCJceDFCIl0pIC8vIE51bSBMb2NrIC8gQ2xlYXIKKyAgICBjYXNlIGtISURVc2FnZV9LZXlw YWROdW1Mb2NrOiAvLyBOdW0gTG9jayAvIENsZWFyCiAgICAgICAgIHJldHVybiBtYWtlTlNTdHJp bmdXaXRoQ2hhcmFjdGVyKE5TQ2xlYXJMaW5lRnVuY3Rpb25LZXkpOworICAgIH0KICAgICByZXR1 cm4gY2hhcmFjdGVyczsKIH0KIApAQCAtMTk0LDggKzE3OSw4IEBAIC0gKFdlYkV2ZW50ICopaW5p dFdpdGhLZXlFdmVudFR5cGU6KFdlYkV2ZW50VHlwZSl0eXBlCiAgICAgfQogCiAgICAgaWYgKCEo X2tleWJvYXJkRmxhZ3MgJiBXZWJFdmVudEtleWJvYXJkSW5wdXRNb2RpZmllckZsYWdzQ2hhbmdl ZCkpIHsKLSAgICAgICAgX2NoYXJhY3RlcnMgPSBbbm9ybWFsaXplZFN0cmluZ1dpdGhBcHBLaXRD b21wYXRpYmlsaXR5TWFwcGluZyhjaGFyYWN0ZXJzKSByZXRhaW5dOwotICAgICAgICBfY2hhcmFj dGVyc0lnbm9yaW5nTW9kaWZpZXJzID0gW25vcm1hbGl6ZWRTdHJpbmdXaXRoQXBwS2l0Q29tcGF0 aWJpbGl0eU1hcHBpbmcoY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzKSByZXRhaW5dOworICAg ICAgICBfY2hhcmFjdGVycyA9IFtub3JtYWxpemVkU3RyaW5nV2l0aEFwcEtpdENvbXBhdGliaWxp dHlNYXBwaW5nKGNoYXJhY3RlcnMsIGtleUNvZGUpIHJldGFpbl07CisgICAgICAgIF9jaGFyYWN0 ZXJzSWdub3JpbmdNb2RpZmllcnMgPSBbbm9ybWFsaXplZFN0cmluZ1dpdGhBcHBLaXRDb21wYXRp YmlsaXR5TWFwcGluZyhjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnMsIGtleUNvZGUpIHJldGFp bl07CiAgICAgICAgIF90YWJLZXkgPSB0YWJLZXk7CiAgICAgICAgIF9rZXlSZXBlYXRpbmcgPSBy ZXBlYXRpbmc7CiAgICAgfQpAQCAtMjMxLDggKzIxNiw4IEBAIC0gKFdlYkV2ZW50ICopaW5pdFdp dGhLZXlFdmVudFR5cGU6KFdlYkV2ZW50VHlwZSl0eXBlCiAgICAgfQogCiAgICAgaWYgKCEoX2tl eWJvYXJkRmxhZ3MgJiBXZWJFdmVudEtleWJvYXJkSW5wdXRNb2RpZmllckZsYWdzQ2hhbmdlZCkp IHsKLSAgICAgICAgX2NoYXJhY3RlcnMgPSBbbm9ybWFsaXplZFN0cmluZ1dpdGhBcHBLaXRDb21w YXRpYmlsaXR5TWFwcGluZyhjaGFyYWN0ZXJzKSByZXRhaW5dOwotICAgICAgICBfY2hhcmFjdGVy c0lnbm9yaW5nTW9kaWZpZXJzID0gW25vcm1hbGl6ZWRTdHJpbmdXaXRoQXBwS2l0Q29tcGF0aWJp bGl0eU1hcHBpbmcoY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzKSByZXRhaW5dOworICAgICAg ICBfY2hhcmFjdGVycyA9IFtub3JtYWxpemVkU3RyaW5nV2l0aEFwcEtpdENvbXBhdGliaWxpdHlN YXBwaW5nKGNoYXJhY3RlcnMsIGtleUNvZGUpIHJldGFpbl07CisgICAgICAgIF9jaGFyYWN0ZXJz SWdub3JpbmdNb2RpZmllcnMgPSBbbm9ybWFsaXplZFN0cmluZ1dpdGhBcHBLaXRDb21wYXRpYmls aXR5TWFwcGluZyhjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnMsIGtleUNvZGUpIHJldGFpbl07 CiAgICAgICAgIF90YWJLZXkgPSB0YWJLZXk7CiAgICAgICAgIF9rZXlSZXBlYXRpbmcgPSByZXBl YXRpbmc7CiAgICAgfQo= 353504 2018-10-31 10:49:01 -0700 2018-11-01 16:25:20 -0700 Patch bug-191120-20181031104900.patch text/plain 7481 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3NjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjI3MjJhMzZhMTE1MmIz MTU5ZDM1ODMxMTdkYmJiYzk5MmY0MmZiMC4uOGJmMTAxZmUxZGI3MjNjZDhjMDNhZWU2NDk3OGQz NTEzZmNmZTI2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTEwLTMxICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBOb3JtYWxpemUg Y2hhcmFjdGVyIHN0cmluZyBiYXNlZCBvbiBrZXkgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxMTIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRm9sbG93aW5nIHIyMzY0MTcgKGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODk2MDQpIHdlIGFsd2F5cyBoYXZlIGEgdmFs aWQga2V5IGNvZGUKKyAgICAgICAgZm9yIGEgc3BlY2lhbCBrZXkgKGUuZy4gcGFnZSB1cCkgYW5k IGNhbiBzaW1wbGlmeSB0aGUgY2hhcmFjdGVyIHN0cmluZyBub3JtYWxpemF0aW9uIGNvZGUuCisK KyAgICAgICAgTm8gZnVuY3Rpb25hbGl0eSBjaGFuZ2VkLiBTbywgbm8gbmV3IHRlc3RzLgorCisg ICAgICAgICogcGxhdGZvcm0vaW9zL1dlYkV2ZW50Lm1tOgorICAgICAgICAobm9ybWFsaXplZFN0 cmluZ1dpdGhBcHBLaXRDb21wYXRpYmlsaXR5TWFwcGluZyk6IE1vZGlmaWVkIHRvIHRha2UgYSBr ZXkgY29kZSBhbmQgd3JvdGUgYWxnb3JpdGhtCisgICAgICAgIGluIHRlcm1zIG9mIGl0LgorCisg ICAgICAgICgtW1dlYkV2ZW50IGluaXRXaXRoS2V5RXZlbnRUeXBlOnRpbWVTdGFtcDpjaGFyYWN0 ZXJzOmNoYXJhY3RlcnNJZ25vcmluZ01vZGlmaWVyczptb2RpZmllcnM6aXNSZXBlYXRpbmc6d2l0 aEZsYWdzOmtleUNvZGU6aXNUYWJLZXk6Y2hhcmFjdGVyU2V0Ol0pOgorICAgICAgICAoLVtXZWJF dmVudCBpbml0V2l0aEtleUV2ZW50VHlwZTp0aW1lU3RhbXA6Y2hhcmFjdGVyczpjaGFyYWN0ZXJz SWdub3JpbmdNb2RpZmllcnM6bW9kaWZpZXJzOmlzUmVwZWF0aW5nOndpdGhGbGFnczp3aXRoSW5w dXRNYW5hZ2VySGludDprZXlDb2RlOmlzVGFiS2V5Ol0pOgorICAgICAgICBQYXNzIHRoZSBrZXkg Y29kZSBmb3IgdGhlIGV2ZW50IHRvIG5vcm1hbGl6ZWRTdHJpbmdXaXRoQXBwS2l0Q29tcGF0aWJp bGl0eU1hcHBpbmcoKS4KKwogMjAxOC0xMC0zMCAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBs ZS5jb20+CiAKICAgICAgICAgW2lPU10gV2ViS2l0IHNob3VsZCBkaXNwYXRjaCBET00gZXZlbnRz IHdoZW4gYSBtb2RpZmllciBrZXkgaXMgcHJlc3NlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvUEFML0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKaW5kZXggMDVj M2YyODQ0MDNjNzY5YjhjMWJhYWJkYWQxNjRiYzg0MTY0MjZkNC4uMjQ4MDMzZGRiMWZjOTRkNWM2 NzE3ODg2NTM2MjVkMDA3ZGJmY2U1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMTgtMTAtMzEgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAg ICAgIFtpT1NdIE5vcm1hbGl6ZSBjaGFyYWN0ZXIgc3RyaW5nIGJhc2VkIG9uIGtleSBjb2RlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTExMjAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgZm9y d2FyZCBkZWNsYXJhdGlvbnMgdGhhdCBhcmUgbm8gbG9uZ2VyIG5lZWRlZCBub3cgdGhhdCB3ZSBj aGVjayBrZXkgY29kZS4KKworICAgICAgICAqIHBhbC9zcGkvaW9zL1VJS2l0U1BJLmg6CisKIDIw MTgtMTAtMzAgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAg Q2xlYW4gdXAgc29tZSBvYnNvbGV0ZSBNQVhfQUxMT1dFRCBtYWNyb3MKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2lvcy9VSUtpdFNQSS5oIGIvU291cmNlL1dlYkNvcmUv UEFML3BhbC9zcGkvaW9zL1VJS2l0U1BJLmgKaW5kZXggYzVlM2NjYmU4MWIwYWIyZDE4NTI4MGMx YzIyODY3NGEzOWQyMjRkOS4uN2M5NDcxNDg2NWRkYTE5Y2ZhOWZjZTcwYzNiYmU3MmEyYjM1NTk2 OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvaW9zL1VJS2l0U1BJLmgK KysrIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvaW9zL1VJS2l0U1BJLmgKQEAgLTMxLDcg KzMxLDYgQEAKICNpbXBvcnQgPFVJS2l0L1VJQXBwbGljYXRpb25fUHJpdmF0ZS5oPgogI2ltcG9y dCA8VUlLaXQvVUlDb2xvcl9Qcml2YXRlLmg+CiAjaW1wb3J0IDxVSUtpdC9VSUludGVyZmFjZV9Q cml2YXRlLmg+Ci0jaW1wb3J0IDxVSUtpdC9VSVJlc3BvbmRlcl9Qcml2YXRlLmg+CiAjaW1wb3J0 IDxVSUtpdC9VSVNjcmVlbl9Qcml2YXRlLmg+CiAjaW1wb3J0IDxVSUtpdC9VSVZpZXdDb250cm9s bGVyX1ByaXZhdGUuaD4KIApAQCAtMTUzLDE2ICsxNTIsNCBAQCBOU19BU1NVTUVfTk9OTlVMTF9F TkQKIAogI2VuZGlmCiAKLU5TX0FTU1VNRV9OT05OVUxMX0JFR0lOCi0KLVdURl9FWFRFUk5fQ19C RUdJTgotCi1leHRlcm4gTlNTdHJpbmcgKmNvbnN0IFVJS2V5SW5wdXRQYWdlVXA7Ci1leHRlcm4g TlNTdHJpbmcgKmNvbnN0IFVJS2V5SW5wdXRQYWdlRG93bjsKLWV4dGVybiBOU1N0cmluZyAqY29u c3QgVUlLZXlJbnB1dEVzY2FwZTsKLQotV1RGX0VYVEVSTl9DX0VORAotCi1OU19BU1NVTUVfTk9O TlVMTF9FTkQKLQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9p b3MvV2ViRXZlbnQubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViRXZlbnQubW0K aW5kZXggMGJhYjJjOTYwNzQxMjIzNGRkOTE0ZTQ1YTJkYjdhNTM2MmY1ZTdiZS4uZjZlZDNiODg5 YzZhMmJkNjVmZDJkYjdkN2NlYmQzOTFjMjMzYjJjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vaW9zL1dlYkV2ZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2lvcy9XZWJFdmVudC5tbQpAQCAtMzUsMjUgKzM1LDcgQEAKIAogI2ltcG9ydCAiS2V5RXZlbnRD b2Rlc0lPUy5oIgogI2ltcG9ydCAiV0FLQXBwS2l0U3R1YnMuaCIKLSNpbXBvcnQgPHBhbC9zcGkv aW9zL1VJS2l0U1BJLmg+Ci0jaW1wb3J0IDx3dGYvU29mdExpbmtpbmcuaD4KLQotU09GVF9MSU5L X0ZSQU1FV09SSyhVSUtpdCkKLVNPRlRfTElOS19DT05TVEFOVChVSUtpdCwgVUlLZXlJbnB1dFVw QXJyb3csIE5TU3RyaW5nICopCi1TT0ZUX0xJTktfQ09OU1RBTlQoVUlLaXQsIFVJS2V5SW5wdXRE b3duQXJyb3csIE5TU3RyaW5nICopCi1TT0ZUX0xJTktfQ09OU1RBTlQoVUlLaXQsIFVJS2V5SW5w dXRMZWZ0QXJyb3csIE5TU3RyaW5nICopCi1TT0ZUX0xJTktfQ09OU1RBTlQoVUlLaXQsIFVJS2V5 SW5wdXRSaWdodEFycm93LCBOU1N0cmluZyAqKQotU09GVF9MSU5LX0NPTlNUQU5UKFVJS2l0LCBV SUtleUlucHV0UGFnZVVwLCBOU1N0cmluZyAqKQotU09GVF9MSU5LX0NPTlNUQU5UKFVJS2l0LCBV SUtleUlucHV0UGFnZURvd24sIE5TU3RyaW5nICopCi1TT0ZUX0xJTktfQ09OU1RBTlQoVUlLaXQs IFVJS2V5SW5wdXRFc2NhcGUsIE5TU3RyaW5nICopCi0KLSNkZWZpbmUgVUlLZXlJbnB1dFVwQXJy b3cgZ2V0VUlLZXlJbnB1dFVwQXJyb3coKQotI2RlZmluZSBVSUtleUlucHV0RG93bkFycm93IGdl dFVJS2V5SW5wdXREb3duQXJyb3coKQotI2RlZmluZSBVSUtleUlucHV0TGVmdEFycm93IGdldFVJ S2V5SW5wdXRMZWZ0QXJyb3coKQotI2RlZmluZSBVSUtleUlucHV0UmlnaHRBcnJvdyBnZXRVSUtl eUlucHV0UmlnaHRBcnJvdygpCi0jZGVmaW5lIFVJS2V5SW5wdXRQYWdlVXAgZ2V0VUlLZXlJbnB1 dFBhZ2VVcCgpCi0jZGVmaW5lIFVJS2V5SW5wdXRQYWdlRG93biBnZXRVSUtleUlucHV0UGFnZURv d24oKQotI2RlZmluZSBVSUtleUlucHV0RXNjYXBlIGdldFVJS2V5SW5wdXRFc2NhcGUoKQorI2lt cG9ydCA8cGFsL3NwaS9jb2NvYS9JT0tpdFNQSS5oPgogCiB1c2luZyBXZWJDb3JlOjp3aW5kb3dz S2V5Q29kZUZvcktleUNvZGU7CiB1c2luZyBXZWJDb3JlOjp3aW5kb3dzS2V5Q29kZUZvckNoYXJD b2RlOwpAQCAtMTQyLDI2ICsxMjQsMjggQEAgc3RhdGljIGludCB3aW5kb3dzS2V5Q29kZUZvckNo YXJDb2RlSU9TKHVuaWNoYXIgY2hhckNvZGUpCiAgICAgcmV0dXJuIHdpbmRvd3NLZXlDb2RlRm9y Q2hhckNvZGUoY2hhckNvZGUpOwogfQogCi1zdGF0aWMgTlNTdHJpbmcqIG5vcm1hbGl6ZWRTdHJp bmdXaXRoQXBwS2l0Q29tcGF0aWJpbGl0eU1hcHBpbmcoTlNTdHJpbmcgKmNoYXJhY3RlcnMpCitz dGF0aWMgTlNTdHJpbmcqIG5vcm1hbGl6ZWRTdHJpbmdXaXRoQXBwS2l0Q29tcGF0aWJpbGl0eU1h cHBpbmcoTlNTdHJpbmcgKmNoYXJhY3RlcnMsIHVpbnQxNl90IGtleUNvZGUpCiB7CiAgICAgYXV0 byBtYWtlTlNTdHJpbmdXaXRoQ2hhcmFjdGVyID0gW10gKHVuaWNoYXIgYykgeyByZXR1cm4gW05T U3RyaW5nIHN0cmluZ1dpdGhDaGFyYWN0ZXJzOiZjIGxlbmd0aDoxXTsgfTsKIAotICAgIGlmIChb Y2hhcmFjdGVycyBpc0VxdWFsVG9TdHJpbmc6VUlLZXlJbnB1dFVwQXJyb3ddKQorICAgIHN3aXRj aCAoa2V5Q29kZSkgeworICAgIGNhc2Uga0hJRFVzYWdlX0tleWJvYXJkVXBBcnJvdzoKICAgICAg ICAgcmV0dXJuIG1ha2VOU1N0cmluZ1dpdGhDaGFyYWN0ZXIoTlNVcEFycm93RnVuY3Rpb25LZXkp OwotICAgIGlmIChbY2hhcmFjdGVycyBpc0VxdWFsVG9TdHJpbmc6VUlLZXlJbnB1dERvd25BcnJv d10pCisgICAgY2FzZSBrSElEVXNhZ2VfS2V5Ym9hcmREb3duQXJyb3c6CiAgICAgICAgIHJldHVy biBtYWtlTlNTdHJpbmdXaXRoQ2hhcmFjdGVyKE5TRG93bkFycm93RnVuY3Rpb25LZXkpOwotICAg IGlmIChbY2hhcmFjdGVycyBpc0VxdWFsVG9TdHJpbmc6VUlLZXlJbnB1dExlZnRBcnJvd10pCisg ICAgY2FzZSBrSElEVXNhZ2VfS2V5Ym9hcmRMZWZ0QXJyb3c6CiAgICAgICAgIHJldHVybiBtYWtl TlNTdHJpbmdXaXRoQ2hhcmFjdGVyKE5TTGVmdEFycm93RnVuY3Rpb25LZXkpOwotICAgIGlmIChb Y2hhcmFjdGVycyBpc0VxdWFsVG9TdHJpbmc6VUlLZXlJbnB1dFJpZ2h0QXJyb3ddKQorICAgIGNh c2Uga0hJRFVzYWdlX0tleWJvYXJkUmlnaHRBcnJvdzoKICAgICAgICAgcmV0dXJuIG1ha2VOU1N0 cmluZ1dpdGhDaGFyYWN0ZXIoTlNSaWdodEFycm93RnVuY3Rpb25LZXkpOwotICAgIGlmIChbY2hh cmFjdGVycyBpc0VxdWFsVG9TdHJpbmc6VUlLZXlJbnB1dFBhZ2VVcF0pCisgICAgY2FzZSBrSElE VXNhZ2VfS2V5Ym9hcmRQYWdlVXA6CiAgICAgICAgIHJldHVybiBtYWtlTlNTdHJpbmdXaXRoQ2hh cmFjdGVyKE5TUGFnZVVwRnVuY3Rpb25LZXkpOwotICAgIGlmIChbY2hhcmFjdGVycyBpc0VxdWFs VG9TdHJpbmc6VUlLZXlJbnB1dFBhZ2VEb3duXSkKKyAgICBjYXNlIGtISURVc2FnZV9LZXlib2Fy ZFBhZ2VEb3duOgogICAgICAgICByZXR1cm4gbWFrZU5TU3RyaW5nV2l0aENoYXJhY3RlcihOU1Bh Z2VEb3duRnVuY3Rpb25LZXkpOwotICAgIGlmIChbY2hhcmFjdGVycyBpc0VxdWFsVG9TdHJpbmc6 VUlLZXlJbnB1dEVzY2FwZV0pCisgICAgY2FzZSBrSElEVXNhZ2VfS2V5Ym9hcmRFc2NhcGU6CiAg ICAgICAgIHJldHVybiBAIlx4MUIiOwotICAgIGlmIChbY2hhcmFjdGVycyBpc0VxdWFsVG9TdHJp bmc6QCJceDFCIl0pIC8vIE51bSBMb2NrIC8gQ2xlYXIKKyAgICBjYXNlIGtISURVc2FnZV9LZXlw YWROdW1Mb2NrOiAvLyBOdW0gTG9jayAvIENsZWFyCiAgICAgICAgIHJldHVybiBtYWtlTlNTdHJp bmdXaXRoQ2hhcmFjdGVyKE5TQ2xlYXJMaW5lRnVuY3Rpb25LZXkpOworICAgIH0KICAgICByZXR1 cm4gY2hhcmFjdGVyczsKIH0KIApAQCAtMTk0LDggKzE3OCw4IEBAIC0gKFdlYkV2ZW50ICopaW5p dFdpdGhLZXlFdmVudFR5cGU6KFdlYkV2ZW50VHlwZSl0eXBlCiAgICAgfQogCiAgICAgaWYgKCEo X2tleWJvYXJkRmxhZ3MgJiBXZWJFdmVudEtleWJvYXJkSW5wdXRNb2RpZmllckZsYWdzQ2hhbmdl ZCkpIHsKLSAgICAgICAgX2NoYXJhY3RlcnMgPSBbbm9ybWFsaXplZFN0cmluZ1dpdGhBcHBLaXRD b21wYXRpYmlsaXR5TWFwcGluZyhjaGFyYWN0ZXJzKSByZXRhaW5dOwotICAgICAgICBfY2hhcmFj dGVyc0lnbm9yaW5nTW9kaWZpZXJzID0gW25vcm1hbGl6ZWRTdHJpbmdXaXRoQXBwS2l0Q29tcGF0 aWJpbGl0eU1hcHBpbmcoY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzKSByZXRhaW5dOworICAg ICAgICBfY2hhcmFjdGVycyA9IFtub3JtYWxpemVkU3RyaW5nV2l0aEFwcEtpdENvbXBhdGliaWxp dHlNYXBwaW5nKGNoYXJhY3RlcnMsIGtleUNvZGUpIHJldGFpbl07CisgICAgICAgIF9jaGFyYWN0 ZXJzSWdub3JpbmdNb2RpZmllcnMgPSBbbm9ybWFsaXplZFN0cmluZ1dpdGhBcHBLaXRDb21wYXRp YmlsaXR5TWFwcGluZyhjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnMsIGtleUNvZGUpIHJldGFp bl07CiAgICAgICAgIF90YWJLZXkgPSB0YWJLZXk7CiAgICAgICAgIF9rZXlSZXBlYXRpbmcgPSBy ZXBlYXRpbmc7CiAgICAgfQpAQCAtMjMxLDggKzIxNSw4IEBAIC0gKFdlYkV2ZW50ICopaW5pdFdp dGhLZXlFdmVudFR5cGU6KFdlYkV2ZW50VHlwZSl0eXBlCiAgICAgfQogCiAgICAgaWYgKCEoX2tl eWJvYXJkRmxhZ3MgJiBXZWJFdmVudEtleWJvYXJkSW5wdXRNb2RpZmllckZsYWdzQ2hhbmdlZCkp IHsKLSAgICAgICAgX2NoYXJhY3RlcnMgPSBbbm9ybWFsaXplZFN0cmluZ1dpdGhBcHBLaXRDb21w YXRpYmlsaXR5TWFwcGluZyhjaGFyYWN0ZXJzKSByZXRhaW5dOwotICAgICAgICBfY2hhcmFjdGVy c0lnbm9yaW5nTW9kaWZpZXJzID0gW25vcm1hbGl6ZWRTdHJpbmdXaXRoQXBwS2l0Q29tcGF0aWJp bGl0eU1hcHBpbmcoY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzKSByZXRhaW5dOworICAgICAg ICBfY2hhcmFjdGVycyA9IFtub3JtYWxpemVkU3RyaW5nV2l0aEFwcEtpdENvbXBhdGliaWxpdHlN YXBwaW5nKGNoYXJhY3RlcnMsIGtleUNvZGUpIHJldGFpbl07CisgICAgICAgIF9jaGFyYWN0ZXJz SWdub3JpbmdNb2RpZmllcnMgPSBbbm9ybWFsaXplZFN0cmluZ1dpdGhBcHBLaXRDb21wYXRpYmls aXR5TWFwcGluZyhjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnMsIGtleUNvZGUpIHJldGFpbl07 CiAgICAgICAgIF90YWJLZXkgPSB0YWJLZXk7CiAgICAgICAgIF9rZXlSZXBlYXRpbmcgPSByZXBl YXRpbmc7CiAgICAgfQo=