Merge remote-tracking branch 'origin/master' into build-flags-bench

Author: micl2e2

.gitignore

@@ -5,3 +5,4 @@
 docs/
 /tdlib/
 vcpkg/
+.clang-tidy

CMake/TdSetUpCompiler.cmake

@@ -154,7 +154,7 @@ function(td_set_up_compiler)
     # see http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1579
     add_cxx_compiler_flag("-Wno-redundant-move")
   endif()
-  if (GCC AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.0))
+  if (GCC)
     add_cxx_compiler_flag("-Wno-stringop-overflow")  # some false positives
   endif()
   if (CLANG AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5))
@@ -164,6 +164,7 @@ function(td_set_up_compiler)
   if (GCC AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.0))
     # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104030
     add_cxx_compiler_flag("-Wbidi-chars=none")
+    add_cxx_compiler_flag("-Wno-bidirectional")
   endif()
 
   if (MINGW)

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
 
-project(TDLib VERSION 1.8.46 LANGUAGES CXX C)
+project(TDLib VERSION 1.8.47 LANGUAGES CXX C)
 
 if (NOT DEFINED CMAKE_MODULE_PATH)
   set(CMAKE_MODULE_PATH "")
@@ -212,6 +212,9 @@ if (TD_BUILD_TESTING AND BUILD_TESTING)
   add_subdirectory(test)
 endif()
 
+set(TDE2E_ENABLE_INSTALL ${TD_INSTALL_STATIC_LIBRARIES} CACHE BOOL "" FORCE)
+add_subdirectory(tde2e)
+
 if (TD_BUILD_BENCHMARK AND (NOT CMAKE_CROSSCOMPILING))
   add_subdirectory(benchmark)
 endif()
