$ git show --format=fuller --patch-with-stat --summary ef29ade22c71747ce64ce11b94b8b8e53eafbfb5
commit ef29ade22c71747ce64ce11b94b8b8e53eafbfb5
Author: mandian <mandian@users.noreply.github.com>
AuthorDate: Tue Nov 2 03:58:32 2021 +0100
Commit: mandian <mandian@users.noreply.github.com>
CommitDate: Tue Nov 2 03:58:32 2021 +0100
unify all openssl fixes in one patch
---
tdesktop-2.1.7-openssl3.patch | 47 +++++++++++++++++++++++++++++++++++++++++++
tdesktop-2.7.9-compile.patch | 46 ------------------------------------------
2 files changed, 47 insertions(+), 46 deletions(-)
diff --git a/tdesktop-2.1.7-openssl3.patch b/tdesktop-2.1.7-openssl3.patch
index 5edb47d..e0cbbe0 100644
--- a/tdesktop-2.1.7-openssl3.patch
+++ b/tdesktop-2.1.7-openssl3.patch
@@ -11,3 +11,50 @@ index 3a924059..53b21c63 100644
FIPS_mode_set(0);
#endif
ENGINE_cleanup();
+diff -up tdesktop-2.7.9-full/Telegram/lib_base/base/openssl_help.h.omv~ tdesktop-2.7.9-full/Telegram/lib_base/base/openssl_help.h
+--- tdesktop-2.7.9-full/Telegram/lib_base/base/openssl_help.h.omv~ 2021-06-21 17:55:46.854877200 +0200
++++ tdesktop-2.7.9-full/Telegram/lib_base/base/openssl_help.h 2021-06-21 18:12:03.420101458 +0200
+@@ -28,6 +28,12 @@ extern "C" {
+ #undef small
+ #endif // small
+
++#if OPENSSL_VERSION_MAJOR >= 3
++#define SHA1 "SHA1"
++#define SHA256 "SHA256"
++#define SHA512 "SHA512"
++#endif
++
+ namespace openssl {
+
+ class Context {
+@@ -414,6 +420,7 @@ inline void ShaUpdate(Context context, M
+ ShaUpdate(context, method, args...);
+ }
+
++#if OPENSSL_VERSION_MAJOR < 3
+ template <size_type Size, typename Method>
+ inline void Sha(
+ bytes::span dst,
+@@ -426,6 +433,21 @@ inline void Sha(
+ data.size(),
+ reinterpret_cast<unsigned char*>(dst.data()));
+ }
++#else
++template <size_type Size>
++inline void Sha(
++ bytes::span dst,
++ char const * const method,
++ bytes::const_span data) {
++ Expects(dst.size() >= Size);
++
++ EVP_Q_digest(NULL, method, NULL,
++ reinterpret_cast<const unsigned char*>(data.data()),
++ data.size(),
++ reinterpret_cast<unsigned char*>(dst.data()),
++ NULL);
++}
++#endif
+
+ template <size_type Size, typename Method>
+ [[nodiscard]] inline bytes::vector Sha(
+
diff --git a/tdesktop-2.7.9-compile.patch b/tdesktop-2.7.9-compile.patch
index 8e96351..272adbc 100644
--- a/tdesktop-2.7.9-compile.patch
+++ b/tdesktop-2.7.9-compile.patch
@@ -1,49 +1,3 @@
-diff -up tdesktop-2.7.9-full/Telegram/lib_base/base/openssl_help.h.omv~ tdesktop-2.7.9-full/Telegram/lib_base/base/openssl_help.h
---- tdesktop-2.7.9-full/Telegram/lib_base/base/openssl_help.h.omv~ 2021-06-21 17:55:46.854877200 +0200
-+++ tdesktop-2.7.9-full/Telegram/lib_base/base/openssl_help.h 2021-06-21 18:12:03.420101458 +0200
-@@ -28,6 +28,12 @@ extern "C" {
- #undef small
- #endif // small
-
-+#if OPENSSL_VERSION_MAJOR >= 3
-+#define SHA1 "SHA1"
-+#define SHA256 "SHA256"
-+#define SHA512 "SHA512"
-+#endif
-+
- namespace openssl {
-
- class Context {
-@@ -414,6 +420,7 @@ inline void ShaUpdate(Context context, M
- ShaUpdate(context, method, args...);
- }
-
-+#if OPENSSL_VERSION_MAJOR < 3
- template <size_type Size, typename Method>
- inline void Sha(
- bytes::span dst,
-@@ -426,6 +433,21 @@ inline void Sha(
- data.size(),
- reinterpret_cast<unsigned char*>(dst.data()));
- }
-+#else
-+template <size_type Size>
-+inline void Sha(
-+ bytes::span dst,
-+ char const * const method,
-+ bytes::const_span data) {
-+ Expects(dst.size() >= Size);
-+
-+ EVP_Q_digest(NULL, method, NULL,
-+ reinterpret_cast<const unsigned char*>(data.data()),
-+ data.size(),
-+ reinterpret_cast<unsigned char*>(dst.data()),
-+ NULL);
-+}
-+#endif
-
- template <size_type Size, typename Method>
- [[nodiscard]] inline bytes::vector Sha(
diff -up tdesktop-2.7.9-full/Telegram/lib_base/base/zlib_help.h.omv~ tdesktop-2.7.9-full/Telegram/lib_base/base/zlib_help.h
--- tdesktop-2.7.9-full/Telegram/lib_base/base/zlib_help.h.omv~ 2021-06-21 18:29:30.294225688 +0200
+++ tdesktop-2.7.9-full/Telegram/lib_base/base/zlib_help.h 2021-06-21 18:51:37.905984716 +0200