<?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>146159</bug_id>
          
          <creation_ts>2015-06-19 13:29:05 -0700</creation_ts>
          <short_desc>Check for SHA1 certificates ignores subresources</short_desc>
          <delta_ts>2015-06-20 09:07:12 -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>WebKit2</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>PC</rep_platform>
          <op_sys>All</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          <see_also>https://bugs.webkit.org/show_bug.cgi?id=142461</see_also>
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Michael Catanzaro">mcatanzaro</reporter>
          <assigned_to name="Michael Catanzaro">mcatanzaro</assigned_to>
          <cc>commit-queue</cc>
    
    <cc>mcatanzaro</cc>
    
    <cc>mitz</cc>
    
    <cc>sam</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1103383</commentid>
    <comment_count>0</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-06-19 13:29:05 -0700</bug_when>
    <thetext>WebPageProxy::didCommitLoadForFrame decides whether to throw a security warning if the certificate chain includes a SHA1 certificate, but does so only for the main resource. Subresources are ignored. That&apos;s not good: the overall security of the page should be determined by the security of the least-secure subresource.

We should probably replace the second parameter to PageLoadState::didCommitLoad (which should only be called for the main resource) with a new PageLoadState member function for this.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1103391</commentid>
    <comment_count>1</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-06-19 13:40:46 -0700</bug_when>
    <thetext>No need for a new function; there is already PageLoadState::didDisplayOrRunInsecureContent.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1103404</commentid>
    <comment_count>2</comment_count>
      <attachid>255224</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-06-19 14:25:33 -0700</bug_when>
    <thetext>Created attachment 255224
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1103406</commentid>
    <comment_count>3</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-06-19 14:28:06 -0700</bug_when>
    <thetext>The patch is really simple so I think it is safe, but note that this is Mac-specific functionality and I don&apos;t have a Mac.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1103440</commentid>
    <comment_count>4</comment_count>
      <attachid>255224</attachid>
    <who name="">mitz</who>
    <bug_when>2015-06-19 15:27:31 -0700</bug_when>
    <thetext>Comment on attachment 255224
Patch

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

&gt; Source/WebKit2/UIProcess/WebPageProxy.cpp:-2947
&gt; -        m_pageLoadState.didCommitLoad(transaction, hasInsecureCertificateChain);

When hasInsecureCertificateChain was false, this was the code that would reset the hasInsecureContent flag in the page load state when navigating from an “insecure content” page to a “secure” page.

&gt; Source/WebKit2/UIProcess/WebPageProxy.cpp:2949
&gt; +        m_pageLoadState.didDisplayOrRunInsecureContent(transaction);

This is no substitute for that, because it only changes the state from “secure” to “insecure”.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1103513</commentid>
    <comment_count>5</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-06-19 17:32:32 -0700</bug_when>
    <thetext>Good catch, thanks! I was thinking that during the course of one load, we would never want to change the state from insecure to secure, but of course we need to do so for subsequent loads.

The easy fix to my patch is to reset the state to false in didCommitLoad, but that would be more fragile than the current code since the correctness would depend on the order the PageLoadState functions are called inside WebPageProxy::didCommitLoadForFrame. So we should keep the parameter and just rename it to something more accurate. It&apos;s hard to think of a good name though, so let&apos;s punt that to bug #146157.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1103541</commentid>
    <comment_count>6</comment_count>
      <attachid>255265</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-06-19 18:41:16 -0700</bug_when>
    <thetext>Created attachment 255265
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1103567</commentid>
    <comment_count>7</comment_count>
      <attachid>255265</attachid>
    <who name="">mitz</who>
    <bug_when>2015-06-19 20:02:16 -0700</bug_when>
    <thetext>Comment on attachment 255265
Patch

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

&gt; Source/WebKit2/UIProcess/WebPageProxy.cpp:2944
&gt; +    // The page is definitely insecure if true, but could still be insecure even if false.

I think I understand this comment, but I am not sure what motivates adding it here now. Doing so doesn’t seem to be directly related to fixing the bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1103611</commentid>
    <comment_count>8</comment_count>
      <attachid>255289</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-06-20 07:51:33 -0700</bug_when>
    <thetext>Created attachment 255289
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1103613</commentid>
    <comment_count>9</comment_count>
      <attachid>255289</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2015-06-20 07:58:03 -0700</bug_when>
    <thetext>Comment on attachment 255289
