backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-02-10 21:56:13 +08:00
Code Issues Projects Releases Wiki Activity
1,938 Commits 20 Branches 42 Tags
14bf90264ef4e93d3725b5065fee61f7149f1eae
Commit Graph

649 Commits

Author SHA1 Message Date
Nick Bolton
14bf90264e Renamed function, was reserved keyword on Mac #4522 2015-04-15 14:49:05 +01:00
Nick Bolton
c7de2da062 Comment out unused fingerprint filename consts #4522 
Causing compile to fail on Mac (fails on warnings)
 2015-04-15 14:33:26 +01:00
Nick Bolton
407f92e9d4 Removed --certificate-fingerprint argument #4522 
Used profile dir for fingerprint file path instead
 2015-04-15 14:16:28 +01:00
Nick Bolton
6580ad0015 Merge branch 'master' of https://github.com/synergy/synergy 2015-04-15 13:40:55 +01:00
XinyuHou
2752d24dc4 Merge branch 'jerry-sandbox' 2015-04-15 13:33:39 +01:00
Xinyu Hou
e405ec25e3 Always log out server fingerprint #4522 2015-04-15 13:25:18 +01:00
Nick Bolton
689737ee7a Fingerprint file check and trust logic #4522 
Also refactored the 'get profile dir' code to use the core interface
(reduce code duplication)
 2015-04-15 13:09:22 +01:00
Xinyu Hou
52d9b1beed Logged out new fingerprint when not match #4522 2015-04-15 13:06:49 +01:00
Xinyu Hou
1e2b822226 Removed unused variable 2015-04-14 17:52:24 +01:00
XinyuHou
fa1ea0022b Fixed code style 2015-04-14 17:52:15 +01:00
XinyuHou
f60e98c8cd Fixed error from merge 2015-04-14 17:52:08 +01:00
XinyuHou
916a4c75af Refactored no or wrong ssl certificate error handling #4410 
Conflicts:
	src/lib/net/TCPListenSocket.cpp
	src/lib/plugin/ns/SecureListenSocket.cpp
	src/lib/plugin/ns/SecureSocket.cpp
	src/lib/plugin/ns/SecureSocket.h
 2015-04-14 17:52:00 +01:00
XinyuHou
dd574c4f2c Added unit tests for string operations 2015-04-14 17:51:50 +01:00
XinyuHou
28eb85660f Fixed error from merge 2015-04-14 17:51:41 +01:00
XinyuHou
b4665b9cd5 Passed args into client and socket 
Conflicts:
	src/lib/client/Client.cpp
	src/lib/client/Client.h
	src/lib/synergy/ClientApp.cpp
	src/test/integtests/net/NetworkTests.cpp
 2015-04-14 17:51:31 +01:00
Xinyu Hou
39e183da3e Refactored string operations 
Conflicts:
	src/lib/base/String.cpp
 2015-04-14 17:51:19 +01:00
XinyuHou
cb0f0dd06d Improved fingerprint verification #4522 
Conflicts:
	src/lib/plugin/ns/SecureSocket.cpp
	src/lib/plugin/ns/SecureSocket.h
	src/lib/synergy/ClientApp.cpp
 2015-04-14 17:50:49 +01:00
XinyuHou
b24eb2b724 Removed test string #4522 2015-04-14 17:50:36 +01:00
XinyuHou
71dc472a64 Fixed code style 2015-04-14 17:49:56 +01:00
XinyuHou
b8ba37b4f4 Made callback function global #4522 2015-04-14 17:49:33 +01:00
Xinyu Hou
5dfe4aa0b5 Added verification of server certificate fingerprint #4522 
Conflicts:
	src/lib/mt/Thread.cpp
	src/lib/plugin/ns/SecureSocket.cpp
	src/lib/synergy/ClientArgs.cpp
 2015-04-14 17:46:58 +01:00
Nick Bolton
07b1ea203f Message box asking user to verify fingerprint #4522 2015-04-14 17:29:08 +01:00
Nick Bolton
6e2ccb8f8d Merge pull request #4422 from legonigel/shortcut_fix 
Changed server shortcut on GUI main window
Fixes #4367
 2015-03-28 08:56:36 +00:00