@@ -349,6 +352,7 @@ set(TDLIB_SOURCE_PART1
   td/telegram/BusinessAwayMessage.cpp
   td/telegram/BusinessAwayMessageSchedule.cpp
   td/telegram/BusinessBotManageBar.cpp
+  td/telegram/BusinessBotRights.cpp
   td/telegram/BusinessChatLink.cpp
   td/telegram/BusinessConnectedBot.cpp
   td/telegram/BusinessConnectionManager.cpp
@@ -397,6 +401,7 @@ set(TDLIB_SOURCE_PART1
   td/telegram/DialogParticipantManager.cpp
   td/telegram/DialogSource.cpp
   td/telegram/Dimensions.cpp
+  td/telegram/DisallowedGiftsSettings.cpp
   td/telegram/Document.cpp
   td/telegram/DocumentsManager.cpp
   td/telegram/DownloadManager.cpp
@@ -576,6 +581,7 @@ set(TDLIB_SOURCE_PART2
   td/telegram/StarGiftAttribute.cpp
   td/telegram/StarGiftId.cpp
   td/telegram/StarGiftManager.cpp
+  td/telegram/StarGiftSettings.cpp
   td/telegram/StarManager.cpp
   td/telegram/StarSubscription.cpp
   td/telegram/StarSubscriptionPricing.cpp
@@ -663,6 +669,7 @@ set(TDLIB_SOURCE_PART2
   td/telegram/BusinessAwayMessage.h
   td/telegram/BusinessAwayMessageSchedule.h
   td/telegram/BusinessBotManageBar.h
+  td/telegram/BusinessBotRights.h
   td/telegram/BusinessChatLink.h
   td/telegram/BusinessConnectedBot.h
   td/telegram/BusinessConnectionId.h
@@ -724,6 +731,7 @@ set(TDLIB_SOURCE_PART2
   td/telegram/DialogParticipantManager.h
   td/telegram/DialogSource.h
   td/telegram/Dimensions.h
+  td/telegram/DisallowedGiftsSettings.h
   td/telegram/Document.h
   td/telegram/DocumentsManager.h
   td/telegram/DownloadManager.h
@@ -949,6 +957,7 @@ set(TDLIB_SOURCE_PART2
   td/telegram/StarGiftAttribute.h
   td/telegram/StarGiftId.h
   td/telegram/StarGiftManager.h
+  td/telegram/StarGiftSettings.h
   td/telegram/StarManager.h
   td/telegram/StarSubscription.h
   td/telegram/StarSubscriptionPricing.h
@@ -1023,6 +1032,7 @@ set(TDLIB_SOURCE_PART2
   td/telegram/BotVerifierSettings.hpp
   td/telegram/BusinessAwayMessage.hpp
   td/telegram/BusinessAwayMessageSchedule.hpp
+  td/telegram/BusinessBotRights.hpp
   td/telegram/BusinessConnectedBot.hpp
   td/telegram/BusinessGreetingMessage.hpp
   td/telegram/BusinessInfo.hpp
@@ -1034,6 +1044,7 @@ set(TDLIB_SOURCE_PART2
   td/telegram/DialogInviteLink.hpp
   td/telegram/DialogNotificationSettings.hpp
   td/telegram/Dimensions.hpp
+  td/telegram/DisallowedGiftsSettings.hpp
   td/telegram/Document.hpp
   td/telegram/DocumentsManager.hpp
   td/telegram/DraftMessage.hpp
@@ -1092,6 +1103,7 @@ set(TDLIB_SOURCE_PART2
   td/telegram/StarGift.hpp
   td/telegram/StarGiftAttribute.hpp
   td/telegram/StarGiftId.hpp
+  td/telegram/StarGiftSettings.hpp
   td/telegram/StarSubscriptionPricing.hpp
   td/telegram/StickerMaskPosition.hpp
   td/telegram/StickerPhotoSize.hpp
@@ -1189,11 +1201,11 @@ endif()
 if (MSVC AND TD_ENABLE_LTO)
   add_library(tdcore_part1 STATIC ${TDLIB_SOURCE_PART1})
   target_include_directories(tdcore_part1 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
-  target_link_libraries(tdcore_part1 PUBLIC tdapi tdnet tddb tdactor tdutils PRIVATE tdmtproto)
+  target_link_libraries(tdcore_part1 PUBLIC tdapi tdnet tddb tdactor tde2e tdutils PRIVATE tdmtproto)
 
   add_library(tdcore_part2 STATIC ${TDLIB_SOURCE_PART2})
   target_include_directories(tdcore_part2 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
-  target_link_libraries(tdcore_part2 PUBLIC tdapi tdnet tddb tdactor tdutils PRIVATE tdmtproto)
+  target_link_libraries(tdcore_part2 PUBLIC tdapi tdnet tddb tdactor tde2e tdutils PRIVATE tdmtproto)
 
   add_library(tdcore INTERFACE)
   target_link_libraries(tdcore INTERFACE tdcore_part1 tdcore_part2)
@@ -1202,7 +1214,7 @@ if (MSVC AND TD_ENABLE_LTO)
 else()
   add_library(tdcore STATIC ${TDLIB_SOURCE})
   target_include_directories(tdcore PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
-  target_link_libraries(tdcore PUBLIC tdapi tdnet tddb tdactor tdutils PRIVATE tdmtproto)
+  target_link_libraries(tdcore PUBLIC tdapi tdnet tddb tdactor tde2e tdutils PRIVATE tdmtproto)
 
   set(TD_CORE_PART_TARGETS)
 endif()
@@ -1370,6 +1382,7 @@ include(GeneratePkgConfig)
 if (TD_INSTALL_STATIC_LIBRARIES)
   generate_pkgconfig(tdutils "Telegram Library - Utils")
   generate_pkgconfig(tdactor "Telegram Library - Actor")
+  generate_pkgconfig(tde2e "Telegram Library - E2E")
   generate_pkgconfig(tdnet "Telegram Library - Net")
   generate_pkgconfig(tdsqlite "Telegram Library - SQLite")
   generate_pkgconfig(tddb "Telegram Library - Database")

README.md

@@ -103,7 +103,7 @@ target_link_libraries(YourTarget PRIVATE Td::TdStatic)
 
 Or you could install `TDLib` and then reference it in your CMakeLists.txt like this:
 ```
-find_package(Td 1.8.46 REQUIRED)
+find_package(Td 1.8.47 REQUIRED)
 target_link_libraries(YourTarget PRIVATE Td::TdStatic)
 ```
 See [example/cpp/CMakeLists.txt](https://github.com/tdlib/td/blob/master/example/cpp/CMakeLists.txt).

SplitSource.php

@@ -316,6 +316,7 @@ function ($matches) use ($needed_std_headers) {
             'BotVerification' => 'BotVerification',
             'BotVerifierSettings' => 'BotVerifierSettings',
             'BusinessAwayMessage' => 'BusinessAwayMessage',
+            'BusinessBotRights' => 'BusinessBotRights',
             'BusinessChatLink' => 'BusinessChatLink',
             'BusinessConnectedBot' => 'BusinessConnectedBot',
             'BusinessConnectionId' => 'BusinessConnectionId',
@@ -351,6 +352,7 @@ function ($matches) use ($needed_std_headers) {
             'DialogParticipantFilter' => 'DialogParticipantFilter',
             'dialog_participant_manager[_(-](?![.]get[(][)])|DialogParticipantManager' => 'DialogParticipantManager',
             'DialogSource' => 'DialogSource',
+            'DisallowedGiftsSettings' => 'DisallowedGiftsSettings',
             'documents_manager[_(-](?![.]get[(][)])|DocumentsManager' => 'DocumentsManager',
             'download_manager[_(-](?![.]get[(][)])|DownloadManager[^C]' => 'DownloadManager',
             'DownloadManagerCallback' => 'DownloadManagerCallback',
@@ -426,6 +428,7 @@ function ($matches) use ($needed_std_headers) {
             'StarGiftAttribute' => 'StarGiftAttribute',
             'StarGiftId' => 'StarGiftId',
             'star_gift_manager[_(-](?![.]get[(][)])|StarGiftManager' => 'StarGiftManager',
+            'StarGiftSettings' => 'StarGiftSettings',
             'star_manager[_(-](?![.]get[(][)])|StarManager' => 'StarManager',
             'StarSubscription[^P]' => 'StarSubscription',
             'StarSubscriptionPricing' => 'StarSubscriptionPricing',

benchmark/bench_crypto.cpp

@@ -127,7 +127,8 @@ class HmacSha256ShortBench final : public td::Benchmark {
   void run(int n) final {
     unsigned char md[32];
     for (int i = 0; i < n; i++) {
-      td::hmac_sha256(td::Slice(data, SHORT_DATA_SIZE), td::Slice(data, SHORT_DATA_SIZE), td::MutableSlice(md, 32));
+      td::hmac_sha256(td::Slice(data, td::min(static_cast<std::size_t>(32), SHORT_DATA_SIZE)),
+                      td::Slice(data, SHORT_DATA_SIZE), td::MutableSlice(md, 32));
     }
   }
 };
@@ -145,9 +146,10 @@ class HmacSha512ShortBench final : public td::Benchmark {
   }
 
   void run(int n) final {
-    unsigned char md[32];
+    unsigned char md[64];
     for (int i = 0; i < n; i++) {
-      td::hmac_sha256(td::Slice(data, SHORT_DATA_SIZE), td::Slice(data, SHORT_DATA_SIZE), td::MutableSlice(md, 32));
+      td::hmac_sha512(td::Slice(data, td::min(static_cast<std::size_t>(64), SHORT_DATA_SIZE)),
+                      td::Slice(data, SHORT_DATA_SIZE), td::MutableSlice(md, 64));
     }
   }
 };

example/cpp/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
 
 project(TdExample VERSION 1.0 LANGUAGES CXX)
 
-find_package(Td 1.8.46 REQUIRED)
+find_package(Td 1.8.47 REQUIRED)
 
 add_executable(tdjson_example tdjson_example.cpp)
 target_link_libraries(tdjson_example PRIVATE Td::TdJson)

example/ios/build.sh

@@ -55,7 +55,7 @@ do
       fi
 
       echo "iOS platform = ${ios_platform}"
-      other_options="-DIOS_PLATFORM=${ios_platform} -DCMAKE_TOOLCHAIN_FILE=${td_path}/CMake/iOS.cmake"
+      other_options="-DIOS_PLATFORM=${ios_platform} -DCMAKE_TOOLCHAIN_FILE=${td_path}/CMake/iOS.cmake -DCMAKE_MAKE_PROGRAM=make"
     fi
 
     set_cmake_options $platform