Attempt to include OpenSSL 1.1 with certs to error sending crash reports

olive-editor · Feb 27, 2023 · c5f0903 · c5f0903
1 parent e5db827
commit c5f0903
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -101,6 +101,16 @@ jobs:
           # Inject custom AppRun (linuxdeployqt won't replace if it already exists)
           cp $GITHUB_WORKSPACE/app/packaging/linux/AppRun appdir
 
+          # Manually add OpenSSL 1.1 that Qt was compiled against
+          mkdir -p appdir/usr/lib64/openssl11
+          cp -a /usr/lib64/libssl.so.1.1.1k /usr/lib64/libcrypto.so.1.1.1k appdir/usr/lib64/
+          cp -a /usr/lib64/libssl.so.1.1 /usr/lib64/libcrypto.so.1.1 appdir/usr/lib64/
+          cp -a /usr/lib64/openssl11/libssl.so /usr/lib64/openssl11/libcrypto.so appdir/usr/lib64/openssl11
+          mkdir -p appdir/etc/pki/ca-trust/extracted/pem
+          mkdir -p appdir/etc/pki/tls/certs
+          cp -a /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem appdir/etc/pki/ca-trust/extracted/pem
+          cp -a /etc/pki/tls/certs/ca-bundle.crt appdir/etc/pki/tls/certs
+
           # Process AppDir
           /usr/local/linuxdeployqt-x86_64.AppImage \
             appdir/usr/share/applications/org.olivevideoeditor.Olive.desktop \
@@ -109,6 +119,8 @@ jobs:
             -executable=appdir/usr/bin/crashpad_handler \
             -executable=appdir/usr/bin/minidump_stackwalk \
             -executable=appdir/usr/bin/olive-crashhandler \
+            -executable=appdir/usr/lib64/libssl.so.1.1.1k \
+            -executable=appdir/usr/lib64/libcrypto.so.1.1.1k \
             --appimage-extract-and-run
 
           # Dump Crashpad symbols

diff --git a/docker/scripts/build_olive.sh b/docker/scripts/build_olive.sh
@@ -14,6 +14,16 @@ cmake --install app --prefix appdir/usr
 #libQt5MultimediaGstTools.so,\
 #libQt5MultimediaWidgets.so,\
 
+# Manually add OpenSSL 1.1 that Qt was compiled against
+mkdir -p appdir/usr/lib64/openssl11
+cp -a /usr/lib64/libssl.so.1.1.1k /usr/lib64/libcrypto.so.1.1.1k appdir/usr/lib64/
+cp -a /usr/lib64/libssl.so.1.1 /usr/lib64/libcrypto.so.1.1 appdir/usr/lib64/
+cp -a /usr/lib64/openssl11/libssl.so /usr/lib64/openssl11/libcrypto.so appdir/usr/lib64/openssl11
+mkdir -p appdir/etc/pki/ca-trust/extracted/pem
+mkdir -p appdir/etc/pki/tls/certs
+cp -a /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem appdir/etc/pki/ca-trust/extracted/pem
+cp -a /etc/pki/tls/certs/ca-bundle.crt appdir/etc/pki/tls/certs
+
 /usr/local/linuxdeployqt-x86_64.AppImage \
   appdir/usr/share/applications/org.olivevideoeditor.Olive.desktop \
   -appimage \
@@ -27,6 +37,8 @@ libQt5VirtualKeyboard.so \
   -executable=appdir/usr/bin/crashpad_handler \
   -executable=appdir/usr/bin/minidump_stackwalk \
   -executable=appdir/usr/bin/olive-crashhandler \
+  -executable=appdir/usr/lib64/libssl.so.1.1.1k \
+  -executable=appdir/usr/lib64/libcrypto.so.1.1.1k \
   --appimage-extract-and-run
 
 ./Olive*.AppImage --appimage-extract-and-run --version