<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>228156</bug_id>
          
          <creation_ts>2021-07-21 12:31:36 -0700</creation_ts>
          <short_desc>macOS key-driven smooth scrolling does not work for pageUp/pageDown</short_desc>
          <delta_ts>2021-08-11 13:32:41 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebCore Misc.</component>
          <version>WebKit Local Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Dana Estra">dana.estra</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>akeerthi</cc>
    
    <cc>bdakin</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>thorton</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1778493</commentid>
    <comment_count>0</comment_count>
    <who name="Dana Estra">dana.estra</who>
    <bug_when>2021-07-21 12:31:36 -0700</bug_when>
    <thetext>pageUp/fn+up-arrow and pageDown/fn+down-arrow are not smooth.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1778499</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-07-21 12:37:59 -0700</bug_when>
    <thetext>&lt;rdar://problem/80911788&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781357</commentid>
    <comment_count>2</comment_count>
      <attachid>434784</attachid>
    <who name="Dana Estra">dana.estra</who>
    <bug_when>2021-08-02 12:35:19 -0700</bug_when>
    <thetext>Created attachment 434784
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781358</commentid>
    <comment_count>3</comment_count>
      <attachid>434785</attachid>
    <who name="Dana Estra">dana.estra</who>
    <bug_when>2021-08-02 12:38:40 -0700</bug_when>
    <thetext>Created attachment 434785
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781359</commentid>
    <comment_count>4</comment_count>
      <attachid>434785</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2021-08-02 12:43:25 -0700</bug_when>
    <thetext>Comment on attachment 434785
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=434785&amp;action=review

&gt; Source/WebCore/ChangeLog:10
&gt; +        No tests yet.

Maybe this is a good opportunity to start porting the iOS keyboard scrolling tests? I think there is one specifically about pageUp/Down

&gt; Source/WebKit/UIProcess/API/mac/WKWebViewMac.mm:269
&gt; +        [self.nextResponder tryToPerform:_cmd with:sender];

I think you need to return here, not say that you&apos;re not handling it (by passing it to the next responder) while ALSO handling it :)

&gt; Source/WebKit/UIProcess/API/mac/WKWebViewMac.mm:277
&gt; +        [self.nextResponder tryToPerform:_cmd with:sender];

(and here)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1782933</commentid>
    <comment_count>5</comment_count>
      <attachid>435197</attachid>
    <who name="Dana Estra">dana.estra</who>
    <bug_when>2021-08-09 12:10:52 -0700</bug_when>
    <thetext>Created attachment 435197
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1782936</commentid>
    <comment_count>6</comment_count>
      <attachid>435197</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2021-08-09 12:29:43 -0700</bug_when>
    <thetext>Comment on attachment 435197
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=435197&amp;action=review

&gt; LayoutTests/fast/scrolling/keyboard-scrolling-distance-pageDown.html:1
&gt; +&lt;!DOCTYPE html&gt; &lt;!-- webkit-test-runner [ useFlexibleViewport=true EventHandlerDrivenSmoothKeyboardScrollingEnabled=true ] --&gt;

Should wait and see if these actually pass on iOS (on the bots). I am hopeful but not certain :)

&gt; LayoutTests/fast/scrolling/keyboard-scrolling-distance-pageDown.html:38
&gt; +                dist: 0

WebKit style generally prefers not abbreviating things (I guess this is `distance`?)

&gt; LayoutTests/fast/scrolling/keyboard-scrolling-distance-pageDown.html:42
&gt; +                checkSuccessfulScroll(scrollObj)

missing semicolon (not required, just a good habit)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1783342</commentid>
    <comment_count>7</comment_count>
      <attachid>435310</attachid>
    <who name="Dana Estra">dana.estra</who>
    <bug_when>2021-08-10 15:44:33 -0700</bug_when>
    <thetext>Created attachment 435310
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1783615</commentid>
    <comment_count>8</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-08-11 13:32:39 -0700</bug_when>
    <thetext>Committed r280928 (240446@main): &lt;https://commits.webkit.org/240446@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 435310.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434784</attachid>
            <date>2021-08-02 12:35:19 -0700</date>
            <delta_ts>2021-08-02 12:38:37 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228156-20210802153518.patch</filename>
            <type>text/plain</type>
            <size>5949</size>
            <attacher name="Dana Estra">dana.estra</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNDgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjc3ZDNmOWFlMGI4YmNk
NmVjY2YxYzNkM2ZkYjc0ZDczYzBkZGI4OS4uZWYyYzA3Y2M1ZjFlMzcwZWZkNmFmOTMwNDUxMGQy
NzdhYzJkYTUxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA4LTAyICBEYW5h
IEVzdHJhICA8ZGVzdHJhQGFwcGxlLmNvbT4KKworICAgICAgICBtYWNPUyBzbW9vdGggc2Nyb2xs
aW5nIGZvciBwYWdlVXAvcGFnZURvd24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIyODE1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIHBhZ2VVcC9wYWdlRG93biBrZXlib2FyZCBldmVudCBzaG91bGQgdHJp
Z2dlciBzbW9vdGggc2Nyb2xsIGFuaW1hdGlvbiBvbiBtYWNPUywgcmF0aGVyIHRoYW4gYmVpbmcg
aGFuZGxlZCBieSBVSSBwcm9jZXNzLgorCisgICAgICAgIE5vIHRlc3RzIHlldC4KKworICAgICAg
ICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxl
cjo6ZGVmYXVsdEtleWJvYXJkRXZlbnRIYW5kbGVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9LZXli
b2FyZFNjcm9sbGluZ0FuaW1hdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OktleWJvYXJkU2Ny
b2xsaW5nQW5pbWF0b3I6OmtleWJvYXJkU2Nyb2xsRm9yS2V5Ym9hcmRFdmVudCBjb25zdCk6CisK
IDIwMjEtMDctMjMgIERhbmEgRXN0cmEgIDxkZXN0cmFAYXBwbGUuY29tPgogCiAgICAgICAgIEFk
ZCBrZXktZHJpdmVuIHNtb290aCBzY3JvbGxpbmcgdG8gbWFjT1MKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggNmYyMWE2
OGE4YmRhMDYyOGQwOTBmN2NmMjQ3OTNjZmJmNjRiODg1Ny4uMjRkYmViNzIzNDhlZGRkNDBkYzg3
MTcwMmZlOWExODllNjgwZDUwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cK
KysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMS0wOC0w
MiAgRGFuYSBFc3RyYSAgPGRlc3RyYUBhcHBsZS5jb20+CisKKyAgICAgICAgbWFjT1Mgc21vb3Ro
IHNjcm9sbGluZyBmb3IgcGFnZVVwL3BhZ2VEb3duCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjgxNTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP
RFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIHBhZ2VVcC9wYWdlRG93biBrZXlib2FyZCBl
dmVudCBzaG91bGQgdHJpZ2dlciBzbW9vdGggc2Nyb2xsIGFuaW1hdGlvbiBvbiBtYWNPUywgcmF0
aGVyIHRoYW4gYmVpbmcgaGFuZGxlZCBieSBVSSBwcm9jZXNzLgorICAgICAgICAKKyAgICAgICAg
Tm8gdGVzdHMgeWV0LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvV0tXZWJWaWV3TWFj
Lm1tOgorCiAyMDIxLTA3LTI5ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5j
b20+CiAKICAgICAgICAgU3RvcCBidWlsZGluZyBXZWJHUFUgYW5kIHRoZSBXSExTTCBjb21waWxl
ciB0byBkZWNyZWFzZSBiaW5hcnkgc2l6ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn
ZS9FdmVudEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3Bw
CmluZGV4IGRiODRiYzgxN2JkNjg3MjcwZjJjOTRkNTNmNmFlOTU5NWNkZjIzMTIuLmMzODg5MmEx
OGE5NjIwNmM3MzNlZTJmYTNiY2RiNjYzYmZjN2I5ODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50
SGFuZGxlci5jcHAKQEAgLTM3ODgsNiArMzc4OCw4IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjpkZWZh
dWx0S2V5Ym9hcmRFdmVudEhhbmRsZXIoS2V5Ym9hcmRFdmVudCYgZXZlbnQpCiAgICAgICAgICAg
ICBkZWZhdWx0VGFiRXZlbnRIYW5kbGVyKGV2ZW50KTsKICAgICAgICAgZWxzZSBpZiAoZXZlbnQu
a2V5SWRlbnRpZmllcigpID09ICJVKzAwMDgiKQogICAgICAgICAgICAgZGVmYXVsdEJhY2tzcGFj
ZUV2ZW50SGFuZGxlcihldmVudCk7CisgICAgICAgIGVsc2UgaWYgKGV2ZW50LmtleUlkZW50aWZp
ZXIoKSA9PSAiUGFnZVVwIiB8fCBldmVudC5rZXlJZGVudGlmaWVyKCkgPT0gIlBhZ2VEb3duIikK
KyAgICAgICAgICAgIHN0YXJ0S2V5Ym9hcmRTY3JvbGxpbmcoZXZlbnQpOwogICAgICAgICBlbHNl
IHsKICAgICAgICAgICAgIEZvY3VzRGlyZWN0aW9uIGRpcmVjdGlvbiA9IGZvY3VzRGlyZWN0aW9u
Rm9yS2V5KGV2ZW50LmtleUlkZW50aWZpZXIoKSk7CiAgICAgICAgICAgICBpZiAoZGlyZWN0aW9u
ICE9IEZvY3VzRGlyZWN0aW9uOjpOb25lKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh
dGZvcm0vS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9LZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yLmNwcAppbmRleCBhYTg2YmJlYjgzNjk0NmI0
MzE4NTNmMTJiMjdiZDNlNjk4OTJhZWRiLi5kMDIxNzY2ZjQ3Yzc1M2QzNDM3ZDE5ZGU3NThiMWY3
YTMxMzJhZDY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LZXlib2FyZFNj
cm9sbGluZ0FuaW1hdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LZXlib2Fy
ZFNjcm9sbGluZ0FuaW1hdG9yLmNwcApAQCAtMTYwLDcgKzE2MCw3IEBAIHN0ZDo6b3B0aW9uYWw8
S2V5Ym9hcmRTY3JvbGw+IEtleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3I6OmtleWJvYXJkU2Nyb2xs
Rm9yS2V5Ym9hCiB7CiAgICAgLy8gRklYTUUgKGJ1ZyAyMjc0NTkpOiBUaGlzIGxvZ2ljIGRvZXMg
bm90IGFjY291bnQgZm9yIHdyaXRpbmctbW9kZS4KIAotICAgIGVudW0gY2xhc3MgS2V5IDogdWlu
dDhfdCB7IExlZnRBcnJvdywgUmlnaHRBcnJvdywgVXBBcnJvdywgRG93bkFycm93LCBTcGFjZSB9
OworICAgIGVudW0gY2xhc3MgS2V5IDogdWludDhfdCB7IExlZnRBcnJvdywgUmlnaHRBcnJvdywg
VXBBcnJvdywgRG93bkFycm93LCBTcGFjZSwgUGFnZVVwLCBQYWdlRG93biB9OwogCiAgICAgS2V5
IGtleTsKICAgICBpZiAoZXZlbnQua2V5SWRlbnRpZmllcigpID09ICJMZWZ0IikKQEAgLTE3Myw2
ICsxNzMsMTAgQEAgc3RkOjpvcHRpb25hbDxLZXlib2FyZFNjcm9sbD4gS2V5Ym9hcmRTY3JvbGxp
bmdBbmltYXRvcjo6a2V5Ym9hcmRTY3JvbGxGb3JLZXlib2EKICAgICAgICAga2V5ID0gS2V5OjpE
b3duQXJyb3c7CiAgICAgZWxzZSBpZiAoZXZlbnQuY2hhckNvZGUoKSA9PSAnICcpCiAgICAgICAg
IGtleSA9IEtleTo6U3BhY2U7CisgICAgZWxzZSBpZiAoZXZlbnQua2V5SWRlbnRpZmllcigpID09
ICJQYWdlVXAiKQorICAgICAgICBrZXkgPSBLZXk6OlBhZ2VVcDsKKyAgICBlbHNlIGlmIChldmVu
dC5rZXlJZGVudGlmaWVyKCkgPT0gIlBhZ2VEb3duIikKKyAgICAgICAga2V5ID0gS2V5OjpQYWdl
RG93bjsKICAgICBlbHNlCiAgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CiAKQEAgLTE4OSw2
ICsxOTMsOCBAQCBzdGQ6Om9wdGlvbmFsPEtleWJvYXJkU2Nyb2xsPiBLZXlib2FyZFNjcm9sbGlu
Z0FuaW1hdG9yOjprZXlib2FyZFNjcm9sbEZvcktleWJvYQogICAgICAgICAgICAgICAgIHJldHVy
biBTY3JvbGxHcmFudWxhcml0eTo6U2Nyb2xsQnlQYWdlOwogICAgICAgICAgICAgcmV0dXJuIFNj
cm9sbEdyYW51bGFyaXR5OjpTY3JvbGxCeUxpbmU7CiAgICAgICAgIGNhc2UgS2V5OjpTcGFjZToK
KyAgICAgICAgY2FzZSBLZXk6OlBhZ2VVcDoKKyAgICAgICAgY2FzZSBLZXk6OlBhZ2VEb3duOgog
ICAgICAgICAgICAgcmV0dXJuIFNjcm9sbEdyYW51bGFyaXR5OjpTY3JvbGxCeVBhZ2U7CiAgICAg
ICAgIH07CiAgICAgfSgpOwpAQCAtMjAwLDggKzIwNiwxMCBAQCBzdGQ6Om9wdGlvbmFsPEtleWJv
YXJkU2Nyb2xsPiBLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yOjprZXlib2FyZFNjcm9sbEZvcktl
eWJvYQogICAgICAgICBjYXNlIEtleTo6UmlnaHRBcnJvdzoKICAgICAgICAgICAgIHJldHVybiBT
Y3JvbGxEaXJlY3Rpb246OlNjcm9sbFJpZ2h0OwogICAgICAgICBjYXNlIEtleTo6VXBBcnJvdzoK
KyAgICAgICAgY2FzZSBLZXk6OlBhZ2VVcDoKICAgICAgICAgICAgIHJldHVybiBTY3JvbGxEaXJl
Y3Rpb246OlNjcm9sbFVwOwogICAgICAgICBjYXNlIEtleTo6RG93bkFycm93OgorICAgICAgICBj
YXNlIEtleTo6UGFnZURvd246CiAgICAgICAgICAgICByZXR1cm4gU2Nyb2xsRGlyZWN0aW9uOjpT
Y3JvbGxEb3duOwogICAgICAgICBjYXNlIEtleTo6U3BhY2U6CiAgICAgICAgICAgICByZXR1cm4g
ZXZlbnQuc2hpZnRLZXkoKSA/IFNjcm9sbERpcmVjdGlvbjo6U2Nyb2xsVXAgOiBTY3JvbGxEaXJl
Y3Rpb246OlNjcm9sbERvd247CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B
UEkvbWFjL1dLV2ViVmlld01hYy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9tYWMv
V0tXZWJWaWV3TWFjLm1tCmluZGV4IDM1ZTViNWI5YzM2OGMyZTNhYTM3YzQ0MmI5MWQ1MmExMWMz
MmNlNjEuLjcxNDYzYTU0YjM0NDdmZGQxMzg3MDgzY2I2OGY0MzlkNDVkYWY4MGEgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9tYWMvV0tXZWJWaWV3TWFjLm1tCisrKyBi
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9tYWMvV0tXZWJWaWV3TWFjLm1tCkBAIC0yNDAs
OCArMjQwLDYgQEAgV0VCQ09SRV9DT01NQU5EKHBhZ2VVcCkKIFdFQkNPUkVfQ09NTUFORChwYWdl
VXBBbmRNb2RpZnlTZWxlY3Rpb24pCiBXRUJDT1JFX0NPTU1BTkQocGFzdGUpCiBXRUJDT1JFX0NP
TU1BTkQocGFzdGVBc1BsYWluVGV4dCkKLVdFQkNPUkVfQ09NTUFORChzY3JvbGxQYWdlRG93bikK
LVdFQkNPUkVfQ09NTUFORChzY3JvbGxQYWdlVXApCiBXRUJDT1JFX0NPTU1BTkQoc2Nyb2xsTGlu
ZURvd24pCiBXRUJDT1JFX0NPTU1BTkQoc2Nyb2xsTGluZVVwKQogV0VCQ09SRV9DT01NQU5EKHNj
cm9sbFRvQmVnaW5uaW5nT2ZEb2N1bWVudCkKQEAgLTI2NSw2ICsyNjMsMjIgQEAgV0VCQ09SRV9D
T01NQU5EKHlhbmtBbmRTZWxlY3QpCiAKICN1bmRlZiBXRUJDT1JFX0NPTU1BTkQKIAorLSAodm9p
ZClzY3JvbGxQYWdlRG93bjooaWQpc2VuZGVyCit7CisgICAgaWYgKF9pbXBsLT5wYWdlKCkucHJl
ZmVyZW5jZXMoKS5ldmVudEhhbmRsZXJEcml2ZW5TbW9vdGhLZXlib2FyZFNjcm9sbGluZ0VuYWJs
ZWQoKSkgeworICAgICAgICBbc2VsZi5uZXh0UmVzcG9uZGVyIHRyeVRvUGVyZm9ybTpfY21kIHdp
dGg6c2VuZGVyXTsKKyAgICB9CisgICAgX2ltcGwtPmV4ZWN1dGVFZGl0Q29tbWFuZEZvclNlbGVj
dG9yKF9jbWQpOworfQorCistICh2b2lkKXNjcm9sbFBhZ2VVcDooaWQpc2VuZGVyCit7CisgICAg
aWYgKF9pbXBsLT5wYWdlKCkucHJlZmVyZW5jZXMoKS5ldmVudEhhbmRsZXJEcml2ZW5TbW9vdGhL
ZXlib2FyZFNjcm9sbGluZ0VuYWJsZWQoKSkgeworICAgICAgICBbc2VsZi5uZXh0UmVzcG9uZGVy
IHRyeVRvUGVyZm9ybTpfY21kIHdpdGg6c2VuZGVyXTsKKyAgICB9CisgICAgX2ltcGwtPmV4ZWN1
dGVFZGl0Q29tbWFuZEZvclNlbGVjdG9yKF9jbWQpOworfQorCiAtIChCT09MKXdyaXRlU2VsZWN0
aW9uVG9QYXN0ZWJvYXJkOihOU1Bhc3RlYm9hcmQgKilwYXN0ZWJvYXJkIHR5cGVzOihOU0FycmF5
ICopdHlwZXMKIHsKICAgICByZXR1cm4gX2ltcGwtPndyaXRlU2VsZWN0aW9uVG9QYXN0ZWJvYXJk
KHBhc3RlYm9hcmQsIHR5cGVzKTsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434785</attachid>
            <date>2021-08-02 12:38:40 -0700</date>
            <delta_ts>2021-08-09 12:10:49 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228156-20210802153839.patch</filename>
            <type>text/plain</type>
            <size>5935</size>
            <attacher name="Dana Estra">dana.estra</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNDgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjc3ZDNmOWFlMGI4YmNk