Patch

Thanks for the review. I&apos;ll just remove the comment.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1103628</commentid>
    <comment_count>10</comment_count>
      <attachid>255289</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2015-06-20 09:07:08 -0700</bug_when>
    <thetext>Comment on attachment 255289
Patch

Clearing flags on attachment: 255289

Committed r185795: &lt;http://trac.webkit.org/changeset/185795&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1103629</commentid>
    <comment_count>11</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2015-06-20 09:07:12 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>255224</attachid>
            <date>2015-06-19 14:25:33 -0700</date>
            <delta_ts>2015-06-19 18:41:12 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-146159-20150619162454.patch</filename>
            <type>text/plain</type>
            <size>3986</size>
            <attacher name="Michael Catanzaro">mcatanzaro</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NzYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWU1NmY5ZjBkMThiMmMw
OGE5M2Q2MjA5YmMyNGQwYTVkNDcwZmRlOS4uZmYyMWI2Y2I3ZDE2OTRjZDUwM2ZhM2NmYmQxM2Iy
NTIyNDQzNjdjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA2LTE5ICBNaWNo
YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KKworICAgICAgICBDaGVjayBm
b3IgU0hBMSBjZXJ0aWZpY2F0ZXMgaWdub3JlcyBzdWJyZXNvdXJjZXMKKyAgICAgICAgaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjE1OQorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL1BhZ2VMb2FkU3Rh
dGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlTG9hZFN0YXRlOjpkaWRDb21taXRMb2FkKTog
UmVtb3ZlIGhhc0luc2VjdXJlQ29udGVudCBwYXJhbWV0ZXIuIFRoaXMgaXMKKyAgICAgICAgcmVk
dW5kYW50IHdpdGggUGFnZUxvYWRTdGF0ZTo6ZGlkRGlzcGxheU9yUnVuSW5zZWN1cmVDb250ZW50
Rm9yRnJhbWUuCisgICAgICAgICogVUlQcm9jZXNzL1BhZ2VMb2FkU3RhdGUuaDogUmVtb3ZlIHRo
ZSB1bm5lZWRlZCBoYXNJbnNlY3VyZUNvbnRlbnQgcGFyYW1ldGVyLgorICAgICAgICAqIFVJUHJv
Y2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRp
ZENvbW1pdExvYWRGb3JGcmFtZSk6IEFsd2F5cyBjYWxsCisgICAgICAgIFBhZ2VMb2FkU3RhdGU6
OmRpZERpc3BsYXlPclJ1bkluc2VjdXJlQ29udGVudCBpZiBhIGNlcnRpZmljYXRlIGNoYWluIGNv
bnRhaW5zIGEgbm9uLXJvb3QKKyAgICAgICAgU0hBMSBjZXJ0aWZpY2F0ZS4KKwogMjAxNS0wNi0x
OCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBz
Y3JvbGxJbnRvVmlld0lmTmVlZGVkIGlzIG5vdCB3b3JraW5nIHdpdGggc2Nyb2xsLXNuYXAgcG9p
bnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5j
cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5jcHAKaW5kZXggNzMz
MmM4MzYzYTc5MTE3NDExOTBmZGJjZjg4YWRlYzJjNjZlNmJkMS4uYjllYWNlNjAyM2Q3ZTE1MmQ5
ZTFjY2M0OTkwNzY5Mjk4ZGY2MjU5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j
ZXNzL1BhZ2VMb2FkU3RhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdl
TG9hZFN0YXRlLmNwcApAQCAtMjY3LDEzICsyNjcsMTIgQEAgdm9pZCBQYWdlTG9hZFN0YXRlOjpk
aWRGYWlsUHJvdmlzaW9uYWxMb2FkKGNvbnN0IFRyYW5zYWN0aW9uOjpUb2tlbiYgdG9rZW4pCiAg
ICAgbV91bmNvbW1pdHRlZFN0YXRlLnVucmVhY2hhYmxlVVJMID0gbV9sYXN0VW5yZWFjaGFibGVV
Ukw7CiB9CiAKLXZvaWQgUGFnZUxvYWRTdGF0ZTo6ZGlkQ29tbWl0TG9hZChjb25zdCBUcmFuc2Fj
dGlvbjo6VG9rZW4mIHRva2VuLCBib29sIGhhc0luc2VjdXJlQ29udGVudCkKK3ZvaWQgUGFnZUxv
YWRTdGF0ZTo6ZGlkQ29tbWl0TG9hZChjb25zdCBUcmFuc2FjdGlvbjo6VG9rZW4mIHRva2VuKQog
ewogICAgIEFTU0VSVF9VTlVTRUQodG9rZW4sICZ0b2tlbi5tX3BhZ2VMb2FkU3RhdGUgPT0gdGhp
cyk7CiAgICAgQVNTRVJUKG1fdW5jb21taXR0ZWRTdGF0ZS5zdGF0ZSA9PSBTdGF0ZTo6UHJvdmlz
aW9uYWwpOwogCiAgICAgbV91bmNvbW1pdHRlZFN0YXRlLnN0YXRlID0gU3RhdGU6OkNvbW1pdHRl
ZDsKLSAgICBtX3VuY29tbWl0dGVkU3RhdGUuaGFzSW5zZWN1cmVDb250ZW50ID0gaGFzSW5zZWN1
cmVDb250ZW50OwogCiAgICAgbV91bmNvbW1pdHRlZFN0YXRlLnVybCA9IG1fdW5jb21taXR0ZWRT
dGF0ZS5wcm92aXNpb25hbFVSTDsKICAgICBtX3VuY29tbWl0dGVkU3RhdGUucHJvdmlzaW9uYWxV
UkwgPSBTdHJpbmcoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdl
TG9hZFN0YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5oCmlu
ZGV4IDI4ZTNiMWFhZmE5ZjI3M2M1YTQxYzA0MTRhNWQ1NzkxYTk3ZWY0ZWIuLjhiYmQ0ZWFiYzQ1
OWI0MzY5ZTJhYWJiYTAxNzA2ZDMzNWU0YzNiYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy
L1VJUHJvY2Vzcy9QYWdlTG9hZFN0YXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz
L1BhZ2VMb2FkU3RhdGUuaApAQCAtMTMxLDcgKzEzMSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRp
ZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZChjb25zdCBUcmFuc2FjdGlv
bjo6VG9rZW4mLCBjb25zdCBTdHJpbmcmIHVybCk7CiAgICAgdm9pZCBkaWRGYWlsUHJvdmlzaW9u
YWxMb2FkKGNvbnN0IFRyYW5zYWN0aW9uOjpUb2tlbiYpOwogCi0gICAgdm9pZCBkaWRDb21taXRM
b2FkKGNvbnN0IFRyYW5zYWN0aW9uOjpUb2tlbiYsIGJvb2wgaGFzSW5zZWN1cmVDb250ZW50KTsK
KyAgICB2b2lkIGRpZENvbW1pdExvYWQoY29uc3QgVHJhbnNhY3Rpb246OlRva2VuJik7CiAgICAg
dm9pZCBkaWRGaW5pc2hMb2FkKGNvbnN0IFRyYW5zYWN0aW9uOjpUb2tlbiYpOwogICAgIHZvaWQg
ZGlkRmFpbExvYWQoY29uc3QgVHJhbnNhY3Rpb246OlRva2VuJik7CiAKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIv
VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggMDkwY2EzZDUzOGJlM2U5ODRlYTIwNGE1
MDJkNjg4MzQ1ODZiNzRlZC4uZWYyNWEzNTNhMDY4NjU0YWI1ZjMwYWExNGEzMzM1Y2ExM2MxNTNi
NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAK
KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTI5NDIs
MTAgKzI5NDIsMTEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZENvbW1pdExvYWRGb3JGcmFtZSh1
aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQKIAogICAgIGF1dG8gdHJhbnNh
Y3Rpb24gPSBtX3BhZ2VMb2FkU3RhdGUudHJhbnNhY3Rpb24oKTsKIAotICAgIGlmIChmcmFtZS0+
aXNNYWluRnJhbWUoKSkgewotICAgICAgICBib29sIGhhc0luc2VjdXJlQ2VydGlmaWNhdGVDaGFp
biA9IG1fdHJlYXRzU0hBMUNlcnRpZmljYXRlc0FzSW5zZWN1cmUgJiYgY2VydGlmaWNhdGVJbmZv
LmNvbnRhaW5zTm9uUm9vdFNIQTFTaWduZWRDZXJ0aWZpY2F0ZSgpOwotICAgICAgICBtX3BhZ2VM
b2FkU3RhdGUuZGlkQ29tbWl0TG9hZCh0cmFuc2FjdGlvbiwgaGFzSW5zZWN1cmVDZXJ0aWZpY2F0
ZUNoYWluKTsKLSAgICB9CisgICAgaWYgKGZyYW1lLT5pc01haW5GcmFtZSgpKQorICAgICAgICBt
X3BhZ2VMb2FkU3RhdGUuZGlkQ29tbWl0TG9hZCh0cmFuc2FjdGlvbik7CisKKyAgICBpZiAobV90
cmVhdHNTSEExQ2VydGlmaWNhdGVzQXNJbnNlY3VyZSAmJiBjZXJ0aWZpY2F0ZUluZm8uY29udGFp
bnNOb25Sb290U0hBMVNpZ25lZENlcnRpZmljYXRlKCkpCisgICAgICAgIG1fcGFnZUxvYWRTdGF0
ZS5kaWREaXNwbGF5T3JSdW5JbnNlY3VyZUNvbnRlbnQodHJhbnNhY3Rpb24pOwogCiAjaWYgVVNF
KEFQUEtJVCkKICAgICAvLyBGSVhNRSAoYnVnIDU5MTExKTogZGlkQ29tbWl0TG9hZEZvckZyYW1l
IGNvbWVzIHRvbyBsYXRlIHdoZW4gcmVzdG9yaW5nIGEgcGFnZSBmcm9tIGIvZiBjYWNoZSwgbWFr
aW5nIHVzIGRpc2FibGUgc2VjdXJlIGV2ZW50IG1vZGUgaW4gcGFzc3dvcmQgZmllbGRzLgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>255265</attachid>
            <date>2015-06-19 18:41:16 -0700</date>
            <delta_ts>2015-06-20 07:51:29 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-146159-20150619204037.patch</filename>
            <type>text/plain</type>
            <size>2229</size>
            <attacher name="Michael Catanzaro">mcatanzaro</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1Nzg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGVkM2MzMjYxNzc2MmZi
