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
Steven Noonan
c21f4b5ec2
OpenSSHKey: correctly parse aes-256-cbc/ctr keys ( #1682 )
...
AES-256 uses a 32-byte (256-bit) key size. This un-breaks the loader and
tests added for AES-256-CBC and AES-256-CTR PEM keys.
* OpenSSHKey: correctly parse encrypted PEM AES-256-CBC/AES-256-CTR keys
* OpenSSHKey: use correct key derivation for AES-256
2018-04-04 21:58:34 -04:00
Louis-Bertrand Varin
8324d03f0a
Formatting the code.
2018-03-31 16:01:30 -04:00
Toni Spets
b0a61f437a
SSH Agent: Fix handling of encrypted RSA keys
...
Also fix multiple UI issues caused by said keys.
Fixes #1560
2018-03-03 16:34:08 +01:00
Toni Spets
d58e3ca34d
SSH Agent: Support old AES-128-CBC encrypted keys
2018-02-11 15:31:06 +01:00
Toni Spets
80d85965e9
SSH Agent: Fix translation arguments
2018-02-11 15:31:06 +01:00
Toni Spets
cbb70cdc7c
SSH Agent: Support old unencrypted DSA and RSA keys
2018-02-04 15:59:08 +02:00
Toni Spets
4840c2c64f
SSH agent support
2017-11-19 14:38:59 +02:00