NmVjY2YxYzNkM2ZkYjc0ZDczYzBkZGI4OS4uZWYyYzA3Y2M1ZjFlMzcwZWZkNmFmOTMwNDUxMGQy
NzdhYzJkYTUxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA4LTAyICBEYW5h
IEVzdHJhICA8ZGVzdHJhQGFwcGxlLmNvbT4KKworICAgICAgICBtYWNPUyBzbW9vdGggc2Nyb2xs
aW5nIGZvciBwYWdlVXAvcGFnZURvd24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIyODE1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIHBhZ2VVcC9wYWdlRG93biBrZXlib2FyZCBldmVudCBzaG91bGQgdHJp
Z2dlciBzbW9vdGggc2Nyb2xsIGFuaW1hdGlvbiBvbiBtYWNPUywgcmF0aGVyIHRoYW4gYmVpbmcg
aGFuZGxlZCBieSBVSSBwcm9jZXNzLgorCisgICAgICAgIE5vIHRlc3RzIHlldC4KKworICAgICAg
ICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxl
cjo6ZGVmYXVsdEtleWJvYXJkRXZlbnRIYW5kbGVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9LZXli
b2FyZFNjcm9sbGluZ0FuaW1hdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OktleWJvYXJkU2Ny
b2xsaW5nQW5pbWF0b3I6OmtleWJvYXJkU2Nyb2xsRm9yS2V5Ym9hcmRFdmVudCBjb25zdCk6CisK
IDIwMjEtMDctMjMgIERhbmEgRXN0cmEgIDxkZXN0cmFAYXBwbGUuY29tPgogCiAgICAgICAgIEFk
ZCBrZXktZHJpdmVuIHNtb290aCBzY3JvbGxpbmcgdG8gbWFjT1MKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggNmYyMWE2
OGE4YmRhMDYyOGQwOTBmN2NmMjQ3OTNjZmJmNjRiODg1Ny4uMjRkYmViNzIzNDhlZGRkNDBkYzg3
MTcwMmZlOWExODllNjgwZDUwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cK
KysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMS0wOC0w
MiAgRGFuYSBFc3RyYSAgPGRlc3RyYUBhcHBsZS5jb20+CisKKyAgICAgICAgbWFjT1Mgc21vb3Ro
IHNjcm9sbGluZyBmb3IgcGFnZVVwL3BhZ2VEb3duCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjgxNTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP
RFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIHBhZ2VVcC9wYWdlRG93biBrZXlib2FyZCBl
dmVudCBzaG91bGQgdHJpZ2dlciBzbW9vdGggc2Nyb2xsIGFuaW1hdGlvbiBvbiBtYWNPUywgcmF0
aGVyIHRoYW4gYmVpbmcgaGFuZGxlZCBieSBVSSBwcm9jZXNzLgorICAgICAgICAKKyAgICAgICAg
Tm8gdGVzdHMgeWV0LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvV0tXZWJWaWV3TWFj
Lm1tOgorCiAyMDIxLTA3LTI5ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5j
b20+CiAKICAgICAgICAgU3RvcCBidWlsZGluZyBXZWJHUFUgYW5kIHRoZSBXSExTTCBjb21waWxl
ciB0byBkZWNyZWFzZSBiaW5hcnkgc2l6ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn
ZS9FdmVudEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3Bw
CmluZGV4IGRiODRiYzgxN2JkNjg3MjcwZjJjOTRkNTNmNmFlOTU5NWNkZjIzMTIuLmMzODg5MmEx
OGE5NjIwNmM3MzNlZTJmYTNiY2RiNjYzYmZjN2I5ODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50
SGFuZGxlci5jcHAKQEAgLTM3ODgsNiArMzc4OCw4IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjpkZWZh
dWx0S2V5Ym9hcmRFdmVudEhhbmRsZXIoS2V5Ym9hcmRFdmVudCYgZXZlbnQpCiAgICAgICAgICAg
ICBkZWZhdWx0VGFiRXZlbnRIYW5kbGVyKGV2ZW50KTsKICAgICAgICAgZWxzZSBpZiAoZXZlbnQu
a2V5SWRlbnRpZmllcigpID09ICJVKzAwMDgiKQogICAgICAgICAgICAgZGVmYXVsdEJhY2tzcGFj
ZUV2ZW50SGFuZGxlcihldmVudCk7CisgICAgICAgIGVsc2UgaWYgKGV2ZW50LmtleUlkZW50aWZp
ZXIoKSA9PSAiUGFnZVVwIiB8fCBldmVudC5rZXlJZGVudGlmaWVyKCkgPT0gIlBhZ2VEb3duIikK
KyAgICAgICAgICAgIHN0YXJ0S2V5Ym9hcmRTY3JvbGxpbmcoZXZlbnQpOwogICAgICAgICBlbHNl
IHsKICAgICAgICAgICAgIEZvY3VzRGlyZWN0aW9uIGRpcmVjdGlvbiA9IGZvY3VzRGlyZWN0aW9u
Rm9yS2V5KGV2ZW50LmtleUlkZW50aWZpZXIoKSk7CiAgICAgICAgICAgICBpZiAoZGlyZWN0aW9u
ICE9IEZvY3VzRGlyZWN0aW9uOjpOb25lKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh
dGZvcm0vS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9LZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yLmNwcAppbmRleCBhYTg2YmJlYjgzNjk0NmI0
MzE4NTNmMTJiMjdiZDNlNjk4OTJhZWRiLi5kMDIxNzY2ZjQ3Yzc1M2QzNDM3ZDE5ZGU3NThiMWY3
YTMxMzJhZDY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LZXlib2FyZFNj
cm9sbGluZ0FuaW1hdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LZXlib2Fy
ZFNjcm9sbGluZ0FuaW1hdG9yLmNwcApAQCAtMTYwLDcgKzE2MCw3IEBAIHN0ZDo6b3B0aW9uYWw8
S2V5Ym9hcmRTY3JvbGw+IEtleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3I6OmtleWJvYXJkU2Nyb2xs
Rm9yS2V5Ym9hCiB7CiAgICAgLy8gRklYTUUgKGJ1ZyAyMjc0NTkpOiBUaGlzIGxvZ2ljIGRvZXMg
bm90IGFjY291bnQgZm9yIHdyaXRpbmctbW9kZS4KIAotICAgIGVudW0gY2xhc3MgS2V5IDogdWlu
dDhfdCB7IExlZnRBcnJvdywgUmlnaHRBcnJvdywgVXBBcnJvdywgRG93bkFycm93LCBTcGFjZSB9
OworICAgIGVudW0gY2xhc3MgS2V5IDogdWludDhfdCB7IExlZnRBcnJvdywgUmlnaHRBcnJvdywg
VXBBcnJvdywgRG93bkFycm93LCBTcGFjZSwgUGFnZVVwLCBQYWdlRG93biB9OwogCiAgICAgS2V5
IGtleTsKICAgICBpZiAoZXZlbnQua2V5SWRlbnRpZmllcigpID09ICJMZWZ0IikKQEAgLTE3Myw2
ICsxNzMsMTAgQEAgc3RkOjpvcHRpb25hbDxLZXlib2FyZFNjcm9sbD4gS2V5Ym9hcmRTY3JvbGxp
bmdBbmltYXRvcjo6a2V5Ym9hcmRTY3JvbGxGb3JLZXlib2EKICAgICAgICAga2V5ID0gS2V5OjpE
b3duQXJyb3c7CiAgICAgZWxzZSBpZiAoZXZlbnQuY2hhckNvZGUoKSA9PSAnICcpCiAgICAgICAg
IGtleSA9IEtleTo6U3BhY2U7CisgICAgZWxzZSBpZiAoZXZlbnQua2V5SWRlbnRpZmllcigpID09
ICJQYWdlVXAiKQorICAgICAgICBrZXkgPSBLZXk6OlBhZ2VVcDsKKyAgICBlbHNlIGlmIChldmVu
dC5rZXlJZGVudGlmaWVyKCkgPT0gIlBhZ2VEb3duIikKKyAgICAgICAga2V5ID0gS2V5OjpQYWdl
RG93bjsKICAgICBlbHNlCiAgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CiAKQEAgLTE4OSw2
ICsxOTMsOCBAQCBzdGQ6Om9wdGlvbmFsPEtleWJvYXJkU2Nyb2xsPiBLZXlib2FyZFNjcm9sbGlu
Z0FuaW1hdG9yOjprZXlib2FyZFNjcm9sbEZvcktleWJvYQogICAgICAgICAgICAgICAgIHJldHVy
biBTY3JvbGxHcmFudWxhcml0eTo6U2Nyb2xsQnlQYWdlOwogICAgICAgICAgICAgcmV0dXJuIFNj
cm9sbEdyYW51bGFyaXR5OjpTY3JvbGxCeUxpbmU7CiAgICAgICAgIGNhc2UgS2V5OjpTcGFjZToK
KyAgICAgICAgY2FzZSBLZXk6OlBhZ2VVcDoKKyAgICAgICAgY2FzZSBLZXk6OlBhZ2VEb3duOgog
ICAgICAgICAgICAgcmV0dXJuIFNjcm9sbEdyYW51bGFyaXR5OjpTY3JvbGxCeVBhZ2U7CiAgICAg
ICAgIH07CiAgICAgfSgpOwpAQCAtMjAwLDggKzIwNiwxMCBAQCBzdGQ6Om9wdGlvbmFsPEtleWJv
YXJkU2Nyb2xsPiBLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yOjprZXlib2FyZFNjcm9sbEZvcktl
eWJvYQogICAgICAgICBjYXNlIEtleTo6UmlnaHRBcnJvdzoKICAgICAgICAgICAgIHJldHVybiBT
Y3JvbGxEaXJlY3Rpb246OlNjcm9sbFJpZ2h0OwogICAgICAgICBjYXNlIEtleTo6VXBBcnJvdzoK
KyAgICAgICAgY2FzZSBLZXk6OlBhZ2VVcDoKICAgICAgICAgICAgIHJldHVybiBTY3JvbGxEaXJl
Y3Rpb246OlNjcm9sbFVwOwogICAgICAgICBjYXNlIEtleTo6RG93bkFycm93OgorICAgICAgICBj
YXNlIEtleTo6UGFnZURvd246CiAgICAgICAgICAgICByZXR1cm4gU2Nyb2xsRGlyZWN0aW9uOjpT
Y3JvbGxEb3duOwogICAgICAgICBjYXNlIEtleTo6U3BhY2U6CiAgICAgICAgICAgICByZXR1cm4g
ZXZlbnQuc2hpZnRLZXkoKSA/IFNjcm9sbERpcmVjdGlvbjo6U2Nyb2xsVXAgOiBTY3JvbGxEaXJl
Y3Rpb246OlNjcm9sbERvd247CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B
UEkvbWFjL1dLV2ViVmlld01hYy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9tYWMv
V0tXZWJWaWV3TWFjLm1tCmluZGV4IDM1ZTViNWI5YzM2OGMyZTNhYTM3YzQ0MmI5MWQ1MmExMWMz
MmNlNjEuLjQzNDgwYjNlZDU0MThhMjEwNjM1YTEwMzVkNDY5ZmEzMmExMTgyYTcgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9tYWMvV0tXZWJWaWV3TWFjLm1tCisrKyBi
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9tYWMvV0tXZWJWaWV3TWFjLm1tCkBAIC0yNDAs
OCArMjQwLDYgQEAgV0VCQ09SRV9DT01NQU5EKHBhZ2VVcCkKIFdFQkNPUkVfQ09NTUFORChwYWdl
VXBBbmRNb2RpZnlTZWxlY3Rpb24pCiBXRUJDT1JFX0NPTU1BTkQocGFzdGUpCiBXRUJDT1JFX0NP
TU1BTkQocGFzdGVBc1BsYWluVGV4dCkKLVdFQkNPUkVfQ09NTUFORChzY3JvbGxQYWdlRG93bikK
LVdFQkNPUkVfQ09NTUFORChzY3JvbGxQYWdlVXApCiBXRUJDT1JFX0NPTU1BTkQoc2Nyb2xsTGlu
ZURvd24pCiBXRUJDT1JFX0NPTU1BTkQoc2Nyb2xsTGluZVVwKQogV0VCQ09SRV9DT01NQU5EKHNj
cm9sbFRvQmVnaW5uaW5nT2ZEb2N1bWVudCkKQEAgLTI2NSw2ICsyNjMsMjIgQEAgV0VCQ09SRV9D
T01NQU5EKHlhbmtBbmRTZWxlY3QpCiAKICN1bmRlZiBXRUJDT1JFX0NPTU1BTkQKIAorLSAodm9p
ZClzY3JvbGxQYWdlRG93bjooaWQpc2VuZGVyCit7CisgICAgaWYgKF9pbXBsLT5wYWdlKCkucHJl
ZmVyZW5jZXMoKS5ldmVudEhhbmRsZXJEcml2ZW5TbW9vdGhLZXlib2FyZFNjcm9sbGluZ0VuYWJs
ZWQoKSkKKyAgICAgICAgW3NlbGYubmV4dFJlc3BvbmRlciB0cnlUb1BlcmZvcm06X2NtZCB3aXRo
OnNlbmRlcl07CisKKyAgICBfaW1wbC0+ZXhlY3V0ZUVkaXRDb21tYW5kRm9yU2VsZWN0b3IoX2Nt
ZCk7Cit9CisKKy0gKHZvaWQpc2Nyb2xsUGFnZVVwOihpZClzZW5kZXIKK3sKKyAgICBpZiAoX2lt
cGwtPnBhZ2UoKS5wcmVmZXJlbmNlcygpLmV2ZW50SGFuZGxlckRyaXZlblNtb290aEtleWJvYXJk
U2Nyb2xsaW5nRW5hYmxlZCgpKQorICAgICAgICBbc2VsZi5uZXh0UmVzcG9uZGVyIHRyeVRvUGVy
Zm9ybTpfY21kIHdpdGg6c2VuZGVyXTsKKworICAgIF9pbXBsLT5leGVjdXRlRWRpdENvbW1hbmRG
b3JTZWxlY3RvcihfY21kKTsKK30KKwogLSAoQk9PTCl3cml0ZVNlbGVjdGlvblRvUGFzdGVib2Fy
ZDooTlNQYXN0ZWJvYXJkICopcGFzdGVib2FyZCB0eXBlczooTlNBcnJheSAqKXR5cGVzCiB7CiAg
ICAgcmV0dXJuIF9pbXBsLT53cml0ZVNlbGVjdGlvblRvUGFzdGVib2FyZChwYXN0ZWJvYXJkLCB0
eXBlcyk7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435197</attachid>
            <date>2021-08-09 12:10:52 -0700</date>
            <delta_ts>2021-08-10 15:44:30 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228156-20210809151051.patch</filename>
            <type>text/plain</type>
            <size>12759</size>
            <attacher name="Dana Estra">dana.estra</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNDgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTQyZTliMGQyMDczYzUw
