diff --git a/WORKSPACE b/WORKSPACE index 367c8fa1c88..618b21547e0 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -30,7 +30,7 @@ bind( ) # When updating envoy sha manually please update the sha in istio.deps file also -ENVOY_SHA = "73bd3d95cd0b6a23de0b6357f1b3065b9014651a" +ENVOY_SHA = "c1cc68dda009452e90d485da22ee9c74c08b328d" http_archive( name = "envoy", diff --git a/istio.deps b/istio.deps index e4d5ea71c25..71d8dc56648 100644 --- a/istio.deps +++ b/istio.deps @@ -11,6 +11,6 @@ "name": "ENVOY_SHA", "repoName": "envoyproxy/envoy", "file": "WORKSPACE", - "lastStableSHA": "73bd3d95cd0b6a23de0b6357f1b3065b9014651a" + "lastStableSHA": "c1cc68dda009452e90d485da22ee9c74c08b328d" } ] diff --git a/src/envoy/alts/tsi_transport_socket.h b/src/envoy/alts/tsi_transport_socket.h index cd26b60d3b3..629cb6f9e5b 100644 --- a/src/envoy/alts/tsi_transport_socket.h +++ b/src/envoy/alts/tsi_transport_socket.h @@ -57,7 +57,6 @@ class TsiSocket : public Network::TransportSocket, Envoy::Network::TransportSocketCallbacks& callbacks) override; std::string protocol() const override; bool canFlushClose() override { return handshake_complete_; } - Envoy::Ssl::Connection* ssl() override { return nullptr; } const Envoy::Ssl::Connection* ssl() const override { return nullptr; } Network::IoResult doWrite(Buffer::Instance& buffer, bool end_stream) override; void closeSocket(Network::ConnectionEvent event) override;