231711 2021-10-13 17:08:38 -0700 Use PlatformKeyboardEvent in KeyboardScrollingAnimator to fix a layering violation 2021-10-13 21:11:14 -0700 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser bdakin simon.fraser webkit-bug-importer oldest_to_newest 1804073 0 simon.fraser 2021-10-13 17:08:38 -0700 Use PlatformKeyboardEvent in KeyboardScrollingAnimator to fix a layering violation 1804075 1 441160 simon.fraser 2021-10-13 17:10:07 -0700 Created attachment 441160 Patch 1804148 2 ews-feeder 2021-10-13 21:10:08 -0700 Committed r284146 (242966@main): <https://commits.webkit.org/242966@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 441160. 1804150 3 webkit-bug-importer 2021-10-13 21:11:14 -0700 <rdar://problem/84231396> 441160 2021-10-13 17:10:07 -0700 2021-10-13 21:10:09 -0700 Patch bug-231711-20211013171007.patch text/plain 10019 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDQ2NmI3M2Q0NGY2NzJm ZDg0ZGVmM2M0MTQ1ODgyMDYxNzNhOWQ1MC4uOTUzODE5NTJiZGRjZTJjODBiZTAzNTI3YWJlZTU3 YzI4ZGE1NmJhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTEwLTEzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFVzZSBQbGF0Zm9y bUtleWJvYXJkRXZlbnQgaW4gS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvciB0byBmaXggYSBsYXll cmluZyB2aW9sYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzMTcxMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEtleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3IgbGl2ZXMgaW4gcGxhdGZvcm0vIHNvIHNo b3VsZCBub3Qga25vdyBhYm91dCBkb20vS2V5Ym9hcmRFdmVudC4KKyAgICAgICAgSGF2ZSBpdCB1 c2UgUGxhdGZvcm1LZXlib2FyZEV2ZW50IGluc3RlYWQuCisKKyAgICAgICAgKiBwYWdlL0V2ZW50 SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OnN0b3BLZXlib2Fy ZFNjcm9sbGluZyk6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OnN0YXJ0S2V5Ym9h cmRTY3JvbGxpbmcpOiBOdWxsIGNoZWNrIHRoZSB2aWV3LiBVc2UgdGhlIHBsYXRmb3JtIGV2ZW50 LgorICAgICAgICAqIHBsYXRmb3JtL0tleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3IuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6a2V5Ym9hcmRTY3JvbGxpbmdLZXlGcm9tRXZlbnQpOgorICAgICAgICAo V2ViQ29yZTo6S2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvcjo6a2V5Ym9hcmRTY3JvbGxGb3JLZXli b2FyZEV2ZW50IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OktleWJvYXJkU2Nyb2xsaW5nQW5p bWF0b3I6OmJlZ2luS2V5Ym9hcmRTY3JvbGxHZXN0dXJlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9L ZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yLmg6CisKIDIwMjEtMTAtMTMgIFNpbW9uIEZyYXNlciAg PHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgW1dLMV0gVGVzdHMgZm9yIHNtb290 aCBzY3JvbGxpbmcgb2YgYSB3aW5kb3cgZmFpbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9FdmVudEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIu Y3BwCmluZGV4IDQ2ZDlmZjhjODZmZTA4NDFiMzkyNmNjOGYzODM3ZmMzMGM4NGUzZTUuLjYxOTM1 YjM0MTNiMzIyZjJjYTdkNDU4MmI0YTQ2M2JjMmRiOGI4MjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2 ZW50SGFuZGxlci5jcHAKQEAgLTQzMjEsMTAgKzQzMjEsMTEgQEAgZmxvYXQgRXZlbnRIYW5kbGVy OjpzY3JvbGxEaXN0YW5jZShTY3JvbGxEaXJlY3Rpb24gZGlyZWN0aW9uLCBTY3JvbGxHcmFudWxh cml0eQogdm9pZCBFdmVudEhhbmRsZXI6OnN0b3BLZXlib2FyZFNjcm9sbGluZygpCiB7CiAgICAg UmVmIHByb3RlY3RlZEZyYW1lID0gbV9mcmFtZTsKLSAgICBGcmFtZVZpZXcqIHZpZXcgPSBtX2Zy YW1lLnZpZXcoKTsKLQotICAgIEtleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3IqIGFuaW1hdG9yID0g dmlldy0+c2Nyb2xsQW5pbWF0b3IoKS5rZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yKCk7CisgICAg YXV0byogdmlldyA9IG1fZnJhbWUudmlldygpOworICAgIGlmICghdmlldykKKyAgICAgICAgcmV0 dXJuOwogCisgICAgYXV0byogYW5pbWF0b3IgPSB2aWV3LT5zY3JvbGxBbmltYXRvcigpLmtleWJv YXJkU2Nyb2xsaW5nQW5pbWF0b3IoKTsKICAgICBpZiAoYW5pbWF0b3IpCiAgICAgICAgIGFuaW1h dG9yLT5oYW5kbGVLZXlVcEV2ZW50KCk7CiB9CkBAIC00MzM1LDEyICs0MzM2LDE0IEBAIGJvb2wg RXZlbnRIYW5kbGVyOjpzdGFydEtleWJvYXJkU2Nyb2xsaW5nKEtleWJvYXJkRXZlbnQmIGV2ZW50 KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBSZWYgcHJvdGVjdGVkRnJhbWUgPSBtX2Zy YW1lOwotICAgIEZyYW1lVmlldyogdmlldyA9IG1fZnJhbWUudmlldygpOwotCi0gICAgS2V5Ym9h cmRTY3JvbGxpbmdBbmltYXRvciogYW5pbWF0b3IgPSB2aWV3LT5zY3JvbGxBbmltYXRvcigpLmtl eWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3IoKTsKKyAgICBhdXRvKiB2aWV3ID0gbV9mcmFtZS52aWV3 KCk7CisgICAgaWYgKCF2aWV3KQorICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoYW5p bWF0b3IpCi0gICAgICAgIHJldHVybiBhbmltYXRvci0+YmVnaW5LZXlib2FyZFNjcm9sbEdlc3R1 cmUoZXZlbnQpOworICAgIGF1dG8qIGFuaW1hdG9yID0gdmlldy0+c2Nyb2xsQW5pbWF0b3IoKS5r ZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yKCk7CisgICAgYXV0byogcGxhdGZvcm1FdmVudCA9IGV2 ZW50LnVuZGVybHlpbmdQbGF0Zm9ybUV2ZW50KCk7CisgICAgaWYgKGFuaW1hdG9yICYmIHBsYXRm b3JtRXZlbnQpCisgICAgICAgIHJldHVybiBhbmltYXRvci0+YmVnaW5LZXlib2FyZFNjcm9sbEdl c3R1cmUoKnBsYXRmb3JtRXZlbnQpOwogCiAgICAgcmV0dXJuIGZhbHNlOwogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yLmNwcApp bmRleCBmZDhmMGZjOTNmN2IwYjAzN2ZmNzUwZjcxMzBmNDQyNWMxMWJkZjNmLi5jYWNkMDQzNDJl ZDk1Y2JhYjI3MWM3NTI3NDY0Y2FhOTRhNDNjNzAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9LZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9LZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yLmNwcApAQCAtMjcsMTIgKzI3 LDIzIEBACiAjaW5jbHVkZSAiS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvci5oIgogCiAjaW5jbHVk ZSAiRXZlbnROYW1lcy5oIgorI2luY2x1ZGUgIlBsYXRmb3JtS2V5Ym9hcmRFdmVudC5oIgogI2lu Y2x1ZGUgIlNjcm9sbFR5cGVzLmgiCiAjaW5jbHVkZSAiU2Nyb2xsYWJsZUFyZWEuaCIKICNpbmNs dWRlICJXcml0aW5nTW9kZS5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2VudW0gY2xhc3Mg S2V5Ym9hcmRTY3JvbGxpbmdLZXkgOiB1aW50OF90IHsKKyAgICBMZWZ0QXJyb3csCisgICAgUmln aHRBcnJvdywKKyAgICBVcEFycm93LAorICAgIERvd25BcnJvdywKKyAgICBTcGFjZSwKKyAgICBQ YWdlVXAsCisgICAgUGFnZURvd24KK307CisKIEtleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3I6Oktl eWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3IoU2Nyb2xsQW5pbWF0b3ImIHNjcm9sbEFuaW1hdG9yLCBT Y3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlciYgc2Nyb2xsQ29udHJvbGxlcikKICAgICA6IG1fc2Ny b2xsQW5pbWF0b3Ioc2Nyb2xsQW5pbWF0b3IpCiAgICAgLCBtX3Njcm9sbENvbnRyb2xsZXIoc2Ny b2xsQ29udHJvbGxlcikKQEAgLTE1OCw2MyArMTY5LDY4IEBAIGZsb2F0IEtleWJvYXJkU2Nyb2xs aW5nQW5pbWF0b3I6OnNjcm9sbERpc3RhbmNlKFNjcm9sbERpcmVjdGlvbiBkaXJlY3Rpb24sIFNj cm9sCiAgICAgcmV0dXJuIDA7CiB9CiAKLXN0ZDo6b3B0aW9uYWw8S2V5Ym9hcmRTY3JvbGw+IEtl eWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3I6OmtleWJvYXJkU2Nyb2xsRm9yS2V5Ym9hcmRFdmVudChL ZXlib2FyZEV2ZW50JiBldmVudCkgY29uc3QKK3N0YXRpYyBzdGQ6Om9wdGlvbmFsPEtleWJvYXJk U2Nyb2xsaW5nS2V5PiBrZXlib2FyZFNjcm9sbGluZ0tleUZyb21FdmVudChjb25zdCBQbGF0Zm9y bUtleWJvYXJkRXZlbnQmIGV2ZW50KQogewotICAgIC8vIEZJWE1FIChidWcgMjI3NDU5KTogVGhp cyBsb2dpYyBkb2VzIG5vdCBhY2NvdW50IGZvciB3cml0aW5nLW1vZGUuCisgICAgYXV0byBpZGVu dGlmaWVyID0gZXZlbnQua2V5SWRlbnRpZmllcigpOworICAgIGlmIChpZGVudGlmaWVyID09ICJM ZWZ0IikKKyAgICAgICAgcmV0dXJuIEtleWJvYXJkU2Nyb2xsaW5nS2V5OjpMZWZ0QXJyb3c7Cisg ICAgaWYgKGlkZW50aWZpZXIgPT0gIlJpZ2h0IikKKyAgICAgICAgcmV0dXJuIEtleWJvYXJkU2Ny b2xsaW5nS2V5OjpSaWdodEFycm93OworICAgIGlmIChpZGVudGlmaWVyID09ICJVcCIpCisgICAg ICAgIHJldHVybiBLZXlib2FyZFNjcm9sbGluZ0tleTo6VXBBcnJvdzsKKyAgICBpZiAoaWRlbnRp ZmllciA9PSAiRG93biIpCisgICAgICAgIHJldHVybiBLZXlib2FyZFNjcm9sbGluZ0tleTo6RG93 bkFycm93OworICAgIGlmIChpZGVudGlmaWVyID09ICJQYWdlVXAiKQorICAgICAgICByZXR1cm4g S2V5Ym9hcmRTY3JvbGxpbmdLZXk6OlBhZ2VVcDsKKyAgICBpZiAoaWRlbnRpZmllciA9PSAiUGFn ZURvd24iKQorICAgICAgICByZXR1cm4gS2V5Ym9hcmRTY3JvbGxpbmdLZXk6OlBhZ2VEb3duOwor CisgICAgaWYgKGV2ZW50LnRleHQoKS5jaGFyYWN0ZXJTdGFydGluZ0F0KDApID09ICcgJykKKyAg ICAgICAgcmV0dXJuIEtleWJvYXJkU2Nyb2xsaW5nS2V5OjpTcGFjZTsKIAotICAgIGVudW0gY2xh c3MgS2V5IDogdWludDhfdCB7IExlZnRBcnJvdywgUmlnaHRBcnJvdywgVXBBcnJvdywgRG93bkFy cm93LCBTcGFjZSwgUGFnZVVwLCBQYWdlRG93biB9OwotCi0gICAgS2V5IGtleTsKLSAgICBpZiAo ZXZlbnQua2V5SWRlbnRpZmllcigpID09ICJMZWZ0IikKLSAgICAgICAga2V5ID0gS2V5OjpMZWZ0 QXJyb3c7Ci0gICAgZWxzZSBpZiAoZXZlbnQua2V5SWRlbnRpZmllcigpID09ICJSaWdodCIpCi0g ICAgICAgIGtleSA9IEtleTo6UmlnaHRBcnJvdzsKLSAgICBlbHNlIGlmIChldmVudC5rZXlJZGVu dGlmaWVyKCkgPT0gIlVwIikKLSAgICAgICAga2V5ID0gS2V5OjpVcEFycm93OwotICAgIGVsc2Ug aWYgKGV2ZW50LmtleUlkZW50aWZpZXIoKSA9PSAiRG93biIpCi0gICAgICAgIGtleSA9IEtleTo6 RG93bkFycm93OwotICAgIGVsc2UgaWYgKGV2ZW50LmNoYXJDb2RlKCkgPT0gJyAnKQotICAgICAg ICBrZXkgPSBLZXk6OlNwYWNlOwotICAgIGVsc2UgaWYgKGV2ZW50LmtleUlkZW50aWZpZXIoKSA9 PSAiUGFnZVVwIikKLSAgICAgICAga2V5ID0gS2V5OjpQYWdlVXA7Ci0gICAgZWxzZSBpZiAoZXZl bnQua2V5SWRlbnRpZmllcigpID09ICJQYWdlRG93biIpCi0gICAgICAgIGtleSA9IEtleTo6UGFn ZURvd247Ci0gICAgZWxzZQotICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OworICAgIHJldHVy biB7IH07Cit9CiAKK3N0ZDo6b3B0aW9uYWw8S2V5Ym9hcmRTY3JvbGw+IEtleWJvYXJkU2Nyb2xs aW5nQW5pbWF0b3I6OmtleWJvYXJkU2Nyb2xsRm9yS2V5Ym9hcmRFdmVudChjb25zdCBQbGF0Zm9y bUtleWJvYXJkRXZlbnQmIGV2ZW50KSBjb25zdAoreworICAgIGF1dG8ga2V5ID0ga2V5Ym9hcmRT Y3JvbGxpbmdLZXlGcm9tRXZlbnQoZXZlbnQpOworICAgIGlmICgha2V5KQorICAgICAgICByZXR1 cm4geyB9OworCisgICAgLy8gRklYTUUgKGJ1ZyAyMjc0NTkpOiBUaGlzIGxvZ2ljIGRvZXMgbm90 IGFjY291bnQgZm9yIHdyaXRpbmctbW9kZS4KICAgICBhdXRvIGdyYW51bGFyaXR5ID0gWyZdIHsK LSAgICAgICAgc3dpdGNoIChrZXkpIHsKLSAgICAgICAgY2FzZSBLZXk6OkxlZnRBcnJvdzoKLSAg ICAgICAgY2FzZSBLZXk6OlJpZ2h0QXJyb3c6CisgICAgICAgIHN3aXRjaCAoa2V5LnZhbHVlKCkp IHsKKyAgICAgICAgY2FzZSBLZXlib2FyZFNjcm9sbGluZ0tleTo6TGVmdEFycm93OgorICAgICAg ICBjYXNlIEtleWJvYXJkU2Nyb2xsaW5nS2V5OjpSaWdodEFycm93OgogICAgICAgICAgICAgcmV0 dXJuIGV2ZW50LmFsdEtleSgpID8gU2Nyb2xsR3JhbnVsYXJpdHk6OlNjcm9sbEJ5UGFnZSA6IFNj cm9sbEdyYW51bGFyaXR5OjpTY3JvbGxCeUxpbmU7Ci0gICAgICAgIGNhc2UgS2V5OjpVcEFycm93 OgotICAgICAgICBjYXNlIEtleTo6RG93bkFycm93OgorICAgICAgICBjYXNlIEtleWJvYXJkU2Ny b2xsaW5nS2V5OjpVcEFycm93OgorICAgICAgICBjYXNlIEtleWJvYXJkU2Nyb2xsaW5nS2V5OjpE b3duQXJyb3c6CiAgICAgICAgICAgICBpZiAoZXZlbnQubWV0YUtleSgpKQogICAgICAgICAgICAg ICAgIHJldHVybiBTY3JvbGxHcmFudWxhcml0eTo6U2Nyb2xsQnlEb2N1bWVudDsKICAgICAgICAg ICAgIGlmIChldmVudC5hbHRLZXkoKSkKICAgICAgICAgICAgICAgICByZXR1cm4gU2Nyb2xsR3Jh bnVsYXJpdHk6OlNjcm9sbEJ5UGFnZTsKICAgICAgICAgICAgIHJldHVybiBTY3JvbGxHcmFudWxh cml0eTo6U2Nyb2xsQnlMaW5lOwotICAgICAgICBjYXNlIEtleTo6U3BhY2U6Ci0gICAgICAgIGNh c2UgS2V5OjpQYWdlVXA6Ci0gICAgICAgIGNhc2UgS2V5OjpQYWdlRG93bjoKKyAgICAgICAgY2Fz ZSBLZXlib2FyZFNjcm9sbGluZ0tleTo6U3BhY2U6CisgICAgICAgIGNhc2UgS2V5Ym9hcmRTY3Jv bGxpbmdLZXk6OlBhZ2VVcDoKKyAgICAgICAgY2FzZSBLZXlib2FyZFNjcm9sbGluZ0tleTo6UGFn ZURvd246CiAgICAgICAgICAgICByZXR1cm4gU2Nyb2xsR3JhbnVsYXJpdHk6OlNjcm9sbEJ5UGFn ZTsKICAgICAgICAgfTsKICAgICAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAg ICB9KCk7CiAKICAgICBhdXRvIGRpcmVjdGlvbiA9IFsmXSB7Ci0gICAgICAgIHN3aXRjaCAoa2V5 KSB7Ci0gICAgICAgIGNhc2UgS2V5OjpMZWZ0QXJyb3c6CisgICAgICAgIHN3aXRjaCAoa2V5LnZh bHVlKCkpIHsKKyAgICAgICAgY2FzZSBLZXlib2FyZFNjcm9sbGluZ0tleTo6TGVmdEFycm93Ogog ICAgICAgICAgICAgcmV0dXJuIFNjcm9sbERpcmVjdGlvbjo6U2Nyb2xsTGVmdDsKLSAgICAgICAg Y2FzZSBLZXk6OlJpZ2h0QXJyb3c6CisgICAgICAgIGNhc2UgS2V5Ym9hcmRTY3JvbGxpbmdLZXk6 OlJpZ2h0QXJyb3c6CiAgICAgICAgICAgICByZXR1cm4gU2Nyb2xsRGlyZWN0aW9uOjpTY3JvbGxS aWdodDsKLSAgICAgICAgY2FzZSBLZXk6OlVwQXJyb3c6Ci0gICAgICAgIGNhc2UgS2V5OjpQYWdl VXA6CisgICAgICAgIGNhc2UgS2V5Ym9hcmRTY3JvbGxpbmdLZXk6OlVwQXJyb3c6CisgICAgICAg IGNhc2UgS2V5Ym9hcmRTY3JvbGxpbmdLZXk6OlBhZ2VVcDoKICAgICAgICAgICAgIHJldHVybiBT Y3JvbGxEaXJlY3Rpb246OlNjcm9sbFVwOwotICAgICAgICBjYXNlIEtleTo6RG93bkFycm93Ogot ICAgICAgICBjYXNlIEtleTo6UGFnZURvd246CisgICAgICAgIGNhc2UgS2V5Ym9hcmRTY3JvbGxp bmdLZXk6OkRvd25BcnJvdzoKKyAgICAgICAgY2FzZSBLZXlib2FyZFNjcm9sbGluZ0tleTo6UGFn ZURvd246CiAgICAgICAgICAgICByZXR1cm4gU2Nyb2xsRGlyZWN0aW9uOjpTY3JvbGxEb3duOwot ICAgICAgICBjYXNlIEtleTo6U3BhY2U6CisgICAgICAgIGNhc2UgS2V5Ym9hcmRTY3JvbGxpbmdL ZXk6OlNwYWNlOgogICAgICAgICAgICAgcmV0dXJuIGV2ZW50LnNoaWZ0S2V5KCkgPyBTY3JvbGxE aXJlY3Rpb246OlNjcm9sbFVwIDogU2Nyb2xsRGlyZWN0aW9uOjpTY3JvbGxEb3duOwogICAgICAg ICB9CiAgICAgICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7CkBAIC0yMzYsMTYgKzI1 MiwxNiBAQCBzdGQ6Om9wdGlvbmFsPEtleWJvYXJkU2Nyb2xsPiBLZXlib2FyZFNjcm9sbGluZ0Fu aW1hdG9yOjprZXlib2FyZFNjcm9sbEZvcktleWJvYQogICAgIHJldHVybiBzY3JvbGw7CiB9CiAK LWJvb2wgS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvcjo6YmVnaW5LZXlib2FyZFNjcm9sbEdlc3R1 cmUoS2V5Ym9hcmRFdmVudCYgZXZlbnQpCitib29sIEtleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3I6 OmJlZ2luS2V5Ym9hcmRTY3JvbGxHZXN0dXJlKGNvbnN0IFBsYXRmb3JtS2V5Ym9hcmRFdmVudCYg ZXZlbnQpCiB7CiAgICAgYXV0byBzY3JvbGwgPSBrZXlib2FyZFNjcm9sbEZvcktleWJvYXJkRXZl bnQoZXZlbnQpOwotCiAgICAgaWYgKCFzY3JvbGwpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAog ICAgIG1fY3VycmVudEtleWJvYXJkU2Nyb2xsID0gc2Nyb2xsOwogCi0gICAgaWYgKCEoZXZlbnQu dHlwZSgpID09IGV2ZW50TmFtZXMoKS5rZXlkb3duRXZlbnQgfHwgZXZlbnQudHlwZSgpID09IGV2 ZW50TmFtZXMoKS5rZXlwcmVzc0V2ZW50KSkKKyAgICAvLyBQbGF0Zm9ybUV2ZW50OjpDaGFyIGlz IGEgImtleXByZXNzIiBldmVudC4KKyAgICBpZiAoIShldmVudC50eXBlKCkgPT0gUGxhdGZvcm1F dmVudDo6UmF3S2V5RG93biB8fCBldmVudC50eXBlKCkgPT0gUGxhdGZvcm1FdmVudDo6Q2hhcikp CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmIChtX3Njcm9sbFRyaWdnZXJpbmdLZXlJ c1ByZXNzZWQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LZXlib2FyZFNj cm9sbGluZ0FuaW1hdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LZXlib2FyZFNjcm9s bGluZ0FuaW1hdG9yLmgKaW5kZXggM2M5ODE0ZmY4OThhOGQ1YjU2YmZhNjg5MjU4OTc4NzQ3YmI4 MTEzZC4uNDg1YWJiMDFmYjJhNDY1NTY5Nzg5NjQ2Mjk0MzdiMjNjNDc1ZjBlNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvci5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3IuaApA QCAtMjUsMjcgKzI1LDI4IEBACiAKICNwcmFnbWEgb25jZQogCi0jaW5jbHVkZSAiS2V5Ym9hcmRF dmVudC5oIiAvLyBGSVhNRTogVGhpcyBpcyBhIGxheWVyaW5nIHZpb2xhdGlvbi4KICNpbmNsdWRl ICJLZXlib2FyZFNjcm9sbC5oIiAvLyBGSVhNRTogVGhpcyBpcyBhIGxheWVyaW5nIHZpb2xhdGlv bi4KICNpbmNsdWRlICJSZWN0RWRnZXMuaCIKICNpbmNsdWRlICJTY3JvbGxBbmltYXRvci5oIgog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2NsYXNzIFBsYXRmb3JtS2V5Ym9hcmRFdmVudDsKKwog Y2xhc3MgS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvciB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFC TEUoS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvcik7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FU RUQ7CiBwdWJsaWM6CiAgICAgS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvcihTY3JvbGxBbmltYXRv ciYsIFNjcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyJik7CiAKLSAgICBib29sIGJlZ2luS2V5Ym9h cmRTY3JvbGxHZXN0dXJlKEtleWJvYXJkRXZlbnQmKTsKKyAgICBib29sIGJlZ2luS2V5Ym9hcmRT Y3JvbGxHZXN0dXJlKGNvbnN0IFBsYXRmb3JtS2V5Ym9hcmRFdmVudCYpOwogICAgIHZvaWQgaGFu ZGxlS2V5VXBFdmVudCgpOwogICAgIHZvaWQgdXBkYXRlS2V5Ym9hcmRTY3JvbGxQb3NpdGlvbihN b25vdG9uaWNUaW1lKTsKIAogcHJpdmF0ZToKICAgICB2b2lkIHN0b3BLZXlib2FyZFNjcm9sbEFu aW1hdGlvbigpOwogICAgIFJlY3RFZGdlczxib29sPiBzY3JvbGxhYmxlRGlyZWN0aW9uc0Zyb21Q b3NpdGlvbihGbG9hdFBvaW50KSBjb25zdDsKLSAgICBzdGQ6Om9wdGlvbmFsPEtleWJvYXJkU2Ny b2xsPiBrZXlib2FyZFNjcm9sbEZvcktleWJvYXJkRXZlbnQoS2V5Ym9hcmRFdmVudCYpIGNvbnN0 OworICAgIHN0ZDo6b3B0aW9uYWw8S2V5Ym9hcmRTY3JvbGw+IGtleWJvYXJkU2Nyb2xsRm9yS2V5 Ym9hcmRFdmVudChjb25zdCBQbGF0Zm9ybUtleWJvYXJkRXZlbnQmKSBjb25zdDsKICAgICBmbG9h dCBzY3JvbGxEaXN0YW5jZShTY3JvbGxEaXJlY3Rpb24sIFNjcm9sbEdyYW51bGFyaXR5KSBjb25z dDsKIAogICAgIFNjcm9sbEFuaW1hdG9yJiBtX3Njcm9sbEFuaW1hdG9yOwo=