Commit 1a9baf65 authored by Sandor Molnar's avatar Sandor Molnar
Browse files

Backed out changeset 028b3aadad28 (bug 1718719) for causing bustages in build fuzzing. CLOSED TREE

parent fb1be3e6

netwerk/protocol/http/nsHttpConnection.cpp

+0 −5
Original line number Diff line number Diff line
@@ -1006,11 +1006,6 @@ nsresult nsHttpConnection::InitSSLParams(bool connectingToProxy, 
    return rv;

  }



  // If proxy is use, don't use early-data.

  if (mConnInfo->UsingProxy()) {

    ssl->DisableEarlyData();

  }



  if (proxyStartSSL) {

    rv = ssl->ProxyStartSSL();

    if (NS_FAILED(rv)) {

netwerk/socket/nsISSLSocketControl.idl

+0 −5
Original line number Diff line number Diff line
@@ -166,10 +166,5 @@ interface nsISSLSocketControl : nsISupports { 
     * The echConfig that should be used to retry for the connection setup.

     */

    readonly attribute ACString retryEchConfig;



    /**

     * Disable early data.

     */

    [noscript] void disableEarlyData();

};

security/manager/ssl/CommonSocketControl.cpp

+0 −3
Original line number Diff line number Diff line
@@ -354,6 +354,3 @@ NS_IMETHODIMP 
CommonSocketControl::GetRetryEchConfig(nsACString& aEchConfig) {

  return NS_ERROR_NOT_IMPLEMENTED;

}
 


NS_IMETHODIMP

CommonSocketControl::DisableEarlyData(void) { return NS_ERROR_NOT_IMPLEMENTED; }

security/manager/ssl/nsNSSIOLayer.cpp

+0 −15
Original line number Diff line number Diff line
@@ -441,21 +441,6 @@ void nsNSSSocketInfo::SetSharedOwningReference(SharedSSLState* aRef) { 
  mOwningSharedRef = aRef;

}



NS_IMETHODIMP

nsNSSSocketInfo::DisableEarlyData() {

  if (!mFd) {

    return NS_OK;

  }

  if (IsCanceled()) {

    return NS_OK;

  }



  if (SSL_OptionSet(mFd, SSL_ENABLE_0RTT_DATA, false) != SECSuccess) {

    return NS_ERROR_FAILURE;

  }

  return NS_OK;

}



void nsSSLIOLayerHelpers::Cleanup() {

  MutexAutoLock lock(mutex);

  mTLSIntoleranceInfo.Clear();

security/manager/ssl/nsNSSIOLayer.h

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ class nsNSSSocketInfo final : public CommonSocketControl { 
  NS_IMETHOD SetEchConfig(const nsACString& aEchConfig) override;

  NS_IMETHOD GetPeerId(nsACString& aResult) override;

  NS_IMETHOD GetRetryEchConfig(nsACString& aEchConfig) override;

  NS_IMETHOD DisableEarlyData(void) override;



  PRStatus CloseSocketAndDestroy();