Commit Graph

291 Commits

Author SHA1 Message Date
Jonathan White
aae6d09fd3
Merge branch 'master' into develop
Conflicts:
	src/CMakeLists.txt
	src/autotype/xcb/AutoTypeXCB.cpp
	src/browser/BrowserAction.cpp
	src/browser/BrowserService.cpp
	src/browser/BrowserService.h
	src/browser/BrowserSettings.h
	src/browser/NativeMessagingHost.cpp
	src/browser/NativeMessagingHost.h
	src/gui/EditWidgetIcons.cpp
	src/gui/EditWidgetIcons.h
	src/gui/MainWindow.cpp
	src/proxy/NativeMessagingHost.cpp
	tests/TestOpenSSHKey.cpp
2018-05-07 23:24:30 -04:00
Jonathan White
3b7e63a773
Bump version number to 2.3.2 & fix Win build 2018-05-07 23:17:32 -04:00
Louis-Bertrand Varin
07bc9a7b4b Add ClangFormat rules 2018-03-31 12:15:09 -04:00
Jonathan White
410d88bf99
Remove KeePassHttp plugin and qhttp (#1752)
Remove KeePassHttp plugin and qhttp
2018-03-31 11:36:18 -04:00
Jonathan White
4a207f079b Enable high entropy ASLR for Windows builds 2018-03-17 12:13:47 -04:00
Janek Bevendorff
642daa641b
Bump version to 2.3.1 and update CHANGELOG 2018-03-06 22:54:01 +01:00
Janek Bevendorff
d3a80513a7 Fix GCC 8 memset warning and set -Werror only for debug builds, resolves #1558 2018-03-04 21:18:13 +01:00
thez3ro
923d24b448
release build when checking out a git-tag 2018-03-01 14:47:16 +01:00
Janek Bevendorff
e231774b05 Don't hardcode HINTS to macdeployqt 2018-02-27 20:11:03 +01:00
Janek Bevendorff
a06a1f84e0 Don't hardcode install_name_tool change path, resolves #1518 2018-02-26 00:55:06 +01:00
Janek Bevendorff
3089894d20 Allow KeePassXC version overrides from file in addition to Git tags 2018-02-23 00:59:45 +01:00
Janek Bevendorff
924d472de5 Add support for pre-releases 2018-02-18 10:20:34 +01:00
Jonathan White
d911987787 Ensure yubikey libs are dynamic; bump to c99 2018-02-01 21:40:47 +01:00
Jonathan White
d8649f7a60 Check for tag to automatically determine release build 2018-01-30 21:21:24 +01:00
Jonathan White
3e2443a861 Add support for nightly builds to release tool 2018-01-30 21:21:23 +01:00
Janek Bevendorff
f520a0f272
Deprecate KeePassHTTP and introduce WITH_XC_NETWORKING CMake option 2018-01-19 20:40:54 +01:00
Jonathan White
542ee42313
Add Argon2Kdf and enable parameters in db settings
Note: This implementation is not yet connected to the
database itself and will corrupt existing kdbx3 db's.

* Implemented memory and parallelism parameters for Argon2Kdf
* Using libargon2; libsodium does not support Argon2d algorithm
* Moved basic rounds parameter into Kdf class
* Reimplemented benchmark algorithm; previous was utterly broken
2018-01-13 14:23:30 -05:00
angelsl
6a0d05e1ef
Add support for various algorithms for kdbx4
* Add SHA512 support to CryptoHash
* Add ChaCha20 support
* Add HMAC support
* Add new HmacBlockStream, used in KDBX 4
* Add support for ChaCha20 protected stream
2018-01-13 14:23:26 -05:00
varjolintu
06518c5736 keepassxc-browser 2018-01-04 21:42:20 +01:00
thez3ro
506057d202
undefine FORTIFY_SOURCE before trying to define it. In case it's already defined by the distro 2018-01-03 20:19:23 +01:00
Orivej Desh
f6a48f2672
Fix use of cmake_minimum_required
cmake_minimum_required() must be used before project(), otherwise it has no effect on internal cmake code that runs when project() is invoked. In particular CMP0025 does not default to NEW and CMake does not detect Clang features on Darwin, which is necessary to compile the project with the upstream (non Apple) compiler.
2017-12-20 08:25:55 +00:00
Janek Bevendorff
57845851c0
Merge branch 'master' into develop 2017-12-13 19:00:04 +01:00
Janek Bevendorff
8c682c80ce
Bump version to 2.2.4 2017-12-13 18:55:54 +01:00
Jonathan White
28ad6ed552 Merge branch 'master' into develop 2017-12-11 21:10:25 -05:00
Jonathan White
228843b010
Version bump to 2.2.3 and changelog 2017-12-11 20:59:41 -05:00
Janek Bevendorff
d35f3fc573 Treat warning as errors 2017-11-27 20:57:55 +01:00
Toni Spets
4840c2c64f SSH agent support 2017-11-19 14:38:59 +02:00
Janek Bevendorff
d4343a5e42
Merge branch 'master' into develop 2017-10-22 00:30:37 +02:00
Janek Bevendorff
880a8da68a
Bump version to 2.2.2 and update changelog 2017-10-22 00:27:26 +02:00
Adolfo E. García
fdc7471a7b Make QtMacExtras optional 2017-10-21 10:12:28 -06:00
Adolfo E. García
7198f20d69 Improve building of macOS target 2017-10-21 10:12:28 -06:00
Adolfo E. García
de065c728f Enable option WITH_ASAN for macOS builds 2017-10-21 10:12:28 -06:00
Adolfo E. García
2fa3f5072d Simplify the ZLIB version check 2017-10-21 10:12:28 -06:00
Janek Bevendorff
8592f7e672 Merge branch 'release/2.2.2' into develop 2017-10-19 21:45:49 +02:00
Janek Bevendorff
ec8c99c3b2 Fix remaining uses of KEEPASSXC_SNAP_BUILD 2017-10-19 15:52:46 +02:00
Janek Bevendorff
bae9dbc407 Add distribution information to debug info screen 2017-10-19 15:52:46 +02:00
Janek Bevendorff
ab21f718ba Merge branch 'release/2.2.2' into develop 2017-10-12 14:10:20 +02:00
Weslly
8a8eecbe8b Fix macOS man path 2017-10-06 00:15:23 -03:00
Jonathan White
91d746c5c0 Corrected issues with desktop and tray icons in snap build 2017-10-03 15:43:52 -04:00
Jonathan White
7d3c18e1fb
Version number bump 2017-10-01 10:58:00 -04:00
Yen Chi Hsuan
ea1554915b 🐛 Use correct ZLib include path
Fixes #801
2017-08-17 11:09:37 +08:00
Janek Bevendorff
35e86efbce
Require CMake 3.1.0 and update Dockerfile 2017-06-26 16:41:16 +02:00
Jonathan White
a3020b6787
Bumped version to 2.2.0 and populated CHANGELOG 2017-06-20 23:14:44 -04:00
thez3ro
a53b111182
Update and fix copyright headers 2017-06-14 15:54:43 +02:00
TheZ3ro
adf61d9878 Merge branch 'develop' into single-instance 2017-05-27 09:18:13 +02:00
Yen Chi Hsuan
3822625e77 Allow disabling .app bundles on Mac 2017-05-14 22:51:12 +08:00
VukoDrakkeinen
d1310b3337 Raise existing instance
Closes #193
2017-05-09 14:06:45 +02:00
Jonathan White
5c8809e55d
Update cmake files, fixes #331 2017-05-06 11:51:43 -04:00
Jonathan White
af4f56abfd Support vscode 2017-05-05 20:20:27 -04:00
seatedscribe
73b0188126
Substitute deprecated commands with feature_summary 2017-04-10 22:05:53 +02:00
Jonathan White
4cd461f57a
Disable DEP and ASLR for Debug builds. This allows for debugging with GDB. 2017-04-09 18:52:54 -04:00
Jonathan White
3de4395d5e
Merge remote-tracking branch 'origin/master' into develop 2017-04-09 10:28:15 -04:00
Jonathan White
918db68c52
Bumped version to 2.1.4, updated CHANGELOG 2017-04-09 09:54:55 -04:00
Louis-Bertrand Varin
e1e8f33f67 Install path on Mac. 2017-03-16 10:09:50 -04:00
Louis-Bertrand Varin
992d8a90c7 Migrate entropy-meter to keepassxc-cli 2017-03-16 10:09:50 -04:00
Janek Bevendorff
8b04040d7e
Add WITH_ASAN option to README 2017-03-16 00:20:38 +01:00
Janek Bevendorff
9608464ed1
Show error message when trying to use WITH_ASAN on Windows or OS X 2017-03-15 15:23:55 +01:00
Janek Bevendorff
2587bac300
Enable ASAN option in Travis build 2017-03-15 15:23:52 +01:00
Janek Bevendorff
504bd40263
Prevent massive end-of-process leak sanitizer dump 2017-03-15 15:23:50 +01:00
Janek Bevendorff
65d4a0a8cd
Add ASAN option to CMake 2017-03-15 15:23:44 +01:00
Janek Bevendorff
bb04144fe8
Merge branch 'develop' into feature/yubikey 2017-03-10 18:53:38 +01:00
Janek Bevendorff
34f037be92
Enable -fstack-protector-strong flag only for GCC >= 4.9 and Clang 2017-03-10 18:42:10 +01:00
Janek Bevendorff
15dd783d2c
Merge branch 'develop' into feature/yubikey 2017-03-10 18:01:14 +01:00
Janek Bevendorff
8a942422da
Harden Linux binary 2017-03-10 17:46:15 +01:00
rockihack
914b848e58
Enable DEP+ASLR for cmake modules (autotype dll). 2017-03-10 17:46:12 +01:00
rockihack
1984595d0d
Enable DEP and ASLR. 2017-03-10 17:46:08 +01:00
Janek Bevendorff
5df7b9aa85
Merge branch 'develop' into feature/yubikey 2017-03-03 22:04:55 +01:00
Jonathan White
7ec8d4c3f6
Fixed WITH_XC_AUTOTYPE and WITH_XC_HTTP descriptions 2017-03-02 22:07:42 -05:00
Jonathan White
3139ae1528
WITH_XC_AUTOTYPE defaults to ON and WITH_XC_HTTP includes ALL networking 2017-03-02 18:44:01 -05:00
Janek Bevendorff
e2d098dd9b
Bump version to 2.1.3, update CHANGELOG 2017-03-02 21:56:22 +01:00
Janek Bevendorff
48366d245c
Add CMake feature description 2017-02-25 17:14:10 +01:00
Janek Bevendorff
b2650c5a96
Hide UI elements when KeePassXC was compiled without -DWITH_XC_YUBIKEY 2017-02-21 01:06:32 +01:00
Janek Bevendorff
a27147a75e
Merge branch 'develop' into feature/yubikey 2017-02-20 20:24:38 +01:00
Janek Bevendorff
217e95e425
Bump version to 2.1.2 2017-02-17 15:56:05 +01:00
Janek Bevendorff
7df6d27900 Fix and clean up CMake files 2017-02-17 02:43:25 +01:00
Jonathan White
5274826e5c Implemented qhttp in server protocol 2017-02-17 02:43:25 +01:00
Janek Bevendorff
37c7318097
Merge branch 'develop' into feature/yubikey 2017-02-15 00:24:28 +01:00
Janek Bevendorff
8a26cfad79 Re-register global D-Bus menu when restoring window from tray, resolves #271 2017-02-09 21:23:46 -05:00
Jonathan White
db75d94961
Added release version and changelist 2017-02-06 18:43:11 -05:00
Janek Bevendorff
1554722a83
Add missing find_package call 2017-01-26 02:58:46 +01:00
Janek Bevendorff
1edc116532
Only require libmicrohttpd when building with -DWITH_XC_HTTP=On, resolves #179 2017-01-24 00:26:16 +01:00
Janek Bevendorff
e17576a6f7 Merge branch 'develop' into feature/yubikey 2017-01-15 03:20:21 +02:00
Josh Soref
3924f628b4 spelling: full 2017-01-14 17:31:38 +01:00
Kyle Manna
82aed2caab keys: yk: Add YubiKey hardware driver support
* Use compile time detection of the YubiKey libraries and link against
  the libraries if present.  Can be disabled with:

      $ cmake -DCMAKE_DISABLE_FIND_PACKAGE_YubiKey=FALSE

* A stub file provides empty calls for all the function calls integrated
  in to the UI to support this.  In the future a more modular approach
  maybe better, but opting for simplicity initially.

Signed-off-by: Kyle Manna <kyle@kylemanna.com>
2017-01-07 23:18:59 -08:00
thez3ro
65992ba6ae
Option to select extension compile-time. Fix #50 #123 2016-12-04 19:57:24 +01:00
TheZ3ro
753b9c9e67 Add Autotype on Windows and MacOS (#63)
* Add Autotype on Windows, including Windows 10
* Add MacOS autotype, fix macdeployqt build
* Make QT_BINARY_DIR overwritable at compile time
2016-11-08 16:13:57 -05:00
Jonathan White
ac108cd708 Added guard to prevent missing prereqs for coverage.. 2016-11-04 00:52:00 -04:00
Jonathan White
29be837b97 Updated README badges and added code coverage 2016-11-04 00:47:04 -04:00
Jonathan White
ccec84aef2 Rename application to KeePassXC and change icon (#70) 2016-11-03 00:05:30 -04:00
Jonathan White
13983d0e51 Make search always visible (PR #67)
* Moved search bar to toolbar and consolidated search options into dropdown list
* Updated GUI tests to be atomic and rewrote search tests
* Searches are saved between databases
* Search is cleared when all databases are closed
* Implemented global search shortcut (CTRL+F) and a notification bar when in search mode
2016-11-02 21:01:02 -04:00
thez3ro
24a17c05ab
🏁 Fix winsock and autotype error when compiling on Windows 2016-10-24 19:45:35 +02:00
Felix Geyer
f05caf7623 Prepare for 2.0.3 release. 2016-10-02 21:50:15 -04:00
Jonathan White
cbb1269b39 Merge from eugenesan/keepassx to implement 1.8.4.1 improvements 2016-04-03 10:49:00 -04:00
Jonathan White
7f7753a004 Fixed various Qt5 changes in the http code 2016-02-28 10:52:02 -05:00
Jonathan White
aba4fa94be Merge remote-tracking branch 'keepassx/master'
# Conflicts:
#	README.md
#	share/translations/keepassx_de.ts
#	src/CMakeLists.txt
#	src/gui/MainWindow.h
2016-02-27 19:11:09 -05:00
Felix Geyer
d6d92ce90a Merge branch '2.0' 2016-02-08 18:13:29 +01:00
Felix Geyer
49f58b4ed8 Prepare 2.0.2 release. 2016-02-02 01:21:39 +01:00
Felix Geyer
d670ef2638 Prepare for 2.0.1 release. 2016-01-31 18:49:35 +01:00
Felix Geyer
ecfbf72a57 Merge branch '2.0' 2015-12-15 21:05:00 +01:00
Felix Geyer
24275d8dc4 Bump version. 2015-12-06 22:19:05 +01:00
Felix Geyer
a408b01111 Add WITH_DEV_BUILD mode.
It disables/warns about deprecated methods.
2015-10-13 22:51:31 +02:00
Felix Geyer
3b2a39fd38 Merge branch '2.0' 2015-09-26 11:44:27 +02:00
Felix Geyer
ee81c7c00e Remove WITH_LTO option.
It's broken and probably not worth the potential again.

Refs #353
2015-09-25 21:34:51 +02:00
Felix Geyer
2e23fb203a Pass -std=c++11 to the C++ compiler unconditionally.
All supported compiler should understand it.
2015-09-12 16:16:18 +02:00
Felix Geyer
7fa0eddc5f Make C++11 mandatory. 2015-09-12 13:55:50 +02:00
Felix Geyer
60daa2b41b Require libgcrypt >= 1.6.0.
Remove our own Salsa20 implementation as libgcrypt ships one
with that version.
2015-09-12 13:51:49 +02:00
Felix Geyer
ec8c0bb3e7 Setup new build dependencies. 2015-09-12 13:51:49 +02:00
Felix Geyer
208b0f39e6 Adapt to QtConcurrent being a separate module now. 2015-09-12 13:51:49 +02:00
Felix Geyer
813c64a055 Port cmake files to Qt 5. 2015-09-12 13:51:49 +02:00
Felix Geyer
95c449481e Prepare beta 2 release. 2015-09-06 23:39:54 +02:00
Felix Geyer
d83fee89bd Fix building WITH_CXX11 on OS X. 2015-09-05 19:03:24 +02:00
Felix Geyer
1226d1dbd5 Prepare next release. 2015-07-18 21:20:38 +02:00
Felix Geyer
6d1ca363af Remove support for clearing the Klipper history.
KDE Plasma 5 doesn't provide the DBus interface anymore and
this avoids the QtDBus dependency.
2015-07-16 20:02:10 +02:00
Ivan
a115bbdc6f Merge branch 'master' of https://github.com/keepassx/keepassx 2015-05-22 21:06:32 -07:00
Felix Geyer
eeb940c0dc Fix plugin path detection when installed with DESTDIR.
This is in no way perfect but should cover most common cases.

Closes #291
2015-05-12 22:24:59 +02:00
Ivan
d70ee509b4 Merge branch 'master' of https://github.com/keepassx/keepassx 2015-04-11 15:41:25 -07:00
Felix Geyer
93ab7eb058 Use CMAKE_INSTALL_DATADIR to look for the data dir. 2015-04-08 18:07:53 +02:00
IvanF
235baa3dcc Merge branch 'master' of https://github.com/keepassx/keepassx
Conflicts:
	README.md
	src/core/Config.cpp
	src/gui/DatabaseTabWidget.cpp
	src/gui/DatabaseTabWidget.h
	src/gui/DatabaseWidget.cpp
	src/gui/DatabaseWidget.h
	src/gui/MainWindow.cpp
	src/gui/MainWindow.h
	src/gui/MainWindow.ui
	src/gui/SearchWidget.ui
	src/gui/SettingsWidget.cpp
	src/gui/SettingsWidgetGeneral.ui
2015-01-29 00:17:39 -08:00
IvanF
f04f4302a2 Deleted local qjson, now using system qjson
Modified CmakeLists to require qjson
Replaced non-standard qjson calls with standard ones
2015-01-28 22:42:02 -08:00
Felix Geyer
4b3a82592c Define QT_NO_DEBUG for build type None.
Debian sets the the build type to None for package builds.
Make sure we don't enable asserts there.

Closes #237
2014-11-04 18:50:59 +01:00
Felix Geyer
b417bf9187 Enable C++11 by default. 2014-06-13 21:33:36 +02:00
Jascha Dachtera
65626f0da2 Merge branch 'master' of https://github.com/keepassx/keepassx
Use SymmetricCipherGcrypt directly in Protocol.cpp to make it work with the latest master
revision.
2014-04-18 13:59:24 +02:00
Felix Geyer
43a1d54bba Prepare 2.0 alpha 6 release. 2014-04-12 15:29:20 +02:00
Keith Bennett
b27ba03d42 Replaced qhttpserver with libmicrohttp.
The qhttpserver seems to be riddled with memory leaks and was
continuously crashing. I don't know Qt well enough to fix it so
I have replaced it with libmicrohttp. This is not nearly as
elegant but it is much more stable.
2014-03-23 17:25:39 +00:00
Felix Geyer
0b6b149351 Use the libgcrypt SALSA20 cipher if available. 2014-01-12 13:42:56 +01:00
Felix Geyer
0cbf59209b Prepare the next alpha release. 2013-12-20 12:41:45 +01:00
Felix Geyer
47b7befd2f Set default build type to RelWithDebInfo. 2013-11-24 22:09:52 +01:00
Felix Geyer
2fcc369c41 Enable the foritfy source build flag only for optimized builds.
https://github.com/keepassx/keepassx/pull/27
2013-11-24 21:40:19 +01:00
Felix Geyer
6504b6f2bd Drop Qt module name from include statements.
This is a preparation to be able to build KeePassX against Qt 5.
2013-10-03 15:18:16 +02:00
Felix Geyer
e1c82a4453 Print a cmake feature log.
This let's users know when the dependnecies for auto-type are missing.
Available only in cmake >= 2.8.3.

Closes #71
2013-06-30 14:07:25 +02:00
Felix Geyer
a505d85792 Fix compatbility with clang 3.2.
Pass --param=ssp-buffer-size=4 to clang instead of
-mllvm -stack-protector-buffer-size=4 which clang 3.2 doesn't seem
to support anymore.
2013-04-30 18:38:44 +02:00
Felix Geyer
fd18bc0330 Use standard GNU install dirs and make them overridable. 2013-04-29 22:17:31 +02:00
Felix Geyer
9e87230102 Use -fvisibility-inlines-hidden only for C++ files.
gcc emits a warning that the flag cannot be used for C.
2013-04-06 17:45:05 +02:00
Felix Geyer
60335452a4 Add compiler flags to hide all symbols by default. 2013-03-30 00:14:32 +01:00
Felix Geyer
98e59215b8 Bump version and update changelog. 2013-03-29 09:46:03 +01:00
Felix Geyer
8d9b209014 Bump version to 2.0 alpha 3. 2012-10-27 10:29:45 +02:00
Felix Geyer
18337927f5 Fix includes for ptrace(PT_DENY_ATTACH, ...). 2012-10-23 17:06:50 +02:00
Felix Geyer
21f1eb2d14 Drop WITH_PIE option as it's broken.
It builds the autotype plugin as a PIE which doesn't work.
2012-10-23 17:05:46 +02:00
Felix Geyer
34f595cc78 Build icon into the main executable on Windows. 2012-10-23 14:52:59 +02:00
Felix Geyer
169e6327ea Disable core dumps and tracing on *nix.
But only when built in release mode.

Closes #4
2012-10-21 12:33:00 +02:00
Felix Geyer
3100c202e8 Install the auto-type plugin. 2012-07-18 21:22:36 +02:00
Felix Geyer
bc207714da Add initial auto-type implementation.
The platform dependent bits are separated in plugins.
A plugin for X11 using Xlib is already done.
2012-07-12 22:33:20 +02:00
Felix Geyer
853d9eaa4a Bump version to alpha 2. 2012-07-02 22:23:20 +02:00
Felix Geyer
a4121f8b5a Set BIN_INSTALL_DIR to "." instead of an empty string on Windows and Mac OS. 2012-07-02 22:13:13 +02:00
Felix Geyer
1bb646fb91 Don't pass -ansi to g++ when WITH_CXX11 is enabled. 2012-07-02 19:52:06 +02:00
Felix Geyer
a9724ad894 Fix building with LTO. 2012-07-02 19:22:26 +02:00
Felix Geyer
af142fc433 Optionally enable C++ 11. 2012-06-29 14:14:58 +02:00
Felix Geyer
f43ad8d062 Support copying username and password to the clipboard. 2012-05-26 16:37:57 +02:00
Felix Geyer
a1a71a88bb Fix cmake file formatting. 2012-05-21 23:37:29 +02:00
Felix Geyer
3bc3bfb15e Support gcc 4.0.
gcc 4.0 doesn't understand -Werror=...
2012-05-21 21:50:48 +02:00