Various Windows Build Fixes

* Fix keepassxreboot#1846, kdbx is registered to KeePassXC with an icon (locked database icon) * Fix keepassxreboot#2489, OpenSSL and Crypto libraries are packaged to support https connections * Fix minor typo in KeeShare (missing "?")
AnatomicJC · Feb 20, 2019 · 6801c15 · 6801c15
1 parent 2d183ed
commit 6801c15
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 1 deletion.
diff --git 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"
diff --git a/share/windows/keepassxc-kdbx.ico b/share/windows/keepassxc-kdbx.ico
diff --git 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" />
   </CPackWiXFragment>
+  <CPackWiXFragment Id="CM_CP_KeePassXC.exe">
+    <ProgId Id="KeePassXC.kdbx" Description="KeePass Password Database" Icon="CM_FP_KeePassXC.exe" IconIndex="1">
+      <Extension Id="kdbx" ContentType="application/x-keepass2">
+        <Verb Id="open" Command="open" TargetFile="CM_FP_KeePassXC.exe" Argument="&quot;%1&quot;"/>
+      </Extension>
+    </ProgId>
+  </CPackWiXFragment>
 </CPackWiXPatch>
diff --git 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
@@ -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);