OWJhMGFiM2FjNjJmOTdmNTE3OTc2NjZkMi4uZDVkY2M1NzNjYjJhMmVmNTRlYjg0ODY2OGM1MzI1
ZjEwYzdkZGFjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE1LTA2LTE5ICBNaWNo
YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KKworICAgICAgICBDaGVjayBm
b3IgU0hBMSBjZXJ0aWZpY2F0ZXMgaWdub3JlcyBzdWJyZXNvdXJjZXMKKyAgICAgICAgaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjE1OQorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94
eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZy
YW1lKTogQ2FsbAorICAgICAgICBQYWdlTG9hZFN0YXRlOjpkaWREaXNwbGF5T3JSdW5JbnNlY3Vy
ZUNvbnRlbnQgaWYgYSBjZXJ0aWZpY2F0ZSBjaGFpbiBjb250YWlucyBhIG5vbi1yb290CisgICAg
ICAgIFNIQTEgY2VydGlmaWNhdGUgd2hlbiB0aGUgZnJhbWUgaXMgbm90IHRoZSBtYWluIGZyYW1l
LgorCiAyMDE1LTA2LTE4ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+
CiAKICAgICAgICAgUkVHUkVTU0lPTihyMTg1NDc1KTogW01hY10gQVNTRVJUKCkgd2hlbiBjbGlj
a2luZyBvbiB0ZXh0IHVzaW5nIHdlYiBmb250cyB3aXRoIGZvcmNlIHRvdWNoIHRyYWNrcGFkCmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1Nv
dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDA5MGNhM2Q1Mzhi
ZTNlOTg0ZWEyMDRhNTAyZDY4ODM0NTg2Yjc0ZWQuLmVmY2U3ZjJiZDI1YjViZmQ5NTQ5MzgzYjY5
MjU2NTQyY2E3MWVjZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ
YWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku
Y3BwCkBAIC0yOTQxLDExICsyOTQxLDEyIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDb21taXRM
b2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklECiAjZW5k
aWYKIAogICAgIGF1dG8gdHJhbnNhY3Rpb24gPSBtX3BhZ2VMb2FkU3RhdGUudHJhbnNhY3Rpb24o
KTsKLQotICAgIGlmIChmcmFtZS0+aXNNYWluRnJhbWUoKSkgewotICAgICAgICBib29sIGhhc0lu
c2VjdXJlQ2VydGlmaWNhdGVDaGFpbiA9IG1fdHJlYXRzU0hBMUNlcnRpZmljYXRlc0FzSW5zZWN1
cmUgJiYgY2VydGlmaWNhdGVJbmZvLmNvbnRhaW5zTm9uUm9vdFNIQTFTaWduZWRDZXJ0aWZpY2F0
ZSgpOwotICAgICAgICBtX3BhZ2VMb2FkU3RhdGUuZGlkQ29tbWl0TG9hZCh0cmFuc2FjdGlvbiwg
aGFzSW5zZWN1cmVDZXJ0aWZpY2F0ZUNoYWluKTsKLSAgICB9CisgICAgLy8gVGhlIHBhZ2UgaXMg
ZGVmaW5pdGVseSBpbnNlY3VyZSBpZiB0cnVlLCBidXQgY291bGQgc3RpbGwgYmUgaW5zZWN1cmUg
ZXZlbiBpZiBmYWxzZS4KKyAgICBib29sIG1hcmtQYWdlSW5zZWN1cmUgPSBtX3RyZWF0c1NIQTFD
ZXJ0aWZpY2F0ZXNBc0luc2VjdXJlICYmIGNlcnRpZmljYXRlSW5mby5jb250YWluc05vblJvb3RT
SEExU2lnbmVkQ2VydGlmaWNhdGUoKTsKKyAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkpCisg
ICAgICAgIG1fcGFnZUxvYWRTdGF0ZS5kaWRDb21taXRMb2FkKHRyYW5zYWN0aW9uLCBtYXJrUGFn
ZUluc2VjdXJlKTsKKyAgICBlbHNlIGlmIChtYXJrUGFnZUluc2VjdXJlKQorICAgICAgICBtX3Bh
Z2VMb2FkU3RhdGUuZGlkRGlzcGxheU9yUnVuSW5zZWN1cmVDb250ZW50KHRyYW5zYWN0aW9uKTsK
IAogI2lmIFVTRShBUFBLSVQpCiAgICAgLy8gRklYTUUgKGJ1ZyA1OTExMSk6IGRpZENvbW1pdExv
YWRGb3JGcmFtZSBjb21lcyB0b28gbGF0ZSB3aGVuIHJlc3RvcmluZyBhIHBhZ2UgZnJvbSBiL2Yg
Y2FjaGUsIG1ha2luZyB1cyBkaXNhYmxlIHNlY3VyZSBldmVudCBtb2RlIGluIHBhc3N3b3JkIGZp
ZWxkcy4K
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>255289</attachid>
            <date>2015-06-20 07:51:33 -0700</date>
            <delta_ts>2015-06-20 09:07:08 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-146159-20150620095054.patch</filename>
            <type>text/plain</type>
            <size>2100</size>
            <attacher name="Michael Catanzaro">mcatanzaro</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NzkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOTdjNWIwZDJjZWI1MDAy
