Merge 1.0.0 changes back to master.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/67680bd2 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/67680bd2 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/67680bd2 Branch: refs/heads/master Commit: 67680bd2d51e7949453f0f7ffc7f4234a1136715 Parents: c120aa0 addb473 Author: Michael Jumper <mjum...@apache.org> Authored: Mon Jun 25 17:27:10 2018 -0700 Committer: Michael Jumper <mjum...@apache.org> Committed: Mon Jun 25 17:27:10 2018 -0700 ---------------------------------------------------------------------- src/common-ssh/common-ssh/key.h | 50 +++++++++++++++++++++ src/common-ssh/common-ssh/ssh.h | 3 +- src/common-ssh/key.c | 84 +++++++++++++++++++++++++++++++++++ src/common-ssh/ssh.c | 41 ++++++++++++++++- src/protocols/rdp/rdp.c | 3 +- src/protocols/rdp/rdp_settings.c | 12 +++++ src/protocols/rdp/rdp_settings.h | 5 +++ src/protocols/ssh/settings.c | 12 ++++- src/protocols/ssh/settings.h | 5 +++ src/protocols/ssh/ssh.c | 6 ++- src/protocols/vnc/settings.c | 12 +++++ src/protocols/vnc/settings.h | 5 +++ src/protocols/vnc/vnc.c | 3 +- 13 files changed, 233 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
