Try to deal with the non-standard OpenSSL3 setup in Coin VMs

 * The system's OpenSSL libs might be different (even 1.x based) than
   the 3.x libs Qt is built against.
 * macOS still cannot handle the new default algorithms used by
   OpenSSL 3 for PKCS#12, so we have to create these using "-legacy".
 * Also be lenient in the packager and try to use old certificates, if
   the user specifies them: they might be deployed to a legacy system.

Change-Id: Icbcb8e53d6d0d102bb51b28780712adb4e919401
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit b62b9a37b752e153385b3dc9460c4b010b6d3a1a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

3 files changed, 5 insertions, 2 deletions

diff --git a/src/crypto-lib/libcryptofunction.cpp b/src/crypto-lib/libcryptofunction.cpp
index 142eac25..c485529a 100644
--- a/src/crypto-lib/libcryptofunction.cpp
+++ b/src/crypto-lib/libcryptofunction.cpp
@@ -60,7 +60,7 @@ bool Cryptography::LibCryptoFunctionBase::initialize(bool loadOpenSsl3LegacyProv
         unsigned long version = 0;
 
         if (am_OpenSSL_version_num.functionPointer())
-            version = am_OpenSSL_version_num();  // 1.1
+            version = am_OpenSSL_version_num();  // 1.1 and 3.x
         else if (am_SSLeay.functionPointer())
             version = am_SSLeay(); // 1.0
 
diff --git a/src/tools/appman/appman.cpp b/src/tools/appman/appman.cpp
index 53c518e8..03646bd9 100644
--- a/src/tools/appman/appman.cpp
+++ b/src/tools/appman/appman.cpp
@@ -11,7 +11,6 @@
 #include "logging.h"
 #include "main.h"
 #include "configuration.h"
-#include "packageutilities.h"
 #if !defined(AM_DISABLE_INSTALLER)
 #  include "sudo.h"
 #endif
diff --git a/src/tools/packager/packager.cpp b/src/tools/packager/packager.cpp
index fd0bfffc..babb64dc 100644
--- a/src/tools/packager/packager.cpp
+++ b/src/tools/packager/packager.cpp
@@ -17,6 +17,7 @@
 #include <QtAppManCommon/exception.h>
 #include <QtAppManCommon/qtyaml.h>
 #include <QtAppManCommon/utilities.h>
+#include <QtAppManCrypto/cryptography.h>
 #include <QtAppManPackage/packageutilities.h>
 #include "packagingjob.h"
 
@@ -64,6 +65,9 @@ static Command command(QCommandLineParser &clp)
 
 int main(int argc, char *argv[])
 {
+    // enable OpenSSL3 to load old certificates
+    Cryptography::enableOpenSsl3LegacyProvider();
+
     PackageUtilities::ensureCorrectLocale();
 
     QCoreApplication::setApplicationName(qSL("Qt ApplicationManager Packager"));