[tor-bugs] #13788 [Tor Browser]: Meek bridges don't work in TB 4.5alpha1

[Tor Bug Tracker & Wiki]

#13788: Meek bridges don't work in TB 4.5alpha1
-----------------------------+-----------------------------------
     Reporter:  cypherpunks  |      Owner:  tbb-team
         Type:  defect       |     Status:  needs_review
     Priority:  normal       |  Milestone:
    Component:  Tor Browser  |    Version:
   Resolution:               |   Keywords:  TorBrowserTeam201501R
Actual Points:               |  Parent ID:
       Points:               |
-----------------------------+-----------------------------------

Comment (by dcf):

 Replying to [comment:20 arthuredelstein]:
 > I'm posting a patch that fixes the meek problem, and also includes the
 simplification of the SOCKs patch given in my previous attachment.

 I compared attachment:0001-fixup-Bug-3455.2.-Allow-RFC1929-authentication-
 usern.patch and attachment:0001-fixup-Bug-3455.2.-Allow-RFC1929
 -authentication-usern.2.patch. I guess the important change (wrt this
 ticket) is the last one, from `proxy != NULL` to `!proxyHost.IsEmpty()`?
 {{{
   {
     nsNSSShutDownPreventionLock locker;
  -  if (forSTARTTLS || haveProxy) {
 -+  if (forSTARTTLS || proxy) {
 ++  nsCString proxyHost;
 ++  if (proxy) {
 ++    proxy->GetHost(proxyHost);
 ++  }
 ++  if (forSTARTTLS || !proxyHost.IsEmpty()) {
       if (SECSuccess != SSL_OptionSet(fd, SSL_SECURITY, false)) {
         return NS_ERROR_FAILURE;
       }
 }}}
 {{{
 +   nsresult rv;
 +   PRStatus stat;
 +
 ++  nsCString proxyHost;
 ++  if (proxy) {
 ++    proxy->GetHost(proxyHost);
 ++  }
 ++
 +   SharedSSLState* sharedState =
 +     providerFlags & nsISocketProvider::NO_PERMANENT_STORAGE ?
 PrivateSSLState() : PublicSSLState();
 +   nsNSSSocketInfo* infoObject = new nsNSSSocketInfo(*sharedState,
 providerFlags);
 }}}
 {{{
     // We are going use a clear connection first //
  -  if (forSTARTTLS || haveProxy) {
 -+  if (forSTARTTLS || proxy) {
 ++  if (forSTARTTLS || !proxyHost.IsEmpty()) {
       infoObject->SetHandshakeNotPending();
     }
 }}}

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/13788#comment:23>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online