ODkzZGJlNTg2NmYxMzJmOGFhMzdkMzk5OS4uNmNkMDMzMDZiZGZjNWU0ZGMxYzNjMGZjMTUxYjkw
Y2U2NWM3NzMxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA4LTA5ICBEYW5h
IEVzdHJhICA8ZGVzdHJhQGFwcGxlLmNvbT4KKworICAgICAgICBTdGFydCBzbW9vdGgga2V5Ym9h
cmQgc2Nyb2xsaW5nIGFuaW1hdGlvbiB3aGVuIHBhZ2VVcCBvciBwYWdlRG93biBrZXkgaXMgcHJl
c3NlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy
ODE1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAg
ICAgICAgVUlQcm9jZXNzIG5vdyBubyBsb25nZXIgaGFuZGxlcyBzY3JvbGxQYWdlVXAgYW5kIHNj
cm9sbFBhZ2VEb3duIGV2ZW50cy4gVGhleSByZXR1cm4gdG8gZXZlbnRIYW5kbGVyIGFzCisgICAg
ICAgIHVuaGFuZGxlZCBhbmQgdGhlIGtleWJvYXJkIHNjcm9sbCBhbmltYXRpb24gaXMgc3RhcnRl
ZC4KKworICAgICAgICBUZXN0czogZmFzdC9zY3JvbGxpbmcva2V5Ym9hcmQtc2Nyb2xsaW5nLWRp
c3RhbmNlLWRvd25BcnJvdy5odG1sCisgICAgICAgICAgICAgICBmYXN0L3Njcm9sbGluZy9rZXli
b2FyZC1zY3JvbGxpbmctZGlzdGFuY2UtcGFnZURvd24uaHRtbAorCisgICAgICAgICogcGFnZS9F
dmVudEhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpkZWZhdWx0
S2V5Ym9hcmRFdmVudEhhbmRsZXIpOgorICAgICAgICAqIHBsYXRmb3JtL0tleWJvYXJkU2Nyb2xs
aW5nQW5pbWF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6S2V5Ym9hcmRTY3JvbGxpbmdBbmlt
YXRvcjo6a2V5Ym9hcmRTY3JvbGxGb3JLZXlib2FyZEV2ZW50IGNvbnN0KToKKwogMjAyMS0wOC0w
NCAgRGFuYSBFc3RyYSAgPGRlc3RyYUBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAo
cjI4MDQ5Mik6IENsaWNraW5nIGJhY2tzcGFjZSBvbiBzaWduIGluIGZpZWxkcyByZXN1bHRzIGlu
IGRlbGV0aW5nIHR3byBjaGFyYWN0ZXJzIGluc3RlYWQgb2Ygb25lLgpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA2ZjIx
YTY4YThiZGEwNjI4ZDA5MGY3Y2YyNDc5M2NmYmY2NGI4ODU3Li41YzliNzY2MTQ1NzgxYTdjODE5
MGZiZWQ1ODk1MGY4NjQ2ZjcxMDMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv
ZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA4
LTA5ICBEYW5hIEVzdHJhICA8ZGVzdHJhQGFwcGxlLmNvbT4KKworICAgICAgICBTdGFydCBzbW9v
dGgga2V5Ym9hcmQgc2Nyb2xsaW5nIGFuaW1hdGlvbiB3aGVuIHBhZ2VVcCBvciBwYWdlRG93biBr
ZXkgaXMgcHJlc3NlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTIyODE1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAg
ICAgICAKKyAgICAgICAgVUlQcm9jZXNzIG5vdyBubyBsb25nZXIgaGFuZGxlcyBzY3JvbGxQYWdl
VXAgYW5kIHNjcm9sbFBhZ2VEb3duIGV2ZW50cy4gVGhleSByZXR1cm4KKyAgICAgICAgdG8gZXZl
bnRIYW5kbGVyIGFzIHVuaGFuZGxlZCBhbmQgdGhlIGtleWJvYXJkIHNjcm9sbCBhbmltYXRpb24g
aXMgc3RhcnRlZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLV2ViVmlld01hYy5t
bToKKyAgICAgICAgKC1bV0tXZWJWaWV3IHNjcm9sbFBhZ2VEb3duOl0pOgorICAgICAgICAoLVtX
S1dlYlZpZXcgc2Nyb2xsUGFnZVVwOl0pOgorCiAyMDIxLTA3LTI5ICBNeWxlcyBDLiBNYXhmaWVs
ZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgU3RvcCBidWlsZGluZyBXZWJHUFUg
YW5kIHRoZSBXSExTTCBjb21waWxlciB0byBkZWNyZWFzZSBiaW5hcnkgc2l6ZQpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv
cGFnZS9FdmVudEhhbmRsZXIuY3BwCmluZGV4IGMxOWQxNTVjNGZiMjNkZGUzOWI3YWI3NDgxODIy
MzBlOWI1OGM1NjYuLjA5OTZlMTlkZjJlZGFlMzgzNWUwM2U1NGFmOWRmMTc5OWVlZjUxMzEgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKQEAgLTM3ODgsNiArMzc4OCw4IEBAIHZv
aWQgRXZlbnRIYW5kbGVyOjpkZWZhdWx0S2V5Ym9hcmRFdmVudEhhbmRsZXIoS2V5Ym9hcmRFdmVu
dCYgZXZlbnQpCiAgICAgICAgICAgICBkZWZhdWx0VGFiRXZlbnRIYW5kbGVyKGV2ZW50KTsKICAg
ICAgICAgZWxzZSBpZiAoZXZlbnQua2V5SWRlbnRpZmllcigpID09ICJVKzAwMDgiKQogICAgICAg
ICAgICAgZGVmYXVsdEJhY2tzcGFjZUV2ZW50SGFuZGxlcihldmVudCk7CisgICAgICAgIGVsc2Ug
aWYgKGV2ZW50LmtleUlkZW50aWZpZXIoKSA9PSAiUGFnZVVwIiB8fCBldmVudC5rZXlJZGVudGlm
aWVyKCkgPT0gIlBhZ2VEb3duIikKKyAgICAgICAgICAgIHN0YXJ0S2V5Ym9hcmRTY3JvbGxpbmco
ZXZlbnQpOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIEZvY3VzRGlyZWN0aW9uIGRpcmVj
dGlvbiA9IGZvY3VzRGlyZWN0aW9uRm9yS2V5KGV2ZW50LmtleUlkZW50aWZpZXIoKSk7CiAgICAg
ICAgICAgICBpZiAoZGlyZWN0aW9uICE9IEZvY3VzRGlyZWN0aW9uOjpOb25lKQpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvci5jcHAg
Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yLmNwcApp
bmRleCBhYTg2YmJlYjgzNjk0NmI0MzE4NTNmMTJiMjdiZDNlNjk4OTJhZWRiLi5kMDIxNzY2ZjQ3
Yzc1M2QzNDM3ZDE5ZGU3NThiMWY3YTMxMzJhZDY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y
ZS9wbGF0Zm9ybS9LZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yLmNwcAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9LZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yLmNwcApAQCAtMTYwLDcgKzE2
MCw3IEBAIHN0ZDo6b3B0aW9uYWw8S2V5Ym9hcmRTY3JvbGw+IEtleWJvYXJkU2Nyb2xsaW5nQW5p
bWF0b3I6OmtleWJvYXJkU2Nyb2xsRm9yS2V5Ym9hCiB7CiAgICAgLy8gRklYTUUgKGJ1ZyAyMjc0
NTkpOiBUaGlzIGxvZ2ljIGRvZXMgbm90IGFjY291bnQgZm9yIHdyaXRpbmctbW9kZS4KIAotICAg
IGVudW0gY2xhc3MgS2V5IDogdWludDhfdCB7IExlZnRBcnJvdywgUmlnaHRBcnJvdywgVXBBcnJv
dywgRG93bkFycm93LCBTcGFjZSB9OworICAgIGVudW0gY2xhc3MgS2V5IDogdWludDhfdCB7IExl
ZnRBcnJvdywgUmlnaHRBcnJvdywgVXBBcnJvdywgRG93bkFycm93LCBTcGFjZSwgUGFnZVVwLCBQ
YWdlRG93biB9OwogCiAgICAgS2V5IGtleTsKICAgICBpZiAoZXZlbnQua2V5SWRlbnRpZmllcigp
ID09ICJMZWZ0IikKQEAgLTE3Myw2ICsxNzMsMTAgQEAgc3RkOjpvcHRpb25hbDxLZXlib2FyZFNj
cm9sbD4gS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvcjo6a2V5Ym9hcmRTY3JvbGxGb3JLZXlib2EK
ICAgICAgICAga2V5ID0gS2V5OjpEb3duQXJyb3c7CiAgICAgZWxzZSBpZiAoZXZlbnQuY2hhckNv
ZGUoKSA9PSAnICcpCiAgICAgICAgIGtleSA9IEtleTo6U3BhY2U7CisgICAgZWxzZSBpZiAoZXZl
bnQua2V5SWRlbnRpZmllcigpID09ICJQYWdlVXAiKQorICAgICAgICBrZXkgPSBLZXk6OlBhZ2VV
cDsKKyAgICBlbHNlIGlmIChldmVudC5rZXlJZGVudGlmaWVyKCkgPT0gIlBhZ2VEb3duIikKKyAg
ICAgICAga2V5ID0gS2V5OjpQYWdlRG93bjsKICAgICBlbHNlCiAgICAgICAgIHJldHVybiBzdGQ6
Om51bGxvcHQ7CiAKQEAgLTE4OSw2ICsxOTMsOCBAQCBzdGQ6Om9wdGlvbmFsPEtleWJvYXJkU2Ny
b2xsPiBLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yOjprZXlib2FyZFNjcm9sbEZvcktleWJvYQog
ICAgICAgICAgICAgICAgIHJldHVybiBTY3JvbGxHcmFudWxhcml0eTo6U2Nyb2xsQnlQYWdlOwog
ICAgICAgICAgICAgcmV0dXJuIFNjcm9sbEdyYW51bGFyaXR5OjpTY3JvbGxCeUxpbmU7CiAgICAg
ICAgIGNhc2UgS2V5OjpTcGFjZToKKyAgICAgICAgY2FzZSBLZXk6OlBhZ2VVcDoKKyAgICAgICAg
Y2FzZSBLZXk6OlBhZ2VEb3duOgogICAgICAgICAgICAgcmV0dXJuIFNjcm9sbEdyYW51bGFyaXR5
OjpTY3JvbGxCeVBhZ2U7CiAgICAgICAgIH07CiAgICAgfSgpOwpAQCAtMjAwLDggKzIwNiwxMCBA
QCBzdGQ6Om9wdGlvbmFsPEtleWJvYXJkU2Nyb2xsPiBLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9y
OjprZXlib2FyZFNjcm9sbEZvcktleWJvYQogICAgICAgICBjYXNlIEtleTo6UmlnaHRBcnJvdzoK
ICAgICAgICAgICAgIHJldHVybiBTY3JvbGxEaXJlY3Rpb246OlNjcm9sbFJpZ2h0OwogICAgICAg
ICBjYXNlIEtleTo6VXBBcnJvdzoKKyAgICAgICAgY2FzZSBLZXk6OlBhZ2VVcDoKICAgICAgICAg
ICAgIHJldHVybiBTY3JvbGxEaXJlY3Rpb246OlNjcm9sbFVwOwogICAgICAgICBjYXNlIEtleTo6
RG93bkFycm93OgorICAgICAgICBjYXNlIEtleTo6UGFnZURvd246CiAgICAgICAgICAgICByZXR1
cm4gU2Nyb2xsRGlyZWN0aW9uOjpTY3JvbGxEb3duOwogICAgICAgICBjYXNlIEtleTo6U3BhY2U6
CiAgICAgICAgICAgICByZXR1cm4gZXZlbnQuc2hpZnRLZXkoKSA/IFNjcm9sbERpcmVjdGlvbjo6
U2Nyb2xsVXAgOiBTY3JvbGxEaXJlY3Rpb246OlNjcm9sbERvd247CmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvbWFjL1dLV2ViVmlld01hYy5tbSBiL1NvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL0FQSS9tYWMvV0tXZWJWaWV3TWFjLm1tCmluZGV4IDM1ZTViNWI5YzM2OGMy
ZTNhYTM3YzQ0MmI5MWQ1MmExMWMzMmNlNjEuLmEwN2M5ZWRlNWE1YjRiNGFjMDNiMWYxZDRkMTA1
YjUzMmE0Y2U3NjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9tYWMv
V0tXZWJWaWV3TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9tYWMvV0tX
ZWJWaWV3TWFjLm1tCkBAIC0yNDAsOCArMjQwLDYgQEAgV0VCQ09SRV9DT01NQU5EKHBhZ2VVcCkK
IFdFQkNPUkVfQ09NTUFORChwYWdlVXBBbmRNb2RpZnlTZWxlY3Rpb24pCiBXRUJDT1JFX0NPTU1B
TkQocGFzdGUpCiBXRUJDT1JFX0NPTU1BTkQocGFzdGVBc1BsYWluVGV4dCkKLVdFQkNPUkVfQ09N
TUFORChzY3JvbGxQYWdlRG93bikKLVdFQkNPUkVfQ09NTUFORChzY3JvbGxQYWdlVXApCiBXRUJD
T1JFX0NPTU1BTkQoc2Nyb2xsTGluZURvd24pCiBXRUJDT1JFX0NPTU1BTkQoc2Nyb2xsTGluZVVw
KQogV0VCQ09SRV9DT01NQU5EKHNjcm9sbFRvQmVnaW5uaW5nT2ZEb2N1bWVudCkKQEAgLTI2NSw2
ICsyNjMsMjYgQEAgV0VCQ09SRV9DT01NQU5EKHlhbmtBbmRTZWxlY3QpCiAKICN1bmRlZiBXRUJD
T1JFX0NPTU1BTkQKIAorLSAodm9pZClzY3JvbGxQYWdlRG93bjooaWQpc2VuZGVyCit7CisgICAg
aWYgKF9pbXBsLT5wYWdlKCkucHJlZmVyZW5jZXMoKS5ldmVudEhhbmRsZXJEcml2ZW5TbW9vdGhL
ZXlib2FyZFNjcm9sbGluZ0VuYWJsZWQoKSkgeworICAgICAgICBbc2VsZi5uZXh0UmVzcG9uZGVy
IHRyeVRvUGVyZm9ybTpfY21kIHdpdGg6c2VuZGVyXTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K
KworICAgIF9pbXBsLT5leGVjdXRlRWRpdENvbW1hbmRGb3JTZWxlY3RvcihfY21kKTsKK30KKwor
LSAodm9pZClzY3JvbGxQYWdlVXA6KGlkKXNlbmRlcgoreworICAgIGlmIChfaW1wbC0+cGFnZSgp
LnByZWZlcmVuY2VzKCkuZXZlbnRIYW5kbGVyRHJpdmVuU21vb3RoS2V5Ym9hcmRTY3JvbGxpbmdF
bmFibGVkKCkpIHsKKyAgICAgICAgW3NlbGYubmV4dFJlc3BvbmRlciB0cnlUb1BlcmZvcm06X2Nt
ZCB3aXRoOnNlbmRlcl07CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBfaW1wbC0+ZXhl
Y3V0ZUVkaXRDb21tYW5kRm9yU2VsZWN0b3IoX2NtZCk7Cit9CisKIC0gKEJPT0wpd3JpdGVTZWxl
Y3Rpb25Ub1Bhc3RlYm9hcmQ6KE5TUGFzdGVib2FyZCAqKXBhc3RlYm9hcmQgdHlwZXM6KE5TQXJy
YXkgKil0eXBlcwogewogICAgIHJldHVybiBfaW1wbC0+d3JpdGVTZWxlY3Rpb25Ub1Bhc3RlYm9h
cmQocGFzdGVib2FyZCwgdHlwZXMpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGQ3MzAxNDI5NjAzMDZjMjA2Y2M3MzkwYzAy
NjZkOTRhNDUzZjJlNmMuLjVlMTMxYWUyZWI2MTU5MzMzYjk4YTcwYzk3NDhkOWRiNTllNGJkNzMg
MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMS0wOC0wOSAgRGFuYSBFc3RyYSAgPGRlc3RyYUBh
cHBsZS5jb20+CisKKyAgICAgICAgU3RhcnQgc21vb3RoIGtleWJvYXJkIHNjcm9sbGluZyBhbmlt
YXRpb24gd2hlbiBwYWdlVXAgb3IgcGFnZURvd24ga2V5IGlzIHByZXNzZWQuCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjgxNTYKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFRlc3RzIGNoZWNr
IHRoYXQgYXQgbGVhc3QgMiBzY3JvbGwgZXZlbnRzIG9jY3VyIHdoZW4gdGhlIGRvd25BcnJvdyBr
ZXkgb3IgcGFnZURvd24ga2V5IGlzIHByZXNzZWQsIGFuZAorICAgICAgICB0aGF0IHdpdGggZWFj
aCBldmVudCwgdGhlIHBhZ2UncyBvZmZzZXQgZnJvbSBpdHMgb3JpZ2luYWwgcG9zaXRpb24gaW5j
cmVhc2VzLgorCisgICAgICAgICogZmFzdC9zY3JvbGxpbmcva2V5Ym9hcmQtc2Nyb2xsaW5nLWRp
c3RhbmNlLWRvd25BcnJvdy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3Qvc2Ny
b2xsaW5nL2tleWJvYXJkLXNjcm9sbGluZy1kaXN0YW5jZS1kb3duQXJyb3cuaHRtbDogQWRkZWQu
CisgICAgICAgICogZmFzdC9zY3JvbGxpbmcva2V5Ym9hcmQtc2Nyb2xsaW5nLWRpc3RhbmNlLXBh
Z2VEb3duLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9zY3JvbGxpbmcva2V5
Ym9hcmQtc2Nyb2xsaW5nLWRpc3RhbmNlLXBhZ2VEb3duLmh0bWw6IEFkZGVkLgorCiAyMDIxLTA3
LTMwICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgogCiAgICAgICAgIExheW91dCBU
ZXN0IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvSW5kZXhlZERCL2ZpcmUtZXJyb3It
ZXZlbnQtZXhjZXB0aW9uLmh0bWwgaXMgYSBGbGFreSBGYWlsdXJlCmRpZmYgLS1naXQgYS9MYXlv
dXRUZXN0cy9mYXN0L3Njcm9sbGluZy9rZXlib2FyZC1zY3JvbGxpbmctZGlzdGFuY2UtZG93bkFy
cm93LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL2tleWJvYXJkLXNj
cm9sbGluZy1kaXN0YW5jZS1kb3duQXJyb3ctZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAw
NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjFkYzk1
NmRkMmZlZTMxMmFkZTlmNzZhMmZhOWM0OGM5MjA2NzkxOGIKLS0tIC9kZXYvbnVsbAorKysgYi9M
YXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9rZXlib2FyZC1zY3JvbGxpbmctZGlzdGFuY2UtZG93
bkFycm93LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDIgQEAKK1N1Y2Nlc3NmdWwgU2Nyb2xsCisK
ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL2tleWJvYXJkLXNjcm9sbGlu
Zy1kaXN0YW5jZS1kb3duQXJyb3cuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL2tl
eWJvYXJkLXNjcm9sbGluZy1kaXN0YW5jZS1kb3duQXJyb3cuaHRtbApuZXcgZmlsZSBtb2RlIDEw
MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41MTlj
ZGZkM2EzYmM2NmRkMjU1ZWYzZjRmYzY4OGI1MjUxYjUxYjJlCi0tLSAvZGV2L251bGwKKysrIGIv
TGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcva2V5Ym9hcmQtc2Nyb2xsaW5nLWRpc3RhbmNlLWRv
d25BcnJvdy5odG1sCkBAIC0wLDAgKzEsNjIgQEAKKzwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtp
dC10ZXN0LXJ1bm5lciBbIHVzZUZsZXhpYmxlVmlld3BvcnQ9dHJ1ZSBFdmVudEhhbmRsZXJEcml2
ZW5TbW9vdGhLZXlib2FyZFNjcm9sbGluZ0VuYWJsZWQ9dHJ1ZSBdIC0tPgorCis8aHRtbD4KKwor
PGhlYWQ+CisgICAgPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy91aS1oZWxwZXIuanMiPjwv
c2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMi
Pjwvc2NyaXB0PgorICAgIDxtZXRhIG5hbWU9InZpZXdwb3J0IiBjb250ZW50PSJpbml0aWFsLXNj
YWxlPTEuNSwgdXNlci1zY2FsYWJsZT1ubyI+CisgICAgPHNjcmlwdD4KKyAgICAgICAgaWYgKHdp
bmRvdy50ZXN0UnVubmVyKSB7CisgICAgICAgICAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsK
KyAgICAgICAgICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOworICAgICAgICB9CisgICAg
ICAgIAorICAgICAgICBmdW5jdGlvbiBjaGVja1N1Y2Nlc3NmdWxTY3JvbGwoc2Nyb2xsT2JqKQor
ICAgICAgICB7CisgICAgICAgICAgICBpZiAod2luZG93LnNjcm9sbFkgPD0gc2Nyb2xsT2JqLmRp
c3QpIHsKKyAgICAgICAgICAgICAgICBkZWJ1ZygiVW5zdWNjZXNzZnVsIFNjcm9sbCAtIG9mZnNl
dCBkb2VzIG5vdCBpbmNyZWFzZSB3aXRoIGVhY2ggc2Nyb2xsIGV2ZW50LiIpOworICAgICAgICAg
ICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworICAgICAgICAgICAgfQorICAgICAgICAg
ICAgCisgICAgICAgICAgICBzY3JvbGxPYmouZGlzdCA9IHdpbmRvdy5zY3JvbGxZOworICAgICAg
ICAgICAgc2Nyb2xsT2JqLmNvdW50Kys7CisgICAgICAgICAgICAKKyAgICAgICAgICAgIGlmIChz
Y3JvbGxPYmouY291bnQgPT0gMikgeworICAgICAgICAgICAgICAgIGRlYnVnKCJTdWNjZXNzZnVs
IFNjcm9sbCIpOworICAgICAgICAgICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworICAg
ICAgICAgICAgfQorICAgICAgICB9CisgICAgICAgIAorICAgICAgICBhc3luYyBmdW5jdGlvbiBy
dW5UZXN0KCkKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKCF3aW5kb3cudGVzdFJ1bm5lciB8
fCAhdGVzdFJ1bm5lci5ydW5VSVNjcmlwdCkKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAg
ICAgICAgICAgICAgCisgICAgICAgICAgICBsZXQgc2Nyb2xsT2JqID0geworICAgICAgICAgICAg
ICAgIGNvdW50OiAwLAorICAgICAgICAgICAgICAgIGRpc3Q6IDAKKyAgICAgICAgICAgIH0KKyAg
ICAgICAgICAgIAorICAgICAgICAgICAgZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigic2Nyb2xs
IiwgZnVuY3Rpb24gKCkgeworICAgICAgICAgICAgICAgIGNoZWNrU3VjY2Vzc2Z1bFNjcm9sbChz
Y3JvbGxPYmopCisgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgYXdh
aXQgVUlIZWxwZXIua2V5RG93bigiZG93bkFycm93Iik7CisgICAgICAgIH0KKyAgICA8L3Njcmlw
dD4KKyAgICA8c3R5bGU+CisgICAgI3BsYWNlaG9sZGVyIHsKKyAgICAgICAgd2lkdGg6IDEwMHB4
OworICAgICAgICBoZWlnaHQ6IDUwMDBweDsKKyAgICB9CisgICAgPC9zdHlsZT4KKzwvaGVhZD4K
KworPGJvZHkgc3R5bGU9Im1hcmdpbjogMDsiIG9ubG9hZD0icnVuVGVzdCgpIj4KKyAgICA8ZGl2
IGlkPSJwbGFjZWhvbGRlciI+CisgICAgPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+CisgICAgPHNj
cmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0Pgor
PC9ib2R5PgorCis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGlu
Zy9rZXlib2FyZC1zY3JvbGxpbmctZGlzdGFuY2UtcGFnZURvd24tZXhwZWN0ZWQudHh0IGIvTGF5
b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcva2V5Ym9hcmQtc2Nyb2xsaW5nLWRpc3RhbmNlLXBhZ2VE
b3duLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xZGM5NTZkZDJmZWUzMTJhZGU5Zjc2YTJmYTlj
NDhjOTIwNjc5MThiCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxp
bmcva2V5Ym9hcmQtc2Nyb2xsaW5nLWRpc3RhbmNlLXBhZ2VEb3duLWV4cGVjdGVkLnR4dApAQCAt
MCwwICsxLDIgQEAKK1N1Y2Nlc3NmdWwgU2Nyb2xsCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz
L2Zhc3Qvc2Nyb2xsaW5nL2tleWJvYXJkLXNjcm9sbGluZy1kaXN0YW5jZS1wYWdlRG93bi5odG1s
IGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcva2V5Ym9hcmQtc2Nyb2xsaW5nLWRpc3RhbmNl
LXBhZ2VEb3duLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYTYyY2Q4MzAyYjFlMjNjZTBkYzdkNjNhN2QyZjZm
ZTc5NDViNTU4MAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5n
L2tleWJvYXJkLXNjcm9sbGluZy1kaXN0YW5jZS1wYWdlRG93bi5odG1sCkBAIC0wLDAgKzEsNjIg
QEAKKzwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIHVzZUZsZXhpYmxl
Vmlld3BvcnQ9dHJ1ZSBFdmVudEhhbmRsZXJEcml2ZW5TbW9vdGhLZXlib2FyZFNjcm9sbGluZ0Vu
YWJsZWQ9dHJ1ZSBdIC0tPgorCis8aHRtbD4KKworPGhlYWQ+CisgICAgPHNjcmlwdCBzcmM9Ii4u
Ly4uL3Jlc291cmNlcy91aS1oZWxwZXIuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSIu
Li8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorICAgIDxtZXRhIG5hbWU9
InZpZXdwb3J0IiBjb250ZW50PSJpbml0aWFsLXNjYWxlPTEuNSwgdXNlci1zY2FsYWJsZT1ubyI+
CisgICAgPHNjcmlwdD4KKyAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAgICAg
ICAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKyAgICAgICAgICAgIHRlc3RSdW5uZXIud2Fp
dFVudGlsRG9uZSgpOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICBmdW5jdGlvbiBjaGVj
a1N1Y2Nlc3NmdWxTY3JvbGwoc2Nyb2xsT2JqKQorICAgICAgICB7CisgICAgICAgICAgICBpZiAo
d2luZG93LnNjcm9sbFkgPD0gc2Nyb2xsT2JqLmRpc3QpIHsKKyAgICAgICAgICAgICAgICBkZWJ1
ZygiVW5zdWNjZXNzZnVsIFNjcm9sbCAtIG9mZnNldCBkb2VzIG5vdCBpbmNyZWFzZSB3aXRoIGVh
Y2ggc2Nyb2xsIGV2ZW50LiIpOworICAgICAgICAgICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9u
ZSgpOworICAgICAgICAgICAgfQorICAgICAgICAgICAgCisgICAgICAgICAgICBzY3JvbGxPYmou
ZGlzdCA9IHdpbmRvdy5zY3JvbGxZOworICAgICAgICAgICAgc2Nyb2xsT2JqLmNvdW50Kys7Cisg
ICAgICAgICAgICAKKyAgICAgICAgICAgIGlmIChzY3JvbGxPYmouY291bnQgPT0gMikgeworICAg
ICAgICAgICAgICAgIGRlYnVnKCJTdWNjZXNzZnVsIFNjcm9sbCIpOworICAgICAgICAgICAgICAg
IHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAg
ICAgIAorICAgICAgICBhc3luYyBmdW5jdGlvbiBydW5UZXN0KCkKKyAgICAgICAgeworICAgICAg
ICAgICAgaWYgKCF3aW5kb3cudGVzdFJ1bm5lciB8fCAhdGVzdFJ1bm5lci5ydW5VSVNjcmlwdCkK
KyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgCisgICAgICAgICAgICBs
ZXQgc2Nyb2xsT2JqID0geworICAgICAgICAgICAgICAgIGNvdW50OiAwLAorICAgICAgICAgICAg
ICAgIGRpc3Q6IDAKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIAorICAgICAgICAgICAgZG9j
dW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigic2Nyb2xsIiwgZnVuY3Rpb24gKCkgeworICAgICAgICAg
ICAgICAgIGNoZWNrU3VjY2Vzc2Z1bFNjcm9sbChzY3JvbGxPYmopCisgICAgICAgICAgICB9KTsK
KyAgICAgICAgICAgIAorICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIua2V5RG93bigicGFnZURv
d24iKTsKKyAgICAgICAgfQorICAgIDwvc2NyaXB0PgorICAgIDxzdHlsZT4KKyAgICAjcGxhY2Vo
b2xkZXIgeworICAgICAgICB3aWR0aDogMTAwcHg7CisgICAgICAgIGhlaWdodDogNTAwMHB4Owor
ICAgIH0KKyAgICA8L3N0eWxlPgorPC9oZWFkPgorCis8Ym9keSBzdHlsZT0ibWFyZ2luOiAwOyIg
b25sb2FkPSJydW5UZXN0KCkiPgorICAgIDxkaXYgaWQ9InBsYWNlaG9sZGVyIj4KKyAgICA8ZGl2
IGlkPSJjb25zb2xlIj48L2Rpdj4KKyAgICA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2Vz
L2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+CisKKzwvaHRtbD4K
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435310</attachid>
            <date>2021-08-10 15:44:33 -0700</date>
            <delta_ts>2021-08-11 13:32:40 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228156-20210810184432.patch</filename>
            <type>text/plain</type>
            <size>15492</size>
            <attacher name="Dana Estra">dana.estra</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwODU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTcxYjFlNGZhNjEwNTg3
