Move some modules to lib_mtproto.

Telegram/SourceFiles/boxes/calendar_box.cpp

@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "boxes/calendar_box.h"
 
-#include "mtproto/rpc_sender.h"
+#include "mtproto/mtproto_rpc_sender.h"
 #include "ui/widgets/buttons.h"
 #include "lang/lang_keys.h"
 #include "ui/effects/ripple_animation.h"

Telegram/SourceFiles/boxes/confirm_box.h

@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "boxes/abstract_box.h"
-#include "mtproto/rpc_sender.h"
+#include "mtproto/mtproto_rpc_sender.h"
 
 namespace Main {
 class Session;

Telegram/SourceFiles/boxes/confirm_phone_box.h

@@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/abstract_box.h"
 #include "base/timer.h"
 #include "ui/widgets/input_fields.h"
-#include "mtproto/rpc_sender.h"
+#include "mtproto/mtproto_rpc_sender.h"
 
 namespace Ui {
 class InputField;

Telegram/SourceFiles/boxes/edit_caption_box.h

@@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/storage_media_prepare.h"
 #include "ui/wrap/slide_wrap.h"
 #include "media/clip/media_clip_reader.h"
-#include "mtproto/rpc_sender.h"
+#include "mtproto/mtproto_rpc_sender.h"
 
 namespace ChatHelpers {
 class TabbedPanel;

Telegram/SourceFiles/boxes/report_box.h

@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "boxes/abstract_box.h"
-#include "mtproto/rpc_sender.h"
+#include "mtproto/mtproto_rpc_sender.h"
 
 namespace Ui {
 template <typename Enum>

Telegram/SourceFiles/boxes/share_box.h

@@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 #include "ui/effects/animations.h"
 #include "ui/effects/round_checkbox.h"
-#include "mtproto/rpc_sender.h"
+#include "mtproto/mtproto_rpc_sender.h"
 
 enum class SendMenuType;
 

Telegram/SourceFiles/boxes/username_box.h

@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "boxes/abstract_box.h"
-#include "mtproto/rpc_sender.h"
+#include "mtproto/mtproto_rpc_sender.h"
 
 namespace Ui {
 class UsernameInput;

Telegram/SourceFiles/calls/calls_call.h

@@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 #include "base/bytes.h"
 #include "mtproto/sender.h"
-#include "mtproto/auth_key.h"
+#include "mtproto/mtproto_auth_key.h"
 
 namespace Media {
 namespace Audio {

Telegram/SourceFiles/core/application.h

@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "core/core_settings.h"
-#include "mtproto/auth_key.h"
+#include "mtproto/mtproto_auth_key.h"
 #include "mtproto/mtproto_proxy_data.h"
 #include "base/observer.h"
 #include "base/timer.h"

Telegram/SourceFiles/core/utils.cpp

@@ -58,12 +58,6 @@ static_assert(sizeof(MTPdouble) == 8, "Basic types size check failed");
 
 static_assert(sizeof(int) >= 4, "Basic types size check failed");
 
-namespace {
-
-std::atomic<int> GlobalAtomicRequestId = 0;
-
-} // namespace
-
 // Precise timing functions / rand init
 
 struct CRYPTO_dynlock_value {
@@ -206,14 +200,6 @@ namespace ThirdParty {
 	}
 }
 
-int GetNextRequestId() {
-	const auto result = ++GlobalAtomicRequestId;
-	if (result == std::numeric_limits<int>::max() / 2) {
-		GlobalAtomicRequestId = 0;
-	}
-	return result;
-}
-
 int32 *hashSha1(const void *data, uint32 len, void *dest) {
 	return (int32*)SHA1((const uchar*)data, (size_t)len, (uchar*)dest);
 }

Telegram/SourceFiles/core/utils.h

@@ -82,8 +82,6 @@ inline QByteArray str_const_toByteArray(const str_const &str) {
 	return QByteArray::fromRawData(str.c_str(), str.size());
 }
 
-int GetNextRequestId();
-
 inline void mylocaltime(struct tm * _Tm, const time_t * _Time) {
 #ifdef Q_OS_WIN
 	localtime_s(_Tm, _Time);
@@ -161,8 +159,6 @@ T rand_value() {
 	return result;
 }
 
-static const QRegularExpression::PatternOptions reMultiline(QRegularExpression::DotMatchesEverythingOption | QRegularExpression::MultilineOption);
-
 template <typename T>
 inline T snap(const T &v, const T &_min, const T &_max) {
 	return (v < _min) ? _min : ((v > _max) ? _max : v);

Telegram/SourceFiles/dialogs/dialogs_inner_widget.h

@@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/rp_widget.h"
 #include "base/flags.h"
 #include "base/object_ptr.h"
-#include "mtproto/rpc_sender.h"
+#include "mtproto/mtproto_rpc_sender.h"
 
 namespace Main {
 class Session;

Telegram/SourceFiles/dialogs/dialogs_widget.h

@@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/scroll_area.h"
 #include "ui/special_buttons.h"
 #include "api/api_single_message_search.h"
-#include "mtproto/rpc_sender.h"
+#include "mtproto/mtproto_rpc_sender.h"
 
 namespace Main {
 class Session;

Telegram/SourceFiles/export/export_api_wrap.cpp

@@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "export/data/export_data_types.h"
 #include "export/output/export_output_result.h"
 #include "export/output/export_output_file.h"
-#include "mtproto/rpc_sender.h"
+#include "mtproto/mtproto_rpc_sender.h"
 #include "base/value_ordering.h"
 #include "base/bytes.h"
 #include <set>

Telegram/SourceFiles/export/export_controller.h

@@ -7,9 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include <crl/crl_object_on_queue.h>
 #include "base/variant.h"
-#include "mtproto/rpc_sender.h"
+#include "mtproto/mtproto_rpc_sender.h"
+
+#include <crl/crl_object_on_queue.h>
 
 namespace Export {
 

Telegram/SourceFiles/main/main_account.h

@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "mtproto/auth_key.h"
+#include "mtproto/mtproto_auth_key.h"
 #include "mtproto/mtp_instance.h"
 #include "base/weak_ptr.h"
 

Telegram/SourceFiles/mainwidget.h

@@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/animations.h"
 #include "media/player/media_player_float.h"
 #include "data/data_pts_waiter.h"
-#include "mtproto/rpc_sender.h"
+#include "mtproto/mtproto_rpc_sender.h"
 
 struct HistoryMessageMarkupButton;
 class MainWindow;

Telegram/SourceFiles/mtproto/concurrent_sender.cpp

@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mtproto/concurrent_sender.h"
 
 #include "mtproto/mtp_instance.h"
-#include "mtproto/rpc_sender.h"
+#include "mtproto/mtproto_rpc_sender.h"
 #include "mtproto/facade.h"
 
 namespace MTP {
@@ -135,7 +135,7 @@ void ConcurrentSender::RequestBuilder::setAfter(
 }
 
 mtpRequestId ConcurrentSender::RequestBuilder::send() {
-	const auto requestId = GetNextRequestId();
+	const auto requestId = internal::GetNextRequestId();
 	const auto dcId = _dcId;
 	const auto msCanWait = _canWait;
 	const auto afterRequestId = _afterRequestId;

Telegram/SourceFiles/mtproto/config_loader.h

@@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 #include "base/weak_ptr.h"
 #include "base/bytes.h"
-#include "mtproto/rpc_sender.h"
+#include "mtproto/mtproto_rpc_sender.h"
 
 namespace MTP {
 

Telegram/SourceFiles/mtproto/connection.cpp

@@ -11,8 +11,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mtproto/details/mtproto_dc_key_checker.h"
 #include "mtproto/details/mtproto_dump_to_text.h"
 #include "mtproto/session.h"
-#include "mtproto/rsa_public_key.h"
-#include "mtproto/rpc_sender.h"
+#include "mtproto/mtproto_rsa_public_key.h"
+#include "mtproto/mtproto_rpc_sender.h"
 #include "mtproto/dc_options.h"
 #include "mtproto/connection_abstract.h"
 #include "zlib.h"

Telegram/SourceFiles/mtproto/connection.h

@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "mtproto/auth_key.h"
+#include "mtproto/mtproto_auth_key.h"
 #include "mtproto/dc_options.h"
 #include "mtproto/connection_abstract.h"
 #include "mtproto/facade.h"

Telegram/SourceFiles/mtproto/connection_resolving.h

@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "mtproto/auth_key.h"
+#include "mtproto/mtproto_auth_key.h"
 #include "mtproto/connection_abstract.h"
 #include "base/timer.h"
 

Telegram/SourceFiles/mtproto/connection_tcp.cpp

@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "mtproto/connection_tcp.h"
 
-#include "mtproto/mtp_abstract_socket.h"
+#include "mtproto/mtproto_abstract_socket.h"
 #include "base/bytes.h"
 #include "base/openssl_help.h"
 #include "base/qthelp_url.h"

Telegram/SourceFiles/mtproto/connection_tcp.h

@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "mtproto/connection_abstract.h"
-#include "mtproto/auth_key.h"
+#include "mtproto/mtproto_auth_key.h"
 
 namespace MTP {
 namespace internal {

Telegram/SourceFiles/mtproto/dc_options.h

@@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/observer.h"
 #include "base/bytes.h"
-#include "mtproto/rsa_public_key.h"
+#include "mtproto/mtproto_rsa_public_key.h"
 
 #include <QtCore/QReadWriteLock>
 #include <string>

Telegram/SourceFiles/mtproto/dcenter.cpp

@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mtproto/dcenter.h"
 
 #include "mtproto/facade.h"
-#include "mtproto/auth_key.h"
+#include "mtproto/mtproto_auth_key.h"
 #include "mtproto/dc_options.h"
 #include "mtproto/mtp_instance.h"
 #include "mtproto/special_config_request.h"

Telegram/SourceFiles/mtproto/details/mtproto_dc_key_checker.h

@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "mtproto/core_types.h"
-#include "mtproto/auth_key.h"
+#include "mtproto/mtproto_auth_key.h"
 
 namespace MTP {
 class Instance;

Telegram/SourceFiles/mtproto/details/mtproto_dc_key_creator.h

@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "mtproto/core_types.h"
-#include "mtproto/auth_key.h"
+#include "mtproto/mtproto_auth_key.h"
 #include "mtproto/connection_abstract.h"
 #include "base/basic_types.h"
 #include "base/expected.h"

Telegram/SourceFiles/mtproto/mtp_instance.cpp

@@ -14,7 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mtproto/special_config_request.h"
 #include "mtproto/connection.h"
 #include "mtproto/sender.h"
-#include "mtproto/rsa_public_key.h"
+#include "mtproto/mtproto_rsa_public_key.h"
 #include "storage/localstorage.h"
 #include "calls/calls_instance.h"
 #include "main/main_session.h" // Session::Exists.
@@ -37,8 +37,22 @@ constexpr auto kCheckKeyEach = 60 * crl::time(1000);
 
 using namespace internal;
 
+std::atomic<int> GlobalAtomicRequestId = 0;
+
 } // namespace
 
+namespace internal {
+
+int GetNextRequestId() {
+	const auto result = ++GlobalAtomicRequestId;
+	if (result == std::numeric_limits<int>::max() / 2) {
+		GlobalAtomicRequestId = 0;
+	}
+	return result;
+}
+
+} // namespace internal
+
 class Instance::Private : private Sender {
 public:
 	Private(not_null<Instance*> instance, not_null<DcOptions*> options, Instance::Mode mode);

Telegram/SourceFiles/mtproto/mtp_instance.h

@@ -7,15 +7,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include <map>
-#include <set>
-#include "mtproto/rpc_sender.h"
+#include "mtproto/mtproto_rpc_sender.h"
 
 namespace MTP {
 namespace internal {
+
 class Dcenter;
 class Session;
 class Connection;
+
+[[nodiscard]] int GetNextRequestId();
+
 } // namespace internal
 
 class DcOptions;
@@ -130,7 +132,7 @@ public:
 			ShiftedDcId shiftedDcId = 0,
 			crl::time msCanWait = 0,
 			mtpRequestId afterRequestId = 0) {
-		const auto requestId = GetNextRequestId();
+		const auto requestId = internal::GetNextRequestId();
 		sendSerialized(
 			requestId,
 			SecureRequest::Serialize(request),
@@ -161,7 +163,7 @@ public:
 	mtpRequestId sendProtocolMessage(
 			ShiftedDcId shiftedDcId,
 			const Request &request) {
-		const auto requestId = GetNextRequestId();
+		const auto requestId = internal::GetNextRequestId();
 		sendRequest(
 			requestId,
 			SecureRequest::Serialize(request),

Telegram/SourceFiles/mtproto/mtproto_abstract_socket.cpp

@@ -5,10 +5,10 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "mtproto/mtp_abstract_socket.h"
+#include "mtproto/mtproto_abstract_socket.h"
 
-#include "mtproto/mtp_tcp_socket.h"
-#include "mtproto/mtp_tls_socket.h"
+#include "mtproto/mtproto_tcp_socket.h"
+#include "mtproto/mtproto_tls_socket.h"
 
 namespace MTP {
 namespace internal {

Telegram/SourceFiles/mtproto/mtproto_auth_key.cpp

@@ -5,12 +5,11 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "mtproto/auth_key.h"
+#include "mtproto/mtproto_auth_key.h"
 
-extern "C" {
-#include <openssl/aes.h>
-#include <openssl/modes.h>
-} // extern "C"
+#include "base/openssl_help.h"
+
+#include <QtCore/QDataStream>
 
 namespace MTP {
 
@@ -43,59 +42,61 @@ AuthKey::KeyId AuthKey::keyId() const {
 void AuthKey::prepareAES_oldmtp(const MTPint128 &msgKey, MTPint256 &aesKey, MTPint256 &aesIV, bool send) const {
 	uint32 x = send ? 0 : 8;
 
-	uchar data_a[16 + 32], sha1_a[20];
-	memcpy(data_a, &msgKey, 16);
-	memcpy(data_a + 16, _key.data() + x, 32);
-	hashSha1(data_a, 16 + 32, sha1_a);
+	bytes::array<20> sha1_a, sha1_b, sha1_c, sha1_d;
+	bytes::array<16 + 32> data_a;
+	memcpy(data_a.data(), &msgKey, 16);
+	memcpy(data_a.data() + 16, _key.data() + x, 32);
+	openssl::Sha1To(sha1_a, data_a);
 
-	uchar data_b[16 + 16 + 16], sha1_b[20];
-	memcpy(data_b, _key.data() + 32 + x, 16);
-	memcpy(data_b + 16, &msgKey, 16);
-	memcpy(data_b + 32, _key.data() + 48 + x, 16);
-	hashSha1(data_b, 16 + 16 + 16, sha1_b);
+	bytes::array<16 + 16 + 16> data_b;
+	memcpy(data_b.data(), _key.data() + 32 + x, 16);
+	memcpy(data_b.data() + 16, &msgKey, 16);
+	memcpy(data_b.data() + 32, _key.data() + 48 + x, 16);
+	openssl::Sha1To(sha1_b, data_b);
 
-	uchar data_c[32 + 16], sha1_c[20];
-	memcpy(data_c, _key.data() + 64 + x, 32);
-	memcpy(data_c + 32, &msgKey, 16);
-	hashSha1(data_c, 32 + 16, sha1_c);
+	bytes::array<32 + 16> data_c;
+	memcpy(data_c.data(), _key.data() + 64 + x, 32);
+	memcpy(data_c.data() + 32, &msgKey, 16);
+	openssl::Sha1To(sha1_c, data_c);
 
-	uchar data_d[16 + 32], sha1_d[20];
-	memcpy(data_d, &msgKey, 16);
-	memcpy(data_d + 16, _key.data() + 96 + x, 32);
-	hashSha1(data_d, 16 + 32, sha1_d);
+	bytes::array<16 + 32> data_d;
+	memcpy(data_d.data(), &msgKey, 16);
+	memcpy(data_d.data() + 16, _key.data() + 96 + x, 32);
+	openssl::Sha1To(sha1_d, data_d);
 
-	auto key = reinterpret_cast<uchar*>(&aesKey);
-	auto iv = reinterpret_cast<uchar*>(&aesIV);
-	memcpy(key, sha1_a, 8);
-	memcpy(key + 8, sha1_b + 8, 12);
-	memcpy(key + 8 + 12, sha1_c + 4, 12);
-	memcpy(iv, sha1_a + 8, 12);
-	memcpy(iv + 12, sha1_b, 8);
-	memcpy(iv + 12 + 8, sha1_c + 16, 4);
-	memcpy(iv + 12 + 8 + 4, sha1_d, 8);
+	auto key = reinterpret_cast<bytes::type*>(&aesKey);
+	auto iv = reinterpret_cast<bytes::type*>(&aesIV);
+	memcpy(key, sha1_a.data(), 8);
+	memcpy(key + 8, sha1_b.data() + 8, 12);
+	memcpy(key + 8 + 12, sha1_c.data() + 4, 12);
+	memcpy(iv, sha1_a.data() + 8, 12);
+	memcpy(iv + 12, sha1_b.data(), 8);
+	memcpy(iv + 12 + 8, sha1_c.data() + 16, 4);
+	memcpy(iv + 12 + 8 + 4, sha1_d.data(), 8);
 }
 
 void AuthKey::prepareAES(const MTPint128 &msgKey, MTPint256 &aesKey, MTPint256 &aesIV, bool send) const {
 	uint32 x = send ? 0 : 8;
 
-	uchar data_a[16 + 36], sha256_a[32];
-	memcpy(data_a, &msgKey, 16);
-	memcpy(data_a + 16, _key.data() + x, 36);
-	hashSha256(data_a, 16 + 36, sha256_a);
+	bytes::array<32> sha256_a, sha256_b;
+	bytes::array<16 + 36> data_a;
+	memcpy(data_a.data(), &msgKey, 16);
+	memcpy(data_a.data() + 16, _key.data() + x, 36);
+	openssl::Sha256To(sha256_a, data_a);
 
-	uchar data_b[36 + 16], sha256_b[32];
-	memcpy(data_b, _key.data() + 40 + x, 36);
-	memcpy(data_b + 36, &msgKey, 16);
-	hashSha256(data_b, 36 + 16, sha256_b);
+	bytes::array<36 + 16> data_b;
+	memcpy(data_b.data(), _key.data() + 40 + x, 36);
+	memcpy(data_b.data() + 36, &msgKey, 16);
+	openssl::Sha256To(sha256_b, data_b);
 
 	auto key = reinterpret_cast<uchar*>(&aesKey);
 	auto iv = reinterpret_cast<uchar*>(&aesIV);
-	memcpy(key, sha256_a, 8);
-	memcpy(key + 8, sha256_b + 8, 16);
-	memcpy(key + 8 + 16, sha256_a + 24, 8);
-	memcpy(iv, sha256_b, 8);
-	memcpy(iv + 8, sha256_a + 8, 16);
-	memcpy(iv + 8 + 16, sha256_b + 24, 8);
+	memcpy(key, sha256_a.data(), 8);
+	memcpy(key + 8, sha256_b.data() + 8, 16);
+	memcpy(key + 8 + 16, sha256_a.data() + 24, 8);
+	memcpy(iv, sha256_b.data(), 8);
+	memcpy(iv + 8, sha256_a.data() + 8, 16);
+	memcpy(iv + 8 + 16, sha256_b.data() + 24, 8);
 }
 
 const void *AuthKey::partForMsgKey(bool send) const {
@@ -135,10 +136,10 @@ void AuthKey::FillData(Data &authKey, bytes::const_span computedAuthKey) {
 }
 
 void AuthKey::countKeyId() {
-	auto sha1 = hashSha1(_key.data(), _key.size());
+	const auto hash = openssl::Sha1(_key);
 
 	// Lower 64 bits = 8 bytes of 20 byte SHA1 hash.
-	_keyId = *reinterpret_cast<KeyId*>(sha1.data() + 12);
+	_keyId = *reinterpret_cast<const KeyId*>(hash.data() + 12);
 }
 
 void aesIgeEncryptRaw(const void *src, void *dst, uint32 len, const void *key, const void *iv) {

Telegram/SourceFiles/mtproto/mtproto_pch.cpp

@@ -5,6 +5,6 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "mtproto/mtp_pch.h"
+#include "mtproto/mtproto_pch.h"
 
 // Precompiled header helper.

Telegram/SourceFiles/mtproto/mtproto_rpc_sender.cpp

@@ -5,25 +5,28 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "mtproto/rpc_sender.h"
+#include "mtproto/mtproto_rpc_sender.h"
+
+#include <QtCore/QRegularExpression>
 
 RPCError::RPCError(const MTPrpcError &error)
 : _code(error.c_rpc_error().verror_code().v) {
 	QString text = qs(error.c_rpc_error().verror_message());
 	if (_code < 0 || _code >= 500) {
-		_type = qsl("INTERNAL_SERVER_ERROR");
+		_type = "INTERNAL_SERVER_ERROR";
 		_description = text;
 	} else {
 		const auto expression = QRegularExpression(
 			"^([A-Z0-9_]+)(: .*)?$",
-			reMultiline);
+			(QRegularExpression::DotMatchesEverythingOption
+				| QRegularExpression::MultilineOption));
 		const auto match = expression.match(text);
 		if (match.hasMatch()) {
 			_type = match.captured(1);
 			_description = match.captured(2).mid(2);
 		} else {
-			_type = qsl("CLIENT_BAD_RPC_ERROR");
-			_description = qsl("Bad rpc error received, text = '") + text + '\'';
+			_type = "CLIENT_BAD_RPC_ERROR";
+			_description = "Bad rpc error received, text = '" + text + '\'';
 		}
 	}
 }

Telegram/SourceFiles/mtproto/mtproto_rpc_sender.h

@@ -8,8 +8,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "base/flat_set.h"
-#include "core/utils.h"
-#include <rpl/details/callable.h>
 
 class RPCError {
 public:

Telegram/SourceFiles/mtproto/mtproto_rsa_public_key.cpp

@@ -5,17 +5,10 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "mtproto/rsa_public_key.h"
+#include "mtproto/mtproto_rsa_public_key.h"
 
 #include "base/openssl_help.h"
 
-extern "C" {
-#include <openssl/rsa.h>
-#include <openssl/pem.h>
-#include <openssl/bio.h>
-#include <openssl/err.h>
-} // extern "C"
-
 namespace MTP {
 namespace internal {
 namespace {
@@ -234,8 +227,9 @@ void RSAPublicKey::Private::computeFingerprint() {
 	MTP_bytes(ToBytes(n)).write(string);
 	MTP_bytes(ToBytes(e)).write(string);
 
-	uchar sha1Buffer[20];
-	_fingerprint = *(uint64*)(hashSha1(&string[0], string.size() * sizeof(mtpPrime), sha1Buffer) + 3);
+	bytes::array<20> sha1Buffer;
+	openssl::Sha1To(sha1Buffer, bytes::make_span(string));
+	_fingerprint = *(uint64*)(sha1Buffer.data() + 12);
 }
 
 bytes::vector RSAPublicKey::Private::ToBytes(const BIGNUM *number) {

Telegram/SourceFiles/mtproto/mtproto_tcp_socket.cpp

@@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "mtproto/mtp_tcp_socket.h"
+#include "mtproto/mtproto_tcp_socket.h"
 
 #include "base/invoke_queued.h"
 

Telegram/SourceFiles/mtproto/mtproto_tcp_socket.h

@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "mtproto/mtp_abstract_socket.h"
+#include "mtproto/mtproto_abstract_socket.h"
 
 namespace MTP {
 namespace internal {

Telegram/SourceFiles/mtproto/mtproto_tls_socket.cpp

@@ -5,9 +5,9 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "mtproto/mtp_tls_socket.h"
+#include "mtproto/mtproto_tls_socket.h"
 
-#include "mtproto/mtp_tcp_socket.h"
+#include "mtproto/mtproto_tcp_socket.h"
 #include "base/openssl_help.h"
 #include "base/bytes.h"
 #include "base/invoke_queued.h"

Telegram/SourceFiles/mtproto/mtproto_tls_socket.h

@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "mtproto/mtp_abstract_socket.h"
+#include "mtproto/mtproto_abstract_socket.h"
 
 namespace MTP {
 namespace internal {

Telegram/SourceFiles/mtproto/sender.h

@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "base/variant.h"
-#include "mtproto/rpc_sender.h"
+#include "mtproto/mtproto_rpc_sender.h"
 #include "mtproto/mtp_instance.h"
 #include "mtproto/facade.h"
 

Telegram/SourceFiles/mtproto/session.cpp

@@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mtproto/details/mtproto_dc_key_checker.h"
 #include "mtproto/connection.h"
 #include "mtproto/dcenter.h"
-#include "mtproto/auth_key.h"
+#include "mtproto/mtproto_auth_key.h"
 #include "base/unixtime.h"
 #include "base/openssl_help.h"
 #include "core/crash_reports.h"

Telegram/SourceFiles/mtproto/session.h

@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "base/timer.h"
-#include "mtproto/rpc_sender.h"
+#include "mtproto/mtproto_rpc_sender.h"
 #include "mtproto/mtproto_proxy_data.h"
 
 #include <QtCore/QTimer>

Telegram/SourceFiles/mtproto/special_config_request.cpp

@@ -7,9 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "mtproto/special_config_request.h"
 
-#include "mtproto/rsa_public_key.h"
+#include "mtproto/mtproto_rsa_public_key.h"
 #include "mtproto/dc_options.h"
-#include "mtproto/auth_key.h"
+#include "mtproto/mtproto_auth_key.h"
 #include "base/unixtime.h"
 #include "base/openssl_help.h"
 #include "base/call_delayed.h"

Telegram/SourceFiles/passport/passport_encryption.cpp

@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "passport/passport_encryption.h"
 
 #include "base/openssl_help.h"
-#include "mtproto/rsa_public_key.h"
+#include "mtproto/mtproto_rsa_public_key.h"
 
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonArray>

Telegram/SourceFiles/storage/serialize_common.h

@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "mtproto/auth_key.h"
+#include "mtproto/mtproto_auth_key.h"
 
 namespace Serialize {
 

Telegram/gyp/lib_mtproto.gyp

@@ -19,8 +19,8 @@
     'variables': {
       'src_loc': '../SourceFiles',
       'res_loc': '../Resources',
-      'pch_source': '<(src_loc)/mtproto/mtp_pch.cpp',
-      'pch_header': '<(src_loc)/mtproto/mtp_pch.h',
+      'pch_source': '<(src_loc)/mtproto/mtproto_pch.cpp',
+      'pch_header': '<(src_loc)/mtproto/mtproto_pch.h',
     },
     'defines': [
     ],
@@ -40,16 +40,22 @@
       '<(src_loc)/mtproto/details/mtproto_dc_key_creator.h',
       '<(src_loc)/mtproto/details/mtproto_dump_to_text.cpp',
       '<(src_loc)/mtproto/details/mtproto_dump_to_text.h',
+      '<(src_loc)/mtproto/mtproto_abstract_socket.cpp',
+      '<(src_loc)/mtproto/mtproto_abstract_socket.h',
+      '<(src_loc)/mtproto/mtproto_auth_key.cpp',
+      '<(src_loc)/mtproto/mtproto_auth_key.h',
       '<(src_loc)/mtproto/mtproto_dh_utils.cpp',
       '<(src_loc)/mtproto/mtproto_dh_utils.h',
       '<(src_loc)/mtproto/mtproto_proxy_data.cpp',
       '<(src_loc)/mtproto/mtproto_proxy_data.h',
-      '<(src_loc)/mtproto/mtp_abstract_socket.cpp',
-      '<(src_loc)/mtproto/mtp_abstract_socket.h',
-      '<(src_loc)/mtproto/mtp_tcp_socket.cpp',
-      '<(src_loc)/mtproto/mtp_tcp_socket.h',
-      '<(src_loc)/mtproto/mtp_tls_socket.cpp',
-      '<(src_loc)/mtproto/mtp_tls_socket.h',
+      '<(src_loc)/mtproto/mtproto_rsa_public_key.cpp',
+      '<(src_loc)/mtproto/mtproto_rsa_public_key.h',
+      '<(src_loc)/mtproto/mtproto_rpc_sender.cpp',
+      '<(src_loc)/mtproto/mtproto_rpc_sender.h',
+      '<(src_loc)/mtproto/mtproto_tcp_socket.cpp',
+      '<(src_loc)/mtproto/mtproto_tcp_socket.h',
+      '<(src_loc)/mtproto/mtproto_tls_socket.cpp',
+      '<(src_loc)/mtproto/mtproto_tls_socket.h',
     ],
   }],
 }

Telegram/gyp/telegram/sources.txt

@@ -533,8 +533,6 @@
 <(src_loc)/media/view/media_view_group_thumbs.h
 <(src_loc)/media/view/media_view_overlay_widget.cpp
 <(src_loc)/media/view/media_view_overlay_widget.h
-<(src_loc)/mtproto/auth_key.cpp
-<(src_loc)/mtproto/auth_key.h
 <(src_loc)/mtproto/concurrent_sender.cpp
 <(src_loc)/mtproto/concurrent_sender.h
 <(src_loc)/mtproto/config_loader.cpp
@@ -561,10 +559,6 @@
 <(src_loc)/mtproto/facade.h
 <(src_loc)/mtproto/mtp_instance.cpp
 <(src_loc)/mtproto/mtp_instance.h
-<(src_loc)/mtproto/rsa_public_key.cpp
-<(src_loc)/mtproto/rsa_public_key.h
-<(src_loc)/mtproto/rpc_sender.cpp
-<(src_loc)/mtproto/rpc_sender.h
 <(src_loc)/mtproto/sender.h
 <(src_loc)/mtproto/session.cpp
 <(src_loc)/mtproto/session.h

Telegram/lib_base

@@ -1 +1 @@
-Subproject commit bdc4127ff5d5a14eb9d04986725ef7ec94e6d807
+Subproject commit 95ea34f59c2e747343aef9c78dd1afbd3fa086c2