<?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>193607</bug_id>
          
          <creation_ts>2019-01-18 21:18:40 -0800</creation_ts>
          <short_desc>C strings in ClientCertificateAuthenticationXPCConstants.h are duplicated</short_desc>
          <delta_ts>2019-01-22 12:52:04 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebKit2</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="David Kilzer (:ddkilzer)">ddkilzer</reporter>
          <assigned_to name="David Kilzer (:ddkilzer)">ddkilzer</assigned_to>
          <cc>achristensen</cc>
    
    <cc>ddkilzer</cc>
    
    <cc>koivisto</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>youennf</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1496182</commentid>
    <comment_count>0</comment_count>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2019-01-18 21:18:40 -0800</bug_when>
    <thetext>C strings in ClientCertificateAuthenticationXPCConstants.h are duplicated in each source file that includes this header:

$ egrep -l -r &apos;ClientCertificateAuthenticationXPCConstants.h[&quot;&gt;]&apos; Source/WebKit 
Source/WebKit/UIProcess/Authentication/cocoa/AuthenticationChallengeProxyCocoa.mm
Source/WebKit/Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm

We should move the string constants to their own source file so they aren&apos;t duplicated.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1496183</commentid>
    <comment_count>1</comment_count>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2019-01-18 21:18:52 -0800</bug_when>
    <thetext>&lt;rdar://problem/47334613&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1496184</commentid>
    <comment_count>2</comment_count>
      <attachid>359585</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2019-01-18 21:35:14 -0800</bug_when>
    <thetext>Created attachment 359585
Patch v1</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1496192</commentid>
    <comment_count>3</comment_count>
      <attachid>359588</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2019-01-18 22:38:29 -0800</bug_when>
    <thetext>Created attachment 359588
Patch v2</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1496242</commentid>
    <comment_count>4</comment_count>
      <attachid>359612</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2019-01-19 09:17:08 -0800</bug_when>
    <thetext>Created attachment 359612
Patch v3</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1496600</commentid>
    <comment_count>5</comment_count>
      <attachid>359612</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2019-01-21 08:55:49 -0800</bug_when>
    <thetext>Comment on attachment 359612
Patch v3

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