NGVkODQ0NzRjYTFiZGNiMWVjYjkyNGIwMy4uMGM3ZTIwNzRiYTMwMjg2YjE2ZjE1NmU1M2U1YmRh
Y2ZlYTE2OWE5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE1LTA2LTIwICBNaWNo
YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KKworICAgICAgICBDaGVjayBm
b3IgU0hBMSBjZXJ0aWZpY2F0ZXMgaWdub3JlcyBzdWJyZXNvdXJjZXMKKyAgICAgICAgaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjE1OQorCisgICAgICAgIFJldmll
d2VkIGJ5IERhbiBCZXJuc3RlaW4uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5
LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRDb21taXRMb2FkRm9yRnJh
bWUpOiBDYWxsCisgICAgICAgIFBhZ2VMb2FkU3RhdGU6OmRpZERpc3BsYXlPclJ1bkluc2VjdXJl
Q29udGVudCBpZiBhIGNlcnRpZmljYXRlIGNoYWluIGNvbnRhaW5zIGEgbm9uLXJvb3QKKyAgICAg
ICAgU0hBMSBjZXJ0aWZpY2F0ZSB3aGVuIHRoZSBmcmFtZSBpcyBub3QgdGhlIG1haW4gZnJhbWUu
CisKIDIwMTUtMDYtMjAgIFJ5dWFuIENob2kgIDxyeXVhbi5jaG9pQG5hdmVyY29ycC5jb20+CiAK
ICAgICAgICAgW0VGTF0gRG8gbm90IGNvbnNpZGVyIHRlc3QgZGlyZWN0b3JpZXMgd2hlbiBERVZF
TE9QRVJfTU9ERSBpcyBPRkYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X
ZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j
cHAKaW5kZXggMDkwY2EzZDUzOGJlM2U5ODRlYTIwNGE1MDJkNjg4MzQ1ODZiNzRlZC4uNzhiMDE0
NDExN2U0MTNkOTg4YTMxN2YwNmUyZmEzYmI0NjM1OGUwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ
cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTI5NDEsMTEgKzI5NDEsMTEgQEAgdm9pZCBXZWJQ
YWdlUHJveHk6OmRpZENvbW1pdExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRf
dCBuYXZpZ2F0aW9uSUQKICNlbmRpZgogCiAgICAgYXV0byB0cmFuc2FjdGlvbiA9IG1fcGFnZUxv
YWRTdGF0ZS50cmFuc2FjdGlvbigpOwotCi0gICAgaWYgKGZyYW1lLT5pc01haW5GcmFtZSgpKSB7
Ci0gICAgICAgIGJvb2wgaGFzSW5zZWN1cmVDZXJ0aWZpY2F0ZUNoYWluID0gbV90cmVhdHNTSEEx
Q2VydGlmaWNhdGVzQXNJbnNlY3VyZSAmJiBjZXJ0aWZpY2F0ZUluZm8uY29udGFpbnNOb25Sb290
U0hBMVNpZ25lZENlcnRpZmljYXRlKCk7Ci0gICAgICAgIG1fcGFnZUxvYWRTdGF0ZS5kaWRDb21t
aXRMb2FkKHRyYW5zYWN0aW9uLCBoYXNJbnNlY3VyZUNlcnRpZmljYXRlQ2hhaW4pOwotICAgIH0K
KyAgICBib29sIG1hcmtQYWdlSW5zZWN1cmUgPSBtX3RyZWF0c1NIQTFDZXJ0aWZpY2F0ZXNBc0lu
c2VjdXJlICYmIGNlcnRpZmljYXRlSW5mby5jb250YWluc05vblJvb3RTSEExU2lnbmVkQ2VydGlm
aWNhdGUoKTsKKyAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkpCisgICAgICAgIG1fcGFnZUxv
YWRTdGF0ZS5kaWRDb21taXRMb2FkKHRyYW5zYWN0aW9uLCBtYXJrUGFnZUluc2VjdXJlKTsKKyAg
ICBlbHNlIGlmIChtYXJrUGFnZUluc2VjdXJlKQorICAgICAgICBtX3BhZ2VMb2FkU3RhdGUuZGlk
RGlzcGxheU9yUnVuSW5zZWN1cmVDb250ZW50KHRyYW5zYWN0aW9uKTsKIAogI2lmIFVTRShBUFBL
SVQpCiAgICAgLy8gRklYTUUgKGJ1ZyA1OTExMSk6IGRpZENvbW1pdExvYWRGb3JGcmFtZSBjb21l
cyB0b28gbGF0ZSB3aGVuIHJlc3RvcmluZyBhIHBhZ2UgZnJvbSBiL2YgY2FjaGUsIG1ha2luZyB1
cyBkaXNhYmxlIHNlY3VyZSBldmVudCBtb2RlIGluIHBhc3N3b3JkIGZpZWxkcy4K
</data>

          </attachment>
      

    </bug>

</bugzilla>