ZGE5NmE0NjRjNTUwNTZlZDk1MzNhMTgzMS4uNGIyNTc4Mzk5NzQwMzg4Mzc4NjUyYTBmMDY4MmJl
MzY3OWMxNTk1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA4LTA5ICBEYW5h
IEVzdHJhICA8ZGVzdHJhQGFwcGxlLmNvbT4KKworICAgICAgICBTdGFydCBzbW9vdGgga2V5Ym9h
cmQgc2Nyb2xsaW5nIGFuaW1hdGlvbiB3aGVuIHBhZ2VVcCBvciBwYWdlRG93biBrZXkgaXMgcHJl
c3NlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy
ODE1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAg
ICAgICAgVUlQcm9jZXNzIG5vdyBubyBsb25nZXIgaGFuZGxlcyBzY3JvbGxQYWdlVXAgYW5kIHNj
cm9sbFBhZ2VEb3duIGV2ZW50cy4gVGhleSByZXR1cm4gdG8gZXZlbnRIYW5kbGVyIGFzCisgICAg
ICAgIHVuaGFuZGxlZCBhbmQgdGhlIGtleWJvYXJkIHNjcm9sbCBhbmltYXRpb24gaXMgc3RhcnRl
ZC4KKworICAgICAgICBUZXN0czogZmFzdC9zY3JvbGxpbmcva2V5Ym9hcmQtc2Nyb2xsaW5nLWRp
c3RhbmNlLWRvd25BcnJvdy5odG1sCisgICAgICAgICAgICAgICBmYXN0L3Njcm9sbGluZy9rZXli
b2FyZC1zY3JvbGxpbmctZGlzdGFuY2UtcGFnZURvd24uaHRtbAorCisgICAgICAgICogcGFnZS9F
dmVudEhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpkZWZhdWx0
S2V5Ym9hcmRFdmVudEhhbmRsZXIpOgorICAgICAgICAqIHBsYXRmb3JtL0tleWJvYXJkU2Nyb2xs
aW5nQW5pbWF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6S2V5Ym9hcmRTY3JvbGxpbmdBbmlt
YXRvcjo6a2V5Ym9hcmRTY3JvbGxGb3JLZXlib2FyZEV2ZW50IGNvbnN0KToKKwogMjAyMS0wOC0x
MCAgQmVuIE5oYW0gIDxuaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggbmVzdGVkIHJlc291
cmNlIGxvYWQgdHJhY2Vwb2ludHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n
IGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggZDA2YWZkZWMzYmVkYTA0MWQzMzg0YjIz
ZmEyNmUzYWE1ODFiMmVhMS4uZGU3OGUzNmJjYzkxYmRmZTY1NDU0MmY1YzkxMzAyOTU5OWIxYjE3
ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp
dC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAyMS0wOC0wOSAgRGFuYSBFc3RyYSAgPGRl
c3RyYUBhcHBsZS5jb20+CisKKyAgICAgICAgU3RhcnQgc21vb3RoIGtleWJvYXJkIHNjcm9sbGlu
ZyBhbmltYXRpb24gd2hlbiBwYWdlVXAgb3IgcGFnZURvd24ga2V5IGlzIHByZXNzZWQuCisgICAg
ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjgxNTYKKworICAg
ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFVJUHJv
Y2VzcyBub3cgbm8gbG9uZ2VyIGhhbmRsZXMgc2Nyb2xsUGFnZVVwIGFuZCBzY3JvbGxQYWdlRG93
biBldmVudHMuIFRoZXkgcmV0dXJuCisgICAgICAgIHRvIGV2ZW50SGFuZGxlciBhcyB1bmhhbmRs
ZWQgYW5kIHRoZSBrZXlib2FyZCBzY3JvbGwgYW5pbWF0aW9uIGlzIHN0YXJ0ZWQuCisKKyAgICAg
ICAgKiBVSVByb2Nlc3MvQVBJL21hYy9XS1dlYlZpZXdNYWMubW06CisgICAgICAgICgtW1dLV2Vi
VmlldyBzY3JvbGxQYWdlRG93bjpdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IHNjcm9sbFBhZ2VV
cDpdKToKKwogMjAyMS0wOC0xMCAgS2ltbW8gS2lubnVuZW4gIDxra2lubnVuZW5AYXBwbGUuY29t
PgogCiAgICAgICAgIFNjcmlwdHMvZ2VuZXJhdGUtZGVyaXZlZC1zb3VyY2VzLnNoOiBsaW5lIDE5
OiBbOiBiaW5hcnkgb3BlcmF0b3IgZXhwZWN0ZWQgd2hpbGUgYnVpbGRpbmcgU291cmNlL1dlYktp
dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwIGIvU291
cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCmluZGV4IDI5MGYwMmYzNjNkMjFjNDdh
YjQ2OWMyY2ZmOTE0ZjFlY2VkNWY5Y2MuLjEyZTk0ODFlNmE2NzdhOWY0YTI5MWZkOTg4YWYyNmZl
NDNjNDc5MzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNw
cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKQEAgLTM4MTksNiAr
MzgxOSw4IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjpkZWZhdWx0S2V5Ym9hcmRFdmVudEhhbmRsZXIo
S2V5Ym9hcmRFdmVudCYgZXZlbnQpCiAgICAgICAgICAgICBkZWZhdWx0VGFiRXZlbnRIYW5kbGVy
KGV2ZW50KTsKICAgICAgICAgZWxzZSBpZiAoZXZlbnQua2V5SWRlbnRpZmllcigpID09ICJVKzAw
MDgiKQogICAgICAgICAgICAgZGVmYXVsdEJhY2tzcGFjZUV2ZW50SGFuZGxlcihldmVudCk7Cisg
ICAgICAgIGVsc2UgaWYgKGV2ZW50LmtleUlkZW50aWZpZXIoKSA9PSAiUGFnZVVwIiB8fCBldmVu
dC5rZXlJZGVudGlmaWVyKCkgPT0gIlBhZ2VEb3duIikKKyAgICAgICAgICAgIHN0YXJ0S2V5Ym9h
cmRTY3JvbGxpbmcoZXZlbnQpOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIEZvY3VzRGly
ZWN0aW9uIGRpcmVjdGlvbiA9IGZvY3VzRGlyZWN0aW9uRm9yS2V5KGV2ZW50LmtleUlkZW50aWZp
ZXIoKSk7CiAgICAgICAgICAgICBpZiAoZGlyZWN0aW9uICE9IEZvY3VzRGlyZWN0aW9uOjpOb25l
KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS2V5Ym9hcmRTY3JvbGxpbmdB
bmltYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LZXlib2FyZFNjcm9sbGluZ0Fu
aW1hdG9yLmNwcAppbmRleCA3NDgyNDgzYjI5ZWNlNmViMjgzMjdiOTEyZTQzNTFiNjE3YWNiZGY4
Li5jOGYwZTY3M2YyYTJlMjAwZDI1NDIxZmNmOGM2YzBhOWZiMzBhN2JkIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yLmNwcAorKysg
Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yLmNwcApA
QCAtMTQyLDE1ICsxNDIsMTcgQEAgZmxvYXQgS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvcjo6c2Ny
b2xsRGlzdGFuY2UoU2Nyb2xsRGlyZWN0aW9uIGRpcmVjdGlvbiwgU2Nyb2wKICAgICAgICAgcmV0
dXJuIG1fc2Nyb2xsQW5pbWF0b3Iuc2Nyb2xsYWJsZUFyZWEoKS5ob3Jpem9udGFsU2Nyb2xsYmFy
KCk7CiAgICAgfSgpOwogCi0gICAgc3dpdGNoIChncmFudWxhcml0eSkgewotICAgIGNhc2UgU2Ny
b2xsR3JhbnVsYXJpdHk6OlNjcm9sbEJ5TGluZToKLSAgICAgICAgcmV0dXJuIHNjcm9sbGJhci0+
bGluZVN0ZXAoKTsKLSAgICBjYXNlIFNjcm9sbEdyYW51bGFyaXR5OjpTY3JvbGxCeVBhZ2U6Ci0g
ICAgICAgIHJldHVybiBzY3JvbGxiYXItPnBhZ2VTdGVwKCk7Ci0gICAgY2FzZSBTY3JvbGxHcmFu
dWxhcml0eTo6U2Nyb2xsQnlEb2N1bWVudDoKLSAgICAgICAgcmV0dXJuIHNjcm9sbGJhci0+dG90
YWxTaXplKCk7Ci0gICAgY2FzZSBTY3JvbGxHcmFudWxhcml0eTo6U2Nyb2xsQnlQaXhlbDoKLSAg
ICAgICAgcmV0dXJuIHNjcm9sbGJhci0+cGl4ZWxTdGVwKCk7CisgICAgaWYgKHNjcm9sbGJhcikg
eworICAgICAgICBzd2l0Y2ggKGdyYW51bGFyaXR5KSB7CisgICAgICAgIGNhc2UgU2Nyb2xsR3Jh
bnVsYXJpdHk6OlNjcm9sbEJ5TGluZToKKyAgICAgICAgICAgIHJldHVybiBzY3JvbGxiYXItPmxp
bmVTdGVwKCk7CisgICAgICAgIGNhc2UgU2Nyb2xsR3JhbnVsYXJpdHk6OlNjcm9sbEJ5UGFnZToK
KyAgICAgICAgICAgIHJldHVybiBzY3JvbGxiYXItPnBhZ2VTdGVwKCk7CisgICAgICAgIGNhc2Ug
U2Nyb2xsR3JhbnVsYXJpdHk6OlNjcm9sbEJ5RG9jdW1lbnQ6CisgICAgICAgICAgICByZXR1cm4g
c2Nyb2xsYmFyLT50b3RhbFNpemUoKTsKKyAgICAgICAgY2FzZSBTY3JvbGxHcmFudWxhcml0eTo6
U2Nyb2xsQnlQaXhlbDoKKyAgICAgICAgICAgIHJldHVybiBzY3JvbGxiYXItPnBpeGVsU3RlcCgp
OworICAgICAgICB9CiAgICAgfQogCiAgICAgcmV0dXJuIDA7CkBAIC0xNjAsNyArMTYyLDcgQEAg
c3RkOjpvcHRpb25hbDxLZXlib2FyZFNjcm9sbD4gS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvcjo6
a2V5Ym9hcmRTY3JvbGxGb3JLZXlib2EKIHsKICAgICAvLyBGSVhNRSAoYnVnIDIyNzQ1OSk6IFRo
aXMgbG9naWMgZG9lcyBub3QgYWNjb3VudCBmb3Igd3JpdGluZy1tb2RlLgogCi0gICAgZW51bSBj
bGFzcyBLZXkgOiB1aW50OF90IHsgTGVmdEFycm93LCBSaWdodEFycm93LCBVcEFycm93LCBEb3du
QXJyb3csIFNwYWNlIH07CisgICAgZW51bSBjbGFzcyBLZXkgOiB1aW50OF90IHsgTGVmdEFycm93
LCBSaWdodEFycm93LCBVcEFycm93LCBEb3duQXJyb3csIFNwYWNlLCBQYWdlVXAsIFBhZ2VEb3du
IH07CiAKICAgICBLZXkga2V5OwogICAgIGlmIChldmVudC5rZXlJZGVudGlmaWVyKCkgPT0gIkxl
ZnQiKQpAQCAtMTczLDYgKzE3NSwxMCBAQCBzdGQ6Om9wdGlvbmFsPEtleWJvYXJkU2Nyb2xsPiBL
ZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yOjprZXlib2FyZFNjcm9sbEZvcktleWJvYQogICAgICAg
ICBrZXkgPSBLZXk6OkRvd25BcnJvdzsKICAgICBlbHNlIGlmIChldmVudC5jaGFyQ29kZSgpID09
ICcgJykKICAgICAgICAga2V5ID0gS2V5OjpTcGFjZTsKKyAgICBlbHNlIGlmIChldmVudC5rZXlJ
ZGVudGlmaWVyKCkgPT0gIlBhZ2VVcCIpCisgICAgICAgIGtleSA9IEtleTo6UGFnZVVwOworICAg
IGVsc2UgaWYgKGV2ZW50LmtleUlkZW50aWZpZXIoKSA9PSAiUGFnZURvd24iKQorICAgICAgICBr
ZXkgPSBLZXk6OlBhZ2VEb3duOwogICAgIGVsc2UKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9w
dDsKIApAQCAtMTg5LDYgKzE5NSw4IEBAIHN0ZDo6b3B0aW9uYWw8S2V5Ym9hcmRTY3JvbGw+IEtl
eWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3I6OmtleWJvYXJkU2Nyb2xsRm9yS2V5Ym9hCiAgICAgICAg
ICAgICAgICAgcmV0dXJuIFNjcm9sbEdyYW51bGFyaXR5OjpTY3JvbGxCeVBhZ2U7CiAgICAgICAg
ICAgICByZXR1cm4gU2Nyb2xsR3JhbnVsYXJpdHk6OlNjcm9sbEJ5TGluZTsKICAgICAgICAgY2Fz
ZSBLZXk6OlNwYWNlOgorICAgICAgICBjYXNlIEtleTo6UGFnZVVwOgorICAgICAgICBjYXNlIEtl
eTo6UGFnZURvd246CiAgICAgICAgICAgICByZXR1cm4gU2Nyb2xsR3JhbnVsYXJpdHk6OlNjcm9s
bEJ5UGFnZTsKICAgICAgICAgfTsKICAgICAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQo
KTsKQEAgLTIwMSw4ICsyMDksMTAgQEAgc3RkOjpvcHRpb25hbDxLZXlib2FyZFNjcm9sbD4gS2V5
Ym9hcmRTY3JvbGxpbmdBbmltYXRvcjo6a2V5Ym9hcmRTY3JvbGxGb3JLZXlib2EKICAgICAgICAg
Y2FzZSBLZXk6OlJpZ2h0QXJyb3c6CiAgICAgICAgICAgICByZXR1cm4gU2Nyb2xsRGlyZWN0aW9u
OjpTY3JvbGxSaWdodDsKICAgICAgICAgY2FzZSBLZXk6OlVwQXJyb3c6CisgICAgICAgIGNhc2Ug
S2V5OjpQYWdlVXA6CiAgICAgICAgICAgICByZXR1cm4gU2Nyb2xsRGlyZWN0aW9uOjpTY3JvbGxV
cDsKICAgICAgICAgY2FzZSBLZXk6OkRvd25BcnJvdzoKKyAgICAgICAgY2FzZSBLZXk6OlBhZ2VE
b3duOgogICAgICAgICAgICAgcmV0dXJuIFNjcm9sbERpcmVjdGlvbjo6U2Nyb2xsRG93bjsKICAg
ICAgICAgY2FzZSBLZXk6OlNwYWNlOgogICAgICAgICAgICAgcmV0dXJuIGV2ZW50LnNoaWZ0S2V5
KCkgPyBTY3JvbGxEaXJlY3Rpb246OlNjcm9sbFVwIDogU2Nyb2xsRGlyZWN0aW9uOjpTY3JvbGxE
b3duOwpAQCAtMjEyLDYgKzIyMiw5IEBAIHN0ZDo6b3B0aW9uYWw8S2V5Ym9hcmRTY3JvbGw+IEtl
eWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3I6OmtleWJvYXJkU2Nyb2xsRm9yS2V5Ym9hCiAKICAgICBm
bG9hdCBkaXN0YW5jZSA9IHNjcm9sbERpc3RhbmNlKGRpcmVjdGlvbiwgZ3JhbnVsYXJpdHkpOwog
CisgICAgaWYgKCFkaXN0YW5jZSkKKyAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKKwogICAg
IEtleWJvYXJkU2Nyb2xsIHNjcm9sbDsKIAogICAgIHNjcm9sbC5vZmZzZXQgPSB1bml0VmVjdG9y
Rm9yU2Nyb2xsRGlyZWN0aW9uKGRpcmVjdGlvbikuc2NhbGVkKGRpc3RhbmNlKTsKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9tYWMvV0tXZWJWaWV3TWFjLm1tIGIvU291
cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL21hYy9XS1dlYlZpZXdNYWMubW0KaW5kZXggMzVlNWI1
YjljMzY4YzJlM2FhMzdjNDQyYjkxZDUyYTExYzMyY2U2MS4uYTA3YzllZGU1YTViNGI0YWMwM2Ix
ZjFkNGQxMDViNTMyYTRjZTc2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv
QVBJL21hYy9XS1dlYlZpZXdNYWMubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ
L21hYy9XS1dlYlZpZXdNYWMubW0KQEAgLTI0MCw4ICsyNDAsNiBAQCBXRUJDT1JFX0NPTU1BTkQo
cGFnZVVwKQogV0VCQ09SRV9DT01NQU5EKHBhZ2VVcEFuZE1vZGlmeVNlbGVjdGlvbikKIFdFQkNP
UkVfQ09NTUFORChwYXN0ZSkKIFdFQkNPUkVfQ09NTUFORChwYXN0ZUFzUGxhaW5UZXh0KQotV0VC
Q09SRV9DT01NQU5EKHNjcm9sbFBhZ2VEb3duKQotV0VCQ09SRV9DT01NQU5EKHNjcm9sbFBhZ2VV
cCkKIFdFQkNPUkVfQ09NTUFORChzY3JvbGxMaW5lRG93bikKIFdFQkNPUkVfQ09NTUFORChzY3Jv
bGxMaW5lVXApCiBXRUJDT1JFX0NPTU1BTkQoc2Nyb2xsVG9CZWdpbm5pbmdPZkRvY3VtZW50KQpA
QCAtMjY1LDYgKzI2MywyNiBAQCBXRUJDT1JFX0NPTU1BTkQoeWFua0FuZFNlbGVjdCkKIAogI3Vu
ZGVmIFdFQkNPUkVfQ09NTUFORAogCistICh2b2lkKXNjcm9sbFBhZ2VEb3duOihpZClzZW5kZXIK
K3sKKyAgICBpZiAoX2ltcGwtPnBhZ2UoKS5wcmVmZXJlbmNlcygpLmV2ZW50SGFuZGxlckRyaXZl
blNtb290aEtleWJvYXJkU2Nyb2xsaW5nRW5hYmxlZCgpKSB7CisgICAgICAgIFtzZWxmLm5leHRS
ZXNwb25kZXIgdHJ5VG9QZXJmb3JtOl9jbWQgd2l0aDpzZW5kZXJdOworICAgICAgICByZXR1cm47
CisgICAgfQorCisgICAgX2ltcGwtPmV4ZWN1dGVFZGl0Q29tbWFuZEZvclNlbGVjdG9yKF9jbWQp
OworfQorCistICh2b2lkKXNjcm9sbFBhZ2VVcDooaWQpc2VuZGVyCit7CisgICAgaWYgKF9pbXBs
LT5wYWdlKCkucHJlZmVyZW5jZXMoKS5ldmVudEhhbmRsZXJEcml2ZW5TbW9vdGhLZXlib2FyZFNj
cm9sbGluZ0VuYWJsZWQoKSkgeworICAgICAgICBbc2VsZi5uZXh0UmVzcG9uZGVyIHRyeVRvUGVy
Zm9ybTpfY21kIHdpdGg6c2VuZGVyXTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIF9p
bXBsLT5leGVjdXRlRWRpdENvbW1hbmRGb3JTZWxlY3RvcihfY21kKTsKK30KKwogLSAoQk9PTCl3
cml0ZVNlbGVjdGlvblRvUGFzdGVib2FyZDooTlNQYXN0ZWJvYXJkICopcGFzdGVib2FyZCB0eXBl
czooTlNBcnJheSAqKXR5cGVzCiB7CiAgICAgcmV0dXJuIF9pbXBsLT53cml0ZVNlbGVjdGlvblRv
UGFzdGVib2FyZChwYXN0ZWJvYXJkLCB0eXBlcyk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D
aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNGVjYzQ1MGQ2OTcxNzVlYjlh
ZjYxNTQzOTdmMDRkMGJjZjRiZDIwMS4uN2M5NTFmNzEwYjAyZjBiYjcwZmY4YWY2OWFkNWU0ZWQx
ZTBmZjlhZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl
c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA4LTA5ICBEYW5hIEVzdHJhICA8
ZGVzdHJhQGFwcGxlLmNvbT4KKworICAgICAgICBTdGFydCBzbW9vdGgga2V5Ym9hcmQgc2Nyb2xs
aW5nIGFuaW1hdGlvbiB3aGVuIHBhZ2VVcCBvciBwYWdlRG93biBrZXkgaXMgcHJlc3NlZC4KKyAg
ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODE1NgorCisg
ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGVz
dHMgY2hlY2sgdGhhdCBhdCBsZWFzdCAyIHNjcm9sbCBldmVudHMgb2NjdXIgd2hlbiB0aGUgZG93
bkFycm93IGtleSBvciBwYWdlRG93biBrZXkgaXMgcHJlc3NlZCwgYW5kCisgICAgICAgIHRoYXQg
d2l0aCBlYWNoIGV2ZW50LCB0aGUgcGFnZSdzIG9mZnNldCBmcm9tIGl0cyBvcmlnaW5hbCBwb3Np
dGlvbiBpbmNyZWFzZXMuCisKKyAgICAgICAgKiBmYXN0L3Njcm9sbGluZy9rZXlib2FyZC1zY3Jv
bGxpbmctZGlzdGFuY2UtZG93bkFycm93LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICog
ZmFzdC9zY3JvbGxpbmcva2V5Ym9hcmQtc2Nyb2xsaW5nLWRpc3RhbmNlLWRvd25BcnJvdy5odG1s
OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3Njcm9sbGluZy9rZXlib2FyZC1zY3JvbGxpbmctZGlz
dGFuY2UtcGFnZURvd24tZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3Njcm9s
bGluZy9rZXlib2FyZC1zY3JvbGxpbmctZGlzdGFuY2UtcGFnZURvd24uaHRtbDogQWRkZWQuCisK
IDIwMjEtMDgtMTAgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBE
b2N1bWVudC5iYXNlVVJJIGlzIGluYWNjdXJhdGUgZm9yIGlmcmFtZSBzcmNkb2MgZG9jdW1lbnRz
CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMv
VGVzdEV4cGVjdGF0aW9ucwppbmRleCBhYWZiMDFlMGUwYjY3YmVjNWRjMjI5MTQ4OGE5ZGVmMDVk
M2JlNGVkLi5kNjYyZGJkZTQxODA5OTBiYTQ2ZGE4ZTlmZjFiNzdiYmY3N2I2NjNhIDEwMDY0NAot
LS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RF
eHBlY3RhdGlvbnMKQEAgLTkyLDYgKzkyLDggQEAgY29tcG9zaXRpbmcvbGF5ZXItY3JlYXRpb24v
Y2xpcHBpbmctc2NvcGUgWyBTa2lwIF0KICMgV2ViS2l0MiBvbmx5LgogcHJpbnRpbmcvcHJpbnRp
bmctZXZlbnRzLmh0bWwgWyBTa2lwIF0KIGZhc3QvZm9ybXMvZW50ZXJrZXloaW50LWF0dHJpYnV0
ZS12YWx1ZXMuaHRtbCBbIFNraXAgXQorZmFzdC9zY3JvbGxpbmcva2V5Ym9hcmQtc2Nyb2xsaW5n
LWRpc3RhbmNlLWRvd25BcnJvdy5odG1sIFsgU2tpcCBdCitmYXN0L3Njcm9sbGluZy9rZXlib2Fy
ZC1zY3JvbGxpbmctZGlzdGFuY2UtcGFnZURvd24uaHRtbCBbIFNraXAgXQogCiAjIEhpZ2hsaWdo
dGluZyBtYXJrZWQgdGV4dCByYW5nZXMgZnJvbSBsYXlvdXQgdGVzdHMgaXMgb25seSBzdXBwb3J0
ZWQgaW4gV2ViS2l0Mi4KIGVkaXRpbmcvaW5wdXQvY29tcG9zaXRpb24taGlnaGxpZ2h0cy5odG1s
IFsgU2tpcCBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9rZXlib2Fy
ZC1zY3JvbGxpbmctZGlzdGFuY2UtZG93bkFycm93LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz
L2Zhc3Qvc2Nyb2xsaW5nL2tleWJvYXJkLXNjcm9sbGluZy1kaXN0YW5jZS1kb3duQXJyb3ctZXhw
ZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjFkYzk1NmRkMmZlZTMxMmFkZTlmNzZhMmZhOWM0OGM5MjA2
NzkxOGIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9rZXli
b2FyZC1zY3JvbGxpbmctZGlzdGFuY2UtZG93bkFycm93LWV4cGVjdGVkLnR4dApAQCAtMCwwICsx
LDIgQEAKK1N1Y2Nlc3NmdWwgU2Nyb2xsCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qv
c2Nyb2xsaW5nL2tleWJvYXJkLXNjcm9sbGluZy1kaXN0YW5jZS1kb3duQXJyb3cuaHRtbCBiL0xh
eW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL2tleWJvYXJkLXNjcm9sbGluZy1kaXN0YW5jZS1kb3du
QXJyb3cuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42ZDlhN2Y3Mjg2NGUyZTMwNzE3YThlOTMwOTAzZjlmMGIz
ZGM4MDEyCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcva2V5
Ym9hcmQtc2Nyb2xsaW5nLWRpc3RhbmNlLWRvd25BcnJvdy5odG1sCkBAIC0wLDAgKzEsNjIgQEAK
KzwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIHVzZUZsZXhpYmxlVmll
d3BvcnQ9dHJ1ZSBFdmVudEhhbmRsZXJEcml2ZW5TbW9vdGhLZXlib2FyZFNjcm9sbGluZ0VuYWJs
ZWQ9dHJ1ZSBdIC0tPgorCis8aHRtbD4KKworPGhlYWQ+CisgICAgPHNjcmlwdCBzcmM9Ii4uLy4u
L3Jlc291cmNlcy91aS1oZWxwZXIuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSIuLi8u
Li9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorICAgIDxtZXRhIG5hbWU9InZp
ZXdwb3J0IiBjb250ZW50PSJpbml0aWFsLXNjYWxlPTEuNSwgdXNlci1zY2FsYWJsZT1ubyI+Cisg
ICAgPHNjcmlwdD4KKyAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAgICAgICAg
ICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKyAgICAgICAgICAgIHRlc3RSdW5uZXIud2FpdFVu
dGlsRG9uZSgpOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICBmdW5jdGlvbiBjaGVja1N1
Y2Nlc3NmdWxTY3JvbGwoc2Nyb2xsT2JqKQorICAgICAgICB7CisgICAgICAgICAgICBpZiAod2lu
ZG93LnNjcm9sbFkgPD0gc2Nyb2xsT2JqLm9mZnNldCkgeworICAgICAgICAgICAgICAgIGRlYnVn
KCJVbnN1Y2Nlc3NmdWwgU2Nyb2xsIC0gb2Zmc2V0IGRvZXMgbm90IGluY3JlYXNlIHdpdGggZWFj
aCBzY3JvbGwgZXZlbnQuIik7CisgICAgICAgICAgICAgICAgdGVzdFJ1bm5lci5ub3RpZnlEb25l
KCk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICAKKyAgICAgICAgICAgIHNjcm9sbE9iai5v
ZmZzZXQgPSB3aW5kb3cuc2Nyb2xsWTsKKyAgICAgICAgICAgIHNjcm9sbE9iai5jb3VudCsrOwor
ICAgICAgICAgICAgCisgICAgICAgICAgICBpZiAoc2Nyb2xsT2JqLmNvdW50ID09IDIpIHsKKyAg
ICAgICAgICAgICAgICBkZWJ1ZygiU3VjY2Vzc2Z1bCBTY3JvbGwiKTsKKyAgICAgICAgICAgICAg
ICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAg
ICAgICAKKyAgICAgICAgYXN5bmMgZnVuY3Rpb24gcnVuVGVzdCgpCisgICAgICAgIHsKKyAgICAg
ICAgICAgIGlmICghd2luZG93LnRlc3RSdW5uZXIgfHwgIXRlc3RSdW5uZXIucnVuVUlTY3JpcHQp
CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIAorICAgICAgICAgICAg
bGV0IHNjcm9sbE9iaiA9IHsKKyAgICAgICAgICAgICAgICBjb3VudDogMCwKKyAgICAgICAgICAg
ICAgICBvZmZzZXQ6IDAKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIAorICAgICAgICAgICAg
ZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigic2Nyb2xsIiwgZnVuY3Rpb24gKCkgeworICAgICAg
ICAgICAgICAgIGNoZWNrU3VjY2Vzc2Z1bFNjcm9sbChzY3JvbGxPYmopOworICAgICAgICAgICAg
fSk7CisgICAgICAgICAgICAKKyAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLmtleURvd24oImRv
d25BcnJvdyIpOworICAgICAgICB9CisgICAgPC9zY3JpcHQ+CisgICAgPHN0eWxlPgorICAgICNw
bGFjZWhvbGRlciB7CisgICAgICAgIHdpZHRoOiAxMDBweDsKKyAgICAgICAgaGVpZ2h0OiA1MDAw
cHg7CisgICAgfQorICAgIDwvc3R5bGU+Cis8L2hlYWQ+CisKKzxib2R5IHN0eWxlPSJtYXJnaW46
IDA7IiBvbmxvYWQ9InJ1blRlc3QoKSI+CisgICAgPGRpdiBpZD0icGxhY2Vob2xkZXIiPgorICAg
IDxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorICAgIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNv
dXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKworPC9odG1sPgpkaWZm
IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcva2V5Ym9hcmQtc2Nyb2xsaW5nLWRp
c3RhbmNlLXBhZ2VEb3duLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5n
L2tleWJvYXJkLXNjcm9sbGluZy1kaXN0YW5jZS1wYWdlRG93bi1leHBlY3RlZC50eHQKbmV3IGZp
bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMC4uMWRjOTU2ZGQyZmVlMzEyYWRlOWY3NmEyZmE5YzQ4YzkyMDY3OTE4YgotLS0gL2Rldi9u
dWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL2tleWJvYXJkLXNjcm9sbGluZy1k
aXN0YW5jZS1wYWdlRG93bi1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwyIEBACitTdWNjZXNzZnVs
IFNjcm9sbAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9rZXlib2Fy
ZC1zY3JvbGxpbmctZGlzdGFuY2UtcGFnZURvd24uaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvc2Ny
b2xsaW5nL2tleWJvYXJkLXNjcm9sbGluZy1kaXN0YW5jZS1wYWdlRG93bi5odG1sCm5ldyBmaWxl
IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAuLjg2MDk0MGIzZjU4N2ZiZmJiOWQ1NDU3ZjQ2MzgxMGQyNDYxOGYwYzUKLS0tIC9kZXYvbnVs
bAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9rZXlib2FyZC1zY3JvbGxpbmctZGlz
dGFuY2UtcGFnZURvd24uaHRtbApAQCAtMCwwICsxLDYyIEBACis8IURPQ1RZUEUgaHRtbD4gPCEt
LSB3ZWJraXQtdGVzdC1ydW5uZXIgWyB1c2VGbGV4aWJsZVZpZXdwb3J0PXRydWUgRXZlbnRIYW5k
bGVyRHJpdmVuU21vb3RoS2V5Ym9hcmRTY3JvbGxpbmdFbmFibGVkPXRydWUgXSAtLT4KKworPGh0
bWw+CisKKzxoZWFkPgorICAgIDxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvdWktaGVscGVy
LmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3Qt
cHJlLmpzIj48L3NjcmlwdD4KKyAgICA8bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0iaW5p
dGlhbC1zY2FsZT0xLjUsIHVzZXItc2NhbGFibGU9bm8iPgorICAgIDxzY3JpcHQ+CisgICAgICAg
IGlmICh3aW5kb3cudGVzdFJ1bm5lcikgeworICAgICAgICAgICAgdGVzdFJ1bm5lci5kdW1wQXNU
ZXh0KCk7CisgICAgICAgICAgICB0ZXN0UnVubmVyLndhaXRVbnRpbERvbmUoKTsKKyAgICAgICAg
fQorICAgICAgICAKKyAgICAgICAgZnVuY3Rpb24gY2hlY2tTdWNjZXNzZnVsU2Nyb2xsKHNjcm9s
bE9iaikKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKHdpbmRvdy5zY3JvbGxZIDw9IHNjcm9s
bE9iai5vZmZzZXQpIHsKKyAgICAgICAgICAgICAgICBkZWJ1ZygiVW5zdWNjZXNzZnVsIFNjcm9s
bCAtIG9mZnNldCBkb2VzIG5vdCBpbmNyZWFzZSB3aXRoIGVhY2ggc2Nyb2xsIGV2ZW50LiIpOwor
ICAgICAgICAgICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworICAgICAgICAgICAgfQor
ICAgICAgICAgICAgCisgICAgICAgICAgICBzY3JvbGxPYmoub2Zmc2V0ID0gd2luZG93LnNjcm9s
bFk7CisgICAgICAgICAgICBzY3JvbGxPYmouY291bnQrKzsKKyAgICAgICAgICAgIAorICAgICAg
ICAgICAgaWYgKHNjcm9sbE9iai5jb3VudCA9PSAyKSB7CisgICAgICAgICAgICAgICAgZGVidWco
IlN1Y2Nlc3NmdWwgU2Nyb2xsIik7CisgICAgICAgICAgICAgICAgdGVzdFJ1bm5lci5ub3RpZnlE
b25lKCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIGFzeW5j
IGZ1bmN0aW9uIHJ1blRlc3QoKQorICAgICAgICB7CisgICAgICAgICAgICBpZiAoIXdpbmRvdy50
ZXN0UnVubmVyIHx8ICF0ZXN0UnVubmVyLnJ1blVJU2NyaXB0KQorICAgICAgICAgICAgICAgIHJl
dHVybjsKKyAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgIGxldCBzY3JvbGxPYmogPSB7Cisg
ICAgICAgICAgICAgICAgY291bnQ6IDAsCisgICAgICAgICAgICAgICAgb2Zmc2V0OiAwCisgICAg
ICAgICAgICB9CisgICAgICAgICAgICAKKyAgICAgICAgICAgIGRvY3VtZW50LmFkZEV2ZW50TGlz
dGVuZXIoInNjcm9sbCIsIGZ1bmN0aW9uICgpIHsKKyAgICAgICAgICAgICAgICBjaGVja1N1Y2Nl
c3NmdWxTY3JvbGwoc2Nyb2xsT2JqKTsKKyAgICAgICAgICAgIH0pOworICAgICAgICAgICAgCisg
ICAgICAgICAgICBhd2FpdCBVSUhlbHBlci5rZXlEb3duKCJwYWdlRG93biIpOworICAgICAgICB9
CisgICAgPC9zY3JpcHQ+CisgICAgPHN0eWxlPgorICAgICNwbGFjZWhvbGRlciB7CisgICAgICAg
IHdpZHRoOiAxMDBweDsKKyAgICAgICAgaGVpZ2h0OiA1MDAwcHg7CisgICAgfQorICAgIDwvc3R5
bGU+Cis8L2hlYWQ+CisKKzxib2R5IHN0eWxlPSJtYXJnaW46IDA7IiBvbmxvYWQ9InJ1blRlc3Qo
KSI+CisgICAgPGRpdiBpZD0icGxhY2Vob2xkZXIiPgorICAgIDxkaXYgaWQ9ImNvbnNvbGUiPjwv
ZGl2PgorICAgIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0Lmpz
Ij48L3NjcmlwdD4KKzwvYm9keT4KKworPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv
cGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIv
VGVzdEV4cGVjdGF0aW9ucwppbmRleCBjZWE0OWViYTdmNWJiZjJjZTBmNTdiMjUzMzhiZjBmOTMw
ODEyOTllLi40OTUyODVlMTY1Yzg5NjhjN2JhMWQ4YjM4YTkzNDViZDk5M2EwNmI3IDEwMDY0NAot
LS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlv
dXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0aW9ucwpAQCAtODYwLDYgKzg2MCw4IEBA
IGh0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvY2xvc2VkLXBvcnQtZGVsYXkuaHRtbCBb
IFBhc3MgXQogCiAjIFdlYktpdDIgb25seS4KIGpzL3Rocm93LWxhcmdlLXN0cmluZy1vb20uaHRt
bCBbIFBhc3MgXQorZmFzdC9zY3JvbGxpbmcva2V5Ym9hcmQtc2Nyb2xsaW5nLWRpc3RhbmNlLWRv
d25BcnJvdy5odG1sIFsgUGFzcyBdCitmYXN0L3Njcm9sbGluZy9rZXlib2FyZC1zY3JvbGxpbmct
ZGlzdGFuY2UtcGFnZURvd24uaHRtbCBbIFBhc3MgXQogZmFzdC9zcGVlY2hyZWNvZ25pdGlvbi9w
ZXJtaXNzaW9uLWVycm9yLmh0bWwgWyBQYXNzIF0KIGZhc3Qvc3BlZWNocmVjb2duaXRpb24vc3Rh
cnQtcmVjb2duaXRpb24tdGhlbi1zdG9wLmh0bWwgWyBQYXNzIF0KIGZhc3Qvc3BlZWNocmVjb2du
aXRpb24vc3RhcnQtc2Vjb25kLXJlY29nbml0aW9uLmh0bWwgWyBQYXNzIF0K
</data>

          </attachment>
      

    </bug>

</bugzilla>