&gt; Source/WebKit/Shared/Authentication/cocoa/ClientCertificateAuthenticationXPCConstants.h:32
&gt; +struct ClientCertificateAuthentication {

Isn&apos;t this more of a namespace?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1496606</commentid>
    <comment_count>6</comment_count>
      <attachid>359612</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2019-01-21 09:56:49 -0800</bug_when>
    <thetext>Comment on attachment 359612
Patch v3

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

&gt;&gt; Source/WebKit/Shared/Authentication/cocoa/ClientCertificateAuthenticationXPCConstants.h:32
&gt;&gt; +struct ClientCertificateAuthentication {
&gt; 
&gt; Isn&apos;t this more of a namespace?

Sure, a namespace could be used instead.  Would you prefer that?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1496635</commentid>
    <comment_count>7</comment_count>
      <attachid>359706</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2019-01-21 12:32:16 -0800</bug_when>
    <thetext>Created attachment 359706
Patch v4 (for landing)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1496637</commentid>
    <comment_count>8</comment_count>
      <attachid>359706</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2019-01-21 12:32:39 -0800</bug_when>
    <thetext>Comment on attachment 359706
Patch v4 (for landing)

Now with namespace.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1496908</commentid>
    <comment_count>9</comment_count>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2019-01-22 12:50:13 -0800</bug_when>
    <thetext>Committed r240275: &lt;https://trac.webkit.org/changeset/240275&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>359585</attachid>
            <date>2019-01-18 21:35:14 -0800</date>
            <delta_ts>2019-01-18 22:38:27 -0800</delta_ts>
            <desc>Patch v1</desc>
            <filename>bug-193607-20190118213513.patch</filename>
            <type>text/plain</type>
            <size>9074</size>
            <attacher name="David Kilzer (:ddkilzer)">ddkilzer</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwMTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDYyNzllZDQyZmEwNmViMmEx
ODY3NDgzMDhmZjUzY2Q1ODNmMDI2MDEuLjg0ZjgwMjM1NWE0YmZlZmYyYjQwYzgyMzgyOTdiYTM0
YjQ5YmY5NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDEtMTggIERhdmlkIEtp
bHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICBDIHN0cmluZ3MgaW4gQ2xpZW50
Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ0NvbnN0YW50cy5oIGFyZSBkdXBsaWNhdGVkCisg
ICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xOTM2MDc+CisgICAgICAgIDxyZGFyOi8vcHJv
YmxlbS80NzMzNDYxMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICAqIFNoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2NvYS9DbGllbnRDZXJ0aWZpY2F0ZUF1
dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRzLmNwcDogQ29waWVkIGZyb20gU291cmNlL1dlYktpdC9T
aGFyZWQvQXV0aGVudGljYXRpb24vY29jb2EvQ2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlv
blhQQ0NvbnN0YW50cy5oLgorICAgICAgICAqIFNoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2NvYS9D
bGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRzLmg6CisgICAgICAgIE1v
dmUgY29uc3RhbnQgdmFsdWVzIHRvIENsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUEND
b25zdGFudHMuY3BwLgorICAgICAgICAqIFNvdXJjZXNDb2NvYS50eHQ6IEFkZCBDbGllbnRDZXJ0
aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRzLmNwcC4KKyAgICAgICAgKiBVbmlmaWVk
U291cmNlcy1pbnB1dC54Y2ZpbGVsaXN0OiBEaXR0by4KKyAgICAgICAgKiBXZWJLaXQueGNvZGVw
cm9qL3Byb2plY3QucGJ4cHJvajogRGl0dG8uCisKIDIwMTktMDEtMTggIERhdmlkIEtpbHplciAg
PGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViS2l0XSBDaGFuZ2UgWGNvZGUgZm9s
ZGVycyB0byBtYXAgdG8gZm9sZGVycyBvbiBkaXNrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0
L1NoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2NvYS9DbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0
aW9uWFBDQ29uc3RhbnRzLmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0F1dGhlbnRpY2F0aW9u
L2NvY29hL0NsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUENDb25zdGFudHMuY3BwCm5l
dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAuLjE1MjY0NDczNTE0YTIyNDgzYmE4ZThmNjhhMDE5MjBmMWM4ZGUzMTEKLS0tIC9k
ZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2NvYS9D
bGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRzLmNwcApAQCAtMCwwICsx
LDQyIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE4LTIwMTkgQXBwbGUgSW5jLiBBbGwgcmln
aHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu
ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVy
bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0
OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBh
Ym92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k
IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5h
cnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2Us
IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4g
dGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQg
d2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQg
QlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkg
RVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE
IFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJ
VE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8g
RVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUg
Rk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlks
IE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE
IFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9T
UyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04p
IEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJ
TgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdM
SUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVT
RSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElU
WSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAi
Q2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ0NvbnN0YW50cy5oIgorCisjaWYgSEFW
RShTRUNfS0VZX1BST1hZKQorCituYW1lc3BhY2UgV2ViS2l0IHsKKworY29uc3QgY2hhciBjbGll
bnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ2VydGlmaWNhdGVzS2V5W10gPSAiY2VydGlm
aWNhdGVzIjsKK2NvbnN0IGNoYXIgY2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ0No
YWxsZW5nZUlES2V5W10gPSAiY2hhbGxlbmdlLWlkIjsKK2NvbnN0IGNoYXIgY2xpZW50Q2VydGlm
aWNhdGVBdXRoZW50aWNhdGlvblhQQ01lc3NhZ2VOYW1lS2V5W10gPSAibWVzc2FnZS1uYW1lIjsK
K2NvbnN0IGNoYXIgY2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ01lc3NhZ2VOYW1l
VmFsdWVbXSA9ICJjbGllbnQtY2VydGlmaWNhdGUtY3JlZGVudGlhbCI7Citjb25zdCBjaGFyIGNs
aWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUENQZXJzaXN0ZW5jZUtleVtdID0gInBlcnNp
c3RlbmNlIjsKK2NvbnN0IGNoYXIgY2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ1Nl
Y0tleVByb3h5RW5kcG9pbnRLZXlbXSA9ICJzZWMta2V5LXByb3h5LWVuZHBvaW50IjsKKworfSAv
LyBuYW1lc3BhY2UgV2ViS2l0CisKKyNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9T
aGFyZWQvQXV0aGVudGljYXRpb24vY29jb2EvQ2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlv
blhQQ0NvbnN0YW50cy5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvQXV0aGVudGljYXRpb24vY29j
b2EvQ2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ0NvbnN0YW50cy5oCmluZGV4IGM4
NDM5NDZkMzJkZWZlMjhmZWZkZTBmYTU2NjM0OGI4OTNiMGE0YTUuLmRlOTY0NmM3OGRiYThhZjQ2
NWU2MjlmYmJlNGZiZTk5Mzk5OWYyMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVk
L0F1dGhlbnRpY2F0aW9uL2NvY29hL0NsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUEND
b25zdGFudHMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2Nv
YS9DbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRzLmgKQEAgLTEsNSAr
MSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE4IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy
ZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxOC0yMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0
cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQg
YmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1p
dHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMjksMTIgKzI5
LDEyIEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1jb25zdCBjaGFyIGNsaWVudENlcnRpZmlj
YXRlQXV0aGVudGljYXRpb25YUENNZXNzYWdlTmFtZUtleVtdID0gIm1lc3NhZ2UtbmFtZSI7Ci1j
b25zdCBjaGFyIGNsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUENNZXNzYWdlTmFtZVZh
bHVlW10gPSAiY2xpZW50LWNlcnRpZmljYXRlLWNyZWRlbnRpYWwiOwotY29uc3QgY2hhciBjbGll
bnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ2hhbGxlbmdlSURLZXlbXSA9ICJjaGFsbGVu
Z2UtaWQiOwotY29uc3QgY2hhciBjbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDU2Vj
S2V5UHJveHlFbmRwb2ludEtleVtdID0gInNlYy1rZXktcHJveHktZW5kcG9pbnQiOwotY29uc3Qg
Y2hhciBjbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ2VydGlmaWNhdGVzS2V5W10g
PSAiY2VydGlmaWNhdGVzIjsKLWNvbnN0IGNoYXIgY2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNh
dGlvblhQQ1BlcnNpc3RlbmNlS2V5W10gPSAicGVyc2lzdGVuY2UiOworY29uc3QgY2hhcltdIGNs
aWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUENDZXJ0aWZpY2F0ZXNLZXk7Citjb25zdCBj
aGFyW10gY2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ0NoYWxsZW5nZUlES2V5Owor
Y29uc3QgY2hhcltdIGNsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUENNZXNzYWdlTmFt
ZUtleTsKK2NvbnN0IGNoYXJbXSBjbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDTWVz
c2FnZU5hbWVWYWx1ZTsKK2NvbnN0IGNoYXJbXSBjbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0
aW9uWFBDUGVyc2lzdGVuY2VLZXk7Citjb25zdCBjaGFyW10gY2xpZW50Q2VydGlmaWNhdGVBdXRo
ZW50aWNhdGlvblhQQ1NlY0tleVByb3h5RW5kcG9pbnRLZXk7CiAKIH0gLy8gbmFtZXNwYWNlIFdl
YktpdAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NvdXJjZXNDb2NvYS50eHQgYi9Tb3Vy
Y2UvV2ViS2l0L1NvdXJjZXNDb2NvYS50eHQKaW5kZXggMTZlODhmMGFiMWZmMGJjN2Q1N2IxMzcx
ODJlNjk3ZDg2NGYxOTM5MS4uYTZmZTAzYThmNmE0MjdiYzY1OWJiMDI2MzUzZGQyODBmOWFiOWM3
ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9Tb3VyY2VzQ29jb2EudHh0CisrKyBiL1NvdXJj
ZS9XZWJLaXQvU291cmNlc0NvY29hLnR4dApAQCAtMTIzLDYgKzEyMyw3IEBAIFNoYXJlZC9jZi9D
b29raWVTdG9yYWdlVXRpbHNDRi5tbQogU2hhcmVkL2NnL1NoYXJlYWJsZUJpdG1hcENHLmNwcAog
CiBTaGFyZWQvQXV0aGVudGljYXRpb24vY29jb2EvQXV0aGVudGljYXRpb25NYW5hZ2VyQ29jb2Eu
bW0KK1NoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2NvYS9DbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRp
Y2F0aW9uWFBDQ29uc3RhbnRzLmNwcAogCiBTaGFyZWQvQ29jb2EvQVBJRGF0YUNvY29hLm1tCiBT
aGFyZWQvQ29jb2EvQVBJT2JqZWN0Lm1tCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VuaWZp
ZWRTb3VyY2VzLWlucHV0LnhjZmlsZWxpc3QgYi9Tb3VyY2UvV2ViS2l0L1VuaWZpZWRTb3VyY2Vz
LWlucHV0LnhjZmlsZWxpc3QKaW5kZXggZTZjN2EwYzdhMjY2MGUxOGE4MmUzYzE1MjVjODkyZDcw
Njg4NmY1Ny4uMTViODA5OWU2OWRiZmNkMjgzNzc4OWQ2ZGIwYzFiOWVmMzM2ZTIzNSAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYktpdC9VbmlmaWVkU291cmNlcy1pbnB1dC54Y2ZpbGVsaXN0CisrKyBi
L1NvdXJjZS9XZWJLaXQvVW5pZmllZFNvdXJjZXMtaW5wdXQueGNmaWxlbGlzdApAQCAtMTcwLDYg
KzE3MCw3IEBAICQoU1JDUk9PVCkvU2hhcmVkL0Fzc2lzdGVkTm9kZUluZm9ybWF0aW9uLmNwcAog
JChTUkNST09UKS9TaGFyZWQvQXN5bmNSZXF1ZXN0LmNwcAogJChTUkNST09UKS9TaGFyZWQvQXV0
aGVudGljYXRpb24vQXV0aGVudGljYXRpb25NYW5hZ2VyLmNwcAogJChTUkNST09UKS9TaGFyZWQv
QXV0aGVudGljYXRpb24vY29jb2EvQXV0aGVudGljYXRpb25NYW5hZ2VyQ29jb2EubW0KKyQoU1JD
Uk9PVCkvU2hhcmVkL0F1dGhlbnRpY2F0aW9uL2NvY29hL0NsaWVudENlcnRpZmljYXRlQXV0aGVu
dGljYXRpb25YUENDb25zdGFudHMuY3BwCiAkKFNSQ1JPT1QpL1NoYXJlZC9CbG9iRGF0YUZpbGVS
ZWZlcmVuY2VXaXRoU2FuZGJveEV4dGVuc2lvbi5jcHAKICQoU1JDUk9PVCkvU2hhcmVkL0NhY2hl
TW9kZWwuY3BwCiAkKFNSQ1JPT1QpL1NoYXJlZC9DaGlsZFByb2Nlc3MuY3BwCmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNl
L1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCAzMDZlOWFhMmY3
MDViNTNmMjFlYjhjZmNiODZjMmRlZjM3MWNjOGJkLi5iZDk0Mzk5ZjYzYzQ2MzAwNzg0ZGYxZjhm
YWM5NzU4Njk3OTkwYTBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXBy
b2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9w
cm9qZWN0LnBieHByb2oKQEAgLTMwNjgsNiArMzA2OCw3IEBACiAJCTQxRkJFODIzMjA2REE3OUMw
MDBGMDc0MSAvKiBOZXR3b3JrQ29udGVudFJ1bGVMaXN0TWFuYWdlci5tZXNzYWdlcy5pbiAqLyA9
IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl
VHlwZSA9IHRleHQ7IHBhdGggPSBOZXR3b3JrQ29udGVudFJ1bGVMaXN0TWFuYWdlci5tZXNzYWdl
cy5pbjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDFGQkU4MjQyMDZEQTc5QzAwMEYw
NzQxIC8qIE5ldHdvcmtDb250ZW50UnVsZUxpc3RNYW5hZ2VyLmNwcCAqLyA9IHtpc2EgPSBQQlhG
aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj
ZWNvZGUuY3BwLmNwcDsgcGF0aCA9IE5ldHdvcmtDb250ZW50UnVsZUxpc3RNYW5hZ2VyLmNwcDsg
c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDQ1MEFFQkYxREMzRkFFNTAwOTk0M0YyIC8q
IFNoYXJlZE1lbW9yeUNvY29hLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl
RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0
aCA9IFNoYXJlZE1lbW9yeUNvY29hLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJ
NDRBNDgxQzYyMUYyRDI3QjAwRjJGOTE5IC8qIENsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRp
b25YUENDb25zdGFudHMuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93
bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gQ2xpZW50Q2VydGlmaWNhdGVB
dXRoZW50aWNhdGlvblhQQ0NvbnN0YW50cy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07
CiAJCTQ2MEY0ODhEMUY5OTZGNkMwMENGNEI4NyAvKiBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVj
dGlvbk1lc3NhZ2VSZWNlaXZlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls
ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IG5h
bWUgPSBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbk1lc3NhZ2VSZWNlaXZlci5jcHA7IHBh
dGggPSBEZXJpdmVkU291cmNlcy9XZWJLaXQyL1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9u
TWVzc2FnZVJlY2VpdmVyLmNwcDsgc291cmNlVHJlZSA9IEJVSUxUX1BST0RVQ1RTX0RJUjsgfTsK
IAkJNDYwRjQ4OEUxRjk5NkY2QzAwQ0Y0Qjg3IC8qIFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0
aW9uTWVzc2FnZXMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg
PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBuYW1lID0gV2ViU1dDb250
ZXh0TWFuYWdlckNvbm5lY3Rpb25NZXNzYWdlcy5oOyBwYXRoID0gRGVyaXZlZFNvdXJjZXMvV2Vi
S2l0Mi9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbk1lc3NhZ2VzLmg7IHNvdXJjZVRyZWUg
PSBCVUlMVF9QUk9EVUNUU19ESVI7IH07CiAJCTQ2MjEwN0Q3MUYzOERCRDMwMERENzgxMCAvKiBQ
aW5nTG9hZC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g
NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBQaW5nTG9h
ZC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC02NzM1LDYgKzY3MzYsNyBAQAog
CQkJaXNhID0gUEJYR3JvdXA7CiAJCQljaGlsZHJlbiA9ICgKIAkJCQk1N0I0QjQ1RDIwQjUwNEFC
MDBENEFENzkgLyogQXV0aGVudGljYXRpb25NYW5hZ2VyQ29jb2EubW0gKi8sCisJCQkJNDRBNDgx
QzYyMUYyRDI3QjAwRjJGOTE5IC8qIENsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUEND
b25zdGFudHMuY3BwICovLAogCQkJCTU3QjRCNDVFMjBCNTA0QUIwMEQ0QUQ3OSAvKiBDbGllbnRD
ZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRzLmggKi8sCiAJCQkpOwogCQkJcGF0
aCA9IGNvY29hOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>359588</attachid>
            <date>2019-01-18 22:38:29 -0800</date>
            <delta_ts>2019-01-19 09:17:07 -0800</delta_ts>
            <desc>Patch v2</desc>
            <filename>bug-193607-20190118223828.patch</filename>
            <type>text/plain</type>
            <size>9074</size>
            <attacher name="David Kilzer (:ddkilzer)">ddkilzer</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwMTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDYyNzllZDQyZmEwNmViMmEx
ODY3NDgzMDhmZjUzY2Q1ODNmMDI2MDEuLjg0ZjgwMjM1NWE0YmZlZmYyYjQwYzgyMzgyOTdiYTM0
YjQ5YmY5NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDEtMTggIERhdmlkIEtp
bHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICBDIHN0cmluZ3MgaW4gQ2xpZW50
Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ0NvbnN0YW50cy5oIGFyZSBkdXBsaWNhdGVkCisg
ICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xOTM2MDc+CisgICAgICAgIDxyZGFyOi8vcHJv
YmxlbS80NzMzNDYxMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICAqIFNoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2NvYS9DbGllbnRDZXJ0aWZpY2F0ZUF1
dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRzLmNwcDogQ29waWVkIGZyb20gU291cmNlL1dlYktpdC9T
aGFyZWQvQXV0aGVudGljYXRpb24vY29jb2EvQ2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlv
blhQQ0NvbnN0YW50cy5oLgorICAgICAgICAqIFNoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2NvYS9D
bGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRzLmg6CisgICAgICAgIE1v
dmUgY29uc3RhbnQgdmFsdWVzIHRvIENsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUEND
b25zdGFudHMuY3BwLgorICAgICAgICAqIFNvdXJjZXNDb2NvYS50eHQ6IEFkZCBDbGllbnRDZXJ0
aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRzLmNwcC4KKyAgICAgICAgKiBVbmlmaWVk
U291cmNlcy1pbnB1dC54Y2ZpbGVsaXN0OiBEaXR0by4KKyAgICAgICAgKiBXZWJLaXQueGNvZGVw
cm9qL3Byb2plY3QucGJ4cHJvajogRGl0dG8uCisKIDIwMTktMDEtMTggIERhdmlkIEtpbHplciAg
PGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViS2l0XSBDaGFuZ2UgWGNvZGUgZm9s
ZGVycyB0byBtYXAgdG8gZm9sZGVycyBvbiBkaXNrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0
L1NoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2NvYS9DbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0
aW9uWFBDQ29uc3RhbnRzLmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0F1dGhlbnRpY2F0aW9u
L2NvY29hL0NsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUENDb25zdGFudHMuY3BwCm5l
dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAuLjE1MjY0NDczNTE0YTIyNDgzYmE4ZThmNjhhMDE5MjBmMWM4ZGUzMTEKLS0tIC9k
ZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2NvYS9D
bGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRzLmNwcApAQCAtMCwwICsx
LDQyIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE4LTIwMTkgQXBwbGUgSW5jLiBBbGwgcmln
aHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu
ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVy
bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0
OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBh
Ym92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k
IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5h
cnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2Us
IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4g
dGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQg
d2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQg
QlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkg
RVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE
IFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJ
VE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8g
RVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUg
Rk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlks
IE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE
IFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9T
UyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04p
IEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJ
TgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdM
SUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVT
RSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElU
WSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAi
Q2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ0NvbnN0YW50cy5oIgorCisjaWYgSEFW
RShTRUNfS0VZX1BST1hZKQorCituYW1lc3BhY2UgV2ViS2l0IHsKKworY29uc3QgY2hhciBjbGll
bnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ2VydGlmaWNhdGVzS2V5W10gPSAiY2VydGlm
aWNhdGVzIjsKK2NvbnN0IGNoYXIgY2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ0No
YWxsZW5nZUlES2V5W10gPSAiY2hhbGxlbmdlLWlkIjsKK2NvbnN0IGNoYXIgY2xpZW50Q2VydGlm
aWNhdGVBdXRoZW50aWNhdGlvblhQQ01lc3NhZ2VOYW1lS2V5W10gPSAibWVzc2FnZS1uYW1lIjsK
K2NvbnN0IGNoYXIgY2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ01lc3NhZ2VOYW1l
VmFsdWVbXSA9ICJjbGllbnQtY2VydGlmaWNhdGUtY3JlZGVudGlhbCI7Citjb25zdCBjaGFyIGNs
aWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUENQZXJzaXN0ZW5jZUtleVtdID0gInBlcnNp
c3RlbmNlIjsKK2NvbnN0IGNoYXIgY2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ1Nl
Y0tleVByb3h5RW5kcG9pbnRLZXlbXSA9ICJzZWMta2V5LXByb3h5LWVuZHBvaW50IjsKKworfSAv
LyBuYW1lc3BhY2UgV2ViS2l0CisKKyNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9T
aGFyZWQvQXV0aGVudGljYXRpb24vY29jb2EvQ2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlv
blhQQ0NvbnN0YW50cy5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvQXV0aGVudGljYXRpb24vY29j
b2EvQ2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ0NvbnN0YW50cy5oCmluZGV4IGM4
NDM5NDZkMzJkZWZlMjhmZWZkZTBmYTU2NjM0OGI4OTNiMGE0YTUuLjkyNDFlZWRkNWRkNDhjMTFi
YTk5NzM0NDEwMTVhODk2YjNkYWI5ZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVk
L0F1dGhlbnRpY2F0aW9uL2NvY29hL0NsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUEND
b25zdGFudHMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2Nv
YS9DbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRzLmgKQEAgLTEsNSAr
MSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE4IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy
ZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxOC0yMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0
cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQg
YmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1p
dHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMjksMTIgKzI5
LDEyIEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1jb25zdCBjaGFyIGNsaWVudENlcnRpZmlj
YXRlQXV0aGVudGljYXRpb25YUENNZXNzYWdlTmFtZUtleVtdID0gIm1lc3NhZ2UtbmFtZSI7Ci1j
b25zdCBjaGFyIGNsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUENNZXNzYWdlTmFtZVZh
bHVlW10gPSAiY2xpZW50LWNlcnRpZmljYXRlLWNyZWRlbnRpYWwiOwotY29uc3QgY2hhciBjbGll
bnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ2hhbGxlbmdlSURLZXlbXSA9ICJjaGFsbGVu
Z2UtaWQiOwotY29uc3QgY2hhciBjbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDU2Vj
S2V5UHJveHlFbmRwb2ludEtleVtdID0gInNlYy1rZXktcHJveHktZW5kcG9pbnQiOwotY29uc3Qg
Y2hhciBjbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ2VydGlmaWNhdGVzS2V5W10g
PSAiY2VydGlmaWNhdGVzIjsKLWNvbnN0IGNoYXIgY2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNh
dGlvblhQQ1BlcnNpc3RlbmNlS2V5W10gPSAicGVyc2lzdGVuY2UiOworY29uc3QgY2hhciBjbGll
bnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ2VydGlmaWNhdGVzS2V5W107Citjb25zdCBj
aGFyIGNsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUENDaGFsbGVuZ2VJREtleVtdOwor
Y29uc3QgY2hhciBjbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDTWVzc2FnZU5hbWVL
ZXlbXTsKK2NvbnN0IGNoYXIgY2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ01lc3Nh
Z2VOYW1lVmFsdWVbXTsKK2NvbnN0IGNoYXIgY2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlv
blhQQ1BlcnNpc3RlbmNlS2V5W107Citjb25zdCBjaGFyIGNsaWVudENlcnRpZmljYXRlQXV0aGVu
dGljYXRpb25YUENTZWNLZXlQcm94eUVuZHBvaW50S2V5W107CiAKIH0gLy8gbmFtZXNwYWNlIFdl
YktpdAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NvdXJjZXNDb2NvYS50eHQgYi9Tb3Vy
Y2UvV2ViS2l0L1NvdXJjZXNDb2NvYS50eHQKaW5kZXggMTZlODhmMGFiMWZmMGJjN2Q1N2IxMzcx
ODJlNjk3ZDg2NGYxOTM5MS4uYTZmZTAzYThmNmE0MjdiYzY1OWJiMDI2MzUzZGQyODBmOWFiOWM3
ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9Tb3VyY2VzQ29jb2EudHh0CisrKyBiL1NvdXJj
ZS9XZWJLaXQvU291cmNlc0NvY29hLnR4dApAQCAtMTIzLDYgKzEyMyw3IEBAIFNoYXJlZC9jZi9D
b29raWVTdG9yYWdlVXRpbHNDRi5tbQogU2hhcmVkL2NnL1NoYXJlYWJsZUJpdG1hcENHLmNwcAog
CiBTaGFyZWQvQXV0aGVudGljYXRpb24vY29jb2EvQXV0aGVudGljYXRpb25NYW5hZ2VyQ29jb2Eu
bW0KK1NoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2NvYS9DbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRp
Y2F0aW9uWFBDQ29uc3RhbnRzLmNwcAogCiBTaGFyZWQvQ29jb2EvQVBJRGF0YUNvY29hLm1tCiBT
aGFyZWQvQ29jb2EvQVBJT2JqZWN0Lm1tCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VuaWZp
ZWRTb3VyY2VzLWlucHV0LnhjZmlsZWxpc3QgYi9Tb3VyY2UvV2ViS2l0L1VuaWZpZWRTb3VyY2Vz
LWlucHV0LnhjZmlsZWxpc3QKaW5kZXggZTZjN2EwYzdhMjY2MGUxOGE4MmUzYzE1MjVjODkyZDcw
Njg4NmY1Ny4uMTViODA5OWU2OWRiZmNkMjgzNzc4OWQ2ZGIwYzFiOWVmMzM2ZTIzNSAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYktpdC9VbmlmaWVkU291cmNlcy1pbnB1dC54Y2ZpbGVsaXN0CisrKyBi
L1NvdXJjZS9XZWJLaXQvVW5pZmllZFNvdXJjZXMtaW5wdXQueGNmaWxlbGlzdApAQCAtMTcwLDYg
KzE3MCw3IEBAICQoU1JDUk9PVCkvU2hhcmVkL0Fzc2lzdGVkTm9kZUluZm9ybWF0aW9uLmNwcAog
JChTUkNST09UKS9TaGFyZWQvQXN5bmNSZXF1ZXN0LmNwcAogJChTUkNST09UKS9TaGFyZWQvQXV0
aGVudGljYXRpb24vQXV0aGVudGljYXRpb25NYW5hZ2VyLmNwcAogJChTUkNST09UKS9TaGFyZWQv
QXV0aGVudGljYXRpb24vY29jb2EvQXV0aGVudGljYXRpb25NYW5hZ2VyQ29jb2EubW0KKyQoU1JD
Uk9PVCkvU2hhcmVkL0F1dGhlbnRpY2F0aW9uL2NvY29hL0NsaWVudENlcnRpZmljYXRlQXV0aGVu
dGljYXRpb25YUENDb25zdGFudHMuY3BwCiAkKFNSQ1JPT1QpL1NoYXJlZC9CbG9iRGF0YUZpbGVS
ZWZlcmVuY2VXaXRoU2FuZGJveEV4dGVuc2lvbi5jcHAKICQoU1JDUk9PVCkvU2hhcmVkL0NhY2hl
TW9kZWwuY3BwCiAkKFNSQ1JPT1QpL1NoYXJlZC9DaGlsZFByb2Nlc3MuY3BwCmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNl
L1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCAzMDZlOWFhMmY3
MDViNTNmMjFlYjhjZmNiODZjMmRlZjM3MWNjOGJkLi5iZDk0Mzk5ZjYzYzQ2MzAwNzg0ZGYxZjhm
YWM5NzU4Njk3OTkwYTBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXBy
b2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9w
cm9qZWN0LnBieHByb2oKQEAgLTMwNjgsNiArMzA2OCw3IEBACiAJCTQxRkJFODIzMjA2REE3OUMw
MDBGMDc0MSAvKiBOZXR3b3JrQ29udGVudFJ1bGVMaXN0TWFuYWdlci5tZXNzYWdlcy5pbiAqLyA9
IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl
VHlwZSA9IHRleHQ7IHBhdGggPSBOZXR3b3JrQ29udGVudFJ1bGVMaXN0TWFuYWdlci5tZXNzYWdl
cy5pbjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDFGQkU4MjQyMDZEQTc5QzAwMEYw
NzQxIC8qIE5ldHdvcmtDb250ZW50UnVsZUxpc3RNYW5hZ2VyLmNwcCAqLyA9IHtpc2EgPSBQQlhG
aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj
ZWNvZGUuY3BwLmNwcDsgcGF0aCA9IE5ldHdvcmtDb250ZW50UnVsZUxpc3RNYW5hZ2VyLmNwcDsg
c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDQ1MEFFQkYxREMzRkFFNTAwOTk0M0YyIC8q
IFNoYXJlZE1lbW9yeUNvY29hLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl
RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0
aCA9IFNoYXJlZE1lbW9yeUNvY29hLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJ
NDRBNDgxQzYyMUYyRDI3QjAwRjJGOTE5IC8qIENsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRp
b25YUENDb25zdGFudHMuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93
bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gQ2xpZW50Q2VydGlmaWNhdGVB
dXRoZW50aWNhdGlvblhQQ0NvbnN0YW50cy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07
CiAJCTQ2MEY0ODhEMUY5OTZGNkMwMENGNEI4NyAvKiBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVj
dGlvbk1lc3NhZ2VSZWNlaXZlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls
ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IG5h
bWUgPSBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbk1lc3NhZ2VSZWNlaXZlci5jcHA7IHBh
dGggPSBEZXJpdmVkU291cmNlcy9XZWJLaXQyL1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9u
TWVzc2FnZVJlY2VpdmVyLmNwcDsgc291cmNlVHJlZSA9IEJVSUxUX1BST0RVQ1RTX0RJUjsgfTsK
IAkJNDYwRjQ4OEUxRjk5NkY2QzAwQ0Y0Qjg3IC8qIFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0
aW9uTWVzc2FnZXMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg
PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBuYW1lID0gV2ViU1dDb250
ZXh0TWFuYWdlckNvbm5lY3Rpb25NZXNzYWdlcy5oOyBwYXRoID0gRGVyaXZlZFNvdXJjZXMvV2Vi
S2l0Mi9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbk1lc3NhZ2VzLmg7IHNvdXJjZVRyZWUg
PSBCVUlMVF9QUk9EVUNUU19ESVI7IH07CiAJCTQ2MjEwN0Q3MUYzOERCRDMwMERENzgxMCAvKiBQ
aW5nTG9hZC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g
NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBQaW5nTG9h
ZC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC02NzM1LDYgKzY3MzYsNyBAQAog
CQkJaXNhID0gUEJYR3JvdXA7CiAJCQljaGlsZHJlbiA9ICgKIAkJCQk1N0I0QjQ1RDIwQjUwNEFC
MDBENEFENzkgLyogQXV0aGVudGljYXRpb25NYW5hZ2VyQ29jb2EubW0gKi8sCisJCQkJNDRBNDgx
QzYyMUYyRDI3QjAwRjJGOTE5IC8qIENsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUEND
b25zdGFudHMuY3BwICovLAogCQkJCTU3QjRCNDVFMjBCNTA0QUIwMEQ0QUQ3OSAvKiBDbGllbnRD
ZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRzLmggKi8sCiAJCQkpOwogCQkJcGF0
aCA9IGNvY29hOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>359612</attachid>
            <date>2019-01-19 09:17:08 -0800</date>
            <delta_ts>2019-01-22 12:51:47 -0800</delta_ts>
            <desc>Patch v3</desc>
            <filename>bug-193607-20190119091708.patch</filename>
            <type>text/plain</type>
            <size>15245</size>
            <attacher name="David Kilzer (:ddkilzer)">ddkilzer</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwMjAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM0MDRkYjEzZWQ5ZDE2ZjE1
ZGVlMDE4MGM3Zjc5ZGFhMzBjZDA0MmQuLmE4MzI5NzNhNjUwNjRhZjY0N2Q0MWY2ZWMyMTY0Y2I2
NGNlODM0NWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTktMDEtMTkgIERhdmlkIEtp
bHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICBDIHN0cmluZ3MgaW4gQ2xpZW50
Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ0NvbnN0YW50cy5oIGFyZSBkdXBsaWNhdGVkCisg
ICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xOTM2MDc+CisgICAgICAgIDxyZGFyOi8vcHJv
YmxlbS80NzMzNDYxMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICAqIFNoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2NvYS9BdXRoZW50aWNhdGlvbk1hbmFn
ZXJDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6QXV0aGVudGljYXRpb25NYW5hZ2VyOjppbml0
aWFsaXplQ29ubmVjdGlvbik6CisgICAgICAgICogVUlQcm9jZXNzL0F1dGhlbnRpY2F0aW9uL2Nv
Y29hL0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlUHJveHlDb2NvYS5tbToKKyAgICAgICAgKFdlYktp
dDo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2VQcm94eTo6c2VuZENsaWVudENlcnRpZmljYXRlQ3Jl
ZGVudGlhbE92ZXJYcGMpOgorICAgICAgICAtIFVwZGF0ZSBuYW1lIG9mIGNvbnN0YW50cy4KKwor
ICAgICAgICAqIFNoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2NvYS9DbGllbnRDZXJ0aWZpY2F0ZUF1
dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRzLmNwcDogQ29waWVkIGZyb20gU291cmNlL1dlYktpdC9T
aGFyZWQvQXV0aGVudGljYXRpb24vY29jb2EvQ2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlv
blhQQ0NvbnN0YW50cy5oLgorICAgICAgICAqIFNoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2NvYS9D
bGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRzLmg6CisgICAgICAgIC0g
UHV0IGNvbnN0YW50IHZhbHVlcyBpbiBhIHN0cnVjdCwgYW5kIG1vdmUgdGhlbSB0bworICAgICAg
ICAgIENsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUENDb25zdGFudHMuY3BwLgorCisg
ICAgICAgICogU291cmNlc0NvY29hLnR4dDoKKyAgICAgICAgKiBVbmlmaWVkU291cmNlcy1pbnB1
dC54Y2ZpbGVsaXN0OgorICAgICAgICAqIFdlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9q
OgorICAgICAgICAtIEFkZCBDbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ29uc3Rh
bnRzLmNwcC4KKwogMjAxOS0wMS0xOSAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29t
PgogCiAgICAgICAgIEZvbGxvdy11cDogaU9TOiBVcGRhdGluZyBpbnB1dCBtb2RlIHNob3VsZCB1
cGRhdGUgdGhlIHNvZnR3YXJlIGtleWJvYXJkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1No
YXJlZC9BdXRoZW50aWNhdGlvbi9jb2NvYS9BdXRoZW50aWNhdGlvbk1hbmFnZXJDb2NvYS5tbSBi
L1NvdXJjZS9XZWJLaXQvU2hhcmVkL0F1dGhlbnRpY2F0aW9uL2NvY29hL0F1dGhlbnRpY2F0aW9u
TWFuYWdlckNvY29hLm1tCmluZGV4IGUzM2Y1MDg5MDYyMDNjMDE3OWJmYzM5MGRiMDkyYmYwYjgx
NjRkZDguLjFkYWRkNDQ3ZTgzNTMzYzJlNmEwYzRjMmYxMjc3NTlhM2Q3MzMwZWQgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0F1dGhlbnRpY2F0aW9uL2NvY29hL0F1dGhlbnRpY2F0
aW9uTWFuYWdlckNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0F1dGhlbnRpY2F0
aW9uL2NvY29hL0F1dGhlbnRpY2F0aW9uTWFuYWdlckNvY29hLm1tCkBAIC0xLDUgKzEsNSBAQAog
LyoKLSAqIENvcHlyaWdodCAoQykgMjAxOCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu
CisgKiBDb3B5cmlnaHQgKEMpIDIwMTgtMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2
ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm
b3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv
dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTU2LDE2ICs1NiwxNiBAQCB2
b2lkIEF1dGhlbnRpY2F0aW9uTWFuYWdlcjo6aW5pdGlhbGl6ZUNvbm5lY3Rpb24oSVBDOjpDb25u
ZWN0aW9uKiBjb25uZWN0aW9uKQogICAgICAgICBpZiAodHlwZSA9PSBYUENfVFlQRV9FUlJPUiB8
fCAhd2Vha1RoaXMpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgaWYgKHR5cGUgIT0g
WFBDX1RZUEVfRElDVElPTkFSWSB8fCBzdHJjbXAoeHBjX2RpY3Rpb25hcnlfZ2V0X3N0cmluZyhl
dmVudCwgY2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ01lc3NhZ2VOYW1lS2V5KSwg
Y2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ01lc3NhZ2VOYW1lVmFsdWUpKSB7Cisg
ICAgICAgIGlmICh0eXBlICE9IFhQQ19UWVBFX0RJQ1RJT05BUlkgfHwgc3RyY21wKHhwY19kaWN0
aW9uYXJ5X2dldF9zdHJpbmcoZXZlbnQsIENsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb246
OlhQQ01lc3NhZ2VOYW1lS2V5KSwgQ2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvbjo6WFBD
TWVzc2FnZU5hbWVWYWx1ZSkpIHsKICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwog
ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgYXV0byBjaGFsbGVuZ2VJ
RCA9IHhwY19kaWN0aW9uYXJ5X2dldF91aW50NjQoZXZlbnQsIGNsaWVudENlcnRpZmljYXRlQXV0
aGVudGljYXRpb25YUENDaGFsbGVuZ2VJREtleSk7CisgICAgICAgIGF1dG8gY2hhbGxlbmdlSUQg
PSB4cGNfZGljdGlvbmFyeV9nZXRfdWludDY0KGV2ZW50LCBDbGllbnRDZXJ0aWZpY2F0ZUF1dGhl
bnRpY2F0aW9uOjpYUENDaGFsbGVuZ2VJREtleSk7CiAgICAgICAgIGlmICghY2hhbGxlbmdlSUQp
CiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgYXV0byB4cGNFbmRQb2ludCA9IHhwY19k
aWN0aW9uYXJ5X2dldF92YWx1ZShldmVudCwgY2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlv
blhQQ1NlY0tleVByb3h5RW5kcG9pbnRLZXkpOworICAgICAgICBhdXRvIHhwY0VuZFBvaW50ID0g
eHBjX2RpY3Rpb25hcnlfZ2V0X3ZhbHVlKGV2ZW50LCBDbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRp
Y2F0aW9uOjpYUENTZWNLZXlQcm94eUVuZHBvaW50S2V5KTsKICAgICAgICAgaWYgKCF4cGNFbmRQ
b2ludCB8fCB4cGNfZ2V0X3R5cGUoeHBjRW5kUG9pbnQpICE9IFhQQ19UWVBFX0VORFBPSU5UKQog
ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBhdXRvIGVuZFBvaW50ID0gYWRvcHROUyhbW05T
WFBDTGlzdGVuZXJFbmRwb2ludCBhbGxvY10gaW5pdF0pOwpAQCAtNzcsNyArNzcsNyBAQCB2b2lk
IEF1dGhlbnRpY2F0aW9uTWFuYWdlcjo6aW5pdGlhbGl6ZUNvbm5lY3Rpb24oSVBDOjpDb25uZWN0
aW9uKiBjb25uZWN0aW9uKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAg
ICAgYXV0byBjZXJ0aWZpY2F0ZURhdGFBcnJheSA9IHhwY19kaWN0aW9uYXJ5X2dldF9hcnJheShl
dmVudCwgY2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ0NlcnRpZmljYXRlc0tleSk7
CisgICAgICAgIGF1dG8gY2VydGlmaWNhdGVEYXRhQXJyYXkgPSB4cGNfZGljdGlvbmFyeV9nZXRf
YXJyYXkoZXZlbnQsIENsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb246OlhQQ0NlcnRpZmlj
YXRlc0tleSk7CiAgICAgICAgIGlmICghY2VydGlmaWNhdGVEYXRhQXJyYXkpCiAgICAgICAgICAg
ICByZXR1cm47CiAgICAgICAgIE5TTXV0YWJsZUFycmF5ICpjZXJ0aWZpY2F0ZXMgPSBuaWw7CkBA
IC05Myw3ICs5Myw3IEBAIHZvaWQgQXV0aGVudGljYXRpb25NYW5hZ2VyOjppbml0aWFsaXplQ29u
bmVjdGlvbihJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24pCiAgICAgICAgICAgICB9CiAgICAg
ICAgIH0KIAotICAgICAgICBhdXRvIHBlcnNpc3RlbmNlID0geHBjX2RpY3Rpb25hcnlfZ2V0X3Vp
bnQ2NChldmVudCwgY2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ1BlcnNpc3RlbmNl
S2V5KTsKKyAgICAgICAgYXV0byBwZXJzaXN0ZW5jZSA9IHhwY19kaWN0aW9uYXJ5X2dldF91aW50
NjQoZXZlbnQsIENsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb246OlhQQ1BlcnNpc3RlbmNl
S2V5KTsKICAgICAgICAgaWYgKHBlcnNpc3RlbmNlID4gc3RhdGljX2Nhc3Q8dWludDY0X3Q+KE5T
VVJMQ3JlZGVudGlhbFBlcnNpc3RlbmNlU3luY2hyb25pemFibGUpKQogICAgICAgICAgICAgcmV0
dXJuOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9BdXRoZW50aWNhdGlvbi9j
b2NvYS9DbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRzLmNwcCBiL1Nv
dXJjZS9XZWJLaXQvU2hhcmVkL0F1dGhlbnRpY2F0aW9uL2NvY29hL0NsaWVudENlcnRpZmljYXRl
QXV0aGVudGljYXRpb25YUENDb25zdGFudHMuY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4
IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmE2NmNmNjU2ODQ2MDhm
NzViYzU5N2I5ZjZiNTM3YTdmZjg1YWQ4NzAKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2Vi
S2l0L1NoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2NvYS9DbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRp
Y2F0aW9uWFBDQ29uc3RhbnRzLmNwcApAQCAtMCwwICsxLDQyIEBACisvKgorICogQ29weXJpZ2h0
IChDKSAyMDE4LTIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJl
ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig
d2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl
IGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25z
IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5v
dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l
ci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0
aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z
IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9u
IGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgor
ICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENP
TlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJB
TlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FS
UkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgor
ICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBP
UiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNU
LCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERB
TUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICog
U1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJ
VFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBB
TlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBM
SUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAq
IEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVO
IElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLwor
CisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiQ2xpZW50Q2VydGlmaWNhdGVBdXRoZW50
aWNhdGlvblhQQ0NvbnN0YW50cy5oIgorCisjaWYgSEFWRShTRUNfS0VZX1BST1hZKQorCituYW1l
c3BhY2UgV2ViS2l0IHsKKworY29uc3QgY2hhciogY29uc3QgQ2xpZW50Q2VydGlmaWNhdGVBdXRo
ZW50aWNhdGlvbjo6WFBDQ2VydGlmaWNhdGVzS2V5ID0gImNlcnRpZmljYXRlcyI7Citjb25zdCBj
aGFyKiBjb25zdCBDbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uOjpYUENDaGFsbGVuZ2VJ
REtleSA9ICJjaGFsbGVuZ2UtaWQiOworY29uc3QgY2hhciogY29uc3QgQ2xpZW50Q2VydGlmaWNh
dGVBdXRoZW50aWNhdGlvbjo6WFBDTWVzc2FnZU5hbWVLZXkgPSAibWVzc2FnZS1uYW1lIjsKK2Nv
bnN0IGNoYXIqIGNvbnN0IENsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb246OlhQQ01lc3Nh
Z2VOYW1lVmFsdWUgPSAiY2xpZW50LWNlcnRpZmljYXRlLWNyZWRlbnRpYWwiOworY29uc3QgY2hh
ciogY29uc3QgQ2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvbjo6WFBDUGVyc2lzdGVuY2VL
ZXkgPSAicGVyc2lzdGVuY2UiOworY29uc3QgY2hhciogY29uc3QgQ2xpZW50Q2VydGlmaWNhdGVB
dXRoZW50aWNhdGlvbjo6WFBDU2VjS2V5UHJveHlFbmRwb2ludEtleSA9ICJzZWMta2V5LXByb3h5
LWVuZHBvaW50IjsKKworfSAvLyBuYW1lc3BhY2UgV2ViS2l0CisKKyNlbmRpZgpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYktpdC9TaGFyZWQvQXV0aGVudGljYXRpb24vY29jb2EvQ2xpZW50Q2VydGlm
aWNhdGVBdXRoZW50aWNhdGlvblhQQ0NvbnN0YW50cy5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQv
QXV0aGVudGljYXRpb24vY29jb2EvQ2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ0Nv
bnN0YW50cy5oCmluZGV4IGM4NDM5NDZkMzJkZWZlMjhmZWZkZTBmYTU2NjM0OGI4OTNiMGE0YTUu
LmFkOGJhZGY4Yjc2NzcyZmUxZjQxNTUzMDU5MTE5ZWY4NmMzZWQ5NTggMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJLaXQvU2hhcmVkL0F1dGhlbnRpY2F0aW9uL2NvY29hL0NsaWVudENlcnRpZmljYXRl
QXV0aGVudGljYXRpb25YUENDb25zdGFudHMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9B
dXRoZW50aWNhdGlvbi9jb2NvYS9DbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ29u
c3RhbnRzLmgKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE4IEFwcGxl
IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxOC0yMDE5IEFw
cGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQg
dXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlm
aWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0
aW9ucwpAQCAtMjksMTIgKzI5LDE0IEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1jb25zdCBj
aGFyIGNsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUENNZXNzYWdlTmFtZUtleVtdID0g
Im1lc3NhZ2UtbmFtZSI7Ci1jb25zdCBjaGFyIGNsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRp
b25YUENNZXNzYWdlTmFtZVZhbHVlW10gPSAiY2xpZW50LWNlcnRpZmljYXRlLWNyZWRlbnRpYWwi
OwotY29uc3QgY2hhciBjbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ2hhbGxlbmdl
SURLZXlbXSA9ICJjaGFsbGVuZ2UtaWQiOwotY29uc3QgY2hhciBjbGllbnRDZXJ0aWZpY2F0ZUF1
dGhlbnRpY2F0aW9uWFBDU2VjS2V5UHJveHlFbmRwb2ludEtleVtdID0gInNlYy1rZXktcHJveHkt
ZW5kcG9pbnQiOwotY29uc3QgY2hhciBjbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBD
Q2VydGlmaWNhdGVzS2V5W10gPSAiY2VydGlmaWNhdGVzIjsKLWNvbnN0IGNoYXIgY2xpZW50Q2Vy
dGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ1BlcnNpc3RlbmNlS2V5W10gPSAicGVyc2lzdGVuY2Ui
Oworc3RydWN0IENsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb24geworICAgIHN0YXRpYyBj
b25zdCBjaGFyKiBjb25zdCBYUENDZXJ0aWZpY2F0ZXNLZXk7CisgICAgc3RhdGljIGNvbnN0IGNo
YXIqIGNvbnN0IFhQQ0NoYWxsZW5nZUlES2V5OworICAgIHN0YXRpYyBjb25zdCBjaGFyKiBjb25z
dCBYUENNZXNzYWdlTmFtZUtleTsKKyAgICBzdGF0aWMgY29uc3QgY2hhciogY29uc3QgWFBDTWVz
c2FnZU5hbWVWYWx1ZTsKKyAgICBzdGF0aWMgY29uc3QgY2hhciogY29uc3QgWFBDUGVyc2lzdGVu
Y2VLZXk7CisgICAgc3RhdGljIGNvbnN0IGNoYXIqIGNvbnN0IFhQQ1NlY0tleVByb3h5RW5kcG9p
bnRLZXk7Cit9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIApkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYktpdC9Tb3VyY2VzQ29jb2EudHh0IGIvU291cmNlL1dlYktpdC9Tb3VyY2VzQ29jb2EudHh0
CmluZGV4IDE2ZTg4ZjBhYjFmZjBiYzdkNTdiMTM3MTgyZTY5N2Q4NjRmMTkzOTEuLmE2ZmUwM2E4
ZjZhNDI3YmM2NTliYjAyNjM1M2RkMjgwZjlhYjljN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL
aXQvU291cmNlc0NvY29hLnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0L1NvdXJjZXNDb2NvYS50eHQK
QEAgLTEyMyw2ICsxMjMsNyBAQCBTaGFyZWQvY2YvQ29va2llU3RvcmFnZVV0aWxzQ0YubW0KIFNo
YXJlZC9jZy9TaGFyZWFibGVCaXRtYXBDRy5jcHAKIAogU2hhcmVkL0F1dGhlbnRpY2F0aW9uL2Nv
Y29hL0F1dGhlbnRpY2F0aW9uTWFuYWdlckNvY29hLm1tCitTaGFyZWQvQXV0aGVudGljYXRpb24v
Y29jb2EvQ2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ0NvbnN0YW50cy5jcHAKIAog
U2hhcmVkL0NvY29hL0FQSURhdGFDb2NvYS5tbQogU2hhcmVkL0NvY29hL0FQSU9iamVjdC5tbQpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0aGVudGljYXRpb24vY29jb2Ev
QXV0aGVudGljYXRpb25DaGFsbGVuZ2VQcm94eUNvY29hLm1tIGIvU291cmNlL1dlYktpdC9VSVBy
b2Nlc3MvQXV0aGVudGljYXRpb24vY29jb2EvQXV0aGVudGljYXRpb25DaGFsbGVuZ2VQcm94eUNv
Y29hLm1tCmluZGV4IDQ5YmExYmRiOWQxM2Q5M2FkYTk0Y2YxZDU1MjQ0MzVmNTAyMmQ0OGIuLmFm
MGE3NjI2ODFkYTczZDRmOWM1YThjYzExZTZiZjNjN2EzYTk2ZDMgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJLaXQvVUlQcm9jZXNzL0F1dGhlbnRpY2F0aW9uL2NvY29hL0F1dGhlbnRpY2F0aW9uQ2hh
bGxlbmdlUHJveHlDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRoZW50
aWNhdGlvbi9jb2NvYS9BdXRoZW50aWNhdGlvbkNoYWxsZW5nZVByb3h5Q29jb2EubW0KQEAgLTEs
NSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE4IEFwcGxlIEluYy4gQWxsIHJpZ2h0
cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxOC0yMDE5IEFwcGxlIEluYy4gQWxsIHJp
Z2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBh
bmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBl
cm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNDEsMTYg
KzQxLDE2IEBAIHZvaWQgQXV0aGVudGljYXRpb25DaGFsbGVuZ2VQcm94eTo6c2VuZENsaWVudENl
cnRpZmljYXRlQ3JlZGVudGlhbE92ZXJYcGMoSVBDOjpDCiAgICAgQVNTRVJUKHNlY0tleVByb3h5
U3RvcmUuaXNJbml0aWFsaXplZCgpKTsKIAogICAgIGF1dG8gbWVzc2FnZSA9IGFkb3B0T1NPYmpl
Y3QoeHBjX2RpY3Rpb25hcnlfY3JlYXRlKG51bGxwdHIsIG51bGxwdHIsIDApKTsKLSAgICB4cGNf
ZGljdGlvbmFyeV9zZXRfc3RyaW5nKG1lc3NhZ2UuZ2V0KCksIGNsaWVudENlcnRpZmljYXRlQXV0
aGVudGljYXRpb25YUENNZXNzYWdlTmFtZUtleSwgY2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNh
dGlvblhQQ01lc3NhZ2VOYW1lVmFsdWUpOwotICAgIHhwY19kaWN0aW9uYXJ5X3NldF91aW50NjQo
bWVzc2FnZS5nZXQoKSwgY2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ0NoYWxsZW5n
ZUlES2V5LCBjaGFsbGVuZ2VJRCk7Ci0gICAgeHBjX2RpY3Rpb25hcnlfc2V0X3ZhbHVlKG1lc3Nh
Z2UuZ2V0KCksIGNsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUENTZWNLZXlQcm94eUVu
ZHBvaW50S2V5LCBzZWNLZXlQcm94eVN0b3JlLmdldCgpLmVuZHBvaW50Ll9lbmRwb2ludCk7Cisg
ICAgeHBjX2RpY3Rpb25hcnlfc2V0X3N0cmluZyhtZXNzYWdlLmdldCgpLCBDbGllbnRDZXJ0aWZp
Y2F0ZUF1dGhlbnRpY2F0aW9uOjpYUENNZXNzYWdlTmFtZUtleSwgQ2xpZW50Q2VydGlmaWNhdGVB
dXRoZW50aWNhdGlvbjo6WFBDTWVzc2FnZU5hbWVWYWx1ZSk7CisgICAgeHBjX2RpY3Rpb25hcnlf
c2V0X3VpbnQ2NChtZXNzYWdlLmdldCgpLCBDbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9u
OjpYUENDaGFsbGVuZ2VJREtleSwgY2hhbGxlbmdlSUQpOworICAgIHhwY19kaWN0aW9uYXJ5X3Nl
dF92YWx1ZShtZXNzYWdlLmdldCgpLCBDbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uOjpY
UENTZWNLZXlQcm94eUVuZHBvaW50S2V5LCBzZWNLZXlQcm94eVN0b3JlLmdldCgpLmVuZHBvaW50
Ll9lbmRwb2ludCk7CiAgICAgYXV0byBjZXJ0aWZpY2F0ZURhdGFBcnJheSA9IGFkb3B0T1NPYmpl
Y3QoeHBjX2FycmF5X2NyZWF0ZShudWxscHRyLCAwKSk7CiAgICAgZm9yIChpZCBjZXJ0aWZpY2F0
ZSBpbiBjcmVkZW50aWFsLm5zQ3JlZGVudGlhbCgpLmNlcnRpZmljYXRlcykgewogICAgICAgICBh
dXRvIGRhdGEgPSBhZG9wdENGKFNlY0NlcnRpZmljYXRlQ29weURhdGEoKFNlY0NlcnRpZmljYXRl
UmVmKWNlcnRpZmljYXRlKSk7CiAgICAgICAgIHhwY19hcnJheV9hcHBlbmRfdmFsdWUoY2VydGlm
aWNhdGVEYXRhQXJyYXkuZ2V0KCksIGFkb3B0T1NPYmplY3QoeHBjX2RhdGFfY3JlYXRlKENGRGF0
YUdldEJ5dGVQdHIoZGF0YS5nZXQoKSksIENGRGF0YUdldExlbmd0aChkYXRhLmdldCgpKSkpLmdl
dCgpKTsKICAgICB9Ci0gICAgeHBjX2RpY3Rpb25hcnlfc2V0X3ZhbHVlKG1lc3NhZ2UuZ2V0KCks
IGNsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUENDZXJ0aWZpY2F0ZXNLZXksIGNlcnRp
ZmljYXRlRGF0YUFycmF5LmdldCgpKTsKLSAgICB4cGNfZGljdGlvbmFyeV9zZXRfdWludDY0KG1l
c3NhZ2UuZ2V0KCksIGNsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUENQZXJzaXN0ZW5j
ZUtleSwgc3RhdGljX2Nhc3Q8dWludDY0X3Q+KGNyZWRlbnRpYWwubnNDcmVkZW50aWFsKCkucGVy
c2lzdGVuY2UpKTsKKyAgICB4cGNfZGljdGlvbmFyeV9zZXRfdmFsdWUobWVzc2FnZS5nZXQoKSwg
Q2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvbjo6WFBDQ2VydGlmaWNhdGVzS2V5LCBjZXJ0
aWZpY2F0ZURhdGFBcnJheS5nZXQoKSk7CisgICAgeHBjX2RpY3Rpb25hcnlfc2V0X3VpbnQ2NCht
ZXNzYWdlLmdldCgpLCBDbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uOjpYUENQZXJzaXN0
ZW5jZUtleSwgc3RhdGljX2Nhc3Q8dWludDY0X3Q+KGNyZWRlbnRpYWwubnNDcmVkZW50aWFsKCku
cGVyc2lzdGVuY2UpKTsKIAogICAgIHhwY19jb25uZWN0aW9uX3NlbmRfbWVzc2FnZShjb25uZWN0
aW9uLnhwY0Nvbm5lY3Rpb24oKSwgbWVzc2FnZS5nZXQoKSk7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViS2l0L1VuaWZpZWRTb3VyY2VzLWlucHV0LnhjZmlsZWxpc3QgYi9Tb3VyY2UvV2ViS2l0
L1VuaWZpZWRTb3VyY2VzLWlucHV0LnhjZmlsZWxpc3QKaW5kZXggZTZjN2EwYzdhMjY2MGUxOGE4
MmUzYzE1MjVjODkyZDcwNjg4NmY1Ny4uMTViODA5OWU2OWRiZmNkMjgzNzc4OWQ2ZGIwYzFiOWVm
MzM2ZTIzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VbmlmaWVkU291cmNlcy1pbnB1dC54
Y2ZpbGVsaXN0CisrKyBiL1NvdXJjZS9XZWJLaXQvVW5pZmllZFNvdXJjZXMtaW5wdXQueGNmaWxl
bGlzdApAQCAtMTcwLDYgKzE3MCw3IEBAICQoU1JDUk9PVCkvU2hhcmVkL0Fzc2lzdGVkTm9kZUlu
Zm9ybWF0aW9uLmNwcAogJChTUkNST09UKS9TaGFyZWQvQXN5bmNSZXF1ZXN0LmNwcAogJChTUkNS
T09UKS9TaGFyZWQvQXV0aGVudGljYXRpb24vQXV0aGVudGljYXRpb25NYW5hZ2VyLmNwcAogJChT
UkNST09UKS9TaGFyZWQvQXV0aGVudGljYXRpb24vY29jb2EvQXV0aGVudGljYXRpb25NYW5hZ2Vy
Q29jb2EubW0KKyQoU1JDUk9PVCkvU2hhcmVkL0F1dGhlbnRpY2F0aW9uL2NvY29hL0NsaWVudENl
cnRpZmljYXRlQXV0aGVudGljYXRpb25YUENDb25zdGFudHMuY3BwCiAkKFNSQ1JPT1QpL1NoYXJl
ZC9CbG9iRGF0YUZpbGVSZWZlcmVuY2VXaXRoU2FuZGJveEV4dGVuc2lvbi5jcHAKICQoU1JDUk9P
VCkvU2hhcmVkL0NhY2hlTW9kZWwuY3BwCiAkKFNSQ1JPT1QpL1NoYXJlZC9DaGlsZFByb2Nlc3Mu
Y3BwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5w
Ynhwcm9qIGIvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpp
bmRleCBiZTUzMzI1YTM1ZDQ3YjEwMWU5MmQ4MmEzNjg2YmJhY2E3YjI0NDY4Li4xYWIxMTBiMzJh
ZDE2YjNlODU3NTA4ZDg1NmM3M2M4OWZkZWM0ZDYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0
L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9XZWJLaXQvV2Vi
S2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTMwNjgsNiArMzA2OCw3IEBACiAJCTQx
RkJFODIzMjA2REE3OUMwMDBGMDc0MSAvKiBOZXR3b3JrQ29udGVudFJ1bGVMaXN0TWFuYWdlci5t
ZXNzYWdlcy5pbiAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0
OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQ7IHBhdGggPSBOZXR3b3JrQ29udGVudFJ1bGVMaXN0
TWFuYWdlci5tZXNzYWdlcy5pbjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDFGQkU4
MjQyMDZEQTc5QzAwMEYwNzQxIC8qIE5ldHdvcmtDb250ZW50UnVsZUxpc3RNYW5hZ2VyLmNwcCAq
LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G
aWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IE5ldHdvcmtDb250ZW50UnVsZUxp
c3RNYW5hZ2VyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDQ1MEFFQkYxREMz
RkFFNTAwOTk0M0YyIC8qIFNoYXJlZE1lbW9yeUNvY29hLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxl
UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv
ZGUuY3BwLmNwcDsgcGF0aCA9IFNoYXJlZE1lbW9yeUNvY29hLmNwcDsgc291cmNlVHJlZSA9ICI8
Z3JvdXA+IjsgfTsKKwkJNDRBNDgxQzYyMUYyRDI3QjAwRjJGOTE5IC8qIENsaWVudENlcnRpZmlj
YXRlQXV0aGVudGljYXRpb25YUENDb25zdGFudHMuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZl
cmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gQ2xp
ZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ0NvbnN0YW50cy5jcHA7IHNvdXJjZVRyZWUg
PSAiPGdyb3VwPiI7IH07CiAJCTQ2MEY0ODhEMUY5OTZGNkMwMENGNEI4NyAvKiBXZWJTV0NvbnRl
eHRNYW5hZ2VyQ29ubmVjdGlvbk1lc3NhZ2VSZWNlaXZlci5jcHAgKi8gPSB7aXNhID0gUEJYRmls
ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj
b2RlLmNwcC5jcHA7IG5hbWUgPSBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbk1lc3NhZ2VS
ZWNlaXZlci5jcHA7IHBhdGggPSBEZXJpdmVkU291cmNlcy9XZWJLaXQyL1dlYlNXQ29udGV4dE1h
bmFnZXJDb25uZWN0aW9uTWVzc2FnZVJlY2VpdmVyLmNwcDsgc291cmNlVHJlZSA9IEJVSUxUX1BS
T0RVQ1RTX0RJUjsgfTsKIAkJNDYwRjQ4OEUxRjk5NkY2QzAwQ0Y0Qjg3IC8qIFdlYlNXQ29udGV4
dE1hbmFnZXJDb25uZWN0aW9uTWVzc2FnZXMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl
OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBu
YW1lID0gV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb25NZXNzYWdlcy5oOyBwYXRoID0gRGVy
aXZlZFNvdXJjZXMvV2ViS2l0Mi9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbk1lc3NhZ2Vz
Lmg7IHNvdXJjZVRyZWUgPSBCVUlMVF9QUk9EVUNUU19ESVI7IH07CiAJCTQ2MjEwN0Q3MUYzOERC
RDMwMERENzgxMCAvKiBQaW5nTG9hZC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg
ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7
IHBhdGggPSBQaW5nTG9hZC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC02NzM1
LDYgKzY3MzYsNyBAQAogCQkJaXNhID0gUEJYR3JvdXA7CiAJCQljaGlsZHJlbiA9ICgKIAkJCQk1
N0I0QjQ1RDIwQjUwNEFCMDBENEFENzkgLyogQXV0aGVudGljYXRpb25NYW5hZ2VyQ29jb2EubW0g
Ki8sCisJCQkJNDRBNDgxQzYyMUYyRDI3QjAwRjJGOTE5IC8qIENsaWVudENlcnRpZmljYXRlQXV0
aGVudGljYXRpb25YUENDb25zdGFudHMuY3BwICovLAogCQkJCTU3QjRCNDVFMjBCNTA0QUIwMEQ0
QUQ3OSAvKiBDbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRzLmggKi8s
CiAJCQkpOwogCQkJcGF0aCA9IGNvY29hOwo=
</data>
<flag name="review"
          id="376366"
          type_id="1"
          status="+"
          setter="achristensen"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>359706</attachid>
            <date>2019-01-21 12:32:16 -0800</date>
            <delta_ts>2019-01-22 12:52:04 -0800</delta_ts>
            <desc>Patch v4 (for landing)</desc>
            <filename>bug-193607-20190121123215.patch</filename>
            <type>text/plain</type>
            <size>15180</size>
            <attacher name="David Kilzer (:ddkilzer)">ddkilzer</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwMjM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGI3NDI2N2JkNGQ0NGY5ODE0
YmU0N2ZiYjU5MjY1NWQzNWVjYzVlOGYuLmI3ZDJkYzhjZTczN2RiZTdhMjU1OTg3NmZkZGM4YThj
ZmQ3YmZlZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTktMDEtMTkgIERhdmlkIEtp
bHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICBDIHN0cmluZ3MgaW4gQ2xpZW50
Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ0NvbnN0YW50cy5oIGFyZSBkdXBsaWNhdGVkCisg
ICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xOTM2MDc+CisgICAgICAgIDxyZGFyOi8vcHJv
YmxlbS80NzMzNDYxMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICAqIFNoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2NvYS9BdXRoZW50aWNhdGlvbk1hbmFn
ZXJDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6QXV0aGVudGljYXRpb25NYW5hZ2VyOjppbml0
aWFsaXplQ29ubmVjdGlvbik6CisgICAgICAgICogVUlQcm9jZXNzL0F1dGhlbnRpY2F0aW9uL2Nv
Y29hL0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlUHJveHlDb2NvYS5tbToKKyAgICAgICAgKFdlYktp
dDo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2VQcm94eTo6c2VuZENsaWVudENlcnRpZmljYXRlQ3Jl
ZGVudGlhbE92ZXJYcGMpOgorICAgICAgICAtIFVwZGF0ZSBuYW1lIG9mIGNvbnN0YW50cy4KKwor
ICAgICAgICAqIFNoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2NvYS9DbGllbnRDZXJ0aWZpY2F0ZUF1
dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRzLmNwcDogQ29waWVkIGZyb20gU291cmNlL1dlYktpdC9T
aGFyZWQvQXV0aGVudGljYXRpb24vY29jb2EvQ2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlv
blhQQ0NvbnN0YW50cy5oLgorICAgICAgICAqIFNoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2NvYS9D
bGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRzLmg6CisgICAgICAgIC0g
UHV0IGNvbnN0YW50IHZhbHVlcyBpbiBhIG5hbWVzcGFjZSwgYW5kIG1vdmUgdmFsdWVzIHRvCisg
ICAgICAgICAgQ2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ0NvbnN0YW50cy5jcHAu
CisKKyAgICAgICAgKiBTb3VyY2VzQ29jb2EudHh0OgorICAgICAgICAqIFVuaWZpZWRTb3VyY2Vz
LWlucHV0LnhjZmlsZWxpc3Q6CisgICAgICAgICogV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBi
eHByb2o6CisgICAgICAgIC0gQWRkIENsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUEND
b25zdGFudHMuY3BwLgorCiAyMDE5LTAxLTE1ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNv
bT4KIAogICAgICAgICBVc2UgcmVmZXJlbmNlcyByYXRoZXIgdGhhbiBwb2ludGVycyBmb3IgcmVn
aXN0ZXIvdW5yZWdpc3RlciBmdW5jdGlvbnMsIGFuZCBtb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViS2l0L1NoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2NvYS9BdXRoZW50aWNhdGlvbk1hbmFnZXJD
b2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0F1dGhlbnRpY2F0aW9uL2NvY29hL0F1dGhl
bnRpY2F0aW9uTWFuYWdlckNvY29hLm1tCmluZGV4IGUzM2Y1MDg5MDYyMDNjMDE3OWJmYzM5MGRi
MDkyYmYwYjgxNjRkZDguLjFkYWRkNDQ3ZTgzNTMzYzJlNmEwYzRjMmYxMjc3NTlhM2Q3MzMwZWQg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0F1dGhlbnRpY2F0aW9uL2NvY29hL0F1
dGhlbnRpY2F0aW9uTWFuYWdlckNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0F1
dGhlbnRpY2F0aW9uL2NvY29hL0F1dGhlbnRpY2F0aW9uTWFuYWdlckNvY29hLm1tCkBAIC0xLDUg
KzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxOCBBcHBsZSBJbmMuIEFsbCByaWdodHMg
cmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTgtMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdo
dHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5k
IGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJt
aXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTU2LDE2ICs1
NiwxNiBAQCB2b2lkIEF1dGhlbnRpY2F0aW9uTWFuYWdlcjo6aW5pdGlhbGl6ZUNvbm5lY3Rpb24o
SVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uKQogICAgICAgICBpZiAodHlwZSA9PSBYUENfVFlQ
RV9FUlJPUiB8fCAhd2Vha1RoaXMpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgaWYg
KHR5cGUgIT0gWFBDX1RZUEVfRElDVElPTkFSWSB8fCBzdHJjbXAoeHBjX2RpY3Rpb25hcnlfZ2V0
X3N0cmluZyhldmVudCwgY2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ01lc3NhZ2VO
YW1lS2V5KSwgY2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ01lc3NhZ2VOYW1lVmFs
dWUpKSB7CisgICAgICAgIGlmICh0eXBlICE9IFhQQ19UWVBFX0RJQ1RJT05BUlkgfHwgc3RyY21w
KHhwY19kaWN0aW9uYXJ5X2dldF9zdHJpbmcoZXZlbnQsIENsaWVudENlcnRpZmljYXRlQXV0aGVu
dGljYXRpb246OlhQQ01lc3NhZ2VOYW1lS2V5KSwgQ2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNh
dGlvbjo6WFBDTWVzc2FnZU5hbWVWYWx1ZSkpIHsKICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVB
Q0hFRCgpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgYXV0byBj
aGFsbGVuZ2VJRCA9IHhwY19kaWN0aW9uYXJ5X2dldF91aW50NjQoZXZlbnQsIGNsaWVudENlcnRp
ZmljYXRlQXV0aGVudGljYXRpb25YUENDaGFsbGVuZ2VJREtleSk7CisgICAgICAgIGF1dG8gY2hh
bGxlbmdlSUQgPSB4cGNfZGljdGlvbmFyeV9nZXRfdWludDY0KGV2ZW50LCBDbGllbnRDZXJ0aWZp
Y2F0ZUF1dGhlbnRpY2F0aW9uOjpYUENDaGFsbGVuZ2VJREtleSk7CiAgICAgICAgIGlmICghY2hh
bGxlbmdlSUQpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgYXV0byB4cGNFbmRQb2lu
dCA9IHhwY19kaWN0aW9uYXJ5X2dldF92YWx1ZShldmVudCwgY2xpZW50Q2VydGlmaWNhdGVBdXRo
ZW50aWNhdGlvblhQQ1NlY0tleVByb3h5RW5kcG9pbnRLZXkpOworICAgICAgICBhdXRvIHhwY0Vu
ZFBvaW50ID0geHBjX2RpY3Rpb25hcnlfZ2V0X3ZhbHVlKGV2ZW50LCBDbGllbnRDZXJ0aWZpY2F0
ZUF1dGhlbnRpY2F0aW9uOjpYUENTZWNLZXlQcm94eUVuZHBvaW50S2V5KTsKICAgICAgICAgaWYg
KCF4cGNFbmRQb2ludCB8fCB4cGNfZ2V0X3R5cGUoeHBjRW5kUG9pbnQpICE9IFhQQ19UWVBFX0VO
RFBPSU5UKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBhdXRvIGVuZFBvaW50ID0gYWRv
cHROUyhbW05TWFBDTGlzdGVuZXJFbmRwb2ludCBhbGxvY10gaW5pdF0pOwpAQCAtNzcsNyArNzcs
NyBAQCB2b2lkIEF1dGhlbnRpY2F0aW9uTWFuYWdlcjo6aW5pdGlhbGl6ZUNvbm5lY3Rpb24oSVBD
OjpDb25uZWN0aW9uKiBjb25uZWN0aW9uKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9
CiAKLSAgICAgICAgYXV0byBjZXJ0aWZpY2F0ZURhdGFBcnJheSA9IHhwY19kaWN0aW9uYXJ5X2dl
dF9hcnJheShldmVudCwgY2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ0NlcnRpZmlj
YXRlc0tleSk7CisgICAgICAgIGF1dG8gY2VydGlmaWNhdGVEYXRhQXJyYXkgPSB4cGNfZGljdGlv
bmFyeV9nZXRfYXJyYXkoZXZlbnQsIENsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb246OlhQ
Q0NlcnRpZmljYXRlc0tleSk7CiAgICAgICAgIGlmICghY2VydGlmaWNhdGVEYXRhQXJyYXkpCiAg
ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIE5TTXV0YWJsZUFycmF5ICpjZXJ0aWZpY2F0ZXMg
PSBuaWw7CkBAIC05Myw3ICs5Myw3IEBAIHZvaWQgQXV0aGVudGljYXRpb25NYW5hZ2VyOjppbml0
aWFsaXplQ29ubmVjdGlvbihJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24pCiAgICAgICAgICAg
ICB9CiAgICAgICAgIH0KIAotICAgICAgICBhdXRvIHBlcnNpc3RlbmNlID0geHBjX2RpY3Rpb25h
cnlfZ2V0X3VpbnQ2NChldmVudCwgY2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ1Bl
cnNpc3RlbmNlS2V5KTsKKyAgICAgICAgYXV0byBwZXJzaXN0ZW5jZSA9IHhwY19kaWN0aW9uYXJ5
X2dldF91aW50NjQoZXZlbnQsIENsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb246OlhQQ1Bl
cnNpc3RlbmNlS2V5KTsKICAgICAgICAgaWYgKHBlcnNpc3RlbmNlID4gc3RhdGljX2Nhc3Q8dWlu
dDY0X3Q+KE5TVVJMQ3JlZGVudGlhbFBlcnNpc3RlbmNlU3luY2hyb25pemFibGUpKQogICAgICAg
ICAgICAgcmV0dXJuOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9BdXRoZW50
aWNhdGlvbi9jb2NvYS9DbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRz
LmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0F1dGhlbnRpY2F0aW9uL2NvY29hL0NsaWVudENl
cnRpZmljYXRlQXV0aGVudGljYXRpb25YUENDb25zdGFudHMuY3BwCm5ldyBmaWxlIG1vZGUgMTAw
NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjhkYzdi
ODI2YjUwNDA0NmQ2ZjczMzRlNGMzOTQ1MDNjNzNiYzJhMzQKLS0tIC9kZXYvbnVsbAorKysgYi9T
b3VyY2UvV2ViS2l0L1NoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2NvYS9DbGllbnRDZXJ0aWZpY2F0
ZUF1dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRzLmNwcApAQCAtMCwwICsxLDQ2IEBACisvKgorICog
Q29weXJpZ2h0IChDKSAyMDE4LTIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor
ICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs
IHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk
IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0
cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQK
KyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg
ZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJl
cHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBj
b25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1
bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJp
YnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBB
TkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBM
SUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElN
UExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFS
VElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQ
TEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1Qs
IElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFV
RU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVO
VCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEs
IE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VE
IEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1Qs
IFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVS
V0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRX
QVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFH
RS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiQ2xpZW50Q2VydGlmaWNh
dGVBdXRoZW50aWNhdGlvblhQQ0NvbnN0YW50cy5oIgorCisjaWYgSEFWRShTRUNfS0VZX1BST1hZ
KQorCituYW1lc3BhY2UgV2ViS2l0IHsKKworbmFtZXNwYWNlIENsaWVudENlcnRpZmljYXRlQXV0
aGVudGljYXRpb24geworCitjb25zdCBjaGFyKiBjb25zdCBYUENDZXJ0aWZpY2F0ZXNLZXkgPSAi
Y2VydGlmaWNhdGVzIjsKK2NvbnN0IGNoYXIqIGNvbnN0IFhQQ0NoYWxsZW5nZUlES2V5ID0gImNo
YWxsZW5nZS1pZCI7Citjb25zdCBjaGFyKiBjb25zdCBYUENNZXNzYWdlTmFtZUtleSA9ICJtZXNz
YWdlLW5hbWUiOworY29uc3QgY2hhciogY29uc3QgWFBDTWVzc2FnZU5hbWVWYWx1ZSA9ICJjbGll
bnQtY2VydGlmaWNhdGUtY3JlZGVudGlhbCI7Citjb25zdCBjaGFyKiBjb25zdCBYUENQZXJzaXN0
ZW5jZUtleSA9ICJwZXJzaXN0ZW5jZSI7Citjb25zdCBjaGFyKiBjb25zdCBYUENTZWNLZXlQcm94
eUVuZHBvaW50S2V5ID0gInNlYy1rZXktcHJveHktZW5kcG9pbnQiOworCit9IC8vIG5hbWVzcGFj
ZSBDbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uCisKK30gLy8gbmFtZXNwYWNlIFdlYktp
dAorCisjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0F1dGhlbnRpY2F0
aW9uL2NvY29hL0NsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUENDb25zdGFudHMuaCBi
L1NvdXJjZS9XZWJLaXQvU2hhcmVkL0F1dGhlbnRpY2F0aW9uL2NvY29hL0NsaWVudENlcnRpZmlj
YXRlQXV0aGVudGljYXRpb25YUENDb25zdGFudHMuaAppbmRleCBjODQzOTQ2ZDMyZGVmZTI4ZmVm
ZGUwZmE1NjYzNDhiODkzYjBhNGE1Li5mOGVkZmY4MTJmM2YwYTc1MGVlMWNiNTU3ZmMyNjUzNTli
NTYwYzdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9BdXRoZW50aWNhdGlvbi9j
b2NvYS9DbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRzLmgKKysrIGIv
U291cmNlL1dlYktpdC9TaGFyZWQvQXV0aGVudGljYXRpb24vY29jb2EvQ2xpZW50Q2VydGlmaWNh
dGVBdXRoZW50aWNhdGlvblhQQ0NvbnN0YW50cy5oCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENv
cHlyaWdodCAoQykgMjAxOCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5
cmlnaHQgKEMpIDIwMTgtMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgog
ICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0
aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhh
dCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTI5LDEyICsyOSwxNiBAQAogCiBuYW1lc3Bh
Y2UgV2ViS2l0IHsKIAotY29uc3QgY2hhciBjbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9u
WFBDTWVzc2FnZU5hbWVLZXlbXSA9ICJtZXNzYWdlLW5hbWUiOwotY29uc3QgY2hhciBjbGllbnRD
ZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDTWVzc2FnZU5hbWVWYWx1ZVtdID0gImNsaWVudC1j
ZXJ0aWZpY2F0ZS1jcmVkZW50aWFsIjsKLWNvbnN0IGNoYXIgY2xpZW50Q2VydGlmaWNhdGVBdXRo
ZW50aWNhdGlvblhQQ0NoYWxsZW5nZUlES2V5W10gPSAiY2hhbGxlbmdlLWlkIjsKLWNvbnN0IGNo
YXIgY2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ1NlY0tleVByb3h5RW5kcG9pbnRL
ZXlbXSA9ICJzZWMta2V5LXByb3h5LWVuZHBvaW50IjsKLWNvbnN0IGNoYXIgY2xpZW50Q2VydGlm
aWNhdGVBdXRoZW50aWNhdGlvblhQQ0NlcnRpZmljYXRlc0tleVtdID0gImNlcnRpZmljYXRlcyI7
Ci1jb25zdCBjaGFyIGNsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUENQZXJzaXN0ZW5j
ZUtleVtdID0gInBlcnNpc3RlbmNlIjsKK25hbWVzcGFjZSBDbGllbnRDZXJ0aWZpY2F0ZUF1dGhl
bnRpY2F0aW9uIHsKKworZXh0ZXJuIGNvbnN0IGNoYXIqIGNvbnN0IFhQQ0NlcnRpZmljYXRlc0tl
eTsKK2V4dGVybiBjb25zdCBjaGFyKiBjb25zdCBYUENDaGFsbGVuZ2VJREtleTsKK2V4dGVybiBj
b25zdCBjaGFyKiBjb25zdCBYUENNZXNzYWdlTmFtZUtleTsKK2V4dGVybiBjb25zdCBjaGFyKiBj
b25zdCBYUENNZXNzYWdlTmFtZVZhbHVlOworZXh0ZXJuIGNvbnN0IGNoYXIqIGNvbnN0IFhQQ1Bl
cnNpc3RlbmNlS2V5OworZXh0ZXJuIGNvbnN0IGNoYXIqIGNvbnN0IFhQQ1NlY0tleVByb3h5RW5k
cG9pbnRLZXk7CisKK30gLy8gbmFtZXNwYWNlIENsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRp
b24KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv
U291cmNlc0NvY29hLnR4dCBiL1NvdXJjZS9XZWJLaXQvU291cmNlc0NvY29hLnR4dAppbmRleCAx
NmU4OGYwYWIxZmYwYmM3ZDU3YjEzNzE4MmU2OTdkODY0ZjE5MzkxLi5hNmZlMDNhOGY2YTQyN2Jj
NjU5YmIwMjYzNTNkZDI4MGY5YWI5YzdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NvdXJj
ZXNDb2NvYS50eHQKKysrIGIvU291cmNlL1dlYktpdC9Tb3VyY2VzQ29jb2EudHh0CkBAIC0xMjMs
NiArMTIzLDcgQEAgU2hhcmVkL2NmL0Nvb2tpZVN0b3JhZ2VVdGlsc0NGLm1tCiBTaGFyZWQvY2cv
U2hhcmVhYmxlQml0bWFwQ0cuY3BwCiAKIFNoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2NvYS9BdXRo
ZW50aWNhdGlvbk1hbmFnZXJDb2NvYS5tbQorU2hhcmVkL0F1dGhlbnRpY2F0aW9uL2NvY29hL0Ns
aWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUENDb25zdGFudHMuY3BwCiAKIFNoYXJlZC9D
b2NvYS9BUElEYXRhQ29jb2EubW0KIFNoYXJlZC9Db2NvYS9BUElPYmplY3QubW0KZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dGhlbnRpY2F0aW9uL2NvY29hL0F1dGhlbnRp
Y2F0aW9uQ2hhbGxlbmdlUHJveHlDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1
dGhlbnRpY2F0aW9uL2NvY29hL0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlUHJveHlDb2NvYS5tbQpp
bmRleCA0OWJhMWJkYjlkMTNkOTNhZGE5NGNmMWQ1NTI0NDM1ZjUwMjJkNDhiLi5hZjBhNzYyNjgx
ZGE3M2Q0ZjljNWE4Y2MxMWU2YmYzYzdhM2E5NmQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0
L1VJUHJvY2Vzcy9BdXRoZW50aWNhdGlvbi9jb2NvYS9BdXRoZW50aWNhdGlvbkNoYWxsZW5nZVBy
b3h5Q29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0aGVudGljYXRpb24v
Y29jb2EvQXV0aGVudGljYXRpb25DaGFsbGVuZ2VQcm94eUNvY29hLm1tCkBAIC0xLDUgKzEsNSBA
QAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxOCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2
ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTgtMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVz
ZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy
eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQg
cHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTQxLDE2ICs0MSwxNiBA
QCB2b2lkIEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlUHJveHk6OnNlbmRDbGllbnRDZXJ0aWZpY2F0
ZUNyZWRlbnRpYWxPdmVyWHBjKElQQzo6QwogICAgIEFTU0VSVChzZWNLZXlQcm94eVN0b3JlLmlz
SW5pdGlhbGl6ZWQoKSk7CiAKICAgICBhdXRvIG1lc3NhZ2UgPSBhZG9wdE9TT2JqZWN0KHhwY19k
aWN0aW9uYXJ5X2NyZWF0ZShudWxscHRyLCBudWxscHRyLCAwKSk7Ci0gICAgeHBjX2RpY3Rpb25h
cnlfc2V0X3N0cmluZyhtZXNzYWdlLmdldCgpLCBjbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0
aW9uWFBDTWVzc2FnZU5hbWVLZXksIGNsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUENN
ZXNzYWdlTmFtZVZhbHVlKTsKLSAgICB4cGNfZGljdGlvbmFyeV9zZXRfdWludDY0KG1lc3NhZ2Uu
Z2V0KCksIGNsaWVudENlcnRpZmljYXRlQXV0aGVudGljYXRpb25YUENDaGFsbGVuZ2VJREtleSwg
Y2hhbGxlbmdlSUQpOwotICAgIHhwY19kaWN0aW9uYXJ5X3NldF92YWx1ZShtZXNzYWdlLmdldCgp
LCBjbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDU2VjS2V5UHJveHlFbmRwb2ludEtl
eSwgc2VjS2V5UHJveHlTdG9yZS5nZXQoKS5lbmRwb2ludC5fZW5kcG9pbnQpOworICAgIHhwY19k
aWN0aW9uYXJ5X3NldF9zdHJpbmcobWVzc2FnZS5nZXQoKSwgQ2xpZW50Q2VydGlmaWNhdGVBdXRo
ZW50aWNhdGlvbjo6WFBDTWVzc2FnZU5hbWVLZXksIENsaWVudENlcnRpZmljYXRlQXV0aGVudGlj
YXRpb246OlhQQ01lc3NhZ2VOYW1lVmFsdWUpOworICAgIHhwY19kaWN0aW9uYXJ5X3NldF91aW50
NjQobWVzc2FnZS5nZXQoKSwgQ2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvbjo6WFBDQ2hh
bGxlbmdlSURLZXksIGNoYWxsZW5nZUlEKTsKKyAgICB4cGNfZGljdGlvbmFyeV9zZXRfdmFsdWUo
bWVzc2FnZS5nZXQoKSwgQ2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvbjo6WFBDU2VjS2V5
UHJveHlFbmRwb2ludEtleSwgc2VjS2V5UHJveHlTdG9yZS5nZXQoKS5lbmRwb2ludC5fZW5kcG9p
bnQpOwogICAgIGF1dG8gY2VydGlmaWNhdGVEYXRhQXJyYXkgPSBhZG9wdE9TT2JqZWN0KHhwY19h
cnJheV9jcmVhdGUobnVsbHB0ciwgMCkpOwogICAgIGZvciAoaWQgY2VydGlmaWNhdGUgaW4gY3Jl
ZGVudGlhbC5uc0NyZWRlbnRpYWwoKS5jZXJ0aWZpY2F0ZXMpIHsKICAgICAgICAgYXV0byBkYXRh
ID0gYWRvcHRDRihTZWNDZXJ0aWZpY2F0ZUNvcHlEYXRhKChTZWNDZXJ0aWZpY2F0ZVJlZiljZXJ0
aWZpY2F0ZSkpOwogICAgICAgICB4cGNfYXJyYXlfYXBwZW5kX3ZhbHVlKGNlcnRpZmljYXRlRGF0
YUFycmF5LmdldCgpLCBhZG9wdE9TT2JqZWN0KHhwY19kYXRhX2NyZWF0ZShDRkRhdGFHZXRCeXRl
UHRyKGRhdGEuZ2V0KCkpLCBDRkRhdGFHZXRMZW5ndGgoZGF0YS5nZXQoKSkpKS5nZXQoKSk7CiAg
ICAgfQotICAgIHhwY19kaWN0aW9uYXJ5X3NldF92YWx1ZShtZXNzYWdlLmdldCgpLCBjbGllbnRD
ZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDQ2VydGlmaWNhdGVzS2V5LCBjZXJ0aWZpY2F0ZURh
dGFBcnJheS5nZXQoKSk7Ci0gICAgeHBjX2RpY3Rpb25hcnlfc2V0X3VpbnQ2NChtZXNzYWdlLmdl
dCgpLCBjbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0aW9uWFBDUGVyc2lzdGVuY2VLZXksIHN0
YXRpY19jYXN0PHVpbnQ2NF90PihjcmVkZW50aWFsLm5zQ3JlZGVudGlhbCgpLnBlcnNpc3RlbmNl
KSk7CisgICAgeHBjX2RpY3Rpb25hcnlfc2V0X3ZhbHVlKG1lc3NhZ2UuZ2V0KCksIENsaWVudENl
cnRpZmljYXRlQXV0aGVudGljYXRpb246OlhQQ0NlcnRpZmljYXRlc0tleSwgY2VydGlmaWNhdGVE
YXRhQXJyYXkuZ2V0KCkpOworICAgIHhwY19kaWN0aW9uYXJ5X3NldF91aW50NjQobWVzc2FnZS5n
ZXQoKSwgQ2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvbjo6WFBDUGVyc2lzdGVuY2VLZXks
IHN0YXRpY19jYXN0PHVpbnQ2NF90PihjcmVkZW50aWFsLm5zQ3JlZGVudGlhbCgpLnBlcnNpc3Rl
bmNlKSk7CiAKICAgICB4cGNfY29ubmVjdGlvbl9zZW5kX21lc3NhZ2UoY29ubmVjdGlvbi54cGND
b25uZWN0aW9uKCksIG1lc3NhZ2UuZ2V0KCkpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp
dC9VbmlmaWVkU291cmNlcy1pbnB1dC54Y2ZpbGVsaXN0IGIvU291cmNlL1dlYktpdC9VbmlmaWVk
U291cmNlcy1pbnB1dC54Y2ZpbGVsaXN0CmluZGV4IGU2YzdhMGM3YTI2NjBlMThhODJlM2MxNTI1
Yzg5MmQ3MDY4ODZmNTcuLjE1YjgwOTllNjlkYmZjZDI4Mzc3ODlkNmRiMGMxYjllZjMzNmUyMzUg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVW5pZmllZFNvdXJjZXMtaW5wdXQueGNmaWxlbGlz
dAorKysgYi9Tb3VyY2UvV2ViS2l0L1VuaWZpZWRTb3VyY2VzLWlucHV0LnhjZmlsZWxpc3QKQEAg
LTE3MCw2ICsxNzAsNyBAQCAkKFNSQ1JPT1QpL1NoYXJlZC9Bc3Npc3RlZE5vZGVJbmZvcm1hdGlv
bi5jcHAKICQoU1JDUk9PVCkvU2hhcmVkL0FzeW5jUmVxdWVzdC5jcHAKICQoU1JDUk9PVCkvU2hh
cmVkL0F1dGhlbnRpY2F0aW9uL0F1dGhlbnRpY2F0aW9uTWFuYWdlci5jcHAKICQoU1JDUk9PVCkv
U2hhcmVkL0F1dGhlbnRpY2F0aW9uL2NvY29hL0F1dGhlbnRpY2F0aW9uTWFuYWdlckNvY29hLm1t
CiskKFNSQ1JPT1QpL1NoYXJlZC9BdXRoZW50aWNhdGlvbi9jb2NvYS9DbGllbnRDZXJ0aWZpY2F0
ZUF1dGhlbnRpY2F0aW9uWFBDQ29uc3RhbnRzLmNwcAogJChTUkNST09UKS9TaGFyZWQvQmxvYkRh
dGFGaWxlUmVmZXJlbmNlV2l0aFNhbmRib3hFeHRlbnNpb24uY3BwCiAkKFNSQ1JPT1QpL1NoYXJl
ZC9DYWNoZU1vZGVsLmNwcAogJChTUkNST09UKS9TaGFyZWQvQ2hpbGRQcm9jZXNzLmNwcApkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBi
L1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggYmU1
MzMyNWEzNWQ0N2IxMDFlOTJkODJhMzY4NmJiYWNhN2IyNDQ2OC4uMWFiMTEwYjMyYWQxNmIzZTg1
NzUwOGQ4NTZjNzNjODlmZGVjNGQ2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJLaXQu
eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29k
ZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0zMDY4LDYgKzMwNjgsNyBAQAogCQk0MUZCRTgyMzIw
NkRBNzlDMDAwRjA3NDEgLyogTmV0d29ya0NvbnRlbnRSdWxlTGlzdE1hbmFnZXIubWVzc2FnZXMu
aW4gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu
b3duRmlsZVR5cGUgPSB0ZXh0OyBwYXRoID0gTmV0d29ya0NvbnRlbnRSdWxlTGlzdE1hbmFnZXIu
bWVzc2FnZXMuaW47IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQxRkJFODI0MjA2REE3
OUMwMDBGMDc0MSAvKiBOZXR3b3JrQ29udGVudFJ1bGVMaXN0TWFuYWdlci5jcHAgKi8gPSB7aXNh
ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg
PSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBOZXR3b3JrQ29udGVudFJ1bGVMaXN0TWFuYWdl
ci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQ0NTBBRUJGMURDM0ZBRTUwMDk5
NDNGMiAvKiBTaGFyZWRNZW1vcnlDb2NvYS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j
ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5j
cHA7IHBhdGggPSBTaGFyZWRNZW1vcnlDb2NvYS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7
IH07CisJCTQ0QTQ4MUM2MjFGMkQyN0IwMEYyRjkxOSAvKiBDbGllbnRDZXJ0aWZpY2F0ZUF1dGhl
bnRpY2F0aW9uWFBDQ29uc3RhbnRzLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBs
YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IENsaWVudENlcnRp
ZmljYXRlQXV0aGVudGljYXRpb25YUENDb25zdGFudHMuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91
cD4iOyB9OwogCQk0NjBGNDg4RDFGOTk2RjZDMDBDRjRCODcgLyogV2ViU1dDb250ZXh0TWFuYWdl
ckNvbm5lY3Rpb25NZXNzYWdlUmVjZWl2ZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu
Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAu
Y3BwOyBuYW1lID0gV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb25NZXNzYWdlUmVjZWl2ZXIu
Y3BwOyBwYXRoID0gRGVyaXZlZFNvdXJjZXMvV2ViS2l0Mi9XZWJTV0NvbnRleHRNYW5hZ2VyQ29u
bmVjdGlvbk1lc3NhZ2VSZWNlaXZlci5jcHA7IHNvdXJjZVRyZWUgPSBCVUlMVF9QUk9EVUNUU19E
SVI7IH07CiAJCTQ2MEY0ODhFMUY5OTZGNkMwMENGNEI4NyAvKiBXZWJTV0NvbnRleHRNYW5hZ2Vy
Q29ubmVjdGlvbk1lc3NhZ2VzLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu
Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgbmFtZSA9IFdl
YlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uTWVzc2FnZXMuaDsgcGF0aCA9IERlcml2ZWRTb3Vy
Y2VzL1dlYktpdDIvV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb25NZXNzYWdlcy5oOyBzb3Vy
Y2VUcmVlID0gQlVJTFRfUFJPRFVDVFNfRElSOyB9OwogCQk0NjIxMDdENzFGMzhEQkQzMDBERDc4
MTAgLyogUGluZ0xvYWQuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv
ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0g
UGluZ0xvYWQuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtNjczNSw2ICs2NzM2
LDcgQEAKIAkJCWlzYSA9IFBCWEdyb3VwOwogCQkJY2hpbGRyZW4gPSAoCiAJCQkJNTdCNEI0NUQy
MEI1MDRBQjAwRDRBRDc5IC8qIEF1dGhlbnRpY2F0aW9uTWFuYWdlckNvY29hLm1tICovLAorCQkJ
CTQ0QTQ4MUM2MjFGMkQyN0IwMEYyRjkxOSAvKiBDbGllbnRDZXJ0aWZpY2F0ZUF1dGhlbnRpY2F0
aW9uWFBDQ29uc3RhbnRzLmNwcCAqLywKIAkJCQk1N0I0QjQ1RTIwQjUwNEFCMDBENEFENzkgLyog
Q2xpZW50Q2VydGlmaWNhdGVBdXRoZW50aWNhdGlvblhQQ0NvbnN0YW50cy5oICovLAogCQkJKTsK
IAkJCXBhdGggPSBjb2NvYTsK
</data>

          </attachment>
      

    </bug>

</bugzilla>