diff --git a/td/telegram/ConfigManager.cpp b/td/telegram/ConfigManager.cpp index 1965da0aa..7fad9ec45 100644 --- a/td/telegram/ConfigManager.cpp +++ b/td/telegram/ConfigManager.cpp @@ -447,7 +447,7 @@ static ActorOwn<> get_full_config(DcOption option, Promise &public_rsa_key() final { + const std::shared_ptr &public_rsa_key() final { return public_rsa_key_; } mtproto::AuthKey get_auth_key() final { @@ -492,7 +492,7 @@ static ActorOwn<> get_full_config(DcOption option, Promise public_rsa_key_ = + std::shared_ptr public_rsa_key_ = std::make_shared(DcId::empty(), G()->is_test_dc()); std::vector> auth_key_listeners_; diff --git a/td/telegram/net/AuthDataShared.cpp b/td/telegram/net/AuthDataShared.cpp index e7a42e884..98e99bae6 100644 --- a/td/telegram/net/AuthDataShared.cpp +++ b/td/telegram/net/AuthDataShared.cpp @@ -21,7 +21,8 @@ namespace td { class AuthDataSharedImpl final : public AuthDataShared { public: - AuthDataSharedImpl(DcId dc_id, std::shared_ptr public_rsa_key, std::shared_ptr guard) + AuthDataSharedImpl(DcId dc_id, std::shared_ptr public_rsa_key, + std::shared_ptr guard) : dc_id_(dc_id), public_rsa_key_(std::move(public_rsa_key)), guard_(std::move(guard)) { log_auth_key(get_auth_key()); } @@ -30,7 +31,7 @@ class AuthDataSharedImpl final : public AuthDataShared { return dc_id_; } - const std::shared_ptr &public_rsa_key() final { + const std::shared_ptr &public_rsa_key() final { return public_rsa_key_; } @@ -88,7 +89,7 @@ class AuthDataSharedImpl final : public AuthDataShared { private: DcId dc_id_; std::vector> auth_key_listeners_; - std::shared_ptr public_rsa_key_; + std::shared_ptr public_rsa_key_; std::shared_ptr guard_; RwMutex rw_mutex_; @@ -123,7 +124,8 @@ mtproto::AuthKey AuthDataShared::get_auth_key_for_dc(DcId dc_id) { return AuthDataSharedImpl::get_auth_key_for_dc(dc_id); } -std::shared_ptr AuthDataShared::create(DcId dc_id, std::shared_ptr public_rsa_key, +std::shared_ptr AuthDataShared::create(DcId dc_id, + std::shared_ptr public_rsa_key, std::shared_ptr guard) { return std::make_shared(dc_id, std::move(public_rsa_key), std::move(guard)); } diff --git a/td/telegram/net/AuthDataShared.h b/td/telegram/net/AuthDataShared.h index 0343cc3c7..8ee9b408e 100644 --- a/td/telegram/net/AuthDataShared.h +++ b/td/telegram/net/AuthDataShared.h @@ -7,10 +7,10 @@ #pragma once #include "td/telegram/net/DcId.h" -#include "td/telegram/net/PublicRsaKeyShared.h" #include "td/mtproto/AuthData.h" #include "td/mtproto/AuthKey.h" +#include "td/mtproto/RSA.h" #include "td/utils/common.h" #include "td/utils/ScopeGuard.h" @@ -33,7 +33,7 @@ class AuthDataShared { }; virtual DcId dc_id() const = 0; - virtual const std::shared_ptr &public_rsa_key() = 0; + virtual const std::shared_ptr &public_rsa_key() = 0; virtual mtproto::AuthKey get_auth_key() = 0; virtual void set_auth_key(const mtproto::AuthKey &auth_key) = 0; virtual void update_server_time_difference(double diff, bool force) = 0; @@ -45,7 +45,8 @@ class AuthDataShared { static mtproto::AuthKey get_auth_key_for_dc(DcId dc_id); - static std::shared_ptr create(DcId dc_id, std::shared_ptr public_rsa_key, + static std::shared_ptr create(DcId dc_id, + std::shared_ptr public_rsa_key, std::shared_ptr guard); };