From c9f91b2de567fcec4efe4e596945acbeffe42af5 Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Thu, 31 Jan 2019 17:50:16 -0500 Subject: [PATCH] Various Windows Build Fixes * Fix #1846, kdbx is registered to KeePassXC with an icon (locked database icon) * Fix #2489, OpenSSL and Crypto libraries are packaged to support https connections * Fix minor typo in KeeShare (missing "?") --- share/windows/icon.rc | 1 + share/windows/keepassxc-kdbx.ico | Bin 0 -> 85182 bytes share/windows/wix-patch.xml | 7 +++++++ src/CMakeLists.txt | 6 ++++++ src/keeshare/ShareObserver.cpp | 2 +- 5 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 share/windows/keepassxc-kdbx.ico diff --git a/share/windows/icon.rc b/share/windows/icon.rc index 42221fe4e..aa025d85c 100644 --- a/share/windows/icon.rc +++ b/share/windows/icon.rc @@ -1 +1,2 @@ IDI_ICON1 ICON DISCARDABLE "keepassxc.ico" +IDI_KDBX ICON DISCARDABLE "keepassxc-kdbx.ico" \ No newline at end of file diff --git a/share/windows/keepassxc-kdbx.ico b/share/windows/keepassxc-kdbx.ico new file mode 100644 index 0000000000000000000000000000000000000000..266046b9fd93d1e796c6790e46c214779d5b5f2d GIT binary patch literal 85182 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 literal 0 HcmV?d00001 diff --git a/share/windows/wix-patch.xml b/share/windows/wix-patch.xml index 1c1d222a9..205ffa352 100644 --- a/share/windows/wix-patch.xml +++ b/share/windows/wix-patch.xml @@ -5,4 +5,11 @@ Name="KeePassXC" Icon="ProductIcon.ico" WorkingDirectory="INSTALL_ROOT" Advertise="yes" /> + + + + + + + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3819ab7df..110dc606c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -428,4 +428,10 @@ if(MINGW) # install CA cert chains install(FILES ${Qt5_PREFIX}/ssl/certs/ca-bundle.crt DESTINATION "ssl/certs") + # install OpenSSL library + if(WITH_XC_NETWORKING) + find_library(OPENSSL_DLL NAMES libssl-1_1.dll libssl-1_1-x64.dll PATH_SUFFIXES bin) + find_library(CRYPTO_DLL NAMES libcrypto-1_1.dll libcrypto-1_1-x64.dll PATH_SUFFIXES bin) + install(FILES ${OPENSSL_DLL} ${CRYPTO_DLL} DESTINATION ".") + endif() endif() diff --git a/src/keeshare/ShareObserver.cpp b/src/keeshare/ShareObserver.cpp index 1660a0990..89352c8ab 100644 --- a/src/keeshare/ShareObserver.cpp +++ b/src/keeshare/ShareObserver.cpp @@ -126,7 +126,7 @@ namespace } else { warning.setIcon(QMessageBox::Question); warning.setWindowTitle(ShareObserver::tr("Import from container with certificate")); - warning.setText(ShareObserver::tr("Do you want to trust %1 with the fingerprint of %2 from %3") + warning.setText(ShareObserver::tr("Do you want to trust %1 with the fingerprint of %2 from %3?") .arg(certificate.signer, certificate.fingerprint(), reference.path)); } auto untrustedOnce = warning.addButton(ShareObserver::tr("Not this time"), QMessageBox::ButtonRole::NoRole);