From 5312a6e885b92747447ff2825a9c880abb9b1b07 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Mon, 8 Apr 2024 15:49:18 +0100
Subject: [PATCH]  Update OpenSSL (3.0.13) and libssh (0.10.6) (#733)

Update OpenSSL (3.0.13) and libssh (0.10.6)
---
 client/3rd-prebuilt                        | 2 +-
 client/3rd/QSimpleCrypto/include/QX509.h   | 2 +-
 client/3rd/QSimpleCrypto/sources/QX509.cpp | 2 +-
 client/cmake/android.cmake                 | 2 --
 client/main.cpp                            | 1 -
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/client/3rd-prebuilt b/client/3rd-prebuilt
index ab4e6b68..3704ff36 160000
--- a/client/3rd-prebuilt
+++ b/client/3rd-prebuilt
@@ -1 +1 @@
-Subproject commit ab4e6b680dc3d3d81809886c2c25b77750659c1a
+Subproject commit 3704ff36363f7269387f6d1d2546eb8700f79f4b
diff --git a/client/3rd/QSimpleCrypto/include/QX509.h b/client/3rd/QSimpleCrypto/include/QX509.h
index 96e0c76c..c31cb9e4 100644
--- a/client/3rd/QSimpleCrypto/include/QX509.h
+++ b/client/3rd/QSimpleCrypto/include/QX509.h
@@ -72,7 +72,7 @@ namespace QSimpleCrypto
         /// \param notAfter - X509 end date.
         /// \return Returns OpenSSL X509 structure or nullptr, if error happened. Returned value must be cleaned up with 'X509_free' to avoid memory leak.
         ///
-        X509* generateSelfSignedCertificate(const RSA* rsa, const QMap<QByteArray, QByteArray>& additionalData,
+        X509* generateSelfSignedCertificate(RSA* rsa, const QMap<QByteArray, QByteArray>& additionalData,
             const QByteArray& certificateFileName = "", const EVP_MD* md = EVP_sha512(),
             const long& serialNumber = 1, const long& version = x509LastVersion,
             const long& notBefore = 0, const long& notAfter = oneYear);
diff --git a/client/3rd/QSimpleCrypto/sources/QX509.cpp b/client/3rd/QSimpleCrypto/sources/QX509.cpp
index 8666347d..ac4fd270 100644
--- a/client/3rd/QSimpleCrypto/sources/QX509.cpp
+++ b/client/3rd/QSimpleCrypto/sources/QX509.cpp
@@ -139,7 +139,7 @@ X509* QSimpleCrypto::QX509::verifyCertificate(X509* x509, X509_STORE* store)
 /// \param notAfter - X509 end date.
 /// \return Returns OpenSSL X509 structure or nullptr, if error happened. Returned value must be cleaned up with 'X509_free' to avoid memory leak.
 ///
-X509* QSimpleCrypto::QX509::generateSelfSignedCertificate(const RSA* rsa, const QMap<QByteArray, QByteArray>& additionalData,
+X509* QSimpleCrypto::QX509::generateSelfSignedCertificate(RSA* rsa, const QMap<QByteArray, QByteArray>& additionalData,
     const QByteArray& certificateFileName, const EVP_MD* md,
     const long& serialNumber, const long& version,
     const long& notBefore, const long& notAfter)
diff --git a/client/cmake/android.cmake b/client/cmake/android.cmake
index aa22456f..9dbef371 100644
--- a/client/cmake/android.cmake
+++ b/client/cmake/android.cmake
@@ -50,7 +50,5 @@ foreach(abi IN ITEMS ${QT_ANDROID_ABIS})
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/android/${abi}/libovpnutil.so
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/android/${abi}/librsapss.so
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/libssh/android/${abi}/libssh.so
-        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openssl3/android/${abi}/libcrypto_3.so
-        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openssl3/android/${abi}/libssl_3.so
     )
 endforeach()
diff --git a/client/main.cpp b/client/main.cpp
index 77c91fbc..540ee6fd 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -29,7 +29,6 @@ int main(int argc, char *argv[])
 #ifdef Q_OS_ANDROID
     // QTBUG-95974 QTBUG-95764 QTBUG-102168
     qputenv("QT_ANDROID_DISABLE_ACCESSIBILITY", "1");
-    qputenv("ANDROID_OPENSSL_SUFFIX", "_3");
 #endif
 
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)