tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Create SslStream from SslCtx.

Browse Source
This commit is contained in:
levlam 2022-11-11 14:51:22 +03:00
parent 28d1dd02e9
commit e8b8f3eb88
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tdnet/td/net/SslStream.cpp
View File

@ -135,13 +135,13 @@ using SslHandle = std::unique_ptr<SSL, SslHandleDeleter>;
class SslStreamImpl { class SslStreamImpl {
public: public:
Status init(CSlice host, CSlice cert_file, SslCtx::VerifyPeer verify_peer, bool check_ip_address_as_host) { Status init(CSlice host, SslCtx ssl_ctx, bool check_ip_address_as_host) {
SslCtx::init_openssl(); if (!ssl_ctx) {
return Status::Error("Invalid SSL context provided");
}
clear_openssl_errors("Before SslFd::init"); clear_openssl_errors("Before SslFd::init");
TRY_RESULT(ssl_ctx, SslCtx::create(cert_file, verify_peer));
auto ssl_handle = SslHandle(SSL_new(static_cast<SSL_CTX *>(ssl_ctx.get_openssl_ctx()))); auto ssl_handle = SslHandle(SSL_new(static_cast<SSL_CTX *>(ssl_ctx.get_openssl_ctx())));
if (!ssl_handle) { if (!ssl_handle) {
return create_openssl_error(-13, "Failed to create an SSL handle"); return create_openssl_error(-13, "Failed to create an SSL handle");
@ -356,10 +356,9 @@ SslStream::SslStream(SslStream &&) noexcept = default;
SslStream &SslStream::operator=(SslStream &&) noexcept = default; SslStream &SslStream::operator=(SslStream &&) noexcept = default;
SslStream::~SslStream() = default; SslStream::~SslStream() = default;
Result<SslStream> SslStream::create(CSlice host, CSlice cert_file, SslCtx::VerifyPeer verify_peer, Result<SslStream> SslStream::create(CSlice host, SslCtx ssl_ctx, bool use_ip_address_as_host) {
bool use_ip_address_as_host) {
auto impl = make_unique<detail::SslStreamImpl>(); auto impl = make_unique<detail::SslStreamImpl>();
TRY_STATUS(impl->init(host, cert_file, verify_peer, use_ip_address_as_host)); TRY_STATUS(impl->init(host, ssl_ctx, use_ip_address_as_host));
return SslStream(std::move(impl)); return SslStream(std::move(impl));
} }
SslStream::SslStream(unique_ptr<detail::SslStreamImpl> impl) : impl_(std::move(impl)) { SslStream::SslStream(unique_ptr<detail::SslStreamImpl> impl) : impl_(std::move(impl)) {
@ -392,8 +391,7 @@ SslStream::SslStream(SslStream &&) noexcept = default;
SslStream &SslStream::operator=(SslStream &&) noexcept = default; SslStream &SslStream::operator=(SslStream &&) noexcept = default;
SslStream::~SslStream() = default; SslStream::~SslStream() = default;
Result<SslStream> SslStream::create(CSlice host, CSlice cert_file, SslCtx::VerifyPeer verify_peer, Result<SslStream> SslStream::create(CSlice host, SslCtx ssl_ctx, bool check_ip_address_as_host) {
bool check_ip_address_as_host) {
return Status::Error("Not supported in Emscripten"); return Status::Error("Not supported in Emscripten");
} }

4
tdnet/td/net/SslStream.h
View File

@ -25,9 +25,7 @@ class SslStream {
SslStream &operator=(SslStream &&) noexcept; SslStream &operator=(SslStream &&) noexcept;
~SslStream(); ~SslStream();
static Result<SslStream> create(CSlice host, CSlice cert_file = CSlice(), static Result<SslStream> create(CSlice host, SslCtx ssl_ctx, bool use_ip_address_as_host = false);
SslCtx::VerifyPeer verify_peer = SslCtx::VerifyPeer::On,
bool use_ip_address_as_host = false);
ByteFlowInterface &read_byte_flow(); ByteFlowInterface &read_byte_flow();
ByteFlowInterface &write_byte_flow(); ByteFlowInterface &write_byte_flow();

3
tdnet/td/net/Wget.cpp
View File

@ -84,7 +84,8 @@ Status Wget::try_init() {
std::numeric_limits<std::size_t>::max(), 0, 0, std::numeric_limits<std::size_t>::max(), 0, 0,
ActorOwn<HttpOutboundConnection::Callback>(actor_id(this))); ActorOwn<HttpOutboundConnection::Callback>(actor_id(this)));
} else { } else {
TRY_RESULT(ssl_stream, SslStream::create(url.host_, CSlice() /* certificate */, verify_peer_)); TRY_RESULT(ssl_ctx, SslCtx::create(CSlice() /* certificate */, verify_peer_));
TRY_RESULT(ssl_stream, SslStream::create(url.host_, std::move(ssl_ctx)));
connection_ = create_actor<HttpOutboundConnection>( connection_ = create_actor<HttpOutboundConnection>(
"Connect", BufferedFd<SocketFd>(std::move(fd)), std::move(ssl_stream), std::numeric_limits<std::size_t>::max(), "Connect", BufferedFd<SocketFd>(std::move(fd)), std::move(ssl_stream), std::numeric_limits<std::size_t>::max(),
0, 0, ActorOwn<HttpOutboundConnection::Callback>(actor_id(this))); 0, 0, ActorOwn<HttpOutboundConnection::Callback>(actor_id(this)));