James McMullan
1bbd086a17 MacOSX Double / Triple Click Fix 
This patch corrects issues with double click and adds triple click to
MacOSX. Double click was functioning but double clicking and then
dragging would not work.
 2015-03-21 13:41:00 +00:00
Nick Bolton
ecd51d231b Revert "Revert "Revert "Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix""" 
This reverts commit 7f721ee7b1.
 2015-03-21 13:38:20 +00:00
Nick Bolton
7f721ee7b1 Revert "Revert "Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix"" 
This reverts commit 32323bc0d1.
 2015-03-21 11:42:37 +00:00
Nick Bolton
32323bc0d1 Revert "Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix" 
This reverts commit b5effc0591, reversing
changes made to 297100c88a.
 2015-03-21 11:36:38 +00:00
Nick Bolton
b5effc0591 Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix 2015-03-21 11:08:53 +00:00
legonigel
447169df32 Fix #4349 
Fixes issue #4349 in MSWindowsDesks.cpp by using HWND_TOP instead of HWND_TOPMOST. All credit for this fix goes to @gitscrubz and @dubuaych.
 2015-03-20 03:12:50 -04:00
legonigel
393ac100c8 Changed shortcut on main window gui for server 
The shortcut for the server checkbox on the main gui is now Alt-V. This deconflicts the start/stop button.
Fixes #4367
 2015-03-09 11:47:13 -04:00
Nick Bolton
702d79570d Merge pull request #4414 from JoshMcCullough/4389 
Fixed #4389 - removed unused include from platform/MSWindowsScreen.
 2015-03-09 10:55:43 +00:00
Josh McCullough
4ac8f61a54 Fixed #4389 - removed unused include from platform/MSWindowsScreen. 2015-03-06 18:10:39 -05:00
Nick Bolton
2feb916f2f Unfucked --enable-drag-drop arg parse #4168 2015-03-04 15:10:03 +00:00
Nick Bolton
3364d38498 Removed unused retry variables #4313 2015-03-04 14:07:43 +00:00
Nick Bolton
b4a1c3627f Improved SSL error handling for accept/connect socket #4313 2015-03-04 13:59:53 +00:00
Nick Bolton
501dc6c886 More user-friendly SSL errors, and rate limited failure #4313 2015-03-04 13:42:19 +00:00
Nick Bolton
9cdff4a910 Removed throw from checkResult (causes client to freeze) #4313 2015-03-04 12:26:54 +00:00
Nick Bolton
87a81adeb4 Improved SLL error messages and throw on cert error #4313 2015-03-04 12:15:56 +00:00
Nick Bolton
55de0746dc Copy all plugin files to bin dir (including symbols) #4168 2015-03-04 12:03:38 +00:00
Nick Bolton
a2524d9f57 Make profile dir hack Windows only #4168 2015-03-04 11:51:56 +00:00
Nick Bolton
719e8f6b56 Revert "More robust secure socket error handling #4313" 
This reverts commit 40fa58de8c.
 2015-03-04 11:43:52 +00:00
Nick Bolton
1c2576b8d7 Revert "Rephrased "crypto disabled" log, changed to error #4313" 
This reverts commit a6b5c872f5.
 2015-03-04 11:43:45 +00:00
Nick Bolton
6ef41522b7 Revert "Fixed: Exception was not thrown on secure accept/connect #4313" 
This reverts commit c5ed03a8a0.
 2015-03-04 11:43:42 +00:00
Nick Bolton
cfd21216cd Fixed: Plugins dir may change depending on user #4168 2015-03-04 11:15:07 +00:00
Nick Bolton
c5ed03a8a0 Fixed: Exception was not thrown on secure accept/connect #4313 2015-03-04 10:14:21 +00:00
Nick Bolton
a6b5c872f5 Rephrased "crypto disabled" log, changed to error #4313 2015-03-04 09:00:01 +00:00
Nick Bolton
065960926c Made OpenSSL config file location Windows-only #4313 2015-03-03 19:51:41 +00:00
Nick Bolton
40fa58de8c More robust secure socket error handling #4313 2015-03-03 19:21:14 +00:00
Nick Bolton
b6a3788fea Removed remnants of synmacph tool (part 3) #4398 2015-03-03 18:06:02 +00:00
Nick Bolton
7add4f4d3f Fixed: Compile errors on Linux #4168 2015-03-03 17:29:52 +00:00