diff options
| author | Christian Kieschnick <christian.kieschnick@hicknhack-software.com> | 2018-10-01 17:26:24 +0300 |
|---|---|---|
| committer | Jonathan White <support@dmapps.us> | 2018-10-01 17:39:37 +0300 |
| commit | eca9c658f4d0a8e956d49ce2e9eea81704e1de9b (patch) | |
| tree | f49da9147abee9a96a0acce17548233a988b1f34 /cmake | |
| parent | c1e9f45df9f21b7697241037643770a2862bb7ef (diff) | |
Add sharing of groups between databases
* Add source folder keeshare for sharing with corresponding define WITH_XC_KEESHARE
* Move common crypto parts to src/crypto/ssh
* Extended OpenSSHKey
* Move filewatching to own file (currently in two related classes DelayedFileWatcher and BulkFileWatcher)
* Small improvements for style and code in several classes
* Sharing is secured using RSA-Keys which are generated on demand
* Publisher signs the container using their private key
* Client can verify the signed container and choose to decline an import,
import only once or trust the publisher and automatically import all
data of this source henceforth
* Integration of settings into Group-Settings, Database-Settings and Application-Settings
* Introduced dependency QuaZip as dependency to allow combined export of
key container and the (custom format) certificate
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CLangFormat.cmake | 6 | ||||
| -rw-r--r-- | cmake/FindQuaZip.cmake | 23 |
2 files changed, 26 insertions, 3 deletions
diff --git a/cmake/CLangFormat.cmake b/cmake/CLangFormat.cmake index 8c26db93b..68d28311b 100644 --- a/cmake/CLangFormat.cmake +++ b/cmake/CLangFormat.cmake @@ -29,9 +29,9 @@ set(EXCLUDED_FILES gui/KMessageWidget.cpp gui/MainWindowAdaptor.h gui/MainWindowAdaptor.cpp - sshagent/bcrypt_pbkdf.cpp - sshagent/blf.h - sshagent/blowfish.c + crypto/ssh/bcrypt_pbkdf.cpp + crypto/ssh/blf.h + crypto/ssh/blowfish.c tests/modeltest.cpp tests/modeltest.h # objective-c files diff --git a/cmake/FindQuaZip.cmake b/cmake/FindQuaZip.cmake new file mode 100644 index 000000000..58244f4df --- /dev/null +++ b/cmake/FindQuaZip.cmake @@ -0,0 +1,23 @@ +# Copyright (C) 2018 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(QUAZIP_INCLUDE_DIR quazip5/quazip.h) +find_library(QUAZIP_LIBRARIES quazip5) + +mark_as_advanced(QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR) + +include(FindPackageHandleStandardArgs) +include_directories(${QUAZIP_INCLUDE_DIR}) +find_package_handle_standard_args(QuaZip DEFAULT_MSG QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR) |