Release 2.5.2

Added

- Browser: Show UI warning when entering invalid URLs [#3912]
- Browser: Option to use an entry only for HTTP auth [#3927]

Changed

- Disable the user interface when merging or saving the database [#3991]
- Ability to hide protected attribute after reveal [#3877]
- Remove mention of "snaps" in Windows and macOS [#3879]
- CLI: Merge parameter for source database key file (--key-file-from) [#3961]
- Improve GUI tests reliability on Hi-DPI displays [#4075]
- Disable deprecation warnings to allow building with Qt 5.14+ [#4075]
- OPVault: Use 'otp' attribute for TOTP field imports [#4075]

Fixed

- Fix crashes when saving a database to cloud storage [#3991]
- Fix crash when pressing enter twice while opening database [#3885]
- Fix handling of HTML when displayed in the entry preview panel [#3910]
- Fix start minimized to tray on Linux [#3899]
- Fix Auto Open with key file only databases [#4075]
- Fix escape key closing the standalone password generator [#3892]
- macOS: Fix monospace font usage in password field and notes [#4075]
- macOS: Fix building on macOS 10.9 to 10.11 [#3946]
- Fix TOTP setup dialog not closing on database lock [#4075]
- Browser: Fix condition where additional URLs are ignored [#4033]
- Browser: Fix subdomain matching to return only relevant site entries [#3854]
- Secret Service: Fix multiple crashes and incompatibilities [#3871, #4009, #4074]
- Secret Service: Fix searching of entries [#4008, #4036]
- Secret Service: Fix behavior when exposed group is recycled [#3914]
- CLI: Release the database instance before exiting interactive mode [#3889]
- Fix (most) memory leaks in tests [#3922]

.clang-format

@@ -23,15 +23,14 @@ BraceWrapping:
   AfterClass:      true
   AfterFunction:   true
   AfterControlStatement: false
-  AfterEnum:       false
-  AfterNamespace:  false
-  AfterObjCDeclaration: false
-  AfterStruct:     false
-  AfterUnion:      false
+  AfterEnum:       true
+  AfterNamespace:  true
+  AfterStruct:     true
+  AfterUnion:      true
   BeforeCatch:     false
   BeforeElse:      false
   IndentBraces:    false
-BreakBeforeBinaryOperators: None
+BreakBeforeBinaryOperators: NonAssignment
 BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: true

.github/CONTRIBUTING.md

@@ -53,7 +53,7 @@ If we reject your contribution, it means only that we do not consider it suitabl
 ## How can I contribute?
 ### Feature requests
 
-We're always looking for suggestions to improve our application. If you have a suggestion to improve an existing feature, or would like to suggest a completely new feature for KeePassXC, please use the [issue tracker on GitHub][issues-section]. For more general discussion, try using our [Google Groups][google-groups] forum.
+We're always looking for suggestions to improve our application. If you have a suggestion to improve an existing feature, or would like to suggest a completely new feature for KeePassXC, please use the [issue tracker on GitHub][issues-section].
 
 ### Bug reports
 
@@ -63,7 +63,7 @@ Before submitting a bug report, check if the problem has already been reported.
 
 ### Discuss with the team
 
-As with feature requests, you can talk to the KeePassXC team about bugs, new features, other issues and pull requests on the dedicated issue tracker, using the [Google Groups][google-groups] forum, or in the IRC channel on Freenode (`#keepassxc-dev` on `irc.freenode.net`, or use a [webchat link](https://webchat.freenode.net/?channels=%23keepassxc-dev)).
+As with feature requests, you can talk to the KeePassXC team about bugs, new features, other issues and pull requests on the dedicated issue tracker, or in the IRC channel on Freenode (`#keepassxc-dev` on `irc.freenode.net`, or use a [webchat link](https://webchat.freenode.net/?channels=%23keepassxc-dev)).
 
 ### Your first code contribution
 
@@ -94,7 +94,7 @@ The Branch Strategy is based on [git-flow-lite](http://nvie.com/posts/a-successf
 * **master** – points to the latest public release
 * **develop** – points to the development of the next release, contains tested and reviewed code
 * **feature/**[name] – points to a branch with a new feature, one which is candidate for merge into develop (subject to rebase)
-* **hotfix/**[id]-[description] – points to a branch with a fix for a particular issue ID
+* **hotfix/**[name] – points to a branch with a fix for a particular issue ID
 
 
 ### Git commit messages
@@ -103,24 +103,16 @@ The Branch Strategy is based on [git-flow-lite](http://nvie.com/posts/a-successf
 * Use the imperative mood ("Move cursor to…" not "Moves cursor to…")
 * Limit the first line to 72 characters or less
 * Reference issues and pull requests liberally
-* When only changing documentation, include `[ci skip]` in the commit description
-* Consider starting the commit message with an applicable emoji:
-    * :memo: `:memo:` when writing docs
-    * :penguin: `:penguin:` when fixing something on Linux
-    * :apple: `:apple:` when fixing something on macOS
-    * :checkered_flag: `:checkered_flag:` when fixing something on Windows
-    * :bug: `:bug:` when fixing a bug
-    * :fire: `:fire:` when removing code or files
-    * :green_heart: `:green_heart:` when fixing the CI build
-    * :white_check_mark: `:white_check_mark:` when adding tests
-    * :lock: `:lock:` when dealing with security
-
+* If your pull request fixes an existing issue, add "Fixes #ISSUENUMBER" to your pull request description
 
 ### Coding styleguide
 
-This project follows the [Qt Coding Style](https://wiki.qt.io/Qt_Coding_Style). All submissions are expected to follow this style.
+The coding style of the project is enforced using llvm's `clang-format` formatting tool. A thorough description
+of the coding style can be found in the `.clang-format` file, but the main conventions are presented here.
 
-In particular, code must stick to the following rules:
+Formatting can be performed automatically by calling `make format` from the `build/` directory.
+
+Note that [formatting can be disabled on a piece of code](https://clang.llvm.org/docs/ClangFormatStyleOptions.html#disabling-formatting-on-a-piece-of-code) if manual formatting is deemed more readable.
 
 #### Naming convention
 `lowerCamelCase`
@@ -129,18 +121,70 @@ For names made of only one word, the first letter should be lowercase.
 For names made of multiple concatenated words, the first letter of the whole is lowercase, and the first letter of each subsequent word is capitalized.
 
 #### Indention
-For **C++ files** (*.cpp .h*): 4 spaces  
+For **C++ files** (*.cpp .h*): 4 spaces
 For **Qt-UI files** (*.ui*): 2 spaces
 
-#### Pointers
-```c
+#### Includes
+```cpp
+// Class includes
+#include "MyWidget.h"
+#include "ui_MyWidget.h"
+
+// Application includes
+#include "core/Config.h"
+#include "core/FilePath.h"
+
+// Global includes
+#include <QWidget>
+#include <stdin>
+```
+
+#### Classes
+```cpp
+// Note: order is important, stay organized!
+class MyWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit MyWidget(QWidget* parent);
+    ~MyWidget() override;
+
+signals:
+    void alert();
+
+public slots:
+    void processEvent(Event* event);
+
+private slots:
+    void myEvent(Event* event);
+
+private:
+    const QScopedPointer<Ui::MyWidget> m_ui;
+    int m_counter;
+};
+
+// Note: alignment of variable initialization
+MyWidget::MyWidget(QWidget* parent)
+    : QWidget(parent)
+    , m_ui(new Ui::MyWidget())
+{
+
+}
+```
+
+#### Pointers / References
+```cpp
 int* count;
+const QString& string;
 ```
 
 #### Braces
-```c
+```cpp
 if (condition) {
     doSomething();
+} else {
+    doSomethingElse();
 }
 
 void ExampleClass::exampleFunction()
@@ -150,16 +194,19 @@ void ExampleClass::exampleFunction()
 ```
 
 #### Switch statement
-```c
+```cpp
+// Note: avoid declaring variables in a switch statement
 switch (a) {
 case 1:
     doSomething();
     break;
 
-default:
+// Note: use braces if necessary
+default: {
     doSomethingElse();
     break;
 }
+}
 ```
 
 #### Member variables
@@ -174,7 +221,6 @@ Example: `<widget class="QCheckBox" name="rememberCheckBox">`
 
 
 
-[beginner]:https://github.com/keepassxreboot/keepassx/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner+label%3A%22help+wanted%22+sort%3Acomments-desc
+[beginner]:https://github.com/keepassxreboot/keepassxc/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22+sort%3Acomments-desc+
 [help-wanted]:https://github.com/keepassxreboot/keepassx/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22+sort%3Acomments-desc
 [issues-section]:https://github.com/keepassxreboot/keepassxc/issues
-[google-groups]:https://groups.google.com/forum/#!forum/keepassx-reboot

.github/ISSUE_TEMPLATE.md

@@ -1,32 +0,0 @@
-<!--- Provide a general summary of the issue in the title above -->
-
-## Expected Behavior
-<!--- If you're describing a bug, tell us what should happen -->
-<!--- If you're suggesting a change/improvement, tell us how it should work -->
-
-## Current Behavior
-<!--- If describing a bug, tell us what happens instead of the expected behavior -->
-<!--- If suggesting a change/improvement, explain the difference from the current behavior -->
-
-## Possible Solution
-<!--- Not obligatory, but suggest a fix/reason for the bug, -->
-<!--- or ideas how to implement the addition or change -->
-
-## Steps to Reproduce (for bugs)
-<!--- Provide a link to a live example, or an unambiguous set of steps to -->
-<!--- reproduce this bug. Include code to reproduce, if relevant -->
-1.
-2.
-3.
-4.
-
-## Context
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
-
-## Your Environment
-<!--- Include relevant details about the environment you experienced the bug in -->
-* KeePassXC version/commit used: (can be found under Help -> About)
-* Qt version (e.g. Qt 5.3): 
-* Compiler (e.g. Clang++3.6.0): 
-* Operating System and version: 

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,49 @@
+---
+name: Bug Report
+about: provide information about a problem
+title: 
+labels: bug
+assignees: ''
+
+---
+
+[TIP]:  # ( Provide a general summary of the issue in the title above ^^ )
+[TIP]:  # ( DO NOT include screenshots of your actual database! )
+
+## Expected Behavior
+[NOTE]: # ( Tell us what you expected to happen )
+
+
+## Current Behavior
+[NOTE]: # ( Tell us what actually happens )
+
+
+## Possible Solution
+[NOTE]: # ( Not required, but suggest a fix/reason for the bug )
+
+
+## Steps to Reproduce
+[NOTE]: # ( Provide a link to a live example, or an unambiguous set of steps to )
+[NOTE]: # ( reproduce this bug. Include code to reproduce, if relevant )
+1.
+2.
+3.
+
+## Context
+[NOTE]: # ( How has this issue affected you? What unique circumstances do you have? )
+
+
+## Debug Info
+[NOTE]: # ( Paste debug info from Help → About here )
+KeePassXC - VERSION
+Revision: REVISION
+
+Libraries:
+- LIBS
+
+Operating system: OS
+CPU architecture: ARCH
+Kernel: KERNEL
+
+Enabled extensions:
+- EXTENSIONS

.github/ISSUE_TEMPLATE/feature-request.md

@@ -0,0 +1,26 @@
+---
+name: Feature Request
+about: tell us about a new capability you want to see
+title: 
+labels: new feature
+assignees: ''
+
+---
+
+[TIP]:  # ( Provide a general summary of the feature in the title above ^^ )
+[TIP]:  # ( DO NOT include screenshots of your actual database! )
+
+## Summary
+[NOTE]: # ( Provide a brief overview of what the new feature is all about )
+
+
+## Desired Behavior
+[NOTE]: # ( Tell us how the new feature should work, be specific )
+
+
+## Possible Solution
+[NOTE]: # ( Not required, but suggest ideas on how to implement the addition or change )
+
+
+## Context
+[NOTE]: # ( Why does this feature matter to you? What unique circumstances do you have? )

.github/ISSUE_TEMPLATE/release-preview-bug-report.md

@@ -0,0 +1,49 @@
+---
+name: Release Preview Bug report
+about: report a bug with a release preview (eg, 2.4.0-beta1)
+title: "[PRE-RELEASE] "
+labels: PRE-RELEASE BUG
+assignees: droidmonkey
+
+---
+
+[TIP]:  # ( Provide a general summary of the issue in the title above ^^ )
+[TIP]:  # ( DO NOT include screenshots of your actual database! )
+
+## Expected Behavior
+[NOTE]: # ( Tell us what you expected to happen )
+
+
+## Current Behavior
+[NOTE]: # ( Tell us what actually happens )
+
+
+## Possible Solution
+[NOTE]: # ( Not required, but suggest a fix/reason for the bug )
+
+
+## Steps to Reproduce
+[NOTE]: # ( Provide a link to a live example, or an unambiguous set of steps to )
+[NOTE]: # ( reproduce this bug. Include code to reproduce, if relevant )
+1.
+2.
+3.
+
+## Context
+[NOTE]: # ( How has this issue affected you? What unique circumstances do you have? )
+
+
+## Debug Info
+[NOTE]: # ( Paste debug info from Help → About here )
+KeePassXC - VERSION
+Revision: REVISION
+
+Libraries:
+- LIBS
+
+Operating system: OS
+CPU architecture: ARCH
+Kernel: KERNEL
+
+Enabled extensions:
+- EXTENSIONS

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,34 +1,36 @@
-<!--- Provide a general summary of your changes in the title above -->
+[TIP]:  # ( Provide a general summary of your changes in the title above ^^ )
 
-## Description
-<!--- Describe your changes in detail -->
-
-## Motivation and context
-<!--- Why is this change required? What problem does it solve? -->
-<!--- If it fixes an open issue, please link to the issue here. -->
-
-## How has this been tested?
-<!--- Please describe in detail how you tested your changes. -->
-<!--- Include details of your testing environment, and the tests you ran to -->
-<!--- see how your change affects other areas of the code, etc. -->
-
-## Screenshots (if appropriate):
-
-## Types of changes
-<!--- What types of changes does your code introduce? -->
-<!--- Please remove all lines which don't apply. -->
+## Type of change
+[NOTE]: # ( Please remove all lines which don't apply. )
 - ✅ Bug fix (non-breaking change which fixes an issue)
+- ✅ Refactor (significant modification to existing code)
 - ✅ New feature (non-breaking change which adds functionality)
 - ✅ Breaking change (fix or feature that would cause existing functionality to change)
+- ✅ Documentation (non-code change)
+
+## Description and Context
+[NOTE]: # ( Describe your changes in detail, why is this change required? )
+[NOTE]: # ( Describe the context of your change. Explain large code modifications. )
+[NOTE]: # ( If it fixes an open issue, please add "Fixes #XXX" as necessary )
+
+
+## Screenshots
+[TIP]:  # ( Do not include screenshots of your actual database! )
+
+
+## Testing strategy
+[NOTE]: # ( Please describe in detail how you tested your changes. )
+[TIP]:  # ( We expect new code to be covered by unit tests and documented with doc blocks! )
+
 
 ## Checklist:
-<!--- Please go over all the following points. -->
-<!--- Again, remove any lines which don't apply. -->
-<!--- Pull Requests that don't fulfill all [REQUIRED] requisites are likely -->
-<!--- to be sent back to you for correction or will be rejected.  -->
+[NOTE]: # ( Please go over all the following points. )
+[NOTE]: # ( Again, remove any lines which don't apply. )
+[NOTE]: # ( Pull Requests that don't fulfill all [REQUIRED] requisites are likely )
+[NOTE]: # ( to be sent back to you for correction or will be rejected.  )
 - ✅ I have read the **CONTRIBUTING** document. **[REQUIRED]**
 - ✅ My code follows the code style of this project. **[REQUIRED]**
 - ✅ All new and existing tests passed. **[REQUIRED]**
 - ✅ I have compiled and verified my code with `-DWITH_ASAN=ON`. **[REQUIRED]**
-- ✅ My change requires a change to the documentation and I have updated it accordingly.
+- ✅ My change requires a change to the documentation, and I have updated it accordingly.
 - ✅ I have added tests to cover my changes.

.gitignore

@@ -7,3 +7,17 @@ release*/
 *.kdev4
 
 \.vscode/
+*.swp
+
+.DS_Store
+.version
+desktop.ini
+\.scannerwork/
+
+/snap/.snapcraft/
+/parts/
+/stage/
+/prime/
+/*.snap
+/*_source.tar.bz2
+

.travis.yml

@@ -1,47 +0,0 @@
-language: cpp
-sudo: required
-dist: trusty
-# FIXME : remove when (https://github.com/google/sanitizers/issues/837) is resolved.
-group: deprecated-2017Q3
-services: [docker]
-
-os:
-  - linux
-#  - osx
-
-# Define clang compiler without any frills
-compiler:
-  - clang
-  - gcc
-
-env:
-  - CONFIG=Release ASAN_OPTIONS=detect_odr_violation=1:leak_check_at_exit=0
-  - CONFIG=Debug ASAN_OPTIONS=detect_odr_violation=1:leak_check_at_exit=0
-
-git:
-  depth: 3
-
-before_install:
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install cmake libclang-common-3.5-dev libxi-dev qtbase5-dev libqt5x11extras5-dev qttools5-dev qttools5-dev-tools libgcrypt20-dev zlib1g-dev libxtst-dev xvfb libyubikey-dev libykpers-1-dev;  fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew ls | grep -wq cmake || brew install cmake; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew ls | grep -wq qt5 || brew install qt5; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew ls | grep -wq libgcrypt || brew install libgcrypt; fi
-
-before_script:
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then CMAKE_ARGS="-DCMAKE_PREFIX_PATH=/usr/local/opt/qt5"; fi
-  - mkdir build && pushd build
-
-script:
-  - cmake -DCMAKE_BUILD_TYPE=${CONFIG} -DWITH_GUI_TESTS=ON -DWITH_ASAN=ON -DWITH_XC_HTTP=ON -DWITH_XC_AUTOTYPE=ON -DWITH_XC_YUBIKEY=ON $CMAKE_ARGS ..
-  - make -j2
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then make test ARGS+="-E testgui --output-on-failure"; fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then xvfb-run -a --server-args="-screen 0 800x600x24" make test ARGS+="-R testgui --output-on-failure"; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then make test ARGS+="--output-on-failure"; fi
-
-# Generate snapcraft build when merging into master/develop branches
-#after_success:
-#  - popd
-#  - "[[ $DEPLOY = 1 ]] && [[ $CONFIG = Release ]] && [[ $TRAVIS_BRANCH =~ (master|develop) ]] && [[ $TRAVIS_PULL_REQUEST = false ]] \
-#    && docker run -v $(pwd):/cwd snapcore/snapcraft sh -c 'cd /cwd && apt update && snapcraft'"

.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[keepassxc.keepassx_ents]
+[keepassxc.keepassxc]
 source_file = share/translations/keepassx_en.ts
 file_filter = share/translations/keepassx_<lang>.ts
 source_lang = en

AppImage-Recipe.sh

@@ -1,102 +0,0 @@
-#!/usr/bin/env bash
-# 
-# KeePassXC AppImage Recipe
-# Copyright (C) 2017 KeePassXC team <https://keepassxc.org/>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 or (at your option)
-# version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-if [ "$1" == "" ] || [ "$2" == "" ]; then
-    echo "Usage: $(basename $0) APP_NAME RELEASE_VERSION" >&2
-    exit 1
-fi
-
-if [ -f CHANGELOG ]; then
-    echo "This recipe must not be run from the sources root." >&2
-    exit 1
-fi
-
-if [ ! -d ../bin-release ]; then
-    echo "../bin-release does not exist." >&2
-    exit 1
-fi
-
-APP="$1"
-LOWERAPP="$(echo "$APP" | tr '[:upper:]' '[:lower:]')"
-VERSION="$2"
-export ARCH=x86_64
-
-mkdir -p $APP.AppDir
-wget -q https://github.com/probonopd/AppImages/raw/master/functions.sh -O ./functions.sh
-. ./functions.sh
-
-LIB_DIR=./usr/lib
-if [ -d ./usr/lib/x86_64-linux-gnu ]; then
-    LIB_DIR=./usr/lib/x86_64-linux-gnu
-elif [ -d ./usr/lib64 ]; then
-    LIB_DIR=./usr/lib64
-fi
-
-cd $APP.AppDir
-cp -a ../../bin-release/* .
-cp -a ./usr/local/* ./usr
-rm -R ./usr/local
-rmdir ./opt 2> /dev/null
-
-# bundle Qt platform plugins and themes
-QXCB_PLUGIN="$(find /usr/lib* -name 'libqxcb.so' 2> /dev/null)"
-if [ "$QXCB_PLUGIN" == "" ]; then
-    QXCB_PLUGIN="$(find /opt/qt*/plugins -name 'libqxcb.so' 2> /dev/null)"
-fi
-QT_PLUGIN_PATH="$(dirname $(dirname $QXCB_PLUGIN))"
-mkdir -p ".${QT_PLUGIN_PATH}/platforms"
-cp "$QXCB_PLUGIN" ".${QT_PLUGIN_PATH}/platforms/"
-
-get_apprun
-copy_deps
-delete_blacklisted
-
-# remove dbus and systemd libs as they are not blacklisted
-find . -name libdbus-1.so.3 -exec rm {} \;
-find . -name libsystemd.so.0 -exec rm {} \;
-
-get_desktop
-get_icon
-cat << EOF > ./usr/bin/keepassxc_env
-#!/usr/bin/env bash
-export LD_LIBRARY_PATH="..$(dirname ${QT_PLUGIN_PATH})/lib:\${LD_LIBRARY_PATH}"
-export QT_PLUGIN_PATH="..${QT_PLUGIN_PATH}:\${KPXC_QT_PLUGIN_PATH}"
-
-# unset XDG_DATA_DIRS to make tray icon work in Ubuntu Unity
-# see https://github.com/AppImage/AppImageKit/issues/351
-unset XDG_DATA_DIRS
-
-if [ "\${1}" == "cli" ]; then
-    shift
-    exec keepassxc-cli "\$@"
-else
-    exec keepassxc "\$@"
-fi
-EOF
-chmod +x ./usr/bin/keepassxc_env
-sed -i 's/Exec=keepassxc/Exec=keepassxc_env/' org.keepassxc.desktop
-get_desktopintegration $LOWERAPP
-
-GLIBC_NEEDED=$(glibc_needed)
-
-cd ..
-
-generate_type2_appimage
-
-mv ../out/*.AppImage ../KeePassXC-${VERSION}-${ARCH}.AppImage
-rmdir ../out > /dev/null 2>&1

CHANGELOG

@@ -1,261 +0,0 @@
-2.2.2 (2017-10-22)
-=========================
-
-- Fixed entries with empty URLs being reported to KeePassHTTP clients [#1031]
-- Fixed YubiKey detection and enabled CLI tool for AppImage binary [#1100]
-- Added AppStream description [#1082]
-- Improved TOTP compatibility and added new Base32 implementation [#1069]
-- Fixed error handling when processing invalid cipher stream [#1099]
-- Fixed double warning display when opening a database [#1037]
-- Fixed unlocking databases with --pw-stdin [#1087]
-- Added ability to override QT_PLUGIN_PATH environment variable for AppImages [#1079]
-- Fixed transform seed not being regenerated when saving the database [#1068]
-- Fixed only one YubiKey slot being polled [#1048]
-- Corrected an issue with entry icons while merging [#1008]
-- Corrected desktop and tray icons in Snap package [#1030]
-- Fixed screen lock and Google fallback settings [#1029]
-
-2.2.1 (2017-10-01)
-=========================
-
-- Corrected multiple snap issues [#934, #1011]
-- Corrected multiple custom icon issues [#708, #719, #994]
-- Corrected multiple Yubikey issues [#880]
-- Fixed single instance preventing load on occasion [#997]
-- Keep entry history when merging databases [#970]
-- Prevent data loss if passwords were mismatched [#1007]
-- Fixed crash after merge [#941]
-- Added configurable auto-type default delay [#703]
-- Unlock database dialog window comes to front [#663]
-- Translation and compiling fixes
-
-2.2.0 (2017-06-23)
-=========================
-
-- Added YubiKey 2FA integration for unlocking databases [#127]
-- Added TOTP support [#519]
-- Added CSV import tool [#146, #490]
-- Added KeePassXC CLI tool [#254]
-- Added diceware password generator [#373]
-- Added support for entry references [#370, #378]
-- Added support for Twofish encryption [#167]
-- Enabled DEP and ASLR for in-memory protection [#371]
-- Enabled single instance mode [#510]
-- Enabled portable mode [#645]
-- Enabled database lock on screensaver and session lock [#545]
-- Redesigned welcome screen with common features and recent databases [#292]
-- Multiple updates to search behavior [#168, #213, #374, #471, #603, #654]
-- Added auto-type fields {CLEARFIELD}, {SPACE}, {{}, {}} [#267, #427, #480]
-- Fixed auto-type errors on Linux [#550]
-- Prompt user prior to executing a cmd:// URL [#235]
-- Entry attributes can be protected (hidden) [#220]
-- Added extended ascii to password generator [#538]
-- Added new database icon to toolbar [#289]
-- Added context menu entry to empty recycle bin in databases [#520]
-- Added "apply" button to entry and group edit windows [#624]
-- Added macOS tray icon and enabled minimize on close [#583]
-- Fixed issues with unclean shutdowns [#170, #580]
-- Changed keyboard shortcut to create new database to CTRL+SHIFT+N [#515]
-- Compare window title to entry URLs [#556]
-- Implemented inline error messages [#162]
-- Ignore group expansion and other minor changes when making database "dirty" [#464]
-- Updated license and copyright information on souce files [#632]
-- Added contributors list to about dialog [#629]
-
-2.1.4 (2017-04-09)
-=========================
-
-- Bumped KeePassHTTP version to 1.8.4.2
-- KeePassHTTP confirmation window comes to foreground [#466]
-
-2.1.3 (2017-03-03)
-=========================
-
-- Fix possible overflow in zxcvbn library [#363]
-- Revert HiDPI setting to avoid problems on laptop screens [#332]
-- Set file meta properties in Windows executable [#330]
-- Suppress error message when auto-reloading a locked database [#345]
-- Improve usability of question dialog when database is already locked by a different instance [#346]
-- Fix compiler warnings in QHttp library [#351]
-- Use unified toolbar on Mac OS X [#361]
-- Fix an issue on X11 where the main window would be raised instead of closed on Alt+F4 [#362]
-
-2.1.2 (2017-02-17)
-=========================
-
-- Ask for save location when creating a new database [#302]
-- Remove Libmicrohttpd dependency to clean up the code and ensure better OS X compatibility [#317, #265]
-- Prevent Qt from degrading Wifi network performance on certain platforms [#318]
-- Visually refine user interface on OS X and other platforms [#299]
-- Remove unusable tray icon setting on OS X [#293]
-- Fix compositing glitches on Ubuntu and prevent flashing when minimizing to the tray at startup [#307]
-- Fix AppImage tray icon on Ubuntu [#277, #273]
-- Fix global menu disappearing after restoring KeePassXC from the tray on Ubuntu [#276]
-- Fix result order in entry search [#320]
-- Enable HiDPI scaling on supported platforms [#315]
-- Remove empty directories from installation target [#282]
-
-2.1.1 (2017-02-06)
-=========================
-
-- Enabled HTTP plugin build; plugin is disabled by default and limited to localhost [#147]
-- Escape HTML in dialog boxes [#247]
-- Corrected crashes in favicon download and password generator [#233, #226]
-- Increase font size of password meter [#228]
-- Fixed compatibility with Qt 5.8 [#211]
-- Use consistent button heights in password generator [#229]
-
-2.1.0 (2017-01-22)
-=========================
-
-- Show unlock dialog when using autotype on a closed database [#10, #89]
-- Show different tray icon when database is locked [#37, #46]
-- Support autotype on Windows and OS X [#42, #60, #63]
-- Add delay feature to autotype [#76, #77]
-- Add password strength meter [#84, #92]
-- Add option for automatically locking the database when minimizing
-  the window [#57]
-- Add feature to download favicons and use them as entry icons [#30]
-- Automatically reload and merge database when the file changed on
-  disk [#22, #33, #93]
-- Add tool for merging two databases [#22, #47, #143]
-- Add --pw-stdin commandline option to unlock the database by providing
-  a password on STDIN [#54]
-- Add utility script for reading the database password from KWallet [#55]
-- Fix some KeePassHTTP settings not being remembered [#34, #65]
-- Make search box persistent [#15, #67, #157]
-- Enhance search feature by scoping the search to selected group [#16, #118]
-- Improve interaction between search field and entry list [#131, #141]
-- Add stand-alone password-generator [#18, #92]
-- Don't require password repetition when password is visible [#27, #92]
-- Add support for entry attributes in autotype sequences [#107]
-- Always focus password field when opening the database unlock widget [#116, #117]
-- Fix compilation errors on various platforms [#53, #126, #130]
-- Restructure and improve kdbx-extract utility [#160]
-
-2.0.3 (2016-09-04)
-=========================
-
-- Improved error reporting when reading / writing databases fails. [#450, #462]
-- Display an error message when opening a custom icon fails.
-- Detect custom icon format based on contents instead of the filename. [#512]
-- Keep symlink intact when saving databases. [#442].
-- Fix a crash when deleting parent group of recycle bin. [#520]
-- Display a confirm dialog before moving an entry to the recycle bin. [#447]
-- Repair UUIDs of inconsistent history items. [#130]
-- Only include top-level windows in auto-type window list when using gnome-shell.
-- Update translations.
-
-2.0.2 (2016-02-02)
-=========================
-
-- Fix regression in database writer that caused it to strip certain special
-  characters (characters from Unicode plane > 0).
-- Fix bug in repair function that caused it to strip non-ASCII characters.
-
-2.0.1 (2016-01-31)
-=========================
-
-- Flush temporary file before opening attachment. [#390]
-- Disable password generator when showing entry in history mode. [#422]
-- Strip invalid XML chars when writing databases. [#392]
-- Add repair function to fix databases with invalid XML chars. [#392]
-- Display custom icons scaled. [#322]
-- Allow opening databases that have no password and keyfile. [#391]
-- Fix crash when importing .kdb files with invalid icon ids. [#425]
-- Update translations.
-
-2.0 (2015-12-06)
-=========================
-
-- Improve UI of the search edit.
-- Clear clipboard when locking databases. [#342]
-- Enable Ctrl+M shortcut to minimize the window on all platforms. [#329]
-- Show a better message when trying to open an old database format. [#338]
-- Fix global auto-type behavior with some window managers.
-- Show global auto-type window on the active desktop. [#359]
-- Disable systray on OS X. [#326]
-- Restore main window when clicking on the OS X docker icon. [#326]
-
-2.0 Beta 2 (2015-09-06)
-=========================
-
-- Fix crash when locking with search UI open [#309]
-- Fix file locking on Mac OS X [#327]
-- Set default extension when saving a database [#79, #308]
-
-2.0 Beta 1 (2015-07-18)
-=========================
-
-- Remember entry column sizes [#159]
-- Add translations
-- Support opening attachments directly
-- Support cmd:// URLs [#244]
-- Protect opened databases with a file lock [#18]
-- Export to csv files [#57]
-- Add optional tray icon [#153]
-- Allow setting the default auto-type sequence for groups [#175]
-- Make the kdbx parser more lenient
-- Remove --password command line option [#285]
-
-2.0 Alpha 6 (2014-04-12)
-=========================
-
-- Add option to lock databases after user inactivity [#62]
-- Add compatibility with libgcrypt 1.6 [#129]
-- Display passwords in monospace font [#51]
-- Use an icon for the button that shows/masks passwords [#38]
-- Add an option to show passwords by default [#93]
-- Improve password generator design [#122]
-- On Linux link .kdbx files with KeePassX
-- Remember window size [#154]
-- Disallow global auto-typing when the database is locked
-
-2.0 Alpha 5 (2013-12-20)
-=========================
-
-- Support copying entries and groups using drag'n'drop [#74]
-- Open last used databases on startup [#36]
-- Made the kdbx file parser more robust
-- Only edit entries on doubleclick (not single) or with enter key
-- Allow removing multiple entries
-- Added option to minimize window when copying data to clipboard
-- Save password generator settings
-- Fixed auto-type producing wrong chars in some keyboard configurations [#116]
-- Added some more actions to the toolbar
-
-2.0 Alpha 4 (2013-03-29)
-=========================
-
-- Add random password generator [#52]
-- Merge the 'Description' tab into the 'Entry' tab [#59]
-- Fix crash when deleting history items [#56]
-- Fix crash on Mac OS X Mountain Lion during startup [#50]
-- Improved KeePassX application icon [#58]
-
-2.0 Alpha 3 (2012-10-27)
-=========================
-
-- Auto-Type on Linux / X11
-- Database locking
-- Fix database corruption when changing key transformation rounds [#34]
-- Verify header data of kdbx files
-- Add menu entry to open URLs in the browser
-- Add menu entry to copy an entry attribute to clipboard
-
-2.0 Alpha 2 (2012-07-02)
-=========================
-
-- Import kdb (KeePass 1) files [#2]
-- Display history items [#23]
-- Implement history item limits [#16]
-- Group and entry icons can be set [#22]
-- Add keyboard shortcuts
-- Search in databases [#24]
-- Sortable entry view
-- Support building Mac OS X bundles
-
-2.0 Alpha 1 (2012-05-07)
-=========================
-
-- First release.

CHANGELOG.md

@@ -0,0 +1,613 @@
+# Changelog
+
+## 2.5.2 (2020-01-04)
+
+### Added
+
+- Browser: Show UI warning when entering invalid URLs [#3912]
+- Browser: Option to use an entry only for HTTP auth [#3927]
+
+### Changed
+
+- Disable the user interface when merging or saving the database [#3991]
+- Ability to hide protected attribute after reveal [#3877]
+- Remove mention of "snaps" in Windows and macOS [#3879]
+- CLI: Merge parameter for source database key file (--key-file-from) [#3961]
+- Improve GUI tests reliability on Hi-DPI displays [#4075]
+- Disable deprecation warnings to allow building with Qt 5.14+ [#4075]
+- OPVault: Use 'otp' attribute for TOTP field imports [#4075]
+
+### Fixed
+
+- Fix crashes when saving a database to cloud storage [#3991]
+- Fix crash when pressing enter twice while opening database [#3885]
+- Fix handling of HTML when displayed in the entry preview panel [#3910]
+- Fix start minimized to tray on Linux [#3899]
+- Fix Auto Open with key file only databases [#4075]
+- Fix escape key closing the standalone password generator [#3892]
+- macOS: Fix monospace font usage in password field and notes [#4075]
+- macOS: Fix building on macOS 10.9 to 10.11 [#3946]
+- Fix TOTP setup dialog not closing on database lock [#4075]
+- Browser: Fix condition where additional URLs are ignored [#4033]
+- Browser: Fix subdomain matching to return only relevant site entries [#3854]
+- Secret Service: Fix multiple crashes and incompatibilities [#3871, #4009, #4074]
+- Secret Service: Fix searching of entries [#4008, #4036]
+- Secret Service: Fix behavior when exposed group is recycled [#3914]
+- CLI: Release the database instance before exiting interactive mode [#3889]
+- Fix (most) memory leaks in tests [#3922]
+
+## 2.5.1 (2019-11-11)
+
+### Added
+
+- Add programmatic use of the EntrySearcher [#3760]
+- Explicitly clear database memory upon locking even if the object is not deleted immediately [#3824]
+- macOS: Add ability to perform notarization of built package [#3827]
+
+### Changed
+
+- Reduce file hash checking to every 30 seconds to correct performance issues [#3724]
+- Correct formatting of notes in entry preview widget [#3727]
+- Improve performance and UX of database statistics page [#3780]
+- Improve interface for key file selection to discourage use of the database file [#3807]
+- Hide Auto-Type sequences column when not needed [#3794]
+- macOS: Revert back to using Carbon API for hotkey detection [#3794]
+- CLI: Do not show protected fields by default [#3710]
+
+### Fixed
+
+- Secret Service: Correct issues interfacing with various applications [#3761]
+- Fix building without additional features [#3693]
+- Fix handling TOTP secret keys that require padding [#3764]
+- Fix database unlock dialog password field focus [#3764]
+- Correctly label open databases as locked on launch [#3764]
+- Prevent infinite recursion when two databases AutoOpen each other [#3764]
+- Browser: Fix incorrect matching of invalid URLs [#3759]
+- Properly stylize the application name on Linux [#3775]
+- Show application icon on Plasma Wayland sessions [#3777]
+- macOS: Check for Auto-Type permissions on use instead of at launch [#3794]
+
+## 2.5.0 (2019-10-26)
+
+### Added
+
+- Add 'Paper Backup' aka 'Export to HTML file' to the 'Database' menu [#3277]
+- Add statistics panel with information about the database (number of entries, number of unique passwords, etc.) to the Database Settings dialog [#2034]
+- Add offline user manual accessible via the 'Help' menu [#3274]
+- Add support for importing 1Password OpVault files [#2292]
+- Implement Freedesktop.org secret storage DBus protocol so that KeePassXC can be used as a vault service by libsecret [#2726]
+- Add support for OnlyKey as an alternative to YubiKeys (requires yubikey-personalization >= 1.20.0) [#3352]
+- Add group sorting feature [#3282]
+- Add feature to download favicons for all entries at once [#3169]
+- Add word case option to passphrase generator [#3172]
+- Add support for RFC6238-compliant TOTP hashes [#2972]
+- Add UNIX man page for main program [#3665]
+- Add 'Monospaced font' option to the notes field [#3321]
+- Add support for key files in auto open [#3504]
+- Add search field for filtering entries in Auto-Type dialog [#2955]
+- Complete usernames based on known usernames from other entries [#3300]
+- Parse hyperlinks in the notes field of the entry preview pane [#3596]
+- Allow abbreviation of field names in entry search [#3440]
+- Allow setting group icons recursively [#3273]
+- Add copy context menu for username and password in Auto-Type dialog [#3038]
+- Drop to background after copying a password to the clipboard [#3253]
+- Add 'Lock databases' entry to tray icon menu [#2896]
+- Add option to minimize window after unlocking [#3439]
+- Add option to minimize window after opening a URL [#3302]
+- Request accessibility permissions for Auto-Type on macOS [#3624]
+- Browser: Add initial support for multiple URLs [#3558]
+- Browser: Add entry-specific browser integration settings [#3444]
+- CLI: Add offline HIBP checker (requires a downloaded HIBP dump) [#2707]
+- CLI: Add 'flatten' option to the 'ls' command [#3276]
+- CLI: Add password generation options to `Add` and `Edit` commands [#3275]
+- CLI: Add XML import [#3572]
+- CLI: Add CSV export to the 'export' command [#3278]
+- CLI: Add `-y --yubikey` option for YubiKey [#3416]
+- CLI: Add `--dry-run` option for merging databases [#3254]
+- CLI: Add group commands (mv, mkdir and rmdir) [#3313].
+- CLI: Add interactive shell mode command `open` [#3224]
+
+
+### Changed
+
+- Redesign database unlock dialog [ #3287]
+- Rework the entry preview panel [ #3306]
+- Move notes to General tab on Group Preview Panel [#3336]
+- Enable entry actions when editing an entry and cleanup entry context menu  [#3641]
+- Improve detection of external database changes  [#2389]
+- Warn if user is trying to use a KDBX file as a key file [#3625]
+- Add option to disable KeePassHTTP settings migrations prompt [#3349, #3344]
+- Re-enabled Wayland support (no Auto-Type yet) [#3520, #3341]
+- Add icon to 'Toggle Window' action in tray icon menu [#3244]
+- Merge custom data between databases only when necessary [#3475]
+- Improve various file-handling related issues when picking files using the system's file dialog [#3473]
+- Add 'New Entry' context menu when no entries are selected [#3671]
+- Reduce default Argon2 settings from 128 MiB and one thread per CPU core to 64 MiB and two threads to account for lower-spec mobile hardware [ #3672]
+- Browser: Remove unused 'Remember' checkbox for HTTP Basic Auth [#3371]
+- Browser: Show database name when pairing with a new browser [#3638]
+- Browser: Show URL in allow access dialog [#3639]
+- CLI: The password length option `-l` for the CLI commands `Add` and `Edit` is now `-L` [#3275]
+- CLI: The `-u` shorthand for the `--upper` password generation option has been renamed to `-U` [#3275]
+- CLI: Rename command `extract` to `export`. [#3277]
+
+### Fixed
+
+- Improve accessibility for assistive technologies [#3409]
+- Correctly unlock all databases if `--pw-stdin` is provided [#2916]
+- Fix password generator issues with special characters [#3303]
+- Fix KeePassXC interrupting shutdown procedure [#3666]
+- Fix password visibility toggle button state on unlock dialog [#3312]
+- Fix potential data loss if database is reloaded while user is editing an entry [#3656]
+- Fix hard-coded background color in search help popup [#3001]
+- Fix font choice for password preview [#3425]
+- Fix handling of read-only files when autosave is enabled [#3408]
+- Handle symlinks correctly when atomic saves are disabled [#3463]
+- Enable HighDPI icon scaling on Linux [#3332]
+- Make Auto-Type on macOS more robust and remove old Carbon API calls [#3634, [#3347)]
+- Hide Share tab if KeePassXC is compiled without KeeShare support and other minor KeeShare improvements [#3654, [#3291, #3029, #3031, #3236]
+- Correctly bring window to the front when clicking tray icon on macOS [#3576]
+- Correct application shortcut created by MSI Installer on Windows [#3296]
+- Fix crash when removing custom data [#3508]
+- Fix placeholder resolution in URLs [#3281]
+- Fix various inconsistencies and platform-dependent compilation bugs [#3664, #3662, #3660, #3655, #3649, #3417, #3357, #3319, #3318, #3304]
+- Browser: Fix potential leaking of entries through the browser integration API if multiple databases are opened [#3480]
+- Browser: Fix password entropy calculation [#3107]
+- Browser: Fix Windows registry settings for portable installation [#3603]
+
+## 2.4.3 (2019-06-12)
+
+### Added
+
+- Add documentation for keyboard shortcuts to source code distribution [#3215]
+
+### Fixed
+
+- Fix library loading issues in the Snap and macOS releases [#3247]
+- Fix various keyboard navigation issues [#3248]
+- Fix main window toggling regression when clicking the tray icon on KDE [#3258]
+
+## 2.4.2 (2019-05-31)
+
+- Improve resilience against memory attacks - overwrite memory before free [#3020]
+- Prevent infinite save loop when location is unavailable [#3026]
+- Attempt to fix quitting application when shutdown or logout issued [#3199]
+- Support merging database custom data [#3002]
+- Fix opening URL's with non-http schemes [#3153]
+- Fix data loss due to not reading all database attachments if duplicates exist [#3180]
+- Fix entry context menu disabling when using keyboard navigation [#3199]
+- Fix behaviors when canceling an entry edit [#3199]
+- Fix processing of tray icon click and doubleclick [#3112]
+- Update group in preview widget when focused [#3199]
+- Prefer DuckDuckGo service over direct icon download (increases resolution) #2996]
+- Remove apply button in application settings [#3019]
+- Use winqtdeploy on Windows to correct deployment issues [#3025]
+- Don't mark entry edit as modified when attribute selection changes [#3041]
+- Use console code page CP_UTF8 on Windows if supported [#3050]
+- Snap: Fix locking database with session lock [#3046]
+- Snap: Fix theming across Linux distributions [#3057]
+- Snap: Use SNAP_USER_COMMON and SNAP_USER_DATA directories [#3131]
+- KeeShare: Automatically enable WITH_XC_KEESHARE_SECURE if quazip is found [#3088]
+- macOS: Fix toolbar text when in dark mode [#2998]
+- macOS: Lock database on switching user [#3097]
+- macOS: Fix global Auto-Type when the database is locked[ #3138]
+- Browser: Close popups when database is locked [#3093]
+- Browser: Add tests [#3016]
+- Browser: Don't create default group if custom group is enabled [#3127]
+
+## 2.4.1 (2019-04-12)
+
+- Fix database deletion when using unsafe saves to a different file system #2889
+- Fix opening databases with legacy key files that contain '/' #2872
+- Fix opening database files from the command line #2919
+- Fix crash when editing master key #2836
+- Fix multiple issues with apply button behavior #2947
+- Fix issues on application startup (tab order, --pw-stdin, etc.) #2830
+- Fix building without WITH_XC_KEESHARE
+- Fix reference entry coloring on macOS dark mode #2984
+- Hide window when performing entry auto-type on macOS #2969
+- Improve UX of update checker; reduce checks to every 7 days #2968
+- KeeShare improvements [#2946, #2978, #2824]
+- Re-enable Ctrl+C to copy password from search box #2947
+- Add KeePassXC-Browser integration for Brave browser #2933
+- SSH Agent: Re-Add keys on database unlock #2982
+- SSH Agent: Only remove keys on app exit if they are removed on lock #2985
+- CLI: Add --no-password option #2708
+- CLI: Improve database extraction to XML #2698
+- CLI: Don't call mandb on build #2774
+- CLI: Add debug info #2714
+- Improve support for Snap theming #2832
+- Add support for building on Haiku OS #2859
+- Ctrl+PgDn now goes to the next tab and Ctrl+PgUp to the previous
+- Fix compiling on GCC 5 / Xenial #2990
+- Add .gitrev output to tarball for third-party builds #2970
+- Add WITH_XC_UPDATECHECK compile flag to toggle the update checker #2968
+
+## 2.4.0 (2019-03-19)
+
+- New Database Wizard #1952
+- Advanced Search #1797
+- Automatic update checker #2648
+- KeeShare database synchronization [#2109, #1992, #2738, #2742, #2746, #2739]
+- Improve favicon fetching; transition to Duck-Duck-Go [#2795, #2011, #2439]
+- Remove KeePassHttp support #1752
+- CLI: output info to stderr for easier scripting #2558
+- CLI: Add --quiet option #2507
+- CLI: Add create command #2540
+- CLI: Add recursive listing of entries #2345
+- CLI: Fix stdin/stdout encoding on Windows #2425
+- SSH Agent: Support OpenSSH for Windows #1994
+- macOS: TouchID Quick Unlock #1851
+- macOS: Multiple improvements; include CLI in DMG [#2165, #2331, #2583]
+- Linux: Prevent Klipper from storing secrets in clipboard #1969
+- Linux: Use polling based file watching for NFS #2171
+- Linux: Enable use of browser plugin in Snap build #2802
+- TOTP QR Code Generator #1167
+- High-DPI Scaling for 4k screens #2404
+- Make keyboard shortcuts more consistent #2431
+- Warn user if deleting referenced entries #1744
+- Allow toolbar to be hidden and repositioned [#1819, #2357]
+- Increase max allowed database timeout to 12 hours #2173
+- Password generator uses existing password length by default #2318
+- Improve alert message box button labels #2376
+- Show message when a database merge makes no changes #2551
+- Browser Integration Enhancements [#1497, #2253, #1904, #2232, #1850, #2218, #2391, #2396, #2542, #2622, #2637, #2790]
+- Overall Code Improvements [#2316, #2284, #2351, #2402, #2410, #2419, #2422, #2443, #2491, #2506, #2610, #2667, #2709, #2731]
+
+## 2.3.4 (2018-08-21)
+
+- Show all URL schemes in entry view #1768
+- Disable merge when database is locked #1975
+- Fix intermittent crashes with favorite icon downloads #1980
+- Provide potential crash warning to Qt 5.5.x users #2211
+- Disable apply button when creating new entry/group to prevent data loss #2204
+- Allow for 12 hour timeout to lock idle database #2173
+- Multiple SSH Agent fixes [#1981, #2117]
+- Multiple Browser Integration enhancements [#1993, #2003, #2055, #2116, #2159, #2174, #2185]
+- Fix browser proxy application not closing properly #2142
+- Add real names and Patreon supporters to about dialog #2214
+- Add settings button to toolbar, Donate button, and Report a Bug button to help menu #2214
+- Enhancements to release-tool to appsign intermediate build products #2101
+
+
+## 2.3.3 (2018-05-09)
+
+- Fix crash when browser integration is enabled #1923
+
+## 2.3.2 (2018-05-07)
+
+- Enable high entropy ASLR on Windows #1747
+- Enhance favicon fetching #1786
+- Fix crash on Windows due to autotype #1691
+- Fix dark tray icon changing all icons #1680
+- Fix --pw-stdin not using getPassword function #1686
+- Fix placeholders being resolved in notes #1907
+- Enable auto-type start delay to be configurable #1908
+- Browser: Fix native messaging reply size #1719
+- Browser: Increase maximum buffer size #1720
+- Browser: Enhance usability and functionality [#1810, #1822, #1830, #1884, #1906]
+- SSH Agent: Parse aes-256-cbc/ctr keys #1682
+- SSH Agent: Enhance usability and functionality [#1677, #1679, #1681, #1787]
+
+## 2.3.1 (2018-03-06)
+
+- Fix unnecessary automatic upgrade to KDBX 4.0 and prevent challenge-response key being stripped #1568
+- Abort saving and show an error message when challenge-response fails #1659
+- Support inner stream protection on all string attributes #1646
+- Fix favicon downloads not finishing on some websites #1657
+- Fix freeze due to invalid STDIN data #1628
+- Correct issue with encrypted RSA SSH keys #1587
+- Fix crash on macOS due to QTBUG-54832 #1607
+- Show error message if ssh-agent communication fails #1614
+- Fix --pw-stdin and filename parameters being ignored #1608
+- Fix Auto-Type syntax check not allowing spaces and special characters #1626
+- Fix reference placeholders in combination with Auto-Type #1649
+- Fix qtbase translations not being loaded #1611
+- Fix startup crash on Windows due to missing SVG libraries #1662
+- Correct database tab order regression #1610
+- Fix GCC 8 compilation error #1612
+- Fix copying of advanced attributes on KDE #1640
+- Fix member initialization of CategoryListWidgetDelegate #1613
+- Fix inconsistent toolbar icon sizes and provide higher-quality icons #1616
+- Improve preview panel geometry #1609
+
+## 2.3.0 (2018-02-27)
+
+- Add support for KDBX 4.0, Argon2 and ChaCha20 [#148, #1179, #1230, #1494]
+- Add SSH Agent feature [#1098, #1450, #1463]
+- Add preview panel with details of the selected entry [#879, #1338]
+- Add more and configurable columns to entry table and allow copying of values by double click #1305
+- Add KeePassXC-Browser API as a replacement for KeePassHTTP #608
+- Deprecate KeePassHTTP #1392
+- Add support for Steam one-time passwords #1206
+- Add support for multiple Auto-Type sequences for a single entry #1390
+- Adjust YubiKey HMAC-SHA1 challenge-response key generation for KDBX 4.0 #1060
+- Replace qHttp with cURL for website icon downloads #1460
+- Remove lock file #1231
+- Add option to create backup file before saving #1385
+- Ask to save a generated password before closing the entry password generator #1499
+- Resolve placeholders recursively #1078
+- Add Auto-Type button to the toolbar #1056
+- Improve window focus handling for Auto-Type dialogs [#1204, #1490]
+- Auto-Type dialog and password generator can now be exited with ESC [#1252, #1412]
+- Add optional dark tray icon #1154
+- Add new "Unsafe saving" option to work around saving problems with file sync services #1385
+- Add IBus support to AppImage and additional image formats to Windows builds [#1534, #1537]
+- Add diceware password generator to CLI #1406
+- Add --key-file option to CLI [#816, #824]
+- Add DBus interface for opening and closing KeePassXC databases #283
+- Add KDBX compression options to database settings #1419
+- Discourage use of old fixed-length key files in favor of arbitrary files [#1326, #1327]
+- Correct reference resolution in entry fields #1486
+- Fix window state and recent databases not being remembered on exit #1453
+- Correct history item generation when configuring TOTP for an entry #1446
+- Correct multiple TOTP bugs #1414
+- Automatic saving after every change is now a default #279
+- Allow creation of new entries during search #1398
+- Correct menu issues on macOS #1335
+- Allow compilation on OpenBSD #1328
+- Improve entry attachments view [#1139, #1298]
+- Fix auto lock for Gnome and Xfce [#910, #1249]
+- Don't remember key files in file dialogs when the setting is disabled #1188
+- Improve database merging and conflict resolution [#807, #1165]
+- Fix macOS pasteboard issues #1202
+- Improve startup times on some platforms #1205
+- Hide the notes field by default #1124
+- Toggle main window by clicking tray icon with the middle mouse button #992
+- Fix custom icons not copied over when databases are merged #1008
+- Allow use of DEL key to delete entries #914
+- Correct intermittent crash due to stale history items #1527
+- Sanitize newline characters in title, username and URL fields #1502
+- Reopen previously opened databases in correct order #774
+- Use system's zxcvbn library if available #701
+- Implement various i18n improvements [#690, #875, #1436]
+
+## 2.2.4 (2017-12-13)
+
+- Prevent database corruption when locked #1219
+- Fixes apply button not saving new entries #1141
+- Switch to Consolas font on Windows for password edit #1229
+- Multiple fixes to AppImage deployment [#1115, #1228]
+- Fixes multiple memory leaks #1213
+- Resize message close to 16x16 pixels #1253
+
+## 2.2.2 (2017-10-22)
+
+- Fixed entries with empty URLs being reported to KeePassHTTP clients #1031
+- Fixed YubiKey detection and enabled CLI tool for AppImage binary #1100
+- Added AppStream description #1082
+- Improved TOTP compatibility and added new Base32 implementation #1069
+- Fixed error handling when processing invalid cipher stream #1099
+- Fixed double warning display when opening a database #1037
+- Fixed unlocking databases with --pw-stdin #1087
+- Added ability to override QT_PLUGIN_PATH environment variable for AppImages #1079
+- Fixed transform seed not being regenerated when saving the database #1068
+- Fixed only one YubiKey slot being polled #1048
+- Corrected an issue with entry icons while merging #1008
+- Corrected desktop and tray icons in Snap package #1030
+- Fixed screen lock and Google fallback settings #1029
+
+## 2.2.1 (2017-10-01)
+
+- Corrected multiple snap issues [#934, #1011]
+- Corrected multiple custom icon issues [#708, #719, #994]
+- Corrected multiple Yubikey issues #880
+- Fixed single instance preventing load on occasion #997
+- Keep entry history when merging databases #970
+- Prevent data loss if passwords were mismatched #1007
+- Fixed crash after merge #941
+- Added configurable auto-type default delay #703
+- Unlock database dialog window comes to front #663
+- Translation and compiling fixes
+
+## 2.2.0 (2017-06-23)
+
+- Added YubiKey 2FA integration for unlocking databases #127
+- Added TOTP support #519
+- Added CSV import tool [#146, #490]
+- Added KeePassXC CLI tool #254
+- Added diceware password generator #373
+- Added support for entry references [#370, #378]
+- Added support for Twofish encryption #167
+- Enabled DEP and ASLR for in-memory protection #371
+- Enabled single instance mode #510
+- Enabled portable mode #645
+- Enabled database lock on screensaver and session lock #545
+- Redesigned welcome screen with common features and recent databases #292
+- Multiple updates to search behavior [#168, #213, #374, #471, #603, #654]
+- Added auto-type fields {CLEARFIELD}, {SPACE}, {{}, {}} [#267, #427, #480]
+- Fixed auto-type errors on Linux #550
+- Prompt user prior to executing a cmd:// URL #235
+- Entry attributes can be protected (hidden) #220
+- Added extended ascii to password generator #538
+- Added new database icon to toolbar #289
+- Added context menu entry to empty recycle bin in databases #520
+- Added "apply" button to entry and group edit windows #624
+- Added macOS tray icon and enabled minimize on close #583
+- Fixed issues with unclean shutdowns [#170, #580]
+- Changed keyboard shortcut to create new database to CTRL+SHIFT+N #515
+- Compare window title to entry URLs #556
+- Implemented inline error messages #162
+- Ignore group expansion and other minor changes when making database "dirty" #464
+- Updated license and copyright information on souce files #632
+- Added contributors list to about dialog #629
+
+## 2.1.4 (2017-04-09)
+
+- Bumped KeePassHTTP version to 1.8.4.2
+- KeePassHTTP confirmation window comes to foreground #466
+
+## 2.1.3 (2017-03-03)
+
+- Fix possible overflow in zxcvbn library #363
+- Revert HiDPI setting to avoid problems on laptop screens #332
+- Set file meta properties in Windows executable #330
+- Suppress error message when auto-reloading a locked database #345
+- Improve usability of question dialog when database is already locked by a different instance #346
+- Fix compiler warnings in QHttp library #351
+- Use unified toolbar on Mac OS X #361
+- Fix an issue on X11 where the main window would be raised instead of closed on Alt+F4 #362
+
+## 2.1.2 (2017-02-17)
+
+- Ask for save location when creating a new database #302
+- Remove Libmicrohttpd dependency to clean up the code and ensure better OS X compatibility [#317, #265]
+- Prevent Qt from degrading Wifi network performance on certain platforms #318
+- Visually refine user interface on OS X and other platforms #299
+- Remove unusable tray icon setting on OS X #293
+- Fix compositing glitches on Ubuntu and prevent flashing when minimizing to the tray at startup #307
+- Fix AppImage tray icon on Ubuntu [#277, #273]
+- Fix global menu disappearing after restoring KeePassXC from the tray on Ubuntu #276
+- Fix result order in entry search #320
+- Enable HiDPI scaling on supported platforms #315
+- Remove empty directories from installation target #282
+
+## 2.1.1 (2017-02-06)
+
+- Enabled HTTP plugin build; plugin is disabled by default and limited to localhost #147
+- Escape HTML in dialog boxes #247
+- Corrected crashes in favicon download and password generator [#233, #226]
+- Increase font size of password meter #228
+- Fixed compatibility with Qt 5.8 #211
+- Use consistent button heights in password generator #229
+
+## 2.1.0 (2017-01-22)
+
+- Show unlock dialog when using autotype on a closed database [#10, #89]
+- Show different tray icon when database is locked [#37, #46]
+- Support autotype on Windows and OS X [#42, #60, #63]
+- Add delay feature to autotype [#76, #77]
+- Add password strength meter [#84, #92]
+- Add option for automatically locking the database when minimizing
+  the window #57
+- Add feature to download favicons and use them as entry icons #30
+- Automatically reload and merge database when the file changed on
+  disk [#22, #33, #93]
+- Add tool for merging two databases [#22, #47, #143]
+- Add --pw-stdin commandline option to unlock the database by providing
+  a password on STDIN #54
+- Add utility script for reading the database password from KWallet #55
+- Fix some KeePassHTTP settings not being remembered [#34, #65]
+- Make search box persistent [#15, #67, #157]
+- Enhance search feature by scoping the search to selected group [#16, #118]
+- Improve interaction between search field and entry list [#131, #141]
+- Add stand-alone password-generator [#18, #92]
+- Don't require password repetition when password is visible [#27, #92]
+- Add support for entry attributes in autotype sequences #107
+- Always focus password field when opening the database unlock widget [#116, #117]
+- Fix compilation errors on various platforms [#53, #126, #130]
+- Restructure and improve kdbx-extract utility #160
+
+## 2.0.3 (2016-09-04)
+
+- Improved error reporting when reading / writing databases fails. [#450, #462]
+- Display an error message when opening a custom icon fails.
+- Detect custom icon format based on contents instead of the filename. #512
+- Keep symlink intact when saving databases. #442.
+- Fix a crash when deleting parent group of recycle bin. #520
+- Display a confirm dialog before moving an entry to the recycle bin. #447
+- Repair UUIDs of inconsistent history items. #130
+- Only include top-level windows in auto-type window list when using gnome-shell.
+- Update translations.
+
+## 2.0.2 (2016-02-02)
+
+- Fix regression in database writer that caused it to strip certain special
+  characters (characters from Unicode plane > 0).
+- Fix bug in repair function that caused it to strip non-ASCII characters.
+
+## 2.0.1 (2016-01-31)
+
+- Flush temporary file before opening attachment. #390
+- Disable password generator when showing entry in history mode. #422
+- Strip invalid XML chars when writing databases. #392
+- Add repair function to fix databases with invalid XML chars. #392
+- Display custom icons scaled. #322
+- Allow opening databases that have no password and keyfile. #391
+- Fix crash when importing .kdb files with invalid icon ids. #425
+- Update translations.
+
+## 2.0 (2015-12-06)
+
+- Improve UI of the search edit.
+- Clear clipboard when locking databases. #342
+- Enable Ctrl+M shortcut to minimize the window on all platforms. #329
+- Show a better message when trying to open an old database format. #338
+- Fix global auto-type behavior with some window managers.
+- Show global auto-type window on the active desktop. #359
+- Disable systray on OS X. #326
+- Restore main window when clicking on the OS X docker icon. #326
+
+## 2.0 Beta 2 (2015-09-06)
+
+- Fix crash when locking with search UI open #309
+- Fix file locking on Mac OS X #327
+- Set default extension when saving a database [#79, #308]
+
+## 2.0 Beta 1 (2015-07-18)
+
+- Remember entry column sizes #159
+- Add translations
+- Support opening attachments directly
+- Support cmd:// URLs #244
+- Protect opened databases with a file lock #18
+- Export to csv files #57
+- Add optional tray icon #153
+- Allow setting the default auto-type sequence for groups #175
+- Make the kdbx parser more lenient
+- Remove --password command line option #285
+
+## 2.0 Alpha 6 (2014-04-12)
+
+- Add option to lock databases after user inactivity #62
+- Add compatibility with libgcrypt 1.6 #129
+- Display passwords in monospace font #51
+- Use an icon for the button that shows/masks passwords #38
+- Add an option to show passwords by default #93
+- Improve password generator design #122
+- On Linux link .kdbx files with KeePassX
+- Remember window size #154
+- Disallow global auto-typing when the database is locked
+
+## 2.0 Alpha 5 (2013-12-20)
+
+- Support copying entries and groups using drag'n'drop #74
+- Open last used databases on startup #36
+- Made the kdbx file parser more robust
+- Only edit entries on doubleclick (not single) or with enter key
+- Allow removing multiple entries
+- Added option to minimize window when copying data to clipboard
+- Save password generator settings
+- Fixed auto-type producing wrong chars in some keyboard configurations #116
+- Added some more actions to the toolbar
+
+## 2.0 Alpha 4 (2013-03-29)
+
+- Add random password generator #52
+- Merge the 'Description' tab into the 'Entry' tab #59
+- Fix crash when deleting history items #56
+- Fix crash on Mac OS X Mountain Lion during startup #50
+- Improved KeePassX application icon #58
+
+## 2.0 Alpha 3 (2012-10-27)
+
+- Auto-Type on Linux / X11
+- Database locking
+- Fix database corruption when changing key transformation rounds #34
+- Verify header data of kdbx files
+- Add menu entry to open URLs in the browser
+- Add menu entry to copy an entry attribute to clipboard
+
+## 2.0 Alpha 2 (2012-07-02)
+
+- Import kdb (KeePass 1) files #2
+- Display history items #23
+- Implement history item limits #16
+- Group and entry icons can be set #22
+- Add keyboard shortcuts
+- Search in databases #24
+- Sortable entry view
+- Support building Mac OS X bundles
+
+## 2.0 Alpha 1 (2012-05-07)
+
+- First release.

CMakeLists.txt

@@ -1,5 +1,5 @@
+#  Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
 #  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
-#  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -14,20 +14,29 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
-      "Choose the type of build, options are: None Debug Release RelWithDebInfo Debug DebugFull Profile MinSizeRel."
-      FORCE)
-endif()
+cmake_minimum_required(VERSION 3.1.0)
 
 project(KeePassXC)
 
-cmake_minimum_required(VERSION 3.1.0)
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
+            "Choose the type of build, options are: Debug Release RelWithDebInfo Profile"
+            FORCE)
+endif()
+string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
+# Use the Compiler Cache (ccache) if it is installed
+# (install with: sudo apt get ccache)
+find_program (CCACHE_FOUND ccache)
+if (CCACHE_FOUND)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+endif (CCACHE_FOUND)
+
 # Support Visual Studio Code
 include(CMakeToolsHelpers OPTIONAL)
+include(FeatureSummary)
 
 include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
@@ -36,63 +45,169 @@ include(CheckCXXSourceCompiles)
 option(WITH_TESTS "Enable building of unit tests" ON)
 option(WITH_GUI_TESTS "Enable building of GUI tests" OFF)
 option(WITH_DEV_BUILD "Use only for development. Disables/warns about deprecated methods." OFF)
-option(WITH_ASAN "Enable address sanitizer checks (Linux only)" OFF)
+option(WITH_ASAN "Enable address sanitizer checks (Linux / macOS only)" OFF)
 option(WITH_COVERAGE "Use to build with coverage tests (GCC only)." OFF)
-option(WITH_APP_BUNDLE "Enable Application Bundle for OS X" ON)
+option(WITH_APP_BUNDLE "Enable Application Bundle for macOS" ON)
+
+set(WITH_XC_ALL OFF CACHE BOOL "Build in all available plugins")
 
 option(WITH_XC_AUTOTYPE "Include Auto-Type." ON)
-option(WITH_XC_HTTP "Include KeePassHTTP and Custom Icon Downloads." OFF)
+option(WITH_XC_NETWORKING "Include networking code (e.g. for downloading website icons)." OFF)
+option(WITH_XC_BROWSER "Include browser integration with keepassxc-browser." OFF)
 option(WITH_XC_YUBIKEY "Include YubiKey support." OFF)
+option(WITH_XC_SSHAGENT "Include SSH agent support." OFF)
+option(WITH_XC_KEESHARE "Sharing integration with KeeShare (requires quazip5 for secure containers)" OFF)
+option(WITH_XC_UPDATECHECK "Include automatic update checks; disable for controlled distributions" ON)
+if(UNIX AND NOT APPLE)
+    option(WITH_XC_FDOSECRETS "Implement freedesktop.org Secret Storage Spec server side API." OFF)
+endif()
+if(APPLE)
+    option(WITH_XC_TOUCHID "Include TouchID support for macOS." OFF)
+endif()
 
-# Process ui files automatically from source files
-set(CMAKE_AUTOUIC ON)
+if(WITH_XC_ALL)
+    # Enable all options (except update check)
+    set(WITH_XC_AUTOTYPE ON)
+    set(WITH_XC_NETWORKING ON)
+    set(WITH_XC_BROWSER ON)
+    set(WITH_XC_YUBIKEY ON)
+    set(WITH_XC_SSHAGENT ON)
+    set(WITH_XC_KEESHARE ON)
+    if(APPLE)
+        set(WITH_XC_TOUCHID ON)
+    endif()
+    if(UNIX AND NOT APPLE)
+        set(WITH_XC_FDOSECRETS ON)
+    endif()
+endif()
+
+if(WITH_XC_SSHAGENT OR WITH_XC_KEESHARE)
+  set(WITH_XC_CRYPTO_SSH ON)
+else()
+  set(WITH_XC_CRYPTO_SSH OFF)
+endif()
+
+# Prefer WITH_XC_NETWORKING setting over WITH_XC_UPDATECHECK
+if(NOT WITH_XC_NETWORKING AND WITH_XC_UPDATECHECK)
+    message(STATUS "Disabling WITH_XC_UPDATECHECK because WITH_XC_NETWORKING is disabled")
+    set(WITH_XC_UPDATECHECK OFF)
+endif()
 
 set(KEEPASSXC_VERSION_MAJOR "2")
-set(KEEPASSXC_VERSION_MINOR "2")
+set(KEEPASSXC_VERSION_MINOR "5")
 set(KEEPASSXC_VERSION_PATCH "2")
 set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
+set(OVERRIDE_VERSION "" CACHE STRING "Override the KeePassXC Version for Snapshot builds")
+
+set(KEEPASSXC_BUILD_TYPE "Snapshot" CACHE STRING "Set KeePassXC build type to distinguish between stable releases and snapshots")
+set_property(CACHE KEEPASSXC_BUILD_TYPE PROPERTY STRINGS Snapshot Release PreRelease)
+
+# Retrieve git HEAD revision hash
+set(GIT_HEAD_OVERRIDE "" CACHE STRING "Manually set the Git HEAD hash when missing (eg, when no .git folder exists)")
+execute_process(COMMAND git rev-parse --short=7 HEAD
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE GIT_HEAD
+        ERROR_QUIET)
+string(STRIP "${GIT_HEAD}" GIT_HEAD)
+if(GIT_HEAD STREQUAL "" AND NOT GIT_HEAD_OVERRIDE STREQUAL "")
+    string(SUBSTRING "${GIT_HEAD_OVERRIDE}" 0 7 GIT_HEAD)
+elseif(EXISTS ${CMAKE_SOURCE_DIR}/.gitrev)
+    file(READ ${CMAKE_SOURCE_DIR}/.gitrev GIT_HEAD)
+endif()
+message(STATUS "Found Git HEAD Revision: ${GIT_HEAD}\n")
+
+# Check if on a tag, if so build as a release
+execute_process(COMMAND git tag --points-at HEAD
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE GIT_TAG
+        ERROR_QUIET)
+if(GIT_TAG)
+    string(STRIP "${GIT_TAG}" GIT_TAG)
+    set(OVERRIDE_VERSION ${GIT_TAG})
+elseif(EXISTS ${CMAKE_SOURCE_DIR}/.version)
+    file(READ ${CMAKE_SOURCE_DIR}/.version OVERRIDE_VERSION)
+endif()
+
+string(REGEX REPLACE "(\r?\n)+" "" OVERRIDE_VERSION "${OVERRIDE_VERSION}")
+if(OVERRIDE_VERSION)
+    if(OVERRIDE_VERSION MATCHES "^[\\.0-9]+-(alpha|beta)[0-9]+$")
+        set(KEEPASSXC_BUILD_TYPE PreRelease)
+        set(KEEPASSXC_VERSION ${OVERRIDE_VERSION})
+    elseif(OVERRIDE_VERSION MATCHES "^[\\.0-9]+$")
+        set(KEEPASSXC_BUILD_TYPE Release)
+        set(KEEPASSXC_VERSION ${OVERRIDE_VERSION})
+    else()
+        set(KEEPASSXC_BUILD_TYPE Snapshot)
+        set(KEEPASSXC_VERSION ${OVERRIDE_VERSION})
+    endif()
+else()
+    if(KEEPASSXC_BUILD_TYPE STREQUAL "PreRelease")
+        set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION}-preview")
+    elseif(KEEPASSXC_BUILD_TYPE STREQUAL "Snapshot")
+        set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION}-snapshot")
+    endif()
+endif()
+
+if(KEEPASSXC_BUILD_TYPE STREQUAL "Release")
+    set(KEEPASSXC_BUILD_TYPE_RELEASE ON)
+elseif(KEEPASSXC_BUILD_TYPE STREQUAL "PreRelease")
+    set(KEEPASSXC_BUILD_TYPE_PRE_RELEASE ON)
+else()
+    set(KEEPASSXC_BUILD_TYPE_SNAPSHOT ON)
+endif()
+
+message(STATUS "Setting up build for KeePassXC v${KEEPASSXC_VERSION}\n")
 
 # Distribution info
-set(KEEPASSXC_DIST True)
-set(KEEPASSXC_DIST_TYPE "Other" CACHE STRING "KeePassXC Distribution type")
+set(KEEPASSXC_DIST ON)
+set(KEEPASSXC_DIST_TYPE "Other" CACHE STRING "KeePassXC Distribution Type")
 set_property(CACHE KEEPASSXC_DIST_TYPE PROPERTY STRINGS Snap AppImage Other)
 if(KEEPASSXC_DIST_TYPE STREQUAL "Snap")
-  set(KEEPASSXC_DIST_SNAP True)
+    set(KEEPASSXC_DIST_SNAP ON)
 elseif(KEEPASSXC_DIST_TYPE STREQUAL "AppImage")
-  set(KEEPASSXC_DIST_APPIMAGE True)
+    set(KEEPASSXC_DIST_APPIMAGE ON)
 elseif(KEEPASSXC_DIST_TYPE STREQUAL "Other")
-  unset(KEEPASSXC_DIST)
+    unset(KEEPASSXC_DIST)
 endif()
 
-if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
-  set(CMAKE_COMPILER_IS_CLANG 1)
+if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
+    set(IS_32BIT TRUE)
 endif()
 
-if("${CMAKE_CXX_COMPILER}" MATCHES "clang(\\+\\+)?$" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-  set(CMAKE_COMPILER_IS_CLANGXX 1)
+set(CLANG_COMPILER_ID_REGEX "^(Apple)?[Cc]lang$")
+if("${CMAKE_C_COMPILER}" MATCHES "clang$"
+        OR "${CMAKE_EXTRA_GENERATOR_C_SYSTEM_DEFINED_MACROS}" MATCHES "__clang__"
+        OR "${CMAKE_C_COMPILER_ID}" MATCHES ${CLANG_COMPILER_ID_REGEX})
+    set(CMAKE_COMPILER_IS_CLANG 1)
+endif()
+
+if("${CMAKE_CXX_COMPILER}" MATCHES "clang(\\+\\+)?$"
+        OR "${CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS}" MATCHES "__clang__"
+        OR "${CMAKE_CXX_COMPILER_ID}" MATCHES ${CLANG_COMPILER_ID_REGEX})
+    set(CMAKE_COMPILER_IS_CLANGXX 1)
 endif()
 
 macro(add_gcc_compiler_cxxflags FLAGS)
-  if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS}")
-  endif()
+    if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS}")
+    endif()
 endmacro(add_gcc_compiler_cxxflags)
 
 macro(add_gcc_compiler_cflags FLAGS)
-  if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAGS}")
-  endif()
+    if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAGS}")
+    endif()
 endmacro(add_gcc_compiler_cflags)
 
 macro(add_gcc_compiler_flags FLAGS)
-  add_gcc_compiler_cxxflags("${FLAGS}")
-  add_gcc_compiler_cflags("${FLAGS}")
+    add_gcc_compiler_cxxflags("${FLAGS}")
+    add_gcc_compiler_cflags("${FLAGS}")
 endmacro(add_gcc_compiler_flags)
 
 add_definitions(-DQT_NO_EXCEPTIONS -DQT_STRICT_ITERATORS -DQT_NO_CAST_TO_ASCII)
 
 if(WITH_APP_BUNDLE)
-  add_definitions(-DWITH_APP_BUNDLE)
+    add_definitions(-DWITH_APP_BUNDLE)
 endif()
 
 add_gcc_compiler_flags("-fno-common")
@@ -101,170 +216,241 @@ add_gcc_compiler_flags("-Wformat=2 -Wmissing-format-attribute")
 add_gcc_compiler_flags("-fvisibility=hidden")
 add_gcc_compiler_cxxflags("-fvisibility-inlines-hidden")
 
+if(CMAKE_BUILD_TYPE_LOWER STREQUAL "debug")
+    add_gcc_compiler_flags("-Werror")
+endif()
+
+if (NOT HAIKU)
 if((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8.999) OR CMAKE_COMPILER_IS_CLANGXX)
     add_gcc_compiler_flags("-fstack-protector-strong")
 else()
     add_gcc_compiler_flags("-fstack-protector --param=ssp-buffer-size=4")
 endif()
+endif()
 
 add_gcc_compiler_cxxflags("-fno-exceptions -fno-rtti")
 add_gcc_compiler_cxxflags("-Wnon-virtual-dtor -Wold-style-cast -Woverloaded-virtual")
 add_gcc_compiler_cflags("-Wchar-subscripts -Wwrite-strings")
+
 if(WITH_ASAN)
-  if(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
-      message(FATAL_ERROR "WITH_ASAN is only supported on Linux at the moment.")
-  endif()
+    if(NOT (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR APPLE))
+        message(FATAL_ERROR "WITH_ASAN is only supported on Linux / macOS at the moment.")
+    endif()
 
-  add_gcc_compiler_flags("-fsanitize=address -DWITH_ASAN")
+    add_gcc_compiler_flags("-fsanitize=address -DWITH_ASAN")
+
+    if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+        if(NOT (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9))
+            add_gcc_compiler_flags("-fsanitize=leak -DWITH_LSAN")
+        endif()
+    endif()
 
-  if(NOT (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9))
-    add_gcc_compiler_flags("-fsanitize=leak -DWITH_LSAN")
-  endif()
 endif()
 
-string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
-if (CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)")
-  add_gcc_compiler_flags("-D_FORTIFY_SOURCE=2")
+if(CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)")
+    add_gcc_compiler_flags("-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2")
 endif()
 
 check_c_compiler_flag("-Werror=format-security -Werror=implicit-function-declaration" WERROR_C_AVAILABLE)
 check_cxx_compiler_flag("-Werror=format-security" WERROR_CXX_AVAILABLE)
 if(WERROR_C_AVAILABLE AND WERROR_CXX_AVAILABLE)
-  add_gcc_compiler_flags("-Werror=format-security")
-  add_gcc_compiler_cflags("-Werror=implicit-function-declaration")
+    add_gcc_compiler_flags("-Werror=format-security")
+    add_gcc_compiler_cflags("-Werror=implicit-function-declaration")
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wcast-align")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wcast-align")
+endif()
 
-  if(WITH_COVERAGE)
-    # Include code coverage, use with -DCMAKE_BUILD_TYPE=Coverage
-    include(CodeCoverage)
-    setup_target_for_coverage(kp_coverage "make test" coverage)
-  endif()
+if(WITH_COVERAGE AND CMAKE_COMPILER_IS_CLANGXX)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-instr-generate -fcoverage-mapping")
+  # then:
+  # $ llvm-profdata merge -sparse default.profraw -o default.profdata
+  # $ llvm-cov show ./tests/${the_test_binary} \
+  #      -format=html -instr-profile=default.profdata -output-dir=./coverages \
+  #      `find src -iname '*.h' -or -iname '*.cpp'`
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCC)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-align")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-align")
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  if (CMAKE_COMPILER_IS_CLANGXX)
-      add_gcc_compiler_flags("-Qunused-arguments")
-  endif()
-  add_gcc_compiler_flags("-pie -fPIE")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-add-needed -Wl,--as-needed -Wl,--no-undefined")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro,-z,now")
-  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-add-needed -Wl,--as-needed")
-  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro,-z,now")
+    if(CMAKE_COMPILER_IS_CLANGXX)
+        add_gcc_compiler_flags("-Qunused-arguments")
+    endif()
+    add_gcc_compiler_flags("-pie -fPIE")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-add-needed -Wl,--as-needed -Wl,--no-undefined")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro,-z,now")
+    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-add-needed -Wl,--as-needed")
+    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro,-z,now")
 endif()
 
+add_gcc_compiler_cflags("-std=c99")
 add_gcc_compiler_cxxflags("-std=c++11")
 
-if(APPLE)
-  add_gcc_compiler_cxxflags("-stdlib=libc++")
+if((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9.99) OR
+    (CMAKE_COMPILER_IS_CLANGXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.6.99))
+    add_gcc_compiler_cxxflags("-fsized-deallocation")
 endif()
 
-add_gcc_compiler_cflags("-ansi")
+if(APPLE AND CMAKE_COMPILER_IS_CLANGXX)
+    add_gcc_compiler_cxxflags("-stdlib=libc++")
+endif()
 
 if(WITH_DEV_BUILD)
-  add_definitions(-DQT_DEPRECATED_WARNINGS -DGCRYPT_NO_DEPRECATED)
+    add_definitions(-DQT_DEPRECATED_WARNINGS -DGCRYPT_NO_DEPRECATED)
+else()
+    add_definitions(-DQT_NO_DEPRECATED_WARNINGS)
+    add_gcc_compiler_cxxflags("-Wno-deprecated-declarations")
 endif()
 
 if(MINGW)
-  set(CMAKE_RC_COMPILER_INIT windres)
-  enable_language(RC)
-  set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
-  if(NOT (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
-    # Enable DEP and ASLR
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
-    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
-  endif()
+    set(CMAKE_RC_COMPILER_INIT windres)
+    enable_language(RC)
+    set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
+    if(NOT (CMAKE_BUILD_TYPE_LOWER STREQUAL "debug" OR CMAKE_BUILD_TYPE_LOWER STREQUAL "relwithdebinfo"))
+        # Enable DEP and ASLR
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
+        set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
+        # Enable high entropy ASLR for 64-bit builds
+        if(NOT IS_32BIT)
+            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--high-entropy-va")
+            set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--high-entropy-va")
+        endif()
+    endif()
 endif()
 
 if(APPLE AND WITH_APP_BUNDLE OR MINGW)
-  set(PROGNAME KeePassXC)
+    set(PROGNAME KeePassXC)
 else()
-  set(PROGNAME keepassxc)
-endif()
-
-if(APPLE AND WITH_APP_BUNDLE AND "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local")
-  set(CMAKE_INSTALL_PREFIX "/Applications")
+    set(PROGNAME keepassxc)
 endif()
 
 if(MINGW)
-  set(CLI_INSTALL_DIR    ".")
-  set(BIN_INSTALL_DIR    ".")
-  set(PLUGIN_INSTALL_DIR ".")
-  set(DATA_INSTALL_DIR   "share")
+    set(CLI_INSTALL_DIR ".")
+    set(PROXY_INSTALL_DIR ".")
+    set(BIN_INSTALL_DIR ".")
+    set(PLUGIN_INSTALL_DIR ".")
+    set(DATA_INSTALL_DIR "share")
 elseif(APPLE AND WITH_APP_BUNDLE)
-  set(CLI_INSTALL_DIR    "/usr/local/bin")
-  set(BIN_INSTALL_DIR    ".")
-  set(PLUGIN_INSTALL_DIR "${PROGNAME}.app/Contents/PlugIns")
-  set(DATA_INSTALL_DIR   "${PROGNAME}.app/Contents/Resources")
+    set(CMAKE_INSTALL_MANDIR "${PROGNAME}.app/Contents/Resources/man")
+    set(CLI_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
+    set(PROXY_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
+    set(BIN_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
+    set(PLUGIN_INSTALL_DIR "${PROGNAME}.app/Contents/PlugIns")
+    set(DATA_INSTALL_DIR "${PROGNAME}.app/Contents/Resources")
 else()
-  include(GNUInstallDirs)
+    include(GNUInstallDirs)
 
-  set(CLI_INSTALL_DIR    "${CMAKE_INSTALL_BINDIR}")
-  set(BIN_INSTALL_DIR    "${CMAKE_INSTALL_BINDIR}")
-  set(PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/keepassxc")
-  set(DATA_INSTALL_DIR   "${CMAKE_INSTALL_DATADIR}/keepassxc")
+    set(CLI_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}")
+    set(PROXY_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}")
+    set(BIN_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}")
+    set(PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/keepassxc")
+    set(DATA_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/keepassxc")
 endif()
 
 if(WITH_TESTS)
-  enable_testing()
+    enable_testing()
 endif(WITH_TESTS)
 
-find_package(Qt5Core          5.2 REQUIRED)
-find_package(Qt5Network       5.2 REQUIRED)
-find_package(Qt5Concurrent    5.2 REQUIRED)
-find_package(Qt5Widgets       5.2 REQUIRED)
-find_package(Qt5Test          5.2 REQUIRED)
-find_package(Qt5LinguistTools 5.2 REQUIRED)
-find_package(Qt5Network       5.2 REQUIRED)
-if (UNIX AND NOT APPLE)
-    find_package(Qt5DBus 5.2 REQUIRED)
+if(WITH_COVERAGE)
+    # Include code coverage, use with -DCMAKE_BUILD_TYPE=Debug
+    include(CodeCoverage)
+    set(COVERAGE_GCOVR_EXCLUDES
+            "\\(.+/\\)?tests/.\\*"
+            ".\\*/moc_\\[^/\\]+\\.cpp"
+            ".\\*/ui_\\[^/\\]+\\.h"
+            "\\(.+/\\)?zxcvbn/.\\*")
+    append_coverage_compiler_flags()
+    setup_target_for_coverage_gcovr_html(
+            NAME coverage
+            EXECUTABLE $(MAKE) && $(MAKE) test
+    )
 endif()
+
+include(CLangFormat)
+
+set(QT_COMPONENTS Core Network Concurrent Gui Svg Widgets Test LinguistTools)
+if(UNIX AND NOT APPLE)
+    find_package(Qt5 COMPONENTS ${QT_COMPONENTS} DBus REQUIRED)
+elseif(APPLE)
+    find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED HINTS /usr/local/opt/qt/lib/cmake /usr/local/Cellar/qt/*/lib/cmake ENV PATH)
+    find_package(Qt5 COMPONENTS MacExtras HINTS /usr/local/opt/qt/lib/cmake /usr/local/Cellar/qt/*/lib/cmake ENV PATH)
+else()
+    find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED)
+endif()
+
+if(Qt5Core_VERSION VERSION_LESS "5.2.0")
+    message(FATAL_ERROR "Qt version 5.2.0 or higher is required")
+endif()
+
+get_filename_component(Qt5_PREFIX ${Qt5_DIR}/../../.. REALPATH)
+
+# Process moc automatically
 set(CMAKE_AUTOMOC ON)
+# Process .ui files automatically
+set(CMAKE_AUTOUIC ON)
+# Process .qrc files automatically
+set(CMAKE_AUTORCC ON)
+
+if(APPLE)
+    set(CMAKE_MACOSX_RPATH TRUE)
+    find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH)
+    if(NOT MACDEPLOYQT_EXE)
+        message(FATAL_ERROR "macdeployqt is required to build on macOS")
+    else()
+        message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}")
+    endif()
+elseif(MINGW)
+    find_program(WINDEPLOYQT_EXE windeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH)
+    if(NOT WINDEPLOYQT_EXE)
+        message(FATAL_ERROR "windeployqt is required to build on Windows")
+    else()
+        message(STATUS "Using windeployqt: ${WINDEPLOYQT_EXE}")
+    endif()
+endif()
 
 # Debian sets the the build type to None for package builds.
 # Make sure we don't enable asserts there.
 set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_NONE QT_NO_DEBUG)
 
 find_package(LibGPGError REQUIRED)
-
-find_package(Gcrypt 1.6.0 REQUIRED)
-
+find_package(Gcrypt 1.7.0 REQUIRED)
+find_package(Argon2 REQUIRED)
 find_package(ZLIB REQUIRED)
+find_package(QREncode REQUIRED)
+find_package(sodium 1.0.12 REQUIRED)
 
 set(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR})
 
-check_cxx_source_compiles("
-  #include <zlib.h>
-
-  #if !defined(ZLIB_VERNUM) || (ZLIB_VERNUM < 0x1200)
-      #error zlib 1.2.x or higher is required to use the gzip format
-  #endif
-
-  int main() { return 0; }" ZLIB_SUPPORTS_GZIP)
-
-if(NOT ZLIB_SUPPORTS_GZIP)
-  message(FATAL_ERROR "zlib 1.2.x or higher is required to use the gzip format")
+if(ZLIB_VERSION_STRING VERSION_LESS "1.2.0")
+    message(FATAL_ERROR "zlib 1.2.0 or higher is required to use the gzip format")
 endif()
 
+include_directories(SYSTEM ${ARGON2_INCLUDE_DIR} ${sodium_INCLUDE_DIR})
+
 # Optional
 if(WITH_XC_YUBIKEY)
-  find_package(YubiKey REQUIRED)
+    find_package(YubiKey REQUIRED)
 
-  include_directories(SYSTEM ${YUBIKEY_INCLUDE_DIRS})
+    include_directories(SYSTEM ${YUBIKEY_INCLUDE_DIRS})
 endif()
 
 if(UNIX)
-  check_cxx_source_compiles("#include <sys/prctl.h>
+    check_cxx_source_compiles("#include <sys/prctl.h>
     int main() { prctl(PR_SET_DUMPABLE, 0); return 0; }"
-    HAVE_PR_SET_DUMPABLE)
+            HAVE_PR_SET_DUMPABLE)
 
-  check_cxx_source_compiles("#include <sys/resource.h>
+    check_cxx_source_compiles("#include <malloc.h>
+    int main() { return 0; }"
+            HAVE_MALLOC_H)
+
+    check_cxx_source_compiles("#include <malloc.h>
+    int main() { malloc_usable_size(NULL, 0); return 0; }"
+            HAVE_MALLOC_USABLE_SIZE)
+
+    check_cxx_source_compiles("#include <sys/resource.h>
     int main() {
       struct rlimit limit;
       limit.rlim_cur = 0;
@@ -273,29 +459,27 @@ if(UNIX)
       return 0;
     }" HAVE_RLIMIT_CORE)
 
-  if(APPLE)
-    check_cxx_source_compiles("#include <sys/types.h>
+    if(APPLE)
+        check_cxx_source_compiles("#include <sys/types.h>
       #include <sys/ptrace.h>
       int main() { ptrace(PT_DENY_ATTACH, 0, 0, 0); return 0; }"
-      HAVE_PT_DENY_ATTACH)
-  endif()
+                HAVE_PT_DENY_ATTACH)
+    endif()
 endif()
 
 include_directories(SYSTEM ${GCRYPT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
 
-include(FeatureSummary)
-
 add_subdirectory(src)
 add_subdirectory(share)
 if(WITH_TESTS)
-  add_subdirectory(tests)
+    add_subdirectory(tests)
 endif(WITH_TESTS)
 
 if(PRINT_SUMMARY)
-  # This will print ENABLED, REQUIRED and DISABLED
-  feature_summary(WHAT ALL)
+    # This will print ENABLED, REQUIRED and DISABLED
+    feature_summary(WHAT ALL)
 else()
-  # This will only print ENABLED and DISABLED feature
-  feature_summary(WHAT ENABLED_FEATURES DESCRIPTION "Enabled features:")
-  feature_summary(WHAT DISABLED_FEATURES DESCRIPTION "Disabled features:")
+    # This will only print ENABLED and DISABLED feature
+    feature_summary(WHAT ENABLED_FEATURES DESCRIPTION "Enabled features:")
+    feature_summary(WHAT DISABLED_FEATURES DESCRIPTION "Disabled features:")
 endif()

COPYING

@@ -1,5 +1,5 @@
 KeePassXC - http://www.keepassxc.org/
-Copyright (C) 2016-2017 KeePassXC Team <team@keepassxc.org>
+Copyright (C) 2016-2019 KeePassXC Team <team@keepassxc.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ Copyright: 2010-2012, Felix Geyer <debfx@fobos.de>
            2000-2008, Tom Sato <VEF00200@nifty.ne.jp>
            2013, Laszlo Papp <lpapp@kde.org>
            2013, David Faure <faure@kde.org>
-           2016-2017, KeePassXC Team <team@keepassxc.org>
+           2016-2019, KeePassXC Team <team@keepassxc.org>
 License: GPL-2 or GPL-3
 
 Comment: The "KeePassXC Team" in every copyright notice is formed by the following people:
@@ -55,20 +55,16 @@ Files: cmake/GenerateProductVersion.cmake
 Copyright: 2015 halex2005 <akharlov@gmail.com>
 License: MIT
 
-Files: cmake/CodeCoverage.cmake
-Copyright: 2012 - 2015, Lars Bilke
-License: BSD-3-clause
-
 Files: share/icons/application/*/apps/keepassxc.png
-       share/icons/application/scalable/apps/keepassxc.svgz
+       share/icons/application/scalable/apps/keepassxc.svg
        share/icons/application/*/apps/keepassxc-dark.png
-       share/icons/application/scalable/apps/keepassxc-dark.svgz
+       share/icons/application/scalable/apps/keepassxc-dark.svg
        share/icons/application/*/apps/keepassxc-locked.png
-       share/icons/application/scalable/apps/keepassxc-locked.svgz
+       share/icons/application/scalable/apps/keepassxc-locked.svg
        share/icons/application/*/apps/keepassxc-unlocked.png
-       share/icons/application/scalable/apps/keepassxc-unlocked.svgz
+       share/icons/application/scalable/apps/keepassxc-unlocked.svg
        share/icons/application/*/mimetypes/application-x-keepassxc.png
-       share/icons/application/scalable/mimetypes/application-x-keepassxc.svgz
+       share/icons/application/scalable/mimetypes/application-x-keepassxc.svg
 Copyright: 2016, Lorenzo Stella <lorenzo.stl@gmail.com>
 License: LGPL-2
 
@@ -155,13 +151,20 @@ Copyright: 2003-2004, David Vignoni <david@icon-king.com>
 License: LGPL-2.1
 Comment: based on Nuvola icon theme
 
+Files: share/icons/application/*/actions/favicon-download.png
+Copyright: 2003-2004, David Vignoni <david@icon-king.com>
+           2018, Kyle Kneitinger <kyle@kneit.in>
+License: LGPL-2.1
+Comment: based on Nuvola icon theme
+
 Files: share/icons/application/*/actions/application-exit.png
+       share/icons/application/*/actions/chronometer.png
        share/icons/application/*/actions/configure.png
+       share/icons/application/*/actions/database-lock.png
        share/icons/application/*/actions/dialog-close.png
        share/icons/application/*/actions/dialog-ok.png
        share/icons/application/*/actions/document-close.png
        share/icons/application/*/actions/document-edit.png
-       share/icons/application/*/actions/document-encrypt.png
        share/icons/application/*/actions/document-new.png
        share/icons/application/*/actions/document-open.png
        share/icons/application/*/actions/document-properties.png
@@ -178,12 +181,13 @@ Files: share/icons/application/*/actions/application-exit.png
        share/icons/application/*/actions/view-history.png
        share/icons/application/*/apps/internet-web-browser.png
        share/icons/application/*/apps/preferences-desktop-icons.png
+       share/icons/application/*/apps/utilities-terminal.png
        share/icons/application/*/categories/preferences-other.png
        share/icons/application/*/status/dialog-error.png
        share/icons/application/*/status/dialog-information.png
        share/icons/application/*/status/dialog-warning.png
        share/icons/application/*/status/security-high.png
-       share/icons/svg/*.svgz
+       share/icons/svg/*.svg
 Copyright: 2007, Nuno Pinheiro <nuno@oxygen-icons.org>
            2007, David Vignoni <david@icon-king.com>
            2007, David Miller <miller@oxygen-icons.org>
@@ -225,11 +229,7 @@ Copyright: 2009-2010, Iowa State University
 License: Boost-1.0
 
 Files: src/zxcvbn/zxcvbn.*
-Copyright: 2015, Tony Evans
-License: BSD 3-clause
-
-Files: src/http/qhttp/*
-Copyright: 2014, Amir Zamani
+Copyright: 2015-2017, Tony Evans
 License: MIT
 
 Files: src/gui/KMessageWidget.h
@@ -237,3 +237,19 @@ Files: src/gui/KMessageWidget.h
 Copyright: 2011 Aurélien Gâteau <agateau@kde.org>
            2014 Dominik Haumann <dhaumann@kde.org>
 License: LGPL-2.1
+
+Files: share/macosx/dmg-background.tiff
+Copyright: 2008-2014, Andrey Tarantsov
+License: MIT
+
+Files: share/icons/application/scalable/apps/freedesktop.svg
+Copyright: GPL-2+
+Comment: from Freedesktop.org website
+
+Files: share/icons/application/32x32/actions/statistics.png
+Copyright: Icon made by Freepik from https://www.flaticon.com/free-icon/bars-chart_265733
+
+Files: share/icons/application/scalable/actions/object-locked.svg
+       share/icons/application/scalable/actions/object-unlocked.svg
+License: LGPL-3
+Comment: from Breeze icon theme (https://github.com/KDE/breeze-icons)

Dockerfile

@@ -1,81 +0,0 @@
-# KeePassXC Linux Release Build Dockerfile
-# Copyright (C) 2017 KeePassXC team <https://keepassxc.org/>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 or (at your option)
-# version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-FROM centos:7
-
-RUN set -x \
-    && curl "https://copr.fedorainfracloud.org/coprs/bugzy/keepassxc/repo/epel-7/bugzy-keepassxc-epel-7.repo" \
-        > /etc/yum.repos.d/bugzy-keepassxc-epel-7.repo
-
-RUN set -x \
-    && curl "https://copr.fedorainfracloud.org/coprs/sic/backports/repo/epel-7/sic-backports-epel-7.repo" \
-        > /etc/yum.repos.d/sic-backports-epel-7.repo
-
-RUN set -x \
-    && yum clean -y all \
-    && yum upgrade -y
-
-# build and runtime dependencies
-RUN set -x \
-    && yum install -y \
-        make \
-        automake \
-        gcc-c++ \
-        cmake \
-        libgcrypt16-devel \
-        qt5-qtbase-devel \
-        qt5-linguist \
-        qt5-qttools \
-        zlib-devel \
-        qt5-qtx11extras \
-        qt5-qtx11extras-devel \
-        libXi-devel \
-        libXtst-devel
-
-# AppImage dependencies
-RUN set -x \
-    && yum install -y \
-        wget \
-        fuse-libs
-
-# build libyubikey
-ENV YUBIKEY_VERSION=1.13
-RUN set -x && yum install -y libusb-devel
-RUN set -x \
-    && wget "https://developers.yubico.com/yubico-c/Releases/libyubikey-${YUBIKEY_VERSION}.tar.gz" \
-    && tar xf libyubikey-${YUBIKEY_VERSION}.tar.gz \
-    && cd libyubikey-${YUBIKEY_VERSION} \
-    && ./configure --prefix=/usr --libdir=/usr/lib64 \
-    && make \
-    && make install \
-    && cd .. \
-    && rm -Rf libyubikey-${YUBIKEY_VERSION}*
-
-# build libykpers-1
-ENV YKPERS_VERSION=1.18.0
-RUN set -x \
-    && wget "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${YKPERS_VERSION}.tar.gz" \
-    && tar xf ykpers-${YKPERS_VERSION}.tar.gz \
-    && cd ykpers-${YKPERS_VERSION} \
-    && ./configure --prefix=/usr --libdir=/usr/lib64 \
-    && make \
-    && make install \
-    && cd .. \
-    && rm -Rf ykpers-${YKPERS_VERSION}*
-
-VOLUME /keepassxc/src
-VOLUME /keepassxc/out
-WORKDIR /keepassxc

INSTALL.md

@@ -1,11 +1,13 @@
-Install KeePassXC
+Build and Install KeePassXC
 =================
 
-This document will guide you across the steps to install KeePassXC.
-You can visit the online version of this document a the following link
+This document will guide you through the steps to build and install KeePassXC from source.
+You can visit the online version of this document at the following link:
 
 https://github.com/keepassxreboot/keepassx/wiki/Install-Instruction-from-Source
 
+The [KeePassXC QuickStart](./docs/QUICKSTART.md) gets you started using KeePassXC on your
+Windows, Mac, or Linux computer using the pre-built binaries.
 
 Build Dependencies
 ==================
@@ -23,48 +25,111 @@ The following libraries are required:
 * zlib
 * libmicrohttpd
 * libxi, libxtst, qtx11extras (optional for auto-type on X11)
-
+* libsodium (>= 1.0.12)
+* libargon2
+* qrencode
+* yubikey ykpers (optional to support YubiKey)
 
 Prepare the Building Environment
 ================================
 
-Building Environment on Linux    ==> https://github.com/keepassxreboot/keepassx/wiki/Building-Environment-on-Linux
-Building Environment on Windows  ==> https://github.com/keepassxreboot/keepassx/wiki/Building-Environment-on-Windows
-Building Environment on MacOS    ==> https://github.com/keepassxreboot/keepassx/wiki/Building-Environment-on-MacOS
-
+* [Building Environment on Linux](https://github.com/keepassxreboot/keepassxc/wiki/Set-up-Build-Environment-on-Linux)
+* [Building Environment on Windows](https://github.com/keepassxreboot/keepassxc/wiki/Set-up-Build-Environment-on-Windows)
+* [Building Environment on MacOS](https://github.com/keepassxreboot/keepassxc/wiki/Set-up-Build-Environment-on-OS-X)
 
 Build Steps
 ===========
+We recommend using the release tool to perform builds, please read up-to-date instructions [on our wiki](https://github.com/keepassxreboot/keepassxc/wiki/Building-KeePassXC#building-using-the-release-tool).
 
 To compile from source, open a **Terminal (on Linux/MacOS)** or a **MSYS2-MinGW shell (on Windows)**<br/>
 **Note:** on Windows make sure you are using a **MINGW shell** by checking the label before the current path
 
-Navigate to the path you have downloaded KeePassXC and type these commands:
+First, download the KeePassXC [source tarball](https://keepassxc.org/download#source)
+or check out the latest version from our [Git repository](https://github.com/keepassxreboot/keepassxc).
+
+To clone the project from Git, `cd` to a suitable location and run
+
+```bash
+git clone https://github.com/keepassxreboot/keepassxc.git
+```
+
+This will clone the entire contents of the repository and check out the current `develop` branch.
+
+To update the project from within the project's folder, you can run the following command:
+
+```bash
+git pull
+```
+
+For a stable build, it is recommended to checkout the master branch.
+
+```bash
+git checkout master
+```
+
+Navigate to the directory where you have downloaded KeePassXC and type these commands:
 
 ```
+cd directory-where-sources-live
 mkdir build
 cd build
-cmake -DWITH_TESTS=OFF
+cmake -DWITH_XC_ALL=ON ..
 make
 ```
 
-**Note:** If you are on MacOS you must add this parameter to **Cmake**, with the Qt version you have installed<br/> `-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.6.2/lib/cmake/`
+If you are on Windows, you may have to add ```-G "MSYS Makefiles"``` to the beginning of the cmake command. See the [Windows Build Instructions](https://github.com/keepassxreboot/keepassxc/wiki/Building-KeePassXC#windows) for more information.
 
-You will have the compiled KeePassXC binary inside the `./build/src/` directory.
+These steps place the compiled KeePassXC binary inside the `./build/src/` directory.
+(Note the cmake notes/options below.)
 
-Common cmake parameters
-```
--DCMAKE_INSTALL_PREFIX=/usr/local
--DCMAKE_VERBOSE_MAKEFILE=ON
--DCMAKE_BUILD_TYPE=<RelWithDebInfo/Debug/Release>
--DWITH_GUI_TESTS=ON
-```
+**Cmake Notes:**
 
+* Common cmake parameters
+
+	```
+	-DCMAKE_INSTALL_PREFIX=/usr/local
+	-DCMAKE_VERBOSE_MAKEFILE=ON
+	-DCMAKE_BUILD_TYPE=<RelWithDebInfo/Debug/Release>
+	-DWITH_GUI_TESTS=ON
+	```
+
+* cmake accepts the following options:
+
+	```
+	  -DWITH_XC_AUTOTYPE=[ON|OFF] Enable/Disable Auto-Type (default: ON)
+	  -DWITH_XC_YUBIKEY=[ON|OFF] Enable/Disable YubiKey HMAC-SHA1 authentication support (default: OFF)
+	  -DWITH_XC_BROWSER=[ON|OFF] Enable/Disable KeePassXC-Browser extension support (default: OFF)
+	  -DWITH_XC_NETWORKING=[ON|OFF] Enable/Disable Networking support (e.g., favicon downloading) (default: OFF)
+	  -DWITH_XC_SSHAGENT=[ON|OFF] Enable/Disable SSHAgent support (default: OFF)
+	  -DWITH_XC_TOUCHID=[ON|OFF] (macOS Only) Enable/Disable Touch ID unlock (default:OFF)
+	  -DWITH_XC_FDOSECRETS=[ON|OFF] (Linux Only) Enable/Disable Freedesktop.org Secrets Service support (default:OFF)
+	  -DWITH_XC_KEESHARE=[ON|OFF] Enable/Disable KeeShare group synchronization extension (default: OFF)
+	  -DWITH_XC_KEESHARE_SECURE=[ON|OFF] Enable/Disable KeeShare signed containers, requires libquazip5 (default: OFF)
+	  -DWITH_XC_ALL=[ON|OFF] Enable/Disable compiling all plugins above (default: OFF)
+	  
+	  -DWITH_XC_UPDATECHECK=[ON|OFF] Enable/Disable automatic updating checking (requires WITH_XC_NETWORKING) (default: ON)
+
+	  -DWITH_TESTS=[ON|OFF] Enable/Disable building of unit tests (default: ON)
+	  -DWITH_GUI_TESTS=[ON|OFF] Enable/Disable building of GUI tests (default: OFF)
+	  -DWITH_DEV_BUILD=[ON|OFF] Enable/Disable deprecated method warnings (default: OFF)
+	  -DWITH_ASAN=[ON|OFF] Enable/Disable address sanitizer checks (Linux / macOS only) (default: OFF)
+	  -DWITH_COVERAGE=[ON|OFF] Enable/Disable coverage tests (GCC only) (default: OFF)
+	  -DWITH_APP_BUNDLE=[ON|OFF] Enable Application Bundle for macOS (default: ON)
+
+	  -DKEEPASSXC_BUILD_TYPE=[Snapshot|PreRelease|Release] Set the build type to show/hide stability warnings (default: "Snapshot")
+	  -DKEEPASSXC_DIST_TYPE=[Snap|AppImage|Other] Specify the distribution method (default: "Other")
+	  -DOVERRIDE_VERSION=[X.X.X] Specify a version number when building. Used with snapshot builds (default: "")
+	  -DGIT_HEAD_OVERRIDE=[XXXXXXX] Specify the 7 digit git commit ref for this build. Used with distribution builds (default: "")
+	```
+
+* If you are on MacOS you must add this parameter to **Cmake**, with the Qt version you have installed<br/> `-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.6.2/lib/cmake/`
+
+:exclamation: When building with ASan support on macOS, you need to use `export ASAN_OPTIONS=detect_leaks=0` before running the tests (no LSan support in macOS).
 
 Installation
 ============
 
-To install this binary execute the following:
+After you have successfully built KeePassXC, install the binary by executing the following:
 
 ```bash
 sudo make install
@@ -79,18 +144,21 @@ DESTDIR=X
 Packaging
 =========
 
-You can create a package to redistribute KeePassXC (zip, deb, rpm, dmg, etc..)
-```
-make package
-```
+You can create a package to redistribute KeePassXC (zip, deb, rpm, dmg, etc..). Refer to [keepassxc-packaging](https://github.com/keepassxreboot/keepassxc-packaging)
 
 
 Testing
 =======
 
-You can perform test on the executable
+You can perform tests on the built executables with:
 ```
-make test
+make test ARGS+="--output-on-failure"
+```
+
+If you are not currently running on an X Server or Wayland, run the tests as follows:
+```
+make test ARGS+="-E test\(cli\|gui\) --output-on-failure"
+xvfb-run -e errors -a --server-args="-screen 0 1024x768x24" make test ARGS+="-R test\(cli\|gui\) --output-on-failure"
 ```
 
 Common parameters:

LICENSE.MIT

@@ -0,0 +1,19 @@
+The MIT License (MIT)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,78 +1,57 @@
-# <img src="https://keepassxc.org/logo.png" width="40" height="40"/> KeePassXC [![Travis Build Status](https://travis-ci.org/keepassxreboot/keepassxc.svg?branch=develop)](https://travis-ci.org/keepassxreboot/keepassxc)  [![Coverage Status](https://coveralls.io/repos/github/keepassxreboot/keepassxc/badge.svg)](https://coveralls.io/github/keepassxreboot/keepassxc)
+# <img src="https://keepassxc.org/logo.png" width="40" height="40"/> KeePassXC
+[![TeamCity Build Status](https://ci.keepassxc.org/app/rest/builds/buildType:\(project:KeepassXC\)/statusIcon)](https://ci.keepassxc.org/?guest=1) [![codecov](https://codecov.io/gh/keepassxreboot/keepassxc/branch/develop/graph/badge.svg)](https://codecov.io/gh/keepassxreboot/keepassxc)
 
-KeePass Cross-platform Community Edition
+## About KeePassXC
+[KeePassXC](https://keepassxc.org) is a cross-platform community fork of
+[KeePassX](https://www.keepassx.org/).
+Our goal is to extend and improve it with new features and bugfixes
+to provide a feature-rich, fully cross-platform and modern
+open-source password manager.
 
-## About
-[KeePassXC](https://keepassxc.org) is a community fork of [KeePassX](https://www.keepassx.org/) with the goal to extend and improve it with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager.
+## Installation
+The [KeePassXC QuickStart](./docs/QUICKSTART.md) gets you started using
+KeePassXC on your Windows, Mac, or Linux computer using pre-compiled binaries
+from the [downloads page](https://keepassxc.org/download).
 
+Additionally, individual Linux distributions may ship their own versions,
+so please check out your distribution's package list to see if KeePassXC is available.
 
 ## Additional features compared to KeePassX
-- Auto-Type on all three major platforms (Linux, Windows, OS X)
-- Stand-alone password generator
+- Auto-Type on all three major platforms (Linux, Windows, macOS)
+- Twofish encryption
+- YubiKey challenge-response support
+- TOTP generation
+- CSV import
+- A [Command Line Interface (keepassxc-cli)](./share/docs/man/keepassxc-cli.1)
+- DEP and ASLR hardening
+- Stand-alone password and passphrase generator
 - Password strength meter
-- YubiKey HMAC-SHA1 authentication for unlocking databases
 - Using website favicons as entry icons
 - Merging of databases
 - Automatic reload when the database changed on disk
-- KeePassHTTP support for use with KeePassHTTP-Connector for [Mozilla Firefox](https://addons.mozilla.org/en-US/firefox/addon/keepasshttp-connector/) and [Google Chrome or Chromium](https://chrome.google.com/webstore/detail/keepasshttp-connector/dafgdjggglmmknipkhngniifhplpcldb), and [passafari](https://github.com/mmichaa/passafari.safariextension/) in Safari.
+- Browser integration with KeePassXC-Browser using [native messaging](https://developer.chrome.com/extensions/nativeMessaging) for [Mozilla Firefox](https://addons.mozilla.org/en-US/firefox/addon/keepassxc-browser/) and [Google Chrome, Chromium, Vivaldi, or Brave](https://chrome.google.com/webstore/detail/keepassxc-browser/oboonakemofpalcgghocfoadofidjkkk)
+- Synchronize passwords using KeeShare. See [Using Sharing](./docs/QUICKSTART.md#using-sharing) for more details.
 - Many bug fixes
 
-For a full list of features and changes, read the [CHANGELOG](CHANGELOG) document.
+For a full list of features and changes, read the [CHANGELOG](CHANGELOG.md) document.
+For a full list of keyboard shortcuts, see [KEYBINDS](./docs/KEYBINDS.md)
 
-### Note about KeePassHTTP
-KeePassHTTP is not a highly secure protocol and has certain flaw which allow an attacker to decrypt your passwords when they manage to intercept communication between a KeePassHTTP server and PassIFox/chromeIPass over a network connection (see [here](https://github.com/pfn/keepasshttp/issues/258) and [here](https://github.com/keepassxreboot/keepassxc/issues/147)). KeePassXC therefore strictly limits communication between itself and the browser plugin to your local computer. As long as your computer is not compromised, your passwords are fairly safe that way, but use it at your own risk!
+## Building KeePassXC
 
-### Installation
-Pre-compiled binaries can be found on the [downloads page](https://keepassxc.org/download).  Additionally, individual Linux distributions may ship their own versions, so please check out your distribution's package list to see if KeePassXC is available.
+Detailed instructions are available in the [Build and Install](./INSTALL.md)
+page or on the [Wiki page](https://github.com/keepassxreboot/keepassxc/wiki/Building-KeePassXC).
 
-### Building KeePassXC
+## Contributing
 
-*More detailed instructions are available in the INSTALL file or on the [Wiki page](https://github.com/keepassxreboot/keepassxc/wiki/Building-KeePassXC).*
-
-First, you must download the KeePassXC [source tarball](https://keepassxc.org/download#source) or check out the latest version from our [Git repository](https://github.com/keepassxreboot/keepassxc).
-
-To clone the project from Git, `cd` to a suitable location and run
-
-```bash
-git clone https://github.com/keepassxreboot/keepassxc.git
-```
-
-This will clone the entire contents of the repository and check out the current `develop` branch.
-
-To update the project from within the project's folder, you can run the following command:
-
-```bash
-git pull
-```
-
-Once you have downloaded the source code, you can `cd` into the source code directory, build and install KeePassXC:
-
-```bash
-mkdir build
-cd build
-cmake -DWITH_TESTS=OFF ..
-make -j8
-sudo make install
-```
-
-cmake accepts the following options:
-
-```
-  -DWITH_XC_AUTOTYPE=[ON|OFF] Enable/Disable Auto-Type (default: ON)
-  -DWITH_XC_HTTP=[ON|OFF] Enable/Disable KeePassHTTP and custom icon downloads (default: OFF)
-  -DWITH_XC_YUBIKEY=[ON|OFF] Enable/Disable YubiKey HMAC-SHA1 authentication support (default: OFF)
-
-  -DWITH_TESTS=[ON|OFF] Enable/Disable building of unit tests (default: ON)
-  -DWITH_GUI_TESTS=[ON|OFF] Enable/Disable building of GUI tests (default: OFF)
-  -DWITH_DEV_BUILD=[ON|OFF] Enable/Disable deprecated method warnings (default: OFF)
-  -DWITH_ASAN=[ON|OFF] Enable/Disable address sanitizer checks (Linux only) (default: OFF)
-  -DWITH_COVERAGE=[ON|OFF] Enable/Disable coverage tests (GCC only) (default: OFF)
-```
-
-### Contributing
-
-We are always looking for suggestions how to improve our application. If you find any bugs or have an idea for a new feature, please let us know by opening a report in our [issue tracker](https://github.com/keepassxreboot/keepassxc/issues) on GitHub or join us on IRC on freenode channels #keepassxc or #keepassxc-dev.
+We are always looking for suggestions how to improve our application.
+If you find any bugs or have an idea for a new feature, please let us know by
+opening a report in our [issue tracker](https://github.com/keepassxreboot/keepassxc/issues)
+on GitHub or join us on IRC on freenode channels #keepassxc or #keepassxc-dev.
 
 You can of course also directly contribute your own code. We are happy to accept your pull requests.
 
 Please read the [CONTRIBUTING document](.github/CONTRIBUTING.md) for further information.
+
+## License
+
+GPL-2 or GPL-3

cmake/CLangFormat.cmake

@@ -0,0 +1,64 @@
+#  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 or (at your option)
+#  version 3 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set(EXCLUDED_DIRS
+        # third-party directories
+        src/zxcvbn/
+        # objective-c directories
+        src/touchid/
+        src/autotype/mac/
+        src/gui/macutils/)
+
+set(EXCLUDED_FILES
+        # third-party files
+        streams/qtiocompressor.cpp
+        streams/qtiocompressor.h
+        gui/KMessageWidget.h
+        gui/KMessageWidget.cpp
+        gui/MainWindowAdaptor.h
+        gui/MainWindowAdaptor.cpp
+        crypto/ssh/bcrypt_pbkdf.cpp
+        crypto/ssh/blf.h
+        crypto/ssh/blowfish.c
+        tests/modeltest.cpp
+        tests/modeltest.h
+        # objective-c files
+        core/ScreenLockListenerMac.h
+        core/ScreenLockListenerMac.cpp)
+
+file(GLOB_RECURSE ALL_SOURCE_FILES RELATIVE ${CMAKE_SOURCE_DIR} src/*.cpp src/*.h tests/*.cpp tests/*.h)
+foreach(SOURCE_FILE ${ALL_SOURCE_FILES})
+    foreach(EXCLUDED_DIR ${EXCLUDED_DIRS})
+        string(FIND ${SOURCE_FILE} ${EXCLUDED_DIR} SOURCE_FILE_EXCLUDED)
+        if(NOT ${SOURCE_FILE_EXCLUDED} EQUAL -1)
+            list(REMOVE_ITEM ALL_SOURCE_FILES ${SOURCE_FILE})
+        endif()
+    endforeach()
+    foreach(EXCLUDED_FILE ${EXCLUDED_FILES})
+        if(${SOURCE_FILE} MATCHES ".*${EXCLUDED_FILE}$")
+            list(REMOVE_ITEM ALL_SOURCE_FILES ${SOURCE_FILE})
+        endif()
+    endforeach()
+endforeach()
+
+add_custom_target(format)
+foreach(SOURCE_FILE ${ALL_SOURCE_FILES})
+    add_custom_command(
+            TARGET format
+            PRE_BUILD
+            COMMAND echo Formatting ${SOURCE_FILE}
+            COMMAND clang-format -style=file -i \"${SOURCE_FILE}\"
+            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+endforeach()

cmake/CodeCoverage.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 - 2015, Lars Bilke
+# Copyright (c) 2012 - 2017, Lars Bilke
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#
+# CHANGES:
 #
 # 2012-01-31, Lars Bilke
 # - Enable Code Coverage
@@ -35,163 +35,269 @@
 # - Added support for Clang.
 # - Some additional usage instructions.
 #
+# 2016-02-03, Lars Bilke
+# - Refactored functions to use named parameters
+#
+# 2017-06-02, Lars Bilke
+# - Merged with modified version from github.com/ufz/ogs
+#
+#
 # USAGE:
-
-# 0. (Mac only) If you use Xcode 5.1 make sure to patch geninfo as described here:
-#      http://stackoverflow.com/a/22404544/80480
 #
 # 1. Copy this file into your cmake modules path.
 #
 # 2. Add the following line to your CMakeLists.txt:
-#      INCLUDE(CodeCoverage)
+#      include(CodeCoverage)
 #
-# 3. Set compiler flags to turn off optimization and enable coverage:
-#    SET(CMAKE_CXX_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
-#	 SET(CMAKE_C_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
+# 3. Append necessary compiler flags:
+#      APPEND_COVERAGE_COMPILER_FLAGS()
 #
-# 3. Use the function SETUP_TARGET_FOR_COVERAGE to create a custom make target
-#    which runs your test executable and produces a lcov code coverage report:
+# 4. If you need to exclude additional directories from the report, specify them
+#    using the COVERAGE_LCOV_EXCLUDES variable before calling SETUP_TARGET_FOR_COVERAGE_LCOV.
 #    Example:
-#	 SETUP_TARGET_FOR_COVERAGE(
-#				my_coverage_target  # Name for custom target.
-#				test_driver         # Name of the test driver executable that runs the tests.
-#									# NOTE! This should always have a ZERO as exit code
-#									# otherwise the coverage generation will not complete.
-#				coverage            # Name of output directory.
-#				)
+#      set(COVERAGE_LCOV_EXCLUDES 'dir1/*' 'dir2/*')
 #
-# 4. Build a Debug build:
-#	 cmake -DCMAKE_BUILD_TYPE=Debug ..
-#	 make
-#	 make my_coverage_target
+# 5. Use the functions described below to create a custom make target which
+#    runs your test executable and produces a code coverage report.
 #
+# 6. Build a Debug build:
+#      cmake -DCMAKE_BUILD_TYPE=Debug ..
+#      make
+#      make my_coverage_target
 #
 
+include(CMakeParseArguments)
+
 # Check prereqs
-FIND_PROGRAM( GCOV_PATH gcov )
-FIND_PROGRAM( LCOV_PATH lcov )
-FIND_PROGRAM( GENHTML_PATH genhtml )
-FIND_PROGRAM( GCOVR_PATH gcovr PATHS ${CMAKE_SOURCE_DIR}/tests)
+find_program( GCOV_PATH gcov )
+find_program( LCOV_PATH  NAMES lcov lcov.bat lcov.exe lcov.perl)
+find_program( GENHTML_PATH NAMES genhtml genhtml.perl genhtml.bat )
+find_program( GCOVR_PATH gcovr PATHS ${CMAKE_SOURCE_DIR}/scripts/test)
+find_program( SIMPLE_PYTHON_EXECUTABLE python )
 
-IF(NOT GCOV_PATH)
-	MESSAGE(FATAL_ERROR "gcov not found! Aborting...")
-ENDIF() # NOT GCOV_PATH
+if(NOT GCOV_PATH)
+    message(FATAL_ERROR "gcov not found! Aborting...")
+endif() # NOT GCOV_PATH
 
-IF("${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang")
-	IF("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 3)
-		MESSAGE(FATAL_ERROR "Clang version must be 3.0.0 or greater! Aborting...")
-	ENDIF()
-ELSEIF(NOT CMAKE_COMPILER_IS_GNUCXX)
-	MESSAGE(FATAL_ERROR "Compiler is not GNU gcc! Aborting...")
-ENDIF() # CHECK VALID COMPILER
+if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang")
+    if("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 3)
+        message(FATAL_ERROR "Clang version must be 3.0.0 or greater! Aborting...")
+    endif()
+elseif(NOT CMAKE_COMPILER_IS_GNUCXX)
+    message(FATAL_ERROR "Compiler is not GNU gcc! Aborting...")
+endif()
 
-SET(CMAKE_CXX_FLAGS_COVERAGE
-    "-g -O0 --coverage -fprofile-arcs -ftest-coverage"
+set(COVERAGE_COMPILER_FLAGS "-g -O0 --coverage -fprofile-arcs -ftest-coverage"
+    CACHE INTERNAL "")
+
+set(CMAKE_CXX_FLAGS_COVERAGE
+    ${COVERAGE_COMPILER_FLAGS}
     CACHE STRING "Flags used by the C++ compiler during coverage builds."
     FORCE )
-SET(CMAKE_C_FLAGS_COVERAGE
-    "-g -O0 --coverage -fprofile-arcs -ftest-coverage"
+set(CMAKE_C_FLAGS_COVERAGE
+    ${COVERAGE_COMPILER_FLAGS}
     CACHE STRING "Flags used by the C compiler during coverage builds."
     FORCE )
-SET(CMAKE_EXE_LINKER_FLAGS_COVERAGE
+set(CMAKE_EXE_LINKER_FLAGS_COVERAGE
     ""
     CACHE STRING "Flags used for linking binaries during coverage builds."
     FORCE )
-SET(CMAKE_SHARED_LINKER_FLAGS_COVERAGE
+set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE
     ""
     CACHE STRING "Flags used by the shared libraries linker during coverage builds."
     FORCE )
-MARK_AS_ADVANCED(
+mark_as_advanced(
     CMAKE_CXX_FLAGS_COVERAGE
     CMAKE_C_FLAGS_COVERAGE
     CMAKE_EXE_LINKER_FLAGS_COVERAGE
     CMAKE_SHARED_LINKER_FLAGS_COVERAGE )
 
-IF ( NOT (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "Coverage"))
-  MESSAGE( WARNING "Code coverage results with an optimized (non-Debug) build may be misleading" )
-ENDIF() # NOT CMAKE_BUILD_TYPE STREQUAL "Debug"
+if(NOT CMAKE_BUILD_TYPE_LOWER STREQUAL "debug")
+    message(WARNING "Code coverage results with an optimised (non-Debug) build may be misleading")
+endif() # NOT CMAKE_BUILD_TYPE STREQUAL "Debug"
 
+if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+    link_libraries(gcov)
+else()
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage")
+endif()
 
-# Param _targetname     The name of new the custom make target
-# Param _testrunner     The name of the target which runs the tests.
-#						MUST return ZERO always, even on errors.
-#						If not, no coverage report will be created!
-# Param _outputname     lcov output is generated as _outputname.info
-#                       HTML report is generated in _outputname/index.html
-# Optional fourth parameter is passed as arguments to _testrunner
-#   Pass them in list form, e.g.: "-j;2" for -j 2
-FUNCTION(SETUP_TARGET_FOR_COVERAGE _targetname _testrunner _outputname)
+# Defines a target for running and collection code coverage information
+# Builds dependencies, runs the given executable and outputs reports.
+# NOTE! The executable should always have a ZERO as exit code otherwise
+# the coverage generation will not complete.
+#
+# SETUP_TARGET_FOR_COVERAGE_LCOV(
+#     NAME testrunner_coverage                    # New target name
+#     EXECUTABLE testrunner -j ${PROCESSOR_COUNT} # Executable in PROJECT_BINARY_DIR
+#     DEPENDENCIES testrunner                     # Dependencies to build first
+# )
+function(SETUP_TARGET_FOR_COVERAGE_LCOV)
 
-	IF(NOT LCOV_PATH)
-		MESSAGE(FATAL_ERROR "lcov not found! Aborting...")
-	ENDIF() # NOT LCOV_PATH
+    set(options NONE)
+    set(oneValueArgs NAME)
+    set(multiValueArgs EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES)
+    cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
-	IF(NOT GENHTML_PATH)
-		MESSAGE(FATAL_ERROR "genhtml not found! Aborting...")
-	ENDIF() # NOT GENHTML_PATH
+    if(NOT LCOV_PATH)
+        message(FATAL_ERROR "lcov not found! Aborting...")
+    endif() # NOT LCOV_PATH
 
-	SET(coverage_info "${CMAKE_BINARY_DIR}/${_outputname}.info")
-	SET(coverage_cleaned "${coverage_info}.cleaned")
+    if(NOT GENHTML_PATH)
+        message(FATAL_ERROR "genhtml not found! Aborting...")
+    endif() # NOT GENHTML_PATH
 
-	SEPARATE_ARGUMENTS(test_command UNIX_COMMAND "${_testrunner}")
+    # Setup target
+    add_custom_target(${Coverage_NAME}
 
-	# Setup target
-	ADD_CUSTOM_TARGET(${_targetname}
+        # Cleanup lcov
+        COMMAND ${LCOV_PATH} --gcov-tool ${GCOV_PATH} -directory . --zerocounters
+        # Create baseline to make sure untouched files show up in the report
+        COMMAND ${LCOV_PATH} --gcov-tool ${GCOV_PATH} -c -i -d . -o ${Coverage_NAME}.base
 
-		# Cleanup lcov
-		${LCOV_PATH} --directory . --zerocounters
+        # Run tests
+        COMMAND ${Coverage_EXECUTABLE}
 
-		# Run tests
-		COMMAND ${test_command} ${ARGV3}
+        # Capturing lcov counters and generating report
+        COMMAND ${LCOV_PATH} --gcov-tool ${GCOV_PATH} --directory . --capture --output-file ${Coverage_NAME}.info
+        # add baseline counters
+        COMMAND ${LCOV_PATH} --gcov-tool ${GCOV_PATH} -a ${Coverage_NAME}.base -a ${Coverage_NAME}.info --output-file ${Coverage_NAME}.total
+        COMMAND ${LCOV_PATH} --gcov-tool ${GCOV_PATH} --remove ${Coverage_NAME}.total ${COVERAGE_LCOV_EXCLUDES} --output-file ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info.cleaned
+        COMMAND ${GENHTML_PATH} -o ${Coverage_NAME} ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info.cleaned
+        COMMAND ${CMAKE_COMMAND} -E remove ${Coverage_NAME}.base ${Coverage_NAME}.total ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info.cleaned
 
-		# Capturing lcov counters and generating report
-		COMMAND ${LCOV_PATH} --directory . --capture --output-file ${coverage_info}
-		COMMAND ${LCOV_PATH} --remove ${coverage_info} 'tests/*' '/usr/*' --output-file ${coverage_cleaned}
-		COMMAND ${GENHTML_PATH} -o ${_outputname} ${coverage_cleaned}
-		COMMAND ${CMAKE_COMMAND} -E remove ${coverage_info} ${coverage_cleaned}
+        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+        DEPENDS ${Coverage_DEPENDENCIES}
+        COMMENT "Resetting code coverage counters to zero.\nProcessing code coverage counters and generating report."
+    )
 
-		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-		COMMENT "Resetting code coverage counters to zero.\nProcessing code coverage counters and generating report."
-	)
+    # Show where to find the lcov info report
+    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
+        COMMAND ;
+        COMMENT "Lcov code coverage info report saved in ${Coverage_NAME}.info."
+    )
 
-	# Show info where to find the report
-	ADD_CUSTOM_COMMAND(TARGET ${_targetname} POST_BUILD
-		COMMAND ;
-		COMMENT "Open ./${_outputname}/index.html in your browser to view the coverage report."
-	)
+    # Show info where to find the report
+    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
+        COMMAND ;
+        COMMENT "Open ./${Coverage_NAME}/index.html in your browser to view the coverage report."
+    )
 
-ENDFUNCTION() # SETUP_TARGET_FOR_COVERAGE
+endfunction() # SETUP_TARGET_FOR_COVERAGE_LCOV
 
-# Param _targetname     The name of new the custom make target
-# Param _testrunner     The name of the target which runs the tests
-# Param _outputname     cobertura output is generated as _outputname.xml
-# Optional fourth parameter is passed as arguments to _testrunner
-#   Pass them in list form, e.g.: "-j;2" for -j 2
-FUNCTION(SETUP_TARGET_FOR_COVERAGE_COBERTURA _targetname _testrunner _outputname)
+# Defines a target for running and collection code coverage information
+# Builds dependencies, runs the given executable and outputs reports.
+# NOTE! The executable should always have a ZERO as exit code otherwise
+# the coverage generation will not complete.
+#
+# SETUP_TARGET_FOR_COVERAGE_GCOVR_XML(
+#     NAME ctest_coverage                    # New target name
+#     EXECUTABLE ctest -j ${PROCESSOR_COUNT} # Executable in PROJECT_BINARY_DIR
+#     DEPENDENCIES executable_target         # Dependencies to build first
+# )
+function(SETUP_TARGET_FOR_COVERAGE_GCOVR_XML)
 
-	IF(NOT PYTHON_EXECUTABLE)
-		MESSAGE(FATAL_ERROR "Python not found! Aborting...")
-	ENDIF() # NOT PYTHON_EXECUTABLE
+    set(options NONE)
+    set(oneValueArgs NAME)
+    set(multiValueArgs EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES)
+    cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
-	IF(NOT GCOVR_PATH)
-		MESSAGE(FATAL_ERROR "gcovr not found! Aborting...")
-	ENDIF() # NOT GCOVR_PATH
+    if(NOT SIMPLE_PYTHON_EXECUTABLE)
+        message(FATAL_ERROR "python not found! Aborting...")
+    endif() # NOT SIMPLE_PYTHON_EXECUTABLE
 
-	ADD_CUSTOM_TARGET(${_targetname}
+    if(NOT GCOVR_PATH)
+        message(FATAL_ERROR "gcovr not found! Aborting...")
+    endif() # NOT GCOVR_PATH
 
-		# Run tests
-		${_testrunner} ${ARGV3}
+    # Combine excludes to several -e arguments
+    set(GCOVR_EXCLUDES "")
+    foreach(EXCLUDE ${COVERAGE_GCOVR_EXCLUDES})
+        list(APPEND GCOVR_EXCLUDES "-e")
+        list(APPEND GCOVR_EXCLUDES "${EXCLUDE}")
+    endforeach()
 
-		# Running gcovr
-		COMMAND ${GCOVR_PATH} -x -r ${CMAKE_SOURCE_DIR} -e '${CMAKE_SOURCE_DIR}/tests/'  -o ${_outputname}.xml
-		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-		COMMENT "Running gcovr to produce Cobertura code coverage report."
-	)
+    add_custom_target(${Coverage_NAME}
+        # Run tests
+        ${Coverage_EXECUTABLE}
 
-	# Show info where to find the report
-	ADD_CUSTOM_COMMAND(TARGET ${_targetname} POST_BUILD
-		COMMAND ;
-		COMMENT "Cobertura code coverage report saved in ${_outputname}.xml."
-	)
+        # Running gcovr
+        COMMAND ${GCOVR_PATH} --xml
+            -r ${PROJECT_SOURCE_DIR} ${GCOVR_EXCLUDES}
+            --object-directory=${PROJECT_BINARY_DIR}
+            -o ${Coverage_NAME}.xml
+        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+        DEPENDS ${Coverage_DEPENDENCIES}
+        COMMENT "Running gcovr to produce Cobertura code coverage report."
+    )
 
-ENDFUNCTION() # SETUP_TARGET_FOR_COVERAGE_COBERTURA
+    # Show info where to find the report
+    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
+        COMMAND ;
+        COMMENT "Cobertura code coverage report saved in ${Coverage_NAME}.xml."
+    )
+
+endfunction() # SETUP_TARGET_FOR_COVERAGE_GCOVR_XML
+
+# Defines a target for running and collection code coverage information
+# Builds dependencies, runs the given executable and outputs reports.
+# NOTE! The executable should always have a ZERO as exit code otherwise
+# the coverage generation will not complete.
+#
+# SETUP_TARGET_FOR_COVERAGE_GCOVR_HTML(
+#     NAME ctest_coverage                    # New target name
+#     EXECUTABLE ctest -j ${PROCESSOR_COUNT} # Executable in PROJECT_BINARY_DIR
+#     DEPENDENCIES executable_target         # Dependencies to build first
+# )
+function(SETUP_TARGET_FOR_COVERAGE_GCOVR_HTML)
+
+    set(options NONE)
+    set(oneValueArgs NAME)
+    set(multiValueArgs EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES)
+    cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    if(NOT SIMPLE_PYTHON_EXECUTABLE)
+        message(FATAL_ERROR "python not found! Aborting...")
+    endif() # NOT SIMPLE_PYTHON_EXECUTABLE
+
+    if(NOT GCOVR_PATH)
+        message(FATAL_ERROR "gcovr not found! Aborting...")
+    endif() # NOT GCOVR_PATH
+
+    # Combine excludes to several -e arguments
+    set(GCOVR_EXCLUDES "")
+    foreach(EXCLUDE ${COVERAGE_GCOVR_EXCLUDES})
+        list(APPEND GCOVR_EXCLUDES "-e")
+        list(APPEND GCOVR_EXCLUDES "${EXCLUDE}")
+    endforeach()
+
+    add_custom_target(${Coverage_NAME}
+        # Run tests
+        ${Coverage_EXECUTABLE}
+
+        # Create folder
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/${Coverage_NAME}
+
+        # Running gcovr
+        COMMAND ${GCOVR_PATH} --html --html-details
+            -r ${PROJECT_SOURCE_DIR} ${GCOVR_EXCLUDES}
+            --object-directory=${PROJECT_BINARY_DIR}
+            -o ${Coverage_NAME}/index.html
+        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+        DEPENDS ${Coverage_DEPENDENCIES}
+        COMMENT "Running gcovr to produce HTML code coverage report."
+    )
+
+    # Show info where to find the report
+    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
+        COMMAND ;
+        COMMENT "Open ./${Coverage_NAME}/index.html in your browser to view the coverage report."
+    )
+
+endfunction() # SETUP_TARGET_FOR_COVERAGE_GCOVR_HTML
+
+function(APPEND_COVERAGE_COMPILER_FLAGS)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE)
+    message(STATUS "Appending code coverage compiler flags: ${COVERAGE_COMPILER_FLAGS}")
+endfunction() # APPEND_COVERAGE_COMPILER_FLAGS

cmake/FindArgon2.cmake

@@ -0,0 +1,36 @@
+#  Copyright (C) 2017 KeePassXC Team
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 or (at your option)
+#  version 3 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+find_path(ARGON2_INCLUDE_DIR argon2.h)
+if(MINGW)
+    # find static library on Windows, and redefine used symbols to
+    # avoid definition name conflicts with libsodium
+    find_library(ARGON2_SYS_LIBRARIES libargon2.a)
+    message(STATUS "Patching libargon2...\n")
+    execute_process(COMMAND objcopy
+            --redefine-sym argon2_hash=libargon2_argon2_hash
+            --redefine-sym _argon2_hash=_libargon2_argon2_hash
+            --redefine-sym argon2_error_message=libargon2_argon2_error_message
+            --redefine-sym _argon2_error_message=_libargon2_argon2_error_message
+            ${ARGON2_SYS_LIBRARIES} ${CMAKE_BINARY_DIR}/libargon2_patched.a
+            WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+    find_library(ARGON2_LIBRARIES libargon2_patched.a PATHS ${CMAKE_BINARY_DIR} NO_DEFAULT_PATH)
+else()
+    find_library(ARGON2_LIBRARIES argon2)
+endif()
+mark_as_advanced(ARGON2_LIBRARIES ARGON2_INCLUDE_DIR)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Argon2 DEFAULT_MSG ARGON2_LIBRARIES ARGON2_INCLUDE_DIR)

cmake/FindGcrypt.cmake

@@ -22,7 +22,7 @@ mark_as_advanced(GCRYPT_LIBRARIES GCRYPT_INCLUDE_DIR)
 if(GCRYPT_INCLUDE_DIR AND EXISTS "${GCRYPT_INCLUDE_DIR}/gcrypt.h")
     file(STRINGS "${GCRYPT_INCLUDE_DIR}/gcrypt.h" GCRYPT_H REGEX "^#define GCRYPT_VERSION \"[^\"]*\"$")
     string(REGEX REPLACE "^.*GCRYPT_VERSION \"([0-9]+).*$" "\\1" GCRYPT_VERSION_MAJOR "${GCRYPT_H}")
-    string(REGEX REPLACE "^.*GCRYPT_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" GCRYPT_VERSION_MINOR  "${GCRYPT_H}")
+    string(REGEX REPLACE "^.*GCRYPT_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" GCRYPT_VERSION_MINOR "${GCRYPT_H}")
     string(REGEX REPLACE "^.*GCRYPT_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" GCRYPT_VERSION_PATCH "${GCRYPT_H}")
     set(GCRYPT_VERSION_STRING "${GCRYPT_VERSION_MAJOR}.${GCRYPT_VERSION_MINOR}.${GCRYPT_VERSION_PATCH}")
 endif()

cmake/FindLibGPGError.cmake

@@ -14,10 +14,10 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 find_path(GPGERROR_INCLUDE_DIR gpg-error.h)
-
 find_library(GPGERROR_LIBRARIES gpg-error)
 
 mark_as_advanced(GPGERROR_LIBRARIES GPGERROR_INCLUDE_DIR)
 
 include(FindPackageHandleStandardArgs)
+include_directories(${GPGERROR_INCLUDE_DIR})
 find_package_handle_standard_args(LibGPGError DEFAULT_MSG GPGERROR_LIBRARIES GPGERROR_INCLUDE_DIR)

cmake/FindQREncode.cmake

@@ -0,0 +1,22 @@
+#  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 or (at your option)
+#  version 3 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+find_path(QRENCODE_INCLUDE_DIR qrencode.h)
+find_library(QRENCODE_LIBRARY qrencode)
+
+mark_as_advanced(QRENCODE_LIBRARY QRENCODE_INCLUDE_DIR)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(QREncode DEFAULT_MSG QRENCODE_LIBRARY QRENCODE_INCLUDE_DIR)

cmake/FindQuaZip.cmake

@@ -0,0 +1,24 @@
+# QUAZIP_FOUND                   - QuaZip library was found
+# QUAZIP_INCLUDE_DIR             - Path to QuaZip include dir
+# QUAZIP_INCLUDE_DIRS            - Path to QuaZip and zlib include dir (combined from QUAZIP_INCLUDE_DIR + ZLIB_INCLUDE_DIR)
+# QUAZIP_LIBRARIES               - List of QuaZip libraries
+# QUAZIP_ZLIB_INCLUDE_DIR        - The include dir of zlib headers
+
+if(MINGW)
+    find_library(QUAZIP_LIBRARIES libquazip5)
+    find_path(QUAZIP_INCLUDE_DIR quazip.h PATH_SUFFIXES quazip5)
+    find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h)
+else()
+    find_library(QUAZIP_LIBRARIES
+        NAMES quazip5 quazip
+	PATHS /usr/lib /usr/lib64 /usr/local/lib
+    )
+    find_path(QUAZIP_INCLUDE_DIR quazip.h
+	PATHS /usr/include /usr/local/include
+        PATH_SUFFIXES quazip5 quazip
+    )
+    find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h PATHS /usr/include /usr/local/include)
+endif()
+include(FindPackageHandleStandardArgs)
+set(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} ${QUAZIP_ZLIB_INCLUDE_DIR})
+find_package_handle_standard_args(QUAZIP DEFAULT_MSG QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS)

cmake/FindReadline.cmake

@@ -0,0 +1,50 @@
+# Code copied from sethhall@github
+#
+# - Try to find readline include dirs and libraries
+#
+# Usage of this module as follows:
+#
+#     find_package(Readline)
+#
+# Variables used by this module, they can change the default behaviour and need
+# to be set before calling find_package:
+#
+#  Readline_ROOT_DIR         Set this variable to the root installation of
+#                            readline if the module has problems finding the
+#                            proper installation path.
+#
+# Variables defined by this module:
+#
+#  READLINE_FOUND            System has readline, include and lib dirs found
+#  Readline_INCLUDE_DIR      The readline include directories.
+#  Readline_LIBRARY          The readline library.
+
+find_path(Readline_ROOT_DIR
+    NAMES include/readline/readline.h
+)
+
+find_path(Readline_INCLUDE_DIR
+    NAMES readline/readline.h
+    HINTS ${Readline_ROOT_DIR}/include
+)
+
+find_library(Readline_LIBRARY
+    NAMES readline
+    HINTS ${Readline_ROOT_DIR}/lib
+)
+
+if(Readline_INCLUDE_DIR AND Readline_LIBRARY AND Ncurses_LIBRARY)
+  set(READLINE_FOUND TRUE)
+else(Readline_INCLUDE_DIR AND Readline_LIBRARY AND Ncurses_LIBRARY)
+  find_library(Readline_LIBRARY NAMES readline)
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(Readline DEFAULT_MSG Readline_INCLUDE_DIR Readline_LIBRARY )
+  mark_as_advanced(Readline_INCLUDE_DIR Readline_LIBRARY)
+endif(Readline_INCLUDE_DIR AND Readline_LIBRARY AND Ncurses_LIBRARY)
+
+mark_as_advanced(
+    Readline_ROOT_DIR
+    Readline_INCLUDE_DIR
+    Readline_LIBRARY
+)
+

cmake/FindYubiKey.cmake

@@ -17,8 +17,8 @@ find_path(YUBIKEY_CORE_INCLUDE_DIR yubikey.h)
 find_path(YUBIKEY_PERS_INCLUDE_DIR ykcore.h PATH_SUFFIXES ykpers-1)
 set(YUBIKEY_INCLUDE_DIRS ${YUBIKEY_CORE_INCLUDE_DIR} ${YUBIKEY_PERS_INCLUDE_DIR})
 
-find_library(YUBIKEY_CORE_LIBRARY yubikey)
-find_library(YUBIKEY_PERS_LIBRARY ykpers-1)
+find_library(YUBIKEY_CORE_LIBRARY NAMES yubikey.dll libyubikey.so yubikey)
+find_library(YUBIKEY_PERS_LIBRARY NAMES ykpers-1.dll libykpers-1.so ykpers-1)
 set(YUBIKEY_LIBRARIES ${YUBIKEY_CORE_LIBRARY} ${YUBIKEY_PERS_LIBRARY})
 
 include(FindPackageHandleStandardArgs)

cmake/Findsodium.cmake

@@ -0,0 +1,267 @@
+# Written in 2016 by Henrik Steffen Gaßmann <henrik@gassmann.onl>
+#
+# To the extent possible under law, the author(s) have dedicated all
+# copyright and related and neighboring rights to this software to the
+# public domain worldwide. This software is distributed without any warranty.
+#
+# You should have received a copy of the CC0 Public Domain Dedication
+# along with this software. If not, see
+#
+#     http://creativecommons.org/publicdomain/zero/1.0/
+#
+########################################################################
+# Tries to find the local libsodium installation.
+#
+# On Windows the sodium_DIR environment variable is used as a default
+# hint which can be overridden by setting the corresponding cmake variable.
+#
+# Once done the following variables will be defined:
+#
+#   sodium_FOUND
+#   sodium_INCLUDE_DIR
+#   sodium_LIBRARY_DEBUG
+#   sodium_LIBRARY_RELEASE
+#
+#
+# Furthermore an imported "sodium" target is created.
+#
+
+if (CMAKE_C_COMPILER_ID STREQUAL "GNU"
+    OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
+    set(_GCC_COMPATIBLE 1)
+endif()
+
+# static library option
+option(sodium_USE_STATIC_LIBS "enable to statically link against sodium")
+if(NOT (sodium_USE_STATIC_LIBS EQUAL sodium_USE_STATIC_LIBS_LAST))
+    unset(sodium_LIBRARY CACHE)
+    unset(sodium_LIBRARY_DEBUG CACHE)
+    unset(sodium_LIBRARY_RELEASE CACHE)
+    unset(sodium_DLL_DEBUG CACHE)
+    unset(sodium_DLL_RELEASE CACHE)
+    set(sodium_USE_STATIC_LIBS_LAST ${sodium_USE_STATIC_LIBS} CACHE INTERNAL "internal change tracking variable")
+endif()
+
+
+########################################################################
+# UNIX
+if (UNIX)
+    # import pkg-config
+    find_package(PkgConfig QUIET)
+    if (PKG_CONFIG_FOUND)
+        pkg_check_modules(sodium_PKG QUIET libsodium)
+    endif()
+
+    if(sodium_USE_STATIC_LIBS)
+        set(XPREFIX sodium_PKG_STATIC)
+    else()
+        set(XPREFIX sodium_PKG)
+    endif()
+
+    find_path(sodium_INCLUDE_DIR sodium.h
+        HINTS ${${XPREFIX}_INCLUDE_DIRS}
+    )
+    find_library(sodium_LIBRARY_DEBUG NAMES ${${XPREFIX}_LIBRARIES} sodium
+        HINTS ${${XPREFIX}_LIBRARY_DIRS}
+    )
+    find_library(sodium_LIBRARY_RELEASE NAMES ${${XPREFIX}_LIBRARIES} sodium
+        HINTS ${${XPREFIX}_LIBRARY_DIRS}
+    )
+
+
+########################################################################
+# Windows
+elseif (WIN32)
+    set(sodium_DIR "$ENV{sodium_DIR}" CACHE FILEPATH "sodium install directory")
+    mark_as_advanced(sodium_DIR)
+
+    find_path(sodium_INCLUDE_DIR sodium.h
+        HINTS ${sodium_DIR}
+        PATH_SUFFIXES include
+    )
+
+    if (MSVC)
+        # detect target architecture
+        file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/arch.c" [=[
+            #if defined _M_IX86
+            #error ARCH_VALUE x86_32
+            #elif defined _M_X64
+            #error ARCH_VALUE x86_64
+            #endif
+            #error ARCH_VALUE unknown
+        ]=])
+        try_compile(_UNUSED_VAR "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/arch.c"
+            OUTPUT_VARIABLE _COMPILATION_LOG
+        )
+        string(REGEX REPLACE ".*ARCH_VALUE ([a-zA-Z0-9_]+).*" "\\1" _TARGET_ARCH "${_COMPILATION_LOG}")
+
+        # construct library path
+        if (_TARGET_ARCH STREQUAL "x86_32")
+            string(APPEND _PLATFORM_PATH "Win32")
+        elseif(_TARGET_ARCH STREQUAL "x86_64")
+            string(APPEND _PLATFORM_PATH "x64")
+        else()
+            message(FATAL_ERROR "the ${_TARGET_ARCH} architecture is not supported by Findsodium.cmake.")
+        endif()
+        string(APPEND _PLATFORM_PATH "/$$CONFIG$$")
+
+        if (MSVC_VERSION LESS 1900)
+            math(EXPR _VS_VERSION "${MSVC_VERSION} / 10 - 60")
+        else()
+            math(EXPR _VS_VERSION "${MSVC_VERSION} / 10 - 50")
+        endif()
+        string(APPEND _PLATFORM_PATH "/v${_VS_VERSION}")
+
+        if (sodium_USE_STATIC_LIBS)
+            string(APPEND _PLATFORM_PATH "/static")
+        else()
+            string(APPEND _PLATFORM_PATH "/dynamic")
+        endif()
+
+        string(REPLACE "$$CONFIG$$" "Debug" _DEBUG_PATH_SUFFIX "${_PLATFORM_PATH}")
+        string(REPLACE "$$CONFIG$$" "Release" _RELEASE_PATH_SUFFIX "${_PLATFORM_PATH}")
+
+        find_library(sodium_LIBRARY_DEBUG libsodium.lib
+            HINTS ${sodium_DIR}
+            PATH_SUFFIXES ${_DEBUG_PATH_SUFFIX}
+        )
+        find_library(sodium_LIBRARY_RELEASE libsodium.lib
+            HINTS ${sodium_DIR}
+            PATH_SUFFIXES ${_RELEASE_PATH_SUFFIX}
+        )
+        if (NOT sodium_USE_STATIC_LIBS)
+            set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
+            find_library(sodium_DLL_DEBUG libsodium
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES ${_DEBUG_PATH_SUFFIX}
+            )
+            find_library(sodium_DLL_RELEASE libsodium
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES ${_RELEASE_PATH_SUFFIX}
+            )
+        endif()
+
+    elseif(_GCC_COMPATIBLE)
+        if (sodium_USE_STATIC_LIBS)
+            find_library(sodium_LIBRARY_DEBUG libsodium.a
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES lib
+            )
+            find_library(sodium_LIBRARY_RELEASE libsodium.a
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES lib
+            )
+        else()
+            find_library(sodium_LIBRARY_DEBUG libsodium.dll.a
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES lib
+            )
+            find_library(sodium_LIBRARY_RELEASE libsodium.dll.a
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES lib
+            )
+
+            file(GLOB _DLL
+                LIST_DIRECTORIES false
+                RELATIVE "${sodium_DIR}/bin"
+                "${sodium_DIR}/bin/libsodium*.dll"
+            )
+            find_library(sodium_DLL_DEBUG ${_DLL} libsodium
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES bin
+            )
+            find_library(sodium_DLL_RELEASE ${_DLL} libsodium
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES bin
+            )
+        endif()
+    else()
+        message(FATAL_ERROR "this platform is not supported by FindSodium.cmake")
+    endif()
+
+
+########################################################################
+# unsupported
+else()
+    message(FATAL_ERROR "this platform is not supported by FindSodium.cmake")
+endif()
+
+
+########################################################################
+# common stuff
+
+# extract sodium version
+if (sodium_INCLUDE_DIR)
+    set(_VERSION_HEADER "${_INCLUDE_DIR}/sodium/version.h")
+    if (EXISTS _VERSION_HEADER)
+        file(READ "${_VERSION_HEADER}" _VERSION_HEADER_CONTENT)
+        string(REGEX REPLACE ".*#[ \t]*define[ \t]*SODIUM_VERSION_STRING[ \t]*\"([^\n]*)\".*" "\\1"
+            sodium_VERSION "${_VERSION_HEADER_CONTENT}")
+        set(sodium_VERSION "${sodium_VERSION}" PARENT_SCOPE)
+    endif()
+endif()
+
+# communicate results
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(sodium
+    REQUIRED_VARS
+        sodium_LIBRARY_RELEASE
+        sodium_LIBRARY_DEBUG
+        sodium_INCLUDE_DIR
+    VERSION_VAR
+        sodium_VERSION
+)
+
+# mark file paths as advanced
+mark_as_advanced(sodium_INCLUDE_DIR)
+mark_as_advanced(sodium_LIBRARY_DEBUG)
+mark_as_advanced(sodium_LIBRARY_RELEASE)
+if (WIN32)
+    mark_as_advanced(sodium_DLL_DEBUG)
+    mark_as_advanced(sodium_DLL_RELEASE)
+endif()
+
+# create imported target
+if(sodium_USE_STATIC_LIBS)
+    set(_LIB_TYPE STATIC)
+else()
+    set(_LIB_TYPE SHARED)
+endif()
+add_library(sodium ${_LIB_TYPE} IMPORTED)
+
+set_target_properties(sodium PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${sodium_INCLUDE_DIR}"
+    IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+)
+
+if (sodium_USE_STATIC_LIBS)
+    set_target_properties(sodium PROPERTIES
+        INTERFACE_COMPILE_DEFINITIONS "SODIUM_STATIC"
+        IMPORTED_LOCATION "${sodium_LIBRARY_RELEASE}"
+        IMPORTED_LOCATION_DEBUG "${sodium_LIBRARY_DEBUG}"
+    )
+else()
+    if (UNIX)
+        set_target_properties(sodium PROPERTIES
+            IMPORTED_LOCATION "${sodium_LIBRARY_RELEASE}"
+            IMPORTED_LOCATION_DEBUG "${sodium_LIBRARY_DEBUG}"
+        )
+    elseif (WIN32)
+        set_target_properties(sodium PROPERTIES
+            IMPORTED_IMPLIB "${sodium_LIBRARY_RELEASE}"
+            IMPORTED_IMPLIB_DEBUG "${sodium_LIBRARY_DEBUG}"
+        )
+        if (NOT (sodium_DLL_DEBUG MATCHES ".*-NOTFOUND"))
+            set_target_properties(sodium PROPERTIES
+                IMPORTED_LOCATION_DEBUG "${sodium_DLL_DEBUG}"
+            )
+        endif()
+        if (NOT (sodium_DLL_RELEASE MATCHES ".*-NOTFOUND"))
+            set_target_properties(sodium PROPERTIES
+                IMPORTED_LOCATION_RELWITHDEBINFO "${sodium_DLL_RELEASE}"
+                IMPORTED_LOCATION_MINSIZEREL "${sodium_DLL_RELEASE}"
+                IMPORTED_LOCATION_RELEASE "${sodium_DLL_RELEASE}"
+            )
+        endif()
+    endif()
+endif()

cmake/GNUInstallDirs.cmake

@@ -1,188 +0,0 @@
-# - Define GNU standard installation directories
-# Provides install directory variables as defined for GNU software:
-#  http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
-# Inclusion of this module defines the following variables:
-#  CMAKE_INSTALL_<dir>      - destination for files of a given type
-#  CMAKE_INSTALL_FULL_<dir> - corresponding absolute path
-# where <dir> is one of:
-#  BINDIR           - user executables (bin)
-#  SBINDIR          - system admin executables (sbin)
-#  LIBEXECDIR       - program executables (libexec)
-#  SYSCONFDIR       - read-only single-machine data (etc)
-#  SHAREDSTATEDIR   - modifiable architecture-independent data (com)
-#  LOCALSTATEDIR    - modifiable single-machine data (var)
-#  LIBDIR           - object code libraries (lib or lib64 or lib/<multiarch-tuple> on Debian)
-#  INCLUDEDIR       - C header files (include)
-#  OLDINCLUDEDIR    - C header files for non-gcc (/usr/include)
-#  DATAROOTDIR      - read-only architecture-independent data root (share)
-#  DATADIR          - read-only architecture-independent data (DATAROOTDIR)
-#  INFODIR          - info documentation (DATAROOTDIR/info)
-#  LOCALEDIR        - locale-dependent data (DATAROOTDIR/locale)
-#  MANDIR           - man documentation (DATAROOTDIR/man)
-#  DOCDIR           - documentation root (DATAROOTDIR/doc/PROJECT_NAME)
-# Each CMAKE_INSTALL_<dir> value may be passed to the DESTINATION options of
-# install() commands for the corresponding file type.  If the includer does
-# not define a value the above-shown default will be used and the value will
-# appear in the cache for editing by the user.
-# Each CMAKE_INSTALL_FULL_<dir> value contains an absolute path constructed
-# from the corresponding destination by prepending (if necessary) the value
-# of CMAKE_INSTALL_PREFIX.
-
-#=============================================================================
-# Copyright 2011 Nikita Krupen'ko <krnekit@gmail.com>
-# Copyright 2011 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-# Installation directories
-#
-if(NOT DEFINED CMAKE_INSTALL_BINDIR)
-  set(CMAKE_INSTALL_BINDIR "bin" CACHE PATH "user executables (bin)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_SBINDIR)
-  set(CMAKE_INSTALL_SBINDIR "sbin" CACHE PATH "system admin executables (sbin)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_LIBEXECDIR)
-  set(CMAKE_INSTALL_LIBEXECDIR "libexec" CACHE PATH "program executables (libexec)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR)
-  set(CMAKE_INSTALL_SYSCONFDIR "etc" CACHE PATH "read-only single-machine data (etc)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_SHAREDSTATEDIR)
-  set(CMAKE_INSTALL_SHAREDSTATEDIR "com" CACHE PATH "modifiable architecture-independent data (com)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_LOCALSTATEDIR)
-  set(CMAKE_INSTALL_LOCALSTATEDIR "var" CACHE PATH "modifiable single-machine data (var)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-  set(_LIBDIR_DEFAULT "lib")
-  # Override this default 'lib' with 'lib64' iff:
-  #  - we are on Linux system but NOT cross-compiling
-  #  - we are NOT on debian
-  #  - we are on a 64 bits system
-  # reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
-  # For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
-  # CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
-  # See http://wiki.debian.org/Multiarch
-  if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
-      AND NOT CMAKE_CROSSCOMPILING)
-    if (EXISTS "/etc/debian_version") # is this a debian system ?
-       if(CMAKE_LIBRARY_ARCHITECTURE)
-         set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
-       endif()
-    else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
-      if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
-        message(AUTHOR_WARNING
-          "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
-          "Please enable at least one language before including GNUInstallDirs.")
-      else()
-        if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-          set(_LIBDIR_DEFAULT "lib64")
-        endif()
-      endif()
-    endif()
-  endif()
-  set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
-  set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE PATH "C header files (include)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_OLDINCLUDEDIR)
-  set(CMAKE_INSTALL_OLDINCLUDEDIR "/usr/include" CACHE PATH "C header files for non-gcc (/usr/include)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_DATAROOTDIR)
-  set(CMAKE_INSTALL_DATAROOTDIR "share" CACHE PATH "read-only architecture-independent data root (share)")
-endif()
-
-#-----------------------------------------------------------------------------
-# Values whose defaults are relative to DATAROOTDIR.  Store empty values in
-# the cache and store the defaults in local variables if the cache values are
-# not set explicitly.  This auto-updates the defaults as DATAROOTDIR changes.
-
-if(NOT CMAKE_INSTALL_DATADIR)
-  set(CMAKE_INSTALL_DATADIR "" CACHE PATH "read-only architecture-independent data (DATAROOTDIR)")
-  set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}")
-endif()
-
-if(NOT CMAKE_INSTALL_INFODIR)
-  set(CMAKE_INSTALL_INFODIR "" CACHE PATH "info documentation (DATAROOTDIR/info)")
-  set(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info")
-endif()
-
-if(NOT CMAKE_INSTALL_LOCALEDIR)
-  set(CMAKE_INSTALL_LOCALEDIR "" CACHE PATH "locale-dependent data (DATAROOTDIR/locale)")
-  set(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATAROOTDIR}/locale")
-endif()
-
-if(NOT CMAKE_INSTALL_MANDIR)
-  set(CMAKE_INSTALL_MANDIR "" CACHE PATH "man documentation (DATAROOTDIR/man)")
-  set(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man")
-endif()
-
-if(NOT CMAKE_INSTALL_DOCDIR)
-  set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/PROJECT_NAME)")
-  set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}")
-endif()
-
-#-----------------------------------------------------------------------------
-
-mark_as_advanced(
-  CMAKE_INSTALL_BINDIR
-  CMAKE_INSTALL_SBINDIR
-  CMAKE_INSTALL_LIBEXECDIR
-  CMAKE_INSTALL_SYSCONFDIR
-  CMAKE_INSTALL_SHAREDSTATEDIR
-  CMAKE_INSTALL_LOCALSTATEDIR
-  CMAKE_INSTALL_LIBDIR
-  CMAKE_INSTALL_INCLUDEDIR
-  CMAKE_INSTALL_OLDINCLUDEDIR
-  CMAKE_INSTALL_DATAROOTDIR
-  CMAKE_INSTALL_DATADIR
-  CMAKE_INSTALL_INFODIR
-  CMAKE_INSTALL_LOCALEDIR
-  CMAKE_INSTALL_MANDIR
-  CMAKE_INSTALL_DOCDIR
-  )
-
-# Result directories
-#
-foreach(dir
-    BINDIR
-    SBINDIR
-    LIBEXECDIR
-    SYSCONFDIR
-    SHAREDSTATEDIR
-    LOCALSTATEDIR
-    LIBDIR
-    INCLUDEDIR
-    OLDINCLUDEDIR
-    DATAROOTDIR
-    DATADIR
-    INFODIR
-    LOCALEDIR
-    MANDIR
-    DOCDIR
-    )
-  if(NOT IS_ABSOLUTE ${CMAKE_INSTALL_${dir}})
-    set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_${dir}}")
-  else()
-    set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_${dir}}")
-  endif()
-endforeach()

cmake/GenerateProductVersion.cmake

@@ -91,7 +91,7 @@ function(generate_product_version outfiles)
         set(PRODUCT_COMPANY_COPYRIGHT "Copyright (C) ${PRODUCT_CURRENT_YEAR} ${PRODUCT_COMPANY_NAME}")
     endif()
     if (NOT PRODUCT_COMMENTS OR "${PRODUCT_COMMENTS}" STREQUAL "")
-        set(PRODUCT_COMMENTS "${PRODUCT_NAME} v${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}")
+        set(PRODUCT_COMMENTS "${PRODUCT_NAME} v${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}.${PRODUCT_VERSION_PATCH}")
     endif()
     if (NOT PRODUCT_ORIGINAL_FILENAME OR "${PRODUCT_ORIGINAL_FILENAME}" STREQUAL "")
         set(PRODUCT_ORIGINAL_FILENAME "${PRODUCT_NAME}")

cmake/GetGitRevisionDescription.cmake

@@ -1,130 +0,0 @@
-# - Returns a version string from Git
-#
-# These functions force a re-configure on each git commit so that you can
-# trust the values of the variables in your build system.
-#
-#  get_git_head_revision(<refspecvar> <hashvar> [<additional arguments to git describe> ...])
-#
-# Returns the refspec and sha hash of the current head revision
-#
-#  git_describe(<var> [<additional arguments to git describe> ...])
-#
-# Returns the results of git describe on the source tree, and adjusting
-# the output so that it tests false if an error occurs.
-#
-#  git_get_exact_tag(<var> [<additional arguments to git describe> ...])
-#
-# Returns the results of git describe --exact-match on the source tree,
-# and adjusting the output so that it tests false if there was no exact
-# matching tag.
-#
-# Requires CMake 2.6 or newer (uses the 'function' command)
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE.BOOST-1.0 or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-if(__get_git_revision_description)
-	return()
-endif()
-set(__get_git_revision_description YES)
-
-# We must run the following at "include" time, not at function call time,
-# to find the path to this module rather than the path to a calling list file
-get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
-
-function(get_git_head_revision _refspecvar _hashvar)
-	set(GIT_PARENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-	set(GIT_DIR "${GIT_PARENT_DIR}/.git")
-	while(NOT EXISTS "${GIT_DIR}")	# .git dir not found, search parent directories
-		set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}")
-		get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH)
-		if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT)
-			# We have reached the root directory, we are not in git
-			set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
-			set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
-			return()
-		endif()
-		set(GIT_DIR "${GIT_PARENT_DIR}/.git")
-	endwhile()
-	# check if this is a submodule
-	if(NOT IS_DIRECTORY ${GIT_DIR})
-		file(READ ${GIT_DIR} submodule)
-		string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule})
-		get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
-		get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE)
-	endif()
-	set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
-	if(NOT EXISTS "${GIT_DATA}")
-		file(MAKE_DIRECTORY "${GIT_DATA}")
-	endif()
-
-	if(NOT EXISTS "${GIT_DIR}/HEAD")
-		return()
-	endif()
-	set(HEAD_FILE "${GIT_DATA}/HEAD")
-	configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY)
-
-	configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
-		"${GIT_DATA}/grabRef.cmake"
-		@ONLY)
-	include("${GIT_DATA}/grabRef.cmake")
-
-	set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE)
-	set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE)
-endfunction()
-
-function(git_describe _var)
-	if(NOT GIT_FOUND)
-		find_package(Git QUIET)
-	endif()
-	get_git_head_revision(refspec hash)
-	if(NOT GIT_FOUND)
-		set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
-		return()
-	endif()
-	if(NOT hash)
-		set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
-		return()
-	endif()
-
-	# TODO sanitize
-	#if((${ARGN}" MATCHES "&&") OR
-	#	(ARGN MATCHES "||") OR
-	#	(ARGN MATCHES "\\;"))
-	#	message("Please report the following error to the project!")
-	#	message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
-	#endif()
-
-	#message(STATUS "Arguments to execute_process: ${ARGN}")
-
-	execute_process(COMMAND
-		"${GIT_EXECUTABLE}"
-		describe
-		${hash}
-		${ARGN}
-		WORKING_DIRECTORY
-		"${CMAKE_SOURCE_DIR}"
-		RESULT_VARIABLE
-		res
-		OUTPUT_VARIABLE
-		out
-		ERROR_QUIET
-		OUTPUT_STRIP_TRAILING_WHITESPACE)
-	if(NOT res EQUAL 0)
-		set(out "${out}-${res}-NOTFOUND")
-	endif()
-
-	set(${_var} "${out}" PARENT_SCOPE)
-endfunction()
-
-function(git_get_exact_tag _var)
-	git_describe(out --exact-match ${ARGN})
-	set(${_var} "${out}" PARENT_SCOPE)
-endfunction()

cmake/GetGitRevisionDescription.cmake.in

@@ -1,41 +0,0 @@
-#
-# Internal file for GetGitRevisionDescription.cmake
-#
-# Requires CMake 2.6 or newer (uses the 'function' command)
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE.BOOST-1.0 or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-set(HEAD_HASH)
-
-file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024)
-
-string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS)
-if(HEAD_CONTENTS MATCHES "ref")
-	# named branch
-	string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
-	if(EXISTS "@GIT_DIR@/${HEAD_REF}")
-		configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
-	else()
-		configure_file("@GIT_DIR@/packed-refs" "@GIT_DATA@/packed-refs" COPYONLY)
-		file(READ "@GIT_DATA@/packed-refs" PACKED_REFS)
-		if(${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}")
-			set(HEAD_HASH "${CMAKE_MATCH_1}")
-		endif()
-	endif()
-else()
-	# detached HEAD
-	configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
-endif()
-
-if(NOT HEAD_HASH)
-	file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
-	string(STRIP "${HEAD_HASH}" HEAD_HASH)
-endif()

docs/KEYBINDS.md

@@ -0,0 +1,35 @@
+# List of Keyboard Shortcuts for KeepassXC
+
+Actions                    | Keyboard Shortcuts
+---------------------------|----------------------------
+New Database               | Ctrl + Shift + N
+Open Database              | Ctrl + O
+Save Database              | Ctrl + S
+Save Database As           | Ctrl + Shift + S
+Close Database             | Ctrl + W
+Lock Databases             | Ctrl + L
+Quit                       | Ctrl + Q
+New Entry                  | Ctrl + N
+Edit Entry                 | Ctrl + E
+Delete Entry               | Ctrl + D
+Clone Entry                | Ctrl + K
+Show TOTP                  | Ctrl + Shift + T
+Copy TOTP                  | Ctrl + T
+Copy Username              | Ctrl + B
+Copy Password              | Ctrl + C
+Trigger AutoType           | Ctrl + Shift - V
+Open Url                   | Ctrl + Shift - U
+Copy Url                   | Ctrl + U
+Show Minimized             | Ctrl + M
+Hide Window                | Ctrl + Shift - M
+Select Next Database Tab   | Ctrl + Tab *OR* Ctrl + PGDN
+Select Previous Datase Tab | Ctrl + Shift + Tab *OR* Ctrl + PGUP
+Toggle Passwords Hidden    | Ctrl + Shift + C
+Toggle Usernames Hidden    | Ctrl + Shift + B
+Focus Search               | Ctrl + F
+Clear Search               | ESC
+Show Keyboard Shortcuts    | Ctrl + /
+
+
+
+

docs/QUICKSTART.md

@@ -0,0 +1,137 @@
+# Quick Start for KeePassXC
+
+This procedure gets KeePassXC running on your computer with browser integration, using the pre-built binaries available for [download](https://keepassxc.org/download) from [KeePassXC site](https://keepassxc.org).
+
+**TL;DR** KeePassXC saves your passwords securely.
+When you double-click a URL in KeePassXC, it launches your default browser to that URL.
+With browser integration configured, KeePassXC automatically enters username/password credentials into web page fields.
+
+## Installing and Starting KeePassXC
+
+1. [Download the native installer](https://keepassxc.org/download) and install KeePassXC for your  Windows, macOS, or Linux computer in the usual way for your platform.
+1. Open the KeePassXC application.
+1. Create a new database and give it a master key that's used to unlock the database file. 
+This database holds entries (usernames, passwords, account numbers, notes) for all your websites, programs, etc.
+1. Create a few entries - enter the username, password, URL, and optionally notes about the entry.
+1. KeePassXC securely stores those entries in the database.
+
+## Setting up Browser Integration with KeePassXC
+
+1. *Within KeePassXC*, go to **Tools → Settings** (on macOS, go to **KeePassXC → Preferences**).
+1. In **Browser Integration**, check **Enable KeePassXC browser integration**.
+1. Right below that, click the checkbox for the browser(s) you use. 
+Leave the other options at their defaults.
+1. *In your default web browser,* install the KeePassXC Browser extension/add-on. Instructions for [Firefox or Tor Browser](https://addons.mozilla.org/firefox/addon/keepassxc-browser/) or [Chrome or Chromium](https://chrome.google.com/webstore/detail/keepassxc-browser/oboonakemofpalcgghocfoadofidjkkk).
+1. Click the KeePassXC icon in the upper-right corner. You'll see the dialog below.
+1. Click the blue Connect button to make the browser extension connect to the KeePassXC application.
+
+&nbsp;<img src="./KeePassHTTP/KeePassXC-Connect.png" height="200" alt="KeePassXC Connect Dialog">
+
+7. *Switch back to KeePassXC.* You'll see a dialog (below) indicating that a request to connect has arrived.
+7. Give the connection a name (perhaps *Keepass-Browsername*, any unique name will suffice) and click OK to accept it.
+7. This one-time operation connects KeePassXC and your browser.
+
+<img src="./KeePassHTTP/KeePassXC-Accept-Button.png" height="200" alt="KeePassXC Accept Connection Dialog">
+
+## Using Browser Integration
+
+1. *Within KeePassXC,* double-click the URL of an entry, or select it and type Ctrl+U (Cmd+U on macOS).
+1. Your browser opens to that URL.
+1. If there are username/password fields on that page, you will see the dialog below. 
+Click *Allow* to confirm that KeePassXC may access the credentials to auto-fill the fields.
+1. Check *Remember this decision* to allow this each time you visit the page.
+
+<img src="./KeePassHTTP/KeePassXC-Confirm.png" height="200" alt="KeePassCX Confirm Access Dialog">
+
+## Using Sharing
+
+Sharing allows you to share a subset of your credentials with others and vice versa.
+
+### Enable Sharing
+
+To use sharing, you need to enable for the application.
+
+1. Go to Tools &rarr; Settings.
+1. Select the category KeeShare.
+1. Check _Allow import_ if you want to import shared credentials.
+1. Check _Allow export_ if you want to share credentials.
+
+To make sure that your data is valid when imported by another client, please _generate_ (or _import_) a public/private key pair and enter your _signer_ name. This way your client may verify that the imported data is valid. When Importing, you'll see the known sources with names and fingerprint in the list at the bottom. This is the place to _trust_ or _untrust_ signers. It is only possible to trust someone on application level.
+
+<img src="./KeeShare/AppSettings.png" height="600" width="800" alt="KeeShare Application Settings">
+
+### Sharing Credentials
+
+If you checked _Allow export_ in the Sharing settings you now are good to go to share some passwords with others. Sharing always is defined on a group. If you enable sharing on a group, every entry under this group or its children is shared. If you enable sharing on the root node, **every password** inside your database gets shared!
+
+1. Open the edit sheet on a group you want to share.
+1. Select the sharing section.
+1. Choose _Export to path_ as the sharing method.
+1. Choose a path to store the shared credentials to.
+1. Generate a password for this share container.
+
+The export file will not be generated automatically. Instead, each time the database is saved, the file gets written (so please deactivate the autosafe feature). If an old file is present, the old file will be overwritten! The file should be written to a location that is accessible by others. An easy setup is a network share or storing the file inside the cloud.
+
+<img src="./KeeShare/GroupSettings_Export.png" height="600" width="800" alt="KeeShare Group Sharing Settings">
+
+### Using Shared Credentials
+
+Checking _Allow import_ in the Sharing settings of the database enables you to receive credentials from others. KeePass will watch sharing sources and import any changes immediately into your database using the synchronization feature.
+
+1. Create a group for import.
+1. Open the edit sheet on that group.
+1. Select the sharing section.
+1. Choose _Import from path_ as the sharing method.
+1. Choose a share container that is shared with you.
+1. Enter the password for the shared container.
+
+KeeShare observes the container for changes and merges them into your database when necessary. Importing merges in time order, so older data is moved to the history, which should have a sufficient size to prevent loss of needed data.
+
+Please note, that the import currently is not restricted to the configured group. Every entry which was imported and moved outside the import group will be updated regardless of it's location!
+
+<img src="./KeeShare/GroupSettings_Import.png" height="600" width="800" alt="KeeShare Group Import Settings">
+
+### Using Synchronized Credentials
+
+Instead of using different groups for sharing and importing you can use a single group that acts as both. This way you can synchronize a number of credentials easily across many users without a lot of hassle.
+
+1. Open the edit sheet on a group you want to synchronize.
+1. Select the sharing section.
+1. Choose _Synchronize with path_ as the sharing method.
+1. Choose a database that you want to use a synchronization file.
+1. Enter the password for the database.
+
+<img src="./KeeShare/GroupSettings_Sync.png" height="600" width="800" alt="KeeShare Group Synchronization Settings">
+
+### Disable Sharing for Credentials
+
+In case you don't want to share (import or export) some credentials, it is possible to you can 
+* use the application settings and uncheck the options or 
+* instead of selecting _Import from path_, _Export to path_ or _Synchronize with path_ you'll select _Inactive_ while leaving the path and the password untouched.
+
+### Sharing overview
+
+There is a simple overview of shared groups to keep track of your data.
+
+1. Open the Database Settings.
+1. Select the KeeShare category.
+
+<img src="./KeeShare/DatabaseSettings.png" height="600" width="800" alt="KeeShare Group Sharing Ovewview">
+
+## Technical Details and Limitations of Sharing
+
+Sharing relies on the combination of file exports and imports as well as the synchronization mechanism provided by KeePassXC. Since the merge algorithm uses the history of entries to prevent data loss, this history must be enabled and have a sufficient size. Furthermore, the merge algorithm is location independend, therefore it does not matter if entries are moved outside of an import group. These entries will be updated none the less. Moving entries outside of export groups will prevent a further export of the entry, but it will not ensure that the already shared data will be removed from any client.
+
+KeeShare uses a custom certification mechanism to ensure that the source of the data is the expected one. This ensures that the data was exported by the signer but it is not possible to detect if someone replaced the data with an older version from a valid signer. To prevent this, the container could be placed at a location which is only writeable for valid signers.
+
+## Using Auto Open
+
+The Auto Open feature automatically loads and unlocks additional databases when you unlock your main database.
+In order to use this functionnality, do the following:
+
+1. Create a group called **AutoOpen** at the root of your main database.
+1. In this group, create a new entry for each database that should be opened automatically:
+    * Put the *password of the database* in the **Password** field
+    * Put the *path to the database's file* in the **URL** field* (it can be formatted either as **file://**, a **/path/to/the/file** form, or a relative file path.)
+    * If the extra database requires a keyfile to be unlocked, put the *path to the keyfile* in the **Username** field. The path options are the same as for the database's file in the URL field.
+1. The next time you unlock your database these databases will be opened and unlocked automatically.

share/CMakeLists.txt

@@ -23,118 +23,120 @@ file(GLOB DATABASE_ICONS icons/database/*.png)
 
 install(FILES ${DATABASE_ICONS} DESTINATION ${DATA_INSTALL_DIR}/icons/database)
 
-if(UNIX AND NOT APPLE)
+if(UNIX AND NOT APPLE AND NOT HAIKU)
     install(DIRECTORY icons/application/ DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor
-            FILES_MATCHING PATTERN "keepassx*.png" PATTERN "keepassx*.svgz"
+            FILES_MATCHING PATTERN "keepassx*.png" PATTERN "keepassx*.svg"
             PATTERN "status" EXCLUDE PATTERN "actions" EXCLUDE PATTERN "categories" EXCLUDE)
     install(DIRECTORY icons/application/ DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor
-            FILES_MATCHING PATTERN "application-x-keepassxc.png" PATTERN "application-x-keepassxc.svgz"
+            FILES_MATCHING PATTERN "application-x-keepassxc.png" PATTERN "application-x-keepassxc.svg"
             PATTERN "status" EXCLUDE PATTERN "actions" EXCLUDE PATTERN "categories" EXCLUDE)
-    install(FILES linux/org.keepassxc.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
-    install(FILES linux/org.keepassxc.appdata.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo)
+    install(FILES linux/org.keepassxc.KeePassXC.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+    install(FILES linux/org.keepassxc.KeePassXC.appdata.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo)
     install(FILES linux/keepassxc.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages)
-endif(UNIX AND NOT APPLE)
+endif(UNIX AND NOT APPLE AND NOT HAIKU)
 
 if(APPLE)
   install(FILES macosx/keepassxc.icns DESTINATION ${DATA_INSTALL_DIR})
 endif()
 
+install(DIRECTORY docs/ DESTINATION ${DATA_INSTALL_DIR}/docs FILES_MATCHING PATTERN "*.pdf")
+
+install(DIRECTORY wizard/ DESTINATION ${DATA_INSTALL_DIR}/wizard FILES_MATCHING PATTERN "*.png")
+
 install(DIRECTORY icons/application/ DESTINATION ${DATA_INSTALL_DIR}/icons/application
-        FILES_MATCHING PATTERN "*.png" PATTERN "*.svgz")
+        FILES_MATCHING PATTERN "*.png" PATTERN "*.svg")
 
 add_custom_target(icons
-                  # SVGZ to PNGs for KeePassXC
-                  COMMAND inkscape -z -w 16 -h 16
-                    icons/application/scalable/apps/keepassxc.svgz -e icons/application/16x16/apps/keepassxc.png
-                  COMMAND inkscape -z -w  24 -h 24
-                    icons/application/scalable/apps/keepassxc.svgz -e icons/application/24x24/apps/keepassxc.png
-                  COMMAND inkscape -z -w  32 -h 32
-                    icons/application/scalable/apps/keepassxc.svgz -e icons/application/32x32/apps/keepassxc.png
-                  COMMAND inkscape -z -w 48 -h 48
-                    icons/application/scalable/apps/keepassxc.svgz -e icons/application/48x48/apps/keepassxc.png
-                  COMMAND inkscape -z -w 64 -h 64
-                    icons/application/scalable/apps/keepassxc.svgz -e icons/application/64x64/apps/keepassxc.png
-                  COMMAND inkscape -z -w 128 -h 128
-                    icons/application/scalable/apps/keepassxc.svgz -e icons/application/128x128/apps/keepassxc.png
-                  COMMAND inkscape -z -w 256 -h 256
-                    icons/application/scalable/apps/keepassxc.svgz -e icons/application/256x256/apps/keepassxc.png
+    # SVG to PNGs for KeePassXC
+    COMMAND inkscape -z -w 16 -h 16
+        icons/application/scalable/apps/keepassxc.svg -e icons/application/16x16/apps/keepassxc.png
+    COMMAND inkscape -z -w  24 -h 24
+        icons/application/scalable/apps/keepassxc.svg -e icons/application/24x24/apps/keepassxc.png
+    COMMAND inkscape -z -w  32 -h 32
+        icons/application/scalable/apps/keepassxc.svg -e icons/application/32x32/apps/keepassxc.png
+    COMMAND inkscape -z -w 48 -h 48
+        icons/application/scalable/apps/keepassxc.svg -e icons/application/48x48/apps/keepassxc.png
+    COMMAND inkscape -z -w 64 -h 64
+        icons/application/scalable/apps/keepassxc.svg -e icons/application/64x64/apps/keepassxc.png
+    COMMAND inkscape -z -w 128 -h 128
+        icons/application/scalable/apps/keepassxc.svg -e icons/application/128x128/apps/keepassxc.png
+    COMMAND inkscape -z -w 256 -h 256
+        icons/application/scalable/apps/keepassxc.svg -e icons/application/256x256/apps/keepassxc.png
 
-                  # SVGZ to PNGs for KeePassXC
-                  COMMAND inkscape -z -w 16 -h 16
-                    icons/application/scalable/apps/keepassxc-dark.svgz -e icons/application/16x16/apps/keepassxc-dark.png
-                  COMMAND inkscape -z -w  24 -h 24
-                    icons/application/scalable/apps/keepassxc-dark.svgz -e icons/application/24x24/apps/keepassxc-dark.png
-                  COMMAND inkscape -z -w  32 -h 32
-                    icons/application/scalable/apps/keepassxc-dark.svgz -e icons/application/32x32/apps/keepassxc-dark.png
-                  COMMAND inkscape -z -w 48 -h 48
-                    icons/application/scalable/apps/keepassxc-dark.svgz -e icons/application/48x48/apps/keepassxc-dark.png
-                  COMMAND inkscape -z -w 64 -h 64
-                    icons/application/scalable/apps/keepassxc-dark.svgz -e icons/application/64x64/apps/keepassxc-dark.png
-                  COMMAND inkscape -z -w 128 -h 128
-                    icons/application/scalable/apps/keepassxc-dark.svgz -e icons/application/128x128/apps/keepassxc-dark.png
-                  COMMAND inkscape -z -w 256 -h 256
-                    icons/application/scalable/apps/keepassxc-dark.svgz -e icons/application/256x256/apps/keepassxc-dark.png
+    # SVG to PNGs for KeePassXC
+    COMMAND inkscape -z -w 16 -h 16
+        icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/16x16/apps/keepassxc-dark.png
+    COMMAND inkscape -z -w  24 -h 24
+        icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/24x24/apps/keepassxc-dark.png
+    COMMAND inkscape -z -w  32 -h 32
+        icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/32x32/apps/keepassxc-dark.png
+    COMMAND inkscape -z -w 48 -h 48
+        icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/48x48/apps/keepassxc-dark.png
+    COMMAND inkscape -z -w 64 -h 64
+        icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/64x64/apps/keepassxc-dark.png
+    COMMAND inkscape -z -w 128 -h 128
+        icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/128x128/apps/keepassxc-dark.png
+    COMMAND inkscape -z -w 256 -h 256
+        icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/256x256/apps/keepassxc-dark.png
 
-                  # SVGZ to PNGs for KeePassXC
-                  COMMAND inkscape -z -w 16 -h 16
-                    icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/16x16/apps/keepassxc-locked.png
-                  COMMAND inkscape -z -w  24 -h 24
-                    icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/24x24/apps/keepassxc-locked.png
-                  COMMAND inkscape -z -w  32 -h 32
-                    icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/32x32/apps/keepassxc-locked.png
-                  COMMAND inkscape -z -w 48 -h 48
-                    icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/48x48/apps/keepassxc-locked.png
-                  COMMAND inkscape -z -w 64 -h 64
-                    icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/64x64/apps/keepassxc-locked.png
-                  COMMAND inkscape -z -w 128 -h 128
-                    icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/128x128/apps/keepassxc-locked.png
-                  COMMAND inkscape -z -w 256 -h 256
-                    icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/256x256/apps/keepassxc-locked.png
+    # SVG to PNGs for KeePassXC
+    COMMAND inkscape -z -w 16 -h 16
+        icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/16x16/apps/keepassxc-locked.png
+    COMMAND inkscape -z -w  24 -h 24
+        icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/24x24/apps/keepassxc-locked.png
+    COMMAND inkscape -z -w  32 -h 32
+        icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/32x32/apps/keepassxc-locked.png
+    COMMAND inkscape -z -w 48 -h 48
+        icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/48x48/apps/keepassxc-locked.png
+    COMMAND inkscape -z -w 64 -h 64
+        icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/64x64/apps/keepassxc-locked.png
+    COMMAND inkscape -z -w 128 -h 128
+        icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/128x128/apps/keepassxc-locked.png
+    COMMAND inkscape -z -w 256 -h 256
+        icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/256x256/apps/keepassxc-locked.png
 
-                  # SVGZ to PNGs for KeePassXC
-                  COMMAND inkscape -z -w 16 -h 16
-                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/16x16/apps/keepassxc-unlocked.png
-                  COMMAND inkscape -z -w  24 -h 24
-                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/24x24/apps/keepassxc-unlocked.png
-                  COMMAND inkscape -z -w  32 -h 32
-                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/32x32/apps/keepassxc-unlocked.png
-                  COMMAND inkscape -z -w 48 -h 48
-                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/48x48/apps/keepassxc-unlocked.png
-                  COMMAND inkscape -z -w 64 -h 64
-                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/64x64/apps/keepassxc-unlocked.png
-                  COMMAND inkscape -z -w 128 -h 128
-                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/128x128/apps/keepassxc-unlocked.png
-                  COMMAND inkscape -z -w 256 -h 256
-                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/256x256/apps/keepassxc-unlocked.png
+    # SVG to PNGs for KeePassXC
+    COMMAND inkscape -z -w 16 -h 16
+        icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/16x16/apps/keepassxc-unlocked.png
+    COMMAND inkscape -z -w  24 -h 24
+        icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/24x24/apps/keepassxc-unlocked.png
+    COMMAND inkscape -z -w  32 -h 32
+        icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/32x32/apps/keepassxc-unlocked.png
+    COMMAND inkscape -z -w 48 -h 48
+        icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/48x48/apps/keepassxc-unlocked.png
+    COMMAND inkscape -z -w 64 -h 64
+        icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/64x64/apps/keepassxc-unlocked.png
+    COMMAND inkscape -z -w 128 -h 128
+        icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/128x128/apps/keepassxc-unlocked.png
+    COMMAND inkscape -z -w 256 -h 256
+        icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/256x256/apps/keepassxc-unlocked.png
 
-                  # SVGZ to PNGs for KeePassXC MIME-Type
-                  COMMAND inkscape -z -w 16 -h 16
-                    icons/application/scalable/mimetypes/application-x-keepassxc.svgz -e icons/application/16x16/mimetypes/application-x-keepassxc.png
-                  COMMAND inkscape -z -w 22 -h 22
-                    icons/application/scalable/mimetypes/application-x-keepassxc.svgz -e icons/application/22x22/mimetypes/application-x-keepassxc.png
-                  COMMAND inkscape -z -w 32 -h 32
-                    icons/application/scalable/mimetypes/application-x-keepassxc.svgz -e icons/application/32x32/mimetypes/application-x-keepassxc.png
-                  COMMAND inkscape -z -w 64 -h 64
-                    icons/application/scalable/mimetypes/application-x-keepassxc.svgz -e icons/application/64x64/mimetypes/application-x-keepassxc.png
-                  COMMAND inkscape -z -w 128 -h 128
-                    icons/application/scalable/mimetypes/application-x-keepassxc.svgz -e icons/application/128x128/mimetypes/application-x-keepassxc.png
+    # SVG to PNGs for KeePassXC MIME-Type
+    COMMAND inkscape -z -w 16 -h 16
+        icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/16x16/mimetypes/application-x-keepassxc.png
+    COMMAND inkscape -z -w 22 -h 22
+        icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/22x22/mimetypes/application-x-keepassxc.png
+    COMMAND inkscape -z -w 32 -h 32
+        icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/32x32/mimetypes/application-x-keepassxc.png
+    COMMAND inkscape -z -w 64 -h 64
+        icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/64x64/mimetypes/application-x-keepassxc.png
+    COMMAND inkscape -z -w 128 -h 128
+        icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/128x128/mimetypes/application-x-keepassxc.png
 
-                  # ICNS for MacOS
-                  COMMAND png2icns macosx/keepassxc.icns
-                    icons/application/16x16/apps/keepassxc.png
-                    icons/application/32x32/apps/keepassxc.png
-                    icons/application/48x48/apps/keepassxc.png
-                    icons/application/128x128/apps/keepassxc.png
-                    icons/application/256x256/apps/keepassxc.png
+    # Shrink PNGs using pngcrush
+    COMMAND bash ./crushpng.sh icons
 
-                  # ICO for Windows
-                  COMMAND icotool -c -o windows/keepassxc.ico
-                    icons/application/16x16/apps/keepassxc.png
-                    icons/application/24x24/apps/keepassxc.png
-                    icons/application/32x32/apps/keepassxc.png
-                    icons/application/48x48/apps/keepassxc.png
-                    icons/application/64x64/apps/keepassxc.png
-                    icons/application/128x128/apps/keepassxc.png
-                    icons/application/256x256/apps/keepassxc.png
-                  VERBATIM
-                  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+    # ICNS for MacOS
+    COMMAND png2icns macosx/keepassxc.icns
+        icons/application/16x16/apps/keepassxc.png
+        icons/application/32x32/apps/keepassxc.png
+        icons/application/48x48/apps/keepassxc.png
+        icons/application/128x128/apps/keepassxc.png
+        icons/application/256x256/apps/keepassxc.png
+
+    # ICO for Windows
+    COMMAND bash ./windows/create-ico.sh icons/application/scalable/apps/keepassxc.svg windows/keepassxc.ico
+    COMMAND bash ./windows/create-ico.sh icons/application/scalable/mimetypes/application-x-keepassxc.svg windows/keepassxc-kdbx.ico
+
+    VERBATIM
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

share/crushpng.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+if [[ -z $1 ]]; then
+  echo "You must supply a root folder!"
+  exit 1
+fi
+
+find "$1" -iname '*png' -exec pngcrush -ow -brute {} \;

share/demo.key

@@ -0,0 +1 @@
+secret

share/docs/man/keepassxc-cli.1

@@ -0,0 +1,255 @@
+.TH KEEPASSXC-CLI 1 "June 15, 2019"
+
+.SH NAME
+keepassxc-cli \- command line interface for the \fBKeePassXC\fP password manager.
+
+.SH SYNOPSIS
+.B keepassxc-cli
+.I command
+.B [
+-I options
+.B ]
+
+.SH DESCRIPTION
+\fBkeepassxc-cli\fP is the command line interface for the \fBKeePassXC\fP password manager. It provides the ability to query and modify the entries of a KeePass database, directly from the command line.
+
+.SH COMMANDS
+
+.IP "add [options] <database> <entry>"
+Adds a new entry to a database. A password can be generated (\fI-g\fP option), or a prompt can be displayed to input the password (\fI-p\fP option).
+The same password generation options as documented for the generate command can be used when the \fI-g\fP option is set.
+
+.IP "analyze [options] <database>"
+Analyzes passwords in a database for weaknesses.
+
+.IP "clip [options] <database> <entry> [timeout]"
+Copies the password or the current TOTP (\fI-t\fP option) of a database entry to the clipboard. If multiple entries with the same name exist in different groups, only the password for the first one is going to be copied. For copying the password of an entry in a specific group, the group path to the entry should be specified as well, instead of just the name. Optionally, a timeout in seconds can be specified to automatically clear the clipboard.
+
+.IP "close"
+In interactive mode, closes the currently opened database (see \fIopen\fP).
+
+.IP "create [options] <database>"
+Creates a new database with a key file and/or password. The key file will be created if the file that is referred to does not exist. If both the key file and password are empty, no database will be created.
+
+.IP "diceware [options]"
+Generates a random diceware passphrase.
+
+.IP "edit [options] <database> <entry>"
+Edits a database entry. A password can be generated (\fI-g\fP option), or a prompt can be displayed to input the password (\fI-p\fP option).
+The same password generation options as documented for the generate command can be used when the \fI-g\fP option is set.
+
+.IP "estimate [options] [password]"
+Estimates the entropy of a password. The password to estimate can be provided as a positional argument, or using the standard input.
+
+.IP "exit"
+Exits interactive mode. Synonymous with \fIquit\fP.
+
+.IP "export [options] <database>"
+Exports the content of a database to standard output in the specified format (defaults to XML).
+
+.IP "generate [options]"
+Generates a random password.
+
+.IP "help [command]"
+Displays a list of available commands, or detailed information about the specified command.
+
+.IP "import [options] <xml> <database>"
+Imports the contents of an XML database to the target database.
+
+.IP "locate [options] <database> <term>"
+Locates all the entries that match a specific search term in a database.
+
+.IP "ls [options] <database> [group]"
+Lists the contents of a group in a database. If no group is specified, it will default to the root group.
+
+.IP "merge [options] <database1> <database2>"
+Merges two databases together. The first database file is going to be replaced by the result of the merge, for that reason it is advisable to keep a backup of the two database files before attempting a merge. In the case that both databases make use of the same credentials, the \fI--same-credentials\fP or \fI-s\fP option can be used.
+
+.IP "mkdir [options] <database> <group>"
+Adds a new group to a database.
+
+.IP "mv [options] <database> <entry> <group>"
+Moves an entry to a new group.
+
+.IP "open [options] <database>"
+Opens the given database in a shell-style interactive mode. This is useful for performing multiple operations on a single database (e.g. \fIls\fP followed by \fIshow\fP).
+
+.IP "quit"
+Exits interactive mode. Synonymous with \fIexit\fP.
+
+.IP "rm [options] <database> <entry>"
+Removes an entry from a database. If the database has a recycle bin, the entry will be moved there. If the entry is already in the recycle bin, it will be removed permanently.
+
+.IP "rmdir [options] <database> <group>"
+Removes a group from a database. If the database has a recycle bin, the group will be moved there. If the group is already in the recycle bin, it will be removed permanently.
+
+.IP "show [options] <database> <entry>"
+Shows the title, username, password, URL and notes of a database entry. Can also show the current TOTP. Regarding the occurrence of multiple entries with the same name in different groups, everything stated in the \fIclip\fP command section also applies here.
+
+.SH OPTIONS
+
+.SS "General options"
+
+.IP "--debug-info"
+Displays debugging information.
+
+.IP "-k, --key-file <path>"
+Specifies a path to a key file for unlocking the database. In a merge operation this option, is used to specify the key file path for the first database.
+
+.IP "--no-password"
+Deactivates the password key for the database.
+
+.IP "-y, --yubikey <slot>"
+Specifies a yubikey slot for unlocking the database. In a merge operation this option is used to specify the yubikey slot for the first database.
+
+.IP "-q, --quiet <path>"
+Silences password prompt and other secondary outputs.
+
+.IP "-h, --help"
+Displays help information.
+
+.IP "-v, --version"
+Displays the program version.
+
+
+.SS "Merge options"
+
+.IP "-d, --dry-run <path>"
+Prints the changes detected by the merge operation without making any changes to the database.
+
+.IP "--key-file-from <path>"
+Sets the path of the key file for the second database.
+
+.IP "--no-password-from"
+Deactivates password key for the database to merge from.
+
+.IP "--yubikey-from <slot>"
+Yubikey slot for the second database.
+
+.IP "-s, --same-credentials"
+Uses the same credentials for unlocking both databases.
+
+
+.SS "Add and edit options"
+The same password generation options as documented for the generate command can be used
+with those 2 commands when the -g option is set.
+
+.IP "-u, --username <username>"
+Specifies the username of the entry.
+
+.IP "--url <url>"
+Specifies the URL of the entry.
+
+.IP "-p, --password-prompt"
+Uses a password prompt for the entry's password.
+
+.IP "-g, --generate"
+Generates a new password for the entry.
+
+
+.SS "Edit options"
+
+.IP "-t, --title <title>"
+Specifies the title of the entry.
+
+
+.SS "Estimate options"
+
+.IP "-a, --advanced"
+Performs advanced analysis on the password.
+
+
+.SS "Analyze options"
+
+.IP "-H, --hibp <filename>"
+Checks if any passwords have been publicly leaked, by comparing against the given
+list of password SHA-1 hashes, which must be in "Have I Been Pwned" format. Such
+files are available from https://haveibeenpwned.com/Passwords; note that they
+are large, and so this operation typically takes some time (minutes up to an
+hour or so).
+
+
+.SS "Clip options"
+
+.IP "-t, --totp"
+Copies the current TOTP instead of current password to clipboard. Will report
+an error if no TOTP is configured for the entry.
+
+
+.SS "Show options"
+
+.IP "-a, --attributes <attribute>..."
+Shows the named attributes. This option can be specified more than once,
+with each attribute shown one-per-line in the given order. If no attributes are
+specified and \fI-t\fP is not specified, a summary of the default attributes is given.
+Protected attributes will be displayed in clear text if specified explicitly by this option.
+
+.IP "-s, --show-protected"
+Shows the protected attributes in clear text.
+
+.IP "-t, --totp"
+Also shows the current TOTP, reporting an error if no TOTP is configured for
+the entry.
+
+
+.SS "Diceware options"
+
+.IP "-W, --words <count>"
+Sets the desired number of words for the generated passphrase. [Default: 7]
+
+.IP "-w, --word-list <path>"
+Sets the Path of the wordlist for the diceware generator. The wordlist must
+have > 1000 words, otherwise the program will fail. If the wordlist has < 4000
+words a warning will be printed to STDERR.
+
+
+.SS "Export options"
+
+.IP "-f, --format"
+Format to use when exporting. Available choices are xml or csv. Defaults to xml.
+
+
+.SS "List options"
+
+.IP "-R, --recursive"
+Recursively lists the elements of the group.
+
+.IP "-f, --flatten"
+Flattens the output to single lines. When this option is enabled, subgroups and subentries will be displayed with a relative group path instead of indentation.
+
+.SS "Generate options"
+
+.IP "-L, --length <length>"
+Sets the desired length for the generated password. [Default: 16]
+
+.IP "-l --lower"
+Uses lowercase characters for the generated password. [Default: Enabled]
+
+.IP "-U --upper"
+Uses uppercase characters for the generated password. [Default: Enabled]
+
+.IP "-n --numeric"
+Uses numbers characters for the generated password. [Default: Enabled]
+
+.IP "-s --special"
+Uses special characters for the generated password. [Default: Disabled]
+
+.IP "-e --extended"
+Uses extended ASCII characters for the generated password. [Default: Disabled]
+
+.IP "-x --exclude <chars>"
+Comma-separated list of characters to exclude from the generated password. None is excluded by default.
+
+.IP "--exclude-similar"
+Exclude similar looking characters. [Default: Disabled]
+
+.IP "--every-group"
+Include characters from every selected group. [Default: Disabled]
+
+
+.SH REPORTING BUGS
+Bugs and feature requests can be reported on GitHub at https://github.com/keepassxreboot/keepassxc/issues.
+
+.SH AUTHOR
+This manual page was originally written by Manolis Agkopian <m.agkopian@gmail.com>,
+and is maintained by the KeePassXC Team <team@keepassxc.org>.

share/docs/man/keepassxc.1

@@ -0,0 +1,39 @@
+.TH KEEPASSXC 1 "Oct 25, 2019"
+.SH NAME
+keepassxc \- password manager
+
+.SH SYNOPSIS
+.B keepassxc
+.B [
+.I options
+.B ] [
+.I filename(s)
+.B ]
+
+.SH DESCRIPTION
+\fBKeePassXC\fP is a free/open-source password manager or safe which helps you to manage your passwords in a secure way. The complete database is always encrypted with the industry-standard AES (alias Rijndael) encryption algorithm using a 256 bit key. KeePassXC uses a database format that is compatible with KeePass Password Safe. Your wallet works offline and requires no Internet connection.
+
+.SH OPTIONS
+.IP "-h, --help"
+Displays this help.
+
+.IP "-v, --version"
+Displays version information.
+
+.IP "--config <config>"
+Path to a custom config file
+
+.IP "--keyfile <keyfile>"
+Key file of the database
+
+.IP "--pw-stdin"
+Read password of the database from stdin
+
+.IP "--pw, --parent-window <handle>"
+Parent window handle
+
+.IP "--debug-info"
+Displays debugging information.
+
+.SH AUTHOR
+This manual page is maintained by the KeePassXC Team <team@keepassxc.org>.