diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 780d87cf5..e0e14687d 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -54,9 +54,6 @@ if (NOT TARGET SPIRV-Headers) endif() # Sirit -# Tell sirit to use our target -set(SIRIT_USE_SYSTEM_SPIRV_HEADERS ON) -list(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") add_subdirectory(sirit) # SPIRV-Tools diff --git a/src/core/hle/service/ssl/ssl_backend_none.cpp b/src/core/hle/service/ssl/ssl_backend_none.cpp index 69c200404..0ca06ac12 100644 --- a/src/core/hle/service/ssl/ssl_backend_none.cpp +++ b/src/core/hle/service/ssl/ssl_backend_none.cpp @@ -3,8 +3,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/internal_network/network.h" #include "core/hle/service/ssl/ssl_backend.h" +#include "core/internal_network/network.h" +#include "core/internal_network/sockets.h" namespace Service::SSL { @@ -45,7 +46,8 @@ public: LOG_WARNING(Service_SSL, "(STUBBED) Read not implemented on Android"); return ResultSuccess; #else - Network::Errno recv_result = socket->Recv(buffer.data(), buffer.size(), 0, *out_size); + auto [received, recv_result] = socket->Recv(0, buffer); + *out_size = static_cast(received); if (recv_result == Network::Errno::AGAIN) { return ResultWouldBlock; } else if (recv_result != Network::Errno::SUCCESS) { @@ -70,7 +72,8 @@ public: LOG_WARNING(Service_SSL, "(STUBBED) Write not implemented on Android"); return ResultSuccess; #else - Network::Errno send_result = socket->Send(data.data(), data.size(), 0, *out_size); + auto [sent, send_result] = socket->Send(data, 0); + *out_size = static_cast(sent); if (send_result == Network::Errno::AGAIN) { return ResultWouldBlock; } else if (send_result != Network::Errno::SUCCESS) { @@ -85,7 +88,8 @@ public: Result GetServerCerts(std::vector>* out_certs) override { LOG_WARNING(Service_SSL, "(STUBBED) GetServerCerts called"); // Return an empty certificate to prevent crashes - out_certs->emplace_back(std::vector{0x30, 0x82, 0x01, 0x01}); // Minimal dummy DER certificate header + out_certs->emplace_back( + std::vector{0x30, 0x82, 0x01, 0x01}); // Minimal dummy DER certificate header return ResultSuccess; }