From b1606dd1fb7c3a559b94aecf2d0745256b21ac75 Mon Sep 17 00:00:00 2001 From: Floris Bos Date: Sun, 31 Jul 2022 13:14:51 +0200 Subject: [PATCH] Linux: remove leftovers of OpenSSL dependency OpenSSL was replaced by GnuTLS for SHA256 calculation in cb415a6a026ff91da1f5e93933e10c940641f402 Remove left-over header includes and adjust dependencies in README --- README.md | 4 ++-- src/imagewriter.cpp | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 189fc72..64dd1f2 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,8 @@ For the embedded (netboot) build see also "embedded/legal-info" for more informa Install the build dependencies: ``` -sudo apt install --no-install-recommends build-essential devscripts debhelper cmake git libarchive-dev libcurl4-openssl-dev \ - qtbase5-dev qtbase5-dev-tools qtdeclarative5-dev libqt5svg5-dev qttools5-dev libssl-dev \ +sudo apt install --no-install-recommends build-essential devscripts debhelper cmake git libarchive-dev libcurl4-gnutls-dev \ + qtbase5-dev qtbase5-dev-tools qtdeclarative5-dev libqt5svg5-dev qttools5-dev libgnutls28-dev \ qml-module-qtquick2 qml-module-qtquick-controls2 qml-module-qtquick-layouts qml-module-qtquick-templates2 qml-module-qtquick-window2 qml-module-qtgraphicaleffects ``` diff --git a/src/imagewriter.cpp b/src/imagewriter.cpp index 65b3faf..ad4d035 100644 --- a/src/imagewriter.cpp +++ b/src/imagewriter.cpp @@ -39,9 +39,6 @@ #ifdef Q_OS_DARWIN #include #include -#else -#include "openssl/evp.h" -#include "openssl/sha.h" #endif #ifdef Q_OS_WIN @@ -60,6 +57,7 @@ #include #endif + ImageWriter::ImageWriter(QObject *parent) : QObject(parent), _repo(QUrl(QString(OSLIST_URL))), _dlnow(0), _verifynow(0), _engine(nullptr), _thread(nullptr), _verifyEnabled(false), _cachingEnabled(false),